From 95f2e092177fdf46e5b48460867a7923556fa908 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Sun, 1 Sep 2024 12:21:55 -0300
Subject: [PATCH] refactor: update component to use `FlowRow` for RTL support

---
 .../com/geeksville/mesh/ui/map/CacheLayout.kt | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/CacheLayout.kt b/app/src/main/java/com/geeksville/mesh/ui/map/CacheLayout.kt
index b292543f4..a9b14caf2 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/CacheLayout.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/CacheLayout.kt
@@ -3,7 +3,8 @@ package com.geeksville.mesh.ui.map
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -15,13 +16,13 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.geeksville.mesh.R
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 internal fun CacheLayout(
     cacheEstimate: String,
@@ -33,7 +34,7 @@ internal fun CacheLayout(
         modifier = modifier
             .fillMaxWidth()
             .wrapContentHeight()
-            .background(colorResource(R.color.colorAdvancedBackground))
+            .background(color = MaterialTheme.colors.background)
             .padding(8.dp),
     ) {
         Text(
@@ -54,15 +55,15 @@ internal fun CacheLayout(
             color = MaterialTheme.colors.onBackground.copy(alpha = ContentAlpha.medium),
         )
 
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
+        FlowRow(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp),
+            horizontalArrangement = Arrangement.spacedBy(space = 8.dp),
         ) {
             Button(
                 onClick = onCancelDownload,
-                modifier = Modifier
-                    .weight(1f)
-                    .padding(start = 8.dp),
+                modifier = Modifier.weight(1f),
             ) {
                 Text(
                     text = stringResource(id = R.string.cancel),
@@ -71,9 +72,7 @@ internal fun CacheLayout(
             }
             Button(
                 onClick = onExecuteJob,
-                modifier = Modifier
-                    .weight(1f)
-                    .padding(end = 8.dp),
+                modifier = Modifier.weight(1f),
             ) {
                 Text(
                     text = stringResource(id = R.string.map_start_download),