Skip to content

Commit 0f84519

Browse files
bubelovbubelov
committed
Improve payment flow
1 parent 926822a commit 0f84519

41 files changed

Lines changed: 53 additions & 56 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/main/kotlin/org/btcmap/boost/BoostFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class BoostFragment : Fragment() {
5858
binding.boost1m,
5959
binding.boost3m,
6060
binding.boost12m,
61-
binding.generateInvoice,
61+
binding.btnContinue,
6262
).also { views -> views.forEach { it.isEnabled = false } }
6363

6464
// get quote
@@ -109,7 +109,7 @@ class BoostFragment : Fragment() {
109109
var boostResponse: BoostApi.BoostResponse? = null
110110

111111
// send boost request and fetch an invoice
112-
binding.generateInvoice.setOnClickListener {
112+
binding.btnContinue.setOnClickListener {
113113
val days = if (binding.boost12m.isChecked) {
114114
365
115115
} else if (binding.boost3m.isChecked) {

‎app/src/main/kotlin/org/btcmap/comment/AddCommentFragment.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ class AddCommentFragment : Fragment() {
5757
}
5858

5959
// disable invoice generation until quote is fetched
60-
binding.generateInvoice.isEnabled = false
60+
binding.btnContinue.isEnabled = false
6161

6262
// get quote and enable generate invoice button on success
6363
viewLifecycleOwner.lifecycleScope.launch {
6464
try {
6565
val quote = CommentApi.getQuote()
6666
withResumed {
6767
binding.fee.text = getString(R.string.d_sat, quote.quoteSat.toString())
68-
binding.generateInvoice.isEnabled = true
68+
binding.btnContinue.isEnabled = true
6969
}
7070
} catch (t: Throwable) {
7171
Log.e(null, null, t)
@@ -81,15 +81,15 @@ class AddCommentFragment : Fragment() {
8181
}
8282

8383
// send comment request and fetch an invoice
84-
binding.generateInvoice.setOnClickListener {
84+
binding.btnContinue.setOnClickListener {
8585
val commentText = binding.comment.text.toString().trim()
8686
if (commentText.isEmpty()) {
8787
Toast.makeText(requireContext(), R.string.comment_cannot_be_empty, Toast.LENGTH_SHORT).show()
8888
return@setOnClickListener
8989
}
9090

9191
binding.comment.isEnabled = false
92-
binding.generateInvoice.isEnabled = false
92+
binding.btnContinue.isEnabled = false
9393

9494
viewLifecycleOwner.lifecycleScope.launch {
9595
val addCommentResponse = try {
@@ -101,7 +101,7 @@ class AddCommentFragment : Fragment() {
101101
Log.e(null, null, t)
102102
withResumed {
103103
binding.comment.isEnabled = true
104-
binding.generateInvoice.isEnabled = true
104+
binding.btnContinue.isEnabled = true
105105
MaterialAlertDialogBuilder(requireContext())
106106
.setTitle(R.string.error)
107107
.setMessage(t.toString())

‎app/src/main/res/layout/add_comment_fragment.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@
8181
</com.google.android.material.textfield.TextInputLayout>
8282

8383
<Button
84-
android:id="@+id/generate_invoice"
84+
android:id="@+id/btn_continue"
8585
android:layout_width="wrap_content"
8686
android:layout_height="wrap_content"
8787
android:layout_marginTop="16dp"
8888
android:layout_marginEnd="8dp"
8989
android:layout_marginBottom="16dp"
90-
android:text="@string/generate_invoice"
90+
android:text="@string/btn_continue"
9191
tools:ignore="ButtonStyle" />
9292

9393
<ImageView

‎app/src/main/res/layout/boost_fragment.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@
6868
</RadioGroup>
6969

7070
<Button
71-
android:id="@+id/generate_invoice"
71+
android:id="@+id/btn_continue"
7272
android:layout_width="wrap_content"
7373
android:layout_height="wrap_content"
7474
android:layout_marginTop="16dp"
7575
android:layout_marginEnd="8dp"
7676
android:layout_marginBottom="16dp"
77-
android:text="@string/generate_invoice"
77+
android:text="@string/btn_continue"
7878
tools:ignore="ButtonStyle" />
7979

8080
<ImageView

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<string name="comments_d">Kommentaar (%1$d)</string>
2020
<string name="add_element_comment_disclosure_1">Alle kommentare is anoniem maar ons hef \'n klein fooi in sats as \'n spam-beskermingsmaatreel</string>
2121
<string name="comment">Kommentaar</string>
22-
<string name="generate_invoice">Genereer Faktuur</string>
22+
<string name="btn_continue">Gaan voort</string>
2323
<string name="add_comment">Voeg Kommentaar By</string>
2424
<string name="error">Fout</string>
2525
<string name="close">Sluit</string>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<string name="comments_d">التعليقات (%1$d)</string>
2020
<string name="add_element_comment_disclosure_1">جميع التعليقات مجهولة لكننا نتقاضي رسماً صغيراً بالساتoshi كإجراء حماية من البريد العشوائي</string>
2121
<string name="comment">تعليق</string>
22-
<string name="generate_invoice">إنشاء فاتورة</string>
22+
<string name="btn_continue">متابعة</string>
2323
<string name="add_comment">إضافة تعليق</string>
2424
<string name="error">خطأ</string>
2525
<string name="close">إغلاق</string>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<string name="comments_d">Коментари (%1$d)</string>
2020
<string name="add_element_comment_disclosure_1">Всички коментари са анонимни, но ние събираме малка такса в сатоши като мярка за защита от спам</string>
2121
<string name="comment">Коментар</string>
22-
<string name="generate_invoice">Генерирайте фактура</string>
22+
<string name="btn_continue">Продължи</string>
2323
<string name="add_comment">Добавете коментар</string>
2424
<string name="error">Грешка</string>
2525
<string name="close">Затворете</string>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<string name="comments_d">মন্তব্য (%1$d)</string>
2020
<string name="add_element_comment_disclosure_1">সমস্ত মন্তব্য বেনামি কিন্তু আমরা স্প্যাম সুরক্ষা হিসাবে স্যাটে একটি ছোট ফি সংগ্রহ করি</string>
2121
<string name="comment">মন্তব্য</string>
22-
<string name="generate_invoice">ইনভয়েস তৈরি করুন</string>
22+
<string name="btn_continue">চালিয়ে যান</string>
2323
<string name="add_comment">মন্তব্য যোগ করুন</string>
2424
<string name="error">ত্রুটি</string>
2525
<string name="close">বন্ধ করুন</string>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<string name="comments_d">Comentaris (%1$d)</string>
2020
<string name="add_element_comment_disclosure_1">Tots els comentaris són anònims però cobrem una petita tarifa en sats com a mesura de protecció contra correu brossa</string>
2121
<string name="comment">Comentari</string>
22-
<string name="generate_invoice">Genera Factura</string>
22+
<string name="btn_continue">Continua</string>
2323
<string name="add_comment">Afegir Comentari</string>
2424
<string name="error">Error</string>
2525
<string name="close">Tanca</string>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<string name="comments_d">Komentáře (%1$d)</string>
2020
<string name="add_element_comment_disclosure_1">Všechny komentáře jsou anonymní, ale vybíráme malý poplatek v satech jako ochranu proti spamu</string>
2121
<string name="comment">Komentář</string>
22-
<string name="generate_invoice">Vygenerovat fakturu</string>
22+
<string name="btn_continue">Pokračovat</string>
2323
<string name="add_comment">Přidat komentář</string>
2424
<string name="error">Chyba</string>
2525
<string name="close">Zavřít</string>

0 commit comments

Comments
 (0)