Merge pull request #70 from THT-Team/feat/userCard_animation

[#67]좌우로 움직이는 애니메이션 개선
THT-Team · Mar 3, 2024 · a257787 · a257787
2 parents ff92d20 + 2e1c784
commit a257787
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/Projects/Features/Falling/Src/Subviews/Cell/FallingUserCollectionViewCell.swift b/Projects/Features/Falling/Src/Subviews/Cell/FallingUserCollectionViewCell.swift
@@ -44,7 +44,7 @@ final class FallingUserCollectionViewCell: TFBaseCollectionViewCell {
 
   lazy var cardTimeView = CardTimeView()
 
-  private lazy var pauseView: PauseView = {
+  lazy var pauseView: PauseView = {
     let pauseView = PauseView(
       frame: CGRect(
         x: 0,
@@ -197,6 +197,7 @@ extension Reactive where Base: FallingUserCollectionViewCell {
       base.cardTimeView.timerView.strokeLayer.strokeEnd = strokeEnd
 
       base.profileCollectionView.transform = base.profileCollectionView.transform.rotated(by: timeState.rotateAngle)
+      base.pauseView.transform = base.profileCollectionView.transform.rotated(by: timeState.rotateAngle)
     }
   }
 

diff --git a/Projects/Features/Falling/Src/Subviews/Cell/FallinguserCollectionViewCellModel.swift b/Projects/Features/Falling/Src/Subviews/Cell/FallinguserCollectionViewCellModel.swift
@@ -90,30 +90,38 @@ enum TimeState {
     }
   }
 
-  // .pi / 360 == 1도
+  // .pi / 360 => 1도
   var rotateAngle: CGFloat {
     switch self {
     case .four:
-      // 8 10 => 초당 0.5도
+      // 8 10 => 초당 0.5도 (편도 / 2 1회)
       return .pi / 360 / 200
-    case .three:
-      // 6 8 => 초당 1도
-      return -.pi / 360 / 100
+    case .three(let value):
+      // 6 8 => 초당 2도 (왕복 1회)
+      let time = round((4-value/2) * 100) / 100
+      if time <= 0.5 { return -.pi / 360 / 50 }
+      else { return .pi / 360 / 50 }
     case .two(let value):
-      // 4 6 => 초당 2도
+      // 4 6 => 초당 4도 (왕복 2회)
       let time = round((3-value/2) * 100) / 100
-      if time <= 0.5 { return .pi / 360 / 50 }
-      else { return -.pi / 360 / 50 }
+      if time <= 0.25 { return -.pi / 360 / 25 }
+      else if 0.25 < time && time <= 0.5 { return .pi / 360 / 25 }
+      else if 0.5 < time && time <= 0.75 { return -.pi / 360 / 25 }
+      else { return .pi / 360 / 25 }
     case .one(let value):
-      // 2 4 => 초당 4도
-      let time = round((2-value/2) * 100) / 100
-      if time <= 0.25 { return .pi / 360 / 50 }
-      else if 0.25 < time && time <= 0.5 { return -.pi / 360 / 50 }
-      else if 0.5 < time && time <= 0.75 { return .pi / 360 / 50 }
-      else { return -.pi / 360 / 50 }
+      // 2 4 => 초당 8도 (왕복 4회)
+      let time = round((2-value/2) * 1000) / 1000
+      if time <= 0.125 { return -.pi / 360 / 12.5 }
+      else if 0.125 < time && time <= 0.25 { return .pi / 360 / 12.5 }
+      else if 0.25 < time && time <= 0.375 { return -.pi / 360 / 12.5 }
+      else if 0.375 < time && time <= 0.5 { return .pi / 360 / 12.5 }
+      else if 0.5 < time && time <= 0.625 { return -.pi / 360 / 12.5 }
+      else if 0.625 < time && time <= 0.75 { return .pi / 360 / 12.5 }
+      else if 0.75 < time && time <= 0.875 { return -.pi / 360 / 12.5 }
+      else { return .pi / 360 / 12.5 }
     case .zero:
       // 1 2 => 초당 1도
-      return .pi / 360 / 100
+      return -.pi / 360 / 100
     default:
       return 0
     }