From ff971ee492dc7555cfa2cffdec44ccb41a3eba83 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 25 Jan 2018 14:27:30 -0600
Subject: [PATCH] Improved ReceiveTransactionFragment using SquaredImageView
 and ScrollView

---
 .../activities/IntroActivity.java             |   4 +-
 .../main/res/layout/receive_transaction.xml   | 275 +++++++++---------
 2 files changed, 142 insertions(+), 137 deletions(-)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java
index 92414b0..42d53d2 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java
@@ -54,7 +54,7 @@ public class IntroActivity extends AppCompatActivity {
         //Checks if the user has any seed created
         AccountSeedListViewModel accountSeedListViewModel = ViewModelProviders.of(this).get(AccountSeedListViewModel.class);
 
-        /*if (accountSeedListViewModel.accountSeedsCount() == 0){
+        if (accountSeedListViewModel.accountSeedsCount() == 0){
             //If the user doesn't have any seeds created, then
             //send the user to create/import an account
             //Intent intent = new Intent(this, AccountSeedsManagementActivity.class);
@@ -65,7 +65,7 @@ public class IntroActivity extends AppCompatActivity {
             //Intent intent = new Intent(this, CreateSeedActivity.class);
             Intent intent = new Intent(this, BoardActivity.class);
             startActivity(intent);
-        }*/
+        }
 
         /*CrystalDatabase db = CrystalDatabase.getAppDatabase(getApplicationContext());
         List<AccountSeed> seeds = RandomSeedGenerator.generateSeeds(2);
diff --git a/app/src/main/res/layout/receive_transaction.xml b/app/src/main/res/layout/receive_transaction.xml
index ddcc678..5be59dc 100644
--- a/app/src/main/res/layout/receive_transaction.xml
+++ b/app/src/main/res/layout/receive_transaction.xml
@@ -1,154 +1,159 @@
 <?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" >
+    android:layout_height="match_parent">
 
-    <View
-        android:id="@+id/topView"
+    <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:background="@drawable/receive_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/receive_assets"
-        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/receive_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/spTo"
-        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/receive_assets"
+            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/spTo"
-        app:layout_constraintStart_toStartOf="@+id/spTo"
-        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/etAmount"
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        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/gravatar" />
+        <Spinner
+            android:id="@+id/spTo"
+            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: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/tvFromError"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textColor="@color/red"
+            app:layout_constraintEnd_toEndOf="@+id/spTo"
+            app:layout_constraintStart_toStartOf="@+id/spTo"
+            app:layout_constraintTop_toBottomOf="@+id/topView" />
 
-    <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="24dp"
+            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/gravatar" />
 
-    <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" />
 
-    <ImageView
-        android:id="@+id/ivQrCode"
-        android:layout_width="match_parent"
-        android:layout_height="300dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
-        android:adjustViewBounds="true"
-        android:contentDescription="@string/qr_code"
-        android:src="@color/gray"
-        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="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/tvShare"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
-        android:text="@string/share_this_qr"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ivQrCode" />
+        <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/tvCancel"
-        android:layout_width="wrap_content"
-        android:layout_height="20dp"
-        android:layout_marginBottom="24dp"
-        android:layout_marginEnd="24dp"
-        android:text="@string/close"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <cy.agorise.crystalwallet.util.SquaredImageView
+            android:id="@+id/ivQrCode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/qr_code"
+            android:src="@color/gray"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvAmountError"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/tvShare"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="24dp"
+            android:layout_marginStart="24dp"
+            android:text="@string/share_this_qr"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:layout_constraintTop_toBottomOf="@id/ivQrCode"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+        <TextView
+            android:id="@+id/tvCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/close"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:layout_constraintTop_toTopOf="@id/tvShare"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </android.support.constraint.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file