From 7bb451d409d5feec4f1a92511cd5c77d549a59fe Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Wed, 17 Jan 2018 22:15:50 -0600
Subject: [PATCH] Added below banner to SettingsActivity

---
 .../activities/SettingsActivity.java          |   2 +
 .../fragments/SecuritySettingsFragment.java   |  38 ++
 app/src/main/res/layout/activity_settings.xml |  56 ++-
 .../res/layout/fragment_accounts_settings.xml | 190 +++++-----
 .../res/layout/fragment_general_settings.xml  | 344 +++++++++---------
 .../res/layout/fragment_security_settings.xml |   7 +
 app/src/main/res/values/strings.xml           |   2 +-
 7 files changed, 372 insertions(+), 267 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
 create mode 100644 app/src/main/res/layout/fragment_security_settings.xml

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 5587815..69fce40 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
@@ -21,6 +21,7 @@ import cy.agorise.crystalwallet.fragments.AccountsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BalanceFragment;
 import cy.agorise.crystalwallet.fragments.GeneralSettingsFragment;
+import cy.agorise.crystalwallet.fragments.SecuritySettingsFragment;
 
 /**
  * Created by seven on 12/28/17.
@@ -91,6 +92,7 @@ public class SettingsActivity extends AppCompatActivity{
                 case 0:
                     return new GeneralSettingsFragment();
                 case 1:
+                    return new SecuritySettingsFragment();
                 case 2:
                     return new BackupsSettingsFragment();
                 case 3:
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
new file mode 100644
index 0000000..471200c
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
@@ -0,0 +1,38 @@
+package cy.agorise.crystalwallet.fragments;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import butterknife.ButterKnife;
+import cy.agorise.crystalwallet.R;
+
+/**
+ * Created by xd on 1/17/18.
+ */
+
+public class SecuritySettingsFragment extends Fragment {
+
+    public SecuritySettingsFragment() {
+        // Required empty public constructor
+    }
+
+    public static SecuritySettingsFragment newInstance() {
+        SecuritySettingsFragment fragment = new SecuritySettingsFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View v = inflater.inflate(R.layout.fragment_security_settings, container, false);
+        ButterKnife.bind(this, v);
+
+        return v;
+    }
+}
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index f030f1a..e3a44b9 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -12,7 +12,6 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="120dp"
-        android:fitsSystemWindows="true"
         android:background="@color/colorPrimary"
         app:theme="@style/AppTheme.AppBarOverlay">
 
@@ -20,7 +19,6 @@
             android:id="@+id/toolbar_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
             app:contentScrim="@color/transparent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:toolbarId="@+id/toolbar">
@@ -125,11 +123,57 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <!-- change height -->
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:layout_marginBottom="?attr/actionBarSize"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/clBottomBanner"/>
+
+        <android.support.constraint.ConstraintLayout
+            android:id="@+id/clBottomBanner"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:layout_alignParentBottom="true"
+            android:background="@color/gray">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:text="v2.0.0"
+                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="block# 14966596"
+                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>
+
+    </RelativeLayout>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_accounts_settings.xml b/app/src/main/res/layout/fragment_accounts_settings.xml
index c9ba6b6..e06f240 100644
--- a/app/src/main/res/layout/fragment_accounts_settings.xml
+++ b/app/src/main/res/layout/fragment_accounts_settings.xml
@@ -1,106 +1,114 @@
 <?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="match_parent">
 
-    <TextView
-        android:id="@+id/tvUpgrade"
-        android:layout_width="0dp"
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginTop="32dp"
-        android:text="@string/upgrade_description"
-        android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        android:paddingBottom="20dp">
 
