Merge pull request #1061 from maxrave-dev/dev

v0.2.18: New version

Author: maxrave-dev

.github/workflows/android-release.yml

@@ -35,10 +35,13 @@ jobs:
           distribution: "temurin"
           cache: 'gradle'
 
-      - name: Update Sentry DSN
+      - name: Update Sentry Secrets
         env:
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-        run: echo 'SENTRY_DSN=${{ secrets.SENTRY_DSN }}' > ./local.properties
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: |
+          echo 'SENTRY_DSN=${{ secrets.SENTRY_DSN }}' > ./local.properties
+          echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> ./local.properties
 
       - name: Update environment variables
         env:

.github/workflows/android.yml

@@ -36,10 +36,13 @@ jobs:
           distribution: "temurin"
           cache: 'gradle'
 
-      - name: Update Sentry DSN
+      - name: Update Sentry Secrets
         env:
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-        run: echo 'SENTRY_DSN=${{ secrets.SENTRY_DSN }}' > ./local.properties
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: |
+          echo 'SENTRY_DSN=${{ secrets.SENTRY_DSN }}' > ./local.properties
+          echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> ./local.properties
 
       - name: Build release APK
         run: ./gradlew app:assembleFullRelease

MediaServiceCore

@@ -1,7 +1,20 @@
 <div align="center"> <img src="https://raw.githubusercontent.com/maxrave-dev/SimpMusic/jetpack_compose/fastlane/metadata/android/en-US/images/featureGraphic.png"> <h1>SimpMusic</h1>  
-A FOSS YouTube Music client for Android with many features from<br>Spotify, Musixmatch, SponsorBlock, ReturnYouTubeDislike<br> <br> <a href="https://github.com/maxrave-dev/SimpMusic/releases"><img src="https://img.shields.io/github/v/release/maxrave-dev/SimpMusic"></a> <a href="https://github.com/maxrave-dev/SimpMusic/releases"><img src="https://img.shields.io/github/downloads/maxrave-dev/SimpMusic/total"></a> <br> <br> <a href="https://trendshift.io/repositories/13482" target="_blank"><img src="https://trendshift.io/api/badge/repositories/13482" alt="maxrave-dev%2FSimpMusic | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a> <br> <h4>Download</h4>  
-<a href="https://apt.izzysoft.de/packages/com.maxrave.simpmusic/"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" height="80"></a> <a href="https://f-droid.org/en/packages/com.maxrave.simpmusic/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="80"></a> <a href="https://www.openapk.net/simpmusic/com.maxrave.simpmusic/"><img src="https://www.openapk.net/images/openapk-badge.png" height="80"></a> <a href="https://www.androidfreeware.net/download-simpmusic-apk.html"><img src="https://www.androidfreeware.net/images/androidfreeware-badge.png" height="80"></a> <a href="https://github.com/maxrave-dev/SimpMusic/releases"><img src="https://raw.githubusercontent.com/NeoApplications/Neo-Backup/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" height="80"></a> <a href="https://www.producthunt.com/posts/simpmusic?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-simpmusic" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=797736&theme=light&t=1737299913224" alt="SimpMusic - A&#0032;FOSS&#0032;YouTube&#0032;Music&#0032;client&#0032;for&#0032;Android&#0032;with&#0032;many&#0032;features | Product Hunt" style="width: 250px; height: 80px;" width="250" height="80" /></a> <h4>Nightly Build</h4>  
-<a href="https://nightly.link/maxrave-dev/SimpMusic/workflows/android/dev/app.zip"><img src="https://github.com/maxrave-dev/SimpMusic/actions/workflows/android.yml/badge.svg"></a><br/> <a href="https://nightly.link/maxrave-dev/SimpMusic/workflows/android/dev/app.zip"><img src="https://raw.githubusercontent.com/NeoApplications/Neo-Backup/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" height="80"></a> </div>  
+A FOSS YouTube Music client for Android with many features from<br>Spotify, Musixmatch, SponsorBlock, ReturnYouTubeDislike
+<br> 
+<br>
+<a href="https://github.com/maxrave-dev/SimpMusic/releases"><img src="https://img.shields.io/github/v/release/maxrave-dev/SimpMusic"></a> <a href="https://github.com/maxrave-dev/SimpMusic/releases"><img src="https://img.shields.io/github/downloads/maxrave-dev/SimpMusic/total"></a> <br> <br> <a href="https://trendshift.io/repositories/13482" target="_blank"><img src="https://trendshift.io/api/badge/repositories/13482" alt="maxrave-dev%2FSimpMusic | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+<br>
+<br>
+<a href="https://www.producthunt.com/products/simpmusic/reviews?utm_source=badge-product_rating&utm_medium=badge&utm_source=badge-simpmusic" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/product_rating.svg?product_id=903836&theme=dark" alt="SimpMusic - A&#0032;FOSS&#0032;YouTube&#0032;Music&#0032;client&#0032;for&#0032;Android&#0032;with&#0032;many&#0032;features | Product Hunt" style="width: 242px; height: 108px;" width="242" height="108" /></a>
+<br> 
+<h4>Download</h4>  
+<a href="https://apt.izzysoft.de/packages/com.maxrave.simpmusic/"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" width="200"></a> 
+<a href="https://f-droid.org/en/packages/com.maxrave.simpmusic/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" width="200"></a> 
+<a href="https://www.openapk.net/simpmusic/com.maxrave.simpmusic/"><img src="https://www.openapk.net/images/openapk-badge.png" width="200"></a> 
+<a href="https://github.com/maxrave-dev/SimpMusic/releases"><img src="https://raw.githubusercontent.com/NeoApplications/Neo-Backup/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" width="200"></a> 
+<h4>Nightly Build</h4>  
+<a href="https://nightly.link/maxrave-dev/SimpMusic/workflows/android/dev/app.zip"><img src="https://github.com/maxrave-dev/SimpMusic/actions/workflows/android.yml/badge.svg"></a><br/> <a href="https://nightly.link/maxrave-dev/SimpMusic/workflows/android/dev/app.zip"><img src="https://raw.githubusercontent.com/NeoApplications/Neo-Backup/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" width="200"></a> 
+</div>  
 
 ## Features ✨️    
  - Play music from YouTube Music or YouTube for free, without ads and in the background    
