[fix|build] Fix deeplink; use LocalActivity.current; use new R8 DSL; bump dependencies

Author: lightsummer233

gradle.properties

@@ -15,8 +15,8 @@ kotlin.native.ignoreDisabledTargets=true
 org.jetbrains.compose.experimental.macos.enabled=true
 
 # Android
-android.useAndroidX=true
 android.enableBuildConfigAsBytecode=true
+android.r8.gradual.support=true
 android.r8.maxWorkers=4
 android.injected.androidTest.leaveApksInstalledAfterRun=true
 

gradle/libs.versions.toml

@@ -1,25 +1,25 @@
 [versions]
-agp = "9.2.0"
+agp = "9.2.1"
 kotlin = "2.3.21"
-kotlinx-datetime = "0.7.1"
-kotlinx-coroutines = "1.10.2"
+kotlinx-datetime = "0.8.0"
+kotlinx-coroutines = "1.11.0"
 kotlinx-serialization = "1.11.0"
 kotlinx-io = "0.9.0"
 ksp = "2.3.7"
-compose = "1.11.0-beta03"
+compose = "1.11.0-rc01"
 compose-material3 = "1.11.0-alpha07"
 compose-material3-adaptive = "1.3.0-alpha07"
 compose-materialIconsExtended = "1.7.3"
 lifecycle = "2.10.0"
-navigation3 = "1.1.0"
+navigation3 = "1.1.1"
 ktor = "3.4.3"
 koin = "4.2.1"
 ksoup = "0.2.6"
-coil = "3.4.0"
-paging = "3.4.2"
+coil = "3.5.0-beta01"
+paging = "3.5.0"
 worker = "2.11.2"
 room = "2.8.4"
-filekit = "0.13.0"
+filekit = "0.14.1"
 xmlutil = "0.91.3"
 tracing-perfetto = "1.0.1"
 
@@ -29,7 +29,7 @@ androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", versi
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version = "1.13.0" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
 androidx-constraintlayout-compose = { module = "tech.annexflow.compose:constraintlayout-compose-multiplatform", version = "0.7.0-shaded" }
-androidx-media = { module = "androidx.media:media", version = "1.7.1" }
+androidx-media = { module = "androidx.media:media", version = "1.8.0" }
 androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version = "1.4.1" }
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version = "0.37.3" }
 desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
@@ -157,4 +157,4 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 room = { id = "androidx.room", version.ref = "room" }
-buildkonfig = { id = "com.codingfeline.buildkonfig", version = "0.18.0" }
+buildkonfig = { id = "com.codingfeline.buildkonfig", version = "0.20.0" }

platform/android/app/build.gradle.kts

