From bf45cae2a130fd3ce1ec1a136d1ec3d015e4b5f7 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 25 Jan 2018 15:49:43 -0600
Subject: [PATCH] Improved SendTransactionLayout to adjust to different screen
 sizes and fixed text color

---
 .../main/res/layout/receive_transaction.xml   |   3 +-
 app/src/main/res/layout/send_transaction.xml  | 426 +++++++++---------
 app/src/main/res/values/strings.xml           |   2 +
 3 files changed, 218 insertions(+), 213 deletions(-)

diff --git a/app/src/main/res/layout/receive_transaction.xml b/app/src/main/res/layout/receive_transaction.xml
index 5be59dc..3d0e06f 100644
--- a/app/src/main/res/layout/receive_transaction.xml
+++ b/app/src/main/res/layout/receive_transaction.xml
@@ -69,8 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginStart="24dp"
-            android:inputType="textMultiLine"
-            android:textColor="@color/white"
+            android:inputType="numberDecimal"
             android:textSize="20sp"
             android:hint="@string/amount"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/send_transaction.xml b/app/src/main/res/layout/send_transaction.xml
index cf22d2f..3c0a374 100644
--- a/app/src/main/res/layout/send_transaction.xml
+++ b/app/src/main/res/layout/send_transaction.xml
@@ -1,239 +1,243 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <View
-        android:id="@+id/topView"
+    <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:background="@drawable/send_transaction_top_view"
-        android:layout_height="120dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
-        android:text="@string/title_capital"
-        android:textColor="@color/white"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:paddingBottom="24dp">
 
-    <cy.agorise.crystalwallet.util.CircularImageView
-        android:id="@+id/gravatar"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:src="@drawable/ken_code_gravatar"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="90dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <View
+            android:id="@+id/topView"
+            android:layout_width="match_parent"
+            android:background="@drawable/send_transaction_top_view"
+            android:layout_height="120dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <Spinner
-        android:id="@+id/spFrom"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
-        android:layout_marginStart="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/gravatar"
-        app:layout_constraintTop_toTopOf="@id/gravatar" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="@string/title_capital"
+            android:textColor="@color/white"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tvFromError"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textColor="@color/red"
-        app:layout_constraintEnd_toEndOf="@+id/spFrom"
-        app:layout_constraintStart_toStartOf="@+id/spFrom"
-        app:layout_constraintTop_toBottomOf="@+id/topView" />
+        <cy.agorise.crystalwallet.util.CircularImageView
+            android:id="@+id/gravatar"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:src="@drawable/ken_code_gravatar"
+            android:layout_marginStart="32dp"
+            android:layout_marginTop="90dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <EditText
-        android:id="@+id/etTo"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
-        android:gravity="top"
-        android:inputType="textMultiLine"
-        android:textColor="@color/white"
-        android:textSize="20sp"
-        android:hint="@string/to_capital"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/gravatar" />
+        <Spinner
+            android:id="@+id/spFrom"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:layout_marginStart="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/gravatar"
+            app:layout_constraintTop_toTopOf="@id/gravatar" />
 
-    <ImageView
-        android:id="@+id/ivPeople"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginEnd="5dp"
-        app:srcCompat="@drawable/ic_people"
-        android:layout_marginBottom="15dp"
-        app:layout_constraintEnd_toEndOf="@id/etTo"
-        app:layout_constraintBottom_toBottomOf="@id/etTo"/>
+        <TextView
+            android:id="@+id/tvFromError"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textColor="@color/red"
+            app:layout_constraintEnd_toEndOf="@+id/spFrom"
+            app:layout_constraintStart_toStartOf="@+id/spFrom"
+            app:layout_constraintTop_toBottomOf="@+id/topView" />
 
-    <TextView
-        android:id="@+id/tvToError"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textColor="@color/red"
-        app:layout_constraintEnd_toEndOf="@+id/etTo"
-        app:layout_constraintStart_toStartOf="@+id/etTo"
-        app:layout_constraintTop_toBottomOf="@+id/etTo" />
+        <EditText
+            android:id="@+id/etTo"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:gravity="top"
+            android:inputType="text"
+            android:textSize="20sp"
+            android:hint="@string/to_capital"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/gravatar" />
 
