From 05dc28aa6372f228292b6fc1feb993f2155da89e Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Wed, 24 Jan 2018 22:27:15 -0600
Subject: [PATCH] Created BottomStatusBar custom view and added it to Settings
 and CreateSeed Activities

---
 .../activities/SettingsActivity.java          |  5 ---
 app/src/main/res/layout/activity_settings.xml | 44 +++----------------
 app/src/main/res/layout/create_seed.xml       | 11 +++--
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
index 70f68aa..222c74a 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
@@ -84,11 +84,6 @@ public class SettingsActivity extends AppCompatActivity{
 
         mPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mPager));
-
-        // Automatically get build version from app information
-        String buildVersion = "v";
-        buildVersion += BuildConfig.VERSION_NAME;
-        tvBuildVersion.setText(buildVersion);
     }
 
     private class SettingsPagerAdapter extends FragmentStatePagerAdapter {
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 484c17d..2e76881 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -125,47 +125,13 @@
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@id/clBottomBanner"/>
+            android:layout_above="@id/bottomStatusBar"/>
 
-        <android.support.constraint.ConstraintLayout
-            android:id="@+id/clBottomBanner"
+        <cy.agorise.crystalwallet.util.BottomStatusBar
+            android:id="@+id/bottomStatusBar"
             android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:layout_alignParentBottom="true"
-            android:background="@color/gray">
-
-            <TextView
-                android:id="@+id/tvBuildVersion"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:text="@string/version_placeholder"
-                android:textSize="16sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/block_number_placeholder"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginEnd="24dp"
-                android:layout_marginTop="8dp"
-                android:src="@drawable/icon_connecting"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </android.support.constraint.ConstraintLayout>
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/create_seed.xml b/app/src/main/res/layout/create_seed.xml
index 1958f75..7a8b7cd 100644
--- a/app/src/main/res/layout/create_seed.xml
+++ b/app/src/main/res/layout/create_seed.xml
@@ -89,7 +89,7 @@
         android:text="@string/cancel"
         android:textColor="@color/white"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/linearLayout"
+        app:layout_constraintBottom_toTopOf="@+id/bottomStatusBar"
         app:layout_constraintStart_toStartOf="@id/tilAccountName"
         app:layout_constraintTop_toBottomOf="@+id/tilAccountName" />
 
@@ -106,7 +106,7 @@
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="@id/tilAccountName"
         app:layout_constraintTop_toTopOf="@id/btnCancel" />
-
+<!--
     <LinearLayout
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
@@ -146,5 +146,10 @@
             android:src="@drawable/icon_setting"
             android:visibility="invisible" />
     </LinearLayout>
-
+-->
+    <cy.agorise.crystalwallet.util.BottomStatusBar
+        android:id="@+id/bottomStatusBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46b8d4e..37e81e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -498,4 +498,5 @@
     <string name="pattern">Pattern</string>
     <string name="new_user">New user?</string>
     <string name="existing_user">Existing user?</string>
+    <string name="connection_status">Connection status</string>
 </resources>