Merge pull request #4510 from Abhinavreddy-B/resume-playback-on-start

Implemented autoplay option on opening the app
fast4x · Nov 13, 2024 · abebb7a · abebb7a
2 parents 6b824a5 + abe7fa6
commit abebb7a
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/modern/PlayerServiceModern.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/modern/PlayerServiceModern.kt
@@ -147,6 +147,7 @@ import it.fast4x.rimusic.utils.playbackFadeAudioDurationKey
 import it.fast4x.rimusic.utils.preferences
 import it.fast4x.rimusic.utils.putEnum
 import it.fast4x.rimusic.utils.queueLoopTypeKey
+import it.fast4x.rimusic.utils.resumePlaybackOnStartKey
 import it.fast4x.rimusic.utils.resumePlaybackWhenDeviceConnectedKey
 import it.fast4x.rimusic.utils.setLikeState
 import it.fast4x.rimusic.utils.showDownloadButtonBackgroundPlayerKey
@@ -437,6 +438,7 @@ class PlayerServiceModern : MediaLibraryService(),
         // Load persistent queue when start activity and save periodically in background
         if (isPersistentQueueEnabled) {
             maybeRestorePlayerQueue()
+            maybeResumePlaybackOnStart()
 
             val scheduler = Executors.newScheduledThreadPool(1)
             scheduler.scheduleWithFixedDelay({
@@ -1306,6 +1308,13 @@ class PlayerServiceModern : MediaLibraryService(),
         }
     }
 
+    private fun maybeResumePlaybackOnStart() {
+        if(!isPersistentQueueEnabled || !preferences.getBoolean(resumePlaybackOnStartKey, false)) return
+
+        if(!player.isPlaying) {
+            player.play()
+        }
+    }
 
     @ExperimentalCoroutinesApi
     @FlowPreview

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/settings/UiSettings.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/settings/UiSettings.kt
@@ -166,6 +166,7 @@ import it.fast4x.rimusic.utils.queueTypeKey
 import it.fast4x.rimusic.utils.recommendationsNumberKey
 import it.fast4x.rimusic.utils.rememberEqualizerLauncher
 import it.fast4x.rimusic.utils.rememberPreference
+import it.fast4x.rimusic.utils.resumePlaybackOnStartKey
 import it.fast4x.rimusic.utils.resumePlaybackWhenDeviceConnectedKey
 import it.fast4x.rimusic.utils.shakeEventEnabledKey
 import it.fast4x.rimusic.utils.showButtonPlayerAddToPlaylistKey
@@ -220,6 +221,8 @@ fun DefaultUiSettings() {
     exoPlayerMinTimeForEvent = ExoPlayerMinTimeForEvent.`20s`
     var persistentQueue by rememberPreference(persistentQueueKey, false)
     persistentQueue = false
+    var resumePlaybackOnStart by rememberPreference(resumePlaybackOnStartKey, false)
+    resumePlaybackOnStart = false
     var closebackgroundPlayer by rememberPreference(closebackgroundPlayerKey, false)
     closebackgroundPlayer = false
     var closeWithBackButton by rememberPreference(closeWithBackButtonKey, true)
@@ -530,6 +533,7 @@ fun UiSettings(
         ExoPlayerMinTimeForEvent.`20s`
     )
     var persistentQueue by rememberPreference(persistentQueueKey, false)
+    var resumePlaybackOnStart by rememberPreference(resumePlaybackOnStartKey, false)
     var closebackgroundPlayer by rememberPreference(closebackgroundPlayerKey, false)
     var closeWithBackButton by rememberPreference(closeWithBackButtonKey, true)
     var resumePlaybackWhenDeviceConnected by rememberPreference(
@@ -1075,6 +1079,23 @@ fun UiSettings(
                 }
             )
             RestartPlayerService(restartService, onRestart = { restartService = false })
+
+            AnimatedVisibility(visible = persistentQueue) {
+                Column(
+                    modifier = Modifier.padding(start = 25.dp)
+                ) {
+                    SwitchSettingEntry(
+                        title =  stringResource(R.string.resume_playback_on_start),
+                        text = stringResource(R.string.resume_automatically_when_app_opens),
+                        isChecked = resumePlaybackOnStart,
+                        onCheckedChange = {
+                            resumePlaybackOnStart = it
+                            restartService = true
+                        }
+                    )
+                    RestartPlayerService(restartService, onRestart = { restartService = false } )
+                }
+            }
         }
 
 

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/Preferences.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/Preferences.kt
@@ -60,6 +60,7 @@ const val skipMediaOnErrorKey = "skipMediaOnError"
 const val volumeNormalizationKey = "volumeNormalization"
 const val resumePlaybackWhenDeviceConnectedKey = "resumePlaybackWhenDeviceConnected"
 const val persistentQueueKey = "persistentQueue"
+const val resumePlaybackOnStartKey = "resumePlaybackOnStart"
 const val closebackgroundPlayerKey = "closebackgroundPlayer"
 const val closeWithBackButtonKey = "closeWithBackButton"
 const val isShowingSynchronizedLyricsKey = "isShowingSynchronizedLyrics"

diff --git a/composeApp/src/androidMain/res/values/strings.xml b/composeApp/src/androidMain/res/values/strings.xml
@@ -778,4 +778,6 @@
     <string name="failed_to_remove_thumbnail">Failed to Remove Thumbnail</string>
     <string name="showsecondline">Show Translation in the Second Line</string>
     <string name="enter_the_value">Enter The Value</string>
+    <string name="resume_playback_on_start">Resume Playback On Start</string>
+    <string name="resume_automatically_when_app_opens">Resume Playback automatically when the app is opened</string>
 </resources>