[taler-wallet-android] branch master updated (d3cc4bb -> 589411a)

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a change to branch master
in repository wallet-android.

    from d3cc4bb  Show product images in full size if you click on them
     new d041ac6  Show product details by default, if there's only one product
     new 318fc32  Hide wallet reset button when not in developer mode
     new c9abffa  Hide reload balance/history menu items when not in dev mode
     new 589411a  Only show order summary (and product image) if there's only 
one product

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/java/net/taler/wallet/BalanceFragment.kt  |  5 ++
 app/src/main/java/net/taler/wallet/Settings.kt     | 83 +++++++++++-----------
 .../taler/wallet/history/WalletHistoryFragment.kt  |  8 +++
 .../taler/wallet/payment/PromptPaymentFragment.kt  |  3 +-
 app/src/main/res/layout/fragment_settings.xml      |  1 +
 .../main/res/layout/list_item_product_single.xml   |  2 +
 app/src/main/res/values/strings.xml                |  4 +-
 7 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/net/taler/wallet/BalanceFragment.kt 
b/app/src/main/java/net/taler/wallet/BalanceFragment.kt
index b9f5818..84a1b3c 100644
--- a/app/src/main/java/net/taler/wallet/BalanceFragment.kt
+++ b/app/src/main/java/net/taler/wallet/BalanceFragment.kt
@@ -46,6 +46,7 @@ class BalanceFragment : Fragment() {
     private val model: WalletViewModel by activityViewModels()
     private val withdrawManager by lazy { model.withdrawManager }
 
+    private var reloadBalanceMenuItem: MenuItem? = null
     private val balancesAdapter = BalanceAdapter()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -75,6 +76,7 @@ class BalanceFragment : Fragment() {
         model.devMode.observe(viewLifecycleOwner, Observer { enabled ->
             delayedTransition()
             testWithdrawButton.visibility = if (enabled) VISIBLE else GONE
+            reloadBalanceMenuItem?.isVisible = enabled
         })
         testWithdrawButton.setOnClickListener {
             withdrawManager.withdrawTestkudos()
@@ -117,6 +119,9 @@ class BalanceFragment : Fragment() {
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.balance, menu)
         menu.findItem(R.id.developer_mode).isChecked = model.devMode.value!!
+        reloadBalanceMenuItem = menu.findItem(R.id.reload_balance).apply {
+            isVisible = model.devMode.value!!
+        }
         super.onCreateOptionsMenu(menu, inflater)
     }
 
diff --git a/app/src/main/java/net/taler/wallet/Settings.kt 
b/app/src/main/java/net/taler/wallet/Settings.kt
index 8a91d62..6d10412 100644
--- a/app/src/main/java/net/taler/wallet/Settings.kt
+++ b/app/src/main/java/net/taler/wallet/Settings.kt
@@ -19,15 +19,22 @@ package net.taler.wallet
 import android.app.Dialog
 import android.content.Context
 import android.content.Intent
+import android.content.Intent.ACTION_CREATE_DOCUMENT
+import android.content.Intent.ACTION_OPEN_DOCUMENT
+import android.content.Intent.CATEGORY_OPENABLE
+import android.content.Intent.EXTRA_TITLE
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
-import android.widget.Button
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
 import kotlinx.android.synthetic.main.fragment_settings.*
 
 
@@ -70,47 +77,40 @@ class ResetDialogFragment : DialogFragment() {
     }
 }
 
-/**
- * A simple [Fragment] subclass.
- *
- */
 class Settings : Fragment() {
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: 
Intent?) {
-        when (requestCode) {
-            CREATE_FILE -> {
-                if (data == null) {
-                    return
-                }
-                Log.i(TAG, "got createFile result with URL ${data.data}")
-            }
-            PICK_FILE -> {
-                if (data == null) {
-                    return
-                }
-                Log.i(TAG, "got pickFile result with URL ${data.data}")
-            }
-            else -> {
-
-            }
-        }
+    companion object {
+        private const val TAG = "taler-wallet"
+        private const val CREATE_FILE = 1
+        private const val PICK_FILE = 2
     }
 
+    private val model: WalletViewModel by activityViewModels()
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        // Inflate the layout for this fragment
-        val view = inflater.inflate(R.layout.fragment_settings, container, 
false)
-        
view.findViewById<Button>(R.id.button_reset_wallet_dangerously).setOnClickListener
 {
+        return inflater.inflate(R.layout.fragment_settings, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        model.devMode.observe(viewLifecycleOwner, Observer { enabled ->
+            val visibility = if (enabled) VISIBLE else GONE
+            devSettingsTitle.visibility = visibility
+            button_reset_wallet_dangerously.visibility = visibility
+        })
+
+        textView4.text = BuildConfig.VERSION_NAME
+        button_reset_wallet_dangerously.setOnClickListener {
             val d = ResetDialogFragment()
-            d.show(requireActivity().supportFragmentManager, 
"walletResetDialog")
+            d.show(parentFragmentManager, "walletResetDialog")
         }
-        
view.findViewById<Button>(R.id.button_backup_export).setOnClickListener {
-            val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
+        button_backup_export.setOnClickListener {
+            val intent = Intent(ACTION_CREATE_DOCUMENT).apply {
+                addCategory(CATEGORY_OPENABLE)
                 type = "application/json"
-                putExtra(Intent.EXTRA_TITLE, "taler-wallet-backup.json")
+                putExtra(EXTRA_TITLE, "taler-wallet-backup.json")
 
                 // Optionally, specify a URI for the directory that should be 
opened in
                 // the system file picker before your app creates the document.
@@ -118,26 +118,23 @@ class Settings : Fragment() {
             }
             startActivityForResult(intent, CREATE_FILE)
         }
-        
view.findViewById<Button>(R.id.button_backup_import).setOnClickListener {
-            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
+        button_backup_import.setOnClickListener {
+            val intent = Intent(ACTION_OPEN_DOCUMENT).apply {
+                addCategory(CATEGORY_OPENABLE)
                 type = "application/json"
 
                 //putExtra(DocumentsContract.EXTRA_INITIAL_URI, 
pickerInitialUri)
             }
-
             startActivityForResult(intent, PICK_FILE)
         }
-        return view
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        textView4.text = BuildConfig.VERSION_NAME
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: 
Intent?) {
+        if (data == null) return
+        when (requestCode) {
+            CREATE_FILE -> Log.i(TAG, "got createFile result with URL 
${data.data}")
+            PICK_FILE -> Log.i(TAG, "got pickFile result with URL 
${data.data}")
+        }
     }
 
-    companion object {
-        private const val TAG = "taler-wallet"
-        private const val CREATE_FILE = 1
-        private const val PICK_FILE = 2
-    }
 }
diff --git 
a/app/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt 
b/app/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt
index 75b7d02..4f8ab82 100644
--- a/app/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt
+++ b/app/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt
@@ -31,6 +31,7 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
+import kotlinx.android.synthetic.main.fragment_show_balance.*
 import kotlinx.android.synthetic.main.fragment_show_history.*
 import net.taler.wallet.R
 import net.taler.wallet.WalletViewModel
@@ -44,6 +45,7 @@ class WalletHistoryFragment : Fragment(), 
OnEventClickListener {
     private val model: WalletViewModel by activityViewModels()
     private val historyManager by lazy { model.historyManager }
     private lateinit var showAllItem: MenuItem
+    private var reloadHistoryItem: MenuItem? = null
     private val historyAdapter = WalletHistoryAdapter(this)
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -65,6 +67,9 @@ class WalletHistoryFragment : Fragment(), 
OnEventClickListener {
             addItemDecoration(DividerItemDecoration(context, VERTICAL))
         }
 
+        model.devMode.observe(viewLifecycleOwner, Observer { enabled ->
+            reloadHistoryItem?.isVisible = enabled
+        })
         historyManager.progress.observe(viewLifecycleOwner, Observer { show ->
             historyProgressBar.visibility = if (show) VISIBLE else INVISIBLE
         })
@@ -81,6 +86,9 @@ class WalletHistoryFragment : Fragment(), 
OnEventClickListener {
         inflater.inflate(R.menu.history, menu)
         showAllItem = menu.findItem(R.id.show_all_history)
         showAllItem.isChecked = historyManager.showAll.value == true
+        reloadHistoryItem = menu.findItem(R.id.reload_history).apply {
+            isVisible = model.devMode.value!!
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git 
a/app/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt 
b/app/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
index 5a53556..44dcf26 100644
--- a/app/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
+++ b/app/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
@@ -142,6 +142,7 @@ class PromptPaymentFragment : Fragment(), 
ProductImageClickListener {
     private fun showOrder(contractTerms: ContractTerms, totalFees: Amount?) {
         orderView.text = contractTerms.summary
         adapter.setItems(contractTerms.products)
+        if (contractTerms.products.size == 1) 
paymentManager.toggleDetailsShown()
         val amount = contractTerms.amount
         @SuppressLint("SetTextI18n")
         totalView.text = "${amount.amount} ${amount.currency}"
@@ -154,7 +155,7 @@ class PromptPaymentFragment : Fragment(), 
ProductImageClickListener {
         }
         orderLabelView.fadeIn()
         orderView.fadeIn()
-        if (contractTerms.products.isNotEmpty()) detailsButton.fadeIn()
+        if (contractTerms.products.size > 1) detailsButton.fadeIn()
         totalLabelView.fadeIn()
         totalView.fadeIn()
     }
diff --git a/app/src/main/res/layout/fragment_settings.xml 
b/app/src/main/res/layout/fragment_settings.xml
index 12a83ec..2fa0fcc 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -81,6 +81,7 @@
 
 
     <TextView
+            android:id="@+id/devSettingsTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ems="10"
diff --git a/app/src/main/res/layout/list_item_product_single.xml 
b/app/src/main/res/layout/list_item_product_single.xml
index a4578b3..a08f1f8 100644
--- a/app/src/main/res/layout/list_item_product_single.xml
+++ b/app/src/main/res/layout/list_item_product_single.xml
@@ -25,6 +25,7 @@
             android:id="@+id/quantity"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             app:layout_constraintEnd_toStartOf="@+id/name"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintHorizontal_chainStyle="packed"
@@ -52,6 +53,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
+            android:visibility="gone"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toTopOf="@+id/image"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 5120492..8981e04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,11 +72,11 @@
     <string name="payment_label_amount_total">Total Amount:</string>
     <string name="payment_label_order_summary">Order</string>
     <string name="payment_error">Error: %s</string>
-    <string name="payment_balance_insufficient">Balance Insufficient!</string>
+    <string name="payment_balance_insufficient">Balance insufficient!</string>
     <string name="payment_show_details">Show Details</string>
     <string name="payment_hide_details">Hide Details</string>
     <string name="payment_successful">Payment was successful</string>
-    <string name="payment_back_button">Go Back</string>
+    <string name="payment_back_button">OK</string>
     <string name="payment_already_paid">You\'ve already paid for this 
order.</string>
 
     <string name="withdraw_accepted">Withdrawal accepted</string>

-- 
To stop receiving notification emails like this one, please contact
address@hidden.