From 67ad71ff88fc96a95bb8de682e79e29605eddeeb Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 10 Jan 2019 15:57:53 -0600
Subject: [PATCH] Change brainkey error description and create and import
 button labels in ImportBrainkeyFragment. Also added an 'Or' string between
 the import and create buttons.

---
 .../res/layout/fragment_import_brainkey.xml   | 34 ++++++++++++++-----
 app/src/main/res/values/strings.xml           | 10 +++---
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/fragment_import_brainkey.xml b/app/src/main/res/layout/fragment_import_brainkey.xml
index 80e96c8..0372fdc 100644
--- a/app/src/main/res/layout/fragment_import_brainkey.xml
+++ b/app/src/main/res/layout/fragment_import_brainkey.xml
@@ -79,24 +79,40 @@
         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"/>
+        android:text="@string/button__import_existing_account"/>
 
-    <View
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/spacing_different_topic"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:background="@color/black"/>
+        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_marginTop="@dimen/spacing_different_topic"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:text="@string/button__create"/>
+        android:text="@string/button__create_new_account"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95fc195..c330420 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,11 +12,10 @@
     <string name="text_field__confirm_pin">Confirm PIN</string>
     <string name="error__pin_mismatch">PIN mismatch</string>
     <string name="text__brain_key">BrainKey</string>
-    <string name="error__enter_correct_brainkey">Please enter correct brainkey, it should have between 12 and 16
-        words.
-    </string>
-    <string name="button__import">Import</string>
-    <string name="button__create">Create</string>
+    <string name="error__enter_correct_brainkey">Please enter correct brainkey, it should have 12 or 16 words.</string>
+    <string name="button__import_existing_account">Import existing account</string>
+    <string name="text__or">Or</string>
+    <string name="button__create_new_account">Create new account</string>
     <!-- TODO improve below error explanation -->
     <string name="error__invalid_brainkey">Invalid account, please check your brainkey for typing errors</string>
     <string name="error__try_again">Please try again after 5 minutes</string>
@@ -36,6 +35,7 @@
     <string name="error__faucet">The server returned an error. This might be due to a limitation purposefully set in place to disallow frequent requests coming from the same IP address in a short time lapse. Please wait 5 minutes and try again, or switch to a different network, for example from wifi to cell.</string>
     <string name="error__faucet_template">The faucet returned an error. Msg: %1$s</string>
     <string name="error__created_account_not_found">The app could not retrieve information about the newly created account</string>
+    <string name="button__create">Create</string>
 
     <!-- Home -->
     <string name="title_transactions">Transactions</string>