[NL-69] : merge 오류 해결 (#50)

* [NL-69] : profile 수정

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

* [NL-69] : PopUpComponent 생성

* [NL-69] : Popup 적용

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

* [NL-69] : Toas 구현
- Layout 문제 해결

* [NL-69] : 오류 해결

* [NL-69] : Modal 수정

Author: GomHyeok

Common/Base/Sources/Model/UserDTO.swift

@@ -20,9 +20,8 @@ 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)
-  {
+  
+  public init(id: String, name: String, birthDate: String?, birthTime: [String]?, gender: GenderDTO) {
     self.id = id
     self.name = name
     self.birthDate = birthDate

DesignSystem/DesignSystem/Sources/GenderSelectionView.swift

@@ -10,15 +10,15 @@ import Then
 import UIKit
 
 // MARK: - GenderSelectionViewDelegate (성별 선택 그룹에서 선택된 성별을 알리는 프로토콜)
-protocol GenderSelectionViewDelegate: AnyObject {
+public protocol GenderSelectionViewDelegate: AnyObject {
   func genderSelectionView(_ view: GenderSelectionView, didSelectGender gender: String?)
 }
 
 // MARK: - GenderSelectionView (라디오 버튼 그룹)
 public final class GenderSelectionView: UIView {
 
   // 델리게이트를 통해 상위 뷰에 선택된 성별을 알림
-  weak var delegate: GenderSelectionViewDelegate?
+  public weak var delegate: GenderSelectionViewDelegate?
 
   // 라디오 버튼들을 정렬하기 위한 스택 뷰
   private let stackView = UIStackView().then {

DesignSystem/DesignSystem/Sources/PopUp.swift

@@ -105,7 +105,7 @@ public final class PopUp: UIView {
     outButton.snp.makeConstraints { make in
       make.height.equalTo(48)
     }
-
+    
     actionButton.snp.makeConstraints { make in
       make.height.equalTo(48)
     }

DesignSystem/DesignSystem/Sources/Toast.swift

@@ -73,7 +73,6 @@ public final class Toast: UIView {
   }
 
   stackView.addArrangedSubview(toast)
-
   toast.snp.makeConstraints { make in
     make.width.equalTo(327)
     make.height.equalTo(44)

Feature/Setting/Sources/EditPage/EditProfileViewController.swift

@@ -11,6 +11,7 @@ import DIInjector
 import DesignSystem
 import Foundation
 import UIKit
+import DIInjector
 
 public protocol EditProfileViewControllerProtocol {
   func showToast()
@@ -36,17 +37,15 @@ 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: "나가기")
+    $0.update(titile: "수정 중인 내용이 있소", description: "저장하지 않고 화면을 벗어나면\n감쪽같이 사라질 것이오", actionButtonTitle: "계속 수정하기", outButtonTitle: "나가기")
   }
 
   private lazy var nameStack = UIStackView().then {
@@ -198,13 +197,13 @@ extension EditProfileViewController {
   private func setDelegate() {
     self.nameTextField.delegate = self
     self.birthTextField.delegate = self
+    genderSelectionView.delegate = self
   }
 
   private func setupUI() {
     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)
@@ -240,21 +239,7 @@ 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)
-    }
-
-    backgourndView.snp.makeConstraints { make in
-      make.edges.equalToSuperview()
-    }
-
+    
     popup.snp.makeConstraints { make in
       make.center.equalToSuperview()
       make.width.equalTo(327)
@@ -402,6 +387,10 @@ extension EditProfileViewController {
       .receive(on: RunLoop.main)
       .sink { [weak self] isHidden in
         guard let self else { return }
+        self.navigationController?.view.addSubview(backgourndView)
+        backgourndView.snp.makeConstraints { make in
+          make.edges.equalToSuperview()
+        }
         self.popup.isHidden = isHidden
         self.backgourndView.isHidden = isHidden
       }
@@ -410,45 +399,15 @@ extension EditProfileViewController {
     popup.outButton.tapPublisher
       .sink { [weak self] _ in
         guard let self else { return }
-        self.navigationController?.popViewController(animated: true)
-      }
-      .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.backgourndView.removeFromSuperview()
         self.navigationController?.popViewController(animated: true)
       }
       .store(in: &store)
 
     popup.actionButton.tapPublisher
       .sink { [weak self] _ in
         guard let self else { return }
+        self.backgourndView.removeFromSuperview()
         self.popup.isHidden = true
         self.backgourndView.isHidden = true
       }
@@ -527,6 +486,18 @@ extension EditProfileViewController {
   }
 }
 
+extension EditProfileViewController : GenderSelectionViewDelegate {
+  func genderSelectionView(_ view: DesignSystem.GenderSelectionView, didSelectGender gender: String?) {
+    guard let gender = gender else { return }
+
+    var genderType: GenderType
+
+    if gender == "남성" { genderType = .male } else { genderType = .female }
+    viewModel.send(input: .genderSelected(isSelected: genderType))
+  }
+  
+}
+
 extension EditProfileViewController: UITextFieldDelegate {
   public func textFieldDidBeginEditing(_ textField: UITextField) {
     textField.layer.borderColor = STColors.primary2.color.cgColor

Feature/Setting/Sources/EditPage/EditProfileViewModel.swift

@@ -11,6 +11,8 @@ import Combine
 import DIInjector
 import Foundation
 import Lib
+import Auth
+import DIInjector
 
 final class EditProfileViewModel {
   enum Input {
@@ -45,9 +47,10 @@ final class EditProfileViewModel {
   let output: Output = Output()
 
   private var state: State = .init()
-
-  @Injected private var userDataManager: UserDataManager
+  
+  @Injected private var userDataManager : UserDataManager
   @Injected private var router: SettingRouter
+
   private var _isNameValid: Bool = true
   private var _isBirthDateValid: Bool = true
   private var _isBornTimeValied: Bool = true
@@ -80,22 +83,21 @@ final class EditProfileViewModel {
         self.output.setTimePickerLabel.send(time)
         self._isDontKnowButtonSelected = false
       }
-
+      
     case .checkBirthFormat(let birth):
       self._isBirthDateValid = checkBirthFormat(birth: birth)
       if self._isBirthDateValid { self.state.birthDate = birth }
       self.output.showBirthError.send(self._isBirthDateValid)
       self.output.isSaveButtonEnabled.send(_isNameValid && _isBirthDateValid && _isBornTimeValied)
-
+      
     case .checkNameFormat(let name):
       self._isNameValid = checkNameFormat(name: name)
       if self._isNameValid { self.state.name = name }
       self.output.showNameError.send(self._isNameValid)
       self.output.isSaveButtonEnabled.send(_isNameValid && _isBirthDateValid && _isBornTimeValied)
-
+      
     case .genderSelected(let isSelected):
       self.state.gender = isSelected
-
     case .timePickerTap:
       Task { @MainActor in
         self.router.navigate(
@@ -112,14 +114,12 @@ final class EditProfileViewModel {
               self.output.navigate.send(.popWithToast)
               self.router.navigate(to: SettingRoute.myPage, how: .pop, with: [:])
             }
-
           } catch {
             // TODO: API 호출 에러처리
             print(error)
           }
         }
       }
-
     case .backButtonTapped:
       if hasChanges() {
         self.output.updatePopupHiden.send(false)
@@ -201,13 +201,17 @@ extension EditProfileViewModel {
 
   private func hasChanges() -> Bool {
     guard let originalUser = self.state.originalUser else { return false }
+    
 
     if let name = self.state.name, name != originalUser.name {
       return true
     }
 
-    if let gender = self.state.gender, gender.rawValue != originalUser.gender.rawValue {
-      return true
+    if let gender = self.state.gender {
+      let gendervalue = gender == .male ? GenderDTO.male : GenderDTO.female
+      if gendervalue != originalUser.gender {
+        return true
+      }
     }
 
     if let birthDate = self.state.birthDate, birthDate != originalUser.birthDate {

Feature/Setting/Sources/MyPage/Cells/MyPageMenuCollectionViewCell.swift

@@ -10,6 +10,7 @@ import DesignSystem
 import SnapKit
 import Then
 import UIKit
+import Base
 
 struct MyPageMenuCollectionViewCellModel {
 

Feature/Setting/Sources/MyPage/Cells/SendFeedbackCollectionViewCell.swift

@@ -96,7 +96,7 @@ final class SendFeedbackCollectionViewCell: UICollectionViewCell {
       make.leading.equalToSuperview().offset(12)
       make.centerY.equalToSuperview()
     }
-
+    
     arrowRightView.snp.makeConstraints { make in
       make.height.width.equalTo(15)
       make.trailing.equalToSuperview().inset(12)

Feature/Setting/Sources/MyPage/MyPageService.swift

@@ -31,7 +31,6 @@ struct MyPageService {
 
       return "알수 없소"
     }()
-
     let birthDate = userData.birthDate ?? "알수 없소"
     let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
     return [

Feature/Setting/Sources/MyPage/MyPageViewController.swift

@@ -12,6 +12,7 @@ import Extension
 import SnapKit
 import Then
 import UIKit
+import Base
 
 enum MyPageSection {
   case profile(MyProfileInfoCollectionViewCellModel)
@@ -59,7 +60,7 @@ public final class MyPageViewController: BaseViewController {
     setupBinding()
     viewModel.send(input: .viewDidLoad)
   }
-
+  
   public override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
 
@@ -89,7 +90,6 @@ public final class MyPageViewController: BaseViewController {
         let toast = Toast().then {
           $0.update(message: "프로필 수정이 완료됐소.")
         }
-
         guard let tabBar = self.tabBarController?.view else { return }
         tabBar.addSubview(toast)
         toast.snp.makeConstraints { make in
@@ -98,7 +98,6 @@ public final class MyPageViewController: BaseViewController {
           make.trailing.equalToSuperview().offset(-24)
           make.height.equalTo(44)
         }
-
         UIView.animate(
           withDuration: 0.5, delay: 3, options: .curveEaseOut,
           animations: {
@@ -268,7 +267,7 @@ extension MyPageViewController: UICollectionViewDelegateFlowLayout {
       SettingAssembly(),
       NetworkCoreAssembly(),
     ])
-
+    
     return MyPageViewController(viewModel: MyPageViewModel())
   }
 #endif