[NL-79]: 홈 화면 미비점 수정 - 2 (#56)

* [NL-79]: 번호 새로 받으면 스크롤 최상단으로 이동

* [NL-79]: 스와이프 제스쳐 활성화

* [NL-79]: 로딩 인디케이터 추가

* [NL-79]: 홈화면 결과 조회 가능 여부 확인 로직 추가

* [NL-79]: 추천 상세 화면 결과 조회 가능 여부 확인 로직 추가

Author: TTOzzi

Common/Base/Sources/BaseViewController.swift

@@ -18,6 +18,15 @@ open class BaseViewController: UIViewController {
   open var navigationBarStyle: NavigationBar.Style { .text(alignment: .center) }
   public private(set) lazy var navigationBar = NavigationBar(
     style: navigationBarStyle, height: Constant.navigationBarHeight)
+  private lazy var interactionBlockerView = UIView().then {
+    $0.backgroundColor = .clear
+    $0.isHidden = true
+    $0.isUserInteractionEnabled = true
+  }
+  private lazy var activityIndicator = UIActivityIndicatorView(style: .large).then {
+    $0.hidesWhenStopped = true
+  }
+
   public override var title: String? {
     get { navigationBar.title }
     set { navigationBar.title = newValue }
@@ -29,12 +38,27 @@ open class BaseViewController: UIViewController {
     super.viewDidLoad()
     setupNavigationBar()
     setNavigationBarHidden(false)
+
+    view.addSubview(interactionBlockerView)
+    interactionBlockerView.snp.makeConstraints { make in
+      make.top.equalTo(view.safeAreaLayoutGuide.snp.top)
+      make.leading.trailing.bottom.equalToSuperview()
+    }
+
+    view.addSubview(activityIndicator)
+    activityIndicator.snp.makeConstraints { make in
+      make.center.equalToSuperview()
+    }
   }
 
   open override func viewDidLayoutSubviews() {
     super.viewDidLayoutSubviews()
     updateBottomSafeArea()
     view.bringSubviewToFront(navigationBar)
+    if interactionBlockerView.isHidden == false {
+      view.bringSubviewToFront(interactionBlockerView)
+      view.bringSubviewToFront(activityIndicator)
+    }
   }
 
   public func setNavigationBarHidden(_ isHidden: Bool) {
@@ -52,6 +76,7 @@ open class BaseViewController: UIViewController {
 
   private func setupNavigationBar() {
     navigationController?.setNavigationBarHidden(true, animated: false)
+    navigationController?.interactivePopGestureRecognizer?.delegate = self
     view.addSubview(navigationBar)
     navigationBar.snp.makeConstraints { make in
       make.bottom.equalTo(view.safeAreaLayoutGuide.snp.top)
@@ -69,3 +94,24 @@ open class BaseViewController: UIViewController {
     additionalSafeAreaInsets.bottom = TabBarView.Constant.tabBarHeight
   }
 }
+
+extension BaseViewController: UIGestureRecognizerDelegate {
+  public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+    return true
+  }
+}
+
+extension BaseViewController {
+  public func showLoading() {
+    interactionBlockerView.isHidden = false
+    view.bringSubviewToFront(interactionBlockerView)
+    view.bringSubviewToFront(activityIndicator)
+    activityIndicator.startAnimating()
+    view.bringSubviewToFront(navigationBar)
+  }
+  
+  public func hideLoading() {
+    interactionBlockerView.isHidden = true
+    activityIndicator.stopAnimating()
+  }
+}

Feature/Home/Sources/Home/HomeService.swift

@@ -29,27 +29,28 @@ struct HomeService {
     let (lottoRecommendation, dailyFortunes) = try await (
       lottoRecommendationRequest, dailyFortunesRequest
     )
-    let recommendationCollectionViewCellModel =
-      if let recommendationContent = lottoRecommendation.content {
-        HomeRecommendationCollectionViewCellModel(
-          title: "\(name)님을 위한 로또 번호 추천",
-          state: .recommended(  // TODO: 서버 - 결과 확인 여부 추가 예정
-            numbers: [
-              recommendationContent.num1,
-              recommendationContent.num2,
-              recommendationContent.num3,
-              recommendationContent.num4,
-              recommendationContent.num5,
-              recommendationContent.num6,
-            ].sorted()
-          )
-        )
-      } else {
-        HomeRecommendationCollectionViewCellModel(
-          title: "\(name)님을 위한 로또 번호 추천",
-          state: .needsRecommendation
-        )
-      }
+    
+    let recommendationCollectionViewCellModel: HomeRecommendationCollectionViewCellModel
+    if let recommendationContent = lottoRecommendation.content {
+      let numbers = [
+        recommendationContent.num1,
+        recommendationContent.num2,
+        recommendationContent.num3,
+        recommendationContent.num4,
+        recommendationContent.num5,
+        recommendationContent.num6,
+      ].sorted()
+      recommendationCollectionViewCellModel = HomeRecommendationCollectionViewCellModel(
+        title: "\(name)님을 위한 로또 번호 추천",
+        state: lottoRecommendation.isFinished ? .needsResultCheck(numbers: numbers) : .recommended(numbers: numbers)
+      )
+    } else {
+      recommendationCollectionViewCellModel = HomeRecommendationCollectionViewCellModel(
+        title: "\(name)님을 위한 로또 번호 추천",
+        state: .needsRecommendation
+      )
+    }
+    
     let homeTodayFortuneCollectionViewCellModels = dailyFortunes.content.map { item in
       FortuneItemCollectionViewCellModel(
         title: item.fortuneType,

Feature/Home/Sources/Home/HomeViewController.swift

@@ -65,6 +65,17 @@ public final class HomeViewController: BaseViewController {
   }
 
   private func setupBinding() {
+    viewModel.output.isLoading
+      .receive(on: DispatchQueue.main)
+      .sink { [weak self] isLoading in
+        if isLoading {
+          self?.showLoading()
+        } else {
+          self?.hideLoading()
+        }
+      }
+      .store(in: &cancellables)
+    
     viewModel.output.sections
       .receive(on: DispatchQueue.main)
       .sink { [weak self] _ in

Feature/Home/Sources/Home/HomeViewModel.swift

@@ -19,6 +19,7 @@ public final class HomeViewModel {
   }
 
   struct Output {
+    let isLoading = CurrentValueSubject<Bool, Never>(false)
     let sections = CurrentValueSubject<[any HomeCellModel], Never>([])
   }
 
@@ -31,6 +32,7 @@ public final class HomeViewModel {
   func send(input: Input) {
     switch input {
     case .viewDidLoad:
+      output.isLoading.send(true)
       Task {
         do {
           let sections = try await homeService.fetch()
@@ -39,6 +41,7 @@ public final class HomeViewModel {
           // TODO: 에러 처리
           print(error)
         }
+        output.isLoading.send(false)
       }
 
     case .recommendationButtonTapped(let state):

Feature/Home/Sources/Model/LottoRecommendationDTO.swift

@@ -13,11 +13,13 @@ struct LottoRecommendationDTO: Decodable {
     case userId = "user_id"
     case round
     case content
+    case isFinished = "is_finished"
   }
 
   let userId: String
   let round: Int
   let content: Content?
+  let isFinished: Bool
 
   struct Content: Codable {
 

Feature/Home/Sources/RecommendationDetail/NumberRecommendationCollectionViewCell.swift

@@ -13,9 +13,13 @@ import UIKit
 
 struct NumberRecommendationCollectionViewCellModel: RecommendationDetailCellModel {
   let roundText: String
+  let isFinished: Bool
   let title: String
   let numbers: [Int]
-  var secondsUntilResult: Int {  // TODO: 기기 시간 설정을 바꾼 경우, 오후 8시 35분이 지났으나 서버에서 결과 조회가 준비되지 않은 경우 논의 필요
+  var secondsUntilResult: Int {  // TODO: 기기 시간 설정을 바꾼 케이스 논의 필요
+    if isFinished {
+      return .zero
+    }
     var calendar = Calendar(identifier: .gregorian)
     calendar.timeZone = .current
     calendar.locale = Locale(identifier: "ko_KR")
@@ -154,10 +158,7 @@ final class NumberRecommendationCollectionViewCell: BaseCollectionViewCell {
 
     countdownCancellable = Timer.publish(every: 1, on: .main, in: .common)
       .autoconnect()
-      .handleEvents(receiveSubscription: { [weak self] _ in
-        self?.timeUntilDrawLabel.styledText = self?.countdownText(
-          from: Int(target.timeIntervalSinceNow))
-      })
+      .prepend(target)
       .map { _ in
         return max(0, Int(target.timeIntervalSinceNow))
       }
@@ -219,6 +220,7 @@ final class NumberRecommendationCollectionViewCell: BaseCollectionViewCell {
 #Preview {
   let cellModel = NumberRecommendationCollectionViewCellModel(
     roundText: "1181회",
+    isFinished: false,
     title: "콩떡님을 위한 로또 번호 추천",
     numbers: [9, 11, 18, 24, 33, 42]
   )

Feature/Home/Sources/RecommendationDetail/RecommendationDetailService.swift

@@ -50,6 +50,7 @@ struct RecommendationDetailService {
     return [
       NumberRecommendationCollectionViewCellModel(
         roundText: "\(recommendation.round)회",
+        isFinished: recommendation.isFinished,
         title: title,
         numbers: [
           content.num1,

Feature/Home/Sources/RecommendationDetail/RecommendationDetailViewController.swift

@@ -170,6 +170,7 @@ final class RecommendationDetailViewController: BaseViewController {
           self?.loadingView.play()
           self?.title = nil
         } else {
+          self?.collectionView.setContentOffset(.zero, animated: false)
           UIView.animate(
             withDuration: 0.25,
             animations: {

Feature/Onboarding/Sources/Agreement/AgreementViewController.swift

@@ -240,7 +240,7 @@ extension AgreementViewController: AgreementCellDelegate {
   }
 }
 
-extension AgreementViewController: UIGestureRecognizerDelegate {
+extension AgreementViewController {
   func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch)
     -> Bool
   {