make seek preview chapter to be seek preview text, so not only the chapter can be shown

Author: theScrabi

new-player/src/main/java/net/newpipe/newplayer/ui/common/thumb_preview/ThumbPreview.kt

@@ -28,12 +28,27 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Slider
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -93,9 +108,11 @@ internal fun ThumbPreview(
         ) {
             // Together with the getHeight() function this Box ensures that the thumbnail
             // does not collapse and glitch during enter and exit animation.
-            Box(Modifier
-                .fillMaxSize()
-                .background(Color.Red)) {
+            Box(
+                Modifier
+                    .fillMaxSize()
+                    .background(Color.Red)
+            ) {
                 // this allows the current thumbnail to remain when animated visibility is being hidden
                 var lastAvailableImage by remember {
                     mutableStateOf(uiState.currentSeekPreviewThumbnail)
@@ -182,7 +199,11 @@ private fun ThumbPreviewPreview() {
                     seekerPosition = sliderPosition,
                     seekPreviewVisible = thumbDown,
                     currentSeekPreviewThumbnail = previewThumbnail.asImageBitmap(),
-                    currentSeekPreviewChapter = Chapter(0, "What a wonderfull chapter", null)
+                    currentSeekPreviewText = Chapter(
+                        0,
+                        "What a wonderfull chapter",
+                        null
+                    ).chapterTitle
                 ),
                 additionalStartPaddingPxls = startOffset,
                 additionalEndPaddingPxls = endOffset,

new-player/src/main/java/net/newpipe/newplayer/uiModel/NewPlayerUIState.kt

@@ -185,10 +185,10 @@ data class NewPlayerUIState(
     val currentSeekPreviewThumbnail: ImageBitmap?,
 
     /**
-     * The seeker preview chapter that should be visible. This updates if the user uses
-     * the seeker thumb to seek through a stream. If null no chapter is available.
+     * The seeker preview text that should be visible when the playback position is changed through
+     * the seek bar. If null no text will be rendered.
      */
-    val currentSeekPreviewChapter: Chapter?,
+    val currentSeekPreviewText: String?,
 
     /**
      * Depicts weather the seeker preview thumbnail should be visible or not.
@@ -227,7 +227,7 @@ data class NewPlayerUIState(
             currentlyPlayingTracks = emptyList(),
             enteringPip = false,
             currentSeekPreviewThumbnail = null,
-            currentSeekPreviewChapter = null,
+            currentSeekPreviewText = null,
             seekPreviewVisible = false,
         )
 

new-player/src/main/java/net/newpipe/newplayer/uiModel/NewPlayerViewModelImpl.kt

@@ -476,8 +476,7 @@ class NewPlayerViewModelImpl @Inject constructor(
         newPlayer?.currentPosition = seekPositionInMs
         Log.i(TAG, "Seek to Ms: $seekPositionInMs")
 
-        updateSeekPreviewThumbnail(seekPositionInMs)
-        updateSeekPreviewChapter(seekPositionInMs)
+        updateSeekPreview(seekPositionInMs)
         mutableUiState.update {
             it.copy(
                 seekerPosition = newValue,
@@ -487,35 +486,27 @@ class NewPlayerViewModelImpl @Inject constructor(
         }
     }
 
-    private fun updateSeekPreviewChapter(seekPositionInMs: Long) {
-        viewModelScope.launch {
-            val chapters = mutableUiState.value.chapters
-            val chapter = chapters.lastOrNull {
-                it.chapterStartInMs < seekPositionInMs
-            }
-            mutableUiState.update {
-                it.copy(
-                    currentSeekPreviewChapter = chapter,
-                    seekPreviewVisible = true
-                )
-            }
-        }
-    }
-
-    private fun updateSeekPreviewThumbnail(seekPositionInMs: Long) {
+    private fun updateSeekPreview(seekPositionInMs: Long) {
         updatePreviewThumbnailJob?.cancel()
 
         updatePreviewThumbnailJob = viewModelScope.launch {
 
             val item = newPlayer?.currentlyPlaying?.value?.let {
                 newPlayer?.getItemFromMediaItem(it)
             }
+
+            val chapters = mutableUiState.value.chapters
+            val chapter = chapters.lastOrNull {
+                it.chapterStartInMs < seekPositionInMs
+            }
+
             item?.let {
                 val bitmap =
                     newPlayer?.repository?.getPreviewThumbnail(item, seekPositionInMs)
 
                 mutableUiState.update {
                     it.copy(
+                        currentSeekPreviewText = chapter?.chapterTitle,
                         currentSeekPreviewThumbnail = bitmap?.asImageBitmap(),
                         seekPreviewVisible = true
                     )