Merge branch 'develop' of https://github.com/Health-Food-Me/Health-Fo…

…od-Me-iOS into feature/Health-Food-Me#252
yungu0010 · Sep 13, 2022 · cc35a42 · cc35a42
2 parents 07035a9 + 99e5fae
commit cc35a42
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 8 deletions.
diff --git a/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj b/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
@@ -2563,7 +2563,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = HealthFoodMe/HealthFoodMe.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 202209071;
 				DEVELOPMENT_TEAM = FY8N9XTH66;
@@ -2589,7 +2589,7 @@
 				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.healthFoodMe.release;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.healthFoodMe.release";
+				PROVISIONING_PROFILE_SPECIFIER = "match Development com.healthFoodMe.release";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;

diff --git a/HealthFoodMe/HealthFoodMe/Data/Entity/Author/SocialLoginScene/SocialLoginEntity.swift b/HealthFoodMe/HealthFoodMe/Data/Entity/Author/SocialLoginScene/SocialLoginEntity.swift
@@ -15,7 +15,8 @@ struct SocialLoginEntity: Codable {
 
 // MARK: - User
 struct User: Codable {
-    let id, name, email, agent: String
+    let id, name, agent: String
+    let email: String?
 
     enum CodingKeys: String, CodingKey {
         case id = "_id"

diff --git a/...Me/Global/Resources/Assets.xcassets/HamburgerBar/btn_edit.imageset/btn_edit.png b/...Me/Global/Resources/Assets.xcassets/HamburgerBar/btn_edit.imageset/btn_edit.png
diff --git a/...Global/Resources/Assets.xcassets/HamburgerBar/btn_edit.imageset/btn_edit@2x.png b/...Global/Resources/Assets.xcassets/HamburgerBar/btn_edit.imageset/btn_edit@2x.png
diff --git a/...Global/Resources/Assets.xcassets/HamburgerBar/btn_edit.imageset/btn_edit@3x.png b/...Global/Resources/Assets.xcassets/HamburgerBar/btn_edit.imageset/btn_edit@3x.png
diff --git a/...ealthFoodMe/Global/Resources/Assets.xcassets/Map/icn_meat.imageset/icn_meat.png b/...ealthFoodMe/Global/Resources/Assets.xcassets/Map/icn_meat.imageset/icn_meat.png
diff --git a/...thFoodMe/Global/Resources/Assets.xcassets/Map/icn_meat.imageset/icn_meat@2x.png b/...thFoodMe/Global/Resources/Assets.xcassets/Map/icn_meat.imageset/icn_meat@2x.png
diff --git a/...thFoodMe/Global/Resources/Assets.xcassets/Map/icn_meat.imageset/icn_meat@3x.png b/...thFoodMe/Global/Resources/Assets.xcassets/Map/icn_meat.imageset/icn_meat@3x.png
diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MainDetailScene/Cells/MainInfoTVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MainDetailScene/Cells/MainInfoTVC.swift
@@ -151,7 +151,6 @@ extension MainInfoTVC {
             distanceLabel.text = "\(data.restaurant.distance)m"
         }
         self.expandableData = data.restaurant.toDomain()
-        print(self.expandableData)
 
         initialReload()
     }

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/HamburgerBarVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/HamburgerBarScene/HamburgerBarVC.swift
@@ -9,6 +9,7 @@ import UIKit
 
 import SnapKit
 import MessageUI
+import KakaoSDKUser
 
 enum HamburgerType {
     case editName
@@ -431,19 +432,48 @@ extension HamburgerBarVC {
             self.makeAlert(alertType: .logoutAlert,
                       title: I18N.HelfmeAlert.logout,
                       subtitle: I18N.HelfmeAlert.logoutContent) {
-                let loginVC = ModuleFactory.resolve().makeLoginVC()
-                UserManager.shared.clearUserInform()
-                self.navigationController?.pushViewController(loginVC, animated: true)
+                if UserManager.shared.isAppleLoginned {
+
+                } else {
+                    self.logoutWithKakao()
+                }
             }
         }
 
         [needLoginButton, needLoginImageButton].forEach {
             $0.press {
-                self.presentSocialLoginAlert()
+                self.presentSocialLoginVC()
             }
         }
     }
 
+    private func logoutWithKakao() {
+        UserApi.shared.logout {(error) in
+            if let error = error {
+                print(error)
+            }
+            else {
+                print("카카오 로그아웃 완료")
+                UserManager.shared.clearUserInform()
+                self.pushSocialLoginVC()
+            }
+        }
+    }
+
+    private func presentSocialLoginVC() {
+        let rootViewController = ModuleFactory.resolve().makeLoginVC()
+        let navigation = UINavigationController(rootViewController: rootViewController)
+        navigation.isNavigationBarHidden = true
+        navigation.modalTransitionStyle = .crossDissolve
+        navigation.modalPresentationStyle = .fullScreen
+        self.present(navigation, animated: true)
+    }
+
+    private func pushSocialLoginVC() {
+        let loginVC = ModuleFactory.resolve().makeLoginVC()
+        self.navigationController?.pushViewController(loginVC, animated: true)
+    }
+
     private func presentSocialLoginAlert() {
         let alert = ModuleFactory.resolve().makeHelfmeLoginAlertVC()
         alert.modalPresentationStyle = .overFullScreen