Merge pull request #315 from Team-return/feature/(#313)-interest_refact

🔗 :: (#313) 관심분야 로직 수정

Author: leejh08

Projects/Core/Sources/Steps/InterestFieldCheckStep.swift

@@ -3,4 +3,5 @@ import RxFlow
 public enum InterestFieldCheckStep: Step {
     case interestFieldIsRequired
     case interestFieldCheckIsRequired
+    case popHomeFieldIsRequired
 }

Projects/Flow/Sources/MyPage/InterestField/InterestFieldCheckFlow.swift

@@ -18,14 +18,17 @@ public final class InterestFieldCheckFlow: Flow {
     }
 
     public func navigate(to step: Step) -> FlowContributors {
-        guard let step = step as? InterestFieldStep else { return .none }
+        guard let step = step as? InterestFieldCheckStep else { return .none }
 
         switch step {
         case .interestFieldIsRequired:
             return navigateToInterestField()
 
         case .interestFieldCheckIsRequired:
             return navigateToInterestFieldCheck()
+
+        case .popHomeFieldIsRequired:
+            return navigateToInterestField()
         }
     }
 }
@@ -51,4 +54,8 @@ private extension InterestFieldCheckFlow {
             withNextStepper: interestFieldCheckViewController.viewModel
         ))
     }
+
+//    func navigateToHomeField() -> FlowContributors {
+//        
+//    }
 }

Projects/Presentation/Sources/InterestField/Components/Cell/MajorCollectionViewCell.swift

@@ -60,13 +60,13 @@ final class MajorCollectionViewCell: BaseCollectionViewCell<CodeEntity> {
             verticalFittingPriority: .required
         )
 
-        let minWidth: CGFloat = 60
+        let minWidth: CGFloat = 45
         let width = max(fittingSize.width, minWidth)
 
         layoutAttributes.frame.size = CGSize(width: width, height: 31)
         return layoutAttributes
     }
-    
+
     override var intrinsicContentSize: CGSize {
         let labelSize = majorLabel.intrinsicContentSize
         let width = labelSize.width + 32

Projects/Presentation/Sources/InterestField/InterestFieldCheckViewController.swift

@@ -9,10 +9,15 @@ import Domain
 
 public final class InterestFieldCheckViewController: BaseViewController<InterestFieldCheckViewModel> {
     private let interestView = InterestCheckView()
+//    private let backButton = JobisButton(style: .main).then {
+//        $0.setText("홈으로 가기")
+//        $0.isEnabled = true
+//    }
 
     public override func addView() {
         [
             interestView
+//            backButton
         ].forEach(view.addSubview)
     }
 
@@ -21,6 +26,11 @@ public final class InterestFieldCheckViewController: BaseViewController<Interest
             $0.centerX.centerY.equalToSuperview()
             $0.leading.trailing.lessThanOrEqualToSuperview().inset(24)
         }
+//        backButton.snp.makeConstraints {
+//            $0.centerX.equalToSuperview()
+//            $0.leading.trailing.equalToSuperview().inset(24)
+//            $0.bottom.equalToSuperview().inset(24)
+//        }
     }
 
     public override func configureNavigation() {
@@ -33,6 +43,7 @@ public final class InterestFieldCheckViewController: BaseViewController<Interest
 
         let input = InterestFieldCheckViewModel.Input(
             viewWillAppear: viewWillAppearPublisher.asObservable()
+//            backButtonTap: backButton.rx.tap.asObservable()
         )
 
         let output = viewModel.transform(input)

Projects/Presentation/Sources/InterestField/InterestFieldCheckViewModel.swift

@@ -18,6 +18,7 @@ public final class InterestFieldCheckViewModel: BaseViewModel, Stepper {
 
     public struct Input {
         let viewWillAppear: Observable<Void>
+//        let backButtonTap: Observable<Void>
     }
 
     public struct Output {
@@ -33,6 +34,11 @@ public final class InterestFieldCheckViewModel: BaseViewModel, Stepper {
             .bind(to: studentNameRelay)
             .disposed(by: disposeBag)
 
+//        input.backButtonTap
+//            .map { InterestFieldCheckStep.popHomeFieldIsRequired }
+//            .bind(to: steps)
+//            .disposed(by: disposeBag)
+
         return Output(
             studentName: studentNameRelay.asDriver()
         )

Projects/Presentation/Sources/InterestField/InterestFieldViewController.swift

@@ -11,7 +11,7 @@ public final class InterestFieldViewController: BaseViewController<InterestField
     private let selectedIndexesRelay = BehaviorRelay<Set<IndexPath>>(value: [])
     private let interestsRelay = BehaviorRelay<[CodeEntity]>(value: [])
     private let selectedInterestsRelay = BehaviorRelay<[CodeEntity]>(value: [])
-    
+
     private let interestFieldTitleLabel = UILabel().then {
         $0.setJobisText(
             "님의\n관심사를 선택해주세요",