Skip to content

Commit 651c40c

Browse files
dudtjs1021ejdudtjs1021ej
committed
Merge branch 'develop' of https://github.com/YAPP-Github/21st-iOS-Team-2-iOS into feature/report-block
2 parents 23f4d36 + e34bc9d commit 651c40c

File tree

30 files changed

+240
-98
lines changed

30 files changed

+240
-98
lines changed

β€ŽFitfty/Projects/App/Support/Info.plistβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
1616
<string>$(PRODUCT_NAME)</string>
17+
<key>CFBundleDisplayName</key>
18+
<string>핏프티</string>
1719
<key>CFBundlePackageType</key>
1820
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1921
<key>CFBundleShortVersionString</key>

β€ŽFitfty/Projects/Coordinator/Sources/Profile/ProfileCoordinator.swiftβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private extension ProfileCoordinator {
100100
style: .custom(196),
101101
contentViewController: coordinator.navigationController
102102
)
103-
bottomSheetDelegate = bottomSheetViewController
103+
coordinator.bottomSheetDelegate = bottomSheetViewController
104104
return bottomSheetViewController
105105
}
106106

@@ -122,7 +122,7 @@ extension ProfileCoordinator: ProfileCoordinatorInterface {
122122
func showMyFitfty(_ myFitftyType: MyFitftyType) {
123123
let coordinator = makeMyFitftyCoordinator(myFitftyType)
124124
coordinator.start()
125-
coordinator.navigationController.modalPresentationStyle = .overFullScreen
125+
coordinator.navigationController.modalPresentationStyle = .fullScreen
126126
navigationController.present(coordinator.navigationController, animated: true)
127127
}
128128

β€ŽFitfty/Projects/Coordinator/Sources/Profile/ReportCoordinator.swiftβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private extension ReportCoordinator {
7676
coordinator.finishDelegate = self
7777
coordinator.parentCoordinator = self
7878
let bottomSheetViewController = BottomSheetViewController(
79-
style: .custom(480),
79+
style: .custom(511),
8080
contentViewController: coordinator.navigationController
8181
)
8282
coordinator.bottomSheetDelegate = bottomSheetViewController

β€ŽFitfty/Projects/Core/Sources/Error/MyFitftyError.swiftβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//
2+
// MyFitftyError.swift
3+
// Core
4+
//
5+
// Created by μž„μ˜μ„  on 2023/02/23.
6+
// Copyright Β© 2023 Fitfty. All rights reserved.
7+
//
8+
9+
import Foundation
10+
11+
public enum MyFitftyError: Error {
12+
case noWeather
13+
case failUpload
14+
case failModify
15+
case failGetPost
16+
case others(String)
17+
}
18+
19+
extension MyFitftyError: LocalizedError {
20+
public var errorDescription: String? {
21+
switch self {
22+
case .noWeather:
23+
return NSLocalizedString("날씨λ₯Ό λΆˆλŸ¬μ˜€λŠ”λ° μ‹€νŒ¨ν–ˆμ–΄μš”.\nν•΄μ™Έ 사진은 날씨 μ‘°νšŒκ°€ λΆˆκ°€λŠ₯ν•΄μš”.", comment: "noWeather")
24+
case .failUpload:
25+
return NSLocalizedString("핏프티 등둝에 μ‹€νŒ¨ν–ˆμ–΄μš”. μž μ‹œ ν›„ λ‹€μ‹œ μ‹œλ„ν•΄ μ£Όμ„Έμš”.", comment: "failUpload")
26+
case .failModify:
27+
return NSLocalizedString("핏프티 μˆ˜μ •μ— μ‹€νŒ¨ν–ˆμ–΄μš”. μž μ‹œ ν›„ λ‹€μ‹œ μ‹œλ„ν•΄ μ£Όμ„Έμš”.", comment: "failModify")
28+
case .failGetPost:
29+
return NSLocalizedString("핏프티 정보λ₯Ό κ°€μ Έμ˜€λŠ”λ° μ‹€νŒ¨ν–ˆμ–΄μš”. μž μ‹œ ν›„ λ‹€μ‹œ μ‹œλ„ν•΄ μ£Όμ„Έμš”.", comment: "failGetPost")
30+
case .others(let message):
31+
return NSLocalizedString(message, comment: "Others Message")
32+
}
33+
}
34+
}

β€ŽFitfty/Projects/Core/Sources/Error/SettingError.swiftβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extension SettingError: LocalizedError {
2929
case .noAvailableBirthday:
3030
return NSLocalizedString("μ˜¬λ°”λ₯Έ 생년월일을 κΈ°μž…ν•΄μ£Όμ„Έμš”", comment: "Wrong Birthday")
3131
case .noAvailableNickname:
32-
return NSLocalizedString("6자 μ΄μƒμ˜ 영문과 μˆ«μžμ‘°ν•©μœΌλ‘œ 이루어진 λ‹‰λ„€μž„μ„ κΈ°μž…ν•΄μ£Όμ„Έμš”", comment: "Wrond Nickname")
32+
return NSLocalizedString("1자 μ΄μƒμ˜ 영문과 μˆ«μžμ‘°ν•©μœΌλ‘œ 이루어진 λ‹‰λ„€μž„μ„ κΈ°μž…ν•΄μ£Όμ„Έμš”", comment: "Wrond Nickname")
3333
case .overlappedNickname:
3434
return NSLocalizedString("μ€‘λ³΅λœ λ‹‰λ„€μž„μ΄μ—μš”", comment: "Overlapped Nickname")
3535
case .failWithdrawAccount:

β€ŽFitfty/Projects/Core/Sources/LocalStorage.swiftβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public enum LocalKey: String {
1717
case userIdentifier
1818
case userAccount
1919
case hasCompletedWelcomePage
20+
case isGuest
2021
}
2122

2223
public protocol LocalStorageService: AnyObject {

β€ŽFitfty/Projects/Core/Sources/Network/FitftyAPI.swiftβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ extension FitftyAPI: TargetType, AccessTokenAuthorizable {
136136
.setUserDetails(let parameters),
137137
.postMyFitfty(let parameters),
138138
.codyList(let parameters),
139+
.updateUserPrivacy(let parameters),
139140
.updateMyProfile(let parameters),
140141
.putPost(let parameters, _):
141142
return .requestParameters(parameters: parameters, encoding: JSONEncoding.default)

β€ŽFitfty/Projects/Core/Sources/Utilities/UserManager.swiftβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public protocol UserManager {
2222
func updateUserState(_ state: Bool)
2323
func updateCurrentLocation(_ address: Address)
2424
func updateGender(_ gender: Gender)
25+
func getGender() -> Gender
2526
func updateGuestState(_ isGuest: Bool)
2627
func updateCompletedWelcomePage()
2728
func getCurrentGuestState() -> Bool
@@ -50,7 +51,7 @@ extension DefaultUserManager: UserManager {
5051
public var isNewUser: Bool {
5152
localStorage.read(key: .isNewUser) as? Bool ?? true
5253
}
53-
54+
5455
public var currentLocation: Address? {
5556
let address = localStorage.read(key: .currentLocation) as? [String: Any] ?? [:]
5657
return Address(address)
@@ -82,6 +83,10 @@ extension DefaultUserManager: UserManager {
8283
_gender = gender
8384
}
8485

86+
public func getGender() -> Gender {
87+
return _gender ?? .female
88+
}
89+
8590
public func updateGuestState(_ isGuest: Bool) {
8691
_guestState.send(isGuest)
8792
}

β€ŽFitfty/Projects/MainFeed/Sources/MyFitfty/ViewControllers/MyFitftyViewController.swiftβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ private extension MyFitftyViewController {
182182
button.tintColor = .black
183183
button.setPreferredSymbolConfiguration(.init(scale: .medium), forImageIn: .normal)
184184
button.addTarget(self, action: #selector(didTapCancelButton), for: .touchUpInside)
185+
button.contentEdgeInsets = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10)
186+
button.imageEdgeInsets = UIEdgeInsets(top: 0, left: -20, bottom: 0, right: 0)
185187
return button
186188
}()
187189
navigationItem.leftBarButtonItem = UIBarButtonItem(customView: leftButton)
@@ -419,7 +421,7 @@ extension MyFitftyViewController {
419421
private func contentSectionLayout() -> NSCollectionLayoutSection? {
420422
let layoutSize = NSCollectionLayoutSize(
421423
widthDimension: .fractionalWidth(1),
422-
heightDimension: .absolute(UIScreen.main.bounds.width*0.936+55+64)
424+
heightDimension: .absolute(UIScreen.main.bounds.width*0.936+13+40+64)
423425
)
424426
let group = NSCollectionLayoutGroup.horizontal(
425427
layoutSize: .init(

β€ŽFitfty/Projects/MainFeed/Sources/MyFitfty/ViewModel/MyFitfty/MyFitftyViewModel.swiftβ€Ž

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public final class MyFitftyViewModel {
5353
]
5454

5555
private var genderTagItems: [(gender: String, isSelected: Bool)] = [
56-
("μ—¬μ„±", true),
56+
("μ—¬μ„±", false),
5757
("남성", false)
5858
]
5959

@@ -224,6 +224,7 @@ extension MyFitftyViewModel: MyFitftyViewModelInput {
224224
func viewDidLoad() {
225225
switch myFitftyType {
226226
case .uploadMyFitfty:
227+
changeTag(.genderTag, selectedIndex: userManager.gender == .female ? 0 : 1)
227228
currentState.send(.sections([
228229
MyFitftySection(sectionKind: .content, items: [MyFitftyCellModel.content(UUID())]),
229230
MyFitftySection(sectionKind: .weatherTag, items: getWeatherTagCellModels()),
@@ -293,12 +294,12 @@ extension MyFitftyViewModel: MyFitftyViewModelInput {
293294
currentState.send(.isLoading(false))
294295
} else {
295296
currentState.send(.isLoading(false))
296-
currentState.send(.errorMessage("ν”„λ‘œν•„ μ‘°νšŒμ— μ•Œ 수 μ—†λŠ” μ—λŸ¬κ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€."))
297+
currentState.send(.errorMessage(MyFitftyError.failGetPost.localizedDescription))
297298
}
298299
} catch {
299-
Logger.debug(error: error, message: "μž‘μ„±ν–ˆλ˜ κ²Œμ‹œκΈ€ 쑰회 μ‹€νŒ¨")
300+
Logger.debug(error: error, message: MyFitftyError.failGetPost.localizedDescription)
300301
currentState.send(.isLoading(false))
301-
currentState.send(.errorMessage("μž‘μ„±ν–ˆλ˜ κ²Œμ‹œκΈ€ μ‘°νšŒμ— μ•Œ 수 μ—†λŠ” μ—λŸ¬κ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€."))
302+
currentState.send(.errorMessage(MyFitftyError.failGetPost.localizedDescription))
302303
}
303304
}
304305
}
@@ -430,7 +431,7 @@ private extension MyFitftyViewModel {
430431
], true))
431432
} catch {
432433
Logger.debug(error: error, message: "사진 날씨정보 κ°€μ Έμ˜€κΈ° μ‹€νŒ¨")
433-
self.currentState.send(.errorMessage("μ‚¬μ§„μ˜ 날씨 정보λ₯Ό κ°€μ Έμ˜€λŠ”λ° μ•Œ 수 μ—†λŠ” μ—λŸ¬κ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€."))
434+
self.currentState.send(.errorMessage(MyFitftyError.noWeather.localizedDescription))
434435
}
435436
}
436437
}
@@ -471,7 +472,7 @@ private extension MyFitftyViewModel {
471472
self.currentState.send(.completed(true))
472473
} else {
473474
self.currentState.send(.completed(false))
474-
self.currentState.send(.errorMessage("핏프티 등둝에 μ•Œ 수 μ—†λŠ” μ—λŸ¬κ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€."))
475+
self.currentState.send(.errorMessage(MyFitftyError.failUpload.localizedDescription))
475476
}
476477

477478
case .modifyMyFitfty:
@@ -488,25 +489,23 @@ private extension MyFitftyViewModel {
488489
photoTakenTime: self.photoTakenTime,
489490
tagGroup: tagGroup
490491
)
491-
print(request)
492492
let response = try await putPost(request: request, boardToken: boardToken)
493493
if response.result == "SUCCESS" {
494494
self.currentState.send(.completed(true))
495495
} else {
496-
print(response)
497496
self.currentState.send(.completed(false))
498-
self.currentState.send(.errorMessage("핏프티 μˆ˜μ •μ— μ•Œ 수 μ—†λŠ” μ—λŸ¬κ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€."))
497+
self.currentState.send(.errorMessage(MyFitftyError.failModify.localizedDescription))
499498
}
500499
}
501500
} else {
502501
self.currentState.send(.completed(false))
503-
self.currentState.send(.errorMessage("핏프티 등둝에 μ•Œ 수 μ—†λŠ” μ—λŸ¬κ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€."))
502+
self.currentState.send(.errorMessage(MyFitftyError.failModify.localizedDescription))
504503
}
505504
self.currentState.send(.isLoading(false))
506505
} catch {
507-
Logger.debug(error: error, message: "핏프티 등둝 μ‹€νŒ¨")
506+
Logger.debug(error: error, message: MyFitftyError.failUpload.localizedDescription)
508507
self.currentState.send(.isLoading(false))
509-
self.currentState.send(.errorMessage("핏프티 등둝에 μ•Œ 수 μ—†λŠ” μ—λŸ¬κ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€."))
508+
self.currentState.send(.errorMessage(MyFitftyError.failUpload.localizedDescription))
510509
}
511510
}
512511
}

0 commit comments

Comments
Β (0)