Merge branch 'feat/new-receive-sheet' into feat/send-sheet-redesign

Author: jvsena42

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

@@ -388,9 +388,6 @@ fun ContentView(
                                     navigateToExternalConnection = {
                                         navController.navigate(ExternalConnection())
                                         appViewModel.hideSheet()
-                                    },
-                                    toast = { toast ->
-                                        appViewModel.toast(toast)
                                     }
                                 )
                             }

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

@@ -7,12 +7,12 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.rememberTooltipState
 import androidx.compose.runtime.Composable
@@ -35,7 +35,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -124,28 +123,28 @@ fun QrCodeImage(
             }
         }
 
-        Column(
-            modifier = Modifier.align(Alignment.Center),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            logoPainter?.let {
-                Box(
-                    contentAlignment = Alignment.Center,
-                    modifier = Modifier
-                        .size(68.dp)
-                        .background(Color.White, shape = CircleShape)
-                ) {
-                    Image(
-                        painter = it,
-                        contentDescription = null,
-                        modifier = Modifier.size(50.dp)
-                    )
-                }
+        logoPainter?.let {
+            Box(
+                contentAlignment = Alignment.Center,
+                modifier = Modifier
+                    .size(68.dp)
+                    .background(Color.White, shape = CircleShape)
+                    .align(Alignment.Center)
+            ) {
+                Image(
+                    painter = it,
+                    contentDescription = null,
+                    modifier = Modifier.size(50.dp)
+                )
             }
+        }
 
-            if (bitmap == null) {
-                CaptionB(stringResource(R.string.wallet__receive_qr_generating), color = Colors.Black)
-            }
+        if (bitmap == null) {
+            CircularProgressIndicator(
+                color = Colors.Black,
+                strokeWidth = 4.dp,
+                modifier = Modifier.size(68.dp)
+            )
         }
     }
 }

app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/CustomTabRowWithSpacing.kt

@@ -5,7 +5,6 @@ import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -24,6 +23,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import to.bitkit.ui.components.CaptionB
+import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.theme.Colors
 
 @Composable
@@ -49,7 +49,7 @@ fun <T : TabItem> CustomTabRowWithSpacing(
                         contentAlignment = Alignment.Center,
                         modifier = Modifier
                             .fillMaxWidth()
-                            .clickable { onTabChange(tab) }
+                            .clickableAlpha { onTabChange(tab) }
                             .padding(vertical = 8.dp)
                             .testTag("Tab-${tab.name.lowercase()}"),
                     ) {