[NL-69] : 프로필 수정 API 연결 (#45)

* [NL-69] : profile 수정

* [NL-69] : 정보 수정 API 연결

* [NL-69] : PopUpComponent 생성

* [NL-69] : Popup 적용

* [NL-69] : 파일 이름 수정

Author: GomHyeok

App/Sources/AppDependencyHandler.swift

@@ -27,6 +27,7 @@ struct AppDependencyHandler: DependencyRegistrable {
     // TODO: 이미 TabBarController 가 있는 경우에 대한 예외 처리
     let tabBarController = BaseTabBarController()
     tabBarController.viewControllers = [
+
       BaseNavigationController(rootViewController: HomeViewController(viewModel: HomeViewModel())),
       BaseNavigationController(
         rootViewController: FortuneViewController(viewModel: FortuneViewModel())),

Common/Auth/Sources/UserDataManager.swift

@@ -20,6 +20,7 @@ public final class UserDataManager {
 
   @discardableResult
   public func fetch() async throws -> UserDTO {
+
     let target = AuthTarget.GetUser(userID: userID)
     do {
       let user = try await networkProvider.request(target: target)

Common/Base/Sources/Model/UserDTO.swift

@@ -20,6 +20,14 @@ public struct UserDTO: Decodable {
   public let birthDate: String?
   public let birthTime: [String]?
   public let gender: GenderDTO
+  
+  public init(id: String, name: String, birthDate: String?, birthTime: [String]?, gender: GenderDTO) {
+    self.id = id
+    self.name = name
+    self.birthDate = birthDate
+    self.birthTime = birthTime
+    self.gender = gender
+  }
 
   // TODO: 사주 정보?
 }

Common/Lib/Sources/Router/SettingRoute.swift

@@ -10,4 +10,6 @@ public enum SettingRoute {
   case pushSetting
   case editProfile
   case timePicker
+  case back
+  case pop
 }

DesignSystem/DesignSystem/Sources/GenderSelectionView.swift

@@ -86,9 +86,9 @@ public final class GenderSelectionView: UIView {
   }
 
   public func setInitialSelection(gender: String) {
-    if gender == "남성", let index = radioButtons.firstIndex(where: { $0.title == "남성" }) {
+    if gender == "M", let index = radioButtons.firstIndex(where: { $0.title == "남성" }) {
       selectRadioButton(at: index)
-    } else if gender == "여성", let index = radioButtons.firstIndex(where: { $0.title == "여성" }) {
+    } else if gender == "F", let index = radioButtons.firstIndex(where: { $0.title == "여성" }) {
       selectRadioButton(at: index)
     }
   }

DesignSystem/DesignSystem/Sources/PopUp.swift

@@ -0,0 +1,162 @@
+//
+//  PopUp.swift
+//  DesignSystemLayer
+//
+//  Created by 최재혁 on 8/18/25.
+//
+
+import SnapKit
+import Then
+import UIKit
+
+public final class PopUp : UIView {
+  
+  public enum Style : CaseIterable {
+    case one
+    case two
+    
+    fileprivate var isHidden: Bool {
+      switch self {
+      case .one:
+        return true
+      case .two:
+        return false
+      }
+    }
+  }
+  private lazy var contentStackView = UIStackView().then {
+    $0.axis = .vertical
+    $0.alignment = .center
+  }
+  
+  private(set) lazy var deleteButton = UIButton().then {
+    $0.setImage(STImages.xMark.image, for: .normal)
+  }
+  
+  private lazy var titleLabel = UILabel().then {
+    $0.style = Typography.Heading_20_B
+    $0.textColor = STColors.gray1.color
+    $0.textAlignment = .center
+  }
+  
+  private lazy var descriptionLabel = UILabel().then {
+    $0.style = Typography.Body_16_M
+    $0.textColor = STColors.gray4.color
+    $0.textAlignment = .center
+    $0.numberOfLines = 2
+  }
+  
+  private lazy var buttonStackView = UIStackView().then {
+    $0.axis = .horizontal
+    $0.spacing = 8
+    $0.alignment = .center
+    $0.distribution = .fillEqually
+  }
+  
+  public private(set) lazy var outButton = UIButton().then {
+    $0.backgroundColor = STColors.gray7.color
+    $0.layer.cornerRadius = 8
+  }
+  
+  public private(set) lazy var actionButton = UIButton().then {
+    $0.backgroundColor = STColors.primary2.color
+    $0.layer.cornerRadius = 8
+  }
+  
+  public init(style : Style? = nil) {
+    super.init(frame: .zero)
+    setupUI()
+  }
+  
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+  
+  private func setupUI() {
+    layer.cornerRadius = 12
+    layer.masksToBounds = true
+    backgroundColor = STColors.white.color
+    
+    addSubview(contentStackView)
+    addSubview(deleteButton)
+    contentStackView.addArrangedSubview(titleLabel)
+    contentStackView.addArrangedSubview(descriptionLabel)
+    contentStackView.addArrangedSubview(buttonStackView)
+    buttonStackView.addArrangedSubview(outButton)
+    buttonStackView.addArrangedSubview(actionButton)
+    
+    contentStackView.snp.makeConstraints { make in
+      make.edges.equalToSuperview().inset(24)
+    }
+    
+    contentStackView.setCustomSpacing(8, after: titleLabel)
+    contentStackView.setCustomSpacing(24, after: descriptionLabel)
+    
+    deleteButton.snp.makeConstraints { make in
+      make.top.equalToSuperview().inset(24)
+      make.trailing.equalToSuperview().inset(24)
+      make.width.height.equalTo(16)
+    }
+    
+    buttonStackView.snp.makeConstraints { make in
+      make.leading.trailing.equalToSuperview()
+    }
+    
+    outButton.snp.makeConstraints { make in
+      make.height.equalTo(48)
+    }
+    
+    actionButton.snp.makeConstraints { make in
+      make.height.equalTo(48)
+    }
+  }
+  
+  public func update(titile : String, description: String? = nil, actionButtonTitle: String, outButtonTitle: String = "취소") {
+    titleLabel.styledText = titile
+    descriptionLabel.styledText = description
+    let style = Typography.Body_16_B
+    style.color = STColors.white.color
+    actionButton.setAttributedTitle(actionButtonTitle.set(style: style), for: .normal)
+    style.color = STColors.gray1.color
+    outButton.setAttributedTitle(outButtonTitle.set(style: style), for: .normal)
+  }
+  
+  public func update(style : Style) {
+    outButton.isHidden = style.isHidden
+  }
+}
+
+@available(iOS 17.0, *)
+#Preview {
+  let stackView = UIStackView().then {
+    $0.axis = .vertical
+    $0.spacing = 16
+    $0.alignment = .center
+    $0.backgroundColor = .systemBackground
+  }
+  
+  let popup = PopUp().then {
+    $0.update(titile: "제목", description: "설명 텍스트입니다.", actionButtonTitle: "확인")
+    $0.update(style: .one)
+  }
+  
+  let popupTwo = PopUp().then {
+    $0.update(titile: "제목", description: "설명 \n텍스트입니다.", actionButtonTitle: "확인", outButtonTitle: "취소")
+    $0.update(style: .two)
+  }
+  
+  stackView.addArrangedSubview(popup)
+  stackView.addArrangedSubview(popupTwo)
+  
+  popup.snp.makeConstraints { make in
+    make.width.equalTo(300)
+    make.height.equalTo(200)
+  }
+  
+  popupTwo.snp.makeConstraints { make in
+    make.width.equalTo(300)
+    make.height.equalTo(200)
+  }
+  
+  return stackView
+}

Feature/Onboarding/Sources/Onboarding/OnboardingViewModel.swift

@@ -82,7 +82,6 @@ public class OnboardingViewModel {
           do {
             let test = try await self.userDataManager.create(
               name: name, birthDate: birthDate, birthTime: birthTime, gender: genderDTO)
-            print(test)
           } catch {
             // TODO: API 호출 에러처리
             print(error)

Feature/Setting/Sources/EditPage/EditProfileViewController.swift

@@ -10,12 +10,13 @@ import Combine
 import DesignSystem
 import Foundation
 import UIKit
+import DIInjector
 
 final class EditProfileViewController: BaseViewController {
 
   private var store: Set<AnyCancellable> = []
-  private let router: SettingRouter
   private let viewModel: EditProfileViewModel
+  @Injected private var router : SettingRouter
 
   private lazy var scrollView: UIScrollView = UIScrollView().then {
     $0.showsHorizontalScrollIndicator = false
@@ -30,6 +31,16 @@ final class EditProfileViewController: BaseViewController {
     $0.spacing = 28
     $0.alignment = .leading
   }
+  
+  private lazy var backgourndView = UIView().then {
+    $0.isHidden = true
+    $0.backgroundColor = STColors.black.color.withAlphaComponent(0.5)
+  }
+  
+  private lazy var popup = PopUp().then {
+    $0.isHidden = true
+    $0.update(titile: "수정 중인 내용이 있소", description: "저장하지 않고 화면을 벗어나면\n감쪽같이 사라질 것이오", actionButtonTitle: "계속 수정하기", outButtonTitle: "나가기")
+  }
 
   private lazy var nameStack = UIStackView().then {
     $0.axis = .vertical
@@ -134,14 +145,14 @@ final class EditProfileViewController: BaseViewController {
   }
 
   private lazy var saveButton: UIButton = UIButton().then {
-    $0.setTitle("저장", for: .normal)
-    $0.setTitleColor(STColors.white.color, for: .normal)
+    let style = Typography.Body_18_B
+    style.color = STColors.white.color
+    $0.setAttributedTitle("저장하기".set(style: style), for: .normal)
     $0.backgroundColor = STColors.primary2.color
     $0.layer.cornerRadius = 8
   }
 
-  init(router: SettingRouter, viewModel: EditProfileViewModel = EditProfileViewModel()) {
-    self.router = router
+  init(viewModel: EditProfileViewModel = EditProfileViewModel()) {
     self.viewModel = viewModel
     super.init(nibName: nil, bundle: nil)
   }
@@ -165,6 +176,11 @@ extension EditProfileViewController {
     title = "프로필 수정"
     navigationBar.backgroundColor = STColors.white.color
     let backButtonItem = NaivgationBarButtonItem.back
+    backButtonItem.tapPublisher
+      .sink { [weak self] in
+        self?.viewModel.send(input: .backButtonTapped)
+      }
+      .store(in: &store)
     setNavigationBarLeftButtonItems(items: [backButtonItem])
   }
 }
@@ -181,6 +197,8 @@ extension EditProfileViewController {
     self.view.backgroundColor = STColors.white.color
     self.view.addSubview(scrollView)
     self.view.addSubview(saveButton)
+    self.view.addSubview(backgourndView)
+    backgourndView.addSubview(popup)
     scrollView.addSubview(contentView)
     contentView.addSubview(contentStackView)
 
@@ -215,6 +233,16 @@ extension EditProfileViewController {
       make.top.bottom.equalToSuperview()
       make.leading.trailing.equalToSuperview().inset(24)
     }
+    
+    backgourndView.snp.makeConstraints { make in
+      make.edges.equalToSuperview()
+    }
+    
+    popup.snp.makeConstraints { make in
+      make.center.equalToSuperview()
+      make.width.equalTo(327)
+      make.height.equalTo(206)
+    }
 
     nameStack.snp.makeConstraints {
       $0.leading.trailing.equalToSuperview()
@@ -266,10 +294,11 @@ extension EditProfileViewController {
         self.nameTextField.text = user.name
         self.genderSelectionView.setInitialSelection(gender: user.gender.rawValue)
         self.birthTextField.text = user.birthDate
-        if let bornTime = user.bornTime {
-          self.bornTimeSetButton.selectedItem = bornTime
+        if let bornTime = user.birthTime {
+          self.bornTimeSetButton.selectedItem = "\(bornTime[0]) ~ \(bornTime[1])"
         } else {
           self.dontKnowButton.isSelected = true
+          self.bornTimeSetButton.isEnabled = false
         }
       }
       .store(in: &store)
@@ -332,7 +361,47 @@ extension EditProfileViewController {
         self.birthStack.layoutIfNeeded()
       }
       .store(in: &store)
+  
+    viewModel.output.setTimePickerLabel
+      .receive(on: RunLoop.main)
+      .sink { [weak self] time in
+        guard let self else { return }
+        self.bornTimeSetButton.selectedItem = time
+      }
+      .store(in: &store)
+    
+    viewModel.output.navigate
+      .receive(on: RunLoop.main)
+      .sink { [weak self ] route in
+        guard let self else { return }
+        if route == .pop { self.navigationController?.popViewController(animated: true)}
+      }
+      .store(in: &store)
+    
+    viewModel.output.updatePopupHiden
+      .receive(on: RunLoop.main)
+      .sink { [weak self] isHidden in
+        guard let self else { return }
+        self.popup.isHidden = isHidden
+        self.backgourndView.isHidden = isHidden
+      }
+      .store(in: &store)
+    
+    popup.outButton.tapPublisher
+      .sink { [weak self] _ in
+        guard let self else { return }
+        self.navigationController?.popViewController(animated: true)
+      }
+      .store(in: &store)
 
+    popup.actionButton.tapPublisher
+      .sink { [weak self] _ in
+        guard let self else { return }
+        self.popup.isHidden = true
+        self.backgourndView.isHidden = true
+      }
+      .store(in: &store)
+    
     saveButton.tapPublisher
       .sink { [weak self] _ in
         guard let self else { return }
@@ -350,7 +419,7 @@ extension EditProfileViewController {
     dontKnowButton.gesturePublisher(gestureRecognizer: UITapGestureRecognizer())
       .sink { [weak self] _ in
         guard let self else { return }
-        self.viewModel.send(input: .bornTimeSelected(bornTime: .dontKnow(isSelected: true)))
+        self.viewModel.send(input: .bornTimeSelected(bornTime: .dontKnow(isSelected: self.dontKnowButton.isSelected)))
         bornTimeSetButton.isEnabled.toggle()
         self.dontKnowButton.isSelected.toggle()
       }
@@ -463,6 +532,7 @@ extension EditProfileViewController: UITextFieldDelegate {
   }
 
   public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+    textField.resignFirstResponder()
     if textField === nameTextField {
       guard let name = textField.text, !name.isEmpty else {
         return false
@@ -472,8 +542,3 @@ extension EditProfileViewController: UITextFieldDelegate {
     return true
   }
 }
-
-@available(iOS 17.0, *)
-#Preview {
-  return EditProfileViewController(router: SettingRouter())
-}