fix: restart on previous on player screen (#309)

Author: naveensingh

app/src/main/kotlin/org/fossify/musicplayer/activities/TrackActivity.kt

@@ -50,6 +50,7 @@ import org.fossify.musicplayer.extensions.getTrackCoverArt
 import org.fossify.musicplayer.extensions.getTrackFromUri
 import org.fossify.musicplayer.extensions.isReallyPlaying
 import org.fossify.musicplayer.extensions.loadGlideResource
+import org.fossify.musicplayer.extensions.maybeRestartOnPrevious
 import org.fossify.musicplayer.extensions.nextMediaItem
 import org.fossify.musicplayer.extensions.sendCommand
 import org.fossify.musicplayer.extensions.setRepeatMode
@@ -198,9 +199,9 @@ class TrackActivity : SimpleControllerActivity(), PlaybackSpeedListener {
 
     private fun setupButtons() = binding.apply {
         activityTrackToggleShuffle.setOnClickListener { withPlayer { toggleShuffle() } }
-        activityTrackPrevious.setOnClickListener { seekWithDelay(previous = true) }
+        activityTrackPrevious.setOnClickListener { seekToPrevious() }
         activityTrackPlayPause.setOnClickListener { togglePlayback() }
-        activityTrackNext.setOnClickListener { seekWithDelay() }
+        activityTrackNext.setOnClickListener { seekToNext() }
         activityTrackProgressCurrent.setOnClickListener { seekBack() }
         activityTrackProgressMax.setOnClickListener { seekForward() }
         activityTrackPlaybackSetting.setOnClickListener { togglePlaybackSetting() }
@@ -494,12 +495,24 @@ class TrackActivity : SimpleControllerActivity(), PlaybackSpeedListener {
         binding.activityTrackPlayPause.updatePlayPauseIcon(isPlaying, getProperTextColor())
     }
 
+    private fun seekToNext() {
+        seekCount += 1
+        seekWithDelay()
+    }
+
+    private fun seekToPrevious() {
+        withPlayer {
+            if (maybeRestartOnPrevious()) return@withPlayer
+            seekCount -= 1
+            seekWithDelay()
+        }
+    }
+
     /**
      * This is here so the player can quickly seek next/previous without doing too much work.
      * It probably won't be needed once https://github.com/androidx/media/issues/81 is resolved.
      */
-    private fun seekWithDelay(previous: Boolean = false) {
-        if (previous) seekCount -= 1 else seekCount += 1
+    private fun seekWithDelay() {
         seekJob?.cancel()
         seekJob = scope.launch {
             delay(timeMillis = SEEK_COALESCE_INTERVAL_MS)

app/src/main/kotlin/org/fossify/musicplayer/extensions/Player.kt

@@ -6,6 +6,7 @@ import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import org.fossify.commons.helpers.ensureBackgroundThread
 import org.fossify.musicplayer.helpers.PlaybackSetting
+import org.fossify.musicplayer.helpers.RESTART_ON_PREVIOUS_THRESHOLD
 import org.fossify.musicplayer.models.Track
 import org.fossify.musicplayer.models.toMediaItemsFast
 
@@ -99,6 +100,15 @@ fun Player.setRepeatMode(playbackSetting: PlaybackSetting) {
     }
 }
 
+fun Player.maybeRestartOnPrevious(): Boolean {
+     if (currentPosition > RESTART_ON_PREVIOUS_THRESHOLD) {
+         seekTo(0)
+         return true
+     } else {
+         return false
+     }
+}
+
 /**
  * Force seek to the next media item regardless of the current [Player.RepeatMode]. Returns true on success.
  */

app/src/main/kotlin/org/fossify/musicplayer/helpers/Constants.kt

@@ -66,6 +66,7 @@ const val SORT_PLAYLIST_PREFIX = "sort_playlist_"
 
 const val SEEK_INTERVAL_MS = 10000L
 const val SEEK_INTERVAL_S = 10
+const val RESTART_ON_PREVIOUS_THRESHOLD = 5000L
 
 const val SHOW_FILENAME_NEVER = 1
 const val SHOW_FILENAME_IF_UNAVAILABLE = 2

app/src/main/kotlin/org/fossify/musicplayer/playback/player/SimpleMusicPlayer.kt

@@ -9,6 +9,7 @@ import androidx.media3.exoplayer.source.ShuffleOrder.DefaultShuffleOrder
 import org.fossify.musicplayer.extensions.currentMediaItems
 import org.fossify.musicplayer.extensions.maybeForceNext
 import org.fossify.musicplayer.extensions.maybeForcePrevious
+import org.fossify.musicplayer.extensions.maybeRestartOnPrevious
 import org.fossify.musicplayer.extensions.move
 import org.fossify.musicplayer.extensions.shuffledMediaItemsIndices
 import org.fossify.musicplayer.inlines.indexOfFirstOrNull
@@ -37,18 +38,15 @@ class SimpleMusicPlayer(private val exoPlayer: ExoPlayer) : ForwardingPlayer(exo
 
     override fun seekToNext() {
         play()
-        if (!maybeForceNext()) {
-            super.seekToNext()
-        }
+        if (maybeForceNext()) return
+        super.seekToNext()
     }
 
     override fun seekToPrevious() {
         play()
-        if (currentPosition > 5000) {
-            seekTo(0)
-        } else if (!maybeForcePrevious()) {
-            super.seekToPrevious()
-        }
+        if (maybeRestartOnPrevious()) return
+        if (maybeForcePrevious()) return
+        super.seekToPrevious()
     }
 
     override fun seekToNextMediaItem() = seekToNext()