Trying Auto Skip

app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt

@@ -138,6 +138,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         const val NOTIFICATION_ID = 2326
         const val CHANNEL_ID = 7340
         const val STOP_ACTION = "stopcs3"
+        private const val SKIP_CHAPTER_AUTO_CLICK_COUNTDOWN_SECONDS = 5
 
         private var lastUsedGenerator: IGenerator? = null
         fun newInstance(generator: IGenerator, syncData: HashMap<String, String>? = null): Bundle {
@@ -1996,12 +1997,90 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun onDestroyView() {
+        clearSkipChapterAutoClick()
         binding = null
         super.onDestroyView()
     }
 
     var skipAnimator: ValueAnimator? = null
     var skipIndex = 0
+    private var currentTimestamp: VideoSkipStamp? = null
+    private var skipAutoClickRunnable: Runnable? = null
+    private var skipAutoClickSecondsRemaining: Int? = null
+    private var skipAutoClickIndex: Int? = null
+    private var skipAutoClickTimestamp: VideoSkipStamp? = null
+
+    private fun isAutoSkipPopupEnabled(): Boolean {
+        val ctx = context ?: return false
+        return PreferenceManager.getDefaultSharedPreferences(ctx).getBoolean(
+            ctx.getString(R.string.auto_skip_popup_key),
+            false
+        )
+    }
+
+    private fun updateSkipChapterButtonText() {
+        val text = currentTimestamp?.let { timestamp ->
+            if (isAutoSkipPopupEnabled()) {
+                skipAutoClickSecondsRemaining?.let { seconds ->
+                    txt(R.string.skip_chapter_countdown_format, timestamp.uiText, seconds)
+                } ?: timestamp.uiText
+            } else {
+                timestamp.uiText
+            }
+        }
+        playerBinding?.skipChapterButton?.setText(text)
+    }
+
+    private fun clearSkipChapterAutoClick() {
+        val button = playerBinding?.skipChapterButton
+
+        skipAutoClickRunnable?.let { runnable ->
+            button?.removeCallbacks(runnable)
+        }
+
+        skipAutoClickRunnable = null
+        skipAutoClickSecondsRemaining = null
+        skipAutoClickIndex = null
+        skipAutoClickTimestamp = null
+    }
+    private fun startSkipChapterAutoClick(timestamp: VideoSkipStamp, currentIndex: Int) {
+        if (
+            skipAutoClickRunnable != null &&
+            skipAutoClickIndex == currentIndex &&
+            skipAutoClickTimestamp == timestamp
+        ) return
+
+        clearSkipChapterAutoClick()
+        if (!isAutoSkipPopupEnabled()) {
+            updateSkipChapterButtonText()
+            return
+        }
+
+        skipAutoClickIndex = currentIndex
+        skipAutoClickTimestamp = timestamp
+        skipAutoClickSecondsRemaining = SKIP_CHAPTER_AUTO_CLICK_COUNTDOWN_SECONDS
+        updateSkipChapterButtonText()
+
+        val runnable = object : Runnable {
+            override fun run() {
+                if (skipIndex != currentIndex || currentTimestamp != timestamp) return
+
+                val nextSeconds = (skipAutoClickSecondsRemaining ?: return) - 1
+                if (nextSeconds <= 0) {
+                    clearSkipChapterAutoClick()
+                    player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
+                    return
+                }
+
+                skipAutoClickSecondsRemaining = nextSeconds
+                updateSkipChapterButtonText()
+                playerBinding?.skipChapterButton?.handler?.postDelayed(this, 1000)
+            }
+        }
+
+        skipAutoClickRunnable = runnable
+        playerBinding?.skipChapterButton?.handler?.postDelayed(runnable, 1000)
+    }
 
     private fun displayTimeStamp(show: Boolean) {
         if (timestampShowState == show) return
@@ -2053,19 +2132,25 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun onTimestampSkipped(timestamp: VideoSkipStamp) {
+        currentTimestamp = null
+        clearSkipChapterAutoClick()
         displayTimeStamp(false)
     }
 
     override fun onTimestamp(timestamp: VideoSkipStamp?) {
         if (timestamp != null) {
+            currentTimestamp = timestamp
             playerBinding?.skipChapterButton?.setText(timestamp.uiText)
             displayTimeStamp(true)
             val currentIndex = skipIndex
             playerBinding?.skipChapterButton?.handler?.postDelayed({
                 if (skipIndex == currentIndex)
                     displayTimeStamp(false)
             }, 6000)
+            startSkipChapterAutoClick(timestamp, currentIndex)
         } else {
+            currentTimestamp = null
+            clearSkipChapterAutoClick()
             displayTimeStamp(false)
         }
     }

app/src/main/res/layout/player_custom_layout.xml

@@ -620,11 +620,12 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/skip_chapter_button"
                 style="@style/NiceButton"
-                android:layout_width="150dp"
+                android:layout_width="190dp"
                 android:layout_height="40dp"
                 android:layout_marginTop="60dp"
                 android:layout_marginEnd="100dp"
                 android:backgroundTint="@color/skipOpTransparent"
+                android:ellipsize="end"
                 android:maxLines="1"
                 android:padding="10dp"
                 android:textColor="@color/white"
@@ -1137,4 +1138,4 @@
 
         </androidx.recyclerview.widget.RecyclerView>
     </LinearLayout>
-</FrameLayout>
+</FrameLayout>

app/src/main/res/layout/player_custom_layout_tv.xml

@@ -315,10 +315,11 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/skip_chapter_button"
                 style="@style/NiceButton"
-                android:layout_width="150dp"
+                android:layout_width="190dp"
                 android:layout_height="40dp"
                 android:layout_marginEnd="100dp"
                 android:backgroundTint="@color/skipOpTransparent"
+                android:ellipsize="end"
                 android:maxLines="1"
                 android:nextFocusLeft="@id/player_pause_play"
                 android:nextFocusUp="@id/player_restart"
@@ -1145,4 +1146,4 @@
         </androidx.recyclerview.widget.RecyclerView>
     </LinearLayout>
 
-</FrameLayout>
+</FrameLayout>

app/src/main/res/values/donottranslate-strings.xml

@@ -38,6 +38,7 @@
     <string name="android_tv_interface_on_seek_key">android_tv_interface_on_seek_key</string>
     <string name="swipe_vertical_enabled_key">swipe_vertical_enabled_key</string>
     <string name="autoplay_next_key">autoplay_next_key</string>
+    <string name="auto_skip_popup_key">auto_skip_popup_key</string>
     <string name="display_sub_key">display_sub_key</string>
     <string name="show_fillers_key">show_fillers_key</string>
     <string name="show_player_metadata_key">show_player_metadata_key</string>

app/src/main/res/values/strings.xml

@@ -156,6 +156,8 @@
     <string name="swipe_to_change_settings_des">Slide up or down on the left or right side to change brightness or volume</string>
     <string name="autoplay_next_settings">Autoplay next episode</string>
     <string name="autoplay_next_settings_des">Start the next episode when the current one ends</string>
+    <string name="auto_skip_popup_settings">Auto-skip OP</string>
+    <string name="auto_skip_popup_settings_des">Automatically SKIP OP after 5 seconds</string>
     <string name="double_tap_to_seek_settings">Double tap to seek</string>
     <string name="double_tap_to_pause_settings">Double tap to pause</string>
     <string name="double_tap_to_seek_amount_settings">Player seek amount (Seconds)</string>
@@ -561,6 +563,7 @@
     <string name="skip_type_mixed_op">Mixed opening</string>
     <string name="skip_type_creddits">Credits</string>
     <string name="skip_type_intro">Intro</string>
+    <string name="skip_chapter_countdown_format" formatted="true">%1$s (%2$d)</string>
     <string name="clear_history">Clear history</string>
     <string name="history">History</string>
     <string name="enable_skip_op_from_database_des">Show skip popups for opening/ending</string>

app/src/main/res/xml/settings_player.xml

@@ -98,6 +98,12 @@
             android:title="@string/video_skip_op"
             app:defaultValue="true"
             app:key="@string/enable_skip_op_from_database" />
+        <SwitchPreference
+            android:icon="@drawable/ic_baseline_skip_next_24"
+            android:summary="@string/auto_skip_popup_settings_des"
+            android:title="@string/auto_skip_popup_settings"
+            app:defaultValue="false"
+            app:key="@string/auto_skip_popup_key" />
         <SwitchPreference
             android:icon="@drawable/screen_rotation"
             android:summary="@string/rotate_video_desc"
@@ -222,4 +228,4 @@
             app:seekBarIncrement="5"
             app:showSeekBarValue="true" />
     </PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen>