From 29f263440f893d7aa39921dc9b54554d32fdbfce Mon Sep 17 00:00:00 2001
From: Han Yin <han.yin@arm.com>
Date: Sat, 30 Aug 2025 11:31:32 -0700
Subject: [PATCH] misc: replace top bar indicator's spacer with padding

---
 .../llama/ui/scaffold/topbar/PerformanceTopBar.kt    | 12 ++++--------
 .../llama/ui/scaffold/topbar/StorageTopBar.kt        |  3 +--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/topbar/PerformanceTopBar.kt b/examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/topbar/PerformanceTopBar.kt
index 18f33657f0..46c4aa8cb9 100644
--- a/examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/topbar/PerformanceTopBar.kt
+++ b/examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/topbar/PerformanceTopBar.kt
@@ -70,8 +70,6 @@ fun PerformanceTopBar(
                     useFahrenheit = useFahrenheit,
                     onScaffoldEvent = onScaffoldEvent,
                 )
-
-                Spacer(modifier = Modifier.width(8.dp))
             }
 
             // Memory indicator
@@ -95,7 +93,7 @@ private fun MemoryIndicator(
     val totalGB = String.format(Locale.getDefault(), "%.1f", memoryUsage.totalGB)
 
     Row(
-        modifier = Modifier.padding(end = 8.dp).clickable(role = Role.Button) {
+        modifier = Modifier.padding(end = 12.dp).clickable(role = Role.Button) {
             onScaffoldEvent(ScaffoldEvent.ShowSnackbar(
                 message = "Free RAM available: $availableGB GB\nTotal RAM on your device: $totalGB GB",
                 withDismissAction = true,
@@ -113,9 +111,8 @@ private fun MemoryIndicator(
             }
         )
 
-        Spacer(modifier = Modifier.width(4.dp))
-
         Text(
+            modifier = Modifier.padding(start = 4.dp),
             text =  "$availableGB / $totalGB GB",
             style = MaterialTheme.typography.bodySmall,
         )
@@ -138,7 +135,7 @@ private fun TemperatureIndicator(
     val warningDismissible = temperatureMetrics.warningLevel == TemperatureWarningLevel.HIGH
 
     Row(
-        modifier = Modifier.clickable(role = Role.Button) {
+        modifier = Modifier.padding(end = 12.dp).clickable(role = Role.Button) {
             onScaffoldEvent(ScaffoldEvent.ShowSnackbar(
                 message = temperatureWarning,
                 withDismissAction = warningDismissible,
@@ -158,9 +155,8 @@ private fun TemperatureIndicator(
             }
         )
 
-        Spacer(modifier = Modifier.width(2.dp))
-
         Text(
+            modifier = Modifier.padding(start = 4.dp),
             text = temperatureDisplay,
             style = MaterialTheme.typography.bodySmall,
             color = when (temperatureMetrics.warningLevel) {
diff --git a/examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/topbar/StorageTopBar.kt b/examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/topbar/StorageTopBar.kt
index 062bb89845..7c896ae950 100644
--- a/examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/topbar/StorageTopBar.kt
+++ b/examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/topbar/StorageTopBar.kt
@@ -84,9 +84,8 @@ private fun StorageIndicator(
             }
         )
 
-        Spacer(modifier = Modifier.width(2.dp))
-
         Text(
+            modifier = Modifier.padding(start = 4.dp),
             text = "$usedGb / $availableGb GB",
             style = MaterialTheme.typography.bodySmall
         )