feat: Skip credits

app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt

@@ -37,13 +37,15 @@ import dagger.hilt.android.AndroidEntryPoint
 import dev.jdtech.jellyfin.databinding.ActivityPlayerBinding
 import dev.jdtech.jellyfin.dialogs.SpeedSelectionDialogFragment
 import dev.jdtech.jellyfin.dialogs.TrackSelectionDialogFragment
+import dev.jdtech.jellyfin.models.FindroidSegment
 import dev.jdtech.jellyfin.utils.PlayerGestureHelper
 import dev.jdtech.jellyfin.utils.PreviewScrubListener
 import dev.jdtech.jellyfin.viewmodels.PlayerActivityViewModel
 import dev.jdtech.jellyfin.viewmodels.PlayerEvents
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
+import dev.jdtech.jellyfin.core.R as CoreR
 
 var isControlsLocked: Boolean = false
 
@@ -58,6 +60,8 @@ class PlayerActivity : BasePlayerActivity() {
     override val viewModel: PlayerActivityViewModel by viewModels()
     private var previewScrubListener: PreviewScrubListener? = null
     private var wasZoom: Boolean = false
+    private var oldSegment: FindroidSegment? = null
+    private var buttonPressed: Boolean = false
 
     private val isPipSupported by lazy {
         // Check if device has PiP feature
@@ -119,7 +123,8 @@ class PlayerActivity : BasePlayerActivity() {
         val audioButton = binding.playerView.findViewById<ImageButton>(R.id.btn_audio_track)
         val subtitleButton = binding.playerView.findViewById<ImageButton>(R.id.btn_subtitle)
         val speedButton = binding.playerView.findViewById<ImageButton>(R.id.btn_speed)
-        val skipIntroButton = binding.playerView.findViewById<Button>(R.id.btn_skip_intro)
+        val skipButton = binding.playerView.findViewById<Button>(R.id.btn_skip_intro)
+        val watchCreditsButton = binding.playerView.findViewById<Button>(R.id.btn_watch_credits)
         val pipButton = binding.playerView.findViewById<ImageButton>(R.id.btn_pip)
         val lockButton = binding.playerView.findViewById<ImageButton>(R.id.btn_lockview)
         val unlockButton = binding.playerView.findViewById<ImageButton>(R.id.btn_unlock)
@@ -133,13 +138,80 @@ class PlayerActivity : BasePlayerActivity() {
                             // Title
                             videoNameTextView.text = currentItemTitle
 
-                            // Skip Intro button
-                            skipIntroButton.isVisible = !isInPictureInPictureMode && currentIntro != null
-                            skipIntroButton.setOnClickListener {
-                                currentIntro?.let {
-                                    binding.playerView.player?.seekTo((it.introEnd * 1000).toLong())
+                            // Skip Button
+                            if (currentSegment != oldSegment) buttonPressed = false
+                            // Button Visibility and Text
+                            when (currentSegment?.type) {
+                                "intro" -> {
+                                    skipButton.text =
+                                        getString(CoreR.string.skip_intro_button)
+                                    skipButton.isVisible =
+                                        !isInPictureInPictureMode && !buttonPressed && (showSkip == true || (binding.playerView.isControllerFullyVisible && currentSegment?.skip == true))
+                                    watchCreditsButton.isVisible = false
                                 }
+
+                                "credit" -> {
+                                    skipButton.text =
+                                        if (binding.playerView.player?.hasNextMediaItem() == true) {
+                                            getString(CoreR.string.skip_credit_button)
+                                        } else {
+                                            getString(CoreR.string.skip_credit_button_last)
+                                        }
+                                    skipButton.isVisible =
+                                        !isInPictureInPictureMode && !buttonPressed && currentSegment?.skip == true && !binding.playerView.isControllerFullyVisible
+                                    watchCreditsButton.isVisible = skipButton.isVisible
+                                }
+
+                                else -> {
+                                    skipButton.isVisible = false
+                                    watchCreditsButton.isVisible = false
+                                }
+                            }
+                            binding.playerView.setControllerVisibilityListener(
+                                PlayerView.ControllerVisibilityListener { visibility ->
+                                    when (currentSegment?.type) {
+                                        "intro" -> {
+                                            skipButton.isVisible =
+                                                !buttonPressed && (showSkip == true || (visibility == View.VISIBLE && currentSegment?.skip == true))
+                                        }
+
+                                        "credit" -> {
+                                            skipButton.isVisible =
+                                                !buttonPressed && currentSegment?.skip == true && visibility == View.GONE
+                                            watchCreditsButton.isVisible = skipButton.isVisible
+                                        }
+                                    }
+                                },
+                            )
+                            // onClick
+                            if (currentSegment?.type == "credit") {
+                                watchCreditsButton.setOnClickListener {
+                                    buttonPressed = true
+                                    skipButton.isVisible = false
+                                    watchCreditsButton.isVisible = false
+                                }
+                            }
+                            skipButton.setOnClickListener {
+                                when (currentSegment?.type) {
+                                    "intro" -> {
+                                        currentSegment?.let {
+                                            binding.playerView.player?.seekTo((it.endTime * 1000).toLong())
+                                        }
+                                    }
+
+                                    "credit" -> {
+                                        if (binding.playerView.player?.hasNextMediaItem() == true) {
+                                            binding.playerView.player?.seekToNext()
+                                        } else {
+                                            finish()
+                                        }
+                                    }
+                                }
+                                buttonPressed = true
+                                skipButton.isVisible = false
+                                watchCreditsButton.isVisible = false
                             }
+                            oldSegment = currentSegment
 
                             // Trickplay
                             previewScrubListener?.let {

app/phone/src/main/res/layout/exo_player_view.xml

@@ -48,24 +48,6 @@
             android:textColor="@android:color/white"
             android:textSize="14sp" />
 
-        <Button
-            android:id="@+id/btn_skip_intro"
-            style="@style/Widget.Material3.Button.OutlinedButton.Icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_marginEnd="24dp"
-            android:layout_marginBottom="64dp"
-            android:text="@string/player_controls_skip_intro"
-            android:textColor="@android:color/white"
-            android:visibility="gone"
-            app:backgroundTint="@color/player_background"
-            app:icon="@drawable/ic_skip_forward"
-            app:iconGravity="end"
-            app:iconTint="@android:color/white"
-            app:strokeColor="@android:color/white"
-            tools:visibility="visible" />
-
     </androidx.media3.ui.AspectRatioFrameLayout>
 
     <androidx.media3.ui.SubtitleView
@@ -89,4 +71,33 @@
         android:layout_height="match_parent"
         app:animation_enabled="false"/>
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="end|bottom"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="64dp">
+
+        <Button
+            android:id="@+id/btn_watch_credits"
+            style="@style/Widget.Material3.Button.TonalButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:text="@string/watch_credits"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <Button
+            android:id="@+id/btn_skip_intro"
+            style="@style/Widget.Material3.Button.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:icon="@drawable/ic_skip_forward"
+            tools:visibility="visible" />
+
+    </LinearLayout>
+
 </merge>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="watch_credits">Watch credits</string>
+</resources>

core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt

@@ -20,11 +20,11 @@ import dev.jdtech.jellyfin.models.toFindroidEpisodeDto
 import dev.jdtech.jellyfin.models.toFindroidMediaStreamDto
 import dev.jdtech.jellyfin.models.toFindroidMovieDto
 import dev.jdtech.jellyfin.models.toFindroidSeasonDto
+import dev.jdtech.jellyfin.models.toFindroidSegmentsDto
 import dev.jdtech.jellyfin.models.toFindroidShowDto
 import dev.jdtech.jellyfin.models.toFindroidSourceDto
 import dev.jdtech.jellyfin.models.toFindroidTrickplayInfoDto
 import dev.jdtech.jellyfin.models.toFindroidUserDataDto
-import dev.jdtech.jellyfin.models.toIntroDto
 import dev.jdtech.jellyfin.repository.JellyfinRepository
 import java.io.File
 import java.util.UUID
@@ -47,7 +47,7 @@ class DownloaderImpl(
     ): Pair<Long, UiText?> {
         try {
             val source = jellyfinRepository.getMediaSources(item.id, true).first { it.id == sourceId }
-            val intro = jellyfinRepository.getIntroTimestamps(item.id)
+            val segments = jellyfinRepository.getSegmentsTimestamps(item.id)
             val trickplayInfo = if (item is FindroidSources) {
                 item.trickplayInfo?.get(sourceId)
             } else {
@@ -79,8 +79,8 @@ class DownloaderImpl(
                     if (trickplayInfo != null) {
                         downloadTrickplayData(item.id, sourceId, trickplayInfo)
                     }
-                    if (intro != null) {
-                        database.insertIntro(intro.toIntroDto(item.id))
+                    if (segments != null) {
+                        database.insertSegments(segments.toFindroidSegmentsDto(item.id))
                     }
                     val request = DownloadManager.Request(source.path.toUri())
                         .setTitle(item.name)
@@ -108,8 +108,8 @@ class DownloaderImpl(
                     if (trickplayInfo != null) {
                         downloadTrickplayData(item.id, sourceId, trickplayInfo)
                     }
-                    if (intro != null) {
-                        database.insertIntro(intro.toIntroDto(item.id))
+                    if (segments != null) {
+                        database.insertSegments(segments.toFindroidSegmentsDto(item.id))
                     }
                     val request = DownloadManager.Request(source.path.toUri())
                         .setTitle(item.name)
@@ -171,7 +171,7 @@ class DownloaderImpl(
 
         database.deleteUserData(item.id)
 
-        database.deleteIntro(item.id)
+        database.deleteSegments(item.id)
 
         File(context.filesDir, "trickplay/${item.id}").deleteRecursively()
     }

core/src/main/res/values-it/strings.xml

@@ -135,7 +135,7 @@
     <string name="add">Aggiungi</string>
     <string name="quick_connect">Connessione Rapida</string>
     <string name="pref_player_intro_skipper">Salta intro</string>
-    <string name="pref_player_intro_skipper_summary">Richiede il plugin Intro Skipper di ConfusedPolarBear installato sul server</string>
+    <string name="pref_player_intro_skipper_summary">Richiede il plugin <b>Intro Skipper</b> di <i>jumoog</i> installato sul server</string>
     <string name="player_gestures_seek_summary">Scorri orizzontalmente per posizionarti avanti o indietro</string>
     <string name="player_gestures_seek">Gesto posizionamento</string>
     <string name="audio">Audio</string>
@@ -147,6 +147,8 @@
     <string name="extra_info">Mostra più informazioni</string>
     <string name="amoled_theme">Tema scuro AMOLED</string>
     <string name="amoled_theme_summary">Usa il tema AMOLED con lo sfondo nero</string>
+    <string name="pref_player_trickplay">Anteprima</string>
+    <string name="pref_player_trickplay_summary">Richiede il plugin Jellyscrub di nicknsy installato sul server</string>
     <string name="size">Dimensione</string>
     <string name="privacy_policy_notice">Utilizzando Findroid accetti l\'<a href="https://raw.githubusercontent.com/jarnedemeulemeester/findroid/main/PRIVACY">informativa sulla privacy</a> che afferma che non raccogliamo alcun dato</string>
     <string name="episode_name_with_end">%1$d-%2$d. %3$s</string>
@@ -183,6 +185,9 @@
     <string name="live_tv">Diretta TV</string>
     <string name="play">Riproduci</string>
     <string name="remove_from_favorites">Rimuovi dai preferiti</string>
+    <string name="skip_intro_button">Salta intro</string>
+    <string name="skip_credit_button">Prossimo episodio</string>
+    <string name="skip_credit_button_last">Chiudi player</string>
     <string name="player_gestures_chapter_skip">Gesto per le scene</string>
     <string name="pref_player_chapter_markers">Marcatori delle scene</string>
     <string name="pref_player_chapter_markers_summary">Mostra i marcatori delle scene sulla timebar</string>

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

@@ -145,7 +145,7 @@
     <string name="pref_player_mpv_vo">Video output</string>
     <string name="pref_player_mpv_ao">Audio output</string>
     <string name="pref_player_intro_skipper">Intro Skipper</string>
-    <string name="pref_player_intro_skipper_summary">Requires ConfusedPolarBear\'s Intro Skipper plugin to be installed on the server</string>
+    <string name="pref_player_intro_skipper_summary">Requires <i>jumoog\'s</i> <b>Intro Skipper</b> plugin to be installed on the server</string>
     <string name="pref_player_trickplay">Trickplay</string>
     <string name="pref_player_trickplay_summary">Display preview images while scrubbing</string>
     <string name="pref_player_chapter_markers">Chapter markers</string>
@@ -192,4 +192,7 @@
     <string name="unmark_as_played">Unmark as played</string>
     <string name="add_to_favorites">Add to favorites</string>
     <string name="remove_from_favorites">Remove from favorites</string>
+    <string name="skip_intro_button">Skip Intro</string>
+    <string name="skip_credit_button">Next episode</string>
+    <string name="skip_credit_button_last">Close player</string>
 </resources>