feat: update state collection to use collectAsStateWithLifecycle for better lifecycle management, force to kill app in service

Author: maxrave-dev

README.md

@@ -38,7 +38,7 @@ A FOSS YouTube Music client for Android with many features from<br>Spotify, Spon
     
 > **Warning**    
  > This app is in the beta stage, so it may have many bugs and make it crash. If you find any bugs,      
-> please create an issue or contact me via email or Discord server.    
+> please create an issue or contact me via email or Discord server.   
     
 ## Screenshots    
  <p align="center">          
@@ -96,7 +96,7 @@ sometimes, some songs or videos get the wrong lyrics
   ## Developer/Team    
 - [maxrave-dev](https://github.com/maxrave-dev/SimpMusic): Founder/Developer/Designer    
 - [Owen Connor](https://github.com/owencz1998): Discord Server Admin.    
-- [Ilian Delagrange](https://github.com/ilianoKokoro): Discord Server Admin.
+- [ilianoKokoro](https://github.com/ilianoKokoro): Discord Server Admin.
 
 We're looking for more contributors, all contributions are welcome!
 See our [CODE OF CONDUCT](https://github.com/maxrave-dev/SimpMusic/blob/jetpack_compose/CODE_OF_CONDUCT.md)
@@ -144,3 +144,5 @@ Crowdin and Sentry both have a free enterprise plan for Open-source projects. Fo
 
 Check out the Vercel open-source program:
 - https://vercel.com/open-source-program
+
+*This project is a part of SimpMusic.org Open-source project by me [maxrave-dev](https://github.com/maxrave-dev)*

app/src/main/java/com/maxrave/simpmusic/data/db/entities/ArtistEntity.kt

@@ -1,19 +1,24 @@
 package com.maxrave.simpmusic.data.db.entities
 
+import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.maxrave.simpmusic.data.type.ArtistType
 import com.maxrave.simpmusic.data.type.RecentlyType
+import kotlinx.parcelize.Parcelize
 import java.time.LocalDateTime
 
 @Entity(tableName = "artist")
+@Parcelize
 data class ArtistEntity(
     @PrimaryKey(autoGenerate = false)
     val channelId: String,
     val name: String,
     val thumbnails: String?,
     val followed: Boolean = false,
     val inLibrary: LocalDateTime = LocalDateTime.now(),
-) : RecentlyType, ArtistType {
+) : RecentlyType,
+    ArtistType,
+    Parcelable {
     override fun objectType() = RecentlyType.Type.ARTIST
 }

app/src/main/java/com/maxrave/simpmusic/di/MediaServiceModule.kt

@@ -29,7 +29,6 @@ import androidx.media3.exoplayer.audio.AudioSink
 import androidx.media3.exoplayer.audio.DefaultAudioSink
 import androidx.media3.exoplayer.audio.SilenceSkippingAudioProcessor
 import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
-import androidx.media3.exoplayer.source.preload.DefaultPreloadManager
 import androidx.media3.exoplayer.util.EventLogger
 import androidx.media3.extractor.ExtractorsFactory
 import androidx.media3.extractor.mkv.MatroskaExtractor
@@ -39,7 +38,6 @@ import com.maxrave.simpmusic.common.Config.CANVAS_CACHE
 import com.maxrave.simpmusic.common.Config.DOWNLOAD_CACHE
 import com.maxrave.simpmusic.common.Config.MAIN_PLAYER
 import com.maxrave.simpmusic.common.Config.PLAYER_CACHE
-import com.maxrave.simpmusic.common.Config.SECONDARY_PLAYER
 import com.maxrave.simpmusic.common.Config.SERVICE_SCOPE
 import com.maxrave.simpmusic.data.dataStore.DataStoreManager
 import com.maxrave.simpmusic.data.repository.MainRepository
@@ -53,7 +51,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.singleOrNull
+import kotlinx.coroutines.flow.lastOrNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import okhttp3.OkHttpClient
@@ -254,7 +252,7 @@ private fun provideResolvingDataSourceFactory(
                     .getStream(
                         id,
                         true,
-                    ).singleOrNull()
+                    ).lastOrNull()
                     ?.let {
                         Log.d("Stream", it)
                         Log.w("Stream", "Video")
@@ -277,7 +275,7 @@ private fun provideResolvingDataSourceFactory(
                     .getStream(
                         mediaId,
                         isVideo = false,
-                    ).singleOrNull()
+                    ).lastOrNull()
                     ?.let {
                         Log.d("Stream", it)
                         Log.w("Stream", "Audio")

app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaService.kt

@@ -7,7 +7,6 @@ import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
 import android.util.Log
-import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.DefaultMediaNotificationProvider
@@ -19,13 +18,16 @@ import com.google.common.util.concurrent.MoreExecutors
 import com.maxrave.simpmusic.R
 import com.maxrave.simpmusic.common.Config.MAIN_PLAYER
 import com.maxrave.simpmusic.common.MEDIA_NOTIFICATION
+import com.maxrave.simpmusic.di.mediaServiceModule
 import com.maxrave.simpmusic.service.test.CoilBitmapLoader
 import com.maxrave.simpmusic.ui.MainActivity
 import com.maxrave.simpmusic.ui.widget.BasicWidget
 import kotlinx.coroutines.runBlocking
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
+import org.koin.core.context.loadKoinModules
 import org.koin.core.qualifier.named
+import kotlin.system.exitProcess
 
 @UnstableApi
 class SimpleMediaService :
@@ -42,25 +44,20 @@ class SimpleMediaService :
 
     private val binder = MusicBinder()
 
-    inner class MusicBinder : Binder()
+    inner class MusicBinder : Binder() {
+        val service: SimpleMediaService
+            get() = this@SimpleMediaService
+    }
 
     override fun onBind(intent: Intent?): IBinder {
-        super.onBind(intent)
         Log.w("Service", "Simple Media Service Bound")
-        return binder
-    }
-
-    override fun onUnbind(intent: Intent?): Boolean {
-        if (simpleMediaServiceHandler.shouldReleaseOnTaskRemoved()) {
-            release()
-        }
-        Log.w("Service", "Simple Media Service Unbound")
-        return super.onUnbind(intent)
+        return super.onBind(intent) ?: binder
     }
 
     @UnstableApi
     override fun onCreate() {
         super.onCreate()
+        loadKoinModules(mediaServiceModule)
         Log.w("Service", "Simple Media Service Created")
         setMediaNotificationProvider(
             DefaultMediaNotificationProvider(
@@ -132,24 +129,20 @@ class SimpleMediaService :
         Log.w("Service", "Starting release process")
         runBlocking {
             try {
-                // Release handler first (contains coroutines and jobs)
-                simpleMediaServiceHandler.release()
-
                 // Release MediaSession and Player
                 mediaSession?.run {
+                    this.player.pause()
+                    this.player.playWhenReady = false
+                    this.player.release()
                     this.release()
-                    if (this.player.playbackState != Player.STATE_IDLE) {
-                        this.player.seekTo(0)
-                        this.player.playWhenReady = false
-                        this.player.stop()
-                    }
                 }
+                // Release handler first (contains coroutines and jobs)
+                simpleMediaServiceHandler.release()
                 mediaSession = null
                 Log.w("Service", "Simple Media Service Released")
             } catch (e: Exception) {
                 Log.e("Service", "Error during release", e)
             }
-            stopSelf()
         }
     }
 
@@ -170,6 +163,7 @@ class SimpleMediaService :
         if (simpleMediaServiceHandler.shouldReleaseOnTaskRemoved()) {
             release()
             super.onTaskRemoved(rootIntent)
+            exitProcess(0)
         }
     }
 

app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt

@@ -1530,8 +1530,6 @@ class SimpleMediaServiceHandler(
             mayBeSavePlaybackState()
 
             // Stop and release player
-            player.stop()
-            player.playWhenReady = false
             player.removeListener(this)
 
             // Release audio effects
@@ -1581,9 +1579,6 @@ class SimpleMediaServiceHandler(
             // Cancel coroutine scope
             coroutineScope.cancel()
 
-            // Clear callbacks
-            setNotificationLayout = null
-
             Log.w("ServiceHandler", "Handler released successfully. Scope active: ${coroutineScope.isActive}")
         } catch (e: Exception) {
             Log.e("ServiceHandler", "Error during release", e)

app/src/main/java/com/maxrave/simpmusic/ui/MainActivity.kt

@@ -32,7 +32,6 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -106,6 +105,18 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+    override fun onStart() {
+        super.onStart()
+        startMusicService()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        if (shouldUnbind) {
+            unbindService(serviceConnection)
+        }
+    }
+
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         Log.d("MainActivity", "onNewIntent: $intent")
@@ -215,9 +226,9 @@ class MainActivity : AppCompatActivity() {
             val navController = rememberNavController()
 
             val sleepTimerState by viewModel.sleepTimerState.collectAsStateWithLifecycle()
-            val nowPlayingData by viewModel.nowPlayingState.collectAsState()
-            val githubResponse by viewModel.githubResponse.collectAsState()
-            val intent by viewModel.intent.collectAsState()
+            val nowPlayingData by viewModel.nowPlayingState.collectAsStateWithLifecycle()
+            val githubResponse by viewModel.githubResponse.collectAsStateWithLifecycle()
+            val intent by viewModel.intent.collectAsStateWithLifecycle()
 
             val isTranslucentBottomBar by viewModel.getTranslucentBottomBar().collectAsStateWithLifecycle(DataStoreManager.FALSE)
             // MiniPlayer visibility logic
@@ -551,12 +562,12 @@ class MainActivity : AppCompatActivity() {
         Log.w("MainActivity", "onDestroy: Should stop service $shouldStopMusicService")
 
         // Always unbind service if it was bound to prevent MusicBinder leak
-        if (shouldStopMusicService && shouldUnbind) {
-            unbindService(serviceConnection)
+        if (shouldStopMusicService && shouldUnbind && isFinishing) {
             viewModel.isServiceRunning = false
         }
         unloadKoinModules(viewModelModule)
         super.onDestroy()
+        Log.d("MainActivity", "onDestroy: ")
     }
 
     override fun onRestart() {

app/src/main/java/com/maxrave/simpmusic/ui/component/LyricsView.kt

@@ -56,7 +56,6 @@ import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableIntStateOf
@@ -83,6 +82,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.media3.common.util.UnstableApi
 import androidx.navigation.NavController
 import coil3.compose.AsyncImage
@@ -132,7 +132,7 @@ fun LyricsView(
         mutableIntStateOf(0)
     }
     val listState = rememberLazyListState()
-    val current by timeLine.collectAsState()
+    val current by timeLine.collectAsStateWithLifecycle()
     var currentLineIndex by rememberSaveable {
         mutableIntStateOf(-1)
     }
@@ -302,9 +302,9 @@ fun FullscreenLyricsSheet(
 ) {
     val context = LocalContext.current
 
-    val screenDataState by sharedViewModel.nowPlayingScreenData.collectAsState()
-    val timelineState by sharedViewModel.timeline.collectAsState()
-    val controllerState by sharedViewModel.controllerState.collectAsState()
+    val screenDataState by sharedViewModel.nowPlayingScreenData.collectAsStateWithLifecycle()
+    val timelineState by sharedViewModel.timeline.collectAsStateWithLifecycle()
+    val controllerState by sharedViewModel.controllerState.collectAsStateWithLifecycle()
 
     val sheetState =
         rememberModalBottomSheetState(

app/src/main/java/com/maxrave/simpmusic/ui/component/ModalBottomSheet.kt

@@ -110,6 +110,7 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.dp
 import androidx.core.text.isDigitsOnly
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.media3.common.util.UnstableApi
 import androidx.navigation.NavController
 import coil3.compose.AsyncImage
@@ -176,10 +177,10 @@ fun InfoPlayerBottomSheet(
             }
     }
 
-    val screenDataState by sharedViewModel.nowPlayingScreenData.collectAsState()
+    val screenDataState by sharedViewModel.nowPlayingScreenData.collectAsStateWithLifecycle()
     val songEntity by sharedViewModel.nowPlayingState.map { it?.songEntity }.collectAsState(null)
     val format by sharedViewModel.format.collectAsState(null)
-    val downloadProgress by sharedViewModel.downloadFileProgress.collectAsState()
+    val downloadProgress by sharedViewModel.downloadFileProgress.collectAsStateWithLifecycle()
 
     if (downloadProgress != DownloadProgress.INIT) {
         Box(modifier = Modifier.fillMaxSize()) {
@@ -710,12 +711,12 @@ fun QueueBottomSheet(
     var overscrollJob by remember { mutableStateOf<Job?>(null) }
     var shouldShowQueueItemBottomSheet by rememberSaveable { mutableStateOf(false) }
     var clickMoreIndex by rememberSaveable { mutableIntStateOf(0) }
-    val screenDataState by sharedViewModel.nowPlayingScreenData.collectAsState()
+    val screenDataState by sharedViewModel.nowPlayingScreenData.collectAsStateWithLifecycle()
     val songEntity by sharedViewModel.nowPlayingState.map { it?.songEntity }.collectAsState(null)
     val queue by musicServiceHandler.queueData
         .mapLatest { it?.listTracks?.toList() ?: emptyList() }
         .collectAsState(emptyList())
-    val loadMoreState by musicServiceHandler.stateFlow.collectAsState()
+    val loadMoreState by musicServiceHandler.stateFlow.collectAsStateWithLifecycle()
     val endlessQueueEnable by dataStoreManager.endlessQueue.map { it == DataStoreManager.TRUE }.collectAsState(false)
 
     val shouldLoadMore =
@@ -1181,7 +1182,7 @@ fun NowPlayingBottomSheet(
 ) {
     val context = LocalContext.current
 
-    val uiState by viewModel.uiState.collectAsState()
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val coroutineScope = rememberCoroutineScope()
     val modelBottomSheetState =
         rememberModalBottomSheetState(