Merge pull request #350 from boostcampwm2023/iOS/task/Rewind-Fix

[iOS] 여정 조회 개선

iOS/Features/Home/Sources/Home/Presentation/HomeViewController.swift

@@ -126,9 +126,7 @@ public final class HomeViewController: HomeBottomSheetViewController {
         super.viewDidAppear(animated)
 
         // 화면 시작 시 새로고침 버튼 기능 한번 실행
-        if !self.viewModel.state.isRecording.value {
-            self.refreshButton.sendActions(for: .touchUpInside)
-        }
+        self.refreshButtonDidTap()
     }
 
     // MARK: - Combine Binding

iOS/Features/JourneyList/Sources/JourneyList/Presentation/JourneyListViewModel.swift

@@ -8,7 +8,6 @@
 import Combine
 import Foundation
 
-import MSData
 import MSDomain
 import MSLogger
 

iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/MSProgressView.swift

@@ -5,20 +5,20 @@
 //  Created by 전민건 on 11/22/23.
 //
 
-import UIKit
 import Combine
+import UIKit
 
 public final class MSProgressView: UIProgressView {
 
     // MARK: - Properties
 
-    private let progressViewModel = MSProgressViewModel()
-    private var timerSubscriber: Set<AnyCancellable> = []
-    internal var percentage: Float = 0.0 {
-        didSet {
-            syncProgress(percentage: percentage)
-        }
+    private var progressViewModel: MSProgressViewModel!
+    private var timer: Set<AnyCancellable> = []
+
+    internal var percentage: Double = 0.0 {
+        willSet { self.syncProgress(percentage: newValue) }
     }
+
     internal var isHighlighted: Bool = false {
         didSet {
             if self.isHighlighted {
@@ -34,18 +34,24 @@ public final class MSProgressView: UIProgressView {
             }
         }
     }
+
     internal var isLeftOfCurrentHighlighting: Bool = false
 
     // MARK: - Initializer
 
-    public override init(frame: CGRect) {
+    override init(frame: CGRect) {
         super.init(frame: frame)
+    }
+
+    convenience init(frame: CGRect = .zero, duration: TimeInterval) {
+        self.init(frame: frame)
         self.configureColor()
-        self.timerBinding()
+        self.progressViewModel = MSProgressViewModel(duration: duration)
+        self.bind()
     }
 
     required init?(coder: NSCoder) {
-        fatalError("MusicSpot은 code-based 로 개발되었습니다.")
+        fatalError("MusicSpot은 code-based로만 작업 중입니다.")
     }
 
     // MARK: - Configure
@@ -57,18 +63,18 @@ public final class MSProgressView: UIProgressView {
 
     // MARK: - Functions: change progress
 
-    private func syncProgress(percentage: Float) {
-        DispatchQueue.main.async { self.progress = percentage }
+    private func syncProgress(percentage: Double) {
+        DispatchQueue.main.async { self.progress = Float(percentage) }
     }
 
     // MARK: - Timer
 
-    private func timerBinding() {
+    private func bind() {
         self.progressViewModel.timerPublisher
             .sink { [weak self] currentPercentage in
                 self?.percentage = currentPercentage
             }
-            .store(in: &timerSubscriber)
+            .store(in: &self.timer)
     }
 
 }

iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/MSProgressViewModel.swift

@@ -5,43 +5,48 @@
 //  Created by 전민건 on 12/4/23.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 final class MSProgressViewModel {
 
     // MARK: - Constants
 
-    private let timerDuration: Double = 4.0
-    private let timerTimeInterval: Double = 0.01
+    private enum Metric {
+        static let timeInterval: Double = 0.01
+    }
 
     // MARK: - Properties
 
-    internal let timerPublisher = PassthroughSubject<Float, Never>()
+    internal let timerPublisher = PassthroughSubject<Double, Never>()
     private var timer: AnyCancellable?
+
+    private let timerDuration: Double
     private var remainingTime: Double
 
     // MARK: Initializers
 
-    init() {
-        self.remainingTime = self.timerDuration
+    internal init(duration: TimeInterval) {
+        self.timerDuration = duration
+        self.remainingTime = duration
     }
 
     // MARK: - Functions: Timers
 
     internal func startTimer() {
-        self.timer = Timer.publish(every: self.timerTimeInterval, on: .current, in: .common)
+        self.timer = Timer.publish(every: Metric.timeInterval, on: .current, in: .common)
             .autoconnect()
             .receive(on: DispatchQueue.global(qos: .background))
             .sink { [weak self] _ in
                 guard let remainingTime = self?.remainingTime,
-                      let timerDuration = self?.timerDuration,
-                      let timerTimeInterval = self?.timerTimeInterval else { return }
+                      let timerDuration = self?.timerDuration else {
+                    return
+                }
 
-                self?.remainingTime -= timerTimeInterval
+                self?.remainingTime -= Metric.timeInterval
                 if remainingTime >= 0 {
-                    let currentPercentage = ( timerDuration - remainingTime ) / timerDuration
-                    self?.timerPublisher.send(Float(currentPercentage))
+                    let currentPercentage: Double = (timerDuration - remainingTime) / timerDuration
+                    self?.timerPublisher.send(currentPercentage)
                 } else {
                     self?.timerPublisher.send(1.0)
                     self?.stopTimer()

iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/RewindJourneyViewController+Gesture.swift

@@ -12,7 +12,7 @@ import UIKit
 
 private enum Metric {
 
-    static let movedXPositionToBackScene: CGFloat = 50.0
+    static let movedYPositionToBackScene: CGFloat = 50.0
     static let animationDuration: Double = 0.3
 
 }
@@ -22,10 +22,10 @@ private enum Metric {
 internal extension RewindJourneyViewController {
 
     func configureLeftToRightSwipeGesture() {
-        let panGesture = UIPanGestureRecognizer(target: self, action: #selector(panGestureDismiss(_:)))
-            self.view.addGestureRecognizer(panGesture)
+        let panGesture = UIPanGestureRecognizer(target: self, action: #selector(self.panGestureDismiss(_:)))
+        self.view.addGestureRecognizer(panGesture)
     }
-
+    
     @objc
     private func panGestureDismiss(_ sender: UIPanGestureRecognizer) {
         let touchPoint = sender.location(in: self.view.window)
@@ -35,14 +35,14 @@ internal extension RewindJourneyViewController {
         case .began:
             self.initialTouchPoint = touchPoint
         case .changed:
-            if touchPoint.x - self.initialTouchPoint.x > .zero {
-                self.view.frame = CGRect(x: touchPoint.x - self.initialTouchPoint.x,
-                                         y: .zero,
+            if touchPoint.y - self.initialTouchPoint.y > .zero {
+                self.view.frame = CGRect(x: .zero,
+                                         y: touchPoint.y - self.initialTouchPoint.y,
                                          width: width,
                                          height: height)
             }
         case .ended, .cancelled:
-            if touchPoint.x - self.initialTouchPoint.x > Metric.movedXPositionToBackScene {
+            if touchPoint.y - self.initialTouchPoint.y > Metric.movedYPositionToBackScene {
                 self.navigationDelegate?.popToHome()
             } else {
                 self.view.frame = CGRect(x: .zero,
@@ -51,11 +51,11 @@ internal extension RewindJourneyViewController {
                                          height: height)
             }
         default:
-            UIView.animate(withDuration: Metric.animationDuration) {
-                self.view.frame = CGRect(x: .zero,
-                                         y: .zero,
-                                         width: width,
-                                         height: height)
+            UIView.animate(withDuration: Metric.animationDuration) { [weak self] in
+                self?.view.frame = CGRect(x: .zero,
+                                          y: .zero,
+                                          width: width,
+                                          height: height)
             }
         }
     }