From 8c5aea46f1a532aea2f5ccdf6defe023c6247d0e Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Sat, 2 Mar 2024 19:10:42 +0000
Subject: [PATCH] refactor incognito button icon

---
 .../vitorpamplona/amethyst/ui/note/Icons.kt   | 34 +++++++++----------
 .../ui/screen/loggedIn/ChatroomScreen.kt      | 16 +++++++--
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt
index 9d2d4cb5a..2dc80c964 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt
@@ -20,11 +20,12 @@
  */
 package com.vitorpamplona.amethyst.ui.note
 
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.OpenInNew
+import androidx.compose.material.icons.automirrored.filled.VolumeOff
+import androidx.compose.material.icons.automirrored.filled.VolumeUp
 import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.Clear
@@ -37,8 +38,6 @@ import androidx.compose.material.icons.filled.Link
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.PushPin
 import androidx.compose.material.icons.filled.Report
-import androidx.compose.material.icons.filled.VolumeOff
-import androidx.compose.material.icons.filled.VolumeUp
 import androidx.compose.material.icons.outlined.BarChart
 import androidx.compose.material.icons.outlined.PlayCircle
 import androidx.compose.material3.Icon
@@ -50,7 +49,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.Size18Modifier
@@ -340,7 +338,7 @@ fun CloseIcon() {
 @Composable
 fun MutedIcon() {
     Icon(
-        imageVector = Icons.Default.VolumeOff,
+        imageVector = Icons.AutoMirrored.Filled.VolumeOff,
         contentDescription = stringResource(id = R.string.muted_button),
         tint = MaterialTheme.colorScheme.onBackground,
         modifier = Size30Modifier,
@@ -350,7 +348,7 @@ fun MutedIcon() {
 @Composable
 fun MuteIcon() {
     Icon(
-        imageVector = Icons.Default.VolumeUp,
+        imageVector = Icons.AutoMirrored.Filled.VolumeUp,
         contentDescription = stringResource(id = R.string.mute_button),
         tint = MaterialTheme.colorScheme.onBackground,
         modifier = Size30Modifier,
@@ -484,27 +482,27 @@ fun NIP05FailedVerification(modifier: Modifier) {
 }
 
 @Composable
-fun IncognitoIconOn() {
+fun IncognitoIconOn(
+    modifier: Modifier,
+    tint: Color,
+) {
     Icon(
         painter = painterResource(id = R.drawable.incognito),
         contentDescription = stringResource(id = R.string.accessibility_turn_off_sealed_message),
-        modifier =
-            Modifier
-                .padding(top = 2.dp)
-                .size(18.dp),
-        tint = MaterialTheme.colorScheme.primary,
+        modifier = modifier,
+        tint = tint,
     )
 }
 
 @Composable
-fun IncognitoIconOff() {
+fun IncognitoIconOff(
+    modifier: Modifier,
+    tint: Color,
+) {
     Icon(
         painter = painterResource(id = R.drawable.incognito_off),
         contentDescription = stringResource(id = R.string.accessibility_turn_on_sealed_message),
-        modifier =
-            Modifier
-                .padding(top = 2.dp)
-                .size(18.dp),
-        tint = MaterialTheme.colorScheme.placeholderText,
+        modifier = modifier,
+        tint = tint,
     )
 }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
index 59f052a0d..1e621e109 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
@@ -442,9 +442,21 @@ fun PrivateMessageEditFieldRow(
                         },
                     ) {
                         if (channelScreenModel.nip24) {
-                            IncognitoIconOn()
+                            IncognitoIconOn(
+                                modifier =
+                                    Modifier
+                                        .padding(top = 2.dp)
+                                        .size(18.dp),
+                                tint = MaterialTheme.colorScheme.primary,
+                            )
                         } else {
-                            IncognitoIconOff()
+                            IncognitoIconOff(
+                                modifier =
+                                    Modifier
+                                        .padding(top = 2.dp)
+                                        .size(18.dp),
+                                tint = MaterialTheme.colorScheme.placeholderText,
+                            )
                         }
                     }
                 }