Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[feat] 로그인 애니메이션 처리 및 카메라 이벤트 수정 #182

Merged
merged 5 commits into from
Jul 21, 2022
Merged

[feat] 로그인 애니메이션 처리 및 카메라 이벤트 수정 #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4cf2017
Merge remote-tracking branch 'upstream/develop' into fix/#139
i-colours-u Jul 20, 2022
347b740
[feat] 로그아웃시 로그인 화면으로 이동
i-colours-u Jul 20, 2022
b50bf2d
[fix] 로그인 로티 애니메이션 전환 매끄럽게 처리
i-colours-u Jul 20, 2022
c67ea1e
Merge remote-tracking branch 'upstream/develop' into fix/#139
i-colours-u Jul 21, 2022
511f5ad
[fix] 최초 진입시 카메라 이동후 데이터 불러오도록 처리
i-colours-u Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
695758F928857FDC00E36789 /* ReviewWriteEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758F828857FDC00E36789 /* ReviewWriteEntity.swift */; };
69D7074B2888062E00C2C278 /* ReviewDeleteEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69D7074A2888062E00C2C278 /* ReviewDeleteEntity.swift */; };
69D7074D28885B9900C2C278 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 69D7074C28885B9900C2C278 /* GoogleService-Info.plist */; };
A1C216841FE9493B5DB5C4A2 /* Pods_HealthFoodMe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 68035982AEF7055CACF7B224 /* Pods_HealthFoodMe.framework */; };
A90CFDCF2885B4DC0018AB94 /* SearchDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90CFDCE2885B4DC0018AB94 /* SearchDataModel.swift */; };
A90CFDD12885B4E70018AB94 /* SearchResultDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90CFDD02885B4E70018AB94 /* SearchResultDataModel.swift */; };
A90ED6252886644400FCE149 /* SearchEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90ED6222886644400FCE149 /* SearchEntity.swift */; };
Expand Down Expand Up @@ -91,6 +90,7 @@
A9E593C72874266200B0F8B5 /* SearchRecent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E593C62874266200B0F8B5 /* SearchRecent.swift */; };
A9E593CF2876C26900B0F8B5 /* Color.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A9E593CE2876C26900B0F8B5 /* Color.xcassets */; };
A9E593D1287818E900B0F8B5 /* SearchTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E593D0287818E900B0F8B5 /* SearchTVC.swift */; };
E6162185C27CA09702A0669B /* Pods_HealthFoodMe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 10784F48AA025AF791D137F1 /* Pods_HealthFoodMe.framework */; };
EB033E84287B5BE300C48FB9 /* StarRatingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB033E83287B5BE300C48FB9 /* StarRatingView.swift */; };
EB6A44C7287366DF00749582 /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = EB6A44C6287366DF00749582 /* .swiftlint.yml */; };
EB6A44D128737CC400749582 /* MainDetailUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6A44CB28737CC400749582 /* MainDetailUseCase.swift */; };
Expand Down Expand Up @@ -239,7 +239,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
31504E08C4A872E9E6B2EEDD /* Pods-HealthFoodMe.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HealthFoodMe.debug.xcconfig"; path = "Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe.debug.xcconfig"; sourceTree = "<group>"; };
10784F48AA025AF791D137F1 /* Pods_HealthFoodMe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HealthFoodMe.framework; sourceTree = BUILT_PRODUCTS_DIR; };
20F003D15CC754E358383110 /* Pods-HealthFoodMe.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HealthFoodMe.release.xcconfig"; path = "Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe.release.xcconfig"; sourceTree = "<group>"; };
3B089C48287D876F00DA80B9 /* GodoB.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = GodoB.otf; sourceTree = "<group>"; };
3B089C49287D876F00DA80B9 /* GodoB.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = GodoB.ttf; sourceTree = "<group>"; };
3B0B254D28757C7100950539 /* HealthFoodMe.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HealthFoodMe.entitlements; sourceTree = "<group>"; };
Expand Down Expand Up @@ -271,8 +272,6 @@
3BCC441D28745FD800661A12 /* SocialLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialLoginVC.swift; sourceTree = "<group>"; };
3BCC441F28745FE500661A12 /* SocialLogin.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SocialLogin.storyboard; sourceTree = "<group>"; };
3BDE7F282882054200EE7F47 /* ReviewEmptyViewCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewEmptyViewCVC.swift; sourceTree = "<group>"; };
419B07D18D99D2AAB152AD90 /* Pods-HealthFoodMe.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HealthFoodMe.release.xcconfig"; path = "Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe.release.xcconfig"; sourceTree = "<group>"; };
68035982AEF7055CACF7B224 /* Pods_HealthFoodMe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HealthFoodMe.framework; sourceTree = BUILT_PRODUCTS_DIR; };
69028BA52874673600373984 /* MenuCellCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuCellCVC.swift; sourceTree = "<group>"; };
69028BA72874675800373984 /* MenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuView.swift; sourceTree = "<group>"; };
69028BA9287467F100373984 /* MenuDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuDetailView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -329,6 +328,7 @@
A9E593C62874266200B0F8B5 /* SearchRecent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchRecent.swift; sourceTree = "<group>"; };
A9E593CE2876C26900B0F8B5 /* Color.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Color.xcassets; sourceTree = "<group>"; };
A9E593D0287818E900B0F8B5 /* SearchTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTVC.swift; sourceTree = "<group>"; };
AB5C09E6B1BC2E2B0D36CB5B /* Pods-HealthFoodMe.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HealthFoodMe.debug.xcconfig"; path = "Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe.debug.xcconfig"; sourceTree = "<group>"; };
EB033E83287B5BE300C48FB9 /* StarRatingView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = StarRatingView.swift; sourceTree = "<group>"; tabWidth = 4; };
EB085ED628716E1900361837 /* HealthFoodMe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HealthFoodMe.app; sourceTree = BUILT_PRODUCTS_DIR; };
EB085EE728716E1B00361837 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -485,7 +485,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A1C216841FE9493B5DB5C4A2 /* Pods_HealthFoodMe.framework in Frameworks */,
E6162185C27CA09702A0669B /* Pods_HealthFoodMe.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -812,14 +812,6 @@
path = Views;
sourceTree = "<group>";
};
92A28C6F6F3B08038C52D661 /* Frameworks */ = {
isa = PBXGroup;
children = (
68035982AEF7055CACF7B224 /* Pods_HealthFoodMe.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
A90CFDA5288328C90018AB94 /* Recovered References */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -995,11 +987,19 @@
path = Object;
sourceTree = "<group>";
};
B551EB8F65835286AA221974 /* Frameworks */ = {
isa = PBXGroup;
children = (
10784F48AA025AF791D137F1 /* Pods_HealthFoodMe.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
E3F60CBC9B890A7FB4D4AAAF /* Pods */ = {
isa = PBXGroup;
children = (
31504E08C4A872E9E6B2EEDD /* Pods-HealthFoodMe.debug.xcconfig */,
419B07D18D99D2AAB152AD90 /* Pods-HealthFoodMe.release.xcconfig */,
AB5C09E6B1BC2E2B0D36CB5B /* Pods-HealthFoodMe.debug.xcconfig */,
20F003D15CC754E358383110 /* Pods-HealthFoodMe.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
Expand All @@ -1025,7 +1025,7 @@
EB085ED728716E1900361837 /* Products */,
E3F60CBC9B890A7FB4D4AAAF /* Pods */,
A90CFDA5288328C90018AB94 /* Recovered References */,
92A28C6F6F3B08038C52D661 /* Frameworks */,
B551EB8F65835286AA221974 /* Frameworks */,
);
indentWidth = 4;
sourceTree = "<group>";
Expand Down Expand Up @@ -1986,12 +1986,12 @@
isa = PBXNativeTarget;
buildConfigurationList = EB085EEA28716E1B00361837 /* Build configuration list for PBXNativeTarget "HealthFoodMe" */;
buildPhases = (
6544FF9BC2ED4872399FB637 /* [CP] Check Pods Manifest.lock */,
6C1CF7A52786993975B9A1C9 /* [CP] Check Pods Manifest.lock */,
EB085ED228716E1900361837 /* Sources */,
EB085ED328716E1900361837 /* Frameworks */,
EB085ED428716E1900361837 /* Resources */,
EBFAEB012885551B009C569C /* Run Script */,
4533E3ED9E9CF29ADF7AFFCF /* [CP] Embed Pods Frameworks */,
F9EDBBC8D18259384215A033 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -2080,24 +2080,7 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
4533E3ED9E9CF29ADF7AFFCF /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
6544FF9BC2ED4872399FB637 /* [CP] Check Pods Manifest.lock */ = {
6C1CF7A52786993975B9A1C9 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand Down Expand Up @@ -2137,6 +2120,23 @@
shellPath = /bin/sh;
shellScript = "if [ \"${CONFIGURATION}\" != \"Debug\" ]; then\n\"${PODS_ROOT}/FirebaseCrashlytics/run\"\n\"${PODS_ROOT}/FirebaseCrashlytics/upload-symbols\" -gsp ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/GoogleService-Info.plist -p ios ${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\nfi\n";
};
F9EDBBC8D18259384215A033 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -2473,7 +2473,7 @@
};
EB085EEB28716E1B00361837 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 31504E08C4A872E9E6B2EEDD /* Pods-HealthFoodMe.debug.xcconfig */;
baseConfigurationReference = AB5C09E6B1BC2E2B0D36CB5B /* Pods-HealthFoodMe.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -2503,7 +2503,7 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.healthFoodMe.release;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = HealthFoodMe_Dev;
PROVISIONING_PROFILE_SPECIFIER = healthFood_dev;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand All @@ -2512,7 +2512,7 @@
};
EB085EEC28716E1B00361837 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 419B07D18D99D2AAB152AD90 /* Pods-HealthFoodMe.release.xcconfig */;
baseConfigurationReference = 20F003D15CC754E358383110 /* Pods-HealthFoodMe.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down
15 changes: 9 additions & 6 deletions HealthFoodMe/HealthFoodMe/Presentation/Auth/SocialLoginScene/VC/SocialLoginVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class SocialLoginVC: UIViewController {
lb.font = UIFont(name: AppFontName.GodoB, size: 58 * (screenWidth/375))
lb.textColor = .mainRed
lb.textAlignment = .center
lb.alpha = 0

return lb
}()
Expand All @@ -42,6 +43,8 @@ class SocialLoginVC: UIViewController {
lb.textColor = .helfmeGray1
lb.numberOfLines = 2
lb.textAlignment = .center
lb.alpha = 0


return lb
}()
Expand All @@ -67,6 +70,7 @@ class SocialLoginVC: UIViewController {
setAddTarget()
}


override func viewDidAppear(_ animated: Bool) {
showAnimation()
}
Expand Down Expand Up @@ -172,7 +176,7 @@ extension SocialLoginVC {
view.addSubviews(titleLabel, subTitleLabel, kakaoLoginButton, appleLoginButton)

titleLabel.snp.makeConstraints { make in
make.top.equalTo(view.safeAreaLayoutGuide).offset(230)
make.top.equalTo(view.safeAreaLayoutGuide).offset(140)
make.centerX.equalToSuperview().offset(2)
}

Expand All @@ -196,12 +200,11 @@ extension SocialLoginVC {
}

private func showAnimation() {
titleLabel.snp.updateConstraints { make in
make.top.equalTo(view.safeAreaLayoutGuide).offset(140)
}

UIView.animate(withDuration: 0.7,delay: 0.5) {

UIView.animate(withDuration: 0.7,delay: 0) {
self.view.layoutIfNeeded()
self.titleLabel.alpha = 1
self.subTitleLabel.alpha = 1
self.kakaoLoginButton.alpha = 1
self.appleLoginButton.alpha = 1
}
Expand Down
7 changes: 6 additions & 1 deletion HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/HamburgerBarVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,11 +377,16 @@ extension HamburgerBarVC {
self.makeAlert(alertType: .logoutAlert,
title: I18N.HelfmeAlert.logout,
subtitle: I18N.HelfmeAlert.logoutContent) {
self.makeAlert(title: "", message: "로그아웃 성공 ~ ~ !")
let loginVC = ModuleFactory.resolve().makeLoginVC()
self.navigationController?.pushViewController(loginVC, animated: true)
}
}
}

private func moveToLogin() {

}

// MARK: - @objc Methods

@objc func moveHamburgerBarWithGesture(_ sender: UIPanGestureRecognizer) {
Expand Down
20 changes: 11 additions & 9 deletions HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import SwiftUI
class MainMapVC: UIViewController, NMFLocationManagerDelegate {

// MARK: - Properties

private var initialMapOpened: Bool = false
private let disposeBag = DisposeBag()
private var isInitialPoint = false
private var currentZoom: Double = 0
Expand All @@ -42,6 +42,7 @@ class MainMapVC: UIViewController, NMFLocationManagerDelegate {
}
private var restaurantData: [MainMapEntity] = []
var viewModel: MainMapViewModel!
var scrapList: [ScrapListEntity] = []


// MARK: - UI Components
Expand Down Expand Up @@ -340,15 +341,16 @@ extension MainMapVC {
}

private func setIntitialMapPoint() {

let NMGPosition = self.locationManager?.currentLatLng()
if let position = NMGPosition {
self.mapView.moveCameraPositionWithZoom(position, 2000)
} else {
self.mapView.moveCameraPositionWithZoom(LocationLiterals.gangnamStation, 2000)
if !initialMapOpened {
initialMapOpened = true
let NMGPosition = self.locationManager?.currentLatLng()
if let position = NMGPosition {
self.mapView.moveCameraPositionWithZoom(position, 2000)
} else {
self.mapView.moveCameraPositionWithZoom(LocationLiterals.gangnamStation, 2000)
}
isInitialPoint = true
}
isInitialPoint = true

}

private func setMapView() {
Expand Down
5 changes: 5 additions & 0 deletions HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/Views/mapContainerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,11 @@ extension NaverMapContainerView: NMFMapViewCameraDelegate {
self.zoomLevelChange.accept(Int(mapView.zoomLevel))
}
}
func mapView(_ mapView: NMFMapView, cameraDidChangeByReason reason: Int, animated: Bool) {
if reason == 0 || reason == -3 {
self.zoomLevelChange.accept(Int(mapView.zoomLevel))
}
}
}

struct MapAccumulationCalculator {
Expand Down
11 changes: 9 additions & 2 deletions HealthFoodMe/HealthFoodMe/Presentation/Splash/SplashScene/VC/SplashVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,15 @@ extension SplashVC {
}

private func checkLoginStatusAndPresentVC() {
DispatchQueue.main.asyncAfter(deadline: .now()+3) {
self.presentSocialLoginVC()
DispatchQueue.main.asyncAfter(deadline: .now()+2) {

UIView.animate(withDuration: 1) {
self.animationView.alpha = 0
} completion: { _ in
self.presentSocialLoginVC()
}



// print(self.userManager.isLogin)
// if self.userManager.isLogin == true {
Expand Down