Media3重构，页面布局重构优化

.github/workflows/android_daily_update.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.4.2
+        uses: actions/checkout@v4.2.2
         with:
           repository: cy745/lmusic
           ref: dev
@@ -22,7 +22,7 @@ jobs:
           clean: true
           fetch-depth: 1
           lfs: false
-          submodules: true
+          submodules: recursive
 
       - name: Create the Keystore from Secrets to Sign the App
         env:
@@ -35,7 +35,7 @@ jobs:
           echo $KEYSTORE_PROPERTIES_BASE64 | base64 -di > ${{ github.workspace }}/keystore.properties
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.5.0
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -47,7 +47,7 @@ jobs:
         run: ./gradlew build
 
       - name: Upload Apk to Artifact
-        uses: actions/upload-artifact@v3.1.0
+        uses: actions/upload-artifact@v4.4.3
         with:
           name: LMusic-Apks
           path: ${{ github.workspace }}/app/build/outputs/apk/release/*.apk

app/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 import java.io.FileInputStream
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -7,15 +8,17 @@ import java.util.TimeZone
 plugins {
     id("com.android.application")
     kotlin("android")
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.kotlin.serialization)
     id("com.google.devtools.ksp")
-    alias(libs.plugins.flyjingfish.aop)
+    id("android.aop")
 }
 
 val keystoreProps = rootProject.file("keystore.properties")
     .takeIf { it.exists() }
     ?.let { Properties().apply { load(FileInputStream(it)) } }
 
-fun releaseTime(pattern: String = "yyyyMMdd_HHmmZ"): String = SimpleDateFormat(pattern).run {
+fun releaseTime(pattern: String = "MMdd_HHmm"): String = SimpleDateFormat(pattern).run {
     timeZone = TimeZone.getTimeZone("Asia/Shanghai")
     format(Date())
 }
@@ -39,12 +42,12 @@ androidAopConfig {
 
 android {
     namespace = "com.lalilu"
-    compileSdk = AndroidConfig.COMPILE_SDK_VERSION
+    compileSdk = libs.versions.compile.version.get().toIntOrNull()
 
     defaultConfig {
         applicationId = "com.lalilu.lmusic"
-        minSdk = AndroidConfig.MIN_SDK_VERSION
-        targetSdk = AndroidConfig.TARGET_SDK_VERSION
+        minSdk = libs.versions.min.sdk.version.get().toIntOrNull()
+        targetSdk = libs.versions.compile.version.get().toIntOrNull()
         versionCode = 42
         versionName = "1.5.4"
 
@@ -58,7 +61,6 @@ android {
 
     buildFeatures {
         compose = true
-        viewBinding = true
         buildConfig = true
     }
 
@@ -95,7 +97,7 @@ android {
             isMinifyEnabled = true
             isShrinkResources = true
 
-            versionNameSuffix = "-ALPHA_${releaseTime()}"
+            versionNameSuffix = "-Aplha-${releaseTime()}"
             applicationIdSuffix = ".alpha"
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
@@ -142,6 +144,9 @@ android {
             versionNameSuffix = "-DEBUG_${releaseTime("yyyyMMdd")}"
             applicationIdSuffix = ".debug"
             signingConfig = signingConfigs.getByName("debug")
+            isProfileable = true
+            isDebuggable = true
+            isJniDebuggable = true
 
             resValue("string", "app_name", "@string/app_name_debug")
         }
@@ -154,29 +159,36 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.compose.compiler.get().version.toString()
-    }
     lint {
         disable += "Instantiatable"
         abortOnError = false
     }
 }
 
+composeCompiler {
+    composeCompiler.featureFlags.add(ComposeFeatureFlag.StrongSkipping)
+    composeCompiler.featureFlags.add(ComposeFeatureFlag.PausableComposition)
+}
+
 dependencies {
-    implementation(project(":ui"))
     implementation(project(":crash"))
     implementation(project(":component"))
     implementation(project(":lplaylist"))
     implementation(project(":lhistory"))
     implementation(project(":lartist"))
     implementation(project(":lalbum"))
-    implementation(project(":ldictionary"))
+    implementation(project(":lfolder"))
+    ksp(libs.koin.compiler)
 
     implementation(libs.room.ktx)
     implementation(libs.room.runtime)
+    implementation(libs.kotlin.serialization)
+    implementation(libs.kotlinx.serialization.json)
     ksp(libs.room.compiler)
 
+    implementation(libs.xmlutil.core)
+    implementation(libs.xmlutil.serialization)
+
     // https://github.com/Block-Network/StatusBarApiExample
     // 墨 · 状态栏歌词 API
     implementation("com.github.577fkj:StatusBarApiExample:v2.0")
@@ -197,11 +209,6 @@ dependencies {
     // Bitmap的Blur实现库
     implementation("com.github.Commit451:NativeStackBlur:1.0.4")
 
-    // https://github.com/Moriafly/LyricViewX
-    // GPL-3.0 License
-    // 歌词组件
-    implementation("com.github.cy745:LyricViewX:7c92c6d19a")
-
     // https://github.com/qinci/EdgeTranslucent
     // https://github.com/cy745/EdgeTranslucent
     // Undeclared License
@@ -211,10 +218,18 @@ dependencies {
     implementation("com.github.commandiron:WheelPickerCompose:1.1.11")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
 
-    debugImplementation("com.github.getActivity:Logcat:11.8")
+//    debugImplementation("com.github.getActivity:Logcat:11.8")
 //    debugImplementation("io.github.knight-zxw:blockcanary:0.0.5")
 //    debugImplementation("io.github.knight-zxw:blockcanary-ui:0.0.5")
+//    debugImplementation("com.github.cy745:wytrace:d0df4c2d15")
+//    debugImplementation("com.bytedance.android:shadowhook:1.0.10")
+    implementation("io.github.theapache64:rebugger:1.0.0-rc03")
 
     implementation(libs.bundles.flyjingfish.aop)
     ksp(libs.flyjingfish.aop.ksp)
+
+    implementation("com.google.accompanist:accompanist-adaptive:0.35.1-alpha")
+    implementation("androidx.compose.material3.adaptive:adaptive:1.0.0-beta04")
+    implementation("androidx.compose.material3.adaptive:adaptive-layout:1.0.0-beta04")
+    implementation("androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-beta04")
 }

app/proguard-rules.pro

@@ -45,7 +45,47 @@
 -dontwarn com.squareup.picasso.Picasso
 -dontwarn com.squareup.picasso.RequestCreator
 
+# 针对KRouter，保留所需的类的构造函数
+-keepclassmembers @com.zhangke.krouter.annotation.Destination public class * { public <init>(*); }
+
 # 墨 · 状态栏歌词
 -keep class StatusBarLyric.API.StatusBarLyric { *; }
 
--printmapping ../mapping.txt
+-printmapping ../mapping.txt
+
+-dontwarn org.gradle.api.Action
+-dontwarn org.gradle.api.Named
+-dontwarn org.gradle.api.Plugin
+-dontwarn org.gradle.api.Task
+-dontwarn org.gradle.api.artifacts.Dependency
+-dontwarn org.gradle.api.artifacts.ExternalModuleDependency
+-dontwarn org.gradle.api.attributes.Attribute
+-dontwarn org.gradle.api.attributes.AttributeCompatibilityRule
+-dontwarn org.gradle.api.attributes.AttributeContainer
+-dontwarn org.gradle.api.attributes.AttributeDisambiguationRule
+-dontwarn org.gradle.api.attributes.HasAttributes
+-dontwarn org.gradle.api.component.SoftwareComponent
+-dontwarn org.gradle.api.plugins.ExtensionAware
+-dontwarn org.gradle.api.tasks.util.PatternFilterable
+
+
+-dontwarn coil3.PlatformContext
+-dontwarn libcore.icu.NativePluralRules
+-dontwarn org.jetbrains.kotlin.library.BaseKotlinLibrary
+-dontwarn org.jetbrains.kotlin.library.BaseWriter
+-dontwarn org.jetbrains.kotlin.library.IrKotlinLibraryLayout
+-dontwarn org.jetbrains.kotlin.library.IrLibrary
+-dontwarn org.jetbrains.kotlin.library.IrWriter
+-dontwarn org.jetbrains.kotlin.library.KotlinLibrary
+-dontwarn org.jetbrains.kotlin.library.KotlinLibraryLayout
+-dontwarn org.jetbrains.kotlin.library.KotlinLibraryProperResolverWithAttributes
+-dontwarn org.jetbrains.kotlin.library.MetadataKotlinLibraryLayout
+-dontwarn org.jetbrains.kotlin.library.MetadataLibrary
+-dontwarn org.jetbrains.kotlin.library.MetadataWriter
+-dontwarn org.jetbrains.kotlin.library.SearchPathResolver
+-dontwarn org.jetbrains.kotlin.library.impl.BaseLibraryAccess
+-dontwarn org.jetbrains.kotlin.library.impl.ExtractingKotlinLibraryLayout
+-dontwarn org.jetbrains.kotlin.library.impl.FromZipBaseLibraryImpl
+-dontwarn org.jetbrains.kotlin.library.impl.KotlinLibraryLayoutForWriter
+-dontwarn org.jetbrains.kotlin.library.impl.KotlinLibraryLayoutImpl
+-dontwarn org.jetbrains.kotlin.library.impl.KotlinLibraryLayoutImplKt

app/src/main/AndroidManifest.xml

@@ -6,6 +6,8 @@
         android:glEsVersion="0x00030000"
         android:required="true" />
 
+    <uses-sdk tools:overrideLibrary="com.funny.data_saver,com.nomanr.composables" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
@@ -36,37 +38,20 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Music"
         android:usesCleartextTraffic="true"
-        tools:ignore="AllowBackup,UnusedAttribute">
+        tools:ignore="AllowBackup,UnusedAttribute"
+        tools:overrideLibrary="com.nomanr.composables">
 
         <meta-data
             android:name="ScopedStorage"
             android:value="true" />
 
-        <receiver
-            android:name="androidx.media.session.MediaButtonReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name="com.lalilu.lmusic.service.LMusicService"
-            android:enabled="true"
-            android:exported="true"
-            android:foregroundServiceType="mediaPlayback">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-                <action android:name="android.media.browse.MediaBrowserService" />
-            </intent-filter>
-        </service>
-
         <activity
             android:name=".lmusic.MainActivity"
             android:configChanges="orientation|screenSize"
             android:exported="true"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:resizeableActivity="true"
+            android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MUSIC_PLAYER" />
@@ -95,5 +80,11 @@
             android:launchMode="singleTop">
 
         </activity>
+
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge"></provider>
     </application>
 </manifest>