Show products included in contract terms when paying

3 files changed, 165 insertions, 79 deletions

diff --git a/app/src/main/res/layout/fragment_prompt_payment.xml b/app/src/main/res/layout/fragment_prompt_payment.xml
index 8bc7b07..78d477f 100644
--- a/app/src/main/res/layout/fragment_prompt_payment.xml
+++ b/app/src/main/res/layout/fragment_prompt_payment.xml
@@ -6,92 +6,136 @@
         android:layout_height="match_parent"
         tools:context=".payment.PromptPaymentFragment">
 
-    <TextView
-            android:id="@+id/error_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/activity_horizontal_margin"
-            android:textColor="@android:color/holo_red_dark"
-            android:textSize="22sp"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toTopOf="@+id/order_summary_label"
+    <ScrollView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginBottom="16dp"
+            android:fillViewport="true"
+            app:layout_constraintBottom_toTopOf="@+id/button_abort_payment"
             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="packed"
-            tools:text="@string/payment_balance_insufficient"
-            tools:visibility="visible" />
+            app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-            android:id="@+id/order_summary_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/activity_horizontal_margin"
-            android:text="@string/payment_label_order_summary"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toTopOf="@+id/order_summary"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/error_text"
-            tools:visibility="visible" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-    <TextView
-            android:id="@+id/order_summary"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/activity_horizontal_margin"
-            android:layout_marginTop="16dp"
-            android:gravity="center_horizontal"
-            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-            android:textSize="25sp"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toTopOf="@+id/order_amount_label"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/order_summary_label"
-            tools:text="2 x Cappuccino, 1 x Hot Meals, 1 x Dessert"
-            tools:visibility="visible" />
+            <TextView
+                    android:id="@+id/error_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/activity_horizontal_margin"
+                    android:textColor="@android:color/holo_red_dark"
+                    android:textSize="22sp"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toTopOf="@+id/order_summary_label"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    tools:text="@string/payment_balance_insufficient"
+                    tools:visibility="visible" />
 
-    <TextView
-            android:id="@+id/order_amount_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/activity_horizontal_margin"
-            android:text="@string/payment_label_amount"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toTopOf="@+id/order_amount"
-            app:layout_constraintEnd_toEndOf="@+id/order_summary"
-            app:layout_constraintStart_toStartOf="@+id/order_summary"
-            app:layout_constraintTop_toBottomOf="@+id/order_summary"
-            tools:visibility="visible" />
+            <TextView
+                    android:id="@+id/order_summary_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/activity_horizontal_margin"
+                    android:text="@string/payment_label_order_summary"
+                    android:visibility="invisible"
+                    app:layout_constraintBottom_toTopOf="@+id/order_summary"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/error_text"
+                    tools:visibility="visible" />
 
-    <TextView
-            android:id="@+id/order_amount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/activity_horizontal_margin"
-            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toTopOf="@+id/order_fees_amount"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/order_amount_label"
-            tools:text="10 TESTKUDOS"
-            tools:visibility="visible" />
+            <TextView
+                    android:id="@+id/order_summary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/activity_horizontal_margin"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center_horizontal"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                    android:textSize="25sp"
+                    android:visibility="invisible"
+                    app:layout_constraintBottom_toTopOf="@+id/detailsButton"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/order_summary_label"
+                    tools:text="2 x Cappuccino, 1 x Hot Meals, 1 x Dessert"
+                    tools:visibility="visible" />
 
-    <TextView
-            android:id="@+id/order_fees_amount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toTopOf="@+id/button_abort_payment"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/order_amount"
-            tools:text="@string/payment_fee"
-            tools:visibility="visible" />
+            <Button
+                    android:id="@+id/detailsButton"
+                    style="@style/Widget.AppCompat.Button.Colored"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:backgroundTint="@color/colorPrimary"
+                    android:text="@string/payment_show_details"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toTopOf="@+id/productsList"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/order_summary"
+                    tools:visibility="visible" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/productsList"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/activity_horizontal_margin"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toTopOf="@+id/order_amount_label"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/detailsButton"
+                    tools:listitem="@layout/list_item_product"
+                    tools:visibility="visible" />
+
+            <TextView
+                    android:id="@+id/order_amount_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/activity_horizontal_margin"
+                    android:text="@string/payment_label_amount"
+                    android:visibility="invisible"
+                    app:layout_constraintBottom_toTopOf="@+id/order_amount"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/productsList"
+                    tools:visibility="visible" />
+
+            <TextView
+                    android:id="@+id/order_amount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/activity_horizontal_margin"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                    android:visibility="invisible"
+                    app:layout_constraintBottom_toTopOf="@+id/order_fees_amount"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/order_amount_label"
+                    tools:text="10 TESTKUDOS"
+                    tools:visibility="visible" />
+
+            <TextView
+                    android:id="@+id/order_fees_amount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:visibility="invisible"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/order_amount"
+                    tools:text="@string/payment_fee"
+                    tools:visibility="visible" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
 
     <Button
             android:id="@+id/button_abort_payment"
diff --git a/app/src/main/res/layout/list_item_product.xml b/app/src/main/res/layout/list_item_product.xml
new file mode 100644
index 0000000..88fb9e8
--- /dev/null
+++ b/app/src/main/res/layout/list_item_product.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="8dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="8dp">
+
+    <TextView
+            android:id="@+id/quantity"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:minWidth="24dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="31" />
+
+    <TextView
+            android:id="@+id/name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintEnd_toStartOf="@+id/price"
+            app:layout_constraintStart_toEndOf="@+id/quantity"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="A product item that in some cases could have a very long name" />
+
+    <TextView
+            android:id="@+id/price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="23.42" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8602063..cd1ad54 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,5 +43,7 @@
     <string name="payment_label_order_summary">Order Summary</string>
     <string name="payment_error">Error: %s</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>
 
 </resources>