Skip to content

Commit 63bee4c

Browse files
committed
回滚compose依赖版本,部分设备存在UI加载闪退
1 parent 460769e commit 63bee4c

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

app/build.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ val appVerCode: Int get() {
3232
return versionCode.toInt()
3333
}
3434
val buildNum: String get() = SimpleDateFormat("MMddHH", Locale.ENGLISH).format(Date())
35-
val appVerName: String = "3.0.11"
35+
val appVerName: String = "3.0.11-fix"
3636

3737
android {
3838
namespace = "me.teble.xposed.autodaily"
@@ -196,7 +196,7 @@ android {
196196
compose = true
197197
}
198198
composeOptions {
199-
kotlinCompilerExtensionVersion = rootProject.extra["composeCompilerVersion"] as String
199+
kotlinCompilerExtensionVersion = rootProject.extra["composeVersion"] as String
200200
}
201201

202202
externalNativeBuild {
@@ -261,19 +261,18 @@ dependencies {
261261
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
262262

263263
// jetpack compose
264-
implementation("androidx.activity:activity-compose:1.6.0")
265-
implementation("androidx.savedstate:savedstate-ktx:1.2.0")
264+
implementation("androidx.activity:activity-compose:1.4.0")
266265
implementation("androidx.compose.ui:ui:${rootProject.extra["composeVersion"]}")
267266
implementation("androidx.compose.ui:ui-tooling:${rootProject.extra["composeVersion"]}")
268267
implementation("androidx.compose.material:material:${rootProject.extra["composeVersion"]}")
269-
implementation("androidx.navigation:navigation-compose:2.6.0-alpha02")
268+
implementation("androidx.navigation:navigation-compose:2.5.0-alpha04")
270269
implementation("cn.hutool:hutool-core:5.8.0.M1")
271-
implementation("com.squareup.okhttp3:okhttp:4.10.0")
270+
implementation("com.squareup.okhttp3:okhttp:4.9.3")
272271
// Other
273272
implementation("com.hankcs:aho-corasick-double-array-trie:1.2.3")
274273
implementation("net.bytebuddy:byte-buddy-android:1.12.7")
275274
implementation("com.charleskorn.kaml:kaml:0.36.0")
276-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
275+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
277276
// implementation ("org.apache-extras.beanshell:bsh:2.0b6")
278277
// shizuku
279278
implementation("dev.rikka.shizuku:api:12.1.0")

app/src/main/java/me/teble/xposed/autodaily/activity/module/ModuleActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import androidx.compose.ui.platform.ComposeView
1616
import androidx.core.view.WindowCompat
1717
import androidx.lifecycle.ViewTreeLifecycleOwner
1818
import androidx.lifecycle.ViewTreeViewModelStoreOwner
19-
import androidx.savedstate.setViewTreeSavedStateRegistryOwner
19+
import androidx.savedstate.ViewTreeSavedStateRegistryOwner
2020
import kotlinx.coroutines.CoroutineScope
2121
import kotlinx.coroutines.MainScope
2222
import kotlinx.coroutines.cancel
@@ -68,7 +68,7 @@ class ModuleActivity : BaseActivity(), CoroutineScope by MainScope() {
6868
view.let {
6969
ViewTreeLifecycleOwner.set(it, this)
7070
ViewTreeViewModelStoreOwner.set(it, this)
71-
it.setViewTreeSavedStateRegistryOwner(this)
71+
ViewTreeSavedStateRegistryOwner.set(it, this)
7272
}
7373
setContentView(view)
7474
}

app/src/main/java/me/teble/xposed/autodaily/ui/CustomDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.lifecycle.*
1111
import androidx.savedstate.SavedStateRegistry
1212
import androidx.savedstate.SavedStateRegistryController
1313
import androidx.savedstate.SavedStateRegistryOwner
14-
import androidx.savedstate.setViewTreeSavedStateRegistryOwner
14+
import androidx.savedstate.ViewTreeSavedStateRegistryOwner
1515

1616
@SuppressLint("ResourceType")
1717
class CustomDialog(context: Context) : Dialog(context, 5),
@@ -40,7 +40,7 @@ class CustomDialog(context: Context) : Dialog(context, 5),
4040
super.setContentView(view)
4141
ViewTreeLifecycleOwner.set(view, this)
4242
ViewTreeViewModelStoreOwner.set(view, this)
43-
view.setViewTreeSavedStateRegistryOwner(this)
43+
ViewTreeSavedStateRegistryOwner.set(view, this)
4444
}
4545

4646
private fun handleLifecycleEvent(event: Lifecycle.Event) =

build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
val kotlinVersion by extra("1.7.20")
5-
val gradleVersion by extra("7.3.1")
4+
val kotlinVersion by extra("1.6.10")
5+
val gradleVersion by extra("7.2.2")
66
val gradlePluginVersion by extra("2.2.1")
7-
val composeVersion by extra("1.2.1")
8-
val composeCompilerVersion by extra("1.3.2")
7+
val composeVersion by extra("1.2.0-alpha07")
98
repositories {
109
google()
1110
mavenCentral()

0 commit comments

Comments
 (0)