-    <Button
-        android:id="@+id/btnUpgrade"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        style="@style/Widget.Button"
-        android:text="@string/upgrade"
-        android:textStyle="bold"
-        android:textColor="@color/white"
-        android:background="@color/colorPrimary"
-        app:layout_constraintTop_toBottomOf="@id/tvUpgrade"
-        app:layout_constraintStart_toStartOf="@id/tvUpgrade" />
+        <TextView
+            android:id="@+id/tvUpgrade"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginTop="32dp"
+            android:text="@string/upgrade_description"
+            android:textSize="15sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
-    <TextView
-        android:id="@+id/tvImport"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="@string/import_description"
-        android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="@id/tvUpgrade"
-        app:layout_constraintTop_toBottomOf="@id/btnUpgrade"
-        app:layout_constraintEnd_toEndOf="@id/tvUpgrade"/>
+        <Button
+            android:id="@+id/btnUpgrade"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            style="@style/Widget.Button"
+            android:text="@string/upgrade"
+            android:textStyle="bold"
+            android:textColor="@color/white"
+            android:background="@color/colorPrimary"
+            app:layout_constraintTop_toBottomOf="@id/tvUpgrade"
+            app:layout_constraintStart_toStartOf="@id/tvUpgrade" />
 
-    <Button
-        android:id="@+id/btnImport"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        style="@style/Widget.Button"
-        android:text="@string/import_"
-        android:textStyle="bold"
-        android:textColor="@color/white"
-        android:background="@color/colorPrimary"
-        app:layout_constraintTop_toBottomOf="@id/tvImport"
-        app:layout_constraintStart_toStartOf="@id/btnUpgrade" />
+        <TextView
+            android:id="@+id/tvImport"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/import_description"
+            android:textSize="15sp"
+            app:layout_constraintStart_toStartOf="@id/tvUpgrade"
+            app:layout_constraintTop_toBottomOf="@id/btnUpgrade"
+            app:layout_constraintEnd_toEndOf="@id/tvUpgrade"/>
 
-    <TextView
-        android:id="@+id/tvRefresh"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="@string/refresh_description"
-        android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="@id/tvImport"
-        app:layout_constraintTop_toBottomOf="@id/btnImport"
-        app:layout_constraintEnd_toEndOf="@id/tvImport"/>
+        <Button
+            android:id="@+id/btnImport"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            style="@style/Widget.Button"
+            android:text="@string/import_"
+            android:textStyle="bold"
+            android:textColor="@color/white"
+            android:background="@color/colorPrimary"
+            app:layout_constraintTop_toBottomOf="@id/tvImport"
+            app:layout_constraintStart_toStartOf="@id/btnUpgrade" />
 
-    <Button
-        android:id="@+id/btnRefresh"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        style="@style/Widget.Button"
-        android:text="@string/refresh"
-        android:textStyle="bold"
-        android:textColor="@color/white"
-        android:background="@color/colorPrimary"
-        app:layout_constraintTop_toBottomOf="@id/tvRefresh"
-        app:layout_constraintStart_toStartOf="@id/btnImport" />
+        <TextView
+            android:id="@+id/tvRefresh"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/refresh_description"
+            android:textSize="15sp"
+            app:layout_constraintStart_toStartOf="@id/tvImport"
+            app:layout_constraintTop_toBottomOf="@id/btnImport"
+            app:layout_constraintEnd_toEndOf="@id/tvImport"/>
 
-    <TextView
-        android:id="@+id/tvRemove"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="@string/remove_description"
-        android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="@id/tvRefresh"
-        app:layout_constraintTop_toBottomOf="@id/btnRefresh"
-        app:layout_constraintEnd_toEndOf="@id/tvRefresh"/>
+        <Button
+            android:id="@+id/btnRefresh"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            style="@style/Widget.Button"
+            android:text="@string/refresh"
+            android:textStyle="bold"
+            android:textColor="@color/white"
+            android:background="@color/colorPrimary"
+            app:layout_constraintTop_toBottomOf="@id/tvRefresh"
+            app:layout_constraintStart_toStartOf="@id/btnImport" />
 
