feat(player): Add intro skip for media controls (#1108)

aniyomiorg · Aug 20, 2023 · 89e1da0 · 89e1da0
1 parent d04ae72
commit 89e1da0
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt
@@ -248,6 +248,7 @@ object SettingsPlayerScreen : SearchableSettings {
                 Preference.PreferenceItem.SwitchPreference(
                     pref = mediaChapterSeek,
                     title = stringResource(R.string.pref_media_control_chapter_seeking),
+                    subtitle = stringResource(R.string.pref_media_control_chapter_seeking_summary),
                 ),
                 Preference.PreferenceItem.InfoPreference(
                     title = stringResource(R.string.pref_category_player_aniskip_info),

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(getString(R.string.go_to_previous_chapter), isForward = false)
                             }
                         } else {
                             changeEpisode(viewModel.getAdjacentEpisodeId(previous = true))
@@ -497,6 +498,10 @@ class PlayerActivity : BaseActivity() {
                         if (playerPreferences.mediaChapterSeek().get()) {
                             if (player.loadChapters().isNotEmpty()) {
                                 MPVLib.command(arrayOf("add", "chapter", "1"))
+                                skipAnimation(getString(R.string.go_to_next_chapter), isForward = true)
+                            } else {
+                                MPVLib.command(arrayOf("seek", viewModel.getAnimeSkipIntroLength().toString(), "relative+exact"))
+                                skipAnimation(getString(R.string.go_to_after_opening), isForward = true)
                             }
                         } else {
                             changeEpisode(viewModel.getAdjacentEpisodeId(previous = false))
@@ -920,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() {

diff --git a/i18n/src/main/res/values/strings-aniyomi.xml b/i18n/src/main/res/values/strings-aniyomi.xml
@@ -106,7 +106,11 @@
     <string name="pref_skip_5" translatable="false">5s</string>
     <string name="pref_skip_3" translatable="false">3s</string>
     <string name="pref_skip_disable">Disable</string>
-    <string name="pref_media_control_chapter_seeking">Use media controls for chapter seeking</string>
+    <string name="pref_media_control_chapter_seeking">Seek chapters with media controls</string>
+    <string name="pref_media_control_chapter_seeking_summary">When enabled, using next will invoke the skip intro button if no chapters are found</string>
+    <string name="go_to_next_chapter">Next chapter</string>
+    <string name="go_to_previous_chapter">Previous chapter</string>
+    <string name="go_to_after_opening">Skipped opening</string>
     <string name="pref_player_smooth_seek">Enable precise seeking</string>
     <string name="pref_player_smooth_seek_summary">When enabled, seeking will not focus on keyframes, leading to slower but precise seeking</string>
     <string name="pref_player_fullscreen">Show content in display cutout</string>