From 41615be5aec850bdb30c666cbd90f1256aaddc6f Mon Sep 17 00:00:00 2001
From: Han Yin <han.yin@arm.com>
Date: Thu, 17 Apr 2025 20:29:49 -0700
Subject: [PATCH] UI: fix the typo `totalGb` in `StorageMetrics`

---
 .../revamp/data/repository/ModelRepository.kt |  4 +--
 .../llama/revamp/ui/components/TopAppBars.kt  | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/examples/llama.android/app/src/main/java/com/example/llama/revamp/data/repository/ModelRepository.kt b/examples/llama.android/app/src/main/java/com/example/llama/revamp/data/repository/ModelRepository.kt
index 017b016414..3826b94ae4 100644
--- a/examples/llama.android/app/src/main/java/com/example/llama/revamp/data/repository/ModelRepository.kt
+++ b/examples/llama.android/app/src/main/java/com/example/llama/revamp/data/repository/ModelRepository.kt
@@ -99,7 +99,7 @@ class ModelRepositoryImpl @Inject constructor(
             emit(
                 StorageMetrics(
                     usedGB = modelsSizeBytes / BYTES_IN_GB,
-                    totalGB = availableSpaceBytes / BYTES_IN_GB
+                    availableGB = availableSpaceBytes / BYTES_IN_GB
                 )
             )
             delay(STORAGE_METRICS_UPDATE_INTERVAL)
@@ -343,5 +343,5 @@ class ModelRepositoryImpl @Inject constructor(
 
 data class StorageMetrics(
     val usedGB: Float,
-    val totalGB: Float
+    val availableGB: Float
 )
diff --git a/examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/components/TopAppBars.kt b/examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/components/TopAppBars.kt
index 62b9bf2506..faac83e94e 100644
--- a/examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/components/TopAppBars.kt
+++ b/examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/components/TopAppBars.kt
@@ -14,6 +14,7 @@ import androidx.compose.material.icons.filled.WarningAmber
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.Label
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -174,7 +175,9 @@ fun StorageTopBar(
             }
         },
         actions = {
-            StorageIndicator(storageMetrics = storageMetrics)
+            storageMetrics?.let {
+                StorageIndicator(storageMetrics = it)
+            }
         },
         colors = TopAppBarDefaults.topAppBarColors(
             containerColor = MaterialTheme.colorScheme.surface,
@@ -238,23 +241,17 @@ fun TemperatureIndicator(temperatureMetrics: TemperatureMetrics, useFahrenheit:
 }
 
 @Composable
-fun StorageIndicator(storageMetrics: StorageMetrics?) {
-    val usedGb = storageMetrics?.usedGB
-    val totalGb = storageMetrics?.totalGB
-    val usedRatio = if (usedGb != null && totalGb != null && totalGb > 0.0f) {
-        usedGb / totalGb
-    } else {
-        null
-    }
+fun StorageIndicator(storageMetrics: StorageMetrics) {
+    val usedGb = storageMetrics.usedGB
+    val availableGb = storageMetrics.availableGB
 
     Row(modifier = Modifier.padding(end = 8.dp), verticalAlignment = Alignment.CenterVertically) {
         Icon(
             imageVector = Icons.Default.SdStorage,
             contentDescription = "Storage",
             tint = when {
-                usedRatio == null -> MaterialTheme.colorScheme.onSurface
-                usedRatio > 0.9f -> MaterialTheme.colorScheme.error
-                usedRatio > 0.7f -> MaterialTheme.colorScheme.tertiary
+                availableGb < 5.0f -> MaterialTheme.colorScheme.error
+                availableGb < 10.0f -> MaterialTheme.colorScheme.tertiary
                 else -> MaterialTheme.colorScheme.onSurface
             }
         )
@@ -262,9 +259,7 @@ fun StorageIndicator(storageMetrics: StorageMetrics?) {
         Spacer(modifier = Modifier.width(2.dp))
 
         Text(
-            text = storageMetrics?.let {
-                String.format(Locale.getDefault(), "%.1f / %.1f GB", it.usedGB, it.totalGB)
-            } ?: String.format(Locale.getDefault(), " - / - GB"),
+            text = String.format(Locale.getDefault(), "%.1f / %.1f GB", usedGb, availableGb),
             style = MaterialTheme.typography.bodySmall
         )
     }