Merge pull request #1273 from maxrave-dev/dev

v0.2.21: New version

Author: maxrave-dev

.gitignore

@@ -23,3 +23,4 @@ crowdin.yml
 
 # Sentry Config File
 sentry.properties
+/.claude/

MediaServiceCore

@@ -103,6 +103,14 @@ sometimes, some songs or videos get the wrong lyrics
 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)
 
+ ## Showcase
+This project is following clean architecture and MVVM pattern (in UI, app module).
+
+ ### Dependencies graph
+  <p float="left">        
+  <img src="https://github.com/maxrave-dev/SimpMusic/blob/dev/asset/dependencies_graph.svg?raw=true" width="800"> 
+  </p>
+
  ## Support & Donations 
  #### Special thanks to all supporter ❤️    
  <div align="left"> 

README.md

@@ -1,3 +1,4 @@
+
 import com.android.build.gradle.internal.tasks.CompileArtProfileTask
 import java.util.Properties
 
@@ -6,20 +7,16 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.navigation.safeargs)
-    alias(libs.plugins.ksp)
     alias(libs.plugins.aboutlibraries)
-    alias(libs.plugins.room)
     alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.sentry.gradle)
 }
 
 kotlin {
     jvmToolchain(17) // or appropriate version
     compilerOptions {
         freeCompilerArgs.add("-Xwhen-guards")
-        freeCompilerArgs.add("-Xcontext-receivers")
+        freeCompilerArgs.add("-Xcontext-parameters")
         freeCompilerArgs.add("-Xmulti-dollar-interpolation")
     }
 }
