diff --git a/app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt b/app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt index 71729b97e..466a2199b 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt @@ -16,11 +16,11 @@ package com.hippo.ehviewer.util import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalLocale import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import com.ehviewer.core.i18n.R import com.ehviewer.core.util.toLocalDateTime -import java.util.Locale import kotlin.time.Clock import kotlin.time.Instant import kotlinx.datetime.LocalDate @@ -127,7 +127,7 @@ object ReadableTime { val timeDate = time.toLocalDateTime(timeZone).date val nowYear = nowDate.year val timeYear = timeDate.year - val isZh = Locale.getDefault().language == "zh" + val isZh = LocalLocale.current.language == "zh" if (nowYear == timeYear) { if (isZh) DATE_FORMAT_WITHOUT_YEAR_ZH else DATE_FORMAT_WITHOUT_YEAR } else { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 646db1aaa..62bf4e532 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ androidx-webkit = "1.15.0" androidx-work = "2.11.0" arrow = "2.2.1.1" coil = "3.3.0" -compose-bom = "2025.12.01" +compose-bom = "2026.01.00" compose-multiplatform = "1.10.0" compose-destinations = "2.3.0" compose-preference = "2.1.1" @@ -74,7 +74,7 @@ coil-gif = { module = "io.coil-kt.coil3:coil-gif" } coil-network = { module = "io.coil-kt.coil3:coil-network-ktor3" } compose-bom = { module = "androidx.compose:compose-bom-alpha", version.ref = "compose-bom" } -compose-foundation = { module = "androidx.compose.foundation:foundation" } +compose-foundation = { module = "androidx.compose.foundation:foundation", version = "1.11.0-SNAPSHOT" } compose-material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version = "1.7.3" } compose-material3 = { module = "org.jetbrains.compose.material3:material3", version = "1.9.0" } compose-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version = "1.2.0" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 2859d03e7..0137322f5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,6 +24,8 @@ dependencyResolutionManagement { } } mavenCentral() + // https://issuetracker.google.com/477453079 + maven("https://androidx.dev/snapshots/builds/14690944/artifacts/repository") } }