Previous track button should replay last one chapter before position …

…threshold
GrakovNe · Nov 6, 2024 · f8702d1 · f8702d1
1 parent de1ecf5
commit f8702d1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         applicationId = "org.grakovne.lissen"
         minSdk = 28
         targetSdk = 35
-        versionCode = 22
-        versionName = "1.0.21"
+        versionCode = 23
+        versionName = "1.0.22"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -42,7 +42,7 @@ android {
         release {}
         debug {
             matchingFallbacks.add("release")
-            isDebuggable = false
+            isDebuggable = true
         }
     }
 

diff --git a/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/TrackControlComposable.kt b/app/src/main/java/org/grakovne/lissen/ui/screens/player/composable/TrackControlComposable.kt
@@ -123,19 +123,14 @@ fun TrackControlComposable(
             ) {
                 IconButton(
                     onClick = {
-                        if (currentTrackIndex > 0) {
-                            viewModel.previousTrack()
-                        }
+                        viewModel.previousTrack()
                     },
-                    enabled = currentTrackIndex > 0
+                    enabled = true
                 ) {
                     Icon(
                         imageVector = Icons.Rounded.SkipPrevious,
                         contentDescription = "Previous Track",
-                        tint = when (currentTrackIndex > 0) {
-                            true -> colorScheme.onBackground
-                            else -> colorScheme.onBackground.copy(alpha = 0.3f)
-                        },
+                        tint = colorScheme.onBackground,
                         modifier = Modifier.size(36.dp)
                     )
                 }

diff --git a/app/src/main/java/org/grakovne/lissen/viewmodel/PlayerViewModel.kt b/app/src/main/java/org/grakovne/lissen/viewmodel/PlayerViewModel.kt
@@ -135,8 +135,15 @@ class PlayerViewModel @Inject constructor(
     }
 
     fun previousTrack() {
-        val previousChapterIndex = currentChapterIndex.value?.let { it - 1 } ?: return
-        setChapter(previousChapterIndex)
+        val position = currentChapterPosition.value ?: return
+        val index = currentChapterIndex.value ?: return
+
+        val currentIndexReplay = (position > CURRENT_TRACK_REPLAY_THRESHOLD || index == 0)
+
+        when {
+            currentIndexReplay -> setChapter(index)
+            index > 0 -> setChapter(index - 1)
+        }
     }
 
     fun togglePlayPause() {
@@ -182,4 +189,9 @@ class PlayerViewModel @Inject constructor(
 
         return 0.0
     }
+
+    companion object {
+
+        private const val CURRENT_TRACK_REPLAY_THRESHOLD = 5
+    }
 }