Merge branch 'master' into feat/toast-v59

Author: jvsena42

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -457,7 +457,6 @@ fun ContentView(
 
                     if (showTabBar) {
                         TabBar(
-                            hazeState = hazeState,
                             onSendClick = { appViewModel.showSheet(Sheet.Send()) },
                             onReceiveClick = { appViewModel.showSheet(Sheet.Receive) },
                             onScanClick = { navController.navigateToScanner() },

app/src/main/java/to/bitkit/ui/components/RectangleButton.kt

@@ -1,56 +1,111 @@
 package to.bitkit.ui.components
 
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ContentPaste
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
-import to.bitkit.ui.theme.AppShapes
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
+import to.bitkit.ui.theme.Shapes
 
 @Composable
 fun RectangleButton(
     label: String,
-    icon: @Composable () -> Unit,
     modifier: Modifier = Modifier,
+    @DrawableRes icon: Int? = null,
+    imageVector: ImageVector? = null,
+    iconTint: Color = Colors.White,
     enabled: Boolean = true,
+    iconSize: Dp = 20.dp,
     onClick: () -> Unit = {},
 ) {
     Button(
         onClick = onClick,
         colors = ButtonDefaults.buttonColors(
-            containerColor = Colors.White10,
+            containerColor = Colors.Gray6,
         ),
         enabled = enabled,
-        shape = AppShapes.small,
-        contentPadding = PaddingValues(24.dp),
+        shape = Shapes.medium,
+        contentPadding = PaddingValues(horizontal = 16.dp, vertical = 0.dp),
         modifier = modifier
             .alpha(if (enabled) 1f else 0.5f)
             .height(80.dp)
             .fillMaxWidth()
     ) {
-        icon()
-        Spacer(modifier = Modifier.width(16.dp))
+        icon?.let {
+            CircularIcon(
+                painter = painterResource(it),
+                iconTint = iconTint,
+                iconSize = iconSize
+            )
+        }
+        imageVector?.let {
+            CircularIcon(
+                imageVector = it,
+                iconTint = iconTint,
+                iconSize = iconSize
+            )
+        }
+        HorizontalSpacer(16.dp)
         BodyMSB(text = label, color = Colors.White)
-        Spacer(modifier = Modifier.weight(1f))
+        FillWidth()
+    }
+}
+
+@Composable
+private fun CircularIcon(
+    iconTint: Color,
+    iconSize: Dp,
+    painter: Painter? = null,
+    imageVector: ImageVector? = null,
+) {
+    Box(
+        modifier = Modifier
+            .clip(CircleShape)
+            .size(40.dp)
+            .background(Colors.Black),
+        contentAlignment = Alignment.Center
+    ) {
+        when {
+            painter != null -> Icon(
+                painter = painter,
+                contentDescription = null,
+                tint = iconTint,
+                modifier = Modifier.size(iconSize),
+            )
+
+            imageVector != null -> Icon(
+                imageVector = imageVector,
+                contentDescription = null,
+                tint = iconTint,
+                modifier = Modifier.size(iconSize),
+            )
+        }
     }
 }
 
@@ -64,26 +119,14 @@ private fun RectangleButtonPreview() {
         ) {
             RectangleButton(
                 label = "Button",
-                icon = {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_scan),
-                        contentDescription = null,
-                        tint = Color.Unspecified,
-                        modifier = Modifier.size(28.dp),
-                    )
-                }
+                icon = R.drawable.ic_scan
             )
             RectangleButton(
                 label = "Button Disabled",
                 enabled = false,
-                icon = {
-                    Icon(
-                        imageVector = Icons.Default.ContentPaste,
-                        contentDescription = null,
-                        tint = Colors.Brand,
-                        modifier = Modifier.size(28.dp),
-                    )
-                }
+                icon = null,
+                iconTint = Colors.Purple,
+                imageVector = Icons.Default.ContentPaste,
             )
         }
     }

app/src/main/java/to/bitkit/ui/components/SwipeToConfirm.kt

@@ -49,6 +49,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import to.bitkit.R
 import to.bitkit.ui.scaffold.ScreenColumn
+import to.bitkit.ui.shared.util.primaryButtonStyle
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import kotlin.math.roundToInt
@@ -61,7 +62,7 @@ private val Padding = 8.dp
 @Composable
 fun SwipeToConfirm(
     text: String = stringResource(R.string.other__swipe),
-    color: Color = Colors.Green,
+    color: Color = Colors.Brand,
     icon: ImageVector = Icons.AutoMirrored.Default.ArrowForward,
     @DrawableRes endIcon: Int = R.drawable.ic_check,
     endIconTint: Color = Colors.Black,
@@ -97,7 +98,10 @@ fun SwipeToConfirm(
         modifier = modifier
             .requiredHeight(CircleSize + Padding * 2)
             .clip(CircleShape)
-            .background(Color.White.copy(alpha = 0.16f))
+            .primaryButtonStyle(
+                isEnabled = !loading,
+                shape = CircleShape,
+            )
             .padding(Padding)
     ) {
         Box(
@@ -223,7 +227,7 @@ private fun Preview() {
         ) {
             SwipeToConfirm(
                 text = stringResource(R.string.wallet__send_swipe),
-                color = Colors.Green,
+                color = Colors.Brand,
                 loading = isLoading,
                 onConfirm = {
                     scope.launch {