Skip to content

Commit 81d37e3

Browse files
committed
[fix] BaseCategoryImage -> BaseProfile μˆ˜μ •
1 parent 5217173 commit 81d37e3

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

β€ŽProjects/Domain/Sources/NicknameSetting/NicknameSetting.swiftβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public struct NicknameSetting: Equatable {
1414
/// λ‹‰λ„€μž„ 쀑볡 μ—¬λΆ€
1515
public var isDuplicate: Bool
1616
/// μœ μ € 선택 ν”„λ‘œν•„
17-
public var selectedProfile: BaseCategoryImage?
17+
public var selectedProfile: BaseProfile?
1818
/// ν”„λ‘œν•„μ— μ„€μ •ν•  수 μžˆλŠ” 이미지
19-
public var imageList: [BaseCategoryImage]
19+
public var imageList: [BaseProfile]
2020

2121
// - MARK: Request
2222
/// 등둝할 λ‹‰λ„€μž„
@@ -25,7 +25,7 @@ public struct NicknameSetting: Equatable {
2525
public init(
2626
isDuplicate: Bool = false,
2727
nickname: String = "",
28-
selectedProfile: BaseCategoryImage?
28+
selectedProfile: BaseProfile?
2929
) {
3030
self.imageList = []
3131
self.isDuplicate = isDuplicate

β€ŽProjects/Feature/FeatureSetting/Sources/Setting/NickNameSetting/NickNameSettingFeature.swiftβ€Ž

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public struct NickNameSettingFeature {
3434
get { domain.user }
3535
}
3636

37-
var selectedProfile: BaseCategoryImage? {
37+
var selectedProfile: BaseProfile? {
3838
get { domain.selectedProfile }
3939
set { domain.selectedProfile = newValue }
4040
}
4141

42-
var profileImages: [BaseCategoryImage] {
42+
var profileImages: [BaseProfile] {
4343
get { domain.imageList }
4444
}
4545

@@ -51,9 +51,9 @@ public struct NickNameSettingFeature {
5151
if let user,
5252
let profile = user.profile {
5353
self.domain = .init(
54-
selectedProfile: BaseCategoryImage(
55-
imageId: profile.id,
56-
imageURL: profile.url
54+
selectedProfile: BaseProfile(
55+
id: profile.id,
56+
imageURL: profile.imageURL
5757
)
5858
)
5959
} else {
@@ -85,7 +85,7 @@ public struct NickNameSettingFeature {
8585
case λ‹‰λ„€μž„_ν…μŠ€νŠΈ_λ³€κ²½λ˜μ—ˆμ„λ•Œ
8686
case λ‹‰λ„€μž„_쀑볡_확인_API_반영(Bool)
8787
case λ‹‰λ„€μž„_쑰회_API_반영(BaseUser)
88-
case ν”„λ‘œν•„_λͺ©λ‘_쑰회_API_반영(images: [BaseCategoryImage])
88+
case ν”„λ‘œν•„_λͺ©λ‘_쑰회_API_반영(images: [BaseProfile])
8989
}
9090

9191
public enum AsyncAction: Equatable {
@@ -95,7 +95,7 @@ public struct NickNameSettingFeature {
9595
}
9696

9797
public enum ScopeAction {
98-
case profile(PokitProfileBottomSheet<BaseCategoryImage>.Delegate)
98+
case profile(PokitProfileBottomSheet<BaseProfile>.Delegate)
9999
}
100100

101101
public enum DelegateAction: Equatable { case μ—†μŒ }
@@ -177,6 +177,7 @@ private extension NickNameSettingFeature {
177177

178178
case .λ‹‰λ„€μž„μ§€μš°κΈ°_λ²„νŠΌ_λˆŒλ €μ„λ•Œ:
179179
state.domain.nickname = ""
180+
state.buttonState = .disable
180181
return .none
181182

182183
case .ν”„λ‘œν•„_μ„€μ •_λ²„νŠΌ_λˆŒλ €μ„λ•Œ:
@@ -224,7 +225,7 @@ private extension NickNameSettingFeature {
224225
state.domain.user = user
225226
state.domain.nickname = user.nickname
226227
if let profile = user.profile {
227-
state.selectedProfile = BaseCategoryImage(imageId: profile.id, imageURL: profile.url)
228+
state.selectedProfile = BaseProfile(id: profile.id, imageURL: profile.imageURL)
228229
} else {
229230
state.selectedProfile = nil
230231
}
@@ -266,7 +267,8 @@ private extension NickNameSettingFeature {
266267
case .profile(.이미지_μ„ νƒν–ˆμ„λ•Œ(let imageInfo)):
267268
state.isProfileSheetPresented = false
268269
state.selectedProfile = imageInfo
269-
return .none
270+
271+
return .send(.inner(.λ‹‰λ„€μž„_ν…μŠ€νŠΈ_λ³€κ²½λ˜μ—ˆμ„λ•Œ))
270272
}
271273
}
272274

β€ŽProjects/Feature/FeatureSetting/Sources/Setting/PokitSettingView.swiftβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private extension PokitSettingView {
7070
@ViewBuilder
7171
var profileSection: some View {
7272
HStack(spacing: 12) {
73-
LazyImage(url: URL(string: store.user?.profile?.url ?? "")) { state in
73+
LazyImage(url: URL(string: store.user?.profile?.imageURL ?? "")) { state in
7474
Group {
7575
if let image = state.image {
7676
image

0 commit comments

Comments
Β (0)