From 6c1b0702ba0b4d71763ce1fd9963523ccf7625c2 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Sat, 10 Oct 2026 14:55:28 +0600 Subject: [PATCH] Use the beta Compose BOM The alpha BOM's 2026.10.00 has the same Compose and Material 3 versions as the beta one, but it keeps material3-adaptive on alpha. Tracker search now reads the locale from composition, since Locale.current is deprecated. Closes #4065 --- .../java/eu/kanade/presentation/track/TrackerSearch.kt | 7 ++++--- gradle/libs.versions.toml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/track/TrackerSearch.kt b/app/src/main/java/eu/kanade/presentation/track/TrackerSearch.kt index 46da98b8b..a4fb355af 100644 --- a/app/src/main/java/eu/kanade/presentation/track/TrackerSearch.kt +++ b/app/src/main/java/eu/kanade/presentation/track/TrackerSearch.kt @@ -56,10 +56,10 @@ import androidx.compose.ui.platform.Clipboard import androidx.compose.ui.platform.LocalClipboard import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.platform.LocalLocale import androidx.compose.ui.platform.toClipEntry import androidx.compose.ui.text.capitalize import androidx.compose.ui.text.input.ImeAction -import androidx.compose.ui.text.intl.Locale import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.toLowerCase import androidx.compose.ui.tooling.preview.PreviewLightDark @@ -245,8 +245,9 @@ private fun SearchResultItem( val context = LocalContext.current val clipboard: Clipboard = LocalClipboard.current val focusManager = LocalFocusManager.current - val type = trackSearch.publishing_type.toLowerCase(Locale.current).capitalize(Locale.current) - val status = trackSearch.publishing_status.toLowerCase(Locale.current).capitalize(Locale.current) + val locale = LocalLocale.current + val type = trackSearch.publishing_type.toLowerCase(locale).capitalize(locale) + val status = trackSearch.publishing_status.toLowerCase(locale).capitalize(locale) val description = trackSearch.summary.trim() val shape = RoundedCornerShape(16.dp) val borderColor = if (selected) MaterialTheme.colorScheme.outline else Color.Transparent diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 15bd4e873..caee21afb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ androidx-appCompat = "1.8.0" androidx-baselineProfile = "1.5.0" androidx-benchmark = "1.5.0" androidx-biometric = "1.2.0-alpha05" -androidx-compose-bom = "2026.09.01" +androidx-compose-bom = "2026.10.00" androidx-constraintLayout = "2.2.2" androidx-core = "1.19.1" androidx-coreSplashScreen = "1.2.0" @@ -90,7 +90,7 @@ androidx-benchmark-macroJunit4 = { module = "androidx.benchmark:benchmark-macro- androidx-biometric = { module = "androidx.biometric:biometric-ktx", version.ref = "androidx-biometric" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-animationGraphics = { module = "androidx.compose.animation:animation-graphics" } -androidx-compose-bom = { module = "androidx.compose:compose-bom-alpha", version.ref = "androidx-compose-bom" } +androidx-compose-bom = { module = "androidx.compose:compose-bom-beta", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-material3NavSuite = { module = "androidx.compose.material3:material3-adaptive-navigation-suite" }