feat: enhance artist page functionality and UI, fix various issues

Author: maxrave-dev

.github/workflows/android.yml

@@ -1,4 +1,4 @@
-name: Build release APK (Full)
+name: Build release APK (FOSS)
 on:
   workflow_dispatch:
   push:
@@ -45,7 +45,7 @@ jobs:
           echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> ./local.properties
 
       - name: Build release APK
-        run: ./gradlew app:assembleFullRelease
+        run: ./gradlew app:assembleFossRelease
 
       - name: Check build-tools version
         shell: bash
@@ -57,7 +57,7 @@ jobs:
       - uses: kevin-david/zipalign-sign-android-release@v2
         id: sign_app
         with:
-          releaseDirectory: app/build/outputs/apk/full/release
+          releaseDirectory: app/build/outputs/apk/foss/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -70,4 +70,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: app
-          path: app/build/outputs/apk/full/release/*-signed.apk
+          path: app/build/outputs/apk/foss/release/*-signed.apk

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

@@ -7,6 +7,7 @@ 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
@@ -41,6 +42,22 @@ class SimpleMediaService :
 
     private val binder = MusicBinder()
 
+    inner class MusicBinder : Binder()
+
+    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)
+    }
+
     @UnstableApi
     override fun onCreate() {
         super.onCreate()
@@ -111,15 +128,28 @@ class SimpleMediaService :
     }
 
     @UnstableApi
-    private fun release() {
+    fun release() {
+        Log.w("Service", "Starting release process")
         runBlocking {
-            simpleMediaServiceHandler.release()
-            mediaSession?.run {
-                player.stop()
-                this.release()
-                player.release()
+            try {
+                // Release handler first (contains coroutines and jobs)
+                simpleMediaServiceHandler.release()
+
+                // Release MediaSession and Player
+                mediaSession?.run {
+                    this.release()
+                    if (this.player.playbackState != Player.STATE_IDLE) {
+                        this.player.seekTo(0)
+                        this.player.playWhenReady = false
+                        this.player.stop()
+                    }
+                }
                 mediaSession = null
+                Log.w("Service", "Simple Media Service Released")
+            } catch (e: Exception) {
+                Log.e("Service", "Error during release", e)
             }
+            stopSelf()
         }
     }
 
@@ -130,25 +160,19 @@ class SimpleMediaService :
     }
 
     override fun onTrimMemory(level: Int) {
-        super.onTrimMemory(level)
+        Log.w("Service", "Simple Media Service Trim Memory Level: $level")
         simpleMediaServiceHandler.mayBeSaveRecentSong()
     }
 
     @UnstableApi
     override fun onTaskRemoved(rootIntent: Intent?) {
+        Log.w("Service", "Simple Media Service Task Removed")
         if (simpleMediaServiceHandler.shouldReleaseOnTaskRemoved()) {
             release()
+            super.onTaskRemoved(rootIntent)
         }
-        super.onTaskRemoved(rootIntent)
     }
 
-    inner class MusicBinder : Binder() {
-        val service: SimpleMediaService
-            get() = this@SimpleMediaService
-    }
-
-    override fun onBind(intent: Intent?): IBinder = super.onBind(intent) ?: binder
-
     // Can't inject by Koin because it depend on service
     @UnstableApi
     private fun provideMediaLibrarySession(

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

@@ -106,7 +106,6 @@ class SimpleMediaServiceHandler(
     private var secondLoudnessEnhancer: LoudnessEnhancer? = null
 
     private var volumeNormalizationJob: Job? = null
-    private var volumeNormalizationForSecondPlayerJob: Job? = null
 
     private var sleepTimerJob: Job? = null
 
@@ -1524,28 +1523,71 @@ class SimpleMediaServiceHandler(
         }
 
     fun release() {
-        mayBeSaveRecentSong(true)
-        mayBeSavePlaybackState()
-        player.stop()
-        player.playWhenReady = false
-        player.removeListener(this)
-        sendCloseEqualizerIntent()
-        progressJob?.cancel()
-        progressJob = null
-        bufferedJob?.cancel()
-        bufferedJob = null
-        sleepTimerJob?.cancel()
-        sleepTimerJob = null
-        volumeNormalizationJob?.cancel()
-        volumeNormalizationJob = null
-        toggleLikeJob?.cancel()
-        toggleLikeJob = null
-        updateNotificationJob?.cancel()
-        updateNotificationJob = null
-        loadJob?.cancel()
-        loadJob = null
-        coroutineScope.cancel()
-        Log.w("Service", "scope is active: ${coroutineScope.isActive}")
+        Log.w("ServiceHandler", "Starting release process")
+        try {
+            // Save state first
+            mayBeSaveRecentSong(true)
+            mayBeSavePlaybackState()
+
+            // Stop and release player
+            player.stop()
+            player.playWhenReady = false
+            player.removeListener(this)
+
+            // Release audio effects
+            try {
+                loudnessEnhancer?.enabled = false
+                loudnessEnhancer?.release()
+                loudnessEnhancer = null
+
+                secondLoudnessEnhancer?.enabled = false
+                secondLoudnessEnhancer?.release()
+                secondLoudnessEnhancer = null
+            } catch (e: Exception) {
+                Log.e("ServiceHandler", "Error releasing audio effects", e)
+            }
+
+            // Send close equalizer intent
+            sendCloseEqualizerIntent()
+
+            // Cancel all jobs
+            progressJob?.cancel()
+            progressJob = null
+            bufferedJob?.cancel()
+            bufferedJob = null
+            sleepTimerJob?.cancel()
+            sleepTimerJob = null
+            volumeNormalizationJob?.cancel()
+            volumeNormalizationJob = null
+            toggleLikeJob?.cancel()
+            toggleLikeJob = null
+            updateNotificationJob?.cancel()
+            updateNotificationJob = null
+            loadJob?.cancel()
+            loadJob = null
+            songEntityJob?.cancel()
+            songEntityJob = null
+            downloadImageForWidgetJob?.cancel()
+            downloadImageForWidgetJob = null
+            getSkipSegmentsJob?.cancel()
+            getSkipSegmentsJob = null
+            getFormatJob?.cancel()
+            getFormatJob = null
+            jobWatchtime?.cancel()
+            jobWatchtime = null
+            getDataOfNowPlayingTrackStateJob?.cancel()
+            getDataOfNowPlayingTrackStateJob = null
+
+            // 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)
+        }
     }
 
     @SuppressLint("PrivateResource")

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

@@ -86,6 +86,8 @@ import java.util.Locale
 class MainActivity : AppCompatActivity() {
     val viewModel: SharedViewModel by inject()
 
+    private var mBound = false
+    private var shouldUnbind = false
     private val serviceConnection =
         object : ServiceConnection {
             override fun onServiceConnected(
@@ -94,11 +96,13 @@ class MainActivity : AppCompatActivity() {
             ) {
                 if (service is SimpleMediaService.MusicBinder) {
                     Log.w("MainActivity", "onServiceConnected: ")
+                    mBound = true
                 }
             }
 
             override fun onServiceDisconnected(name: ComponentName?) {
                 Log.w("MainActivity", "onServiceDisconnected: ")
+                mBound = false
             }
         }
 
@@ -117,11 +121,6 @@ class MainActivity : AppCompatActivity() {
 //        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this)
 //    }
 
-    override fun onResume() {
-        super.onResume()
-        Log.d("MainActivity", "onResume: ")
-    }
-
     @UnstableApi
     @ExperimentalMaterial3Api
     @ExperimentalFoundationApi
@@ -548,10 +547,13 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onDestroy() {
-        Log.w("MainActivity", "onDestroy: ")
-        if (viewModel.shouldStopMusicService()) {
-            viewModel.isServiceRunning = false
+        val shouldStopMusicService = viewModel.shouldStopMusicService()
+        Log.w("MainActivity", "onDestroy: Should stop service $shouldStopMusicService")
+
+        // Always unbind service if it was bound to prevent MusicBinder leak
+        if (shouldStopMusicService && shouldUnbind) {
             unbindService(serviceConnection)
+            viewModel.isServiceRunning = false
         }
         unloadKoinModules(viewModelModule)
         super.onDestroy()
@@ -563,14 +565,12 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun startMusicService() {
-        println("go to StartMusicService")
-        if (!viewModel.recreateActivity.value) {
-            val intent = Intent(this, SimpleMediaService::class.java)
-            startService(intent)
-            bindService(intent, serviceConnection, BIND_AUTO_CREATE)
-            viewModel.isServiceRunning = true
-            Log.d("Service", "Service started")
-        }
+        val intent = Intent(this, SimpleMediaService::class.java)
+        startService(intent)
+        bindService(intent, serviceConnection, BIND_AUTO_CREATE)
+        viewModel.isServiceRunning = true
+        shouldUnbind = true
+        Log.d("Service", "Service started")
     }
 
     private fun checkForUpdate() {

fastlane/metadata/android/en-US/changelogs/38.txt

@@ -2,6 +2,7 @@
 - Fixed Spotify
 - Fixed Android Auto problems
 - Fixed video being stretched to 16:9
+- Fixed "Killed service" error
 - PIP support in Fullscreen
 - Subtitle inside every video
 - Option to backup downloaded songs

fastlane/metadata/android/vi-VN/changelogs/38.txt

@@ -2,6 +2,7 @@
 - Sửa lỗi Spotify
 - Sửa lỗi Android Auto
 - Sửa lỗi video bị kéo dãn thành tỷ lệ 16:9
+- Sửa lỗi "Dịch vụ bị giết"
 - Hỗ trợ PIP khi ở chế độ toàn màn hình
 - Phụ đề trong mọi video
 - Tùy chọn sao lưu các bài hát đã tải xuống

gradle/libs.versions.toml

@@ -49,7 +49,7 @@ sdp-android = "1.1.1"
 ssp-android = "1.1.1"
 aboutlibraries = "12.2.4"
 flexbox = "3.0.0"
-balloon = "1.6.12"
+balloon = "1.6.13"
 insetsx = "0.1.0-alpha10"
 ktor = "3.2.3"
 brotli = "0.1.2"
@@ -67,9 +67,9 @@ json = "1.9.0"
 gemini-kotlin = "4.0.2"
 slf4j = "1.7.36"
 sentry-android = "8.18.0"
-sentry-gradle = "5.8.0"
+sentry-gradle = "5.8.1"
 newpipe = "7adbc48a0aa872c016b8ec089e278d5e12772054"
-leakcanary = "2.14"
+leakcanary = "3.0-alpha-8"
 
 [libraries]
 desugaring = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugaring"}