@@ -81,9 +94,13 @@ sometimes, some songs or videos get the wrong lyrics
 
 #### More FAQ, join [my Discord channel](https://discord.com/channels/1136988323819298856/1349800418745778196)  
   ## 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.    
+- [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.
+
+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)
+
  ## Support & Donations 
  #### Special thanks to all supporter ❤️    
  <div align="left"> 
@@ -100,14 +117,19 @@ src="https://raw.githubusercontent.com/liberapay/liberapay.com/master/www/assets
  </p>
 
 ## SimpMusic is sponsored by:
+<a href="https://www.digitalocean.com/?refcode=d7f6eedfb9a9&utm_campaign=Referral_Invite&utm_medium=Referral_Program&utm_source=badge"><img src="https://web-platforms.sfo2.cdn.digitaloceanspaces.com/WWW/Badge%201.svg" width="300" alt="DigitalOcean Referral Badge" /></a>
+<br>
 <a href="https://crowdin.com">
 <img src="https://support.crowdin.com/assets/logos/plate/png/crowdin-logo-with-plate.png" width="300"/>
 </a>
+<br>
 <a href="https://sentry.io">
 <img src="https://github.com/maxrave-dev/SimpMusic/blob/dev/asset/sentry.svg?raw=true" width="300"/>
 </a>
 <br>
 
