From 14a35b8f12615e66c3466e68269b868b214afcfe Mon Sep 17 00:00:00 2001 From: HapeLee <63206378+HapeLee@users.noreply.github.com> Date: Wed, 1 Jul 2026 23:52:58 +0800 Subject: [PATCH] chore(deps): update dependencies and adapt Miuix 0.9.2 --- .../java/io/legado/app/ui/util/MiuixUtils.kt | 2 +- .../app/ui/widget/components/AppTextField.kt | 17 ++++++++-- gradle/libs.versions.toml | 34 +++++++++---------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/util/MiuixUtils.kt b/app/src/main/java/io/legado/app/ui/util/MiuixUtils.kt index 9d6c7c31c..a755aa49a 100644 --- a/app/src/main/java/io/legado/app/ui/util/MiuixUtils.kt +++ b/app/src/main/java/io/legado/app/ui/util/MiuixUtils.kt @@ -26,9 +26,9 @@ import top.yukonga.miuix.kmp.basic.TopAppBar import top.yukonga.miuix.kmp.blur.BlendColorEntry import top.yukonga.miuix.kmp.blur.BlurColors import top.yukonga.miuix.kmp.blur.LayerBackdrop -import top.yukonga.miuix.kmp.blur.isRenderEffectSupported import top.yukonga.miuix.kmp.blur.rememberLayerBackdrop import top.yukonga.miuix.kmp.blur.textureBlur +import top.yukonga.miuix.kmp.shader.isRenderEffectSupported import top.yukonga.miuix.kmp.theme.MiuixTheme import top.yukonga.miuix.kmp.utils.overScrollVertical import top.yukonga.miuix.kmp.utils.scrollEndHaptic diff --git a/app/src/main/java/io/legado/app/ui/widget/components/AppTextField.kt b/app/src/main/java/io/legado/app/ui/widget/components/AppTextField.kt index c0e0483fc..9c0304fda 100644 --- a/app/src/main/java/io/legado/app/ui/widget/components/AppTextField.kt +++ b/app/src/main/java/io/legado/app/ui/widget/components/AppTextField.kt @@ -30,6 +30,7 @@ import io.legado.app.ui.widget.components.text.AppText import top.yukonga.miuix.kmp.theme.MiuixTheme import top.yukonga.miuix.kmp.basic.InputField as MiuixSearchBarInputField import top.yukonga.miuix.kmp.basic.TextField as MiuixTextField +import top.yukonga.miuix.kmp.basic.TextFieldDefaults as MiuixTextFieldDefaults @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -67,7 +68,13 @@ fun AppTextField( modifier = modifier, enabled = enabled, readOnly = readOnly, - backgroundColor = if (backgroundColor != Color.Unspecified) backgroundColor else MiuixTheme.colorScheme.surfaceContainerHigh, + colors = MiuixTextFieldDefaults.textFieldColors( + backgroundColor = if (backgroundColor != Color.Unspecified) { + backgroundColor + } else { + MiuixTheme.colorScheme.surfaceContainerHigh + }, + ), label = label ?: "", leadingIcon = leadingIcon, trailingIcon = trailingIcon, @@ -166,7 +173,13 @@ fun AppTextField( modifier = modifier, enabled = enabled, readOnly = readOnly, - backgroundColor = if (backgroundColor != Color.Unspecified) backgroundColor else MiuixTheme.colorScheme.surfaceContainerHigh, + colors = MiuixTextFieldDefaults.textFieldColors( + backgroundColor = if (backgroundColor != Color.Unspecified) { + backgroundColor + } else { + MiuixTheme.colorScheme.surfaceContainerHigh + }, + ), label = label ?: "", leadingIcon = leadingIcon, trailingIcon = trailingIcon, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ddbff021e..765171447 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,30 +1,30 @@ [versions] accompanistWebview = "0.36.0" -adaptive = "1.3.0-beta02" -adaptiveLayout = "1.3.0-beta02" -adaptiveNavigation = "1.3.0-beta02" -animation = "1.11.2" +adaptive = "1.3.0-rc01" +adaptiveLayout = "1.3.0-rc01" +adaptiveNavigation = "1.3.0-rc01" +animation = "1.11.3" biometric = "1.4.0-alpha07" coilCompose = "2.7.0" -composeBom = "2026.05.01" +composeBom = "2026.06.00" constraintlayoutCompose = "1.1.1" coreSplashscreen = "1.2.0" datastorePreferences = "1.2.1" -foundation = "1.11.2" -kotlin = "2.3.21" +foundation = "1.11.3" +kotlin = "2.4.0" kotlinxSerialization = "1.11.0" kotlinxCoroutinesAndroid = "1.11.0" kotlinxSerializationJson = "1.11.0" -kotlinxCollectionsImmutable = "0.4.0" +kotlinxCollectionsImmutable = "0.5.0" ksp = "2.3.6" agp = "9.2.1" appcompat = "1.7.1" colorpicker = "1.1.0" -colorpicker-compose = "1.1.4" +colorpicker-compose = "1.2.0" commonsText = "1.15.0" constraintlayout = "2.2.1" -core = "1.18.0" +core = "1.19.0" firebaseBom = "34.6.0" flexbox = "3.0.0" fragment = "1.8.9" @@ -33,29 +33,29 @@ fragment = "1.8.9" hutool = "5.8.22" libarchive = "1.1.6" -lifecycle = "2.10.0" +lifecycle = "2.11.0" glide = "5.0.7" gson = "2.14.0" jsonPath = "3.0.0" -ktor = "3.5.0" +ktor = "3.5.1" # issue #3811,不要更新版本,新版引入了一个破坏性变更(详见https://github.com/jhy/jsoup/pull/2017) # 若要升级请确保相关代码不会受此变更影响(如AnalyzeByJSoup.kt、JsoupXpath库等) intellijMarkdown = "0.7.3" jsoup = "1.16.2" jsoupxpath = "2.5.3" coroutines = "1.10.2" -lifecycleViewmodelCompose = "2.10.0" +lifecycleViewmodelCompose = "2.11.0" liveeventbus = "1.8.14" -navigation3 = "1.1.2" +navigation3 = "1.1.3" markwon = "4.6.2" material = "1.14.0" -material3 = "1.5.0-alpha20" +material3 = "1.5.0-alpha22" material3IconsExtended = "1.7.8" materialKolor = "4.1.1" media = "1.8.0" media3 = "1.8.0" navigationCompose = "2.9.8" -okhttp = "5.3.2" +okhttp = "5.4.0" palette = "1.0.0" preference = "1.2.1" protobufJavalite = "4.26.1" @@ -85,7 +85,7 @@ biometricKtx = "1.1.0" reorderable = "3.1.0" haze = "1.7.2" timber = "5.0.1" -miuix = "0.9.1" +miuix = "0.9.2" backdrop = "2.0.0" capsule = "2.1.3" lyricViewx = "1.3.2"