From c61c4ce16c4f97b9688a56867beb65618d908345 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Sat, 28 Sep 2024 11:01:56 -0400
Subject: [PATCH] Improves names and icons of the left drawer.

---
 .../amethyst/ui/navigation/DrawerContent.kt   | 64 +++++++++++++++----
 amethyst/src/main/res/values/strings.xml      |  4 ++
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt
index f71736172..809cc2e3f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt
@@ -45,6 +45,8 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Send
 import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.outlined.CloudUpload
+import androidx.compose.material.icons.outlined.GroupAdd
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -65,6 +67,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
@@ -478,7 +481,7 @@ fun ListContent(
 
         IconRow(
             title = stringRes(R.string.media_servers),
-            icon = androidx.media3.ui.R.drawable.exo_icon_repeat_all,
+            icon = Icons.Outlined.CloudUpload,
             tint = MaterialTheme.colorScheme.onBackground,
             onClick = {
                 nav.closeDrawer()
@@ -494,6 +497,16 @@ fun ListContent(
             route = Route.BlockedUsers.route,
         )
 
+        IconRow(
+            title = stringRes(R.string.privacy_options),
+            icon = R.drawable.ic_tor,
+            tint = MaterialTheme.colorScheme.onBackground,
+            onClick = {
+                nav.closeDrawer()
+                conectOrbotDialogOpen = true
+            },
+        )
+
         accountViewModel.account.settings.keyPair.privKey?.let {
             IconRow(
                 title = stringRes(R.string.backup_keys),
@@ -506,18 +519,8 @@ fun ListContent(
             )
         }
 
-        IconRow(
-            title = stringRes(R.string.connect_via_tor_short),
-            icon = R.drawable.ic_tor,
-            tint = MaterialTheme.colorScheme.onBackground,
-            onClick = {
-                nav.closeDrawer()
-                conectOrbotDialogOpen = true
-            },
-        )
-
         NavigationRow(
-            title = stringRes(R.string.settings),
+            title = stringRes(R.string.preferences),
             icon = Route.Settings.icon,
             tint = MaterialTheme.colorScheme.onBackground,
             nav = nav,
@@ -528,7 +531,7 @@ fun ListContent(
 
         IconRow(
             title = stringRes(R.string.drawer_accounts),
-            icon = R.drawable.manage_accounts,
+            icon = Icons.Outlined.GroupAdd,
             tint = MaterialTheme.colorScheme.onBackground,
             onClick = openSheet,
         )
@@ -648,6 +651,41 @@ fun IconRow(
     }
 }
 
+@Composable
+fun IconRow(
+    title: String,
+    icon: ImageVector,
+    tint: Color,
+    onClick: () -> Unit,
+) {
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clickable(
+                    onClickLabel = title,
+                    onClick = onClick,
+                ),
+    ) {
+        Row(
+            modifier = IconRowModifier,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                imageVector = icon,
+                null,
+                modifier = Size22Modifier,
+                tint = tint,
+            )
+            Text(
+                modifier = IconRowTextModifier,
+                text = title,
+                fontSize = Font18SP,
+            )
+        }
+    }
+}
+
 @Composable
 fun IconRowRelays(
     accountViewModel: AccountViewModel,
diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml
index 02f34b81e..e205c7c20 100644
--- a/amethyst/src/main/res/values/strings.xml
+++ b/amethyst/src/main/res/values/strings.xml
@@ -401,6 +401,7 @@
     <string name="upload_server_relays_nip95">Your relays (NIP-95)</string>
     <string name="upload_server_relays_nip95_explainer">Files are hosted by your relays. New NIP: check if they support</string>
 
+    <string name="privacy_options">Privacy Options</string>
     <string name="connect_via_tor_short">Tor/Orbot setup</string>
     <string name="connect_via_tor">Connect through your Orbot setup</string>
 
@@ -592,6 +593,9 @@
 
     <string name="add_sensitive_content_label">Sensitive Content</string>
     <string name="add_sensitive_content_description">Adds sensitive content warning before showing this content</string>
+
+    <string name="preferences">App Preferences</string>
+
     <string name="settings">Settings</string>
     <string name="connectivity_type_always">Always</string>
     <string name="connectivity_type_wifi_only">Wifi-only</string>