@@ -81,12 +81,7 @@ android {
             if (signing != null) {
                 signingConfig = signingConfigs.getByName("release")    // signing
             }
-            isMinifyEnabled = true
-            isShrinkResources = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
+            optimization.enable = true
         }
         debug {
             applicationIdSuffix = ".debug"

platform/android/app/proguard-rules.pro

@@ -1,5 +1,6 @@
 package com.skyd.podaura.ui.player
 
+import androidx.activity.compose.LocalActivity
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.aspectRatio
@@ -14,15 +15,13 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil3.compose.rememberAsyncImagePainter
 import com.skyd.compone.ext.ratio
 import com.skyd.compone.ext.size
 import com.skyd.compone.ext.thenIfNotNull
-import com.skyd.podaura.ext.activity
 import com.skyd.podaura.model.preference.player.BackgroundPlayPreference
 import com.skyd.podaura.ui.component.OnLifecycleEvent
 import com.skyd.podaura.ui.component.rememberOrientationController
@@ -54,7 +53,6 @@ import com.skyd.podaura.ui.screen.settings.playerconfig.ForwardSecondsDialog
 import com.skyd.podaura.ui.screen.settings.playerconfig.ReplaySecondsDialog
 import io.github.vinceglb.filekit.PlatformFile
 
-
 @Composable
 fun PlayerViewRoute(
     service: PlayerCoordinator?,
@@ -72,7 +70,7 @@ fun PlayerView(
     onBack: () -> Unit,
     onSaveScreenshot: (PlatformFile) -> Unit,
 ) {
-    val context = LocalContext.current
+    val activity = LocalActivity.current
 
     val playerState by service.playerState.collectAsStateWithLifecycle()
     var playState by remember { mutableStateOf(PlayState.initial) }
@@ -140,7 +138,7 @@ fun PlayerView(
 
     val playerObserver = PlayerCoordinator.Observer { command ->
         when (command) {
-            is PlayerEvent.Shutdown -> context.activity.finish()
+            is PlayerEvent.Shutdown -> activity?.finish()
             PlayerEvent.Seek -> playState = playState.copy(isSeeking = false)
             else -> Unit
         }
@@ -223,7 +221,7 @@ fun PlayerView(
 
             Lifecycle.Event.ON_STOP -> {
                 if (inPipMode) {    // Close button in PIP window is clicked
-                    context.activity.finish()
+                    activity?.finish()
                 }
             }
 
@@ -250,7 +248,6 @@ private fun PipContent(
             onCommand = onCommand,
             modifier = Modifier
                 .pipParams(
-                    context = LocalContext.current,
                     autoEnterPipMode = autoEnterPipMode,
                     isVideo = true,
                     playState = playState,
@@ -265,7 +262,6 @@ private fun PipContent(
         val modifier = Modifier
             .fillMaxSize()
             .pipParams(
-                context = LocalContext.current,
                 autoEnterPipMode = autoEnterPipMode,
                 isVideo = false,
                 playState = playState,
@@ -373,4 +369,4 @@ private fun Content(
         visible = { dialogState.forwardSecondsDialogState().show },
         onDismissRequest = { onDialogVisibilityChanged.onForwardSecondDialog(false) },
     )
-}
+}

platform/android/app/src/main/java/com/skyd/podaura/ui/player/PlayerView.kt

@@ -0,0 +1,11 @@
+# FFmpeg
+-dontwarn com.arthenica.smartexception.java.Exceptions
+
+# MPV
+-keep,allowoptimization class is.xyz.mpv.MPVLib { public *; }
+
+# Allow ProGuard to widen access modifiers
+-allowaccessmodification
+
+# Strip Kotlin null checks inserted by the compiler to reduce method count and overhead
+-processkotlinnullchecks remove

platform/android/app/src/main/keepRules/rules.keep

@@ -208,18 +208,6 @@ kotlin {
     }
 }
 
-// https://github.com/coil-kt/coil/issues/3382
-// TODO Remove it after coil 3.5.0-beta01 released
-// w: Skiko dependencies' versions are incompatible.
-//    io.coil-kt.coil3:coil-core-jvm:3.4.0
-//    \--- org.jetbrains.skiko:skiko:0.9.22.2 -> 0.144.5
-//
-//    io.coil-kt.coil3:coil-svg-jvm:3.4.0
-//    \--- org.jetbrains.skiko:skiko:0.9.22.2 -> 0.144.5
-configurations.all {
-    resolutionStrategy.force("org.jetbrains.skiko:skiko:0.144.5")
-}
-
 compose.resources {
     publicResClass = true
 }

shared/build.gradle.kts

@@ -1,50 +1,17 @@
 package com.skyd.podaura.ext
 
-import android.app.Activity
 import android.content.Context
-import android.content.ContextWrapper
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Build.VERSION.SDK_INT
 import android.os.Vibrator
 import android.os.VibratorManager
-import android.view.Window
 import androidx.core.content.pm.PackageInfoCompat
 import kotlinx.coroutines.runBlocking
 import org.jetbrains.compose.resources.StringResource
 
-val Context.activity: Activity
-    get() {
-        return tryActivity ?: error("Can't find activity: $this")
-    }
-
-@get:JvmName("tryActivity")
-val Context.tryActivity: Activity?
-    get() {
-        var ctx = this
-        while (ctx is ContextWrapper) {
-            if (ctx is Activity) {
-                return ctx
-            }
-            ctx = ctx.baseContext
-        }
-        return null
-    }
-
-val Context.tryWindow: Window?
-    get() {
-        var ctx = this
-        while (ctx is ContextWrapper) {
-            if (ctx is Activity) {
-                return ctx.window
-            }
-            ctx = ctx.baseContext
-        }
-        return null
-    }
-
 fun Context.getAppVersionName(): String {
     var appVersionName = ""
     try {
@@ -105,4 +72,4 @@ fun Context.vibrator(): Vibrator {
         @Suppress("DEPRECATION")
         getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
     }
-}
+}