Merge pull request #1180 from maxrave-dev/dev

v0.2.20: New version

Author: maxrave-dev

MediaServiceCore

@@ -13,7 +13,7 @@ A FOSS YouTube Music client for Android with many features from<br>Spotify, Spon
 <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> 
+<a href="https://simpmusic.org/nightly-download"><img src="https://github.com/maxrave-dev/SimpMusic/actions/workflows/android.yml/badge.svg"></a><br/> <a href="https://simpmusic.org/nightly-download"><img src="https://raw.githubusercontent.com/NeoApplications/Neo-Backup/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" width="200"></a> 
 </div>  
 
 ## Features ✨️    
@@ -39,6 +39,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.   
+> Because of depending on YouTube Music, the player error will happen and it's normally, please don't ask me about the stable state of this app.
     
 ## Screenshots    
  <p align="center">          
@@ -97,6 +98,7 @@ sometimes, some songs or videos get the wrong lyrics
 - [maxrave-dev](https://github.com/maxrave-dev/SimpMusic): Founder/Developer/Designer    
 - [Owen Connor](https://github.com/owencz1998): Discord Server Admin.    
 - [ilianoKokoro](https://github.com/ilianoKokoro): Discord Server Admin.
+- [CrazyWolf13](https://github.com/CrazyWolf13): Issues organizer/planner.
 
 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)

README.md

@@ -38,7 +38,7 @@ class AiService(
             ModelId(customModelId)
         } else {
             when (aiHost) {
-                AIHost.GEMINI -> ModelId("gemini-2.0-flash-lite")
+                AIHost.GEMINI -> ModelId("gemini-2.0-flash")
                 AIHost.OPENAI -> ModelId("gpt-4o")
             }
         }

aiService/src/main/java/org/simpmusic/aiservice/AiService.kt

@@ -20,6 +20,7 @@ kotlin {
     compilerOptions {
         freeCompilerArgs.add("-Xwhen-guards")
         freeCompilerArgs.add("-Xcontext-receivers")
+        freeCompilerArgs.add("-Xmulti-dollar-interpolation")
     }
 }
 
@@ -45,6 +46,7 @@ android {
             libs.versions.version.name
                 .get()
         vectorDrawables.useSupportLibrary = true
+        multiDexEnabled = true
 
         @Suppress("UnstableApiUsage")
         androidResources {
@@ -80,6 +82,12 @@ android {
         }
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
+        ndk {
+            abiFilters.add("x86_64")
+            abiFilters.add("armeabi-v7a")
+            abiFilters.add("arm64-v8a")
+        }
+
         if (isFullBuild) {
             try {
                 println("Full build detected, enabling Sentry DSN")
@@ -192,6 +200,8 @@ dependencies {
     val fullImplementation = "fullImplementation"
     val debugImplementation = "debugImplementation"
 
+    coreLibraryDesugaring(libs.desugaring)
+
     // Compose
     val composeBom = platform(libs.compose.bom)
     implementation(composeBom)
@@ -308,9 +318,6 @@ dependencies {
     // Custom Activity On Crash
     implementation(libs.customactivityoncrash)
 
-    implementation(libs.sdp.android)
-    implementation(libs.ssp.android)
-
     implementation(libs.aboutlibraries)
     implementation(libs.aboutlibraries.compose.m3)
 
@@ -320,8 +327,6 @@ dependencies {
     // InsetsX
     implementation(libs.insetsx)
 
-    coreLibraryDesugaring(libs.desugaring)
-
     // Koin
     implementation(platform(libs.koin.bom))
     implementation(libs.koin.core)
@@ -342,13 +347,18 @@ dependencies {
 
 //    debugImplementation(libs.leak.canary)
 }
+/**
+ * Task to generate the aboutlibraries.json file
+ * Run with:
+ ./gradlew :app:exportLibraryDefinitions --no-daemon --no-configuration-cache --no-build-cache
+ **/
 aboutLibraries {
+    android.registerAndroidTasks = false
     export {
+        exportVariant = "fullRelease"
         prettyPrint = true
         excludeFields = listOf("generated")
-    }
-    android {
-        registerAndroidTasks = false
+        outputPath = File(project.projectDir, "src/main/res/raw/aboutlibraries.json")
     }
 }
 tasks.withType<CompileArtProfileTask> {

app/build.gradle.kts

@@ -150,11 +150,6 @@
 -keep interface com.liskovsoft.googleapi.** { *; }
 -keep class com.eclipsesource.v8.** { *; }
 
-## Rules for NewPipeExtractor
--keep class org.mozilla.javascript.** { *; }
--keep class org.mozilla.classfile.ClassFileWriter
--dontwarn org.mozilla.javascript.tools.**
-
 -dontwarn javax.script.AbstractScriptEngine
 -dontwarn javax.script.Bindings
 -dontwarn javax.script.Compilable
@@ -182,4 +177,17 @@
 -dontwarn jdk.dynalink.linker.TypeBasedGuardingDynamicLinker
 -dontwarn jdk.dynalink.linker.support.CompositeTypeBasedGuardingDynamicLinker
 -dontwarn jdk.dynalink.linker.support.Guards
--dontwarn jdk.dynalink.support.ChainedCallSite
+-dontwarn jdk.dynalink.support.ChainedCallSite
+
+## 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.
+-dontwarn java.beans.BeanDescriptor
+-dontwarn java.beans.BeanInfo
+-dontwarn java.beans.IntrospectionException
+-dontwarn java.beans.Introspector
+-dontwarn java.beans.PropertyDescriptor

app/proguard-rules.pro

@@ -9,5 +9,5 @@ fun reportCrash(throwable: Throwable) {
 fun configCrashlytics(applicationContext: Context) {
 }
 
-fun pushYouTubeError(error: Throwable) {
+fun pushPlayerError(error: Throwable) {
 }

app/src/foss/java/com/maxrave/simpmusic/Crashlytics.kt

@@ -18,7 +18,7 @@ fun configCrashlytics(applicationContext: Context) {
     }
 }
 
-fun pushYouTubeError(error: Throwable) {
+fun pushPlayerError(error: Throwable) {
     Sentry.withScope { scope ->
         Sentry.captureException(error)
     }

app/src/full/java/com/maxrave/simpmusic/Crashlytics.kt

@@ -49,8 +49,9 @@
         android:localeConfig="@xml/locale_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
-        android:theme="@style/Theme.SimpMusic"
+        android:theme="@style/Theme.Material3.Light.NoActionBar"
         android:enableOnBackInvokedCallback="true"
+        android:extractNativeLibs="true"
         tools:targetApi="tiramisu">
         <receiver
             android:name=".ui.widget.BasicWidget"
@@ -72,6 +73,7 @@
             android:supportsPictureInPicture="true"
             android:enableOnBackInvokedCallback="true"
             android:launchMode="singleTask"
+            android:theme="@style/Theme.Material3.Light.NoActionBar"
             tools:ignore="DiscouragedApi,LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -84,7 +86,7 @@
             </intent-filter>
 
             <!-- Youtube filter -->
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
@@ -109,7 +111,7 @@
                 <!-- playlist prefix -->
                 <data android:pathPrefix="/playlist" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
@@ -176,9 +178,6 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <meta-data
-            android:name="preloaded_fonts"
-            android:resource="@array/preloaded_fonts" />
         <meta-data
             android:name="androidx.car.app.TintableAttributionIcon"
             android:resource="@drawable/monochrome" />

app/src/main/AndroidManifest.xml

@@ -383,8 +383,6 @@ class DataStoreManager(
         }
     }
 
-
-
     val translationLanguage =
         settingsDataStore.data.map { preferences ->
             val languageValue = language.first()
@@ -404,8 +402,6 @@ class DataStoreManager(
         }
     }
 
-
-
     val maxSongCacheSize =
         settingsDataStore.data.map { preferences ->
             preferences[MAX_SONG_CACHE_SIZE] ?: -1
@@ -748,6 +744,19 @@ class DataStoreManager(
         }
     }
 
+    val updateChannel =
+        settingsDataStore.data.map { preferences ->
+            preferences[UPDATE_CHANNEL] ?: FDROID
+        }
+
+    suspend fun setUpdateChannel(channel: String) {
+        withContext(Dispatchers.IO) {
+            settingsDataStore.edit { settings ->
+                settings[UPDATE_CHANNEL] = channel
+            }
+        }
+    }
+
     val blurFullscreenLyrics =
         settingsDataStore.data.map { preferences ->
             preferences[BLUR_FULLSCREEN_LYRICS] ?: FALSE
@@ -1093,6 +1102,11 @@ class DataStoreManager(
         val ENDLESS_QUEUE = stringPreferencesKey("endless_queue")
         val SHOULD_SHOW_LOG_IN_REQUIRED_ALERT = stringPreferencesKey("should_show_log_in_required_alert")
         val AUTO_CHECK_FOR_UPDATES = stringPreferencesKey("auto_check_for_updates")
+        val UPDATE_CHANNEL = stringPreferencesKey("update_channel")
+        const val FDROID = "fdroid"
+
+        const val GITHUB_FOSS_NIGHTLY = "github_foss_nightly"
+        const val GITHUB = "github_release"
         val BLUR_FULLSCREEN_LYRICS = stringPreferencesKey("blur_fullscreen_lyrics")
         val BLUR_PLAYER_BACKGROUND = stringPreferencesKey("blur_player_background")
         val PLAYBACK_SPEED = floatPreferencesKey("playback_speed")

app/src/main/java/com/maxrave/simpmusic/data/dataStore/DataStoreManager.kt

@@ -0,0 +1,7 @@
+package com.maxrave.simpmusic.data.model.update
+
+data class UpdateData(
+    val tagName: String,
+    val releaseTime: String?,
+    val body: String,
+)