-    <EditText
-        android:id="@+id/etAmount"
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginStart="24dp"
-        android:inputType="textMultiLine"
-        android:textColor="@color/white"
-        android:textSize="20sp"
-        android:hint="@string/amount"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvToError" />
+        <ImageView
+            android:id="@+id/ivPeople"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="5dp"
+            app:srcCompat="@drawable/ic_people"
+            android:layout_marginBottom="15dp"
+            app:layout_constraintEnd_toEndOf="@id/etTo"
+            app:layout_constraintBottom_toBottomOf="@id/etTo"
+            android:contentDescription="@string/people_icon" />
 
-    <TextView
-        android:id="@+id/tvAmountError"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textColor="@color/red"
-        app:layout_constraintEnd_toEndOf="@+id/etAmount"
-        app:layout_constraintStart_toStartOf="@+id/etAmount"
-        app:layout_constraintTop_toBottomOf="@+id/etAmount" />
+        <TextView
+            android:id="@+id/tvToError"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textColor="@color/red"
+            app:layout_constraintEnd_toEndOf="@+id/etTo"
+            app:layout_constraintStart_toStartOf="@+id/etTo"
+            app:layout_constraintTop_toBottomOf="@+id/etTo" />
 
-    <Spinner
-        android:id="@+id/spAsset"
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
-        android:layout_marginTop="8dp"
-        android:gravity="top"
-        android:inputType="textMultiLine"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/etAmount" />
+        <EditText
+            android:id="@+id/etAmount"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="24dp"
+            android:inputType="numberDecimal"
+            android:textSize="20sp"
+            android:hint="@string/amount"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvToError" />
 
-    <View
-        android:id="@+id/viewSpinner"
-        android:layout_width="0dp"
-        android:layout_height="3dp"
-        android:layout_marginTop="5dp"
-        android:background="@color/gray"
-        app:layout_constraintEnd_toEndOf="@+id/spAsset"
-        app:layout_constraintStart_toStartOf="@+id/spAsset"
-        app:layout_constraintTop_toBottomOf="@id/spAsset" />
+        <TextView
+            android:id="@+id/tvAmountError"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textColor="@color/red"
+            app:layout_constraintEnd_toEndOf="@+id/etAmount"
+            app:layout_constraintStart_toStartOf="@+id/etAmount"
+            app:layout_constraintTop_toBottomOf="@+id/etAmount" />
 
-    <TextView
-        android:id="@+id/tvAssetError"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textColor="@color/red"
-        app:layout_constraintBottom_toBottomOf="@+id/tvAmountError"
-        app:layout_constraintEnd_toEndOf="@+id/spAsset"
-        app:layout_constraintStart_toStartOf="@+id/spAsset" />
+        <Spinner
+            android:id="@+id/spAsset"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:layout_marginTop="8dp"
+            android:gravity="top"
+            android:inputType="textMultiLine"
+            android:textColor="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/etAmount" />
 
-    <EditText
-        android:id="@+id/etMemo"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
-        android:inputType="textMultiLine"
-        android:textColor="@color/white"
-        android:hint="@string/memo_capital"
-        android:textSize="20sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvAmountError" />
+        <View
+            android:id="@+id/viewSpinner"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginBottom="7dp"
+            android:background="@color/darkGray"
+            app:layout_constraintEnd_toEndOf="@+id/spAsset"
+            app:layout_constraintStart_toStartOf="@+id/spAsset"
+            app:layout_constraintBottom_toBottomOf="@id/etAmount" />
 
-    <TextView
-        android:id="@+id/tvMemoError"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textColor="@color/red"
-        app:layout_constraintEnd_toEndOf="@+id/etMemo"
-        app:layout_constraintStart_toStartOf="@+id/etMemo"
-        app:layout_constraintTop_toBottomOf="@+id/etMemo" />
+        <TextView
+            android:id="@+id/tvAssetError"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textColor="@color/red"
+            app:layout_constraintBottom_toBottomOf="@+id/tvAmountError"
+            app:layout_constraintEnd_toEndOf="@+id/spAsset"
+            app:layout_constraintStart_toStartOf="@+id/spAsset" />
 
