taler-android

commit 2f26b7840614bde0aeab671cc25b5af44246e1b0
parent 6337d1a58fba3ab5c1f5199445284c9645d3e59c
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 17 Jul 2024 09:24:14 -0600

[wallet] Temporarily hide the progress bar from more places

Diffstat:
M
cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
 | 
2
+-
M
cashier/src/main/java/net/taler/cashier/withdraw/TransactionFragment.kt
 | 
2
+-
M
merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt
 | 
4
++--
M
merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt
 | 
2
+-
M
wallet/src/main/java/net/taler/wallet/MainActivity.kt
 | 
7
++++---

5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt b/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
@@ -81,7 +81,7 @@ class ConfigFragment : Fragment() {
             if (checkConfig(config)) {
                 // show progress
                 ui.saveButton.visibility = INVISIBLE
-                ui.progressBar.visibility = VISIBLE
+                // ui.progressBar.visibility = VISIBLE
                 // kick off check and observe result
                 configManager.checkAndSaveConfig(config)
                 configManager.configResult.observe(viewLifecycleOwner, onConfigResult)
diff --git a/cashier/src/main/java/net/taler/cashier/withdraw/TransactionFragment.kt b/cashier/src/main/java/net/taler/cashier/withdraw/TransactionFragment.kt
@@ -140,7 +140,7 @@ class TransactionFragment : Fragment() {
         is WithdrawStatus.Confirming -> {
             ui.confirmButton.isEnabled = false
             ui.qrCodeView.fadeOut()
-            ui.progressBar.fadeIn()
+            // ui.progressBar.fadeIn()
         }
         is WithdrawStatus.Success -> {
             withdrawManager.completeTransaction()
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt
@@ -84,7 +84,7 @@ class ConfigFragment : Fragment() {
             } else {
                 "https://$inputUrl".also { ui.configUrlView.editText!!.setText(it) }
             }
-            ui.progressBarOld.visibility = VISIBLE
+            // ui.progressBarOld.visibility = VISIBLE
             ui.okOldButton.visibility = INVISIBLE
             val config = Config.Old(
                 configUrl = url,
@@ -119,7 +119,7 @@ class ConfigFragment : Fragment() {
                 "https://$inputUrl".also { ui.merchantUrlView.editText!!.setText(it) }
             }
 
-            ui.progressBarNew.visibility = VISIBLE
+            // ui.progressBarNew.visibility = VISIBLE
             ui.okNewButton.visibility = INVISIBLE
             val config = Config.New(
                 merchantUrl = url,
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt
@@ -84,7 +84,7 @@ class RefundFragment : Fragment() {
         }
         ui.amountView.error = null
         ui.refundButton.fadeOut()
-        ui.progressBar.fadeIn()
+        // ui.progressBar.fadeIn()
         refundManager.refund(item, inputAmount, ui.reasonInputView.text.toString())
     }
 
diff --git a/wallet/src/main/java/net/taler/wallet/MainActivity.kt b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
@@ -95,9 +95,10 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener,
         )
         ui.content.toolbar.setupWithNavController(nav, appBarConfiguration)
 
-        model.showProgressBar.observe(this) { show ->
-            ui.content.progressBar.visibility = if (show) VISIBLE else INVISIBLE
-        }
+        // TODO: refactor and unify progress bar handling
+        // model.showProgressBar.observe(this) { show ->
+        //     ui.content.progressBar.visibility = if (show) VISIBLE else INVISIBLE
+        // }
 
         val versionView: TextView = ui.navView.getHeaderView(0).findViewById(R.id.versionView)
         @SuppressLint("SetTextI18n")