From f066fb8ea2efee54da7d6d3fef6cc84eff7af8d0 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 16 Feb 2023 17:26:53 -0400
Subject: [PATCH] Tweak media transition fade.

---
 .../securesms/mediapreview/MediaPreviewV2Activity.kt      | 5 ++++-
 .../securesms/mediapreview/MediaPreviewV2Fragment.kt      | 8 --------
 app/src/main/res/layout/fragment_media_preview_v2.xml     | 1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Activity.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Activity.kt
index e7e9354090..e52bc5bf82 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Activity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Activity.kt
@@ -111,7 +111,10 @@ class MediaPreviewV2Activity : PassphraseRequiredActivity(), VoiceNoteMediaContr
       }.distinctUntilChanged().subscribe { (isInSharedAnimation, loadState) ->
         if (!isInSharedAnimation && loadState == MediaPreviewV2State.LoadState.MEDIA_READY) {
           transitionImageView.clearAnimation()
-          transitionImageView.animate().alpha(0f)
+          transitionImageView.animate()
+            .setInterpolator(PathInterpolatorCompat.create(0.17f, 0.17f, 0f, 1f))
+            .setDuration(200)
+            .alpha(0f)
         }
       }
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
index 4041c05387..dd0a803876 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
@@ -185,14 +185,6 @@ class MediaPreviewV2Fragment : LoggingFragment(R.layout.fragment_media_preview_v
   private fun initializeFullScreenUi() {
     fullscreenHelper.configureToolbarLayout(binding.toolbarCutoutSpacer, binding.toolbar)
     fullscreenHelper.showAndHideWithSystemUI(requireActivity().window, binding.toolbarLayout, binding.mediaPreviewDetailsContainer)
-
-    lifecycleDisposable += viewModel.state.map {
-      it.isInSharedAnimation to it.loadState
-    }.distinctUntilChanged().subscribe { (isInSharedAnimation, loadState) ->
-      if (!isInSharedAnimation && loadState == MediaPreviewV2State.LoadState.MEDIA_READY) {
-        binding.toolbarLayout.animate().alpha(1f)
-      }
-    }
   }
 
   private fun bindCurrentState(currentState: MediaPreviewV2State) {
diff --git a/app/src/main/res/layout/fragment_media_preview_v2.xml b/app/src/main/res/layout/fragment_media_preview_v2.xml
index 29c85aff74..196da61edf 100644
--- a/app/src/main/res/layout/fragment_media_preview_v2.xml
+++ b/app/src/main/res/layout/fragment_media_preview_v2.xml
@@ -54,7 +54,6 @@
         android:id="@+id/toolbar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:alpha="0"
         android:background="@color/signal_dark_colorSurface_87"
         app:elevation="0dp">