Revert "Update dependency androidx.compose:compose-bom-alpha to v2026 (#2835)"
This reverts commit d87de0d3e2.
This commit is contained in:
1 parent
d87de0d3e2
commit
e62738519c
2 files changed
+3
-3
No files matched your search
@@ -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 {
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user