feat: Chapter additions

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

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.graphics.Color
 import android.graphics.Rect
 import android.media.AudioManager
 import android.os.Build
@@ -29,6 +30,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.media3.common.C
 import androidx.media3.ui.DefaultTimeBar
+import androidx.media3.ui.PlayerControlView
 import androidx.media3.ui.PlayerView
 import androidx.navigation.navArgs
 import dagger.hilt.android.AndroidEntryPoint
@@ -144,6 +146,18 @@ class PlayerActivity : BasePlayerActivity() {
                                 it.currentTrickPlay = currentTrickPlay
                             }
 
+                            // Chapters
+                            if (appPreferences.showChapterMarkers && currentChapters != null) {
+                                currentChapters?.let { chapters ->
+                                    val playerControlView = findViewById<PlayerControlView>(R.id.exo_controller)
+                                    val numOfChapters = chapters.size
+                                    playerControlView.setExtraAdGroupMarkers(
+                                        LongArray(numOfChapters) { index -> chapters[index].startPosition },
+                                        BooleanArray(numOfChapters) { false },
+                                    )
+                                }
+                            }
+
                             // File Loaded
                             if (fileLoaded) {
                                 audioButton.isEnabled = true
@@ -239,9 +253,12 @@ class PlayerActivity : BasePlayerActivity() {
             pictureInPicture()
         }
 
+        // Set marker color
+        val timeBar = binding.playerView.findViewById<DefaultTimeBar>(R.id.exo_progress)
+        timeBar.setAdMarkerColor(Color.WHITE)
+
         if (appPreferences.playerTrickPlay) {
             val imagePreview = binding.playerView.findViewById<ImageView>(R.id.image_preview)
-            val timeBar = binding.playerView.findViewById<DefaultTimeBar>(R.id.exo_progress)
             previewScrubListener = PreviewScrubListener(
                 imagePreview,
                 timeBar,

app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt

@@ -23,6 +23,7 @@ import dev.jdtech.jellyfin.AppPreferences
 import dev.jdtech.jellyfin.Constants
 import dev.jdtech.jellyfin.PlayerActivity
 import dev.jdtech.jellyfin.isControlsLocked
+import dev.jdtech.jellyfin.models.PlayerChapter
 import dev.jdtech.jellyfin.mpv.MPVPlayer
 import timber.log.Timber
 import kotlin.math.abs
@@ -74,21 +75,19 @@ class PlayerGestureHelper(
                 return true
             }
 
-            @SuppressLint("SetTextI18n")
             override fun onLongPress(e: MotionEvent) {
                 // Disables long press gesture if view is locked
                 if (isControlsLocked) return
 
                 // Stop long press gesture when more than 1 pointer
                 if (currentNumberOfPointers > 1) return
 
-                playerView.player?.let {
-                    if (it.isPlaying) {
-                        lastPlaybackSpeed = it.playbackParameters.speed
-                        it.setPlaybackSpeed(playbackSpeedIncrease)
-                        activity.binding.gestureSpeedText.text = playbackSpeedIncrease.toString() + "x"
-                        activity.binding.gestureSpeedLayout.visibility = View.VISIBLE
-                    }
+                // This is a temporary solution for chapter skipping.
+                // TODO: Remove this after implementing #636
+                if (appPreferences.playerGesturesChapterSkip) {
+                    handleChapterSkip(e)
+                } else {
+                    enableSpeedIncrease()
                 }
             }
 
@@ -123,6 +122,55 @@ class PlayerGestureHelper(
         },
     )
 
+    @SuppressLint("SetTextI18n")
+    private fun enableSpeedIncrease() {
+        playerView.player?.let {
+            if (it.isPlaying) {
+                lastPlaybackSpeed = it.playbackParameters.speed
+                it.setPlaybackSpeed(playbackSpeedIncrease)
+                activity.binding.gestureSpeedText.text = playbackSpeedIncrease.toString() + "x"
+                activity.binding.gestureSpeedLayout.visibility = View.VISIBLE
+            }
+        }
+    }
+
+    private fun handleChapterSkip(e: MotionEvent) {
+        if (isControlsLocked) {
+            return
+        }
+
+        val viewWidth = playerView.measuredWidth
+        val areaWidth = viewWidth / 5 // Divide the view into 5 parts: 2:1:2
+
+        // Define the areas and their boundaries
+        val leftmostAreaStart = 0
+        val middleAreaStart = areaWidth * 2
+        val rightmostAreaStart = middleAreaStart + areaWidth
+
+        when (e.x.toInt()) {
+            in leftmostAreaStart until middleAreaStart -> {
+                activity.viewModel.seekToPreviousChapter()?.let { chapter ->
+                    displayChapter(chapter)
+                }
+            }
+            in rightmostAreaStart until viewWidth -> {
+                if (activity.viewModel.isLastChapter() == true) {
+                    playerView.player?.seekToNextMediaItem()
+                    return
+                }
+                activity.viewModel.seekToNextChapter()?.let { chapter ->
+                    displayChapter(chapter)
+                }
+            }
+            else -> return
+        }
+    }
+
+    private fun displayChapter(chapter: PlayerChapter) {
+        activity.binding.progressScrubberLayout.visibility = View.VISIBLE
+        activity.binding.progressScrubberText.text = chapter.name ?: ""
+    }
+
     private fun fastForward() {
         val currentPosition = playerView.player?.currentPosition ?: 0
         val fastForwardPosition = currentPosition + appPreferences.playerSeekForwardIncrement

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/exo_controller">
 
     <androidx.media3.ui.AspectRatioFrameLayout
         android:id="@id/exo_content_frame"
@@ -82,9 +83,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <View
-        android:id="@id/exo_controller_placeholder"
+    <androidx.media3.ui.PlayerControlView
+        android:id="@id/exo_controller"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:animation_enabled="false"/>
 
 </merge>

app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Episodes.kt

@@ -55,6 +55,7 @@ val dummyEpisode = FindroidEpisode(
     seasonId = UUID.randomUUID(),
     communityRating = 9.2f,
     images = FindroidImages(),
+    chapters = null,
 )
 
 val dummyEpisodes = listOf(

app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Movies.kt

@@ -55,6 +55,7 @@ val dummyMovie = FindroidMovie(
     endDate = null,
     trailer = "https://www.youtube.com/watch?v=puKWa8hrvA8",
     images = FindroidImages(),
+    chapters = null,
 )
 
 val dummyMovies = listOf(

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

@@ -103,8 +103,10 @@
     <string name="player_gestures_vb">Volume and brightness gestures</string>
     <string name="player_gestures_zoom">Zoom gesture</string>
     <string name="player_gestures_seek">Seek gesture</string>
+    <string name="player_gestures_chapter_skip">Chapter gesture</string>
     <string name="player_gestures_vb_summary">Swipe up and down on the right side of the screen to change the volume and on the left side to change the brightness</string>
     <string name="player_gestures_zoom_summary">Pinch to fill the screen with the video</string>
+    <string name="player_gestures_chapter_skip_summary">Long press on Left / Right side to skip chapters (overrides 2x speed gesture)</string>
     <string name="player_gestures_seek_summary">Swipe horizontally to seek forwards or backwards</string>
     <string name="player_brightness_remember">Remember brightness level</string>
     <string name="player_start_maximized">Start maximized</string>
@@ -145,6 +147,8 @@
     <string name="pref_player_intro_skipper_summary">Requires ConfusedPolarBear\'s Intro Skipper plugin to be installed on the server</string>
     <string name="pref_player_trick_play">Trick Play</string>
     <string name="pref_player_trick_play_summary">Requires nicknsy\'s Jellyscrub plugin to be installed on the server</string>
+    <string name="pref_player_chapter_markers">Chapter markers</string>
+    <string name="pref_player_chapter_markers_summary">Display chapter markers on the timebar</string>
     <string name="addresses">Addresses</string>
     <string name="add_address">Add address</string>
     <string name="add_server_address">Add server address</string>

core/src/main/res/xml/fragment_settings_player.xml

@@ -59,6 +59,12 @@
             app:key="pref_player_gestures_seek"
             app:summary="@string/player_gestures_seek_summary"
             app:title="@string/player_gestures_seek" />
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:dependency="pref_player_gestures"
+            app:key="pref_player_gestures_chapter_skip"
+            app:summary="@string/player_gestures_chapter_skip_summary"
+            app:title="@string/player_gestures_chapter_skip" />
         <SwitchPreferenceCompat
             app:dependency="pref_player_gestures_vb"
             app:key="pref_player_brightness_remember"
@@ -97,6 +103,13 @@
         app:title="@string/pref_player_trick_play"
         app:widgetLayout="@layout/preference_material3_switch" />
 
+    <SwitchPreferenceCompat
+        app:defaultValue="true"
+        app:key="pref_player_chapter_markers"
+        app:summary="@string/pref_player_chapter_markers_summary"
+        app:title="@string/pref_player_chapter_markers"
+        app:widgetLayout="@layout/preference_material3_switch" />
+
     <PreferenceCategory app:title="@string/picture_in_picture">
         <SwitchPreferenceCompat
             app:key="pref_player_picture_in_picture_gesture"