Add animations and fix ktlint

aniyomiorg · Aug 17, 2023 · b871a11 · b871a11
1 parent e54cb31
commit b871a11
Showing 1 changed file with 31 additions and 2 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
@@ -487,6 +487,7 @@ class PlayerActivity : BaseActivity() {
                         if (playerPreferences.mediaChapterSeek().get()) {
                             if (player.loadChapters().isNotEmpty()) {
                                 MPVLib.command(arrayOf("add", "chapter", "-1"))
+                                skipAnimation("Previous chapter", isForward = false)
                             }
                         } else {
                             changeEpisode(viewModel.getAdjacentEpisodeId(previous = true))
@@ -497,9 +498,10 @@ class PlayerActivity : BaseActivity() {
                         if (playerPreferences.mediaChapterSeek().get()) {
                             if (player.loadChapters().isNotEmpty()) {
                                 MPVLib.command(arrayOf("add", "chapter", "1"))
+                                skipAnimation("Next chapter", isForward = true)
                             } else {
-                                 doubleTapSeek(viewModel.getAnimeSkipIntroLength(), isDoubleTap = false)
-                                 playerControls.resetControlsFade()
+                                MPVLib.command(arrayOf("seek", viewModel.getAnimeSkipIntroLength().toString(), "relative+exact"))
+                                skipAnimation("Skipped opening", isForward = true)
                             }
                         } else {
                             changeEpisode(viewModel.getAdjacentEpisodeId(previous = false))
@@ -923,6 +925,33 @@ class PlayerActivity : BaseActivity() {
         MPVLib.command(arrayOf("seek", time.toString(), "relative+exact"))
     }
 
+    // Taken from util/AniSkipApi.kt
+    private fun skipAnimation(skipText: String, isForward: Boolean) {
+        binding.secondsView.binding.doubleTapSeconds.text = skipText
+
+        binding.secondsView.updateLayoutParams<ConstraintLayout.LayoutParams> {
+            rightToRight = if (isForward) ConstraintLayout.LayoutParams.PARENT_ID else ConstraintLayout.LayoutParams.UNSET
+            leftToLeft = if (isForward) ConstraintLayout.LayoutParams.UNSET else ConstraintLayout.LayoutParams.PARENT_ID
+        }
+        binding.secondsView.visibility = View.VISIBLE
+        binding.secondsView.isForward = isForward
+
+        val bindingBg = if (isForward) binding.ffwdBg else binding.rewBg
+
+        bindingBg.visibility = View.VISIBLE
+        bindingBg.animate().alpha(0.15f).setDuration(100).withEndAction {
+            binding.secondsView.animate().alpha(1f).setDuration(500).withEndAction {
+                binding.secondsView.animate().alpha(0f).setDuration(500).withEndAction {
+                    bindingBg.animate().alpha(0f).setDuration(100).withEndAction {
+                        bindingBg.visibility = View.GONE
+                        binding.secondsView.visibility = View.GONE
+                        binding.secondsView.alpha = 1f
+                    }
+                }
+            }
+        }.start()
+    }
+
     // Gesture Functions -- Start --
 
     internal fun initSeek() {