From 347b740992498b082520e418c17abd6e03003d50 Mon Sep 17 00:00:00 2001 From: i-colours-u Date: Thu, 21 Jul 2022 04:08:03 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[feat]=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Map/HamburgerBarScene/HamburgerBarVC.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/HamburgerBarVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/HamburgerBarVC.swift index a10096db..d864faa5 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/HamburgerBarVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/HamburgerBarVC.swift @@ -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) { From b50bf2d107257cfed3a7b57df73a713ff1cbc6b1 Mon Sep 17 00:00:00 2001 From: i-colours-u Date: Thu, 21 Jul 2022 05:38:05 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[fix]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EB=A1=9C=ED=8B=B0=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=A0=84=ED=99=98=20=EB=A7=A4=EB=81=84=EB=9F=BD?= =?UTF-8?q?=EA=B2=8C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SocialLoginScene/VC/SocialLoginVC.swift | 15 +++++++++------ .../Map/MainMapScene/VC/MainMapVC.swift | 19 ++++++++++--------- .../Splash/SplashScene/VC/SplashVC.swift | 11 +++++++++-- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Auth/SocialLoginScene/VC/SocialLoginVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Auth/SocialLoginScene/VC/SocialLoginVC.swift index aa9795dc..268cffb0 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Auth/SocialLoginScene/VC/SocialLoginVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Auth/SocialLoginScene/VC/SocialLoginVC.swift @@ -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 }() @@ -42,6 +43,8 @@ class SocialLoginVC: UIViewController { lb.textColor = .helfmeGray1 lb.numberOfLines = 2 lb.textAlignment = .center + lb.alpha = 0 + return lb }() @@ -67,6 +70,7 @@ class SocialLoginVC: UIViewController { setAddTarget() } + override func viewDidAppear(_ animated: Bool) { showAnimation() } @@ -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) } @@ -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 } diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift index c1384082..138bc0a9 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift @@ -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 @@ -334,15 +334,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() { diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Splash/SplashScene/VC/SplashVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Splash/SplashScene/VC/SplashVC.swift index 2dc054d9..fa267470 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Splash/SplashScene/VC/SplashVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Splash/SplashScene/VC/SplashVC.swift @@ -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 { From 511f5ada1a490eca2dc99f44c08d06a60433f13a Mon Sep 17 00:00:00 2001 From: i-colours-u Date: Thu, 21 Jul 2022 20:03:31 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[fix]=20=EC=B5=9C=EC=B4=88=20=EC=A7=84?= =?UTF-8?q?=EC=9E=85=EC=8B=9C=20=EC=B9=B4=EB=A9=94=EB=9D=BC=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=ED=9B=84=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B6=88?= =?UTF-8?q?=EB=9F=AC=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HealthFoodMe.xcodeproj/project.pbxproj | 78 +++++++++---------- .../Map/MainMapScene/VC/MainMapVC.swift | 1 + .../MainMapScene/Views/mapContainerView.swift | 5 ++ 3 files changed, 45 insertions(+), 39 deletions(-) diff --git a/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj b/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj index d8cb02e0..149edef3 100644 --- a/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj +++ b/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj @@ -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 */; }; @@ -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 */; }; @@ -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 = ""; }; + 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 = ""; }; 3B089C48287D876F00DA80B9 /* GodoB.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = GodoB.otf; sourceTree = ""; }; 3B089C49287D876F00DA80B9 /* GodoB.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = GodoB.ttf; sourceTree = ""; }; 3B0B254D28757C7100950539 /* HealthFoodMe.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HealthFoodMe.entitlements; sourceTree = ""; }; @@ -271,8 +272,6 @@ 3BCC441D28745FD800661A12 /* SocialLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialLoginVC.swift; sourceTree = ""; }; 3BCC441F28745FE500661A12 /* SocialLogin.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SocialLogin.storyboard; sourceTree = ""; }; 3BDE7F282882054200EE7F47 /* ReviewEmptyViewCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewEmptyViewCVC.swift; sourceTree = ""; }; - 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 = ""; }; - 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 = ""; }; 69028BA72874675800373984 /* MenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuView.swift; sourceTree = ""; }; 69028BA9287467F100373984 /* MenuDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuDetailView.swift; sourceTree = ""; }; @@ -329,6 +328,7 @@ A9E593C62874266200B0F8B5 /* SearchRecent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchRecent.swift; sourceTree = ""; }; A9E593CE2876C26900B0F8B5 /* Color.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Color.xcassets; sourceTree = ""; }; A9E593D0287818E900B0F8B5 /* SearchTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTVC.swift; sourceTree = ""; }; + 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 = ""; }; EB033E83287B5BE300C48FB9 /* StarRatingView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = StarRatingView.swift; sourceTree = ""; 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 = ""; }; @@ -485,7 +485,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A1C216841FE9493B5DB5C4A2 /* Pods_HealthFoodMe.framework in Frameworks */, + E6162185C27CA09702A0669B /* Pods_HealthFoodMe.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -812,14 +812,6 @@ path = Views; sourceTree = ""; }; - 92A28C6F6F3B08038C52D661 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 68035982AEF7055CACF7B224 /* Pods_HealthFoodMe.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; A90CFDA5288328C90018AB94 /* Recovered References */ = { isa = PBXGroup; children = ( @@ -995,11 +987,19 @@ path = Object; sourceTree = ""; }; + B551EB8F65835286AA221974 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 10784F48AA025AF791D137F1 /* Pods_HealthFoodMe.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 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 = ""; @@ -1025,7 +1025,7 @@ EB085ED728716E1900361837 /* Products */, E3F60CBC9B890A7FB4D4AAAF /* Pods */, A90CFDA5288328C90018AB94 /* Recovered References */, - 92A28C6F6F3B08038C52D661 /* Frameworks */, + B551EB8F65835286AA221974 /* Frameworks */, ); indentWidth = 4; sourceTree = ""; @@ -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 = ( ); @@ -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 = ( @@ -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 */ @@ -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; @@ -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; @@ -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; diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift index 8c78d7cd..7c0f8351 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift @@ -42,6 +42,7 @@ class MainMapVC: UIViewController, NMFLocationManagerDelegate { } private var restaurantData: [MainMapEntity] = [] var viewModel: MainMapViewModel! + var scrapList: [ScrapListEntity] = [] // MARK: - UI Components diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/Views/mapContainerView.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/Views/mapContainerView.swift index d6d7096e..d77f4b81 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/Views/mapContainerView.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/Views/mapContainerView.swift @@ -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 {