@@ -30,10 +27,6 @@ android {
     namespace = "com.maxrave.simpmusic"
     compileSdk = 36
 
-    room {
-        schemaDirectory("$projectDir/schemas")
-    }
-
     defaultConfig {
         applicationId = "com.maxrave.simpmusic"
         minSdk = 26
@@ -127,6 +120,7 @@ android {
             isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
+                "consumer-rules.pro",
                 "proguard-rules.pro",
             )
             splits {
@@ -208,17 +202,20 @@ dependencies {
     androidTestImplementation(composeBom)
     implementation(libs.compose.material3.lib)
     implementation(libs.compose.material3.sizeclass)
+    implementation(libs.compose.material3.adaptive)
     implementation(libs.compose.ui)
     implementation(libs.compose.material.ripple)
     implementation(libs.compose.material.icons.core)
     implementation(libs.compose.material.icons.extended)
     implementation(libs.compose.ui.viewbinding)
     implementation(libs.constraintlayout.compose)
 
-    // Android Studio Preview support
+    implementation(libs.glance)
+    implementation(libs.glance.appwidget)
+    implementation(libs.glance.material3)
+
     implementation(libs.ui.tooling.preview)
     implementation(libs.activity.compose)
-    // Optional - Integration with ViewModels
     implementation(libs.lifecycle.viewmodel.compose)
 
     implementation(libs.lifecycle.runtime.ktx)
@@ -228,55 +225,28 @@ dependencies {
     implementation(libs.work.runtime.ktx)
     androidTestImplementation(libs.work.testing)
 
-    // Material Design 3
-    implementation(libs.material)
     // Runtime
     implementation(libs.startup.runtime)
+    implementation(project(":common"))
     // Other module
-    implementation(project(mapOf("path" to ":kotlinYtmusicScraper")))
-    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(project(":domain"))
+    implementation(project(":data"))
+    implementation(project(":media3-ui"))
 
     implementation(libs.lifecycle.livedata.ktx)
     implementation(libs.lifecycle.viewmodel.ktx)
     debugImplementation(libs.ui.tooling)
 
     // 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)
-    implementation(libs.media3.exoplayer.rtsp)
-    implementation(libs.media3.exoplayer.smoothstreaming)
-    implementation(libs.media3.exoplayer.workmanager)
-    implementation(libs.media3.datasource.okhttp)
-    implementation(libs.okhttp3.logging.interceptor)
-
-    // Palette Color
-    implementation(libs.palette.ktx)
-    // Expandable Text View
-    implementation(libs.expandable.text)
-
-    implementation(libs.constraintlayout)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.espresso.core)
 
-    implementation(libs.room.runtime)
-    implementation(libs.room.ktx)
-    ksp(libs.room.compiler)
     // Legacy Support
     implementation(libs.legacy.support.v4)
     // Coroutines
     implementation(libs.coroutines.android)
-    implementation(libs.coroutines.guava)
-    // Navigation
-    implementation(libs.navigation.fragment.ktx)
-    implementation(libs.navigation.ui.ktx)
 
     // Navigation Compose
     implementation(libs.navigation.compose)
@@ -290,22 +260,12 @@ dependencies {
     implementation(libs.kmpalette.core)
     // Easy Permissions
     implementation(libs.easypermissions)
-    // Palette Color
-    implementation(libs.palette.ktx)
 
     // Preference
     implementation(libs.preference.ktx)
 
-    // Fragment KTX
-    implementation(libs.fragment.ktx)
-    ksp(libs.kotlinx.metadata.jvm)
     // DataStore
     implementation(libs.datastore.preferences)
-    // Swipe To Refresh
-    implementation(libs.swiperefreshlayout)
-    // Insetter
-    implementation(libs.insetter)
-    implementation(libs.insetter.dbx)
 
     // Lottie
     implementation(libs.lottie)
@@ -321,21 +281,14 @@ dependencies {
     implementation(libs.aboutlibraries)
     implementation(libs.aboutlibraries.compose.m3)
 
-    implementation(libs.flexbox)
     implementation(libs.balloon)
 
-    // InsetsX
-    implementation(libs.insetsx)
-
     // Koin
     implementation(platform(libs.koin.bom))
     implementation(libs.koin.core)
     implementation(libs.koin.android)
     implementation(libs.koin.androidx.compose)
 
-    // Store5
-    implementation(libs.store)
-
     // Jetbrains Markdown
     api(libs.markdown)
 
@@ -345,20 +298,18 @@ dependencies {
 
     fullImplementation(libs.sentry.android)
 
+    implementation(libs.liquid.glass)
+
 //    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
+    collect.configPath = file("../config")
     export {
-        exportVariant = "fullRelease"
         prettyPrint = true
         excludeFields = listOf("generated")
-        outputPath = File(project.projectDir, "src/main/res/raw/aboutlibraries.json")
     }
 }
 tasks.withType<CompileArtProfileTask> {

app/build.gradle.kts

@@ -144,11 +144,10 @@
 -dontwarn org.openjsse.**
 -dontwarn okhttp3.internal.Util
 
--keep class com.liskovsoft.youtubeapi.** { *; }
--keep interface com.liskovsoft.youtubeapi.** { *; }
--keep class com.liskovsoft.googleapi.** { *; }
--keep interface com.liskovsoft.googleapi.** { *; }
+-keep class com.liskovsoft.** { *; }
+-keep interface com.liskovsoft.** { *; }
 -keep class com.eclipsesource.v8.** { *; }
+-keep class com.maxrave.kotlinytmusicscraper.** { *; }
 
 -dontwarn javax.script.AbstractScriptEngine
 -dontwarn javax.script.Bindings
@@ -179,6 +178,13 @@
 -dontwarn jdk.dynalink.linker.support.Guards
 -dontwarn jdk.dynalink.support.ChainedCallSite
 
+-keep class org.apache.commons.io.** { *; }
+
+#YtDlp
+-keep class com.yausername.** { *; }
+-keep class org.apache.commons.compress.archivers.zip.** { *; }
+-keepattributes SourceFile
+
 ## Rules for NewPipeExtractor
 -keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; }
 -keep class org.mozilla.javascript.** { *; }
@@ -190,4 +196,18 @@
 -dontwarn java.beans.BeanInfo
 -dontwarn java.beans.IntrospectionException
 -dontwarn java.beans.Introspector
--dontwarn java.beans.PropertyDescriptor
+-dontwarn java.beans.PropertyDescriptor
+
+-dontwarn com.maxrave.data.di.loader.LoaderKt
+-dontwarn com.maxrave.media3.ui.MediaPlayerViewKt
+
+-keep class com.maxrave.data.di.loader.LoaderKt { *; }
+-keep class com.maxrave.data.mapping.MappingKt { *; }
+-keep class com.maxrave.data.extension.** { *; }
+-keep class com.maxrave.data.di.** { *; }
+
+-keep class com.maxrave.kotlinytmusicscraper.** { *; }
+
+-keep class org.simpmusic.lyrics.parser.** { *; }
+-keep class org.simpmusic.lyrics.models.** { *; }
+-keep class com.simpmusic.lyrics.parser.** { *; }

app/proguard-rules.pro

@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <uses-feature
         android:name="android.hardware.type.automotive"
@@ -52,23 +53,22 @@
         android:theme="@style/Theme.Material3.Light.NoActionBar"
         android:enableOnBackInvokedCallback="true"
         android:extractNativeLibs="true"
+        android:requestLegacyExternalStorage="true"
         tools:targetApi="tiramisu">
-        <receiver
-            android:name=".ui.widget.BasicWidget"
-            android:exported="false">
+
+        <receiver android:name=".ui.widget.AppWidgetReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
-
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/new_app_widget_info" />
         </receiver>
 
         <activity
             android:name=".ui.MainActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize"
-            android:screenOrientation="portrait"
+            android:configChanges="keyboardHidden|screenSize|screenLayout|smallestScreenSize"
             android:exported="true"
             android:supportsPictureInPicture="true"
             android:enableOnBackInvokedCallback="true"
@@ -150,14 +150,6 @@
                 android:resource="@xml/shortcuts" />
         </activity>
 
-        <receiver
-            android:name="androidx.media3.session.MediaButtonReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-        </receiver>
-
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
@@ -181,29 +173,6 @@
         <meta-data
             android:name="androidx.car.app.TintableAttributionIcon"
             android:resource="@drawable/monochrome" />
-
-        <service
-            android:name=".service.SimpleMediaService"
-            android:exported="true"
-            android:foregroundServiceType="mediaPlayback"
-            android:stopWithTask="false">
-            <intent-filter>
-                <action android:name="androidx.media3.session.MediaSessionService" />
-                <action android:name="androidx.media3.session.MediaLibraryService" />
-                <action android:name="android.media.browse.MediaBrowserService" />
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-        </service>
-        <service
-            android:name=".service.test.download.MusicDownloadService"
-            android:exported="true"
-            android:foregroundServiceType="dataSync">
-            <intent-filter>
-                <action android:name="androidx.media3.exoplayer.downloadService.action.RESTART" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </service>
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
             android:enabled="false"