From e62738519cfb36aeecb631862c0c03f6924fae5d Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Fri, 16 Jan 2026 00:45:57 +0800 Subject: [PATCH] Revert "Update dependency androidx.compose:compose-bom-alpha to v2026 (#2835)" This reverts commit d87de0d3e202899bf5c7e260f501b17c7ed0432f. --- app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt | 4 ++-- gradle/libs.versions.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 466a2199b..71729b97e 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 = LocalLocale.current.language == "zh" + val isZh = Locale.getDefault().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 c40b2f984..e6b22aec6 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 = "2026.01.00" +compose-bom = "2025.12.01" compose-multiplatform = "1.10.0" compose-destinations = "2.3.0" compose-preference = "2.1.1"