-    <Button
-        android:id="@+id/btnRemove"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        style="@style/Widget.Button"
-        android:text="@string/remove"
-        android:textStyle="bold"
-        android:textColor="@color/white"
-        android:background="@color/redcolor"
-        app:layout_constraintTop_toBottomOf="@id/tvRemove"
-        app:layout_constraintStart_toStartOf="@id/btnRefresh" />
+        <TextView
+            android:id="@+id/tvRemove"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/remove_description"
+            android:textSize="15sp"
+            app:layout_constraintStart_toStartOf="@id/tvRefresh"
+            app:layout_constraintTop_toBottomOf="@id/btnRefresh"
+            app:layout_constraintEnd_toEndOf="@id/tvRefresh"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/btnRemove"
+            style="@style/Widget.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:background="@color/redcolor"
+            android:text="@string/remove"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="@id/btnRefresh"
+            app:layout_constraintTop_toBottomOf="@id/tvRemove" />
+
+
+    </android.support.constraint.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_general_settings.xml b/app/src/main/res/layout/fragment_general_settings.xml
index e8edbba..6364bb0 100644
--- a/app/src/main/res/layout/fragment_general_settings.xml
+++ b/app/src/main/res/layout/fragment_general_settings.xml
@@ -1,193 +1,199 @@
 <?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"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/tvBackupAsset"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="16dp"
-        android:text="Backup Asset"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Spinner
-        android:id="@+id/spBackupAsset"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="32dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/tvBackupAsset"
-        app:layout_constraintTop_toBottomOf="@id/tvBackupAsset" />
-
-    <View
-        android:id="@+id/vBackupAsset"
+    <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="8dp"
-        android:background="@color/gray"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/spBackupAsset" />
-
-    <TextView
-        android:id="@+id/tvTaxableCountry"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="Taxable Country"
-        app:layout_constraintTop_toBottomOf="@id/vBackupAsset"
-        app:layout_constraintStart_toStartOf="@id/tvBackupAsset"/>
+        android:paddingBottom="20dp">
 
-    <Spinner
-        android:id="@+id/spTaxableCountry"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@+id/tvTaxableCountry"
-        app:layout_constraintStart_toStartOf="@id/spBackupAsset"
-        app:layout_constraintEnd_toEndOf="@id/spBackupAsset"/>
+        <TextView
+            android:id="@+id/tvBackupAsset"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginTop="16dp"
+            android:text="Backup Asset"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <View
-        android:id="@+id/vTaxableCountry"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="8dp"
-        android:background="@color/gray"
-        app:layout_constraintTop_toBottomOf="@id/spTaxableCountry"
-        app:layout_constraintStart_toStartOf="@id/vBackupAsset"
-        app:layout_constraintEnd_toEndOf="@id/vBackupAsset"/>
+        <Spinner
+            android:id="@+id/spBackupAsset"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="32dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/tvBackupAsset"
+            app:layout_constraintTop_toBottomOf="@id/tvBackupAsset" />
 
-    <TextView
-        android:id="@+id/tvPreferredLanguage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="Preferred Language"
-        app:layout_constraintStart_toStartOf="@id/tvTaxableCountry"
-        app:layout_constraintTop_toBottomOf="@id/vTaxableCountry"/>
+        <View
+            android:id="@+id/vBackupAsset"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginTop="8dp"
+            android:background="@color/gray"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/spBackupAsset" />
 
-    <Spinner
-        android:id="@+id/spPreferredLanguage"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/tvPreferredLanguage"
-        app:layout_constraintStart_toStartOf="@id/spTaxableCountry"
-        app:layout_constraintEnd_toEndOf="@id/spTaxableCountry"/>
+        <TextView
+            android:id="@+id/tvTaxableCountry"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="Taxable Country"
+            app:layout_constraintTop_toBottomOf="@id/vBackupAsset"
+            app:layout_constraintStart_toStartOf="@id/tvBackupAsset"/>
 
