fix: increase android speed limit sign font size (#416)

* fix: increase android speed limit sign font size * fix: increase android speed limit sign font size
stadiamaps · Jan 7, 2025 · ee7a121 · ee7a121
1 parent 772d778
commit ee7a121
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 10 deletions.
diff --git a/android/.gitignore b/android/.gitignore
@@ -1,5 +1,6 @@
 *.iml
 .gradle
+.kotlin
 /local.properties
 /.idea/caches
 /.idea/libraries

diff --git a/...a/com/stadiamaps/ferrostar/composeui/views/components/speedlimit/USStyleSpeedLimitView.kt b/...a/com/stadiamaps/ferrostar/composeui/views/components/speedlimit/USStyleSpeedLimitView.kt
@@ -64,7 +64,7 @@ fun USStyleSpeedLimitView(
                     Column(
                         modifier = Modifier.fillMaxSize(),
                         horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.Center) {
+                        verticalArrangement = Arrangement.Top) {
                           Text(
                               text = stringResource(R.string.speed).uppercase(),
                               fontSize = 9.sp,
@@ -79,12 +79,17 @@ fun USStyleSpeedLimitView(
                               fontWeight = FontWeight.Bold,
                               color = Color.Black)
 
-                          Spacer(modifier = Modifier.height(6.dp))
+                          Spacer(modifier = Modifier.weight(1f))
 
                           Text(
                               text = formattedSpeed,
-                              fontSize = if (formattedSpeed.length > 3) 18.sp else 24.sp,
-                              lineHeight = if (formattedSpeed.length > 3) 20.sp else 26.sp,
+                              fontSize =
+                                  when {
+                                    (formattedSpeed.length < 3) -> 30.sp
+                                    (formattedSpeed.length == 3) -> 24.sp
+                                    else -> 18.sp
+                                  },
+                              lineHeight = if (formattedSpeed.length > 3) 26.sp else 32.sp,
                               fontWeight = FontWeight.ExtraBold,
                               color = Color.Black,
                               textAlign = TextAlign.Center)

diff --git a/...ps/ferrostar/composeui/views/components/speedlimit/ViennaConventionStyleSpeedLimitView.kt b/...ps/ferrostar/composeui/views/components/speedlimit/ViennaConventionStyleSpeedLimitView.kt
@@ -60,16 +60,16 @@ fun ViennaConventionStyleSpeedLimitView(
                         text = formattedSpeed,
                         fontSize =
                             when {
-                              formattedSpeed.length > 3 -> 14.sp
-                              formattedSpeed.length > 2 -> 18.sp
-                              else -> 24.sp
+                              formattedSpeed.length > 3 -> 18.sp
+                              formattedSpeed.length > 2 -> 24.sp
+                              else -> 29.sp
                             },
                         fontWeight = FontWeight.ExtraBold,
                         lineHeight =
                             when {
-                              formattedSpeed.length > 3 -> 16.sp
-                              formattedSpeed.length > 2 -> 20.sp
-                              else -> 26.sp
+                              formattedSpeed.length > 3 -> 20.sp
+                              formattedSpeed.length > 2 -> 26.sp
+                              else -> 30.sp
                             },
                         color = Color.Black,
                         textAlign = TextAlign.Center)

diff --git a/...ar.views_NavigatingInnerGridViewTest_testNavigatingInnerGridViewNonTracking.png b/...ar.views_NavigatingInnerGridViewTest_testNavigatingInnerGridViewNonTracking.png
diff --git a/...NavigatingInnerGridViewTest_testNavigatingInnerGridViewNonTrackingLandscape.png b/...NavigatingInnerGridViewTest_testNavigatingInnerGridViewNonTrackingLandscape.png
diff --git a/...ostar.views_NavigatingInnerGridViewTest_testNavigatingInnerGridViewTracking.png b/...ostar.views_NavigatingInnerGridViewTest_testNavigatingInnerGridViewTracking.png
diff --git a/...ws_NavigatingInnerGridViewTest_testNavigatingInnerGridViewTrackingLandscape.png b/...ws_NavigatingInnerGridViewTest_testNavigatingInnerGridViewTrackingLandscape.png
diff --git a/...om.stadiamaps.ferrostar.views_NavigationUIButtonTest_testNavigationUIButton.png b/...om.stadiamaps.ferrostar.views_NavigationUIButtonTest_testNavigationUIButton.png
diff --git a/...aps.ferrostar.views_NavigationUIButtonTest_testNavigationUIButtonCustomized.png b/...aps.ferrostar.views_NavigationUIButtonTest_testNavigationUIButtonCustomized.png
diff --git a/...com.stadiamaps.ferrostar.views_USStyleSpeedLimitViewTest_testFastSpeedValue.png b/...com.stadiamaps.ferrostar.views_USStyleSpeedLimitViewTest_testFastSpeedValue.png
diff --git a/...diamaps.ferrostar.views_USStyleSpeedLimitViewTest_testImplausibleSpeedValue.png b/...diamaps.ferrostar.views_USStyleSpeedLimitViewTest_testImplausibleSpeedValue.png
diff --git a/...s.ferrostar.views_USStyleSpeedLimitViewTest_testKilometersPerHourSpeedValue.png b/...s.ferrostar.views_USStyleSpeedLimitViewTest_testKilometersPerHourSpeedValue.png
diff --git a/...om.stadiamaps.ferrostar.views_USStyleSpeedLimitViewTest_testKnotsSpeedValue.png b/...om.stadiamaps.ferrostar.views_USStyleSpeedLimitViewTest_testKnotsSpeedValue.png
diff --git a/.../com.stadiamaps.ferrostar.views_USStyleSpeedLimitViewTest_testLowSpeedValue.png b/.../com.stadiamaps.ferrostar.views_USStyleSpeedLimitViewTest_testLowSpeedValue.png
diff --git a/...stadiamaps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testFastSpeedValue.png b/...stadiamaps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testFastSpeedValue.png
diff --git a/...aps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testImplausibleSpeedValue.png b/...aps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testImplausibleSpeedValue.png
diff --git a/...tadiamaps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testKnotsSpeedValue.png b/...tadiamaps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testKnotsSpeedValue.png
diff --git a/....stadiamaps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testLowSpeedValue.png b/....stadiamaps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testLowSpeedValue.png
diff --git a/...ferrostar.views_ViennaStyleSpeedLimitViewTest_testMetersPerSecondSpeedValue.png b/...ferrostar.views_ViennaStyleSpeedLimitViewTest_testMetersPerSecondSpeedValue.png
diff --git a/...ps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testMilesPerHourSpeedValue.png b/...ps.ferrostar.views_ViennaStyleSpeedLimitViewTest_testMilesPerHourSpeedValue.png