From da878a9fab0071c77dc355abaa09159d826db8b5 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Tue, 19 Nov 2024 09:04:41 -0600
Subject: [PATCH] PM-15041: Update stepper buttons (#4330)

---
 .../button/BitwardenFilledIconButton.kt       | 55 +++++++++++++++++++
 .../button/color/BitwardenIconButtonColors.kt | 11 ++++
 .../components/stepper/BitwardenStepper.kt    |  6 +-
 3 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledIconButton.kt

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledIconButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledIconButton.kt
new file mode 100644
index 000000000..1f8564e9d
--- /dev/null
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledIconButton.kt
@@ -0,0 +1,55 @@
+package com.x8bit.bitwarden.ui.platform.components.button
+
+import androidx.annotation.DrawableRes
+import androidx.compose.material3.FilledIconButton
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.tooling.preview.Preview
+import com.x8bit.bitwarden.R
+import com.x8bit.bitwarden.ui.platform.components.button.color.bitwardenFilledIconButtonColors
+import com.x8bit.bitwarden.ui.platform.components.util.rememberVectorPainter
+import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
+
+/**
+ * A filled icon button that displays an icon.
+ *
+ * @param vectorIconRes Icon to display on the button.
+ * @param contentDescription The content description for this icon button.
+ * @param onClick Callback for when the icon button is clicked.
+ * @param modifier A [Modifier] for the composable.
+ * @param isEnabled Whether or not the button should be enabled.
+ */
+@Composable
+fun BitwardenFilledIconButton(
+    @DrawableRes vectorIconRes: Int,
+    contentDescription: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    isEnabled: Boolean = true,
+) {
+    FilledIconButton(
+        modifier = modifier.semantics(mergeDescendants = true) {},
+        onClick = onClick,
+        colors = bitwardenFilledIconButtonColors(),
+        enabled = isEnabled,
+    ) {
+        Icon(
+            painter = rememberVectorPainter(id = vectorIconRes),
+            contentDescription = contentDescription,
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun BitwardenFilledIconButton_preview() {
+    BitwardenTheme {
+        BitwardenFilledIconButton(
+            vectorIconRes = R.drawable.ic_question_circle,
+            contentDescription = "Sample Icon",
+            onClick = {},
+        )
+    }
+}
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/color/BitwardenIconButtonColors.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/color/BitwardenIconButtonColors.kt
index b27d01800..b0178c6f2 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/color/BitwardenIconButtonColors.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/color/BitwardenIconButtonColors.kt
@@ -5,6 +5,17 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
 
+/**
+ * Provides a default set of Bitwarden-styled colors for a filled icon button.
+ */
+@Composable
+fun bitwardenFilledIconButtonColors(): IconButtonColors = IconButtonColors(
+    containerColor = BitwardenTheme.colorScheme.filledButton.background,
+    contentColor = BitwardenTheme.colorScheme.filledButton.foreground,
+    disabledContainerColor = BitwardenTheme.colorScheme.filledButton.backgroundDisabled,
+    disabledContentColor = BitwardenTheme.colorScheme.filledButton.foregroundDisabled,
+)
+
 /**
  * Provides a default set of Bitwarden-styled colors for a standard icon button.
  */
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/stepper/BitwardenStepper.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/stepper/BitwardenStepper.kt
index 58681d6f7..289cf8a09 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/stepper/BitwardenStepper.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/stepper/BitwardenStepper.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.ZERO_WIDTH_CHARACTER
 import com.x8bit.bitwarden.ui.platform.base.util.orNullIfBlank
-import com.x8bit.bitwarden.ui.platform.components.button.BitwardenTonalIconButton
+import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledIconButton
 import com.x8bit.bitwarden.ui.platform.components.field.BitwardenTextFieldWithActions
 
 /**
@@ -51,7 +51,7 @@ fun BitwardenStepper(
         value = clampedValue?.toString() ?: ZERO_WIDTH_CHARACTER,
         actionsTestTag = stepperActionsTestTag,
         actions = {
-            BitwardenTonalIconButton(
+            BitwardenFilledIconButton(
                 vectorIconRes = R.drawable.ic_minus,
                 contentDescription = "\u2212",
                 onClick = {
@@ -63,7 +63,7 @@ fun BitwardenStepper(
                 isEnabled = isDecrementEnabled && !isAtRangeMinimum,
                 modifier = Modifier.testTag("DecrementValue"),
             )
-            BitwardenTonalIconButton(
+            BitwardenFilledIconButton(
                 vectorIconRes = R.drawable.ic_plus,
                 contentDescription = "+",
                 onClick = {