-Crowdin and Sentry, both have free enterprise plan for Open-source project. Follow the URLs: 
+Get free $200 credit over 60 days on DigitalOcean: [GET NOW](https://www.digitalocean.com/?refcode=d7f6eedfb9a9&utm_campaign=Referral_Invite&utm_medium=Referral_Program&utm_source=badge)
+
+Crowdin and Sentry both have a free enterprise plan for Open-source projects. Follow the URLs: 
 - [Open Source License Request Form | Crowdin](https://crowdin.com/page/open-source-project-setup-request)
-- [Sentry for Open Source | Sentry](https://sentry.io/for/open-source/)
+- [Sentry for Open Source | Sentry](https://sentry.io/for/open-source/)

README.md

@@ -3,7 +3,11 @@ import com.android.build.gradle.internal.tasks.CompileArtProfileTask
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
-    kotlin("plugin.serialization")
+    alias(libs.plugins.kotlin.serialization)
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 android {
@@ -27,11 +31,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 

aiService/build.gradle.kts

@@ -10,12 +10,15 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.aboutlibraries)
     alias(libs.plugins.room)
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.sentry.gradle)
 }
 
 kotlin {
     jvmToolchain(17) // or appropriate version
     compilerOptions {
         freeCompilerArgs.add("-Xwhen-guards")
+        freeCompilerArgs.add("-Xcontext-receivers")
     }
 }
 
@@ -131,13 +134,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
-        jvmTarget = "17"
-    }
     // enable view binding
     buildFeatures {
         viewBinding = true
@@ -163,8 +159,31 @@ android {
     }
 }
 
+sentry {
+    org.set("simpmusic")
+    projectName.set("android")
+    ignoredFlavors.set(setOf("foss"))
+    ignoredBuildTypes.set(setOf("debug"))
+    autoInstallation.enabled = false
+    val token =
+        try {
+            println("Full build detected, enabling Sentry Auth Token")
+            val properties = Properties()
+            properties.load(rootProject.file("local.properties").inputStream())
+            properties.getProperty("SENTRY_AUTH_TOKEN")
+        } catch (e: Exception) {
+            println("Failed to load SENTRY_AUTH_TOKEN from local.properties: ${e.message}")
+            null
+        }
+    authToken.set(token ?: "")
+    includeProguardMapping.set(true)
+    autoUploadProguardMapping.set(true)
+    telemetry.set(false)
+}
+
 dependencies {
     val fullImplementation = "fullImplementation"
+    val debugImplementation = "debugImplementation"
 
     implementation(project(":lyricsProviders"))
     // Compose
@@ -202,6 +221,7 @@ dependencies {
     implementation(project(mapOf("path" to ":spotify")))
     implementation(project(mapOf("path" to ":aiService")))
     implementation(project(mapOf("path" to ":sharedutils")))
+    implementation(project(mapOf("path" to ":lyricsService")))
 
     implementation(libs.lifecycle.livedata.ktx)
     implementation(libs.lifecycle.viewmodel.ktx)
@@ -210,6 +230,7 @@ dependencies {
     // ExoPlayer
     implementation(libs.media3.exoplayer)
     implementation(libs.media3.ui)
+    implementation(libs.media3.compose)
     implementation(libs.media3.session)
     implementation(libs.media3.exoplayer.dash)
     implementation(libs.media3.exoplayer.hls)
@@ -241,7 +262,11 @@ dependencies {
     implementation(libs.navigation.fragment.ktx)
     implementation(libs.navigation.ui.ktx)
 
-    implementation(libs.gson)
+    // Navigation Compose
+    implementation(libs.navigation.compose)
+
+    // Kotlin Serialization
+    implementation(libs.kotlinx.serialization.json)
 
     // Coil
     implementation(libs.coil.compose)
@@ -266,9 +291,6 @@ dependencies {
     implementation(libs.insetter)
     implementation(libs.insetter.dbx)
 
-    // Shimmer
-    implementation(libs.shimmer)
-
     // Lottie
     implementation(libs.lottie)
     implementation(libs.lottie.compose)
@@ -298,7 +320,6 @@ dependencies {
     implementation(platform(libs.koin.bom))
     implementation(libs.koin.core)
     implementation(libs.koin.android)
-    implementation(libs.koin.workmanager)
     implementation(libs.koin.androidx.compose)
 
     // Store5
@@ -312,11 +333,17 @@ dependencies {
     implementation(libs.haze.material)
 
     fullImplementation(libs.sentry.android)
+
+//    debugImplementation(libs.leak.canary)
 }
 aboutLibraries {
-    prettyPrint = true
-    registerAndroidTasks = false
-    excludeFields = arrayOf("generated")
+    export {
+        prettyPrint = true
+        excludeFields = listOf("generated")
+    }
+    android {
+        registerAndroidTasks = false
+    }
 }
 tasks.withType<CompileArtProfileTask> {
     enabled = false

app/build.gradle.kts

@@ -21,27 +21,59 @@
 #-renamesourcefileattribute SourceFile
 -keep class kotlinx.coroutines.CoroutineExceptionHandler
 -keep class kotlinx.coroutines.internal.MainDispatcherFactory
+# Keep `Companion` object fields of serializable classes.
+# This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+# Keep `serializer()` on companion objects (both default and named) of serializable classes.
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <2>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+
+# Don't print notes about potential mistakes or omissions in the configuration for kotlinx-serialization classes
+# See also https://github.com/Kotlin/kotlinx.serialization/issues/1900
+-dontnote kotlinx.serialization.**
+
+# Serialization core uses `java.lang.ClassValue` for caching inside these specified classes.
+# If there is no `java.lang.ClassValue` (for example, in Android), then R8/ProGuard will print a warning.
+# However, since in this case they will not be used, we can disable these warnings
+
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 -dontwarn kotlinx.serialization.internal.ClassValueReferences
--keep class com.google.gson.reflect.TypeToken { *; }
--keep class * extends com.google.gson.reflect.TypeToken
 -keep class com.maxrave.simpmusic.data.model.** { *; }
 -keep class com.maxrave.simpmusic.extension.AllExtKt { *; }
 -keep class com.maxrave.simpmusic.extension.AllExtKt$* { *; }
 -keep class com.maxrave.kotlinytmusicscraper.extension.MapExtKt$* { *; }
 
-# Removes all Logs as they cause perfomance issues in prod
--assumenosideeffects class android.util.Log {
-    public static int w(...);
-    public static int e(...);
-    public static int i(...);
-    public static int d(...);
-    public static int v(...);
-}
+## Removes all Logs as they cause perfomance issues in prod
+#-assumenosideeffects class android.util.Log {
+#    public static int w(...);
+#    public static int e(...);
+#    public static int i(...);
+#    public static int d(...);
+#    public static int v(...);
+#}
 ## Rules for NewPipeExtractor
 -keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; }
 -keep class org.mozilla.javascript.** { *; }
--keep class org.mozilla.classfile.ClassFileWriter
 -dontwarn org.mozilla.javascript.tools.**
 # Please add these rules to your existing keep rules in order to suppress warning
 # This is generated automatically by the Android Gradle plugin.
@@ -110,6 +142,7 @@
 -dontwarn org.conscrypt.**
 -dontwarn org.bouncycastle.**
 -dontwarn org.openjsse.**
+-dontwarn okhttp3.internal.Util
 
 -keep class com.liskovsoft.youtubeapi.** { *; }
 -keep interface com.liskovsoft.youtubeapi.** { *; }

app/proguard-rules.pro

@@ -4,6 +4,8 @@ import android.app.Application
 import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.media3.common.util.UnstableApi
+import androidx.work.Configuration
+import androidx.work.WorkManager
 import cat.ereza.customactivityoncrash.config.CaocConfig
 import coil3.ImageLoader
 import coil3.PlatformContext
@@ -21,7 +23,6 @@ import com.maxrave.simpmusic.ui.theme.newDiskCache
 import okhttp3.OkHttpClient
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
-import org.koin.androidx.workmanager.koin.workManagerFactory
 import org.koin.core.component.KoinComponent
 import org.koin.core.context.startKoin
 import org.koin.core.logger.Level
@@ -62,8 +63,17 @@ class SimpMusicApplication :
                 mediaServiceModule,
                 viewModelModule,
             )
-            workManagerFactory()
         }
+        // provide custom configuration
+        val workConfig =
+            Configuration
+                .Builder()
+                .setMinimumLoggingLevel(Log.INFO)
+                .build()
+
+        // initialize WorkManager
+        WorkManager.initialize(this, workConfig)
+
         CaocConfig.Builder
             .create()
             .backgroundMode(CaocConfig.BACKGROUND_MODE_SILENT) // default: CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM

app/src/main/java/com/maxrave/simpmusic/SimpMusicApplication.kt

@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:class-naming")
+
 package com.maxrave.simpmusic.common
 
 import android.content.Context
@@ -26,6 +28,8 @@ object Config {
     const val DOWNLOAD_CACHE = "downloadCache"
     const val CANVAS_CACHE = "canvasCache"
     const val SERVICE_SCOPE = "serviceScope"
+    const val MAIN_PLAYER = "mainPlayer"
+    const val SECONDARY_PLAYER = "secondaryPlayer"
 
     val REMOVED_SONG_DATE_TIME: LocalDateTime = LocalDateTime.of(2003, Month.AUGUST, 26, 3, 0)
 
@@ -198,7 +202,7 @@ object SUPPORTED_LANGUAGE {
             "한국어",
             "Català",
             "فارسی",
-            "български"
+            "български",
         )
     val codes: Array<String> =
         arrayOf(