From c34b95795f95306b128c352606e6b3d418ccb895 Mon Sep 17 00:00:00 2001
From: Jannik <seil0@mosad.xyz>
Date: Sun, 10 Jul 2022 12:52:42 +0200
Subject: [PATCH] fix rwd/ffwd button pos when animation is running, clean up
 rwd/ffwd animation handling

---
 .../ui/activity/player/PlayerActivity.kt      | 40 +++--------------
 app/src/main/res/layout/activity_player.xml   | 44 -------------------
 2 files changed, 7 insertions(+), 77 deletions(-)

diff --git a/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerActivity.kt b/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerActivity.kt
index 2fbc175..c3326db 100644
--- a/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerActivity.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerActivity.kt
@@ -229,7 +229,11 @@ class PlayerActivity : AppCompatActivity() {
                     else -> View.GONE
                 }
 
-                controlsBinding.exoPlayPause.isVisible = !playerBinding.loading.isVisible
+                // don't use isVisible to hide exoPlayPause, as it will set the visibility to GONE
+                controlsBinding.exoPlayPause.visibility = when(playerBinding.loading.isVisible) {
+                    true -> View.INVISIBLE
+                    false -> View.VISIBLE
+                }
 
                 if (state == ExoPlayer.STATE_ENDED && hasNextEpisode() && Preferences.autoplay) {
                     playNextEpisode()
@@ -383,44 +387,14 @@ class PlayerActivity : AppCompatActivity() {
         return (model.currentEpisode.nextEpisodeId != null && !model.currentEpisodeIsLastEpisode())
     }
 
-    /**
-     * TODO set position of rewind/fast forward indicators programmatically
-     */
-
     private fun rewind() {
         model.seekToOffset(rwdTime)
-
-        // hide/show needed components
-        playerBinding.exoDoubleTapIndicator.visibility = View.VISIBLE
-        playerBinding.ffwd10Indicator.visibility = View.INVISIBLE
-        controlsBinding.rwd10.visibility = View.INVISIBLE
-
-        playerBinding.rwd10Indicator.onAnimationEndCallback = {
-            playerBinding.exoDoubleTapIndicator.visibility = View.GONE
-            playerBinding.ffwd10Indicator.visibility = View.VISIBLE
-            controlsBinding.rwd10.visibility = View.VISIBLE
-        }
-
-        // run animation
-        playerBinding.rwd10Indicator.runOnClickAnimation()
+        controlsBinding.rwd10.runOnClickAnimation()
     }
 
     private fun fastForward() {
         model.seekToOffset(fwdTime)
-
-        // hide/show needed components
-        playerBinding.exoDoubleTapIndicator.visibility = View.VISIBLE
-        playerBinding.rwd10Indicator.visibility = View.INVISIBLE
-        controlsBinding.ffwd10.visibility = View.INVISIBLE
-
-        playerBinding.ffwd10Indicator.onAnimationEndCallback = {
-            playerBinding.exoDoubleTapIndicator.visibility = View.GONE
-            playerBinding.rwd10Indicator.visibility = View.VISIBLE
-            controlsBinding.ffwd10.visibility = View.VISIBLE
-        }
-
-        // run animation
-        playerBinding.ffwd10Indicator.runOnClickAnimation()
+        controlsBinding.ffwd10.runOnClickAnimation()
     }
 
     private fun playNextEpisode() {
diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml
index 81699da..3c89116 100644
--- a/app/src/main/res/layout/activity_player.xml
+++ b/app/src/main/res/layout/activity_player.xml
@@ -27,50 +27,6 @@
         app:indicatorColor="@color/player_white"
         tools:visibility="visible" />
 
-    <LinearLayout
-        android:id="@+id/exo_double_tap_indicator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
-        <org.mosad.teapod.ui.components.RewindButton
-            android:id="@+id/rwd_10_indicator"
-            android:layout_width="100dp"
-            android:layout_height="wrap_content" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
-        <Space
-            android:layout_width="60dp"
-            android:layout_height="1dp" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
-        <org.mosad.teapod.ui.components.FastForwardButton
-            android:id="@+id/ffwd_10_indicator"
-            android:layout_width="100dp"
-            android:layout_height="wrap_content" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-    </LinearLayout>
-
     <com.google.android.material.button.MaterialButton
         android:id="@+id/button_next_ep"
         android:layout_width="wrap_content"