Merge pull request #238 from yschimke/fix_title

Fix prepare title clipping
android · Mar 20, 2024 · 50adcf3 · 50adcf3
2 parents 6082155 + ed60896
commit 50adcf3
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 31 deletions.
diff --git a/.../java/com/example/exercisesamplecompose/presentation/preparing/PreparingExerciseScreen.kt b/.../java/com/example/exercisesamplecompose/presentation/preparing/PreparingExerciseScreen.kt
@@ -47,9 +47,12 @@ import androidx.compose.ui.graphics.Paint
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.withSaveLayer
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.times
 import androidx.health.services.client.data.LocationAvailability
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -169,15 +172,15 @@ fun PreparingExerciseScreen(
         verticalArrangement = Arrangement.Center
     ) {
         Row(
-            horizontalArrangement = Arrangement.Center,
-            verticalAlignment = Alignment.Top,
             modifier = Modifier.height(25.dp)
         ) {
-
             Text(
                 textAlign = TextAlign.Center,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
                 text = stringResource(id = R.string.preparing_exercise),
                 modifier = Modifier.fillMaxWidth()
+                    .padding(horizontal = 0.15f * LocalConfiguration.current.screenWidthDp.dp)
             )
         }
         Row(
@@ -195,37 +198,27 @@ fun PreparingExerciseScreen(
             }
         }
 
-        Row(
-            horizontalArrangement = Arrangement.Center,
-            verticalAlignment = Alignment.Top
+        Text(
+            modifier = Modifier.fillMaxWidth(),
+            textAlign = TextAlign.Center,
+            text = updatePrepareLocationStatus(
+                locationAvailability = location ?: LocationAvailability.UNAVAILABLE
+            ),
+        )
+
+        Column(
+            modifier = Modifier.fillMaxWidth().padding(top = 6.dp),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            Text(
-                textAlign = TextAlign.Center,
-                text = updatePrepareLocationStatus(
-                    locationAvailability = location ?: LocationAvailability.UNAVAILABLE
-                ),
-                modifier = Modifier.fillMaxWidth()
+            Button(
+                imageVector = Icons.Default.PlayArrow,
+                contentDescription = stringResource(id = R.string.start),
+                onClick = onStart,
+                buttonSize = ButtonSize.Small,
+                enabled = uiState is PreparingScreenState.Preparing
             )
         }
-        Row(
-            horizontalArrangement = Arrangement.Center,
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier.padding(6.dp),
-        ) {
-            Column(
-                modifier = Modifier.fillMaxWidth(),
-                verticalArrangement = Arrangement.Center,
-                horizontalAlignment = Alignment.CenterHorizontally,
-            ) {
-                Button(
-                    imageVector = Icons.Default.PlayArrow,
-                    contentDescription = stringResource(id = R.string.start),
-                    onClick = onStart,
-                    buttonSize = ButtonSize.Small,
-                    enabled = uiState is PreparingScreenState.Preparing
-                )
-            }
-        }
     }
 }
 

diff --git a/...Compose/app/src/test/screenshots/PreparingExerciseScreenTest_galaxy_watch_5.png b/...Compose/app/src/test/screenshots/PreparingExerciseScreenTest_galaxy_watch_5.png
diff --git a/...Compose/app/src/test/screenshots/PreparingExerciseScreenTest_galaxy_watch_6.png b/...Compose/app/src/test/screenshots/PreparingExerciseScreenTest_galaxy_watch_6.png
diff --git a/.../src/test/screenshots/PreparingExerciseScreenTest_galaxy_watch_6_small_font.png b/.../src/test/screenshots/PreparingExerciseScreenTest_galaxy_watch_6_small_font.png
diff --git a/...pleCompose/app/src/test/screenshots/PreparingExerciseScreenTest_large_round.png b/...pleCompose/app/src/test/screenshots/PreparingExerciseScreenTest_large_round.png
diff --git a/...pleCompose/app/src/test/screenshots/PreparingExerciseScreenTest_pixel_watch.png b/...pleCompose/app/src/test/screenshots/PreparingExerciseScreenTest_pixel_watch.png
diff --git a/...app/src/test/screenshots/PreparingExerciseScreenTest_pixel_watch_large_font.png b/...app/src/test/screenshots/PreparingExerciseScreenTest_pixel_watch_large_font.png
diff --git a/...pleCompose/app/src/test/screenshots/PreparingExerciseScreenTest_small_round.png b/...pleCompose/app/src/test/screenshots/PreparingExerciseScreenTest_small_round.png
diff --git a/...Compose/app/src/test/screenshots/PreparingExerciseScreenTest_ticwatch_pro_5.png b/...Compose/app/src/test/screenshots/PreparingExerciseScreenTest_ticwatch_pro_5.png