-    <View
-        android:id="@+id/vPreferredLanguage"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="8dp"
-        android:background="@color/gray"
-        app:layout_constraintTop_toBottomOf="@id/spPreferredLanguage"
-        app:layout_constraintStart_toStartOf="@id/vTaxableCountry"
-        app:layout_constraintEnd_toEndOf="@id/vTaxableCountry"/>
+        <Spinner
+            android:id="@+id/spTaxableCountry"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@+id/tvTaxableCountry"
+            app:layout_constraintStart_toStartOf="@id/spBackupAsset"
+            app:layout_constraintEnd_toEndOf="@id/spBackupAsset"/>
 
-    <TextView
-        android:id="@+id/tvDisplayDateTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="Display Dates and Times as"
-        app:layout_constraintTop_toBottomOf="@id/vPreferredLanguage"
-        app:layout_constraintStart_toStartOf="@id/tvPreferredLanguage"/>
+        <View
+            android:id="@+id/vTaxableCountry"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:background="@color/gray"
+            app:layout_constraintTop_toBottomOf="@id/spTaxableCountry"
+            app:layout_constraintStart_toStartOf="@id/vBackupAsset"
+            app:layout_constraintEnd_toEndOf="@id/vBackupAsset"/>
 
-    <Spinner
-        android:id="@+id/spDisplayDateTime"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/tvDisplayDateTime"
-        app:layout_constraintStart_toStartOf="@id/spPreferredLanguage"
-        app:layout_constraintEnd_toEndOf="@id/spPreferredLanguage"/>
+        <TextView
+            android:id="@+id/tvPreferredLanguage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="Preferred Language"
+            app:layout_constraintStart_toStartOf="@id/tvTaxableCountry"
+            app:layout_constraintTop_toBottomOf="@id/vTaxableCountry"/>
 
-    <View
-        android:id="@+id/vDisplayDateTime"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="8dp"
-        android:background="@color/gray"
-        app:layout_constraintTop_toBottomOf="@id/spDisplayDateTime"
-        app:layout_constraintStart_toStartOf="@id/vPreferredLanguage"
-        app:layout_constraintEnd_toEndOf="@id/vPreferredLanguage"/>
+        <Spinner
+            android:id="@+id/spPreferredLanguage"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@id/tvPreferredLanguage"
+            app:layout_constraintStart_toStartOf="@id/spTaxableCountry"
+            app:layout_constraintEnd_toEndOf="@id/spTaxableCountry"/>
 
-    <TextView
-        android:id="@+id/tvSound"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="Funds Received Sound"
-        app:layout_constraintTop_toBottomOf="@id/vDisplayDateTime"
-        app:layout_constraintStart_toStartOf="@id/tvDisplayDateTime" />
+        <View
+            android:id="@+id/vPreferredLanguage"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:background="@color/gray"
+            app:layout_constraintTop_toBottomOf="@id/spPreferredLanguage"
+            app:layout_constraintStart_toStartOf="@id/vTaxableCountry"
+            app:layout_constraintEnd_toEndOf="@id/vTaxableCountry"/>
 
-    <Spinner
-        android:id="@+id/spSound"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/tvSound"
-        app:layout_constraintStart_toStartOf="@id/spDisplayDateTime"
-        app:layout_constraintEnd_toEndOf="@id/spDisplayDateTime"/>
+        <TextView
+            android:id="@+id/tvDisplayDateTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="Display Dates and Times as"
+            app:layout_constraintTop_toBottomOf="@id/vPreferredLanguage"
+            app:layout_constraintStart_toStartOf="@id/tvPreferredLanguage"/>
 
-    <View
-        android:id="@+id/vSound"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="8dp"
-        android:background="@color/gray"
-        app:layout_constraintTop_toBottomOf="@id/spSound"
-        app:layout_constraintStart_toStartOf="@id/vDisplayDateTime"
-        app:layout_constraintEnd_toEndOf="@id/vDisplayDateTime"/>
+        <Spinner
+            android:id="@+id/spDisplayDateTime"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@id/tvDisplayDateTime"
+            app:layout_constraintStart_toStartOf="@id/spPreferredLanguage"
+            app:layout_constraintEnd_toEndOf="@id/spPreferredLanguage"/>
 
