From e83d3c00a013b3bc83d043a07f52a23f80888991 Mon Sep 17 00:00:00 2001
From: dtvv <coritocorito@hotmail.com>
Date: Wed, 19 Sep 2018 19:16:13 -0500
Subject: [PATCH] Get better view in the import seed layout

---
 app/src/main/res/layout/import_seed.xml | 79 +++++++------------------
 app/src/main/res/values/strings.xml     |  1 +
 2 files changed, 24 insertions(+), 56 deletions(-)

diff --git a/app/src/main/res/layout/import_seed.xml b/app/src/main/res/layout/import_seed.xml
index 01ffc12..3bf41c6 100644
--- a/app/src/main/res/layout/import_seed.xml
+++ b/app/src/main/res/layout/import_seed.xml
@@ -1,47 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".activities.ImportSeedActivity">
-    <!--
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/tilPin"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/tietPin"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-    </android.support.design.widget.TextInputLayout>
-    -->
-    <TextView
-        android:id="@+id/tvPin"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="10dp"
-        android:text="@string/txt_6_digits_pin"
-        android:textStyle="bold" />
 
     <EditText
         android:id="@+id/etPin"
+        android:layout_below="@+id/statusBar"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="20dp"
         android:background="@drawable/edittext_bg"
         android:inputType="number"
         android:maxLines="1"
+        android:hint="@string/txt_6_digits_pin"
         android:textColor="@color/black" />
 
     <TextView
         android:id="@+id/tvPinError"
+        android:layout_below="@+id/etPin"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
@@ -50,25 +32,17 @@
         android:textColor="@color/red"
         android:textStyle="bold" />
 
-    <TextView
-        android:id="@+id/tvPinConfirmation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="10dp"
-        android:text="@string/txt_6_digits_pin_confirm"
-        android:textStyle="bold" />
-
     <EditText
         android:id="@+id/etPinConfirmation"
         android:layout_width="match_parent"
         android:layout_height="40dp"
+        android:layout_below="@+id/tvPinError"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:background="@drawable/edittext_bg"
         android:inputType="number"
         android:maxLines="1"
+        android:hint="@string/txt_6_digits_pin_confirm"
         android:singleLine="true"
         android:textColor="@color/black" />
 
@@ -81,30 +55,25 @@
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginTop="10dp"
         android:textColor="@color/red"
-        android:textStyle="bold" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="10dp"
-        android:text="@string/seed_words"
+        android:layout_below="@+id/etPinConfirmation"
         android:textStyle="bold" />
 
     <EditText
         android:id="@+id/etSeedWords"
+        android:layout_below="@+id/tvPinConfirmationError"
         android:layout_width="match_parent"
         android:layout_height="120dp"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:background="@drawable/edittext_bg"
         android:gravity="top"
+        android:hint="@string/Seed"
         android:inputType="textMultiLine"
         android:textColor="@color/black" />
 
     <TextView
         android:id="@+id/tvSeedWordsError"
+        android:layout_below="@+id/etSeedWords"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
@@ -113,29 +82,23 @@
         android:textColor="@color/red"
         android:textStyle="bold" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="10dp"
-        android:text="@string/txt_account_name"
-        android:textStyle="bold" />
-
     <EditText
         android:id="@+id/etAccountName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/tvSeedWordsError"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:background="@drawable/edittext_bg"
         android:gravity="top"
+        android:hint="@string/txt_account_name"
         android:inputType="textMultiLine"
         android:textColor="@color/black" />
 
     <TextView
         android:id="@+id/tvAccountNameError"
         android:layout_width="match_parent"
+        android:layout_below="@+id/etAccountName"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
@@ -144,8 +107,10 @@
         android:textStyle="bold" />
 
     <TextView
+        android:id="@+id/txtLeyend"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/tvAccountNameError"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginTop="10dp"
@@ -156,6 +121,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/txtLeyend"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginTop="10dp"
@@ -164,11 +130,11 @@
 
         <Button
             android:id="@+id/btnCancel"
-            android:layout_width="wrap_content"
+            android:layout_width="140dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_margin="10dp"
-            android:background="@color/pink"
+            android:background="@color/redColor"
             android:text="@string/cancel"
             android:textColor="@color/white" />
 
@@ -178,7 +144,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_margin="10dp"
-            android:background="@color/green"
+            android:background="@color/colorPrimary"
             android:padding="10dp"
             android:text="@string/create_wallet"
             android:textColor="@color/white" />
@@ -188,6 +154,7 @@
     <cy.agorise.crystalwallet.util.BottomStatusBar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"/>
+        android:layout_gravity="bottom"
+        android:id="@+id/statusBar"/>
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index caa4ab5..1e1d236 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,6 +47,7 @@
     <string name="seed_words">Seed</string>
     <string name="txt_6_digits_pin">PIN (6+ digits)</string>
     <string name="txt_6_digits_pin_confirm">PIN confirm</string>
+    <string name="Seed">Seed</string>
     <string name="create">CREATE</string>
     <string name="or">OR</string>
     <string name="existing_account">Existing Account</string>