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.

Sign up for GitHub

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

[GWL-326] 회원가입 완료버튼 활성화 안되는 현상 개선 #327

Merged
merged 2 commits into from
Dec 10, 2023
Merged

[GWL-326] 회원가입 완료버튼 활성화 안되는 현상 개선 #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2074ea9
fix: 회원가입 완료버튼 활성화 안되는 현상 개선
JongPyoAhn Dec 10, 2023
40edbb2
chore: 쓸데없는 코드 정리
JongPyoAhn Dec 10, 2023
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: 2 additions & 0 deletions iOS/Projects/App/WeTri/Sources/Application/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import UIKit

import Keychain

@main
final class AppDelegate: UIResponder, UIApplicationDelegate {
func application(
Expand Down
5 changes: 2 additions & 3 deletions iOS/Projects/App/WeTri/Sources/Application/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
window = UIWindow(windowScene: windowScene)
let navigationController = UINavigationController()
window?.rootViewController = navigationController
let coordinator = SignUpFeatureCoordinator(navigationController: navigationController, newUserInformation: NewUserInformation(mappedUserID: "", provider: .apple), isMockEnvironment: true)
// let coordinator = AppCoordinator(navigationController: navigationController)
// coordinating = coordinator
let coordinator = AppCoordinator(navigationController: navigationController)
coordinating = coordinator
coordinator.start()
window?.makeKeyAndVisible()
}
Expand Down
2 changes: 1 addition & 1 deletion iOS/Projects/App/WeTri/Sources/CommonScene/Coordinator/AppCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class AppCoordinator: AppCoordinating {
}

func start() {
showTabBarFlow()
showSplashFlow()
}

private func showSplashFlow() {
Expand Down
7 changes: 6 additions & 1 deletion ...Features/SignUp/Sources/Presentation/SignUpProfileScene/SignUpProfileViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,13 @@ extension SignUpProfileViewController: UIImagePickerControllerDelegate {
) {
do {
if let url = info[.imageURL] as? URL {
let image = try Data(contentsOf: url).downsampling(size: profileImageButton.profileSize, scale: .x3)
let imageData = try Data(contentsOf: url)
let image = try imageData.downsampling(size: profileImageButton.profileSize, scale: .x3)
profileImageButton.image = image
guard let downsampledData = image.pngData() else {
return
}
imageSetSubject.send(downsampledData)
}

dismiss(animated: true)
Expand Down
5 changes: 3 additions & 2 deletions ...res/SignUp/Sources/Presentation/SignUpProfileScene/ViewModel/SignUpProfileViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,13 @@ extension SignUpProfileViewModel: SignUpProfileViewModelRepresentable {
.eraseToAnyPublisher()

let imageSettingResult = input.imageSetting
.flatMap { Just(SignUpProfileState.image($0)) }
.flatMap {
return Just(SignUpProfileState.image($0))
}
.eraseToAnyPublisher()

input.imageSetting
.sink { data in
Log.make().debug("data크기 : \(data)")
imageData = data
}
.store(in: &subscriptions)
Expand Down