diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt index c6296300e0..e0a8ff0b6f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt @@ -59,16 +59,22 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.rememberTextMeasurer import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import java.util.Locale internal val Shape14 = RoundedCornerShape(14.dp) +@Composable +internal fun headingUppercase(text: String): String = + text.uppercase(LocalConfiguration.current.locales[0] ?: Locale.ROOT) + @Composable internal fun Eyebrow(t: String) { val pal = LocalPalette.current @@ -76,7 +82,7 @@ internal fun Eyebrow(t: String) { LaunchedEffect(Unit) { rule.animateTo(1f, Motion.tw(600, 120)) } Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { Box(modifier = Modifier.width(18.dp).height(1.5.dp).graphicsLayer { scaleX = rule.value; transformOrigin = androidx.compose.ui.graphics.TransformOrigin(0f, 0.5f) }.background(pal.signal)) - Text(t.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = pal.signal) + Text(headingUppercase(t), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = pal.signal) } } @@ -88,7 +94,7 @@ internal fun Eyebrow(t: String) { internal fun SectionTitle(t: String, detail: String?) { val colors = MaterialTheme.colorScheme Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().padding(top = 16.dp, bottom = 8.dp)) { - Text(t.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = colors.onSurfaceVariant) + Text(headingUppercase(t), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = colors.onSurfaceVariant) if (detail != null) Text(detail, fontSize = 12.sp, color = colors.onBackground) Box(modifier = Modifier.weight(1f).height(1.dp).background(LocalPalette.current.line)) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 1feb8e2800..d63e656469 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -961,7 +961,7 @@ private suspend fun CompletableFuture.await(): T = @Composable private fun SectionLabel(title: String) { Text( - title.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, + headingUppercase(title), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.fillMaxWidth().padding(top = 6.dp, start = 2.dp), ) } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/HeadingLocaleTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/HeadingLocaleTest.kt new file mode 100644 index 0000000000..9b32b50366 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/HeadingLocaleTest.kt @@ -0,0 +1,44 @@ +package com.droiddeck.launcher.ui + +import android.content.res.Configuration +import android.os.LocaleList +import androidx.compose.foundation.layout.Column +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.mutableStateOf +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.test.onAllNodesWithText +import androidx.compose.ui.test.assertCountEquals +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.util.Locale + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class HeadingLocaleTest { + @get:Rule val compose = createRobolectricComposeRule() + + @Test fun headingsFollowTheAppLanguageAndRecomposeWhenItChanges() { + val appLocale = mutableStateOf(Locale.forLanguageTag("tr")) + compose.setContent { + val configuration = Configuration(LocalConfiguration.current).apply { + setLocales(LocaleList(appLocale.value)) + } + CompositionLocalProvider(LocalConfiguration provides configuration) { + DroidDeckTheme { + Column { + Eyebrow("Bileşenler Iİıi") + SectionTitle("Bileşenler Iİıi", null) + } + } + } + } + compose.onAllNodesWithText("BİLEŞENLER IİIİ").assertCountEquals(2) + compose.runOnIdle { appLocale.value = Locale.ENGLISH } + compose.onAllNodesWithText("BILEŞENLER IİII").assertCountEquals(2) + compose.runOnIdle { appLocale.value = Locale.forLanguageTag("tr") } + compose.onAllNodesWithText("BİLEŞENLER IİIİ").assertCountEquals(2) + } +}