From dd619be8c8e5c363279c60bd3db3d4111dc137a0 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Fri, 11 Jan 2019 13:27:34 -0600
Subject: [PATCH] Update ImportBrainkeyFragment layout to show the 'View
 Network Status' text and newtwork status icon at the bottom.

---
 .../res/layout/fragment_import_brainkey.xml   | 226 ++++++++++--------
 app/src/main/res/layout/fragment_settings.xml |   2 +-
 app/src/main/res/values/strings.xml           |   1 +
 3 files changed, 128 insertions(+), 101 deletions(-)

diff --git a/app/src/main/res/layout/fragment_import_brainkey.xml b/app/src/main/res/layout/fragment_import_brainkey.xml
index 0372fdc..736cfb6 100644
--- a/app/src/main/res/layout/fragment_import_brainkey.xml
+++ b/app/src/main/res/layout/fragment_import_brainkey.xml
@@ -2,117 +2,143 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:focusable="true"
     android:focusableInTouchMode="true"
     tools:context=".fragments.ImportBrainkeyFragment">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tilPin"
-        style="@style/Widget.Bitsy.TextInputLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:hint="@string/text_field__6_digit_pin"
-        app:passwordToggleEnabled="true">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/tietPin"
-            android:layout_width="match_parent"
+    
+    <ScrollView 
+        android:layout_width="match_parent" 
+        android:layout_height="0dp"
+        android:layout_weight="1">
+        
+        <LinearLayout 
+            android:layout_width="match_parent" 
             android:layout_height="wrap_content"
-            android:inputType="numberPassword"
-            android:singleLine="true"/>
+            android:orientation="vertical">
 
-    </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/tilPin"
+                style="@style/Widget.Bitsy.TextInputLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                android:hint="@string/text_field__6_digit_pin"
+                app:passwordToggleEnabled="true">
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tilPinConfirmation"
-        style="@style/Widget.Bitsy.TextInputLayout"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/tietPin"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="numberPassword"
+                    android:singleLine="true"/>
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/tilPinConfirmation"
+                style="@style/Widget.Bitsy.TextInputLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_same_topic"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                android:hint="@string/text_field__confirm_pin"
+                app:passwordToggleEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/tietPinConfirmation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="numberPassword"
+                    android:singleLine="true"/>
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/tilBrainKey"
+                style="@style/Widget.Bitsy.TextInputLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_same_topic"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                android:hint="@string/text__brain_key">
+
+                <cy.agorise.bitsybitshareswallet.views.MyTextInputEditText
+                    android:id="@+id/tietBrainKey"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textMultiLine"
+                    android:gravity="top"
+                    android:lines="4"
+                    android:scrollHorizontally="false"
+                    android:imeOptions="actionDone"/>
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnImport"
+                style="@style/Widget.Bitsy.Button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_different_topic"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                android:text="@string/button__import_existing_account"/>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/activity_horizontal_margin">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_centerVertical="true"
+                    android:background="@color/black"/>
+
+                <TextView
+                    android:id="@+id/tvOR"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:background="?android:colorBackground"
+                    android:layout_centerHorizontal="true"
+                    android:text="@string/text__or"
+                    android:textAllCaps="true"
+                    android:textAppearance="@style/TextAppearance.Bitsy.Body1"/>
+
+            </RelativeLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnCreate"
+                style="@style/Widget.Bitsy.Button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                android:text="@string/button__create_new_account"/>
+            
+        </LinearLayout>
+        
+    </ScrollView>
+
+    <TextView
+        android:id="@+id/tvNetworkStatus"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_same_topic"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="@dimen/activity_vertical_margin"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:hint="@string/text_field__confirm_pin"
-        app:passwordToggleEnabled="true">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/tietPinConfirmation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="numberPassword"
-            android:singleLine="true"/>
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tilBrainKey"
-        style="@style/Widget.Bitsy.TextInputLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_same_topic"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:hint="@string/text__brain_key">
-
-        <cy.agorise.bitsybitshareswallet.views.MyTextInputEditText
-            android:id="@+id/tietBrainKey"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textMultiLine"
-            android:gravity="top"
-            android:lines="4"
-            android:scrollHorizontally="false"
-            android:imeOptions="actionDone"/>
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnImport"
-        style="@style/Widget.Bitsy.Button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_different_topic"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:text="@string/button__import_existing_account"/>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/activity_horizontal_margin">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_centerVertical="true"
-            android:background="@color/black"/>
-
-        <TextView
-            android:id="@+id/tvOR"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:background="?android:colorBackground"
-            android:layout_centerHorizontal="true"
-            android:text="@string/text__or"
-            android:textAllCaps="true"
-            android:textAppearance="@style/TextAppearance.Bitsy.Body1"/>
-
-    </RelativeLayout>
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnCreate"
-        style="@style/Widget.Bitsy.Button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:text="@string/button__create_new_account"/>
+        android:text="@string/text__view_network_status"
+        android:gravity="end|center_vertical"
+        android:textAppearance="@style/TextAppearance.Bitsy.Body1"
+        android:drawablePadding="8dp"
+        android:drawableEnd="@drawable/ic_disconnected"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 3f90287..29ba248 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_same_topic"
                 android:layout_marginEnd="2dp"
-                android:text="View Network Status"
+                android:text="@string/text__view_network_status"
                 android:gravity="center_vertical"
                 android:textAppearance="@style/TextAppearance.Bitsy.Body1"
                 android:drawableEnd="@drawable/ic_disconnected"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c330420..585c43c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -124,5 +124,6 @@
         https://github.com/Agorise
     </string>
     <string name="title__bitshares_nodes_dialog">Block: %1$s</string>
+    <string name="text__view_network_status">View Network Status</string>
 
 </resources>