Merge branch 'develop' into QA/MainFeed-iOS-169

Author: leeari95

Fitfty/Projects/App/Support/Info.plist

@@ -14,6 +14,8 @@
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundleDisplayName</key>
+	<string>핏프티</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>

Fitfty/Projects/Common/Resources/Images.xcassets/info.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "info.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Fitfty/Projects/Common/Resources/Images.xcassets/info.imageset/info.svg

@@ -100,7 +100,7 @@ private extension ProfileCoordinator {
             style: .small,
             contentViewController: coordinator.navigationController
         )
-        bottomSheetDelegate = bottomSheetViewController
+        coordinator.bottomSheetDelegate = bottomSheetViewController
         return bottomSheetViewController
     }
 
@@ -122,7 +122,7 @@ extension ProfileCoordinator: ProfileCoordinatorInterface {
     func showMyFitfty(_ myFitftyType: MyFitftyType) {
         let coordinator = makeMyFitftyCoordinator(myFitftyType)
         coordinator.start()
-        coordinator.navigationController.modalPresentationStyle = .overFullScreen
+        coordinator.navigationController.modalPresentationStyle = .fullScreen
         navigationController.present(coordinator.navigationController, animated: true)
     }
 

Fitfty/Projects/Coordinator/Sources/Profile/ProfileCoordinator.swift

@@ -68,7 +68,7 @@ private extension ReportCoordinator {
         coordinator.finishDelegate = self
         coordinator.parentCoordinator = self
         let bottomSheetViewController = BottomSheetViewController(
-            style: .custom(480),
+            style: .custom(511),
             contentViewController: coordinator.navigationController
         )
         coordinator.bottomSheetDelegate = bottomSheetViewController

Fitfty/Projects/Coordinator/Sources/Profile/ReportCoordinator.swift

@@ -0,0 +1,34 @@
+//
+//  MyFitftyError.swift
+//  Core
+//
+//  Created by 임영선 on 2023/02/23.
+//  Copyright © 2023 Fitfty. All rights reserved.
+//
+
+import Foundation
+
+public enum MyFitftyError: Error {
+    case noWeather
+    case failUpload
+    case failModify
+    case failGetPost
+    case others(String)
+}
+
+extension MyFitftyError: LocalizedError {
+    public var errorDescription: String? {
+        switch self {
+        case .noWeather:
+            return NSLocalizedString("날씨를 불러오는데 실패했어요.\n해외 사진은 날씨 조회가 불가능해요.", comment: "noWeather")
+        case .failUpload:
+            return NSLocalizedString("핏프티 등록에 실패했어요. 잠시 후 다시 시도해 주세요.", comment: "failUpload")
+        case .failModify:
+            return NSLocalizedString("핏프티 수정에 실패했어요. 잠시 후 다시 시도해 주세요.", comment: "failModify")
+        case .failGetPost:
+            return NSLocalizedString("핏프티 정보를 가져오는데 실패했어요. 잠시 후 다시 시도해 주세요.", comment: "failGetPost")
+        case .others(let message):
+            return NSLocalizedString(message, comment: "Others Message")
+        }
+    }
+}

Fitfty/Projects/Core/Sources/Error/MyFitftyError.swift

@@ -29,7 +29,7 @@ extension SettingError: LocalizedError {
         case .noAvailableBirthday:
             return NSLocalizedString("올바른 생년월일을 기입해주세요", comment: "Wrong Birthday")
         case .noAvailableNickname:
-            return NSLocalizedString("6자 이상의 영문과 숫자조합으로 이루어진 닉네임을 기입해주세요", comment: "Wrond Nickname")
+            return NSLocalizedString("1자 이상의 영문과 숫자조합으로 이루어진 닉네임을 기입해주세요", comment: "Wrond Nickname")
         case .overlappedNickname:
             return NSLocalizedString("중복된 닉네임이에요", comment: "Overlapped Nickname")
         case .failWithdrawAccount:

Fitfty/Projects/Core/Sources/Error/SettingError.swift

@@ -17,6 +17,7 @@ public enum LocalKey: String {
     case userIdentifier
     case userAccount
     case hasCompletedWelcomePage
+    case isGuest
 }
 
 public protocol LocalStorageService: AnyObject {

Fitfty/Projects/Core/Sources/LocalStorage.swift

@@ -136,6 +136,7 @@ extension FitftyAPI: TargetType, AccessTokenAuthorizable {
              .setUserDetails(let parameters),
              .postMyFitfty(let parameters),
              .codyList(let parameters),
+             .updateUserPrivacy(let parameters),
              .updateMyProfile(let parameters),
              .putPost(let parameters, _):
             return .requestParameters(parameters: parameters, encoding: JSONEncoding.default)

Fitfty/Projects/Core/Sources/Network/FitftyAPI.swift

@@ -22,6 +22,7 @@ public protocol UserManager {
     func updateUserState(_ state: Bool)
     func updateCurrentLocation(_ address: Address)
     func updateGender(_ gender: Gender)
+    func getGender() -> Gender
     func updateGuestState(_ isGuest: Bool)
     func updateCompletedWelcomePage()
     func getCurrentGuestState() -> Bool
@@ -50,7 +51,7 @@ extension DefaultUserManager: UserManager {
     public var isNewUser: Bool {
         localStorage.read(key: .isNewUser) as? Bool ?? true
     }
-    
+   
     public var currentLocation: Address? {
         let address = localStorage.read(key: .currentLocation) as? [String: Any] ?? [:]
         return Address(address)
@@ -85,6 +86,10 @@ extension DefaultUserManager: UserManager {
         _gender = gender
     }
 
+    public func getGender() -> Gender {
+        return _gender ?? .female
+    }
+    
     public func updateGuestState(_ isGuest: Bool) {
         _guestState.send(isGuest)
     }