From e3bea9f475b3e019df6e550b64341a608bf3fb76 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 20 Dec 2018 18:06:11 -0600
Subject: [PATCH] Center text vertically below QR code and fix Please Pay
 string.

---
 app/src/main/res/layout/activity_main.xml     |  1 +
 .../layout/fragment_receive_transaction.xml   | 52 +++++++++++--------
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d412b6c..cb09a9c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -13,6 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
+        android:elevation="4dp"
         android:theme="@style/ThemeOverlay.AppCompat.Dark" />
 
     <fragment
diff --git a/app/src/main/res/layout/fragment_receive_transaction.xml b/app/src/main/res/layout/fragment_receive_transaction.xml
index 1069133..b902424 100644
--- a/app/src/main/res/layout/fragment_receive_transaction.xml
+++ b/app/src/main/res/layout/fragment_receive_transaction.xml
@@ -57,7 +57,7 @@
         android:background="@color/darkGray"
         app:layout_constraintTop_toBottomOf="@+id/spAsset"
         app:layout_constraintEnd_toEndOf="@+id/spAsset"
-        app:layout_constraintStart_toStartOf="@+id/spAsset" />
+        app:layout_constraintStart_toStartOf="@+id/spAsset"/>
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tilAsset"
@@ -89,31 +89,41 @@
         android:layout_height="0dp"
         android:layout_marginTop="@dimen/spacing_different_topic"
         android:layout_marginBottom="@dimen/spacing_different_topic"
-        android:background="@drawable/camera_view_background"
         app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintTop_toBottomOf="@id/tilAsset"
-        app:layout_constraintBottom_toTopOf="@id/tvPleasePay"
+        app:layout_constraintTop_toBottomOf="@+id/tilAsset"
+        app:layout_constraintBottom_toTopOf="@+id/llText"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"/>
 
-    <TextView
-        android:id="@+id/tvPleasePay"
+    <LinearLayout
+        android:id="@+id/llText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxLines="1"
-        tools:text="Please Pay: 12.25316 BTS"
-        android:textAppearance="@style/TextAppearance.Bitsy.Body1"
-        android:textAlignment="center"
-        app:layout_constraintBottom_toTopOf="@id/tvTo"/>
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ivQR">
 
-    <TextView
-        android:id="@+id/tvTo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:maxLines="1"
-        tools:text="To: seventest-3"
-        android:textAppearance="@style/TextAppearance.Bitsy.Body1"
-        android:textAlignment="center"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        <TextView
+            android:id="@+id/tvPleasePay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            tools:text="Please Pay: 12.25316 BTS"
+            android:textAppearance="@style/TextAppearance.Bitsy.Body1"
+            android:textAlignment="center"
+            app:layout_constraintBottom_toTopOf="@id/tvTo"/>
+
+        <TextView
+            android:id="@+id/tvTo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            tools:text="To: seventest-3"
+            android:textAppearance="@style/TextAppearance.Bitsy.Body1"
+            android:textAlignment="center"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2376980..8499903 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,7 +54,7 @@
     <string name="text__memo">Memo</string>
     <string name="text__scan_qr">Scan QR</string>
     <string name="text__asset">Asset</string>
-    <string name="template__please_pay">Please pay: %1$s %2$s</string>
+    <string name="template__please_pay">Please Pay: %1$s %2$s</string>
     <string name="template__to">To: %1$s</string>
 
     <!-- Settings -->