From 8a991c06fd43e709f1e1fcceff99d182c586397d Mon Sep 17 00:00:00 2001
From: djschnei21 <32646250+djschnei21@users.noreply.github.com>
Date: Fri, 10 May 2024 12:50:11 -0400
Subject: [PATCH] replace progress circle for zaps with outbox icon

---
 .../com/vitorpamplona/amethyst/ui/note/Icons.kt   | 15 +++++++++++++++
 .../vitorpamplona/amethyst/ui/note/PollNote.kt    |  7 +------
 .../amethyst/ui/note/ReactionsRow.kt              | 14 +-------------
 .../amethyst/ui/note/ZapTheDevsCard.kt            | 15 +--------------
 4 files changed, 18 insertions(+), 33 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 0ebd0d557..3b96dd264 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
@@ -33,6 +33,7 @@ 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.Outbox
 import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.Clear
 import androidx.compose.material.icons.filled.ContentCopy
@@ -232,6 +233,20 @@ fun ZapIcon(
     )
 }
 
+@Composable
+fun OutboxIcon(
+    modifier: Modifier,
+    tint: Color = Color.Unspecified,
+    contentDescriptor: Int = R.string.zap_description,
+) {
+    Icon(
+        imageVector = Icons.Default.Outbox,
+        contentDescription = stringResource(contentDescriptor),
+        tint = tint,
+        modifier = modifier,
+    )
+}
+
 @Composable
 fun CashuIcon(modifier: Modifier) {
     Icon(
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
index 5a53f964b..7a74a6f20 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
@@ -472,12 +472,7 @@ fun ZapVote(
                     tint = MaterialTheme.colorScheme.placeholderText,
                 )
             } else {
-                Spacer(Modifier.width(3.dp))
-                CircularProgressIndicator(
-                    progress = zappingProgress,
-                    modifier = Modifier.size(14.dp),
-                    strokeWidth = 2.dp,
-                )
+                OutboxIcon(iconSizeModifier, grayTint)
             }
         }
     }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
index 4256f83a1..50fbf7610 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
@@ -1062,19 +1062,7 @@ fun ZapReaction(
         }
 
         if (zappingProgress > 0.00001 && zappingProgress < 0.99999) {
-            Spacer(ModifierWidth3dp)
-
-            CircularProgressIndicator(
-                progress =
-                    animateFloatAsState(
-                        targetValue = zappingProgress,
-                        animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
-                        label = "ZapIconIndicator",
-                    )
-                        .value,
-                modifier = remember { Modifier.size(animationSize) },
-                strokeWidth = 2.dp,
-            )
+            OutboxIcon(iconSizeModifier, grayTint)
         } else {
             ObserveZapIcon(
                 baseNote,
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapTheDevsCard.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapTheDevsCard.kt
index 6af37c656..5f694cdeb 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapTheDevsCard.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapTheDevsCard.kt
@@ -403,20 +403,7 @@ fun ZapDonationButton(
             modifier = iconSizeModifier,
         ) {
             if (zappingProgress > 0.00001 && zappingProgress < 0.99999) {
-                Spacer(ModifierWidth3dp)
-
-                CircularProgressIndicator(
-                    progress =
-                        animateFloatAsState(
-                            targetValue = zappingProgress,
-                            animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
-                            label = "ZapIconIndicator",
-                        )
-                            .value,
-                    modifier = remember { Modifier.size(animationSize) },
-                    strokeWidth = 2.dp,
-                    color = grayTint,
-                )
+                OutboxIcon(iconSizeModifier, grayTint)
             } else {
                 ObserveZapIcon(
                     baseNote,