Merge branch 'master' into feat/send-fee-custom

Author: ovitrif

app/src/main/java/to/bitkit/ui/screens/transfer/SettingUpScreen.kt

@@ -1,13 +1,11 @@
 package to.bitkit.ui.screens.transfer
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 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.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
@@ -20,6 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Devices.NEXUS_5
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.synonym.bitkitcore.regtestMine
@@ -110,14 +109,17 @@ private fun SettingUpScreen(
             actions = { CloseNavIcon(onCloseClick) },
         )
         Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = 16.dp)
         ) {
             Spacer(modifier = Modifier.height(12.dp))
             if (inProgress) {
                 Display(
-                    text = stringResource(R.string.lightning__savings_progress__title).withAccent(accentColor = Colors.Purple),
+                    text = stringResource(R.string.lightning__savings_progress__title)
+                        .withAccent(accentColor = Colors.Purple),
+                    modifier = Modifier.fillMaxWidth(),
                 )
                 Spacer(modifier = Modifier.height(8.dp))
                 BodyM(
@@ -128,6 +130,7 @@ private fun SettingUpScreen(
                 Display(
                     text = stringResource(R.string.lightning__transfer_success__title_spending)
                         .withAccent(accentColor = Colors.Purple),
+                    modifier = Modifier.fillMaxWidth(),
                 )
                 Spacer(modifier = Modifier.height(8.dp))
                 BodyM(
@@ -140,6 +143,7 @@ private fun SettingUpScreen(
                 TransferAnimationView(
                     largeCircleRes = R.drawable.ln_sync_large,
                     smallCircleRes = R.drawable.ln_sync_small,
+                    modifier = Modifier.weight(1f)
                 )
                 Spacer(modifier = Modifier.height(16.dp))
                 val steps = listOf(
@@ -156,23 +160,16 @@ private fun SettingUpScreen(
                         .align(alignment = Alignment.CenterHorizontally)
                 )
             } else {
-                Box(
-                    contentAlignment = Alignment.Center,
+                Image(
+                    painter = painterResource(id = R.drawable.check),
+                    contentDescription = null,
+                    contentScale = ContentScale.Fit,
                     modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp)
-                        .padding(top = 16.dp)
-                ) {
-                    Image(
-                        painter = painterResource(id = R.drawable.check),
-                        contentDescription = null,
-                        contentScale = ContentScale.Fit,
-                        modifier = Modifier.size(256.dp)
-                    )
-                }
+                        .weight(1f)
+                        .padding(16.dp)
+                )
             }
 
-            Spacer(modifier = Modifier.weight(1f))
 
             val randomOkText = localizedRandom(R.string.common__ok_random)
             PrimaryButton(
@@ -198,6 +195,16 @@ private fun SettingUpScreenProgressPreview() {
     }
 }
 
+@Preview(name = "Progress", showSystemUi = true, showBackground = true, device = NEXUS_5)
+@Composable
+private fun SettingUpScreenProgressSmallPreview() {
+    AppThemeSurface {
+        SettingUpScreen(
+            lightningSetupStep = 2,
+        )
+    }
+}
+
 @Preview(name = "Success", showSystemUi = true, showBackground = true)
 @Composable
 private fun SettingUpScreenSuccessPreview() {
@@ -207,3 +214,13 @@ private fun SettingUpScreenSuccessPreview() {
         )
     }
 }
+
+@Preview(name = "Success", showSystemUi = true, showBackground = true, device = NEXUS_5)
+@Composable
+private fun SettingUpScreenSuccessSmallPreview() {
+    AppThemeSurface {
+        SettingUpScreen(
+            lightningSetupStep = 3,
+        )
+    }
+}

app/src/main/java/to/bitkit/ui/screens/transfer/components/TransferAnimationView.kt

@@ -28,6 +28,7 @@ import to.bitkit.ui.theme.AppThemeSurface
 fun TransferAnimationView(
     @DrawableRes largeCircleRes: Int,
     @DrawableRes smallCircleRes: Int,
+    modifier: Modifier = Modifier,
     @DrawableRes contentRes: Int = R.drawable.transfer,
     rotateContent: Boolean = true,
 ) {
@@ -38,7 +39,7 @@ fun TransferAnimationView(
 
     Box(
         contentAlignment = Alignment.Center,
-        modifier = Modifier.padding(horizontal = 16.dp),
+        modifier = modifier.padding(horizontal = 16.dp),
     ) {
         val infiniteTransition = rememberInfiniteTransition("transition")
 

app/src/main/java/to/bitkit/viewmodels/TransferViewModel.kt

@@ -140,10 +140,13 @@ class TransferViewModel @Inject constructor(
 
             blocktankRepo.createOrder(_spendingUiState.value.satsAmount.toULong())
                 .onSuccess { order ->
+                    settingsStore.update { it.copy(lightningSetupStep = 0) }
                     onOrderCreated(order)
+                    delay(1.seconds) // Give time to settle the UI
                     _spendingUiState.update { it.copy(isLoading = false) }
                 }.onFailure { e ->
                     setTransferEffect(TransferEffect.ToastException(e))
+                    delay(1.seconds) // Give time to settle the UI
                     _spendingUiState.update { it.copy(isLoading = false) }
                 }
         }
@@ -192,7 +195,6 @@ class TransferViewModel @Inject constructor(
                 )
                 .onSuccess { txId ->
                     cacheStore.addPaidOrder(orderId = order.id, txId = txId)
-                    settingsStore.update { it.copy(lightningSetupStep = 0) }
                     watchOrder(order.id)
                 }
                 .onFailure { error ->
@@ -248,7 +250,8 @@ class TransferViewModel @Inject constructor(
         return max((fee + maxLspFee).toLong(), Env.TransactionDefaults.dustLimit.toLong())
     }
 
-    private fun onOrderCreated(order: IBtOrder) {
+    private suspend fun onOrderCreated(order: IBtOrder) {
+        settingsStore.update { it.copy(lightningSetupStep = 0) }
         _spendingUiState.update { it.copy(order = order, isAdvanced = false, defaultOrder = null) }
         setTransferEffect(TransferEffect.OnOrderCreated)
     }