Skip to content

Commit 3119421

Browse files
jvsena42jvsena42
committed
feat: add fund flow
1 parent 78e1e4f commit 3119421

17 files changed

Lines changed: 26 additions & 17 deletions

File tree

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

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ import androidx.compose.foundation.layout.Spacer
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.height
99
import androidx.compose.foundation.layout.padding
10-
import androidx.compose.material3.AlertDialog
11-
import androidx.compose.material3.MaterialTheme
12-
import androidx.compose.material3.TextButton
1310
import androidx.compose.runtime.Composable
1411
import androidx.compose.runtime.getValue
1512
import androidx.compose.runtime.mutableStateOf
@@ -24,9 +21,9 @@ import to.bitkit.R
2421
import to.bitkit.env.Defaults
2522
import to.bitkit.ui.LocalBalances
2623
import to.bitkit.ui.components.BodyM
27-
import to.bitkit.ui.components.BodyMB
2824
import to.bitkit.ui.components.Display
2925
import to.bitkit.ui.components.RectangleButton
26+
import to.bitkit.ui.scaffold.AppAlertDialog
3027
import to.bitkit.ui.scaffold.AppTopBar
3128
import to.bitkit.ui.scaffold.DrawerNavIcon
3229
import to.bitkit.ui.scaffold.ScreenColumn
@@ -116,20 +113,16 @@ fun FundingScreen(
116113
}
117114
}
118115
if (showNoFundsAlert) {
119-
AlertDialog(
120-
onDismissRequest = { showNoFundsAlert = false },
121-
confirmButton = {
122-
TextButton(onClick = { showNoFundsAlert = false }) {
123-
BodyM(text = stringResource(R.string.common__ok), color = Colors.Purple)
124-
}
116+
AppAlertDialog(
117+
title = stringResource(R.string.lightning__no_funds__title),
118+
text = stringResource(R.string.lightning__no_funds__description),
119+
confirmText = stringResource(R.string.lightning__no_funds__fund_wallet),
120+
confirmTextColor = Colors.Purple,
121+
onConfirm = {
122+
showNoFundsAlert = false
123+
onFund()
125124
},
126-
title = {
127-
BodyMB(text = stringResource(R.string.lightning__no_funds__title))
128-
},
129-
text = {
130-
BodyM(text = stringResource(R.string.lightning__no_funds__description))
131-
},
132-
shape = MaterialTheme.shapes.small,
125+
onDismiss = { showNoFundsAlert = false },
133126
)
134127
}
135128
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<string name="lightning__next_outbound_htlc_limit">حد HTLC الصادر التالي</string>
169169
<string name="lightning__next_outbound_htlc_min">الحد الأدنى لـ HTLC الصادر التالي</string>
170170
<string name="lightning__no_funds__description">قبل أن تتمكن من تحويل الأموال من رصيد مدخراتك، تحتاج إلى إرسال Bitcoin إلى محفظة Bitkit الخاصة بك.</string>
171+
<string name="lightning__no_funds__fund_wallet">تمويل المحفظة</string>
171172
<string name="lightning__no_funds__title">لا توجد أموال متاحة</string>
172173
<string name="lightning__node_id">معرّف عقدة LDK</string>
173174
<string name="lightning__node_info">عقدة Lightning</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<string name="lightning__next_outbound_htlc_limit">Límite del próximo HTLC saliente</string>
169169
<string name="lightning__next_outbound_htlc_min">Mínimo del próximo HTLC saliente</string>
170170
<string name="lightning__no_funds__description">Para transferir fondos a su saldo de ahorros, primero tiene que enviar bitcoin a su billetera Bitkit.</string>
171+
<string name="lightning__no_funds__fund_wallet">Financiar billetera</string>
171172
<string name="lightning__no_funds__title">Sin fondos disponibles</string>
172173
<string name="lightning__node_id">ID del nodo LDK</string>
173174
<string name="lightning__node_info">Nodo Lightning</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<string name="lightning__next_outbound_htlc_limit">Límit del pròxim HTLC de sortida</string>
169169
<string name="lightning__next_outbound_htlc_min">Mínim del pròxim HTLC de sortida</string>
170170
<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>
171+
<string name="lightning__no_funds__fund_wallet">Finançar cartera</string>
171172
<string name="lightning__no_funds__title">No hi ha fons disponibles</string>
172173
<string name="lightning__node_id">ID de Node LDK</string>
173174
<string name="lightning__node_info">Node de Lightning</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<string name="lightning__next_outbound_htlc_limit">Limit dalšího odchozího HTLC</string>
169169
<string name="lightning__next_outbound_htlc_min">Min dalšího odchozího HTLC</string>
170170
<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>
171+
<string name="lightning__no_funds__fund_wallet">Financovat peněženku</string>
171172
<string name="lightning__no_funds__title">Žádné dostupné prostředky</string>
172173
<string name="lightning__node_id">ID uzlu LDK</string>
173174
<string name="lightning__node_info">Lightning uzel</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<string name="lightning__funding_advanced__button2">Manuelle Einrichtung</string>
101101
<string name="lightning__no_funds__title">Keine verfügbaren Mittel</string>
102102
<string name="lightning__no_funds__description">Bevor du Geld von deinem Sparkonto übertragen kannst, musst du Bitcoin zu deiner Bitkit Wallet senden.</string>
103+
<string name="lightning__no_funds__fund_wallet">Wallet aufladen</string>
103104
<string name="lightning__transfer__nav_title">Übertrage Guthaben</string>
104105
<string name="lightning__transfer__confirm">Bitte\n&lt;accent&gt;bestätige&lt;/accent&gt;</string>
105106
<string name="lightning__transfer__custom_fee">Benutzerdefiniert &lt;accent&gt;fee&lt;/accent&gt;</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<string name="lightning__next_outbound_htlc_limit">Όριο επόμενου εξερχόμενου HTLC</string>
169169
<string name="lightning__next_outbound_htlc_min">Ελάχιστο επόμενο εξερχόμενο HTLC</string>
170170
<string name="lightning__no_funds__description">Πριν μπορέσεις να μεταφέρεις κεφάλαια από το υπόλοιπο αποταμιεύσεων, πρέπει να στείλεις bitcoin στο πορτοφόλι Bitkit.</string>
171+
<string name="lightning__no_funds__fund_wallet">Χρηματοδότηση πορτοφολιού</string>
171172
<string name="lightning__no_funds__title">Δεν υπάρχουν διαθέσιμα κεφάλαια</string>
172173
<string name="lightning__node_id">LDK Node ID</string>
173174
<string name="lightning__node_info">Κόμβος Lightning</string>

‎app/src/main/res/values-es-rES/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<string name="lightning__next_outbound_htlc_limit">Límite del siguiente HTLC saliente</string>
169169
<string name="lightning__next_outbound_htlc_min">Mínimo del siguiente HTLC saliente</string>
170170
<string name="lightning__no_funds__description">Antes de que pueda transferir fondos a su saldo de ahorros, tiene que enviar bitcoin a su monedero Bitkit.</string>
171+
<string name="lightning__no_funds__fund_wallet">Financiar monedero</string>
171172
<string name="lightning__no_funds__title">No hay fondos disponibles</string>
172173
<string name="lightning__node_id">ID del nodo LDK</string>
173174
<string name="lightning__node_info">Nodo Lightning</string>

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
<string name="lightning__funding_advanced__nav_title">Saldo de gastos</string>
174174
<string name="lightning__no_funds__title">No hay fondos disponibles</string>
175175
<string name="lightning__no_funds__description">Antes de que pueda transferir fondos a su saldo de ahorros, tiene que enviar bitcoin a su monedero Bitkit.</string>
176+
<string name="lightning__no_funds__fund_wallet">Financiar monedero</string>
176177
<string name="lightning__transfer__nav_title">Transferir fondos</string>
177178
<string name="lightning__transfer__confirm">Por favor,\n&lt;accent&gt;confirme&lt;/accent&gt;</string>
178179
<string name="lightning__transfer__swipe">Deslizar para transferir</string>

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<string name="lightning__funding_advanced__button2">Configuration manuelle</string>
101101
<string name="lightning__no_funds__title">Pas de fonds disponibles</string>
102102
<string name="lightning__no_funds__description">Avant de pouvoir transférer des fonds depuis votre solde d\'épargne, vous devez envoyer des bitcoins à votre portefeuille Bitkit.</string>
103+
<string name="lightning__no_funds__fund_wallet">Approvisionner le portefeuille</string>
103104
<string name="lightning__transfer__nav_title">Transfert de fonds</string>
104105
<string name="lightning__transfer__confirm">Veuillez\n&lt;accent&gt;confirmer&lt;/accent&gt;</string>
105106
<string name="lightning__transfer__custom_fee">&lt;accent&gt;Frais&lt;/accent&gt; sur mesure</string>

0 commit comments

Comments
 (0)