Merge pull request #71 from THT-Team/feat/infobox_detail

UserBoxView 버튼 클릭 버벅임 현상 수정 및 UserInfoCollectionView Compositional layout으로 마이그레이션

Projects/Domain/Src/Model/User/EmojiType.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 // MARK: - List
-public struct EmojiType {
+public struct EmojiType: Hashable {
   public let identifier = UUID()
   public let idx: Int
   public let name, emojiCode: String
@@ -19,3 +19,12 @@ public struct EmojiType {
     self.emojiCode = emojiCode
   }
 }
+
+extension EmojiType {
+  public func hash(into hasher: inout Hasher) {
+    hasher.combine(identifier)
+  }
+  public static func == (lhs: EmojiType, rhs: EmojiType) -> Bool {
+    lhs.identifier == rhs.identifier
+  }
+}

Projects/Features/Falling/Interface/Src/Model/FallingUser.swift

@@ -12,6 +12,38 @@ public enum FallingProfileSection {
   case profile
 }
 
+public enum FallingUserInfoSection: Int {
+  case interest
+  case ideal
+  case introduction
+
+  public var title: String {
+    switch self {
+    case .interest:
+      return "내 관심사"
+    case .ideal:
+      return "내 이상형"
+    case .introduction:
+      return "자기소개"
+    }
+  }
+}
+
+public enum FallingUserInfoItem: Hashable {
+  case interest(EmojiType)
+  case ideal(EmojiType)
+  case introduction(String)
+
+  public var item: Any {
+    switch self {
+    case .interest(let item), .ideal(let item):
+      return item
+    case .introduction(let item):
+      return item
+    }
+  }
+}
+
 public struct FallingUserInfo {
   public let selectDailyFallingIdx, topicExpirationUnixTime: Int
   public let userInfos: [FallingUser]

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

@@ -10,10 +10,6 @@ import UIKit
 import Core
 import DSKit
 
-enum ElementKind: String {
-  case badge, header, footer
-}
-
 final class FallingHomeView: TFBaseView {
   lazy var collectionView: UICollectionView = {
     let flowLayout = UICollectionViewCompositionalLayout.verticalListLayout(withEstimatedHeight: ((UIWindow.keyWindow?.frame.width ?? 0) - 32) * 1.64)
@@ -69,7 +65,7 @@ extension NSCollectionLayoutSection {
       heightDimension: .estimated(((UIWindow.keyWindow?.frame.width ?? 0) - 32) * 1.64))
     let sectionFooter = NSCollectionLayoutBoundarySupplementaryItem(
         layoutSize: footerSize,
-        elementKind: ElementKind.footer.rawValue, 
+        elementKind: UICollectionView.elementKindSectionFooter, 
         alignment: .bottom
     )
 

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

@@ -11,6 +11,12 @@ import Core
 import DSKit
 import FallingInterface
 
+enum FallingCellButtonAction {
+  case info(IndexPath)
+  case refuse(IndexPath)
+  case like(IndexPath)
+}
+
 final class FallingHomeViewController: TFBaseViewController {
   private let viewModel: FallingHomeViewModel
   private var dataSource: DataSource!
@@ -47,24 +53,25 @@ final class FallingHomeViewController: TFBaseViewController {
 
     let initialTrigger = Driver<Void>.just(())
     let timerOverTrigger = timeOverSubject.asDriverOnErrorJustEmpty()
+    let fallingCellButtonAction = PublishSubject<FallingCellButtonAction>()
 
     let viewWillDisAppearTrigger = self.rx.viewWillDisAppear.map { _ in false }.asDriverOnErrorJustEmpty()
     let timerActiveRelay = BehaviorRelay(value: true)
-    let cardDoubleTapTrigger = self.homeView.collectionView.rx
-      .tapGesture(configuration: { gestureRecognizer, delegate in
-        gestureRecognizer.numberOfTapsRequired = 2
-      })
-      .when(.recognized)
+    let profileDoubleTapTriggerObserver = PublishSubject<Void>()
+
+    let profileDoubleTapTrigger = profileDoubleTapTriggerObserver
       .withLatestFrom(timerActiveRelay) { !$1 }
       .asDriverOnErrorJustEmpty()
 
-    Driver.merge(cardDoubleTapTrigger, viewWillDisAppearTrigger)
+    Driver.merge(profileDoubleTapTrigger, viewWillDisAppearTrigger)
       .drive(timerActiveRelay)
       .disposed(by: disposeBag)
 
     let input = FallingHomeViewModel.Input(
       initialTrigger: initialTrigger,
-      timeOverTrigger: timerOverTrigger)
+      timeOverTrigger: timerOverTrigger,
+      cellButtonAction: fallingCellButtonAction.asDriverOnErrorJustEmpty()
+    )
 
     let output = viewModel.transform(input: input)
 
@@ -78,13 +85,15 @@ final class FallingHomeViewController: TFBaseViewController {
 
       cell.bind(
         FallinguserCollectionViewCellModel(userDomain: item),
-        timerActiveTrigger,
-        scrollToNextObserver: timeOverSubject
+        timerActiveTrigger: timerActiveTrigger,
+        timeOverSubject: timeOverSubject,
+        profileDoubleTapTriggerObserver: profileDoubleTapTriggerObserver,
+        fallingCellButtonAction: fallingCellButtonAction
       )
     }
 
     let footerRegistration = UICollectionView.SupplementaryRegistration
-    <UICollectionReusableView>(elementKind: ElementKind.footer.rawValue) { _,_,_ in }
+    <UICollectionReusableView>(elementKind: UICollectionView.elementKindSectionFooter) { _,_,_ in }
 
     dataSource = DataSource(collectionView: homeView.collectionView, cellProvider: { collectionView, indexPath, itemIdentifier in
       return collectionView.dequeueConfiguredReusableCell(using: profileCellRegistration, for: indexPath, item: itemIdentifier)
@@ -117,6 +126,14 @@ final class FallingHomeViewController: TFBaseViewController {
           animated: true
         )})
       .disposed(by: self.disposeBag)
+
+    output.info
+      .drive(with: self) { owner, indexPath in
+        guard let cell = owner.homeView.collectionView.cellForItem(at: indexPath) as? FallingUserCollectionViewCell
+        else { return }
+        cell.userInfoCollectionView.isHidden.toggle()
+      }
+      .disposed(by: disposeBag)
   }
 }
 

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

@@ -23,11 +23,13 @@ final class FallingHomeViewModel: ViewModelType {
   struct Input {
     let initialTrigger: Driver<Void>
     let timeOverTrigger: Driver<Void>
+    let cellButtonAction: Driver<FallingCellButtonAction>
   }
 
   struct Output {
     let userList: Driver<[FallingUser]>
     let nextCardIndexPath: Driver<IndexPath>
+    let info: Driver<IndexPath>
   }
 
   init(fallingUseCase: FallingUseCaseInterface) {
@@ -59,10 +61,18 @@ final class FallingHomeViewModel: ViewModelType {
       updateScrollIndexTrigger
     ).withLatestFrom(currentIndexRelay.asDriver(onErrorJustReturn: 0)
       .map { IndexPath(row: $0, section: 0) })
+
+    let info = input.cellButtonAction
+      .compactMap { action -> IndexPath? in
+        if case let .info(indexPath) = action {
+          return indexPath
+        } else { return nil }
+      }
 
     return Output(
       userList: userList,
-      nextCardIndexPath: nextCardIndexPath
+      nextCardIndexPath: nextCardIndexPath,
+      info: info
     )
   }
 }