diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt index b63191c19a9..ed0643a0601 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt @@ -670,6 +670,7 @@ class CS3IPlayer : IPlayer { companion object { private const val CRONET_TIMEOUT_MS = 15_000 + private const val SKIP_CHAPTER_END_MARGIN_MS = 500L /** * Single shared engine, to minimize the overhead of maintaining many as: @@ -1025,7 +1026,9 @@ class CS3IPlayer : IPlayer { if (lastTimeStamp.skipToNextEpisode) { handleEvent(CSPlayerEvent.NextEpisode, source) } else { - seekTo(lastTimeStamp.timestamp.endMs + 1L) + // A small margin past the end so the last frames + // of the skipped section are not shown + seekTo(lastTimeStamp.timestamp.endMs + SKIP_CHAPTER_END_MARGIN_MS) } event(TimestampSkippedEvent(timestamp = lastTimeStamp, source = source)) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt index d337d53a6c9..d3126edacf5 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt @@ -238,10 +238,12 @@ open class FullScreenPlayer : AbstractPlayerFragment( } open fun showMirrorsDialogue() { + onPlayerInteraction() throw NotImplementedError() } open fun showTracksDialogue() { + onPlayerInteraction() throw NotImplementedError() } @@ -250,10 +252,12 @@ open class FullScreenPlayer : AbstractPlayerFragment( loadResponse: LoadResponse?, dismissCallback: (() -> Unit) ) { + onPlayerInteraction() throw NotImplementedError() } open fun showEpisodesOverlay() { + onPlayerInteraction() throw NotImplementedError() } @@ -508,6 +512,7 @@ open class FullScreenPlayer : AbstractPlayerFragment( } private fun showSubtitleOffsetDialog() { + onPlayerInteraction() val ctx = context ?: return // Pause player because the subtitles cannot be continuously updated to follow playback. player.handleEvent( @@ -644,6 +649,7 @@ open class FullScreenPlayer : AbstractPlayerFragment( } private fun showSpeedDialog() { + onPlayerInteraction() val act = activity ?: return val isPlaying = player.getIsPlaying() player.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.UI) @@ -714,6 +720,7 @@ open class FullScreenPlayer : AbstractPlayerFragment( // this is the standard, expected suppression for this obtainStyledAttributes pattern. @SuppressLint("ResourceType") private fun showCompressorDialog() { + onPlayerInteraction() val act = activity ?: return val compressor = (player as? CS3IPlayer)?.compressor ?: return @@ -1093,11 +1100,20 @@ open class FullScreenPlayer : AbstractPlayerFragment( override fun isUIShowing(): Boolean = isShowing + /** + * Called whenever the user interacts with the player while it is active + * (tap, swipe or key press). Lets subclasses abort automatic actions + * such as the auto-skip countdown. + */ + override fun onPlayerInteraction() {} + override fun onSingleTap() { + onPlayerInteraction() onClickChange() } override fun onTouchDown() { + onPlayerInteraction() if (isShowingEpisodeOverlay) toggleEpisodesOverlay(show = false) } @@ -1294,6 +1310,10 @@ open class FullScreenPlayer : AbstractPlayerFragment( } private fun handleKeyEvent(event: KeyEvent, hasNavigated: Boolean): Boolean { + if (event.action == KeyEvent.ACTION_DOWN) { + onPlayerInteraction() + } + if (hasNavigated) { autoHide() return false @@ -1492,64 +1512,77 @@ open class FullScreenPlayer : AbstractPlayerFragment( } playerRotateBtt.setOnClickListener { + onPlayerInteraction() autoHide() toggleRotate() } // init clicks playerResizeBtt.setOnClickListener { + onPlayerInteraction() autoHide() nextResize() } playerSpeedBtt.setOnClickListener { + onPlayerInteraction() autoHide() showSpeedDialog() } playerCompressorBtt.setOnClickListener { + onPlayerInteraction() autoHide() showCompressorDialog() } playerSkipOp.setOnClickListener { + onPlayerInteraction() autoHide() skipOp() } playerSkipEpisode.setOnClickListener { + onPlayerInteraction() autoHide() player.handleEvent(CSPlayerEvent.NextEpisode) } playerGoForward.setOnClickListener { + onPlayerInteraction() autoHide() player.handleEvent(CSPlayerEvent.NextEpisode) } playerRestart.setOnClickListener { + onPlayerInteraction() autoHide() player.handleEvent(CSPlayerEvent.Restart) } playerLock.setOnClickListener { + onPlayerInteraction() autoHide() toggleLock() } playerSubtitleOffsetBtt.setOnClickListener { + onPlayerInteraction() showSubtitleOffsetDialog() } playerGoBack.setOnClickListener { + onPlayerInteraction() activity?.popCurrentPage("FullScreenPlayer") } playerSourcesBtt.setOnClickListener { + onPlayerInteraction() showMirrorsDialogue() } playerTracksBtt.setOnClickListener { + onPlayerInteraction() showTracksDialogue() } @@ -1563,6 +1596,7 @@ open class FullScreenPlayer : AbstractPlayerFragment( @SuppressLint("ClickableViewAccessibility") exoProgress.setOnTouchListener { _, event -> + onPlayerInteraction() // this makes the bar not disappear when sliding when (event.action) { MotionEvent.ACTION_DOWN, @@ -1577,6 +1611,7 @@ open class FullScreenPlayer : AbstractPlayerFragment( return@setOnTouchListener false } playerEpisodesButton.setOnClickListener { + onPlayerInteraction() toggleEpisodesOverlay(show = true) } } @@ -1621,6 +1656,7 @@ open class FullScreenPlayer : AbstractPlayerFragment( } private fun toggleEpisodesOverlay(show: Boolean) { + if (show) onPlayerInteraction() if (show && !isShowingEpisodeOverlay) { previousPlayStatus = player.getIsPlaying() player.handleEvent(CSPlayerEvent.Pause) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt index e4616c93bcf..f091de78f36 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt @@ -34,6 +34,7 @@ import androidx.core.text.toSpanned import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.lifecycleScope import androidx.lifecycle.viewModelScope import androidx.media3.common.Format.NO_VALUE import androidx.media3.common.MimeTypes @@ -128,6 +129,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.toPx import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getImageBitmapFromUrl import com.lagradost.cloudstream3.utils.setText import com.lagradost.cloudstream3.utils.txt +import com.lagradost.cloudstream3.utils.videoskip.SkipType import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp import com.lagradost.safefile.SafeFile import kotlinx.coroutines.Job @@ -147,6 +149,7 @@ class GeneratorPlayer : FullScreenPlayer() { const val NOTIFICATION_ID = 2326 const val CHANNEL_ID = 7340 const val STOP_ACTION = "stopcs3" + private const val DEFAULT_AUTO_SKIP_COUNTDOWN_SECONDS = 5 private val generators = ConcurrentHashMap>() fun newInstance( @@ -238,6 +241,12 @@ class GeneratorPlayer : FullScreenPlayer() { super.playerStatusChanged() if (player.getIsPlaying()) { viewModel.forceClearCache = false + } else { + // Never seek away while the user has paused or stopped the video + if (autoSkipJob?.isActive == true) { + declinedTimestamp = shownTimestamp + } + cancelAutoSkipCountdown() } } @@ -591,6 +600,7 @@ class GeneratorPlayer : FullScreenPlayer() { override fun openOnlineSubPicker( context: Context, loadResponse: LoadResponse?, dismissCallback: (() -> Unit) ) { + onPlayerInteraction() val providers = subsProviders.toList() val isSingleProvider = subsProviders.size == 1 @@ -1013,6 +1023,7 @@ class GeneratorPlayer : FullScreenPlayer() { override fun showMirrorsDialogue() { + onPlayerInteraction() try { currentSelectedSubtitles = player.getCurrentPreferredSubtitle() //println("CURRENT SELECTED :$currentSelectedSubtitles of $currentSubs") @@ -1408,6 +1419,7 @@ class GeneratorPlayer : FullScreenPlayer() { } override fun showTracksDialogue() { + onPlayerInteraction() try { //println("CURRENT SELECTED :$currentSelectedSubtitles of $currentSubs") context?.let { ctx -> @@ -1722,7 +1734,27 @@ class GeneratorPlayer : FullScreenPlayer() { var maxEpisodeSet: Int? = null var hasRequestedStamps: Boolean = false + private var lastRecordedPosition: Long = 0L + override fun playerPositionChanged(position: Long, duration: Long) { + if (position < lastRecordedPosition - 1000L) { + // User sought backwards: allow auto-skip to trigger again + declinedTimestamp = null + shownTimestamp = null + } else { + declinedTimestamp?.let { declined -> + if (position >= declined.timestamp.endMs || position < declined.timestamp.startMs) { + declinedTimestamp = null + } + } + shownTimestamp?.let { shown -> + if (position >= shown.timestamp.endMs || position < shown.timestamp.startMs) { + shownTimestamp = null + } + } + } + lastRecordedPosition = position + // Don't save livestream data if ((currentMeta as? ResultEpisode)?.tvType?.isLiveStream() == true) return @@ -2063,6 +2095,135 @@ class GeneratorPlayer : FullScreenPlayer() { var skipAnimator: ValueAnimator? = null var skipIndex = 0 + private var autoSkipJob: Job? = null + + /** + * Timestamp the user declined by interacting with the player during its + * countdown. Never auto-skip it again. + */ + private var declinedTimestamp: VideoSkipStamp? = null + + private fun isAutoSkipEnabled(timestamp: VideoSkipStamp): Boolean { + val ctx = context ?: return false + val prefs = PreferenceManager.getDefaultSharedPreferences(ctx) + if (!prefs.getBoolean(ctx.getString(R.string.auto_skip_popup_key), false)) { + return false + } + + // The user can select which skip types are automatically skipped + val enabledTypes = prefs.getStringSet( + ctx.getString(R.string.auto_skip_types_key), + SkipType.entries.map { it.name }.toSet() + ).orEmpty() + + return timestamp.timestamp.type.name in enabledTypes + } + + private fun getAutoSkipCountdownSeconds(): Int { + val ctx = context ?: return DEFAULT_AUTO_SKIP_COUNTDOWN_SECONDS + return PreferenceManager.getDefaultSharedPreferences(ctx).getInt( + ctx.getString(R.string.auto_skip_countdown_key), + DEFAULT_AUTO_SKIP_COUNTDOWN_SECONDS + ) + } + + private fun cancelAutoSkipCountdown() { + autoSkipJob?.cancel() + autoSkipJob = null + } + + private var hideSkipButtonRunnable: Runnable? = null + + private fun scheduleHideSkipButton(delayMs: Long) { + cancelHideSkipButton() + val runnable = Runnable { + displayTimeStamp(false) + } + hideSkipButtonRunnable = runnable + playerBinding?.skipChapterButton?.postDelayed(runnable, delayMs) + } + + private fun cancelHideSkipButton() { + hideSkipButtonRunnable?.let { + playerBinding?.skipChapterButton?.removeCallbacks(it) + } + hideSkipButtonRunnable = null + } + + private fun performSkip(timestamp: VideoSkipStamp) { + cancelHideSkipButton() + cancelAutoSkipCountdown() + player.handleEvent(CSPlayerEvent.SkipCurrentChapter) + val currentPos = player.getPosition() ?: 0L + if (currentPos < timestamp.timestamp.endMs && !timestamp.skipToNextEpisode) { + player.seekTo(timestamp.timestamp.endMs + 500L) + } + onTimestampSkipped(timestamp) + } + + /** + * Counts down on the skip button and skips the chapter once it reaches + * zero. The countdown is cancelled by any user interaction (see + * [onPlayerInteraction]) or when the player is paused, so the user + * always keeps manual control. + */ + private fun startAutoSkipCountdown(timestamp: VideoSkipStamp, currentIndex: Int) { + cancelAutoSkipCountdown() + if (!isAutoSkipEnabled(timestamp)) return + if (timestamp == declinedTimestamp) return + if (currentPlayerStatus == CSPlayerLoading.IsPaused) return + declinedTimestamp = null + + val countdownSeconds = getAutoSkipCountdownSeconds() + if (countdownSeconds <= 0) { + // Skip instantly when the countdown is set to zero + performSkip(timestamp) + return + } + + autoSkipJob = viewLifecycleOwner.lifecycleScope.launch { + try { + for (secondsRemaining in countdownSeconds downTo 1) { + if (skipIndex != currentIndex) return@launch + if (currentPlayerStatus == CSPlayerLoading.IsPaused) { + cancelAutoSkipCountdown() + declinedTimestamp = shownTimestamp + scheduleHideSkipButton(4000L) + return@launch + } + + playerBinding?.skipChapterButton?.setText( + txt( + R.string.skip_chapter_countdown_format, + timestamp.uiText, + secondsRemaining + ) + ) + delay(1000) + } + + if (skipIndex == currentIndex && currentPlayerStatus != CSPlayerLoading.IsPaused) { + performSkip(timestamp) + } + } finally { + // Restore the plain label no matter how the countdown ended + // (fired, cancelled or replaced by a new timestamp) + if (skipIndex == currentIndex && timestampShowState) { + playerBinding?.skipChapterButton?.setText(timestamp.uiText) + } + } + } + } + + override fun onPlayerInteraction() { + // The user wants manual control: stop the countdown and decline + // the currently shown timestamp if the countdown was active + if (autoSkipJob?.isActive == true) { + declinedTimestamp = shownTimestamp + cancelAutoSkipCountdown() + scheduleHideSkipButton(4000L) + } + } private fun displayTimeStamp(show: Boolean) { if (timestampShowState == show) return @@ -2115,19 +2276,42 @@ class GeneratorPlayer : FullScreenPlayer() { } override fun onTimestampSkipped(timestamp: VideoSkipStamp) { + cancelHideSkipButton() + cancelAutoSkipCountdown() displayTimeStamp(false) + shownTimestamp = null + declinedTimestamp = null } + /** Timestamp currently shown on the skip button */ + private var shownTimestamp: VideoSkipStamp? = null + override fun onTimestamp(timestamp: VideoSkipStamp?) { if (timestamp != null) { + // The player re-invokes the current timestamp on seeks and + // buffering transitions, so ignore it while the skip button is + // already showing it, otherwise the countdown restarts endlessly + if (timestamp == shownTimestamp && timestampShowState) return + + cancelHideSkipButton() + shownTimestamp = timestamp playerBinding?.skipChapterButton?.setText(timestamp.uiText) displayTimeStamp(true) val currentIndex = skipIndex - playerBinding?.skipChapterButton?.handler?.postDelayed({ - if (skipIndex == currentIndex) - displayTimeStamp(false) - }, 6000) + + val isAutoSkip = isAutoSkipEnabled(timestamp) && timestamp != declinedTimestamp + if (isAutoSkip) { + // Countdown will handle skipping and hiding when done + startAutoSkipCountdown(timestamp, currentIndex) + } else { + // Auto-skip is not active for this stamp: hide the manual skip button after 6s + scheduleHideSkipButton(6000L) + } } else { + cancelHideSkipButton() + shownTimestamp = null + declinedTimestamp = null + cancelAutoSkipCountdown() displayTimeStamp(false) } } @@ -2139,6 +2323,7 @@ class GeneratorPlayer : FullScreenPlayer() { } override fun showEpisodesOverlay() { + onPlayerInteraction() try { playerBinding?.apply { playerEpisodeList.setRecycledViewPool(EpisodeAdapter.sharedPool) @@ -2212,6 +2397,11 @@ class GeneratorPlayer : FullScreenPlayer() { @MainThread fun releasePlayer() { + cancelHideSkipButton() + cancelAutoSkipCountdown() + shownTimestamp = null + declinedTimestamp = null + lastRecordedPosition = 0L player.release() currentSelectedSubtitles = null currentSelectedLink = null diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt index c363a29b3aa..eb77db1a182 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt @@ -134,6 +134,8 @@ class PlayerView @JvmOverloads constructor( fun playerUpdated(player: Any?) {} /** Called on a short single-tap on empty player area (no swipe, no double-tap). */ fun onSingleTap() {} + /** Called whenever the user interacts with the player controls (tap, button click, etc.). */ + fun onPlayerInteraction() {} /** Called when the hold-for-speedup gesture starts (show=true) or ends (show=false). */ fun onHoldSpeedUp(show: Boolean) {} /** Called during brightness swipe with the current extra-brightness alpha (0–1). */ @@ -378,6 +380,7 @@ class PlayerView @JvmOverloads constructor( exoFfwdText?.text = context.getString(R.string.ffw_text_regular_format).format(seekSecs) playerPausePlay?.setOnClickListener { + callbacks?.onPlayerInteraction() scheduleAutoHide() if (currentPlayerStatus == CSPlayerLoading.IsEnded && isLayout(PHONE)) { player.handleEvent(CSPlayerEvent.Restart, PlayerEventSource.UI) @@ -386,10 +389,12 @@ class PlayerView @JvmOverloads constructor( } } playerRew?.setOnClickListener { + callbacks?.onPlayerInteraction() scheduleAutoHide() gestureHelper.rewind() } playerFfwd?.setOnClickListener { + callbacks?.onPlayerInteraction() scheduleAutoHide() gestureHelper.fastForward() } @@ -817,7 +822,9 @@ class PlayerView @JvmOverloads constructor( player.handleEvent(CSPlayerEvent.NextEpisode, source = PlayerEventSource.Player) } } - is PauseEvent -> Unit + is PauseEvent -> { + callbacks?.onPlayerInteraction() + } is PlayEvent -> Unit } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayerScreen.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayerScreen.kt index 8f6f5bf4f12..9b3ab7072f9 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayerScreen.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayerScreen.kt @@ -21,6 +21,7 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getFold import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment import com.lagradost.cloudstream3.utils.Coroutines.ioSafe +import com.lagradost.cloudstream3.utils.videoskip.SkipType import com.lagradost.cloudstream4.compose.EMULATOR import com.lagradost.cloudstream4.compose.PHONE import com.lagradost.cloudstream4.compose.TV @@ -28,6 +29,7 @@ import com.lagradost.cloudstream4.compose.isLayout import com.lagradost.cloudstream4.rememberAppSettings import com.mihon.presentation.settings.Preference import com.mihon.presentation.settings.SearchableSettings +import com.mihon.presentation.settings.collectAsState import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @@ -60,6 +62,8 @@ object SettingsPlayerScreen : SearchableSettings { } } + val autoSkipEnabled by settings.player.autoSkipEnabled.collectAsState() + return persistentListOf( Preference.PreferenceGroup( title = stringResource(R.string.pref_category_subtitles), @@ -160,6 +164,27 @@ object SettingsPlayerScreen : SearchableSettings { subtitle = stringResource(R.string.enable_skip_op_from_database_des), icon = painterResource(R.drawable.keyboard_double_arrow_right_24px), ), + Preference.PreferenceItem.SwitchPreference( + preference = settings.player.autoSkipEnabled, + title = stringResource(R.string.auto_skip_popup_settings), + subtitle = stringResource(R.string.auto_skip_popup_settings_des), + icon = painterResource(R.drawable.skip_next_24px), + ), + Preference.PreferenceItem.SliderPreference( + preference = settings.player.autoSkipCountdown, + title = stringResource(R.string.auto_skip_countdown_settings), + subtitle = stringResource(R.string.auto_skip_countdown_settings_des), + icon = painterResource(R.drawable.hourglass_24), + valueRange = 0..10, + enabled = autoSkipEnabled, + ), + Preference.PreferenceItem.MultiSelectListPreference( + preference = settings.player.autoSkipTypes, + title = stringResource(R.string.auto_skip_types_settings), + icon = painterResource(R.drawable.filter_alt_24px), + entries = SkipType.entries.associate { it.name to stringResource(it.res) }, + enabled = autoSkipEnabled, + ), Preference.PreferenceItem.SwitchPreference( preference = settings.player.autoRotateEnabled, title = stringResource(R.string.auto_rotate_video), diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml index 9a79e6590fc..76c499377a0 100644 --- a/app/src/main/res/layout/player_custom_layout.xml +++ b/app/src/main/res/layout/player_custom_layout.xml @@ -635,6 +635,7 @@ 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" diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml index 06ec055c828..57a34fa424e 100644 --- a/app/src/main/res/layout/player_custom_layout_tv.xml +++ b/app/src/main/res/layout/player_custom_layout_tv.xml @@ -329,6 +329,7 @@ android:layout_height="40dp" android:layout_marginEnd="100dp" android:maxLines="1" + android:ellipsize="end" android:nextFocusLeft="@id/player_pause_play" android:nextFocusUp="@id/player_restart" android:nextFocusDown="@id/player_pause_play" diff --git a/app/src/main/res/values/donottranslate-strings.xml b/app/src/main/res/values/donottranslate-strings.xml index bf1566cdb98..267e4b0b347 100644 --- a/app/src/main/res/values/donottranslate-strings.xml +++ b/app/src/main/res/values/donottranslate-strings.xml @@ -39,6 +39,9 @@ android_tv_interface_on_seek_key swipe_vertical_enabled_key autoplay_next_key + auto_skip_popup_key + auto_skip_countdown_key + auto_skip_types_key display_sub_key show_fillers_key show_player_metadata_key diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c429519967..1922713b57e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -158,6 +158,11 @@ Slide up or down on the left or right side to change brightness or volume Autoplay next episode Start the next episode when the current one ends + Auto skip + Automatically skip openings and endings after a countdown. Cancel by tapping the screen or pressing any key. + Auto-skip countdown (Seconds) + How long to wait before automatically skipping. Set to 0 to skip instantly + Auto-skip types Start videos paused Reduce stress when selecting sources Double tap to seek @@ -582,6 +587,7 @@ Credits Preview Intro + %1$s (%2$d) Clear history History Show skip popups for opening/ending diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml index f370fbcc9c2..9ff11d615f5 100644 --- a/app/src/main/res/xml/settings_player.xml +++ b/app/src/main/res/xml/settings_player.xml @@ -104,6 +104,12 @@ android:title="@string/video_skip_op" app:defaultValue="true" app:key="@string/enable_skip_op_from_database" /> +