Merge pull request #883 from synonymdev/feat/external-success-new-text

feat: update external success screen text and image

Author: ovitrif

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Mnemonic warning text transitions on reveal #857
 
 ### Changed
+- Updated design of the success screen in the manual channel setup flow #883
 - Unified send flow with payment method switcher, details toggle, Lightning support for BIP21 payments, and improved fee rate defaults #863
 - Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857
 - Icons added to all settings rows for faster scanning #857

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

@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
@@ -83,6 +82,7 @@ enum class ButtonSize {
             Small -> 8.dp
             Large -> 6.dp
         }
+
     fun secondaryBorder(enabled: Boolean): BorderStroke = when (this) {
         Large -> BorderStroke(2.dp, if (enabled) Colors.Gray4 else Color.Transparent)
         Small -> BorderStroke(1.dp, if (enabled) Colors.White16 else Color.Transparent)
@@ -183,6 +183,7 @@ fun SecondaryButton(
     // and AFTER size modifiers (Haze needs to know dimensions)
     val buttonShape = MaterialTheme.shapes.extraLarge
     Box(
+        propagateMinConstraints = true,
         modifier = modifier
             .then(if (fullWidth) Modifier.fillMaxWidth() else Modifier)
             .requiredHeight(size.height)
@@ -208,7 +209,6 @@ fun SecondaryButton(
             colors = AppButtonDefaults.secondaryColors.copy(contentColor = contentColor),
             contentPadding = contentPadding,
             border = border,
-            modifier = if (fullWidth) Modifier.fillMaxSize() else Modifier,
         ) {
             if (isLoading) {
                 GradientCircularProgressIndicator(
@@ -488,6 +488,25 @@ private fun SecondaryButtonPreview() {
                         )
                     },
                 )
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp)
+                ) {
+                    SecondaryButton(
+                        text = "Secondary",
+                        fullWidth = false,
+                        hazeState = hazeState,
+                        onClick = {},
+                        modifier = Modifier.weight(1f)
+                    )
+                    SecondaryButton(
+                        text = "Secondary",
+                        fullWidth = false,
+                        hazeState = hazeState,
+                        onClick = {},
+                        modifier = Modifier.weight(1f)
+                    )
+                }
                 SecondaryButton(
                     text = "Secondary Small",
                     size = ButtonSize.Small,
@@ -588,6 +607,23 @@ private fun TertiaryButtonPreview() {
                 },
                 onClick = {}
             )
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                TertiaryButton(
+                    text = "Tertiary",
+                    fullWidth = false,
+                    onClick = {},
+                    modifier = Modifier.weight(1f)
+                )
+                TertiaryButton(
+                    text = "Tertiary",
+                    fullWidth = false,
+                    onClick = {},
+                    modifier = Modifier.weight(1f)
+                )
+            }
             TertiaryButton(
                 text = "Tertiary Small",
                 size = ButtonSize.Small,

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

@@ -17,10 +17,10 @@ fun ExternalSuccessScreen(
     onContinue: () -> Unit,
 ) {
     InfoScreenContent(
-        navTitle = stringResource(R.string.lightning__external__nav_title),
+        navTitle = stringResource(R.string.lightning__external_success__nav_title),
         title = stringResource(R.string.lightning__external_success__title).withAccent(accentColor = Colors.Purple),
         description = stringResource(R.string.lightning__external_success__text).withAccentBoldBright(),
-        image = painterResource(R.drawable.switch_box),
+        image = painterResource(R.drawable.lightning),
         buttonText = localizedRandom(R.string.common__ok_random),
         onButtonClick = onContinue,
         testTag = "ExternalSuccess",

app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt

@@ -4,12 +4,10 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
@@ -45,6 +43,7 @@ import to.bitkit.ui.components.EmptyStateView
 import to.bitkit.ui.components.IncomingTransfer
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.TabBar
+import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -130,7 +129,7 @@ fun SpendingWalletScreen(
                 }
 
                 if (!showEmptyState) {
-                    Spacer(modifier = Modifier.height(32.dp))
+                    VerticalSpacer(32.dp)
 
                     if (canTransfer) {
                         SecondaryButton(
@@ -160,8 +159,7 @@ fun SpendingWalletScreen(
         }
         if (showEmptyState) {
             EmptyStateView(
-                text = stringResource(R.string.wallet__spending__onboarding)
-                    .withAccent(accentColor = Colors.Purple),
+                text = stringResource(R.string.wallet__spending__onboarding).withAccent(accentColor = Colors.Purple),
                 modifier = Modifier
                     .systemBarsPadding()
                     .align(Alignment.BottomCenter)

app/src/main/res/values-ar/strings.xml

@@ -130,8 +130,9 @@
     <string name="lightning__external_manual__scan">مسح QR</string>
     <string name="lightning__external_manual__text">يمكنك استخدام عقدة خارجية لفتح اتصال Lightning يدويًا. أدخل تفاصيل العقدة للمتابعة.</string>
     <string name="lightning__external_manual__title">&lt;accent&gt;إعداد يدوي&lt;/accent&gt;</string>
+    <string name="lightning__external_success__nav_title">رصيد الإنفاق</string>
     <string name="lightning__external_success__text">بدأ اتصال Lightning. ستتمكن من استخدام رصيد الإنفاق خلال &lt;accent&gt;±30 دقيقة&lt;/accent&gt; (يعتمد على إعدادات العقدة).</string>
-    <string name="lightning__external_success__title">بدأ\n&lt;accent&gt;الاتصال&lt;/accent&gt;</string>
+    <string name="lightning__external_success__title">القناة\n&lt;accent&gt;قيد الفتح&lt;/accent&gt;</string>
     <string name="lightning__fee_rate">معدل الرسوم</string>
     <string name="lightning__fee_rate_update_time">وقت تحديث ذاكرة التخزين المؤقت لمعدل الرسوم</string>
     <string name="lightning__fees">الرسوم</string>

app/src/main/res/values-b+es+419/strings.xml

@@ -130,8 +130,9 @@
     <string name="lightning__external_manual__scan">Escanear QR</string>
     <string name="lightning__external_manual__text">Puedes usar un nodo externo para abrir una conexión Lightning manualmente. Ingresa los datos del nodo para continuar.</string>
     <string name="lightning__external_manual__title">&lt;accent&gt;Config. manual&lt;/accent&gt;</string>
+    <string name="lightning__external_success__nav_title">Saldo de gasto</string>
     <string name="lightning__external_success__text">Conexión lightning iniciada. Podrá utilizar su saldo de gastos en &lt;accent&gt;±30 minutos&lt;/accent&gt; (depende de la config. del nodo).</string>
-    <string name="lightning__external_success__title">Conexión\n&lt;accent&gt;iniciada&lt;/accent&gt;</string>
+    <string name="lightning__external_success__title">Apertura\n&lt;accent&gt;de canal&lt;/accent&gt;</string>
     <string name="lightning__fee_rate">Tarifa</string>
     <string name="lightning__fee_rate_update_time">Hora de actualización de caché de tarifa</string>
     <string name="lightning__fees">Tarifa</string>

app/src/main/res/values-ca/strings.xml

@@ -130,8 +130,9 @@
     <string name="lightning__external_manual__scan">Escaneja QR</string>
     <string name="lightning__external_manual__text">Pots utilitzar un node extern per obrir manualment una connexió Lightning. Introdueix els detalls del node per continuar.</string>
     <string name="lightning__external_manual__title">&lt;accent&gt;Configuració manual&lt;/accent&gt;</string>
+    <string name="lightning__external_success__nav_title">Saldo de despesa</string>
     <string name="lightning__external_success__text">Connexió Lightning iniciada. Podràs utilitzar el teu saldo de despesa en &lt;accent&gt;±30 minuts&lt;/accent&gt; (depèn de la configuració del node).</string>
-    <string name="lightning__external_success__title">Connexió\n&lt;accent&gt;iniciada&lt;/accent&gt;</string>
+    <string name="lightning__external_success__title">Obertura\n&lt;accent&gt;de canal&lt;/accent&gt;</string>
     <string name="lightning__fee_rate">Taxa de tarifa</string>
     <string name="lightning__fee_rate_update_time">Temps d\'actualització de la memòria cau de tarifes</string>
     <string name="lightning__fees">Tarifes</string>

app/src/main/res/values-cs/strings.xml

@@ -130,8 +130,9 @@
     <string name="lightning__external_manual__scan">Skenovat QR</string>
     <string name="lightning__external_manual__text">Můžete použít externí uzel k ručnímu otevření lightning připojení. Zadejte údaje o uzlu pro pokračování.</string>
     <string name="lightning__external_manual__title">&lt;accent&gt;Manuální nastavení&lt;/accent&gt;</string>
+    <string name="lightning__external_success__nav_title">Zůstatek k utracení</string>
     <string name="lightning__external_success__text">Iniciováno připojení lightning. Zůstatek na účtu budete moci použít do &lt;accent&gt;±30 minut&lt;/accent&gt; (závisí na konfiguraci uzlu).</string>
-    <string name="lightning__external_success__title">Připojení\n&lt;accent&gt;iniciováno&lt;/accent&gt;</string>
+    <string name="lightning__external_success__title">Otevírání\n&lt;accent&gt;kanálu&lt;/accent&gt;</string>
     <string name="lightning__fee_rate">Sazba poplatku</string>
     <string name="lightning__fee_rate_update_time">Čas aktualizace mezipaměti poplatků</string>
     <string name="lightning__fees">Poplatky</string>

app/src/main/res/values-de/strings.xml

@@ -152,7 +152,8 @@
     <string name="lightning__external_manual__paste">Paste Node URI</string>
     <string name="lightning__external_manual__scan">QR-Code scannen</string>
     <string name="lightning__external_amount__title">Spending\n&lt;accent&gt;balance&lt;/accent&gt;</string>
-    <string name="lightning__external_success__title">Verbindung\n&lt;accent&gt;initiiert&lt;/accent&gt;</string>
+    <string name="lightning__external_success__nav_title">Ausgabenguthaben</string>
+    <string name="lightning__external_success__title">Kanal wird\n&lt;accent&gt;geöffnet&lt;/accent&gt;</string>
     <string name="lightning__external_success__text">Lightning-Verbindung initiiert. Du kannst dein Guthaben in &lt;accent&gt;±30 Minuten&lt;/accent&gt; verwenden (abhängig von der Node-Konfiguration).</string>
     <string name="lightning__error_channel_purchase">Einrichtung der Instant-Zahlungen fehlgeschlagen</string>
     <string name="lightning__error_channel_setup_msg">Ein Fehler ist bei der Einrichtung deines Sofortguthabens aufgetreten. {raw}</string>

app/src/main/res/values-el/strings.xml

@@ -130,8 +130,9 @@
     <string name="lightning__external_manual__scan">Σάρωση QR</string>
     <string name="lightning__external_manual__text">Μπορείς να χρησιμοποιήσεις έναν εξωτερικό κόμβο για να ανοίξεις χειροκίνητα μια σύνδεση Lightning. Εισάγαγε τα στοιχεία του κόμβου για να συνεχίσεις.</string>
     <string name="lightning__external_manual__title">&lt;accent&gt;Χειροκίνητη ρύθμιση&lt;/accent&gt;</string>
+    <string name="lightning__external_success__nav_title">Υπόλοιπο δαπανών</string>
     <string name="lightning__external_success__text">Η σύνδεση Lightning ξεκίνησε. Θα μπορείς να χρησιμοποιήσεις το υπόλοιπο δαπανών σε &lt;accent&gt;±30 λεπτά&lt;/accent&gt; (εξαρτάται από τη διαμόρφωση του κόμβου).</string>
-    <string name="lightning__external_success__title">Η σύνδεση\n&lt;accent&gt;ξεκίνησε&lt;/accent&gt;</string>
+    <string name="lightning__external_success__title">Άνοιγμα\n&lt;accent&gt;καναλιού&lt;/accent&gt;</string>
     <string name="lightning__fee_rate">Ποσοστό τέλους</string>
     <string name="lightning__fee_rate_update_time">Χρόνος ενημέρωσης cache τελών</string>
     <string name="lightning__fees">Τέλη</string>