-    <TextView
-        android:id="@+id/tvScan"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:layout_marginStart="24dp"
-        android:text="@string/scan_capital"
-        android:textSize="14sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvMemoError" />
+        <EditText
+            android:id="@+id/etMemo"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:inputType="textMultiLine"
+            android:hint="@string/memo_capital"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvAmountError" />
 
-    <ImageView
-        android:id="@+id/ivCamera"
-        android:layout_width="180dp"
-        android:layout_height="180dp"
-        android:layout_marginBottom="24dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
-        android:src="#666"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvScan" />
+        <TextView
+            android:id="@+id/tvMemoError"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textColor="@color/red"
+            app:layout_constraintEnd_toEndOf="@+id/etMemo"
+            app:layout_constraintStart_toStartOf="@+id/etMemo"
+            app:layout_constraintTop_toBottomOf="@+id/etMemo" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fabCloseCamera"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        app:fabSize="mini"
-        android:layout_marginBottom="165dp"
-        android:layout_marginStart="165dp"
-        app:backgroundTint="@color/send_strong_orange"
-        app:srcCompat="@drawable/ic_close"
-        app:layout_constraintBottom_toBottomOf="@+id/ivCamera"
-        app:layout_constraintStart_toStartOf="@+id/ivCamera" />
+        <TextView
+            android:id="@+id/tvScan"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="24dp"
+            android:text="@string/scan_capital"
+            android:textSize="14sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvMemoError" />
 
-    <View
-        android:id="@+id/viewSend"
-        android:layout_width="120dp"
-        android:layout_height="140dp"
-        android:layout_marginEnd="0dp"
-        android:background="@drawable/send_transaction_send_view"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/ivCamera" />
+        <ImageView
+            android:id="@+id/ivCamera"
+            android:layout_width="180dp"
+            android:layout_height="180dp"
+            android:layout_marginBottom="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:src="#666"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvScan"
+            android:contentDescription="@string/camera_feed_to_scan_qr" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/btnSend"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:layout_marginTop="24dp"
-        app:backgroundTint="@color/send_strong_orange"
-        app:srcCompat="@drawable/ic_arrow_forward"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/viewSend" />
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fabCloseCamera"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            app:fabSize="mini"
+            android:layout_marginBottom="165dp"
+            android:layout_marginStart="165dp"
+            app:backgroundTint="@color/send_strong_orange"
+            app:srcCompat="@drawable/ic_close"
+            app:layout_constraintBottom_toBottomOf="@+id/ivCamera"
+            app:layout_constraintStart_toStartOf="@+id/ivCamera" />
 
-    <TextView
-        android:id="@+id/btnCancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp"
-        android:layout_marginEnd="24dp"
-        android:text="@string/cancel_capital"
-        android:textStyle="bold"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <View
+            android:id="@+id/viewSend"
+            android:layout_width="120dp"
+            android:layout_height="140dp"
+            android:layout_marginEnd="0dp"
+            android:background="@drawable/send_transaction_send_view"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/ivCamera" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/btnSend"
+            android:layout_width="90dp"
+            android:layout_height="90dp"
+            android:layout_marginTop="24dp"
+            app:backgroundTint="@color/send_strong_orange"
+            app:srcCompat="@drawable/ic_arrow_forward"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/viewSend" />
+
+        <TextView
+            android:id="@+id/btnCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:text="@string/cancel_capital"
+            android:textStyle="bold"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </android.support.constraint.ConstraintLayout>
+
+</ScrollView>
\ 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 37e81e9..f00d4b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -499,4 +499,6 @@
     <string name="new_user">New user?</string>
     <string name="existing_user">Existing user?</string>
     <string name="connection_status">Connection status</string>
+    <string name="people_icon">People icon</string>
+    <string name="camera_feed_to_scan_qr">Camera feed to scan QR</string>
 </resources>