feat: update funding screen to match v60 design

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Mnemonic warning text transitions on reveal #857
 
 ### Changed
+- Replace Advanced button with Manual Setup shortcut on Funding screen #885
 - 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/ContentView.kt

@@ -670,7 +670,7 @@ private fun RootNavHost(
                             appViewModel.showSheet(Sheet.Receive)
                         }
                     },
-                    onAdvanced = { navController.navigateTo(Routes.FundingAdvanced) },
+                    onManual = { navController.navigateTo(Routes.ExternalNav) },
                     onBackClick = { navController.popBackStack() },
                     isGeoBlocked = isGeoBlocked,
                 )

app/src/main/java/to/bitkit/ui/scaffold/AppAlertDialog.kt

@@ -7,6 +7,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
@@ -30,6 +31,8 @@ fun AppAlertDialog(
     modifier: Modifier = Modifier,
     confirmText: String = stringResource(R.string.common__ok),
     dismissText: String = stringResource(R.string.common__dialog_cancel),
+    confirmTextColor: Color = Color.Unspecified,
+    dismissTextColor: Color = Colors.White64,
     onDismissRequest: () -> Unit = onDismiss,
     properties: DialogProperties = DialogProperties(
         dismissOnClickOutside = false,
@@ -43,6 +46,8 @@ fun AppAlertDialog(
         modifier = modifier,
         confirmText = confirmText,
         dismissText = dismissText,
+        confirmTextColor = confirmTextColor,
+        dismissTextColor = dismissTextColor,
         onDismissRequest = onDismissRequest,
         properties = properties,
         textContent = { BodyM(text = text, color = Colors.White64) },
@@ -57,6 +62,8 @@ fun AppAlertDialog(
     modifier: Modifier = Modifier,
     confirmText: String = stringResource(R.string.common__ok),
     dismissText: String = stringResource(R.string.common__dialog_cancel),
+    confirmTextColor: Color = Color.Unspecified,
+    dismissTextColor: Color = Colors.White64,
     onDismissRequest: () -> Unit = onDismiss,
     properties: DialogProperties = DialogProperties(
         dismissOnClickOutside = false,
@@ -71,15 +78,15 @@ fun AppAlertDialog(
                 onClick = rememberDebouncedClick(onClick = onConfirm),
                 modifier = Modifier.testTag("DialogConfirm")
             ) {
-                BodyMSB(text = confirmText)
+                BodyMSB(text = confirmText, color = confirmTextColor)
             }
         },
         dismissButton = {
             TextButton(
                 onClick = rememberDebouncedClick(onClick = onDismiss),
                 modifier = Modifier.testTag("DialogCancel")
             ) {
-                BodyMSB(text = dismissText, color = Colors.White64)
+                BodyMSB(text = dismissText, color = dismissTextColor)
             }
         },
         title = { Title(text = title) },

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

@@ -7,9 +7,6 @@ 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.material3.AlertDialog
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -24,9 +21,9 @@ import to.bitkit.R
 import to.bitkit.env.Defaults
 import to.bitkit.ui.LocalBalances
 import to.bitkit.ui.components.BodyM
-import to.bitkit.ui.components.BodyMB
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.RectangleButton
+import to.bitkit.ui.scaffold.AppAlertDialog
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -40,7 +37,7 @@ fun FundingScreen(
     isGeoBlocked: Boolean,
     onTransfer: () -> Unit = {},
     onFund: () -> Unit = {},
-    onAdvanced: () -> Unit = {},
+    onManual: () -> Unit = {},
     onBackClick: () -> Unit = {},
 ) {
     val balances = LocalBalances.current
@@ -106,29 +103,26 @@ fun FundingScreen(
                     modifier = Modifier.testTag("FundReceive")
                 )
                 RectangleButton(
-                    label = stringResource(R.string.lightning__funding__button3),
-                    icon = R.drawable.ic_share_purple,
+                    label = stringResource(R.string.lightning__funding_advanced__button2),
+                    icon = R.drawable.ic_pencil_full,
                     iconTint = Colors.Purple,
-                    onClick = onAdvanced,
-                    modifier = Modifier.testTag("FundCustom")
+                    iconSize = 13.37.dp,
+                    onClick = onManual,
+                    modifier = Modifier.testTag("FundManual")
                 )
             }
         }
         if (showNoFundsAlert) {
-            AlertDialog(
-                onDismissRequest = { showNoFundsAlert = false },
-                confirmButton = {
-                    TextButton(onClick = { showNoFundsAlert = false }) {
-                        BodyM(text = stringResource(R.string.common__ok), color = Colors.Purple)
-                    }
+            AppAlertDialog(
+                title = stringResource(R.string.lightning__no_funds__title),
+                text = stringResource(R.string.lightning__no_funds__description),
+                confirmText = stringResource(R.string.lightning__no_funds__fund_wallet),
+                confirmTextColor = Colors.Purple,
+                onConfirm = {
+                    showNoFundsAlert = false
+                    onFund()
                 },
-                title = {
-                    BodyMB(text = stringResource(R.string.lightning__no_funds__title))
-                },
-                text = {
-                    BodyM(text = stringResource(R.string.lightning__no_funds__description))
-                },
-                shape = MaterialTheme.shapes.small,
+                onDismiss = { showNoFundsAlert = false },
             )
         }
     }

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

@@ -146,9 +146,8 @@
     <string name="lightning__force_title">تحويل\n&lt;accent&gt;إجباري&lt;/accent&gt;</string>
     <string name="lightning__funding__button1">تحويل من المدخرات</string>
     <string name="lightning__funding__button2">استخدم محفظة أخرى</string>
-    <string name="lightning__funding__button3">متقدم</string>
     <string name="lightning__funding__nav_title">رصيد الإنفاق</string>
-    <string name="lightning__funding__text">يمكنك استخدام مدخرات Bitkit أو إرسال Bitcoin من محفظة مختلفة.</string>
+    <string name="lightning__funding__text">أسهل خيار هو استخدام مدخرات Bitkit الخاصة بك أو إرسال بيتكوين من محفظة مختلفة.</string>
     <string name="lightning__funding__text_blocked">لا يوفر Bitkit حاليًا خدمات Lightning في بلدك، لكن يمكنك الاتصال بعقد أخرى مباشرة.</string>
     <string name="lightning__funding__text_blocked_cjit">لا يوفر Bitkit حاليًا خدمات Lightning في بلدك، لكن يمكنك الاتصال بعقد أخرى مباشرة.</string>
     <string name="lightning__funding__title">موّل &lt;accent&gt;رصيد الإنفاق&lt;/accent&gt;</string>
@@ -169,6 +168,7 @@
     <string name="lightning__next_outbound_htlc_limit">حد HTLC الصادر التالي</string>
     <string name="lightning__next_outbound_htlc_min">الحد الأدنى لـ HTLC الصادر التالي</string>
     <string name="lightning__no_funds__description">قبل أن تتمكن من تحويل الأموال من رصيد مدخراتك، تحتاج إلى إرسال Bitcoin إلى محفظة Bitkit الخاصة بك.</string>
+    <string name="lightning__no_funds__fund_wallet">تمويل المحفظة</string>
     <string name="lightning__no_funds__title">لا توجد أموال متاحة</string>
     <string name="lightning__node_id">معرّف عقدة LDK</string>
     <string name="lightning__node_info">عقدة Lightning</string>

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

@@ -146,9 +146,8 @@
     <string name="lightning__force_title">Forzar\n&lt;accent&gt;Transferencia&lt;/accent&gt;</string>
     <string name="lightning__funding__button1">Transferir desde Ahorros</string>
     <string name="lightning__funding__button2">Usar Otra Billetera</string>
-    <string name="lightning__funding__button3">Avanzado</string>
     <string name="lightning__funding__nav_title">Saldo de gastos</string>
-    <string name="lightning__funding__text">Puedes usar tu balance de ahorros en Bitkit o enviar fondos desde otra cartera.</string>
+    <string name="lightning__funding__text">La forma más fácil es usar tus ahorros de Bitkit o enviar bitcoin desde una billetera diferente.</string>
     <string name="lightning__funding__text_blocked">Bitkit no tiene soporte Lightning en tu región, pero puedes usar nodos externos manualmente.</string>
     <string name="lightning__funding__text_blocked_cjit">Bitkit no tiene soporte Lightning en tu región, pero puedes usar nodos externos manualmente.</string>
     <string name="lightning__funding__title">Fondee su &lt;accent&gt;saldo de gastos&lt;/accent&gt;</string>
@@ -169,6 +168,7 @@
     <string name="lightning__next_outbound_htlc_limit">Límite del próximo HTLC saliente</string>
     <string name="lightning__next_outbound_htlc_min">Mínimo del próximo HTLC saliente</string>
     <string name="lightning__no_funds__description">Para transferir fondos a su saldo de ahorros, primero tiene que enviar bitcoin a su billetera Bitkit.</string>
+    <string name="lightning__no_funds__fund_wallet">Financiar billetera</string>
     <string name="lightning__no_funds__title">Sin fondos disponibles</string>
     <string name="lightning__node_id">ID del nodo LDK</string>
     <string name="lightning__node_info">Nodo Lightning</string>

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

@@ -146,9 +146,8 @@
     <string name="lightning__force_title">Forçar\n&lt;accent&gt;transferència&lt;/accent&gt;</string>
     <string name="lightning__funding__button1">Transferir des d\'estalvis</string>
     <string name="lightning__funding__button2">Utilitza un altre moneder</string>
-    <string name="lightning__funding__button3">Avançat</string>
     <string name="lightning__funding__nav_title">Balanç de despesa</string>
-    <string name="lightning__funding__text">Pots utilitzar els teus estalvis de Bitkit o enviar bitcoin des d\'una altra cartera.</string>
+    <string name="lightning__funding__text">La forma més fàcil és utilitzar els teus estalvis de Bitkit o enviar bitcoin des d\'una altra cartera.</string>
     <string name="lightning__funding__text_blocked">Bitkit no ofereix serveis Lightning al teu país, però encara pots connectar-te a altres nodes directament.</string>
     <string name="lightning__funding__text_blocked_cjit">Bitkit no ofereix serveis Lightning al teu país, però encara pots connectar-te a altres nodes directament.</string>
     <string name="lightning__funding__title">Finança el teu &lt;accent&gt;saldo de despesa&lt;/accent&gt;</string>
@@ -169,6 +168,7 @@
     <string name="lightning__next_outbound_htlc_limit">Límit del pròxim HTLC de sortida</string>
     <string name="lightning__next_outbound_htlc_min">Mínim del pròxim HTLC de sortida</string>
     <string name="lightning__no_funds__description">Abans de poder transferir fons del teu saldo d\'estalvis, has d\'enviar bitcoin a la teva cartera Bitkit.</string>
+    <string name="lightning__no_funds__fund_wallet">Finançar cartera</string>
     <string name="lightning__no_funds__title">No hi ha fons disponibles</string>
     <string name="lightning__node_id">ID de Node LDK</string>
     <string name="lightning__node_info">Node de Lightning</string>

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

@@ -146,9 +146,8 @@
     <string name="lightning__force_title">Vynutit\n&lt;accent&gt;Převod&lt;/accent&gt;</string>
     <string name="lightning__funding__button1">Převod z úspor</string>
     <string name="lightning__funding__button2">Použijte jinou peněženku</string>
-    <string name="lightning__funding__button3">Pokročilé</string>
     <string name="lightning__funding__nav_title">Dostupný zůstatek</string>
-    <string name="lightning__funding__text">Můžete použít své úspory na BitKitu nebo poslat bitcoin z jiné peněženky.</string>
+    <string name="lightning__funding__text">Nejjednodušší možností je použít úspory z Bitkitu nebo poslat bitcoin z jiné peněženky.</string>
     <string name="lightning__funding__text_blocked">Bitkit v současné době neposkytuje služby lightning ve vaší zemi, ale stále se můžete připojit k jiným uzlům přímo.</string>
     <string name="lightning__funding__text_blocked_cjit">Bitkit v současné době neposkytuje služby lightning ve vaší zemi, ale stále se můžete připojit k jiným uzlům přímo.</string>
     <string name="lightning__funding__title">Navyšte svůj &lt;accent&gt;disponibilní zůstatek&lt;/accent&gt;</string>
@@ -169,6 +168,7 @@
     <string name="lightning__next_outbound_htlc_limit">Limit dalšího odchozího HTLC</string>
     <string name="lightning__next_outbound_htlc_min">Min dalšího odchozího HTLC</string>
     <string name="lightning__no_funds__description">Než budete moci převést prostředky ze svého zůstatku na spořicím účtu, musíte poslat bitcoiny do peněženky Bitkit.</string>
+    <string name="lightning__no_funds__fund_wallet">Financovat peněženku</string>
     <string name="lightning__no_funds__title">Žádné dostupné prostředky</string>
     <string name="lightning__node_id">ID uzlu LDK</string>
     <string name="lightning__node_info">Lightning uzel</string>

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

@@ -88,19 +88,19 @@
     <string name="lightning__transfer_intro__button">Los geht\'s</string>
     <string name="lightning__funding__nav_title">Spending Balance</string>
     <string name="lightning__funding__title">Fund your &lt;accent&gt;spending balance&lt;/accent&gt;</string>
-    <string name="lightning__funding__text">Du kannst dein Bitkit-Sparkonto verwenden oder Bitcoin aus einer anderen Wallet senden.</string>
+    <string name="lightning__funding__text">Am einfachsten ist es, deine Bitkit-Ersparnisse zu verwenden oder Bitcoin von einer anderen Wallet zu senden.</string>
     <string name="lightning__funding__text_blocked">Bitkit bietet derzeit keine Lightning-Dienste in deinem Land an,  aber du kannst dich trotzdem direkt mit anderen Knotenpunkten verbinden.</string>
     <string name="lightning__funding__text_blocked_cjit">Bitkit bietet derzeit keine Lightning-Dienste in deinem Land an,  aber du kannst dich trotzdem direkt mit anderen Knotenpunkten verbinden.</string>
     <string name="lightning__funding__button1">Von Sparkonto übertragen</string>
     <string name="lightning__funding__button2">Anderes Wallet verwenden</string>
-    <string name="lightning__funding__button3">Fortgeschritten</string>
     <string name="lightning__funding_advanced__nav_title">Ausgabenkonto</string>
     <string name="lightning__funding_advanced__title">Fortgeschrittene&lt;accent&gt;setup&lt;/accent&gt;</string>
     <string name="lightning__funding_advanced__text">Scannen Sie einen QR-Code, um Ihren LNURL-Kanal von einem anderen LSP zu beanspruchen, oder wählen Sie die manuelle Einrichtung.</string>
     <string name="lightning__funding_advanced__button1">LNURL Channel QR</string>
     <string name="lightning__funding_advanced__button2">Manuelle Einrichtung</string>
     <string name="lightning__no_funds__title">Keine verfügbaren Mittel</string>
     <string name="lightning__no_funds__description">Bevor du Geld von deinem Sparkonto übertragen kannst, musst du Bitcoin zu deiner Bitkit Wallet senden.</string>
+    <string name="lightning__no_funds__fund_wallet">Wallet aufladen</string>
     <string name="lightning__transfer__nav_title">Übertrage Guthaben</string>
     <string name="lightning__transfer__confirm">Bitte\n&lt;accent&gt;bestätige&lt;/accent&gt;</string>
     <string name="lightning__transfer__custom_fee">Benutzerdefiniert &lt;accent&gt;fee&lt;/accent&gt;</string>

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

@@ -146,9 +146,8 @@
     <string name="lightning__force_title">Αναγκαστική\n&lt;accent&gt;μεταφορά&lt;/accent&gt;</string>
     <string name="lightning__funding__button1">Μεταφορά από αποταμιεύσεις</string>
     <string name="lightning__funding__button2">Χρήση άλλου πορτοφολιού</string>
-    <string name="lightning__funding__button3">Για προχωρημένους</string>
     <string name="lightning__funding__nav_title">Υπόλοιπο δαπανών</string>
-    <string name="lightning__funding__text">Μπορείς να χρησιμοποιήσεις τις αποταμιεύσεις του Bitkit ή να στείλεις bitcoin από διαφορετικό πορτοφόλι.</string>
+    <string name="lightning__funding__text">Ο ευκολότερος τρόπος είναι να χρησιμοποιήσεις τις αποταμιεύσεις Bitkit ή να στείλεις bitcoin από διαφορετικό πορτοφόλι.</string>
     <string name="lightning__funding__text_blocked">Το Bitkit δεν παρέχει προς το παρόν υπηρεσίες Lightning στη χώρα σου, αλλά μπορείς να συνδεθείς απευθείας σε άλλους κόμβους.</string>
     <string name="lightning__funding__text_blocked_cjit">Το Bitkit δεν παρέχει προς το παρόν υπηρεσίες Lightning στη χώρα σου, αλλά μπορείς να συνδεθείς απευθείας σε άλλους κόμβους.</string>
     <string name="lightning__funding__title">Χρηματοδότησε το &lt;accent&gt;υπόλοιπο δαπανών&lt;/accent&gt;</string>
@@ -169,6 +168,7 @@
     <string name="lightning__next_outbound_htlc_limit">Όριο επόμενου εξερχόμενου HTLC</string>
     <string name="lightning__next_outbound_htlc_min">Ελάχιστο επόμενο εξερχόμενο HTLC</string>
     <string name="lightning__no_funds__description">Πριν μπορέσεις να μεταφέρεις κεφάλαια από το υπόλοιπο αποταμιεύσεων, πρέπει να στείλεις bitcoin στο πορτοφόλι Bitkit.</string>
+    <string name="lightning__no_funds__fund_wallet">Χρηματοδότηση πορτοφολιού</string>
     <string name="lightning__no_funds__title">Δεν υπάρχουν διαθέσιμα κεφάλαια</string>
     <string name="lightning__node_id">LDK Node ID</string>
     <string name="lightning__node_info">Κόμβος Lightning</string>