[taler-merchant-terminal-android] 06/08: Improve display of order total

[gnunet]

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

torsten-grote pushed a commit to branch master
in repository merchant-terminal-android.

commit b15056ec1b9e49a39fb480f5efd7c38dcb96a4b1
Author: Torsten Grote <address@hidden>
AuthorDate: Tue Feb 25 11:33:04 2020 -0300

    Improve display of order total
    
    * add background highlight
    * increase text size
    * show currency
---
 .../net/taler/merchantpos/config/ConfigManager.kt     |  1 +
 .../net/taler/merchantpos/order/OrderStateFragment.kt |  7 ++++++-
 app/src/main/res/layout/fragment_order.xml            |  3 +++
 app/src/main/res/layout/fragment_order_state.xml      | 19 ++++++++++++-------
 app/src/main/res/values-night/colors.xml              |  1 +
 app/src/main/res/values/colors.xml                    |  1 +
 app/src/main/res/values/strings.xml                   |  3 ++-
 7 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/net/taler/merchantpos/config/ConfigManager.kt 
b/app/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
index 6c230d1..753f5b9 100644
--- a/app/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
+++ b/app/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
@@ -52,6 +52,7 @@ class ConfigManager(
         password = prefs.getString(SETTINGS_PASSWORD, "")!!
     )
     var merchantConfig: MerchantConfig? = null
+        private set
 
     private val mConfigUpdateResult = MutableLiveData<ConfigUpdateResult>()
     val configUpdateResult: LiveData<ConfigUpdateResult> = mConfigUpdateResult
diff --git 
a/app/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt 
b/app/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt
index 3988f17..098692c 100644
--- a/app/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt
+++ b/app/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt
@@ -23,6 +23,8 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import kotlinx.android.synthetic.main.fragment_order_state.*
 import net.taler.merchantpos.MainViewModel
 import net.taler.merchantpos.R
+import net.taler.merchantpos.fadeIn
+import net.taler.merchantpos.fadeOut
 import net.taler.merchantpos.order.OrderAdapter.OrderLineLookup
 import net.taler.merchantpos.order.OrderAdapter.OrderViewHolder
 
@@ -79,9 +81,12 @@ class OrderStateFragment : Fragment() {
         })
         orderManager.orderTotal.observe(viewLifecycleOwner, Observer { 
orderTotal ->
             if (orderTotal == 0.0) {
+                totalView.fadeOut()
                 totalView.text = null
             } else {
-                totalView.text = getString(R.string.order_total, orderTotal)
+                val currency = viewModel.configManager.merchantConfig?.currency
+                totalView.text = getString(R.string.order_total, orderTotal, 
currency)
+                totalView.fadeIn()
             }
         })
     }
diff --git a/app/src/main/res/layout/fragment_order.xml 
b/app/src/main/res/layout/fragment_order.xml
index 67f3fc7..3fd4902 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -10,6 +10,7 @@
             android:name="net.taler.merchantpos.order.OrderStateFragment"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="8dp"
             app:layout_constraintBottom_toTopOf="@+id/restartButton"
             app:layout_constraintEnd_toStartOf="@+id/guideline1"
             app:layout_constraintStart_toStartOf="parent"
@@ -28,6 +29,7 @@
             android:name="net.taler.merchantpos.order.ProductsFragment"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="8dp"
             app:layout_constraintBottom_toTopOf="@+id/restartButton"
             app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintStart_toStartOf="@+id/guideline1"
@@ -46,6 +48,7 @@
             android:name="net.taler.merchantpos.order.CategoriesFragment"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="8dp"
             app:layout_constraintBottom_toTopOf="@+id/restartButton"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/guideline2"
diff --git a/app/src/main/res/layout/fragment_order_state.xml 
b/app/src/main/res/layout/fragment_order_state.xml
index 0cd9c75..0fc602a 100644
--- a/app/src/main/res/layout/fragment_order_state.xml
+++ b/app/src/main/res/layout/fragment_order_state.xml
@@ -10,22 +10,27 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@+id/totalView"
-            tools:listitem="@layout/list_item_order"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:listitem="@layout/list_item_order" />
 
     <TextView
             android:id="@+id/totalView"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:background="@color/highlightedBackground"
+            android:elevation="2dp"
+            android:gravity="center_vertical|end"
+            android:padding="8dp"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="16sp"
+            android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/orderList"
-            app:layout_constraintVertical_bias="1.0"
-            tools:text="Total: 23.75" />
+            tools:text="Total: 23.75 TESTKUDOS"
+            tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-night/colors.xml 
b/app/src/main/res/values-night/colors.xml
index 47721b4..10bdbb9 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="highlightedBackground">#2E2E2E</color>
     <color name="selectedBackground">#363636</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml 
b/app/src/main/res/values/colors.xml
index c6be561..bf0c849 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,6 +4,7 @@
     <color name="colorPrimaryDark">#5D4037</color>
     <color name="colorAccent">#FFEB3B</color>
 
+    <color name="highlightedBackground">#E4E4E4</color>
     <color name="selectedBackground">#DADADA</color>
     <color name="bottomButtons">#9E9D24</color>
 
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index c5b1554..1dad4de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,7 +7,8 @@
     <string name="menu_history">History</string>
     <string name="menu_settings">Settings</string>
 
-    <string name="order_total">Total: %1$.2f</string>
+    <!-- The first placeholder is the amount and the second the currency -->
+    <string name="order_total">Total: %1$.2f %2$s</string>
     <string name="order_restart">Restart</string>
     <string name="order_undo">Undo</string>
     <string name="button_reconfigure">Reconfigure</string>

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