DiffableDataSource + Compositional Layout으로 마이그레이션

Projects/Features/Falling/Src/Home/FallingHomeViewController.swift

@@ -13,7 +13,7 @@ import FallingInterface
 
 final class FallingHomeViewController: TFBaseViewController {
   private let viewModel: FallingHomeViewModel
-  private var dataSource: UICollectionViewDiffableDataSource<FallingProfileSection, FallingUser>!
+  private var dataSource: DataSource!
   private lazy var homeView = FallingHomeView()
 
   init(viewModel: FallingHomeViewModel) {
@@ -36,16 +36,18 @@ final class FallingHomeViewController: TFBaseViewController {
     let mindImageView = UIImageView(image: DSKitAsset.Image.Icons.mind.image)
     let mindImageItem = UIBarButtonItem(customView: mindImageView)
 
-    let notificationButtonItem = UIBarButtonItem(image: DSKitAsset.Image.Icons.bell.image, style: .plain, target: nil, action: nil)
-    
+    let notificationButtonItem = UIBarButtonItem.noti
+
     navigationItem.leftBarButtonItem = mindImageItem
     navigationItem.rightBarButtonItem = notificationButtonItem
   }
 
   override func bindViewModel() {
+    let timeOverSubject = PublishSubject<Void>()
+
     let initialTrigger = Driver<Void>.just(())
-    let timerOverTrigger = self.rx.timeOverTrigger.asDriver()
-    
+    let timerOverTrigger = timeOverSubject.asDriverOnErrorJustEmpty()
+
     let viewWillAppearTrigger = self.rx.viewWillAppear.map { _ in true }.asDriverOnErrorJustEmpty()
     let viewWillDisAppearTrigger = self.rx.viewWillDisAppear.map { _ in false }.asDriverOnErrorJustEmpty()
     let timerActiveRelay = BehaviorRelay(value: true)
@@ -56,7 +58,7 @@ final class FallingHomeViewController: TFBaseViewController {
       .when(.recognized)
       .withLatestFrom(timerActiveRelay) { !$1 }
       .asDriverOnErrorJustEmpty()
-    
+
     cardDoubleTapTrigger
       .drive(timerActiveRelay)
       .disposed(by: disposeBag)
@@ -65,61 +67,57 @@ final class FallingHomeViewController: TFBaseViewController {
       .drive(timerActiveRelay)
       .disposed(by: disposeBag)
 
-    let input = FallingHomeViewModel.Input(initialTrigger: initialTrigger,
-                                           timeOverTrigger: timerOverTrigger)
+    let input = FallingHomeViewModel.Input(
+      initialTrigger: initialTrigger,
+      timeOverTrigger: timerOverTrigger)
 
     let output = viewModel.transform(input: input)
 
-    var usersCount = 0
-
-    let profileCellRegistration = UICollectionView.CellRegistration<FallingUserCollectionViewCell, FallingUser> { [weak self] cell, indexPath, item in
-      let observer = FallingUserCollectionViewCellObserver(
-        userCardScrollIndex: output.userCardScrollIndex.asObservable(),
-        timerActiveTrigger: timerActiveRelay.asObservable()
+    let profileCellRegistration = UICollectionView.CellRegistration<CellType, ModelType> { cell, indexPath, item in
+      let timerActiveTrigger = Driver.combineLatest(
+        output.userCardScrollIndex,
+        timerActiveRelay.asDriver()
+      )
+        .filter { indexPath.row == $0.0 }
+        .map { $0.1 }
+        .debug("cell timer active")
+
+      cell.bind(
+        FallinguserCollectionViewCellModel(userDomain: item),
+        timerActiveTrigger,
+        scrollToNextObserver: timeOverSubject
       )
-
-      cell.bind(model: item)
-      cell.bind(observer,
-                index: indexPath,
-                usersCount: usersCount)
-      cell.delegate = self
     }
-
-    dataSource = UICollectionViewDiffableDataSource(collectionView: homeView.collectionView, cellProvider: { collectionView, indexPath, itemIdentifier in
+    dataSource = DataSource(collectionView: homeView.collectionView, cellProvider: { collectionView, indexPath, itemIdentifier in
       return collectionView.dequeueConfiguredReusableCell(using: profileCellRegistration, for: indexPath, item: itemIdentifier)
     })
 
     output.userList
       .drive(with: self, onNext: { this, list in
-        usersCount = list.count
-        var snapshot = NSDiffableDataSourceSnapshot<FallingProfileSection, FallingUser>()
+        var snapshot = Snapshot()
         snapshot.appendSections([.profile])
         snapshot.appendItems(list)
         this.dataSource.apply(snapshot)
       }).disposed(by: disposeBag)
 
-    output.userCardScrollIndex
+    output.nextCardIndex
       .drive(with: self, onNext: { this, index in
-        if usersCount == 0 { return }
-        let index = index >= usersCount ? usersCount - 1 : index
-        let indexPath = IndexPath(row: index, section: 0)
-        this.homeView.collectionView.scrollToItem(at: indexPath,
-                                                  at: .top,
-                                                  animated: true)
-      })
+        this.homeView.collectionView.scrollToItem(
+          at: index,
+          at: .top,
+          animated: true)})
       .disposed(by: self.disposeBag)
   }
 }
 
-extension FallingHomeViewController: TimeOverDelegate {
-  @objc func scrollToNext() { }
-}
+// MARK: DiffableDataSource
 
-extension Reactive where Base: FallingHomeViewController {
-  var timeOverTrigger: ControlEvent<Void> {
-    let source = methodInvoked(#selector(Base.scrollToNext)).map { _ in }
-    return ControlEvent(events: source)
-  }
+extension FallingHomeViewController {
+  typealias CellType = FallingUserCollectionViewCell
+  typealias ModelType = FallingUser
+  typealias SectionType = FallingProfileSection
+  typealias DataSource = UICollectionViewDiffableDataSource<SectionType, ModelType>
+  typealias Snapshot = NSDiffableDataSourceSnapshot<SectionType, ModelType>
 }
 
 //#if DEBUG

Projects/Features/Falling/Src/Home/FallingHomeViewModel.swift

@@ -10,53 +10,66 @@ import FallingInterface
 
 import RxSwift
 import RxCocoa
+import Foundation
 
 final class FallingHomeViewModel: ViewModelType {
-  
+
   private let fallingUseCase: FallingUseCaseInterface
-  
-//  weak var delegate: FallingHomeDelegate?
-  
+
+  //  weak var delegate: FallingHomeDelegate?
+
   var disposeBag: DisposeBag = DisposeBag()
-  
+
   struct Input {
     let initialTrigger: Driver<Void>
     let timeOverTrigger: Driver<Void>
   }
-  
+
   struct Output {
     let userList: Driver<[FallingUser]>
     let userCardScrollIndex: Driver<Int>
+    let nextCardIndex: Driver<IndexPath>
   }
-  
+
   init(fallingUseCase: FallingUseCaseInterface) {
     self.fallingUseCase = fallingUseCase
   }
-  
+
   func transform(input: Input) -> Output {
     let currentIndexRelay = BehaviorRelay<Int>(value: 0)
     let timeOverTrigger = input.timeOverTrigger
-    
+
     let usersResponse = input.initialTrigger
       .flatMapLatest { [unowned self] _ in
         self.fallingUseCase.user(alreadySeenUserUUIDList: [], userDailyFallingCourserIdx: 1, size: 100)
           .asDriver(onErrorJustReturn: .init(selectDailyFallingIdx: 0, topicExpirationUnixTime: 0, userInfos: []))
       }
-    
+
     let userList = usersResponse.map { $0.userInfos }.asDriver()
-
+
+    let userCount = userList.map { $0.count }
+
     let userListObservable = userList.map { _ in
       currentIndexRelay.accept(currentIndexRelay.value)
     }
-    
+
     let nextScrollIndex = timeOverTrigger.withLatestFrom(currentIndexRelay.asDriver(onErrorJustReturn: 0)) { _, index in
       currentIndexRelay.accept(index + 1)
     }
-
-    let userCardScrollIndex = Driver.merge(userListObservable, nextScrollIndex).withLatestFrom(currentIndexRelay.asDriver(onErrorJustReturn: 0))
-
+
+    let userCardScrollIndex = Driver.merge(userListObservable, nextScrollIndex).withLatestFrom(userCount) { _, count in
+      let currentIndex = currentIndexRelay.value
+      return currentIndex >= count ? count - 1 : currentIndex
+    }
+
+    let nextCardIndex = userCardScrollIndex
+      .filter { $0 != 0 }
+      .map { IndexPath(row: $0, section: 0) }
+
     return Output(
       userList: userList,
-      userCardScrollIndex: userCardScrollIndex)
+      userCardScrollIndex: userCardScrollIndex,
+      nextCardIndex: nextCardIndex
+    )
   }
 }

Projects/Features/Falling/Src/Subviews/Cell/FallingUserCollectionViewCell.swift

@@ -16,15 +16,8 @@ struct FallingUserCollectionViewCellObserver {
   var timerActiveTrigger: Observable<Bool>
 }
 
-@objc protocol TimeOverDelegate: AnyObject {
-  @objc func scrollToNext()
-}
-
 final class FallingUserCollectionViewCell: TFBaseCollectionViewCell {
 
-  var viewModel: FallinguserCollectionViewCellModel!
-  weak var delegate: TimeOverDelegate? = nil
-
   lazy var profileCarouselView = ProfileCarouselView()
 
   lazy var cardTimeView = CardTimeView()
@@ -48,44 +41,42 @@ final class FallingUserCollectionViewCell: TFBaseCollectionViewCell {
   override func prepareForReuse() {
     super.prepareForReuse()
     disposeBag = DisposeBag()
-    //    profileCarouselView.tagCollectionView.isHidden = true
   }
-
-  func bind(model: FallingUser) {
-    viewModel = FallinguserCollectionViewCellModel(userDomain: model)
-    profileCarouselView.bind(viewModel.userDomain)
-  }
-
-  func bind(_ observer: FallingUserCollectionViewCellObserver,
-            index: IndexPath,
-            usersCount: Int) {
-
-    let timerActiveTrigger =
-    observer.userCardScrollIndex
-      .observe(on: MainScheduler.asyncInstance)
-      .withLatestFrom(observer.timerActiveTrigger) { userCardScrollIndex, timerActiveTrigger in
-        if index.row == userCardScrollIndex {
-          self.profileCarouselView.hiddenDimView()
-          return observer.timerActiveTrigger
-        }
-        else { return Observable.just(false) }
-      }.map { $0 }
-      .flatMapLatest { return $0 }
-
-    let input = FallinguserCollectionViewCellModel.Input(timerActiveTrigger: timerActiveTrigger.asDriver(onErrorJustReturn: false))
-
+
+  func bind<O>(
+    _ viewModel: FallinguserCollectionViewCellModel,
+    _ timerTrigger: Driver<Bool>,
+    scrollToNextObserver: O) where O: ObserverType, O.Element == Void
+   {
+    let input = FallinguserCollectionViewCellModel.Input(timerActiveTrigger: timerTrigger)
+
     let output = viewModel
       .transform(input: input)
-    
+
     output.timeState
       .drive(self.rx.timeState)
       .disposed(by: self.disposeBag)
-
+
+    output.isDimViewHidden
+      .drive(with: self, onNext: { owner, isHidden in
+        if isHidden {
+          owner.profileCarouselView.hiddenDimView()
+        } else {
+          owner.profileCarouselView.showDimView()
+        }
+      })
+      .disposed(by: disposeBag)
+
     output.timeZero
-      .do { [weak self] _ in self?.delegate?.scrollToNext() }
-      .drive()
-      .disposed(by: self.disposeBag)
-
+      .drive(scrollToNextObserver)
+      .disposed(by: disposeBag)
+
+    output.user
+      .drive(with: self, onNext: { owner, user in
+        owner.profileCarouselView.bind(user)
+      })
+      .disposed(by: disposeBag)
+
     profileCarouselView.infoButton.rx.tap.asDriver()
       .scan(true) { lastValue, _ in
         return !lastValue

Projects/Features/Falling/Src/Subviews/Cell/FallinguserCollectionViewCellModel.swift

@@ -129,8 +129,9 @@ final class FallinguserCollectionViewCellModel: ViewModelType {
 
   struct Output {
     let timeState: Driver<TimeState>
-    let timeZero: Driver<Double>
+    let timeZero: Driver<Void>
     let user: Driver<FallingUser>
+    let isDimViewHidden: Driver<Bool>
   }
 
   func transform(input: Input) -> Output {
@@ -161,12 +162,18 @@ final class FallinguserCollectionViewCellModel: ViewModelType {
       }.asDriver(onErrorJustReturn: 8.0)
 
     let timeState = timer.map { TimeState(rawValue: $0) }
-    let timeZero = timer.filter { $0 == 0 }
-
+    let timeZero = timer.filter { $0 == 0 }.map { _ in }
+
+    let isDimViewHidden = Driver.merge(
+      timerActiveTrigger.take(1).asDriverOnErrorJustEmpty(), // take(1)을 해주지 않으면 일시정지 때마다 dimmed 됨
+      timeZero.map { _ in false }
+    )
+
     return Output(
       timeState: timeState,
       timeZero: timeZero,
-      user: user
+      user: user,
+      isDimViewHidden: isDimViewHidden
     )
   }
 }

Projects/Features/Falling/Src/Subviews/Cell/ProfileCollectionViewCell.swift

@@ -13,7 +13,7 @@ import DSKit
 final class ProfileCollectionViewCell: UICollectionViewCell {
   private lazy var imageView: UIImageView = {
     let imageView = UIImageView()
-    imageView.contentMode = .scaleToFill
+    imageView.contentMode = .scaleAspectFill
     imageView.layer.masksToBounds = true
     return imageView
   }()