FEAT :: [#332] 자기관리 목표 뷰 퍼블리싱

Plugins/EnvPlugin/ProjectDescriptionHelpers/Environment.swift

@@ -7,7 +7,7 @@ public enum Environment {
 public extension Project {
     enum Environment {
         public static let workspaceName = "MaeumGaGym-iOS"
-        public static let deploymentTarget = DeploymentTarget.iOS(targetVersion: "15.0", devices: .iphone)
+        public static let deploymentTarget = DeploymentTarget.iOS(targetVersion: "16.0", devices: .iphone)
         public static let platform = Platform.iOS
         public static let bundlePrefix = "com.maeumGaGym-health-iOS"
         public static let baseSetting: SettingsDictionary = SettingsDictionary()

Projects/Features/SelfCareFeature/Demo/Sources/Application/SceneDelegate.swift

@@ -20,8 +20,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         let useCase = DefaultSelfCareUseCase(repository: SelfCareRepository(networkService: SelfCareService()))
         let viewModel = SelfCareHomeViewModel()
         let viewController = SelfCareHomeViewController(viewModel)
-//        let viewModel = SelfCareMyRoutineViewModel(useCase: useCase)
-//        let viewController = SelfCareMyRoutineViewController(viewModel)
         window?.configure(withRootViewController: viewController)
         window?.makeKeyAndVisible()
     }

Projects/Features/SelfCareFeature/Sources/HomeScene/VC/SelfCareHomeViewController.swift

@@ -174,6 +174,22 @@ extension SelfCareHomeViewController: UITableViewDataSource {
             let viewController = SelfCareProfileViewController(viewModel)
             self.navigationController?.pushViewController(viewController, animated: true)
             return
+        case .selfCare:
+            let useCase = DefaultSelfCareUseCase(repository: SelfCareRepository(networkService: SelfCareService()))
+            let viewModel = SelfCareTargetMainViewModel(useCase: useCase)
+            self.navigationController?.pushViewController(SelfCareTargetMainViewController(viewModel), animated: true)
+//            switch menus[indexPath.row].menuImage {
+//            case .goalIcon:
+//                let useCase = DefaultSelfCareUseCase(repository: SelfCareRepository(networkService: SelfCareService()))
+//                let viewModel = SelfCareTargetMainViewModel(useCase: useCase)
+//                self.navigationController?.pushViewController(
+//                    SelfCareTargetMainViewController(viewModel)
+//                    , animated: true
+//                )
+//                return
+//            default:
+//                return
+//            }
         default:
             return
         }

Projects/Features/SelfCareFeature/Sources/ProfileScene/View/NavigationBar/SelfCareProfileNavigationBar.swift

@@ -26,12 +26,11 @@ final public class SelfCareProfileNavigationBar: UIView {
 
     private lazy var leftItemsStackView = UIStackView(arrangedSubviews: [leftButton, leftLabel]).then {
         $0.axis = .horizontal
-        $0.spacing = 0
-        $0.distribution = .fillEqually
+        $0.spacing = 24
     }
 
     public init(
-        leftText: String
+        leftText: String? = nil
     ) {
         super.init(frame: .zero)
         self.leftText = leftText
@@ -58,7 +57,7 @@ private extension SelfCareProfileNavigationBar {
 
         leftItemsStackView.snp.makeConstraints {
             $0.top.bottom.equalToSuperview()
-            $0.leading.equalToSuperview().offset(-10.0)
+            $0.leading.equalToSuperview().inset(10.0)
         }
     }
 }

Projects/Features/SelfCareFeature/Sources/Supporter/SelfCareButton.swift

@@ -73,14 +73,13 @@ private extension SelfCareButton {
 
             buttonLabel.snp.makeConstraints {
                 $0.top.bottom.equalToSuperview()
+                $0.centerX.equalToSuperview()
                 $0.leading.equalTo(buttonImage.snp.trailing).offset(8.0)
-                $0.trailing.equalToSuperview()
                 $0.height.equalTo(24.0)
             }
 
             buttonLabel.sizeToFit()
             containerView.snp.remakeConstraints {
-                $0.width.equalTo(type.width)
                 $0.centerX.equalToSuperview()
                 $0.top.bottom.equalToSuperview().inset(17.0)
             }

Projects/Features/SelfCareFeature/Sources/Supporter/SelfCareButtonType.swift

@@ -23,7 +23,7 @@ public enum SelfCareButtonType {
         case .posturePlus:
             return DSKitAsset.Assets.blackPlus.image
         case .plusTarget:
-            return DSKitAsset.Assets.blackPlus.image
+            return DSKitAsset.Assets.whiteAdd.image
         default:
             return nil
         }

Projects/Features/SelfCareFeature/Sources/TargetScene/VC/SelfCareAddTargetViewController.swift

@@ -0,0 +1,231 @@
+import UIKit
+
+import RxSwift
+import RxCocoa
+import RxFlow
+
+import SnapKit
+import Then
+
+import Core
+import DSKit
+import Domain
+
+import MGLogger
+import Data
+
+import SelfCareFeatureInterface
+
+final public class SelfCareAddTargetViewController: BaseViewController<SelfCareAddTargetViewModel> {
+
+    private var bottomConstraint: Constraint?
+
+    private lazy var navBar = SelfCareProfileNavigationBar(leftText: "목표 추가")
+    private let titleTextField = MGSelfCareTextField(
+        typeText: "제목",
+        keyboardType: .default,
+        placeholderText: "제목을 입력해주세요",
+        placeholderTextColor: .gray400
+    )
+    private let startDateSelectView = MGDateSelectView(typeText: "시작 날짜")
+    private let endDateSelectView = MGDateSelectView(typeText: "마감 날짜")
+    private let contentTextView = MGTextView()
+    private let endButton = MGButton(
+        titleText: "확인",
+        font: UIFont.Pretendard.labelLarge,
+        textColor: .white,
+        backColor: .blue500
+    ).then {
+        $0.isHidden = true
+    }
+
+    private let editFinishButton = MGButton(
+        titleText: "완료",
+        font: UIFont.Pretendard.labelLarge,
+        textColor: .white,
+        backColor: .blue500
+    ).then {
+        $0.layer.cornerRadius = 8
+    }
+
+    public override func configureNavigationBar() {
+        super.configureNavigationBar()
+
+        navigationController?.isNavigationBarHidden = true
+    }
+    public override func attribute() {
+        super.attribute()
+
+        view.backgroundColor = .white
+        setupKeyboardObservers()
+    }
+    public override func bindActions() {
+        navBar.leftButtonTap
+            .bind(onNext: { [weak self] in
+                self?.navigationController?.popViewController(animated: true)
+            }).disposed(by: disposeBag)
+
+        endButton.rx.tap
+            .bind(onNext: { [weak self] in
+                self?.view.endEditing(true)
+            }).disposed(by: disposeBag)
+
+        editFinishButton.rx.tap
+            .bind(onNext: { [weak self] in
+                self?.navigationController?.popViewController(animated: true)
+            }).disposed(by: disposeBag)
+
+        startDateSelectView.dateButtonTap
+            .bind(onNext: { [weak self] in
+                let vc = MGTargetAlertView(clickDate: { year, month, day in
+                    self?.startDateSelectView.setup(date: [year!, month!, day!])
+                })
+                vc.modalTransitionStyle = .crossDissolve
+                vc.modalPresentationStyle = .overFullScreen
+                self?.present(vc, animated: true)
+            }).disposed(by: disposeBag)
+
+        endDateSelectView.dateButtonTap
+            .bind(onNext: { [weak self] in
+                let vc = MGTargetAlertView(clickDate: { year, month, day in
+                    self?.endDateSelectView.setup(date: [year!, month!, day!])
+                })
+                vc.modalTransitionStyle = .crossDissolve
+                vc.modalPresentationStyle = .overFullScreen
+                self?.present(vc, animated: true)
+            }).disposed(by: disposeBag)
+    }
+    public override func layout() {
+        super.layout()
+
+        view.addSubviews([
+            navBar,
+            titleTextField,
+            startDateSelectView,
+            endDateSelectView,
+            contentTextView,
+            endButton,
+            editFinishButton
+        ])
+
+        navBar.snp.makeConstraints {
+            $0.top.leading.trailing.equalTo(view.safeAreaLayoutGuide)
+        }
+        titleTextField.snp.makeConstraints {
+            $0.top.equalTo(navBar.snp.bottom).offset(52)
+            $0.leading.trailing.equalToSuperview().inset(20)
+            $0.height.equalTo(48)
+        }
+        startDateSelectView.snp.makeConstraints {
+            $0.top.equalTo(titleTextField.snp.bottom).offset(32)
+            $0.leading.trailing.equalToSuperview().inset(20)
+        }
+        endDateSelectView.snp.makeConstraints {
+            $0.top.equalTo(startDateSelectView.snp.bottom).offset(32)
+            $0.leading.trailing.equalToSuperview().inset(20)
+        }
+        contentTextView.snp.makeConstraints {
+            $0.top.equalTo(endDateSelectView.snp.bottom).offset(32)
+            $0.leading.trailing.equalToSuperview().inset(20)
+            $0.height.equalTo(228)
+        }
+        endButton.snp.makeConstraints {
+            $0.leading.trailing.equalToSuperview().inset(20)
+            $0.bottom.equalToSuperview().inset(54)
+            $0.height.equalTo(58)
+        }
+        editFinishButton.snp.makeConstraints {
+            $0.leading.trailing.equalToSuperview().inset(20)
+            $0.bottom.equalToSuperview().inset(54)
+            $0.height.equalTo(58)
+        }
+    }
+}
+
+extension SelfCareAddTargetViewController {
+    private func setupKeyboardObservers() {
+        keyboardBind()
+
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(keyboardWillShow),
+            name: UIResponder.keyboardWillShowNotification,
+            object: nil
+        )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(keyboardWillHide),
+            name: UIResponder.keyboardWillHideNotification,
+            object: nil
+        )
+    }
+    func animateButtonWithKeyboard(notification: NSNotification, show: Bool) {
+        guard let keyboardSize = (notification.userInfo?[
+            UIResponder.keyboardFrameEndUserInfoKey
+        ] as? NSValue)?.cgRectValue,
+              let keyboardAnimationDuration = notification.userInfo?[
+                UIResponder.keyboardAnimationDurationUserInfoKey
+              ] as? TimeInterval else {
+            return
+        }
+
+        let offset = show ? -keyboardSize.height : -20.0
+        bottomConstraint?.update(offset: offset)
+
+        UIView.animate(withDuration: keyboardAnimationDuration) { [weak self] in
+            self?.view.layoutIfNeeded()
+        }
+    }
+
+    @objc func keyboardWillShow(notification: NSNotification) {
+        animateButtonWithKeyboard(notification: notification, show: true)
+    }
+
+    @objc func keyboardWillHide(notification: NSNotification) {
+        animateButtonWithKeyboard(notification: notification, show: false)
+    }
+
+    private func keyboardBind() {
+        let keyboardWillShowObservable = NotificationCenter.default.rx.notification(
+            UIResponder.keyboardWillShowNotification)
+            .map { ($0.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue.height ?? 48 }
+
+        let keyboardWillHideObservable = NotificationCenter.default.rx.notification(
+            UIResponder.keyboardWillHideNotification)
+            .map { _ in CGFloat(48) }
+
+        Observable.merge(keyboardWillShowObservable)
+            .withUnretained(self)
+            .subscribe(onNext: { owner, height in
+                owner.endButton.isHidden = false
+                owner.endButton.snp.remakeConstraints {
+                    owner.bottomConstraint = $0.bottom.equalToSuperview().offset(-height).constraint
+                    $0.width.equalToSuperview()
+                    $0.height.equalTo(58.0)
+                }
+                UIView.animate(withDuration: 0.3) {
+                    owner.view.layoutIfNeeded()
+                }
+            })
+            .disposed(by: disposeBag)
+
+        Observable.merge(keyboardWillHideObservable)
+            .withUnretained(self)
+            .subscribe(onNext: { owner, height in
+                owner.endButton.snp.remakeConstraints {
+                    owner.bottomConstraint?.update(offset: -height + 112.0)
+                    $0.leading.equalToSuperview().offset(20.0)
+                    $0.trailing.equalToSuperview().offset(-20.0)
+                    $0.width.equalTo(390.0)
+                    $0.height.equalTo(58.0)
+                    $0.bottom.equalTo((owner.view.safeAreaLayoutGuide))
+                }
+                owner.endButton.isHidden = true
+                UIView.animate(withDuration: 0.3) {
+                    owner.view.layoutIfNeeded()
+                }
+            })
+            .disposed(by: disposeBag)
+    }
+
+}