Replace Random/Regular buttons with Random toggle

horizontalsystems · Oct 10, 2023 · f69d547 · f69d547
1 parent 6edd1c4
commit f69d547
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 17 deletions.
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/ui/PinNumpad.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/ui/PinNumpad.kt
@@ -30,6 +30,7 @@ import io.horizontalsystems.bankwallet.R
 import io.horizontalsystems.bankwallet.modules.pin.unlock.PinUnlockModule.InputState
 import io.horizontalsystems.bankwallet.ui.compose.ComposeAppTheme
 import io.horizontalsystems.bankwallet.ui.compose.components.ButtonSecondaryDefault
+import io.horizontalsystems.bankwallet.ui.compose.components.ButtonSecondaryYellow
 import io.horizontalsystems.bankwallet.ui.compose.components.VSpacer
 import io.horizontalsystems.core.helpers.HudHelper
 
@@ -89,22 +90,28 @@ fun PinNumpad(
         ){
             if (showRandomizer) {
                 VSpacer(24.dp)
-                ButtonSecondaryDefault(
-                    title = if (isRandomized) {
-                        stringResource(R.string.Unlock_Regular)
+                val onClick = {
+                    isRandomized = !isRandomized
+                    numpadNumbers = if (isRandomized) {
+                        generateRandomNumpadNumbers()
                     } else {
-                        stringResource(R.string.Unlock_Random)
-                    },
-                    onClick = {
-                        isRandomized = !isRandomized
-                        numpadNumbers = if (isRandomized) {
-                            generateRandomNumpadNumbers()
-                        } else {
-                            generateOriginalNumpadNumbers()
-                        }
-                    },
-                    enabled = enabled
-                )
+                        generateOriginalNumpadNumbers()
+                    }
+                }
+
+                if (isRandomized) {
+                    ButtonSecondaryYellow(
+                        title = stringResource(R.string.Unlock_Random),
+                        onClick = onClick,
+                        enabled = enabled,
+                    )
+                } else {
+                    ButtonSecondaryDefault(
+                        title = stringResource(R.string.Unlock_Random),
+                        onClick = onClick,
+                        enabled = enabled,
+                    )
+                }
             }
         }
     }

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/ButtonSecondary.kt b/app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/ButtonSecondary.kt
@@ -3,10 +3,26 @@ package io.horizontalsystems.bankwallet.ui.compose.components
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonColors
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Icon
+import androidx.compose.material.ProvideTextStyle
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -43,6 +59,33 @@ fun ButtonSecondaryDefault(
     )
 }
 
+@Composable
+fun ButtonSecondaryYellow(
+    modifier: Modifier = Modifier,
+    title: String,
+    onClick: () -> Unit,
+    enabled: Boolean = true,
+) {
+    ButtonSecondary(
+        modifier = modifier,
+        onClick = onClick,
+        buttonColors = ButtonPrimaryDefaults.textButtonColors(
+            backgroundColor = ComposeAppTheme.colors.yellowD,
+            contentColor = ComposeAppTheme.colors.dark,
+            disabledBackgroundColor = ComposeAppTheme.colors.steel20,
+            disabledContentColor = ComposeAppTheme.colors.grey50,
+        ),
+        content = {
+            Text(
+                title,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        },
+        enabled = enabled
+    )
+}
+
 @Composable
 fun ButtonSecondaryWithIcon(
     modifier: Modifier = Modifier,