[NL-69] : Toast 구현 (#46)

* [NL-69] : profile 수정

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

* [NL-69] : PopUpComponent 생성

* [NL-69] : Popup 적용

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

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

Author: GomHyeok

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
+  }
 
   public init(id: String, name: String, birthDate: String?, birthTime: [String]?, gender: GenderDTO)
   {

Common/Lib/Sources/Router/AppRouter.swift

@@ -63,6 +63,12 @@ extension Routable {
       } else {
         topViewController()?.dismiss(animated: true, completion: nil)
       }
+    case .pop :
+      if let navigationController = topViewController()?.navigationController {
+        navigationController.popViewController(animated: true)
+      } else {
+        topViewController()?.dismiss(animated: true, completion: nil)
+      }
     }
   }
 }

Common/Lib/Sources/Router/Concreate/NavigateType.swift

@@ -14,4 +14,5 @@ public enum NavigateType {
   case overCurrentContext  // modalPresentationStyle = .overCurrentContext
   case custom  // custom 전환 (transitioningDelegate 필요)
   case clear  //해당 router 관련 view 전부 지움
+  case pop
 }

Common/Lib/Sources/Router/SettingRoute.swift

@@ -12,4 +12,5 @@ public enum SettingRoute {
   case timePicker
   case back
   case pop
+  case popWithToast
 }

DesignSystem/DesignSystem/Resources/Images.xcassets/AlertComponent.imageset/AlertComponent.svg

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "AlertComponent.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DesignSystem/DesignSystem/Resources/Images.xcassets/AlertComponent.imageset/Contents.json

@@ -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/PopUp.swift

@@ -0,0 +1,84 @@
+//
+//  Toast.swift
+//  DesignSystemLayer
+//
+//  Created by 최재혁 on 8/18/25.
+//
+
+import UIKit
+
+import SnapKit
+import Then
+
+public final class Toast : UIView {
+  private lazy var contentStack = UIStackView().then {
+    $0.axis = .horizontal
+    $0.alignment = .leading
+    $0.distribution = .fill
+    $0.spacing = 8
+    $0.backgroundColor = STColors.gray2.color
+    $0.layer.cornerRadius = 10
+    $0.layoutMargins = UIEdgeInsets(top: 12, left: 16, bottom: 12, right: 16)
+    $0.isLayoutMarginsRelativeArrangement = true
+  }
+  
+  private lazy var checkImageView = UIImageView().then {
+    $0.image = STImages.alertComponent.image
+    $0.contentMode = .scaleAspectFit
+  }
+  
+  private lazy var messageLabel = UILabel().then {
+    $0.textColor = STColors.white.color
+    $0.style = Typography.Body_14_M
+    $0.textAlignment = .left
+  }
+  
+  public init() {
+    super.init(frame: .zero)
+    setupUI()
+  }
+  
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+  
+  private func setupUI() {
+    addSubview(contentStack)
+    contentStack.addArrangedSubview(checkImageView)
+    contentStack.addArrangedSubview(messageLabel)
+    
+    contentStack.snp.makeConstraints { make in
+      make.edges.equalToSuperview()
+    }
+    
+    checkImageView.snp.makeConstraints { make in
+      make.width.height.equalTo(16)
+    }
+  }
+  
+  public func update(message : String) {
+    self.messageLabel.styledText = message
+  }
+}
+
+@available(iOS 17.0, *)
+#Preview {
+  let stackView = UIStackView().then {
+    $0.axis = .vertical
+    $0.spacing = 16
+    $0.alignment = .center
+  }
+  
+  let toast = Toast().then {
+    $0.update(message: "정보 수정 성공했습니다.")
+  }
+  
+  stackView.addArrangedSubview(toast)
+  
+  toast.snp.makeConstraints { make in
+    make.width.equalTo(327)
+    make.height.equalTo(44)
+  }
+  
+  return stackView
+}

DesignSystem/DesignSystem/Sources/Toast.swift

@@ -11,12 +11,18 @@ import DIInjector
 import DesignSystem
 import Foundation
 import UIKit
+import DIInjector
+
+public protocol EditProfileViewControllerProtocol {
+  func showToast()
+}
 
 final class EditProfileViewController: BaseViewController {
 
   private var store: Set<AnyCancellable> = []
   private let viewModel: EditProfileViewModel
-  @Injected private var router: SettingRouter
+
+  var delegate : EditProfileViewControllerProtocol?
 
   private lazy var scrollView: UIScrollView = UIScrollView().then {
     $0.showsHorizontalScrollIndicator = false
@@ -31,6 +37,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 backgourndView = UIView().then {
     $0.isHidden = true
@@ -235,6 +251,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)
+    }
 
     backgourndView.snp.makeConstraints { make in
       make.edges.equalToSuperview()
@@ -363,6 +389,41 @@ 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 }
+        guard let delegate else { return }
+        if route == .popWithToast {
+          delegate.showToast()
+        }
+      }
+      .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)
 
     viewModel.output.setTimePickerLabel
       .receive(on: RunLoop.main)
@@ -421,6 +482,7 @@ extension EditProfileViewController {
     dontKnowButton.gesturePublisher(gestureRecognizer: UITapGestureRecognizer())
       .sink { [weak self] _ in
         guard let self else { return }
+
         self.viewModel.send(
           input: .bornTimeSelected(bornTime: .dontKnow(isSelected: self.dontKnowButton.isSelected)))
         bornTimeSetButton.isEnabled.toggle()

Feature/Setting/Sources/EditPage/EditProfileViewController.swift

@@ -11,6 +11,8 @@ import Combine
 import DIInjector
 import Foundation
 import Lib
+import Auth
+import DIInjector
 
 final class EditProfileViewModel {
   enum Input {
@@ -45,6 +47,9 @@ final class EditProfileViewModel {
   let output: Output = Output()
 
   private var state: State = .init()
+  
+  @Injected private var userDataManager : UserDataManager
+  @Injected private var router: SettingRouter
 
   @Injected private var userDataManager: UserDataManager
   @Injected private var router: SettingRouter
@@ -81,22 +86,22 @@ 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(
@@ -106,25 +111,27 @@ final class EditProfileViewModel {
       if let userDTO = generateUserDTO() {
         Task {
           do {
-            let result = try await self.userDataManager.update(
-              name: userDTO.name, birthDate: userDTO.birthDate!, birthTime: userDTO.birthTime,
-              gender: userDTO.gender)
-            self.state.originalUser = result
-            self.state.name = nil
-            self.state.bornTime = nil
-            self.state.birthDate = nil
-            self.state.gender = nil
+            let _ = try await self.userDataManager.update(
+              name: userDTO.name, birthDate: userDTO.birthDate!, birthTime: userDTO.birthTime, gender: userDTO.gender)
+            await MainActor.run {
+              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)
       } else {
-        self.output.navigate.send(.pop)
+        Task { @MainActor in
+          self.router.navigate(to: SettingRoute.myPage, how: .pop, with: [:])
+        }
       }
     }
   }
@@ -178,6 +185,7 @@ extension EditProfileViewModel {
     var updatedGender = originalUser.gender
     let updatedBirthDate = self.state.birthDate ?? originalUser.birthDate
     var updatedBornTime: [String]? = nil
+
     if let bornTimeState = self.state.bornTime {
       updatedBornTime = bornTimeState
     } else if self.state.bornTime == nil && self._isDontKnowButtonSelected == false {
@@ -221,7 +229,6 @@ extension EditProfileViewModel {
         return true
       }
     }
-
     return false
   }
 }