From 83cc7d5181e8187b78723323abd9679b803e37f2 Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Tue, 5 Mar 2024 11:55:50 -0500
Subject: [PATCH] Adjust media tool button animation.

---
 .../v2/review/MediaReviewAnimatorController.kt   |  8 ++++----
 .../mediasend/v2/review/MediaReviewFragment.kt   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewAnimatorController.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewAnimatorController.kt
index 910ae16dbc..fe52627a14 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewAnimatorController.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewAnimatorController.kt
@@ -11,20 +11,20 @@ import org.thoughtcrime.securesms.util.visible
 
 object MediaReviewAnimatorController {
 
-  fun getFadeInAnimator(view: View, interpolator: Interpolator = MediaAnimations.interpolator, isEnabled: Boolean = true): Animator {
+  fun getFadeInAnimator(view: View, isEnabled: Boolean = true): Animator {
     view.visible = true
     view.isEnabled = isEnabled
 
     return ObjectAnimator.ofFloat(view, "alpha", view.alpha, 1f).apply {
-      setInterpolator(interpolator)
+      interpolator = MediaAnimations.interpolator
     }
   }
 
-  fun getFadeOutAnimator(view: View, interpolator: Interpolator = MediaAnimations.interpolator, isEnabled: Boolean = false): Animator {
+  fun getFadeOutAnimator(view: View, isEnabled: Boolean = false): Animator {
     view.isEnabled = isEnabled
 
     val animator = ObjectAnimator.ofFloat(view, "alpha", view.alpha, 0f).apply {
-      setInterpolator(interpolator)
+      interpolator = MediaAnimations.interpolator
     }
 
     animator.doOnEnd { view.visible = false }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
index 32d9b2cbe3..5060a3d693 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
@@ -696,36 +696,36 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
   private fun computeSaveButtonAnimators(state: MediaSelectionState): List<Animator> {
     return if (state.isTouchEnabled && !MediaUtil.isVideo(state.focusedMedia?.mimeType)) {
       listOf(
-        MediaReviewAnimatorController.getFadeInAnimator(saveButton, MediaAnimations.toolIconInterpolator)
+        MediaReviewAnimatorController.getFadeInAnimator(saveButton)
       )
     } else {
       listOf(
-        MediaReviewAnimatorController.getFadeOutAnimator(saveButton, MediaAnimations.toolIconInterpolator)
+        MediaReviewAnimatorController.getFadeOutAnimator(saveButton)
       )
     }
   }
 
   private fun computeQualityButtonAnimators(state: MediaSelectionState): List<Animator> {
     return if (state.isTouchEnabled && !state.isStory) {
-      listOf(MediaReviewAnimatorController.getFadeInAnimator(qualityButton, MediaAnimations.toolIconInterpolator))
+      listOf(MediaReviewAnimatorController.getFadeInAnimator(qualityButton))
     } else {
-      listOf(MediaReviewAnimatorController.getFadeOutAnimator(qualityButton, MediaAnimations.toolIconInterpolator))
+      listOf(MediaReviewAnimatorController.getFadeOutAnimator(qualityButton))
     }
   }
 
   private fun computeCropAndRotateButtonAnimators(state: MediaSelectionState): List<Animator> {
     return if (state.isTouchEnabled && MediaUtil.isImageAndNotGif(state.focusedMedia?.mimeType ?: "")) {
-      listOf(MediaReviewAnimatorController.getFadeInAnimator(cropAndRotateButton, MediaAnimations.toolIconInterpolator))
+      listOf(MediaReviewAnimatorController.getFadeInAnimator(cropAndRotateButton))
     } else {
-      listOf(MediaReviewAnimatorController.getFadeOutAnimator(cropAndRotateButton, MediaAnimations.toolIconInterpolator))
+      listOf(MediaReviewAnimatorController.getFadeOutAnimator(cropAndRotateButton))
     }
   }
 
   private fun computeDrawToolButtonAnimators(state: MediaSelectionState): List<Animator> {
     return if (state.isTouchEnabled && MediaUtil.isImageAndNotGif(state.focusedMedia?.mimeType ?: "")) {
-      listOf(MediaReviewAnimatorController.getFadeInAnimator(drawToolButton, MediaAnimations.toolIconInterpolator))
+      listOf(MediaReviewAnimatorController.getFadeInAnimator(drawToolButton))
     } else {
-      listOf(MediaReviewAnimatorController.getFadeOutAnimator(drawToolButton, MediaAnimations.toolIconInterpolator))
+      listOf(MediaReviewAnimatorController.getFadeOutAnimator(drawToolButton))
     }
   }