refactor: migrate from Precompose to androidx libraries

FunnySaltyFish · FunnySaltyFish · commit a05eba2b810c · 2026-05-03T00:48:59.000+08:00
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -133,13 +133,13 @@ kotlin {
             @OptIn(ExperimentalComposeLibrary::class)
             implementation(compose.components.resources)
 
+            implementation(libs.androidx.lifecycle.viewmodel)
+            implementation(libs.androidx.lifecycle.viewmodel.compose)
             implementation(libs.kotlinx.serialization.json)
-
-            implementation(libs.precompose)
-            implementation(libs.precompose.viewmodel) // For ViewModel intergration
         }
         desktopMain.dependencies {
             implementation(compose.desktop.currentOs)
+            implementation(libs.kotlinx.coroutines.swing)
         }
 
         // 创建 iOS 公共源码集
@@ -189,6 +189,13 @@ android {
 compose.desktop {
     application {
         mainClass = "MainKt"
+        buildTypes.release.proguard {
+            // Compose Desktop release tasks run ProGuard by default.
+            // CI only needs a stable distributable, so disable it here.
+            isEnabled.set(false)
+            optimize.set(false)
+            obfuscate.set(false)
+        }
 
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
diff --git a/composeApp/src/androidMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.android.kt b/composeApp/src/androidMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.android.kt
@@ -0,0 +1,9 @@
+package com.funny.data_saver.kmp
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun PlatformBackHandler(enabled: Boolean, onBack: () -> Unit) {
+    BackHandler(enabled = enabled, onBack = onBack)
+}
diff --git a/composeApp/src/commonMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.kt b/composeApp/src/commonMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.kt
@@ -0,0 +1,6 @@
+package com.funny.data_saver.kmp
+
+import androidx.compose.runtime.Composable
+
+@Composable
+expect fun PlatformBackHandler(enabled: Boolean, onBack: () -> Unit)
diff --git a/composeApp/src/commonMain/kotlin/com/funny/data_saver/kmp/ViewModel.kt b/composeApp/src/commonMain/kotlin/com/funny/data_saver/kmp/ViewModel.kt
diff --git a/composeApp/src/commonMain/kotlin/com/funny/data_saver/ui/ExampleComposables.kt b/composeApp/src/commonMain/kotlin/com/funny/data_saver/ui/ExampleComposables.kt
@@ -57,6 +57,7 @@ import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.funny.data_saver.Constant
 import com.funny.data_saver.Constant.KEY_BEAN_EXAMPLE
 import com.funny.data_saver.Constant.KEY_BOOLEAN_EXAMPLE
@@ -75,7 +76,7 @@ import com.funny.data_saver.core.getLocalDataSaverInterface
 import com.funny.data_saver.core.rememberDataSaverState
 import com.funny.data_saver.kmp.IO
 import com.funny.data_saver.kmp.Log
-import com.funny.data_saver.kmp.viewModel
+import com.funny.data_saver.kmp.PlatformBackHandler
 import composedatasaver.composeapp.generated.resources.Res
 import composedatasaver.composeapp.generated.resources.action_add
 import composedatasaver.composeapp.generated.resources.action_add_id
@@ -172,7 +173,6 @@ import kotlinx.coroutines.launch
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import moe.tlaster.precompose.navigation.BackHandler
 import org.jetbrains.compose.resources.stringResource
 import kotlin.random.Random
 import kotlin.reflect.typeOf
@@ -680,7 +680,7 @@ private fun CustomSealedClassExample() {
 
 @Composable
 private fun CustomCoroutineScopeAndViewModelSample() {
-    val vm: MainViewModel = viewModel(MainViewModel::class) { MainViewModel() }
+    val vm: MainViewModel = viewModel { MainViewModel() }
 
     ExampleCard(
         title = stringResource(Res.string.custom_scope_view_model_title),
@@ -772,7 +772,7 @@ private fun TimeConsumingJobExample() {
                 Log.d("ExampleComposable", "TimeConsumingJobExample job: ${state.job}")
             }
 
-            BackHandler(state.job?.isCompleted == false) {
+            PlatformBackHandler(state.job?.isCompleted == false) {
                 showDialog = true
                 Log.d("ExampleComposable", "TimeConsumingJobExample is not finished")
             }
diff --git a/composeApp/src/commonMain/kotlin/com/funny/data_saver/ui/MainViewModel.kt b/composeApp/src/commonMain/kotlin/com/funny/data_saver/ui/MainViewModel.kt
@@ -1,9 +1,9 @@
 package com.funny.data_saver.ui
 
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.funny.data_saver.AppConfig
 import com.funny.data_saver.core.mutableDataSaverStateOf
-import moe.tlaster.precompose.viewmodel.ViewModel
-import moe.tlaster.precompose.viewmodel.viewModelScope
 
 class MainViewModel: ViewModel() {
     private val dataSaver get() = AppConfig.dataSaver
@@ -23,4 +23,4 @@ class MainViewModel: ViewModel() {
     companion object {
         private const val TAG = "MainViewModel"
     }
-}
+}
diff --git a/composeApp/src/commonMain/kotlin/com/funny/data_saver/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/com/funny/data_saver/ui/theme/Theme.kt
@@ -8,7 +8,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import com.funny.cmaterialcolors.MaterialColors.Companion.Blue500
 import com.funny.cmaterialcolors.MaterialColors.Companion.BlueA700
-import moe.tlaster.precompose.PreComposeApp
 
 private val DarkColorPalette = darkColorScheme(
     primary = Color(0xff3d557b),
@@ -44,12 +43,10 @@ fun FunnyTheme(
         LightColorPalette
     }
 
-    PreComposeApp {
-        MaterialTheme(
-            colorScheme = colors,
-            typography = Typography,
-            shapes = Shapes,
-            content = content
-        )
-    }
+    MaterialTheme(
+        colorScheme = colors,
+        typography = Typography,
+        shapes = Shapes,
+        content = content
+    )
 }
diff --git a/composeApp/src/desktopMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.desktop.kt b/composeApp/src/desktopMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.desktop.kt
@@ -0,0 +1,6 @@
+package com.funny.data_saver.kmp
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun PlatformBackHandler(enabled: Boolean, onBack: () -> Unit) = Unit
diff --git a/composeApp/src/desktopMain/kotlin/com/funny/data_saver/main.kt b/composeApp/src/desktopMain/kotlin/com/funny/data_saver/main.kt
@@ -4,7 +4,6 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import com.funny.data_saver.ui.App
 import kotlinx.serialization.ExperimentalSerializationApi
-import moe.tlaster.precompose.ProvidePreComposeLocals
 
 @OptIn(ExperimentalSerializationApi::class)
 fun main() {
@@ -13,9 +12,7 @@ fun main() {
             onCloseRequest = ::exitApplication,
             title = "Compose Data Saver"
         ) {
-            ProvidePreComposeLocals {
-                App()
-            }
+            App()
         }
     }
 }
diff --git a/composeApp/src/iosMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.ios.kt b/composeApp/src/iosMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.ios.kt
@@ -0,0 +1,6 @@
+package com.funny.data_saver.kmp
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun PlatformBackHandler(enabled: Boolean, onBack: () -> Unit) = Unit
diff --git a/composeApp/src/wasmJsMain/composeResources/font/NotoSansSC_WasmSubset.ttf b/composeApp/src/wasmJsMain/composeResources/font/NotoSansSC_WasmSubset.ttf
diff --git a/composeApp/src/wasmJsMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.wasmJs.kt b/composeApp/src/wasmJsMain/kotlin/com/funny/data_saver/kmp/PlatformBackHandler.wasmJs.kt
@@ -0,0 +1,6 @@
+package com.funny.data_saver.kmp
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun PlatformBackHandler(enabled: Boolean, onBack: () -> Unit) = Unit
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,9 +19,9 @@ junit = "4.13.2"
 kotlin = "2.3.20"
 kotlinx-serialization = "1.11.0"
 kotlinx-coroutines = "1.10.2"
+androidx-lifecycle = "2.10.0"
 datastore = "1.2.1"
 mmkv = "2.4.0"
-precompose = "1.6.2"
 
 [libraries]
 gradle-maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradleMavenPublishPlugin" }
@@ -33,6 +33,7 @@ kotlin-reflection = { module = "org.jetbrains.kotlin:kotlin-reflect", version.re
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
 androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" }
@@ -41,6 +42,8 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
 compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
 compose-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling"}
@@ -55,8 +58,6 @@ mmkv = { group = "com.tencent", name = "mmkv", version.ref = "mmkv" }
 # data store
 datastore = { group = "androidx.datastore", name = "datastore", version.ref = "datastore" }
 datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" }
-precompose = { module = "moe.tlaster:precompose", version.ref = "precompose" }
-precompose-viewmodel = { module = "moe.tlaster:precompose-viewmodel", version.ref = "precompose" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import androidx.compose.ui.window.Window`
`4`	`4`	`import androidx.compose.ui.window.application`
`5`	`5`	`import com.funny.data_saver.ui.App`
`6`	`6`	`import kotlinx.serialization.ExperimentalSerializationApi`
`7`		`-import moe.tlaster.precompose.ProvidePreComposeLocals`
`8`	`7`
`9`	`8`	`@OptIn(ExperimentalSerializationApi::class)`
`10`	`9`	`fun main() {`
`@@ -13,9 +12,7 @@ fun main() {`
`13`	`12`	`onCloseRequest = ::exitApplication,`
`14`	`13`	`title = "Compose Data Saver"`
`15`	`14`	`) {`
`16`		`- ProvidePreComposeLocals {`
`17`		`- App()`
`18`		`- }`
	`15`	`+ App()`
`19`	`16`	`}`
`20`	`17`	`}`
`21`	`18`	`}`