[taler-merchant-terminal-android] 05/08: Redesign payment successful screen

[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 7f76cdb94137499543c965f10fd50b1021a92cd2
Author: Torsten Grote <address@hidden>
AuthorDate: Tue Feb 25 11:14:35 2020 -0300

    Redesign payment successful screen
---
 .../merchantpos/payment/PaymentSuccessFragment.kt  |  2 +-
 app/src/main/res/drawable/ic_check_circle.xml      | 10 +++++
 .../main/res/layout/fragment_payment_success.xml   | 47 +++++++++++++++++-----
 app/src/main/res/values/colors.xml                 |  3 +-
 app/src/main/res/values/strings.xml                |  4 +-
 5 files changed, 53 insertions(+), 13 deletions(-)

diff --git 
a/app/src/main/java/net/taler/merchantpos/payment/PaymentSuccessFragment.kt 
b/app/src/main/java/net/taler/merchantpos/payment/PaymentSuccessFragment.kt
index e3bfa11..1e9953f 100644
--- a/app/src/main/java/net/taler/merchantpos/payment/PaymentSuccessFragment.kt
+++ b/app/src/main/java/net/taler/merchantpos/payment/PaymentSuccessFragment.kt
@@ -20,7 +20,7 @@ class PaymentSuccessFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        button_success_back.setOnClickListener {
+        paymentButton.setOnClickListener {
             findNavController().navigateUp()
         }
     }
diff --git a/app/src/main/res/drawable/ic_check_circle.xml 
b/app/src/main/res/drawable/ic_check_circle.xml
new file mode 100644
index 0000000..61e1b5a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_circle.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android";
+        android:width="24dp"
+        android:height="24dp"
+        android:alpha="0.56"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="@color/green"
+            android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 
10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_payment_success.xml 
b/app/src/main/res/layout/fragment_payment_success.xml
index d6a27db..4924df4 100644
--- a/app/src/main/res/layout/fragment_payment_success.xml
+++ b/app/src/main/res/layout/fragment_payment_success.xml
@@ -4,30 +4,59 @@
         xmlns:tools="http://schemas.android.com/tools";
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="16dp"
         tools:context=".payment.PaymentSuccessFragment">
 
+    <ImageView
+            android:id="@+id/paymentIcon"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="16dp"
+            android:src="@drawable/ic_check_circle"
+            app:layout_constraintBottom_toTopOf="@+id/paymentLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="spread_inside"
+            tools:ignore="ContentDescription" />
+
     <TextView
-            android:id="@+id/textView3"
+            android:id="@+id/paymentLabel"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:gravity="center"
+            android:layout_margin="16dp"
+            android:gravity="center_horizontal|top"
             android:text="@string/payment_received"
-            android:textColor="@android:color/holo_green_dark"
+            android:textColor="@color/green"
             app:autoSizeMaxTextSize="42sp"
             app:autoSizeTextType="uniform"
-            app:layout_constraintBottom_toTopOf="@+id/button_success_back"
+            app:layout_constraintBottom_toTopOf="@+id/paymentButton"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@+id/paymentIcon" />
+
+    <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guidelineLeft"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.25" />
+
+    <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guidelineRight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.75" />
 
     <Button
-            android:id="@+id/button_success_back"
+            android:id="@+id/paymentButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_margin="16dp"
             android:text="@string/payment_back_button"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+            app:layout_constraintStart_toStartOf="@+id/guidelineLeft" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/colors.xml 
b/app/src/main/res/values/colors.xml
index 5a3d60d..c6be561 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,7 +6,8 @@
 
     <color name="selectedBackground">#DADADA</color>
     <color name="bottomButtons">#9E9D24</color>
-    <color name="logoutButton">@color/red</color>
+
+    <color name="green">#388E3C</color>
     <color name="red">#C62828</color>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 02b3101..c5b1554 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,8 +31,8 @@
     <string name="payment_intro_nfc">Please scan QR Code or use NFC to 
pay</string>
     <string name="payment_intro">Please scan QR Code to pay</string>
     <string name="payment_cancel">Cancel Payment</string>
-    <string name="payment_received">Payment Received</string>
-    <string name="payment_back_button">Go Back</string>
+    <string name="payment_received">Payment received</string>
+    <string name="payment_back_button">Continue</string>
     <string name="payment_order_ref">Order Reference: %s</string>
     <string name="payment_canceled">Payment Canceled</string>
 

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