[GWL-334] 카운트다운 화면, WorkoutSession, WorkoutSummery 화면에서 TabBar 보이는 버그…

… 수정 (#335) * feat: 운동 기록중에 보이는 tapbar hidden 처리 완료 * feat: 순환참조 문제 해결 * feat: 순환 참조 문제 해결
boostcampwm2023 · Dec 10, 2023 · 531ed60 · 531ed60
1 parent dda815c
commit 531ed60
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/...ts/Features/Record/Sources/Presentation/Common/Coordinator/RecordFeatureCoordinator.swift b/...ts/Features/Record/Sources/Presentation/Common/Coordinator/RecordFeatureCoordinator.swift
@@ -95,6 +95,7 @@ extension RecordFeatureCoordinator: CoordinatorFinishDelegate {
 
 extension RecordFeatureCoordinator: WorkoutSettingCoordinatorFinishDelegate {
   func workoutSettingCoordinatorDidFinished(workoutSessionComponents: WorkoutSessionComponents) {
+    childCoordinators.removeAll()
     navigationController.dismiss(animated: false)
     showWorkoutFlow(workoutSessionComponents)
   }
@@ -104,6 +105,7 @@ extension RecordFeatureCoordinator: WorkoutSettingCoordinatorFinishDelegate {
 
 extension RecordFeatureCoordinator: WorkoutSessionFinishDelegate {
   public func moveToMainRecord() {
+    childCoordinators.removeAll()
     start()
   }
 }
diff --git a/...s/Features/Record/Sources/Presentation/Common/Coordinator/WorkoutSessionCoordinator.swift b/...s/Features/Record/Sources/Presentation/Common/Coordinator/WorkoutSessionCoordinator.swift
@@ -173,7 +173,9 @@ final class WorkoutSessionCoordinator: WorkoutSessionCoordinating {
       healthDataProtocol: sessionViewController,
       locationTrackingProtocol: routeMapViewController
     )
-    navigationController.pushViewController(viewController, animated: true)
+    viewController.hidesBottomBarWhenPushed = true
+
+    navigationController.setViewControllers([viewController], animated: true)
   }
 
   func pushWorkoutSummaryViewController(recordID: Int) {
@@ -189,6 +191,8 @@ final class WorkoutSessionCoordinator: WorkoutSessionCoordinating {
     let useCase = WorkoutSummaryUseCase(repository: repository, workoutRecordID: recordID)
     let viewModel = WorkoutSummaryViewModel(coordinating: self, workoutSummaryUseCase: useCase)
     let workoutSummaryViewController = WorkoutSummaryViewController(viewModel: viewModel)
+    workoutSummaryViewController.hidesBottomBarWhenPushed = true
+
     navigationController.setViewControllers([workoutSummaryViewController], animated: true)
   }
 
@@ -199,6 +203,8 @@ final class WorkoutSessionCoordinator: WorkoutSessionCoordinating {
     let viewModel = CountDownBeforeWorkoutViewModel(coordinator: self, useCase: useCase)
 
     let viewController = CountDownBeforeWorkoutViewController(viewModel: viewModel)
+    viewController.hidesBottomBarWhenPushed = true
+
     navigationController.setViewControllers([viewController], animated: true)
   }
 

diff --git a/...ion/CountDownBeforeWorkoutScene/ViewController/CountDownBeforeWorkoutViewController.swift b/...ion/CountDownBeforeWorkoutScene/ViewController/CountDownBeforeWorkoutViewController.swift
@@ -93,6 +93,7 @@ private extension CountDownBeforeWorkoutViewController {
 
   func setupStyles() {
     view.backgroundColor = DesignSystemColor.primaryBackground
+    hidesBottomBarWhenPushed = true
   }
 
   func bindViewModel() {

diff --git a/.../Presentation/CountDownBeforeWorkoutScene/ViewModel/CountDownBeforeWorkoutViewModel.swift b/.../Presentation/CountDownBeforeWorkoutScene/ViewModel/CountDownBeforeWorkoutViewModel.swift
@@ -37,10 +37,9 @@ protocol CountDownBeforeWorkoutViewModelRepresentable {
 final class CountDownBeforeWorkoutViewModel {
   // MARK: - Properties
 
-  weak var coordinator: WorkoutSessionCoordinating?
-  var timerUseCase: CountDownBeforeWorkoutStartTimerUseCaseRepresentable
+  private weak var coordinator: WorkoutSessionCoordinating?
+  private var timerUseCase: CountDownBeforeWorkoutStartTimerUseCaseRepresentable
   private var subscriptions: Set<AnyCancellable> = []
-  private var beforeWorkoutTimerSubject: CurrentValueSubject<String, Never> = .init("")
   init(coordinator: WorkoutSessionCoordinating, useCase: CountDownBeforeWorkoutStartTimerUseCaseRepresentable) {
     self.coordinator = coordinator
     timerUseCase = useCase

diff --git a/...tation/WorkoutEnvironmentScene/ViewController/WorkoutEnvironmentSetupViewController.swift b/...tation/WorkoutEnvironmentScene/ViewController/WorkoutEnvironmentSetupViewController.swift
@@ -94,8 +94,6 @@ private extension WorkoutEnvironmentSetupViewController {
     navigationController?.navigationBar.isHidden = false
     navigationController?.navigationBar.tintColor = DesignSystemColor.main03
 
-    let titleBarButtonItemFont: UIFont = .preferredFont(forTextStyle: .title3, weight: .semibold)
-    navigationController?.tabBarItem.setTitleTextAttributes([.font: titleBarButtonItemFont], for: .normal)
     view.backgroundColor = DesignSystemColor.primaryBackground
   }
 

diff --git a/...ces/Presentation/WorkoutEnvironmentScene/ViewController/WorkoutSelectViewController.swift b/...ces/Presentation/WorkoutEnvironmentScene/ViewController/WorkoutSelectViewController.swift
@@ -26,7 +26,7 @@ final class WorkoutSelectViewController: UIViewController {
     bind()
   }
 
-  private var cancellables = Set<AnyCancellable>()
+  private var subscriptions = Set<AnyCancellable>()
   weak var delegate: WorkoutSelectViewDelegate?
 
   private let workoutSelectDescriptionLabel: UILabel = {
@@ -113,7 +113,7 @@ private extension WorkoutSelectViewController {
       .sink { [weak self] _ in
         self?.delegate?.nextButtonDidTap()
       }
-      .store(in: &cancellables)
+      .store(in: &subscriptions)
   }
 
   enum Metrics {

diff --git a/...s/Presentation/WorkoutSessionGroupScene/RouteMapScene/WorkoutRouteMapViewController.swift b/...s/Presentation/WorkoutSessionGroupScene/RouteMapScene/WorkoutRouteMapViewController.swift
@@ -143,7 +143,9 @@ final class WorkoutRouteMapViewController: UIViewController {
 
     viewModel
       .transform(input: input)
-      .sink(receiveValue: render(state:))
+      .sink { [weak self] state in
+        self?.render(state: state)
+      }
       .store(in: &subscriptions)
   }