-    <TextView
-        android:id="@+id/tvCloseWalletTimer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:text="Close wallet after 3 min. of inactivity"
-        android:textSize="14sp"
-        android:textStyle="bold"
-        app:layout_constraintTop_toBottomOf="@id/vSound"
-        app:layout_constraintStart_toStartOf="@id/spSound" />
+        <View
+            android:id="@+id/vDisplayDateTime"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:background="@color/gray"
+            app:layout_constraintTop_toBottomOf="@id/spDisplayDateTime"
+            app:layout_constraintStart_toStartOf="@id/vPreferredLanguage"
+            app:layout_constraintEnd_toEndOf="@id/vPreferredLanguage"/>
 
-    <Switch
-        android:id="@+id/sCloseWalletTimer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@+id/tvCloseWalletTimer"
-        app:layout_constraintEnd_toEndOf="@id/vSound" />
+        <TextView
+            android:id="@+id/tvSound"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="Funds Received Sound"
+            app:layout_constraintTop_toBottomOf="@id/vDisplayDateTime"
+            app:layout_constraintStart_toStartOf="@id/tvDisplayDateTime" />
 
-    <TextView
-        android:id="@+id/tvBugsErrors"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="40dp"
-        android:text="Bugs or Errors? Let us know"
-        android:textSize="14sp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="@id/tvCloseWalletTimer"
-        app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer"/>
+        <Spinner
+            android:id="@+id/spSound"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@id/tvSound"
+            app:layout_constraintStart_toStartOf="@id/spDisplayDateTime"
+            app:layout_constraintEnd_toEndOf="@id/spDisplayDateTime"/>
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:text="CONTACT"
-        android:textStyle="bold"
-        android:textColor="@color/white"
-        android:background="@color/colorPrimary"
-        app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer"
-        app:layout_constraintEnd_toEndOf="@id/sCloseWalletTimer" />
+        <View
+            android:id="@+id/vSound"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:background="@color/gray"
+            app:layout_constraintTop_toBottomOf="@id/spSound"
+            app:layout_constraintStart_toStartOf="@id/vDisplayDateTime"
+            app:layout_constraintEnd_toEndOf="@id/vDisplayDateTime"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/tvCloseWalletTimer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="Close wallet after 3 min. of inactivity"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintTop_toBottomOf="@id/vSound"
+            app:layout_constraintStart_toStartOf="@id/spSound" />
+
+        <Switch
+            android:id="@+id/sCloseWalletTimer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="@+id/tvCloseWalletTimer"
+            app:layout_constraintEnd_toEndOf="@id/vSound" />
+
+        <TextView
+            android:id="@+id/tvBugsErrors"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="40dp"
+            android:text="Bugs or Errors? Let us know"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="@id/tvCloseWalletTimer"
+            app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer"/>
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:background="@color/colorPrimary"
+            android:text="CONTACT"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="@id/sCloseWalletTimer"
+            app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer" />
+
+    </android.support.constraint.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_security_settings.xml b/app/src/main/res/layout/fragment_security_settings.xml
new file mode 100644
index 0000000..d3a737e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_security_settings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7e30a5..af5eeb8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -482,7 +482,7 @@
     <string name="upgrade">Upgrade</string>
     <string name="import_description">Import Accounts. Import multiple accounts from blockchains such as Bitshares, Bitcoin, Steem, Dash and more.</string>
     <string name="import_">Import</string>
-    <string name="refresh_description">Refresh keys. Ony for bithsares accounts.</string>
+    <string name="refresh_description">Refresh keys. Ony for bitshares accounts.</string>
     <string name="refresh">Refresh</string>
     <string name="remove_description">Remove an account from this Wallet. The account removed will still reside on the blockchain.</string>
     <string name="remove">Remove</string>