feature added: resume last playback

app/src/main/java/dev/anilbeesetti/nextplayer/ui/MainScreen.kt

@@ -34,6 +34,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
@@ -46,6 +48,7 @@ import dev.anilbeesetti.nextplayer.core.ui.components.DoneButton
 import dev.anilbeesetti.nextplayer.core.ui.components.NextCenterAlignedTopAppBar
 import dev.anilbeesetti.nextplayer.core.ui.components.NextDialog
 import dev.anilbeesetti.nextplayer.core.ui.designsystem.NextIcons
+import dev.anilbeesetti.nextplayer.feature.player.PlayerViewModel
 import dev.anilbeesetti.nextplayer.navigation.MEDIA_ROUTE
 import dev.anilbeesetti.nextplayer.navigation.mediaNavGraph
 import dev.anilbeesetti.nextplayer.navigation.startPlayerActivity
@@ -59,9 +62,11 @@ const val MAIN_ROUTE = "main_screen_route"
 fun MainScreen(
     permissionState: PermissionState,
     mainNavController: NavHostController,
-    mediaNavController: NavHostController
+    mediaNavController: NavHostController,
+    playerViewModel: PlayerViewModel = hiltViewModel()
 ) {
     val context = LocalContext.current
+    val preferences by playerViewModel.playerPrefs.collectAsStateWithLifecycle()
     var showUrlDialog by rememberSaveable { mutableStateOf(false) }
     val selectVideoFileLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.GetContent(),
@@ -74,6 +79,16 @@ fun MainScreen(
                 verticalArrangement = Arrangement.spacedBy(12.dp),
                 modifier = Modifier.windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal))
             ) {
+                if (preferences.lastPlayback.isNotEmpty()) {
+                    FloatingActionButton(
+                        onClick = { context.startPlayerActivity(Uri.parse(preferences.lastPlayback)) }
+                    ) {
+                        Icon(
+                            imageVector = NextIcons.Play,
+                            contentDescription = stringResource(id = R.string.resume_last_playback)
+                        )
+                    }
+                }
                 FloatingActionButton(
                     onClick = { selectVideoFileLauncher.launch("video/*") }
                 ) {

core/model/src/main/java/dev/anilbeesetti/nextplayer/core/model/PlayerPreferences.kt

@@ -17,6 +17,8 @@ data class PlayerPreferences(
     val seekIncrement: Int = 10,
     val autoplay: Boolean = true,
     val autoPip: Boolean = true,
+    val lastPlayback: String = "",
+    val lastNetworkPlaybackPosition: Long = 0L,
 
     // Controls (Gestures)
     val useSwipeControls: Boolean = true,

core/ui/src/main/java/dev/anilbeesetti/nextplayer/core/ui/designsystem/NextIcons.kt

@@ -38,6 +38,7 @@ import androidx.compose.material.icons.rounded.Palette
 import androidx.compose.material.icons.rounded.PhotoSizeSelectSmall
 import androidx.compose.material.icons.rounded.PictureInPictureAlt
 import androidx.compose.material.icons.rounded.Pinch
+import androidx.compose.material.icons.rounded.PlayArrow
 import androidx.compose.material.icons.rounded.PlayCircle
 import androidx.compose.material.icons.rounded.PriorityHigh
 import androidx.compose.material.icons.rounded.RadioButtonUnchecked
@@ -97,6 +98,7 @@ object NextIcons {
     val PhotoSize = Icons.Rounded.PhotoSizeSelectSmall
     val Pip = Icons.Rounded.PictureInPictureAlt
     val Pinch = Icons.Rounded.Pinch
+    val Play = Icons.Rounded.PlayArrow
     val Player = Icons.Rounded.PlayCircle
     val Priority = Icons.Rounded.PriorityHigh
     val Replay = Icons.Rounded.Replay10

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

@@ -115,6 +115,7 @@
     <string name="example_url" translatable="false">http://example.com/example.mp4</string>
     <string name="network_stream">Network Stream</string>
     <string name="play_file">Open video file to play</string>
+    <string name="resume_last_playback">Resume last playback</string>
     <string name="play_url">Enter video url to play</string>
     <string name="default_name">Default</string>
     <string name="monospace">Monospace</string>

feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/PlayerActivity.kt

@@ -294,6 +294,11 @@ class PlayerActivity : AppCompatActivity() {
         super.onStart()
     }
 
+    override fun onPause() {
+        playlistManager.getCurrent()?.let { savePlayerState(it) }
+        super.onPause()
+    }
+
     override fun onStop() {
         binding.volumeGestureLayout.visibility = View.GONE
         binding.brightnessGestureLayout.visibility = View.GONE
@@ -519,10 +524,15 @@ class PlayerActivity : AppCompatActivity() {
         playlistManager.updateCurrent(uri)
         val isCurrentUriIsFromIntent = intent.data == uri
 
+        viewModel.saveCurrentPlayback(uri)
+
         viewModel.updateState(getPath(uri))
         if (isCurrentUriIsFromIntent && playerApi.hasPosition) {
             viewModel.currentPlaybackPosition = playerApi.position?.toLong()
         }
+        if (getPath(uri) == null && (uri.toString() == playerPreferences.lastPlayback)) {
+            viewModel.currentPlaybackPosition = playerPreferences.lastNetworkPlaybackPosition
+        }
 
         // Get all subtitles for current uri
         val apiSubs = if (isCurrentUriIsFromIntent) playerApi.getSubs() else emptyList()

feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/PlayerViewModel.kt

@@ -79,7 +79,10 @@ class PlayerViewModel @Inject constructor(
         currentSubtitleTrackIndex = subtitleTrackIndex
         currentPlaybackSpeed = playbackSpeed
 
-        if (path == null) return
+        if (path == null) {
+            saveCurrentNetworkPlaybackPosition(position)
+            return
+        }
 
         val newPosition = position.takeIf {
             position < duration - END_POSITION_OFFSET
@@ -97,6 +100,22 @@ class PlayerViewModel @Inject constructor(
         }
     }
 
+    fun saveCurrentPlayback(uri: Uri) {
+        viewModelScope.launch {
+            preferencesRepository.updatePlayerPreferences {
+                it.copy(lastPlayback = uri.toString())
+            }
+        }
+    }
+
+    private fun saveCurrentNetworkPlaybackPosition(position: Long) {
+        viewModelScope.launch {
+            preferencesRepository.updatePlayerPreferences {
+                it.copy(lastNetworkPlaybackPosition = position)
+            }
+        }
+    }
+
     fun setPlayerBrightness(value: Float) {
         viewModelScope.launch {
             preferencesRepository.updatePlayerPreferences { it.copy(playerBrightness = value) }