From e17a4c80b2affa3d5f44ce343d2ecf890ad79321 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 2 Jun 2025 14:38:54 -0300
Subject: [PATCH] Various UI polish items for backups.

---
 .../backup/v2/ui/status/BackupStatusRow.kt     | 18 +++++++++++++++---
 .../MessageBackupsKeyVerifyScreen.kt           |  4 ++++
 .../remote/RemoteBackupsSettingsFragment.kt    |  4 ++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt
index 18d6d2da1e..9073ae002f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatusRow.kt
@@ -75,6 +75,12 @@ fun BackupStatusRow(
   onCancelClick: (() -> Unit)? = null,
   onLearnMoreClick: () -> Unit = {}
 ) {
+  val endPad = if (onCancelClick == null) {
+    dimensionResource(CoreUiR.dimen.gutter)
+  } else {
+    dimensionResource(CoreUiR.dimen.gutter) - 8.dp
+  }
+
   Column(
     modifier = Modifier.padding(top = 8.dp, bottom = 12.dp)
   ) {
@@ -83,12 +89,17 @@ fun BackupStatusRow(
     ) {
       Row(
         verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
+        modifier = Modifier.padding(
+          start = dimensionResource(CoreUiR.dimen.gutter),
+          end = endPad
+        )
       ) {
         LinearProgressIndicator(
           color = progressColor(backupStatusData),
           progress = { backupStatusData.progress },
-          modifier = Modifier.weight(1f).padding(vertical = 12.dp)
+          modifier = Modifier.weight(1f).padding(vertical = 12.dp),
+          gapSize = 0.dp,
+          drawStopIndicator = {}
         )
 
         if (onCancelClick != null) {
@@ -261,7 +272,8 @@ fun BackupStatusRowNormalPreview() {
         bytesTotal = ByteSize(100),
         bytesDownloaded = ByteSize(50),
         restoreStatus = BackupStatusData.RestoreStatus.NORMAL
-      )
+      ),
+      onCancelClick = {}
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyVerifyScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyVerifyScreen.kt
index b0ec70d264..7629c531dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyVerifyScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyVerifyScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -60,6 +61,7 @@ import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.horizontalGutters
+import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.fonts.MonoTypeface
 import org.thoughtcrime.securesms.registrationv3.ui.restore.BackupKeyVisualTransformation
@@ -95,6 +97,7 @@ fun MessageBackupsKeyVerifyScreen(
       verticalArrangement = Arrangement.SpaceBetween,
       modifier = Modifier
         .padding(paddingValues)
+        .imePadding()
         .fillMaxSize()
     ) {
       val scrollState = rememberScrollState()
@@ -212,6 +215,7 @@ fun MessageBackupsKeyVerifyScreen(
       ModalBottomSheet(
         sheetState = sheetState,
         dragHandle = null,
+        containerColor = SignalTheme.colors.colorSurface1,
         onDismissRequest = {
           coroutineScope.launch {
             sheetState.hide()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
index 503e2000d5..f2048bb842 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
@@ -790,8 +790,8 @@ private fun DescriptionText(
     style = MaterialTheme.typography.bodyMedium,
     color = MaterialTheme.colorScheme.onSurfaceVariant,
     modifier = Modifier
-      .padding(horizontal = 16.dp)
-      .padding(top = 16.dp)
+      .horizontalGutters()
+      .padding(vertical = 16.dp)
       .then(modifier)
   )
 }