Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ”€ :: [#269] μ •λ³΄μž…λ ₯ μ§μ ‘μž…λ ₯ μ•ˆλ˜λŠ” 버그 μˆ˜μ • #270

Merged
merged 1 commit into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Projects/App/Sources/Application/NeedleGenerated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ private func registerProviderFactory(_ componentPath: String, _ factory: @escapi

#if !NEEDLE_DYNAMIC

@inline(never) private func register1() {
private func register1() {
registerProviderFactory("^->AppComponent->JwtStoreComponent", factoryb27d5aae1eb7e73575a6f47b58f8f304c97af4d5)
registerProviderFactory("^->AppComponent", factoryEmptyDependencyProvider)
registerProviderFactory("^->AppComponent->KeychainComponent", factoryEmptyDependencyProvider)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,18 @@ final class MyPageIntent: MyPageIntentProtocol {

try await modifyInformationUseCase.execute(req: modifyInformationRequest)
model?.updateIsLoading(isLoading: false)
model?.updateIsCompleteModify(isComplete: true)
} catch {
model?.updateIsError(isError: true)
model?.updateIsLoading(isLoading: false)
}
}
}

func modifyCompleteToastDismissed() {
model?.updateIsCompleteModify(isComplete: false)
}

func imageUpload(imageResult: PickedImageResult) async throws -> String {
try await Task {
try await imageUploadUseCase.execute(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ protocol MyPageIntentProtocol:
func withdrawalDialogDismissed()
func withdrawalDialogIsComplete()
func modifyToInputAllInfo(state: MyPageStateProtocol)
func modifyCompleteToastDismissed()
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ protocol MyPageProfileIntentProtocol {
func techStackAppendDismissed()
func techStackAppendDidComplete(techStacks: [String])
func removeTechStack(techStack: String)
func updateIsSelfEntering(isSelfEntering: Bool)
func majorSheetIsRequired()
func majorSheetDismissed()
func imagePickerIsRequired()
Expand Down Expand Up @@ -63,6 +64,10 @@ extension MyPageIntent: MyPageProfileIntentProtocol {
model?.removeTechStack(techStack: techStack)
}

func updateIsSelfEntering(isSelfEntering: Bool) {
model?.updateIsSelfEntering(isSelfEntering: isSelfEntering)
}

func majorSheetIsRequired() {
model?.updateIsPresentedMajorSheet(isPresented: true)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ final class MyPageModel: ObservableObject, MyPageStateProtocol {
@Published var isPresentedExitBottomSheet: Bool = false
@Published var isPresentedLogoutDialog: Bool = false
@Published var isPresentedWithdrawalDialog: Bool = false
@Published var isCompleteModify: Bool = false

// MARK: Profile
@Published var profileURL: String = ""
Expand Down Expand Up @@ -85,4 +86,8 @@ extension MyPageModel: MyPageActionProtocol {
func updateIsPresentedWithdrawalDialog(isPresented: Bool) {
self.isPresentedWithdrawalDialog = isPresented
}

func updateIsCompleteModify(isComplete: Bool) {
self.isCompleteModify = isComplete
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ protocol MyPageStateProtocol:
var isPresentedExitBottomSheet: Bool { get }
var isPresentedLogoutDialog: Bool { get }
var isPresentedWithdrawalDialog: Bool { get }
var isCompleteModify: Bool { get }
}

protocol MyPageActionProtocol:
Expand All @@ -29,4 +30,5 @@ protocol MyPageActionProtocol:
func updateIsPresentedExitBottomSheet(isPresented: Bool)
func updateIsPresentedLogoutDialog(isPresented: Bool)
func updateIsPresentedWithdrawalDialog(isPresented: Bool)
func updateIsCompleteModify(isComplete: Bool)
}
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ struct MyPageProfileView: View {
) {
focusField = .portfoilo
}
.onChange(of: state.isSelfEntering) { newValue in
isFocuesedMajorTextField = newValue
}
.focused($isFocuesedMajorTextField)
.disabled(!state.isSelfEntering)
.overlay(alignment: .topTrailing) {
SMSIcon(.downChevron)
.padding([.top, .trailing], 12)
Expand Down
11 changes: 11 additions & 0 deletions Projects/Feature/MyPageFeature/Sources/Scene/MyPageView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ struct MyPageView: View {
}
.hideKeyboardWhenTap()
}
.smsToast(
text: "μ •λ³΄μˆ˜μ •μ΄ μ™„λ£Œλ˜μ—ˆμŠ΅λ‹ˆλ‹€.",
isShowing: Binding<Bool>(
get: {
state.isCompleteModify
}, set: { _ in
intent.modifyCompleteToastDismissed()
}
)
)
.edgesIgnoringSafeArea([.bottom])
.smsBottomSheet(
isShowing: Binding(
Expand Down Expand Up @@ -233,6 +243,7 @@ struct MyPageView: View {
$0 ? intent.updateMajor(major: "") : ()
$0 ? intent.activeSelfEntering() : ()
$0 ? intent.majorSheetDismissed() : ()
intent.updateIsSelfEntering(isSelfEntering: $0)
}
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ final class StudentDetailIntent: StudentDetailIntentProtocol {
}
}
}

deinit {
print("DEIIN")
}
}

private extension UserRoleType {
Expand Down