From 718f7704652004adb9637374a4abb772192b3e26 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 9 Jan 2018 01:22:08 -0600
Subject: [PATCH 01/34] Changed Accounts from Fragment to Activity to use the
 SharedElementTransition

---
 app/src/main/AndroidManifest.xml              |   7 +
 .../activities/AccountsActivity.java          |  46 ++++++
 .../activities/BoardActivity.java             |  11 +-
 app/src/main/res/layout/activity_accounts.xml | 145 ++++++++++++++++++
 app/src/main/res/layout/board.xml             |   1 +
 .../res/transition/change_image_transform.xml |   4 +
 app/src/main/res/values/styles.xml            |   8 +
 7 files changed, 220 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
 create mode 100644 app/src/main/res/layout/activity_accounts.xml
 create mode 100644 app/src/main/res/transition/change_image_transform.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 240a2e3..71bf94d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,6 +35,13 @@
         <activity android:name=".activities.SettingsActivity"
             android:theme="@style/AppTheme.NoActionBar" >
         </activity>
+        <activity android:name=".activities.AccountsActivity"
+            android:theme="@style/AppTheme.Transparent"
+            android:parentActivityName=".activities.BoardActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activities.BoardActivity" />
+        </activity>
 
         <service android:name=".service.CrystalWalletService"
             android:exported="false"/>
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
new file mode 100644
index 0000000..71489e5
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
@@ -0,0 +1,46 @@
+package cy.agorise.crystalwallet.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.widget.TextView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import cy.agorise.crystalwallet.R;
+
+/**
+ * Created by xd on 1/9/18.
+ *
+ */
+
+public class AccountsActivity extends Activity{
+
+    @BindView(R.id.tvSettings)
+    TextView tvSettings;
+
+    @BindView(R.id.tvClose)
+    TextView tvClose;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_accounts);
+        ButterKnife.bind(this);
+
+    }
+
+    @OnClick(R.id.tvSettings)
+    public void onTvSettingsClick(){
+        onBackPressed();
+        Intent intent = new Intent(this, SettingsActivity.class);
+        startActivity(intent);
+    }
+
+    @OnClick(R.id.tvClose)
+    public void cancel(){
+        onBackPressed();
+    }
+}
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 1ee48f5..7bfb357 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -1,5 +1,6 @@
 package cy.agorise.crystalwallet.activities;
 
+import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.AnimationDrawable;
@@ -177,7 +178,7 @@ public class BoardActivity  extends AppCompatActivity {
      */
     @OnClick(R.id.toolbar_user_img)
     public void accounts() {
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        /*FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         Fragment prev = getSupportFragmentManager().findFragmentByTag("AccountsDialog");
         if (prev != null) {
             ft.remove(prev);
@@ -186,7 +187,13 @@ public class BoardActivity  extends AppCompatActivity {
 
         // Create and show the dialog.
         AccountsFragment newFragment = AccountsFragment.newInstance(this.cryptoNetAccountId);
-        newFragment.show(ft, "AccountsDialog");
+        newFragment.show(ft, "AccountsDialog");*/
+        Intent intent = new Intent(new Intent(this, AccountsActivity.class));
+
+        ActivityOptions options = ActivityOptions
+                .makeSceneTransitionAnimation(this, userImage, "gravatarTransition");
+        startActivity(intent, options.toBundle());
+        //startActivity(intent);
     }
 
     /*
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
new file mode 100644
index 0000000..f1d7d36
--- /dev/null
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -0,0 +1,145 @@
+<android.support.constraint.ConstraintLayout
+    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="wrap_content"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
+
+    <View
+        android:id="@+id/topView"
+        android:layout_width="match_parent"
+        android:background="@color/colorPrimary"
+        android:layout_height="120dp"
+        android:layout_marginEnd="0dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="45dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <cy.agorise.crystalwallet.util.CircularImageView
+        android:id="@+id/user_img"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
+        android:src="@drawable/ken_code_gravatar"
+        android:transitionName="gravatarTransition"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_width="24dp"
+        android:layout_height="45dp"
+        app:srcCompat="@drawable/ic_lightning_24dp"
+        app:layout_constraintStart_toStartOf="@id/user_img"
+        app:layout_constraintBottom_toBottomOf="@id/user_img"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/user_name_placeholder"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:layout_marginTop="20dp"
+        app:layout_constraintTop_toTopOf="@id/topView"
+        app:layout_constraintBottom_toBottomOf="@id/topView"
+        app:layout_constraintStart_toStartOf="@id/topView"
+        app:layout_constraintEnd_toEndOf="@id/topView"/>
+
+    <View
+        android:id="@+id/secondView"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/lightGray"
+        app:layout_constraintTop_toBottomOf="@id/topView"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/my_accounts"
+        android:textColor="@color/darkGray"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:layout_marginStart="32dp"
+        app:layout_constraintTop_toTopOf="@id/secondView"
+        app:layout_constraintStart_toStartOf="@id/secondView"
+        app:layout_constraintBottom_toBottomOf="@id/secondView"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fabAddAccount"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
+        app:fabSize="normal"
+        app:backgroundTint="@color/colorPrimary"
+        app:srcCompat="@drawable/ic_add_24dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="32dp"
+        app:layout_constraintTop_toTopOf="@id/secondView"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <View
+        android:id="@+id/thirdView"
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:background="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/secondView"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/dont_have_multiple_accounts"
+        android:textSize="16sp"
+        android:textAlignment="center"
+        android:layout_marginEnd="64dp"
+        android:layout_marginStart="64dp"
+        app:layout_constraintEnd_toEndOf="@id/thirdView"
+        app:layout_constraintStart_toStartOf="@id/thirdView"
+        app:layout_constraintTop_toTopOf="@id/thirdView"
+        app:layout_constraintBottom_toBottomOf="@id/thirdView"/>
+
+    <View
+        android:id="@+id/forthView"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:background="@color/lightGray"
+        app:layout_constraintTop_toBottomOf="@id/thirdView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <ImageView
+        android:id="@+id/ivSettings"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        app:srcCompat="@drawable/ic_settings_24dp"
+        android:layout_marginStart="24dp"
+        app:layout_constraintTop_toTopOf="@id/forthView"
+        app:layout_constraintBottom_toBottomOf="@id/forthView"
+        app:layout_constraintStart_toStartOf="@id/forthView"/>
+
+    <TextView
+        android:id="@+id/tvSettings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/settings"
+        android:textStyle="bold"
+        android:layout_marginStart="8dp"
+        app:layout_constraintStart_toEndOf="@id/ivSettings"
+        app:layout_constraintTop_toTopOf="@id/forthView"
+        app:layout_constraintBottom_toBottomOf="@id/forthView"/>
+
+    <TextView
+        android:id="@+id/tvClose"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/close"
+        android:textStyle="bold"
+        android:layout_marginEnd="24dp"
+        app:layout_constraintEnd_toEndOf="@id/forthView"
+        app:layout_constraintTop_toTopOf="@id/forthView"
+        app:layout_constraintBottom_toBottomOf="@id/forthView"/>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 31aa573..47c1b7c 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -65,6 +65,7 @@
                         android:layout_height="?attr/actionBarSize"
                         android:layout_marginEnd="32dp"
                         android:src="@drawable/ken_code_gravatar"
+                        android:transitionName="gravatarTransition"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/transition/change_image_transform.xml b/app/src/main/res/transition/change_image_transform.xml
new file mode 100644
index 0000000..c56e8c5
--- /dev/null
+++ b/app/src/main/res/transition/change_image_transform.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
+    <changeImageTransform />
+</transitionSet>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index be0ebc8..3eb5f25 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -34,6 +34,14 @@
         <item name="fontFamily">@font/opensans</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
     </style>
 
+    <style name="AppTheme.Transparent" parent="AppTheme">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>

From 0c2e2361efbe98bc6854950fa4b48325ce1e335a Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 11 Jan 2018 19:15:50 -0600
Subject: [PATCH 02/34] Step back to fix sharedelementtransition later

---
 .../activities/AccountsActivity.java          |   5 +-
 .../activities/BoardActivity.java             |  36 +--
 app/src/main/res/layout/activity_accounts.xml | 253 +++++++++---------
 app/src/main/res/layout/board.xml             |   2 +
 .../res/transition/change_image_transform.xml |   4 +-
 app/src/main/res/values/styles.xml            |  10 +
 6 files changed, 169 insertions(+), 141 deletions(-)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
index 71489e5..f0b0aa8 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
@@ -16,7 +16,7 @@ import cy.agorise.crystalwallet.R;
  *
  */
 
-public class AccountsActivity extends Activity{
+public class AccountsActivity extends Activity {
 
     @BindView(R.id.tvSettings)
     TextView tvSettings;
@@ -29,7 +29,6 @@ public class AccountsActivity extends Activity{
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_accounts);
         ButterKnife.bind(this);
-
     }
 
     @OnClick(R.id.tvSettings)
@@ -43,4 +42,4 @@ public class AccountsActivity extends Activity{
     public void cancel(){
         onBackPressed();
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 7bfb357..6ae880b 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -3,42 +3,40 @@ package cy.agorise.crystalwallet.activities;
 import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.graphics.drawable.AnimationDrawable;
 import android.media.MediaPlayer;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.PagerAdapter;
+import android.support.v4.util.Pair;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 
-import butterknife.BindColor;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import cy.agorise.crystalwallet.R;
-import cy.agorise.crystalwallet.fragments.AccountsFragment;
 import cy.agorise.crystalwallet.fragments.BalanceFragment;
 import cy.agorise.crystalwallet.fragments.ContactsFragment;
 import cy.agorise.crystalwallet.fragments.ReceiveTransactionFragment;
 import cy.agorise.crystalwallet.fragments.SendTransactionFragment;
 import cy.agorise.crystalwallet.fragments.TransactionsFragment;
+import cy.agorise.crystalwallet.util.CircularImageView;
 
 /**
  * Created by Henry Varona on 7/10/2017.
+ *
  */
 
 public class BoardActivity  extends AppCompatActivity {
@@ -70,7 +68,10 @@ public class BoardActivity  extends AppCompatActivity {
     public SurfaceView mSurfaceView;
 
     @BindView(R.id.toolbar_user_img)
-    public ImageView userImage;
+    public CircularImageView userImage;
+
+    @BindView(R.id.lightning)
+    public ImageView lightning;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -129,7 +130,7 @@ public class BoardActivity  extends AppCompatActivity {
 
         // Hide Add Contact fab, it won't hide until first page changed...
         // Convert 72dp to pixels (fab is 56dp in diameter + 16dp margin)
-        final int fabDistanceToHide = (int) (72 * Resources.getSystem().getDisplayMetrics().density);;
+        final int fabDistanceToHide = (int) (72 * Resources.getSystem().getDisplayMetrics().density);
         fabAddContact.animate().translationY(fabDistanceToHide)
                 .setInterpolator(new LinearInterpolator()).start();
 
@@ -188,18 +189,21 @@ public class BoardActivity  extends AppCompatActivity {
         // Create and show the dialog.
         AccountsFragment newFragment = AccountsFragment.newInstance(this.cryptoNetAccountId);
         newFragment.show(ft, "AccountsDialog");*/
-        Intent intent = new Intent(new Intent(this, AccountsActivity.class));
+        Intent intent = new Intent(this, AccountsActivity.class);
 
-        ActivityOptions options = ActivityOptions
+        Pair p1 = Pair.create(userImage, "gravatarTransition");
+        Pair p2 = Pair.create(lightning, "lightningTransition");
+
+        ActivityOptionsCompat options = ActivityOptionsCompat
                 .makeSceneTransitionAnimation(this, userImage, "gravatarTransition");
-        startActivity(intent, options.toBundle());
-        //startActivity(intent);
+        //ActivityCompat.startActivity(this, intent, options.toBundle());
+        startActivity(intent);
     }
 
     /*
      * dispatch the user to the receive fragment using this account
      */
-    public void receiveToThisAccount(){
+    public void receiveToThisAccount() {
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         Fragment prev = getSupportFragmentManager().findFragmentByTag("ReceiveDialog");
         if (prev != null) {
@@ -215,7 +219,7 @@ public class BoardActivity  extends AppCompatActivity {
     /*
      * dispatch the user to the send fragment using this account
      */
-    public void sendFromThisAccount(){
+    public void sendFromThisAccount() {
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         Fragment prev = getSupportFragmentManager().findFragmentByTag("SendDialog");
         if (prev != null) {
@@ -229,7 +233,7 @@ public class BoardActivity  extends AppCompatActivity {
     }
 
     private class BoardPagerAdapter extends FragmentStatePagerAdapter {
-        public BoardPagerAdapter(FragmentManager fm) {
+        BoardPagerAdapter(FragmentManager fm) {
             super(fm);
         }
 
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index f1d7d36..0cd3176 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -1,145 +1,156 @@
 <android.support.constraint.ConstraintLayout
     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="wrap_content"
+    android:layout_height="match_parent"
     android:paddingStart="16dp"
     android:paddingEnd="16dp">
 
-    <View
-        android:id="@+id/topView"
+    <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:background="@color/colorPrimary"
-        android:layout_height="120dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="45dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <cy.agorise.crystalwallet.util.CircularImageView
-        android:id="@+id/user_img"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:src="@drawable/ken_code_gravatar"
-        android:transitionName="gravatarTransition"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <View
+            android:id="@+id/topView"
+            android:layout_width="match_parent"
+            android:layout_height="120dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="45dp"
+            android:background="@color/colorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
-        android:layout_width="24dp"
-        android:layout_height="45dp"
-        app:srcCompat="@drawable/ic_lightning_24dp"
-        app:layout_constraintStart_toStartOf="@id/user_img"
-        app:layout_constraintBottom_toBottomOf="@id/user_img"/>
+        <cy.agorise.crystalwallet.util.CircularImageView
+            android:id="@+id/user_img"
+            android:layout_width="90dp"
+            android:layout_height="90dp"
+            android:src="@drawable/ken_code_gravatar"
+            android:transitionName="gravatarTransition"
+            app:layout_constraintEnd_toEndOf="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/user_name_placeholder"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:layout_marginTop="20dp"
-        app:layout_constraintTop_toTopOf="@id/topView"
-        app:layout_constraintBottom_toBottomOf="@id/topView"
-        app:layout_constraintStart_toStartOf="@id/topView"
-        app:layout_constraintEnd_toEndOf="@id/topView"/>
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="45dp"
+            app:layout_constraintBottom_toBottomOf="@id/user_img"
+            app:layout_constraintStart_toStartOf="@id/user_img"
+            app:srcCompat="@drawable/ic_lightning_24dp" />
 
-    <View
-        android:id="@+id/secondView"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@color/lightGray"
-        app:layout_constraintTop_toBottomOf="@id/topView"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="@string/user_name_placeholder"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/topView"
+            app:layout_constraintEnd_toEndOf="@id/topView"
+            app:layout_constraintStart_toStartOf="@id/topView"
+            app:layout_constraintTop_toTopOf="@id/topView" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/my_accounts"
-        android:textColor="@color/darkGray"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:layout_marginStart="32dp"
-        app:layout_constraintTop_toTopOf="@id/secondView"
-        app:layout_constraintStart_toStartOf="@id/secondView"
-        app:layout_constraintBottom_toBottomOf="@id/secondView"/>
+        <View
+            android:id="@+id/secondView"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@color/lightGray"
+            app:layout_constraintTop_toBottomOf="@id/topView" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fabAddAccount"
-        android:layout_width="55dp"
-        android:layout_height="55dp"
-        app:fabSize="normal"
-        app:backgroundTint="@color/colorPrimary"
-        app:srcCompat="@drawable/ic_add_24dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="32dp"
-        app:layout_constraintTop_toTopOf="@id/secondView"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:text="@string/my_accounts"
+            android:textColor="@color/darkGray"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/secondView"
+            app:layout_constraintStart_toStartOf="@id/secondView"
+            app:layout_constraintTop_toTopOf="@id/secondView" />
 
-    <View
-        android:id="@+id/thirdView"
-        android:layout_width="match_parent"
-        android:layout_height="250dp"
-        android:background="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/secondView"/>
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fabAddAccount"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginTop="12dp"
+            app:backgroundTint="@color/colorPrimary"
+            app:fabSize="normal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/secondView"
+            app:srcCompat="@drawable/ic_add_24dp" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/dont_have_multiple_accounts"
-        android:textSize="16sp"
-        android:textAlignment="center"
-        android:layout_marginEnd="64dp"
-        android:layout_marginStart="64dp"
-        app:layout_constraintEnd_toEndOf="@id/thirdView"
-        app:layout_constraintStart_toStartOf="@id/thirdView"
-        app:layout_constraintTop_toTopOf="@id/thirdView"
-        app:layout_constraintBottom_toBottomOf="@id/thirdView"/>
+        <View
+            android:id="@+id/thirdView"
+            android:layout_width="match_parent"
+            android:layout_height="250dp"
+            android:background="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/secondView" />
 
-    <View
-        android:id="@+id/forthView"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:background="@color/lightGray"
-        app:layout_constraintTop_toBottomOf="@id/thirdView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="64dp"
+            android:layout_marginStart="64dp"
+            android:text="@string/dont_have_multiple_accounts"
+            android:textAlignment="center"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="@id/thirdView"
+            app:layout_constraintEnd_toEndOf="@id/thirdView"
+            app:layout_constraintStart_toStartOf="@id/thirdView"
+            app:layout_constraintTop_toTopOf="@id/thirdView" />
 
-    <ImageView
-        android:id="@+id/ivSettings"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        app:srcCompat="@drawable/ic_settings_24dp"
-        android:layout_marginStart="24dp"
-        app:layout_constraintTop_toTopOf="@id/forthView"
-        app:layout_constraintBottom_toBottomOf="@id/forthView"
-        app:layout_constraintStart_toStartOf="@id/forthView"/>
+        <View
+            android:id="@+id/forthView"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:background="@color/lightGray"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/thirdView" />
 
-    <TextView
-        android:id="@+id/tvSettings"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/settings"
-        android:textStyle="bold"
-        android:layout_marginStart="8dp"
-        app:layout_constraintStart_toEndOf="@id/ivSettings"
-        app:layout_constraintTop_toTopOf="@id/forthView"
-        app:layout_constraintBottom_toBottomOf="@id/forthView"/>
+        <ImageView
+            android:id="@+id/ivSettings"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="24dp"
+            app:layout_constraintBottom_toBottomOf="@id/forthView"
+            app:layout_constraintStart_toStartOf="@id/forthView"
+            app:layout_constraintTop_toTopOf="@id/forthView"
+            app:srcCompat="@drawable/ic_settings_24dp" />
 
-    <TextView
-        android:id="@+id/tvClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/close"
-        android:textStyle="bold"
-        android:layout_marginEnd="24dp"
-        app:layout_constraintEnd_toEndOf="@id/forthView"
-        app:layout_constraintTop_toTopOf="@id/forthView"
-        app:layout_constraintBottom_toBottomOf="@id/forthView"/>
+        <TextView
+            android:id="@+id/tvSettings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="@string/settings"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/forthView"
+            app:layout_constraintStart_toEndOf="@id/ivSettings"
+            app:layout_constraintTop_toTopOf="@id/forthView" />
+
+        <TextView
+            android:id="@+id/tvClose"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:text="@string/close"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/forthView"
+            app:layout_constraintEnd_toEndOf="@id/forthView"
+            app:layout_constraintTop_toTopOf="@id/forthView" />
+
+    </android.support.constraint.ConstraintLayout>
 
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 47c1b7c..a226a85 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -71,9 +71,11 @@
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <ImageView
+                        android:id="@+id/lightning"
                         android:layout_width="16dp"
                         android:layout_height="30dp"
                         app:srcCompat="@drawable/ic_lightning_24dp"
+                        android:transitionName="lightningTransition"
                         android:contentDescription="@string/lightning_icon"
                         app:layout_constraintStart_toStartOf="@id/toolbar_user_img"
                         app:layout_constraintBottom_toBottomOf="@id/toolbar_user_img"/>
diff --git a/app/src/main/res/transition/change_image_transform.xml b/app/src/main/res/transition/change_image_transform.xml
index c56e8c5..655608d 100644
--- a/app/src/main/res/transition/change_image_transform.xml
+++ b/app/src/main/res/transition/change_image_transform.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
-    <changeImageTransform />
+    <changeImageTransform
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:duration="400"/>
 </transitionSet>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3eb5f25..7ab8ddb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -32,12 +32,22 @@
         <item name="android:colorButtonNormal">@color/white</item>
         <item name="android:fontFamily">@font/opensans</item>
         <item name="fontFamily">@font/opensans</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
+        <!-- enable window content transitions -->
+        <item name="android:windowContentTransitions">true</item>
+
+        <!-- specify shared element transitions -->
+        <item name="android:windowSharedElementEnterTransition">
+            @transition/change_image_transform</item>
+        <item name="android:windowSharedElementExitTransition">
+            @transition/change_image_transform</item>
+
     </style>
 
     <style name="AppTheme.Transparent" parent="AppTheme">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:backgroundDimEnabled">true</item>
     </style>

From 295a3738d6f2a341ab54c491d0a5f3287c2c3d97 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 11 Jan 2018 21:23:32 -0600
Subject: [PATCH 03/34] Finished adding elements to GeneralSettings layout

---
 .../res/layout/fragment_general_settings.xml  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/app/src/main/res/layout/fragment_general_settings.xml b/app/src/main/res/layout/fragment_general_settings.xml
index 0a58521..e8edbba 100644
--- a/app/src/main/res/layout/fragment_general_settings.xml
+++ b/app/src/main/res/layout/fragment_general_settings.xml
@@ -150,4 +150,44 @@
         app:layout_constraintStart_toStartOf="@id/vDisplayDateTime"
         app:layout_constraintEnd_toEndOf="@id/vDisplayDateTime"/>
 
+    <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: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" />
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 2312b667f7ef9dc9560a82f30b9c3b54672409e0 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 11 Jan 2018 22:30:45 -0600
Subject: [PATCH 04/34] Created BackupsSettingFragment layout

---
 .../activities/SettingsActivity.java          |  6 +-
 .../fragments/BackupsSettingsFragment.java    | 62 ++++++++++++++
 .../res/layout/fragment_backups_settings.xml  | 82 +++++++++++++++++++
 app/src/main/res/values/colors.xml            |  2 +-
 app/src/main/res/values/strings.xml           |  3 +
 5 files changed, 150 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java
 create mode 100644 app/src/main/res/layout/fragment_backups_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 54c7368..e90f86e 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
@@ -17,6 +17,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import cy.agorise.crystalwallet.R;
+import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BalanceFragment;
 import cy.agorise.crystalwallet.fragments.GeneralSettingsFragment;
 
@@ -88,12 +89,9 @@ public class SettingsActivity extends AppCompatActivity{
             switch (position){
                 case 0:
                     return new GeneralSettingsFragment();
-                /*case 1:
-                    return null;
-                case 2:
-                    return null;*/
                 case 1:
                 case 2:
+                    return new BackupsSettingsFragment();
                 case 3:
                     return new BalanceFragment();
             }
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java
new file mode 100644
index 0000000..7d8349e
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java
@@ -0,0 +1,62 @@
+package cy.agorise.crystalwallet.fragments;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cy.agorise.crystalwallet.R;
+
+/**
+ * Created by xd on 1/11/18.
+ */
+
+public class BackupsSettingsFragment extends Fragment{
+    public BackupsSettingsFragment() {
+        // Required empty public constructor
+    }
+
+    public static BackupsSettingsFragment newInstance() {
+        BackupsSettingsFragment fragment = new BackupsSettingsFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @BindView(R.id.tvBinFile)
+    public TextView tvBinFile;
+
+    @BindView(R.id.tvBrainkey)
+    public TextView tvBrainkey;
+
+    @BindView(R.id.tvWIFKey)
+    public TextView tvWIFKey;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View v = inflater.inflate(R.layout.fragment_backups_settings, container, false);
+        ButterKnife.bind(this, v);
+
+        tvBinFile.setText(makeFirstWordsBold(getResources().getString(R.string.bin_file_description)));
+        tvBrainkey.setText(makeFirstWordsBold(getResources().getString(R.string.brainkey_description)));
+        tvWIFKey.setText(makeFirstWordsBold(getResources().getString(R.string.wif_key_description)));
+
+        return v;
+    }
+
+    private SpannableStringBuilder makeFirstWordsBold(String str) {
+        SpannableStringBuilder ssb = new SpannableStringBuilder(str);
+        ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD),
+                0, str.indexOf('.')+1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        return ssb;
+    }
+}
diff --git a/app/src/main/res/layout/fragment_backups_settings.xml b/app/src/main/res/layout/fragment_backups_settings.xml
new file mode 100644
index 0000000..569a63c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_backups_settings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    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/tvBinFile"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginTop="32dp"
+        android:text="@string/bin_file_description"
+        android:textSize="15sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <Button
+        android:id="@+id/btnBinFile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:padding="8dp"
+        android:text="CREATE A BACKUP"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        android:background="@color/colorPrimary"
+        app:layout_constraintTop_toBottomOf="@id/tvBinFile"
+        app:layout_constraintStart_toStartOf="@id/tvBinFile" />
+
+    <TextView
+        android:id="@+id/tvBrainkey"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="@string/brainkey_description"
+        android:textSize="15sp"
+        app:layout_constraintStart_toStartOf="@id/tvBinFile"
+        app:layout_constraintEnd_toEndOf="@id/tvBinFile"
+        app:layout_constraintTop_toBottomOf="@id/btnBinFile"/>
+
+    <Button
+        android:id="@+id/btnBrainkey"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:padding="8dp"
+        android:text="View &amp; Copy"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        android:background="@color/colorPrimary"
+        app:layout_constraintStart_toStartOf="@id/btnBinFile"
+        app:layout_constraintTop_toBottomOf="@id/tvBrainkey"/>
+
+    <TextView
+        android:id="@+id/tvWIFKey"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="@string/wif_key_description"
+        android:textSize="15dp"
+        app:layout_constraintTop_toBottomOf="@id/btnBrainkey"
+        app:layout_constraintStart_toStartOf="@id/tvBrainkey"
+        app:layout_constraintEnd_toEndOf="@id/tvBrainkey" />
+
+    <Button
+        android:id="@+id/btnWIFKey"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:padding="8dp"
+        android:text="View &amp; Copy"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        android:background="@color/colorPrimary"
+        app:layout_constraintStart_toStartOf="@id/btnBrainkey"
+        app:layout_constraintTop_toBottomOf="@id/tvWIFKey"/>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dad7b53..fe57704 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,7 +2,7 @@
 <resources>
     <color name="colorPrimary">#0099d6</color>
     <color name="colorPrimaryDark">#0099d6</color>
-    <color name="colorAccent">#669900</color>
+    <color name="colorAccent">#0099d6</color>
     <color name="gray">#d3d3d3</color>
     <color name="darkGray">#686767</color>
     <color name="lightGray">#E3E3E3</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 84ccf5b..b663d75 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -473,4 +473,7 @@
     <string name="go_back_arrow">Go back arrow</string>
     <string name="settings2">Settings</string>
     <string name="info_icon">Info icon</string>
+    <string name="bin_file_description">Bin file. Always save your backup .bin file to a secret MicroSD card or USB Stick.</string>
+    <string name="brainkey_description">Brainkey. Account recovery words that can be captured or copied, but not edited.</string>
+    <string name="wif_key_description">WIF Key (Advanced). A long string of cryptic text that can be used with other Wallets.</string>
 </resources>

From 2635be7dc13930484fb757a446f0a4b03205a124 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 10:22:25 -0600
Subject: [PATCH 05/34] Fixed BackupsSettingsFragment buttons' padding and
 strings

---
 .../res/layout/fragment_backups_settings.xml    | 17 ++++++++++-------
 app/src/main/res/values/strings.xml             |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/fragment_backups_settings.xml b/app/src/main/res/layout/fragment_backups_settings.xml
index 569a63c..69474cb 100644
--- a/app/src/main/res/layout/fragment_backups_settings.xml
+++ b/app/src/main/res/layout/fragment_backups_settings.xml
@@ -23,8 +23,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:padding="8dp"
-        android:text="CREATE A BACKUP"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/create_a_backup"
         android:textStyle="bold"
         android:textColor="@color/white"
         android:background="@color/colorPrimary"
@@ -47,8 +48,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:padding="8dp"
-        android:text="View &amp; Copy"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/view_and_copy"
         android:textStyle="bold"
         android:textColor="@color/white"
         android:background="@color/colorPrimary"
@@ -61,7 +63,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:text="@string/wif_key_description"
-        android:textSize="15dp"
+        android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@id/btnBrainkey"
         app:layout_constraintStart_toStartOf="@id/tvBrainkey"
         app:layout_constraintEnd_toEndOf="@id/tvBrainkey" />
@@ -71,8 +73,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:padding="8dp"
-        android:text="View &amp; Copy"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/view_and_copy"
         android:textStyle="bold"
         android:textColor="@color/white"
         android:background="@color/colorPrimary"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b663d75..cb62013 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -476,4 +476,6 @@
     <string name="bin_file_description">Bin file. Always save your backup .bin file to a secret MicroSD card or USB Stick.</string>
     <string name="brainkey_description">Brainkey. Account recovery words that can be captured or copied, but not edited.</string>
     <string name="wif_key_description">WIF Key (Advanced). A long string of cryptic text that can be used with other Wallets.</string>
+    <string name="create_a_backup">CREATE A BACKUP</string>
+    <string name="view_and_copy"><![CDATA[View & Copy]]></string>
 </resources>

From c8b2f53d47b042e16e60e2f1f1a2552e113e69cc Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 11:05:53 -0600
Subject: [PATCH 06/34] Created AccountsSettingsFragment

---
 .../activities/SettingsActivity.java          |   3 +-
 .../fragments/AccountsSettingsFragment.java   |  66 +++++++++++
 .../res/layout/fragment_accounts_settings.xml | 110 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   8 ++
 4 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsSettingsFragment.java
 create mode 100644 app/src/main/res/layout/fragment_accounts_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 e90f86e..5587815 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
@@ -17,6 +17,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import cy.agorise.crystalwallet.R;
+import cy.agorise.crystalwallet.fragments.AccountsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BalanceFragment;
 import cy.agorise.crystalwallet.fragments.GeneralSettingsFragment;
@@ -93,7 +94,7 @@ public class SettingsActivity extends AppCompatActivity{
                 case 2:
                     return new BackupsSettingsFragment();
                 case 3:
-                    return new BalanceFragment();
+                    return new AccountsSettingsFragment();
             }
 
 
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsSettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsSettingsFragment.java
new file mode 100644
index 0000000..5a84c0d
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsSettingsFragment.java
@@ -0,0 +1,66 @@
+package cy.agorise.crystalwallet.fragments;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cy.agorise.crystalwallet.R;
+
+/**
+ * Created by xd on 1/16/18.
+ */
+
+public class AccountsSettingsFragment extends Fragment {
+    public AccountsSettingsFragment() {
+        // Required empty public constructor
+    }
+
+    public static AccountsSettingsFragment newInstance() {
+        AccountsSettingsFragment fragment = new AccountsSettingsFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @BindView(R.id.tvUpgrade)
+    public TextView tvUpgrade;
+
+    @BindView(R.id.tvImport)
+    public  TextView tvImport;
+
+    @BindView(R.id.tvRefresh)
+    public TextView tvRefresh;
+
+    @BindView(R.id.tvRemove)
+    public  TextView tvRemove;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View v = inflater.inflate(R.layout.fragment_accounts_settings, container, false);
+        ButterKnife.bind(this, v);
+
+        tvUpgrade.setText(makeFirstWordsBold(getResources().getString(R.string.upgrade_description)));
+        tvImport.setText(makeFirstWordsBold(getResources().getString(R.string.import_description)));
+        tvRefresh.setText(makeFirstWordsBold(getResources().getString(R.string.refresh_description)));
+        tvRemove.setText(makeFirstWordsBold(getResources().getString(R.string.remove_description)));
+
+        return v;
+    }
+
+    private SpannableStringBuilder makeFirstWordsBold(String str) {
+        SpannableStringBuilder ssb = new SpannableStringBuilder(str);
+        ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD),
+                0, str.indexOf('.')+1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        return ssb;
+    }
+}
diff --git a/app/src/main/res/layout/fragment_accounts_settings.xml b/app/src/main/res/layout/fragment_accounts_settings.xml
new file mode 100644
index 0000000..09f053b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_accounts_settings.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    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: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"/>
+
+    <Button
+        android:id="@+id/btnUpgrade"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        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/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/btnImport"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        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/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/btnRefresh"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        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/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/btnRemove"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        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" />
+
+</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 cb62013..d7e30a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -478,4 +478,12 @@
     <string name="wif_key_description">WIF Key (Advanced). A long string of cryptic text that can be used with other Wallets.</string>
     <string name="create_a_backup">CREATE A BACKUP</string>
     <string name="view_and_copy"><![CDATA[View & Copy]]></string>
+    <string name="upgrade_description">Upgrade to LifeTime Membership (LTM). Bitshares\' LTM accounts pay near-zero fees, get 80% cashback and bonuses for referrals.</string>
+    <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">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>
 </resources>

From 899d5fcc5370dab1b14e4fb9d38d06f15cd9a51b Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 11:56:49 -0600
Subject: [PATCH 07/34] Created buttons style to make them comply with Carbon's
 video

---
 .../main/res/layout/fragment_accounts_settings.xml   | 12 ++++--------
 .../main/res/layout/fragment_backups_settings.xml    |  9 +++------
 app/src/main/res/values/styles.xml                   |  9 +++++++++
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/fragment_accounts_settings.xml b/app/src/main/res/layout/fragment_accounts_settings.xml
index 09f053b..c9ba6b6 100644
--- a/app/src/main/res/layout/fragment_accounts_settings.xml
+++ b/app/src/main/res/layout/fragment_accounts_settings.xml
@@ -23,8 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/upgrade"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -48,8 +47,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/import_"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -73,8 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/refresh"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -98,8 +95,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/remove"
         android:textStyle="bold"
         android:textColor="@color/white"
diff --git a/app/src/main/res/layout/fragment_backups_settings.xml b/app/src/main/res/layout/fragment_backups_settings.xml
index 69474cb..f8377bf 100644
--- a/app/src/main/res/layout/fragment_backups_settings.xml
+++ b/app/src/main/res/layout/fragment_backups_settings.xml
@@ -23,8 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/create_a_backup"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -48,8 +47,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/view_and_copy"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -73,8 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/view_and_copy"
         android:textStyle="bold"
         android:textColor="@color/white"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7ab8ddb..a5ddb74 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -102,4 +102,13 @@
         <item name="android:windowEnterAnimation">@anim/accounts_in</item>
         <item name="android:windowExitAnimation">@anim/accounts_out</item>
     </style>
+
+    <style name="Widget.Button" parent="android:Widget.Button">
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
+        <item name="android:minHeight">16dp</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
 </resources>

From 9b07c5cb888f48b659c259b8f4d8fbcfaecc4f6f Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 17:26:35 -0600
Subject: [PATCH 08/34] Fixed AccountsFragment theme and almost fixed
 sharedElementTransition

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../activities/AccountsActivity.java          |  3 +-
 .../activities/BoardActivity.java             | 35 +++++++++----------
 .../fragments/AccountsFragment.java           |  2 +-
 app/src/main/res/anim/accounts_in.xml         |  2 +-
 app/src/main/res/layout/activity_accounts.xml |  1 +
 app/src/main/res/layout/board.xml             |  2 ++
 .../res/transition/change_image_transform.xml |  4 +--
 app/src/main/res/values/styles.xml            | 12 ++-----
 9 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 71bf94d..91baac3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
             android:theme="@style/AppTheme.NoActionBar" >
         </activity>
         <activity android:name=".activities.AccountsActivity"
-            android:theme="@style/AppTheme.Transparent"
+            android:theme="@style/ActivityDialog"
             android:parentActivityName=".activities.BoardActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
index f0b0aa8..10e001e 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 
 import butterknife.BindView;
@@ -16,7 +17,7 @@ import cy.agorise.crystalwallet.R;
  *
  */
 
-public class AccountsActivity extends Activity {
+public class AccountsActivity extends AppCompatActivity {
 
     @BindView(R.id.tvSettings)
     TextView tvSettings;
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 6ae880b..38a7678 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -7,16 +7,14 @@ import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.util.Pair;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.util.Pair;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
@@ -73,6 +71,9 @@ public class BoardActivity  extends AppCompatActivity {
     @BindView(R.id.lightning)
     public ImageView lightning;
 
+    @BindView(R.id.triangle)
+    public ImageView triangle;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -179,25 +180,21 @@ public class BoardActivity  extends AppCompatActivity {
      */
     @OnClick(R.id.toolbar_user_img)
     public void accounts() {
-        /*FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        Fragment prev = getSupportFragmentManager().findFragmentByTag("AccountsDialog");
-        if (prev != null) {
-            ft.remove(prev);
-        }
-        ft.addToBackStack(null);
-
-        // Create and show the dialog.
-        AccountsFragment newFragment = AccountsFragment.newInstance(this.cryptoNetAccountId);
-        newFragment.show(ft, "AccountsDialog");*/
         Intent intent = new Intent(this, AccountsActivity.class);
 
-        Pair p1 = Pair.create(userImage, "gravatarTransition");
-        Pair p2 = Pair.create(lightning, "lightningTransition");
+        // SharedElementTransition is only available from API level 21
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+            Pair p1 = Pair.create(userImage, "gravatarTransition");
+            Pair p2 = Pair.create(lightning, "lightningTransition");
+            Pair p3 = Pair.create(triangle, "triangleTransition");
 
-        ActivityOptionsCompat options = ActivityOptionsCompat
-                .makeSceneTransitionAnimation(this, userImage, "gravatarTransition");
-        //ActivityCompat.startActivity(this, intent, options.toBundle());
-        startActivity(intent);
+            ActivityOptions options = ActivityOptions
+                    .makeSceneTransitionAnimation(this, p1, p2, p3);
+
+            startActivity(intent, options.toBundle());
+        } else {
+            startActivity(intent);
+        }
     }
 
     /*
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java
index f0e3ae4..130cb2f 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java
@@ -53,7 +53,7 @@ public class AccountsFragment extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AccountsTheme);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
         LayoutInflater inflater = getActivity().getLayoutInflater();
         View view = inflater.inflate(R.layout.fragment_accounts, null);
diff --git a/app/src/main/res/anim/accounts_in.xml b/app/src/main/res/anim/accounts_in.xml
index e229b12..95d3c0d 100644
--- a/app/src/main/res/anim/accounts_in.xml
+++ b/app/src/main/res/anim/accounts_in.xml
@@ -2,7 +2,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false">
     <scale
-        android:interpolator="@android:anim/bounce_interpolator"
+        android:interpolator="@android:anim/anticipate_overshoot_interpolator"
         android:fromXScale="1.0"
         android:toXScale="1.0"
         android:fromYScale="0.0"
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index 0cd3176..8777d9f 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -40,6 +40,7 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="45dp"
+            android:transitionName="lightningTransition"
             app:layout_constraintBottom_toBottomOf="@id/user_img"
             app:layout_constraintStart_toStartOf="@id/user_img"
             app:srcCompat="@drawable/ic_lightning_24dp" />
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index a226a85..12507b1 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -81,9 +81,11 @@
                         app:layout_constraintBottom_toBottomOf="@id/toolbar_user_img"/>
 
                     <ImageView
+                        android:id="@+id/triangle"
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         app:srcCompat="@drawable/ic_arrow_24dp"
+                        android:transitionName="triangleTransition"
                         android:contentDescription="@string/small_triangle_icon"
                         app:layout_constraintEnd_toEndOf="@id/toolbar_user_img"
                         app:layout_constraintBottom_toBottomOf="@id/toolbar_user_img"/>
diff --git a/app/src/main/res/transition/change_image_transform.xml b/app/src/main/res/transition/change_image_transform.xml
index 655608d..459686a 100644
--- a/app/src/main/res/transition/change_image_transform.xml
+++ b/app/src/main/res/transition/change_image_transform.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
-    <changeImageTransform
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:duration="400"/>
+    <changeImageTransform/>
 </transitionSet>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a5ddb74..91f9541 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -35,19 +35,18 @@
         <!-- enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
 
-        <!-- specify shared element transitions -->
+        <!-- specify shared element transitions
         <item name="android:windowSharedElementEnterTransition">
             @transition/change_image_transform</item>
         <item name="android:windowSharedElementExitTransition">
-            @transition/change_image_transform</item>
+            @transition/change_image_transform</item> -->
 
     </style>
 
-    <style name="AppTheme.Transparent" parent="AppTheme">
+    <style name="ActivityDialog" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:backgroundDimEnabled">true</item>
     </style>
@@ -93,11 +92,6 @@
         <item name="android:windowExitAnimation">@anim/receive_transaction_out</item>
     </style>
 
-    <style name="AccountsTheme" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="android:windowBackground">@color/transparent</item>
-        <item name="android:windowAnimationStyle">@style/AccountsAnimation.Window</item>
-    </style>
-
     <style name="AccountsAnimation.Window" parent="@android:style/Animation.Activity">
         <item name="android:windowEnterAnimation">@anim/accounts_in</item>
         <item name="android:windowExitAnimation">@anim/accounts_out</item>

From db3c02d543f8738e4a8a83918d81f134d59889b7 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 23:38:04 -0600
Subject: [PATCH 09/34] Changed CircleImageView to make transition work

---
 app/build.gradle                                               | 1 +
 .../cy/agorise/crystalwallet/activities/BoardActivity.java     | 3 ++-
 app/src/main/res/layout/activity_accounts.xml                  | 2 +-
 app/src/main/res/layout/board.xml                              | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3e7bbbe..0a46832 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,6 +53,7 @@ dependencies {
     compile 'com.jakewharton:butterknife:8.8.1'
     compile 'com.github.bilthon:graphenej:0.4.6-alpha1'
     compile 'com.google.zxing:core:3.3.1'
+    compile 'de.hdodenhof:circleimageview:2.2.0'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 38a7678..73ac2d4 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -31,6 +31,7 @@ import cy.agorise.crystalwallet.fragments.ReceiveTransactionFragment;
 import cy.agorise.crystalwallet.fragments.SendTransactionFragment;
 import cy.agorise.crystalwallet.fragments.TransactionsFragment;
 import cy.agorise.crystalwallet.util.CircularImageView;
+import de.hdodenhof.circleimageview.CircleImageView;
 
 /**
  * Created by Henry Varona on 7/10/2017.
@@ -66,7 +67,7 @@ public class BoardActivity  extends AppCompatActivity {
     public SurfaceView mSurfaceView;
 
     @BindView(R.id.toolbar_user_img)
-    public CircularImageView userImage;
+    public CircleImageView userImage;
 
     @BindView(R.id.lightning)
     public ImageView lightning;
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index 8777d9f..f2dc015 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -27,7 +27,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <cy.agorise.crystalwallet.util.CircularImageView
+        <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/user_img"
             android:layout_width="90dp"
             android:layout_height="90dp"
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 12507b1..3880c02 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -59,7 +59,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <cy.agorise.crystalwallet.util.CircularImageView
+                    <de.hdodenhof.circleimageview.CircleImageView
                         android:id="@+id/toolbar_user_img"
                         android:layout_width="?attr/actionBarSize"
                         android:layout_height="?attr/actionBarSize"

From a8f93ada9b54aa01101b5cd7b89d79bac46731bc Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 23:45:49 -0600
Subject: [PATCH 10/34] Trick to make collapsingToolbarLayout look better when
 collapsed

---
 app/src/main/res/layout/board.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 3880c02..49f9d44 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -41,6 +41,7 @@
                 android:layout_height="?attr/actionBarSize"
                 android:background="@color/transparent"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="-20dp"
                 app:layout_collapseMode="none"
                 app:popupTheme="@style/AppTheme.PopupOverlay">
 

From 3b757ad55eba9582d58f87f6665d4d9ef987226c 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 11/34] 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>

From d7ce6e6088c592ae4f7a82f81f062a1b1244c685 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Wed, 17 Jan 2018 22:32:50 -0600
Subject: [PATCH 12/34] Improved SettingsActivity layout

---
 app/src/main/res/layout/activity_settings.xml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index e3a44b9..6bd5fc5 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -15,18 +15,14 @@
         android:background="@color/colorPrimary"
         app:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.design.widget.CollapsingToolbarLayout
-            android:id="@+id/toolbar_layout"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:contentScrim="@color/transparent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:toolbarId="@+id/toolbar">
+            android:layout_height="match_parent">
 
             <SurfaceView
                 android:id="@+id/surface_view"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"/>
 
             <View
                 android:layout_width="match_parent"
@@ -39,7 +35,6 @@
                 android:layout_height="?attr/actionBarSize"
                 android:background="@color/transparent"
                 android:layout_marginTop="8dp"
-                app:layout_collapseMode="none"
                 app:popupTheme="@style/AppTheme.PopupOverlay">
 
                 <android.support.constraint.ConstraintLayout
@@ -82,15 +77,13 @@
 
                 </android.support.constraint.ConstraintLayout>
 
-
             </android.support.v7.widget.Toolbar>
 
             <android.support.design.widget.TabLayout
                 android:id="@+id/tabs"
-                android:layout_gravity="bottom"
+                android:layout_alignParentBottom="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_collapseMode="pin"
                 android:animateLayoutChanges="true">
 
                 <android.support.design.widget.TabItem
@@ -119,14 +112,13 @@
 
             </android.support.design.widget.TabLayout>
 
-        </android.support.design.widget.CollapsingToolbarLayout>
+        </RelativeLayout>
 
     </android.support.design.widget.AppBarLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="?attr/actionBarSize"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <android.support.v4.view.ViewPager

From 72fc4d507a5aad5fa42b81f8dc2ad4734b72b134 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 18 Jan 2018 13:39:05 -0600
Subject: [PATCH 13/34] Added viewpager to work inside SecuritySettingsFragment

---
 .../fragments/SecuritySettingsFragment.java   |  44 ++++++++
 .../res/layout/fragment_security_settings.xml | 106 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   1 +
 3 files changed, 151 insertions(+)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
index 471200c..e47e8c3 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
@@ -1,11 +1,16 @@
 package cy.agorise.crystalwallet.fragments;
 
 import android.os.Bundle;
+import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import cy.agorise.crystalwallet.R;
 
@@ -26,6 +31,11 @@ public class SecuritySettingsFragment extends Fragment {
         return fragment;
     }
 
+    @BindView(R.id.pager)
+    public ViewPager mPager;
+
+    public SecurityPagerAdapter securityPagerAdapter;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -33,6 +43,40 @@ public class SecuritySettingsFragment extends Fragment {
         View v = inflater.inflate(R.layout.fragment_security_settings, container, false);
         ButterKnife.bind(this, v);
 
+        securityPagerAdapter = new SecurityPagerAdapter(getChildFragmentManager());
+        mPager.setAdapter(securityPagerAdapter);
+
+        TabLayout tabLayout = v.findViewById(R.id.tabs);
+
+        mPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+        tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mPager));
+
         return v;
     }
+
+    private class SecurityPagerAdapter extends FragmentPagerAdapter {
+        SecurityPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            switch (position){
+                case 0:
+                    //return new GeneralSettingsFragment();
+                case 1:
+                    //return new SecuritySettingsFragment();
+                case 2:
+                    return new BackupsSettingsFragment();
+            }
+
+
+            return null; //new OnConstructionFragment();
+        }
+
+        @Override
+        public int getCount() {
+            return 3;
+        }
+    }
 }
diff --git a/app/src/main/res/layout/fragment_security_settings.xml b/app/src/main/res/layout/fragment_security_settings.xml
index d3a737e..0e513fb 100644
--- a/app/src/main/res/layout/fragment_security_settings.xml
+++ b/app/src/main/res/layout/fragment_security_settings.xml
@@ -1,7 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
     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">
 
+    <android.support.design.widget.CoordinatorLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/vPocketSecurity">
+
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/lightGray"
+            app:theme="@style/AppTheme.AppBarOverlay">
+
+            <android.support.design.widget.TabLayout
+                android:id="@+id/tabs"
+                android:layout_alignParentBottom="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:tabTextColor="@color/black"
+                android:animateLayoutChanges="true">
+
+                <android.support.design.widget.TabItem
+                    android:id="@+id/tabNone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="None" />
+
+                <android.support.design.widget.TabItem
+                    android:id="@+id/tabPin"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Pin" />
+
+                <android.support.design.widget.TabItem
+                    android:id="@+id/tabPattern"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Pattern" />
+
+            </android.support.design.widget.TabLayout>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+    </android.support.design.widget.CoordinatorLayout>
+
+    <View
+        android:id="@+id/vPocketSecurity"
+        android:layout_width="match_parent"
+        android:layout_height="140dp"
+        android:background="@color/lightGray"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/tvPocketSecurity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginStart="24dp"
+        android:text="Use &quot;Pocket&quot; Security"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="@+id/vPocketSecurity"
+        app:layout_constraintStart_toStartOf="@id/vPocketSecurity"/>
+
+    <Switch
+        android:id="@+id/sPocketSecurity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="24dp"
+        app:layout_constraintTop_toTopOf="@+id/vPocketSecurity"
+        app:layout_constraintEnd_toEndOf="@id/vPocketSecurity" />
+
+    <TextView
+        android:id="@+id/tvPocketSecurityUser"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/user_name_password_placeholder"
+        tools:layout_editor_absoluteY="8dp"
+        app:layout_constraintTop_toBottomOf="@id/tvPocketSecurity"
+        app:layout_constraintStart_toStartOf="@id/tvPocketSecurity"/>
+    
+    <EditText
+        android:id="@+id/etPocketPassword"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tvPocketSecurityUser"
+        app:layout_constraintStart_toStartOf="@id/tvPocketSecurity"
+        app:layout_constraintEnd_toEndOf="@id/sPocketSecurity"/>
+
 </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 af5eeb8..85457e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -486,4 +486,5 @@
     <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>
+    <string name="user_name_password_placeholder">user_name Password</string>
 </resources>

From 8de7e59d01f392f74aa06b2a023d73640fa0843c Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 18 Jan 2018 16:11:54 -0600
Subject: [PATCH 14/34] Created PinSecurityFragment

---
 .../fragments/PinSecurityFragment.java        | 38 +++++++++++++++
 .../fragments/SecuritySettingsFragment.java   |  3 +-
 .../main/res/layout/fragment_pin_security.xml | 47 +++++++++++++++++++
 3 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/fragments/PinSecurityFragment.java
 create mode 100644 app/src/main/res/layout/fragment_pin_security.xml

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/PinSecurityFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/PinSecurityFragment.java
new file mode 100644
index 0000000..52e2c55
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/PinSecurityFragment.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/18/18.
+ */
+
+public class PinSecurityFragment extends Fragment {
+
+    public PinSecurityFragment() {
+        // Required empty public constructor
+    }
+
+    public static PinSecurityFragment newInstance() {
+        PinSecurityFragment fragment = new PinSecurityFragment();
+        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_pin_security, container, false);
+        ButterKnife.bind(this, v);
+
+        return v;
+    }
+}
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
index e47e8c3..c20e65d 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
@@ -65,12 +65,11 @@ public class SecuritySettingsFragment extends Fragment {
                 case 0:
                     //return new GeneralSettingsFragment();
                 case 1:
-                    //return new SecuritySettingsFragment();
+                    return new PinSecurityFragment();
                 case 2:
                     return new BackupsSettingsFragment();
             }
 
-
             return null; //new OnConstructionFragment();
         }
 
diff --git a/app/src/main/res/layout/fragment_pin_security.xml b/app/src/main/res/layout/fragment_pin_security.xml
new file mode 100644
index 0000000..2f70a6b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_pin_security.xml
@@ -0,0 +1,47 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:id="@+id/tvCurrentPin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="Current PIN"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <EditText
+        android:id="@+id/etCurrentPin"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:inputType="numberPassword"
+        app:layout_constraintTop_toBottomOf="@id/tvCurrentPin"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <EditText
+        android:id="@+id/etNewPin"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="New PIN"
+        android:inputType="numberPassword"
+        app:layout_constraintTop_toBottomOf="@+id/etCurrentPin"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <EditText
+        android:id="@+id/etConfirmPin"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="Confirm PIN"
+        android:inputType="numberPassword"
+        app:layout_constraintTop_toBottomOf="@+id/etNewPin"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 9ede134712bbec8c3e3fb2faaa2e58ecd14c5eb3 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 18 Jan 2018 16:19:24 -0600
Subject: [PATCH 15/34] Automatically get build version from app information

---
 .../crystalwallet/activities/SettingsActivity.java     | 10 ++++++++++
 app/src/main/res/layout/activity_settings.xml          |  1 +
 2 files changed, 11 insertions(+)

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 69fce40..70f68aa 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
@@ -12,10 +12,12 @@ import android.support.v7.widget.Toolbar;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import cy.agorise.crystalwallet.BuildConfig;
 import cy.agorise.crystalwallet.R;
 import cy.agorise.crystalwallet.fragments.AccountsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
@@ -41,6 +43,9 @@ public class SettingsActivity extends AppCompatActivity{
     @BindView(R.id.surface_view)
     public SurfaceView mSurfaceView;
 
+    @BindView(R.id.tvBuildVersion)
+    public TextView tvBuildVersion;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -79,6 +84,11 @@ 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 6bd5fc5..a53ac71 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -135,6 +135,7 @@
             android:background="@color/gray">
 
             <TextView
+                android:id="@+id/tvBuildVersion"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"

From 8d6c67cff2af470e43a51b3ef917d52564da7e9c Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 18 Jan 2018 17:12:45 -0600
Subject: [PATCH 16/34] Created ChildViewPager that does not listen to swipe
 events

---
 .../fragments/SecuritySettingsFragment.java   |  4 +-
 .../crystalwallet/util/ChildViewPager.java    | 48 +++++++++++++++++++
 app/src/main/res/layout/activity_settings.xml |  4 +-
 .../main/res/layout/fragment_pin_security.xml | 38 +++++++++------
 .../res/layout/fragment_security_settings.xml |  2 +-
 app/src/main/res/values/strings.xml           |  5 ++
 6 files changed, 83 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
index c20e65d..3850627 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
@@ -13,6 +13,7 @@ import android.view.ViewGroup;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import cy.agorise.crystalwallet.R;
+import cy.agorise.crystalwallet.util.ChildViewPager;
 
 /**
  * Created by xd on 1/17/18.
@@ -32,7 +33,7 @@ public class SecuritySettingsFragment extends Fragment {
     }
 
     @BindView(R.id.pager)
-    public ViewPager mPager;
+    public ChildViewPager mPager;
 
     public SecurityPagerAdapter securityPagerAdapter;
 
@@ -45,6 +46,7 @@ public class SecuritySettingsFragment extends Fragment {
 
         securityPagerAdapter = new SecurityPagerAdapter(getChildFragmentManager());
         mPager.setAdapter(securityPagerAdapter);
+        mPager.setSwipeLocked(true);
 
         TabLayout tabLayout = v.findViewById(R.id.tabs);
 
diff --git a/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java b/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
new file mode 100644
index 0000000..d01cbd5
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
@@ -0,0 +1,48 @@
+package cy.agorise.crystalwallet.util;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/**
+ * Created by xd on 1/18/18.
+ */
+
+
+public class ChildViewPager extends ViewPager {
+
+    private boolean swipeLocked;
+
+    public ChildViewPager(Context context) {
+        super(context);
+    }
+
+    public ChildViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public boolean getSwipeLocked() {
+        return swipeLocked;
+    }
+
+    public void setSwipeLocked(boolean swipeLocked) {
+        this.swipeLocked = swipeLocked;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return !swipeLocked && super.onTouchEvent(event);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        return !swipeLocked && super.onInterceptTouchEvent(event);
+    }
+
+    @Override
+    public boolean canScrollHorizontally(int direction) {
+        return !swipeLocked && super.canScrollHorizontally(direction);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index a53ac71..484c17d 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -139,7 +139,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:text="v2.0.0"
+                android:text="@string/version_placeholder"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -148,7 +148,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="block# 14966596"
+                android:text="@string/block_number_placeholder"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_pin_security.xml b/app/src/main/res/layout/fragment_pin_security.xml
index 2f70a6b..0fa46ce 100644
--- a/app/src/main/res/layout/fragment_pin_security.xml
+++ b/app/src/main/res/layout/fragment_pin_security.xml
@@ -1,47 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    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"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/tvCurrentPin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="Current PIN"
+        android:text="@string/current_pin"
+        app:layout_constraintBottom_toTopOf="@+id/etCurrentPin"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <EditText
         android:id="@+id/etCurrentPin"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:inputType="numberPassword"
-        app:layout_constraintTop_toBottomOf="@id/tvCurrentPin"
+        app:layout_constraintBottom_toTopOf="@+id/etNewPin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@+id/tvCurrentPin"
+        tools:ignore="LabelFor" />
 
     <EditText
         android:id="@+id/etNewPin"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:hint="New PIN"
+        android:hint="@string/new_pin"
         android:inputType="numberPassword"
-        app:layout_constraintTop_toBottomOf="@+id/etCurrentPin"
+        app:layout_constraintBottom_toTopOf="@+id/etConfirmPin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@+id/etCurrentPin" />
 
     <EditText
         android:id="@+id/etConfirmPin"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:hint="Confirm PIN"
+        android:hint="@string/confirm_pin"
         android:inputType="numberPassword"
-        app:layout_constraintTop_toBottomOf="@+id/etNewPin"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@+id/etNewPin" />
 
 </android.support.constraint.ConstraintLayout>
\ 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
index 0e513fb..0c2f9ce 100644
--- a/app/src/main/res/layout/fragment_security_settings.xml
+++ b/app/src/main/res/layout/fragment_security_settings.xml
@@ -54,7 +54,7 @@
 
         </android.support.design.widget.AppBarLayout>
 
-        <android.support.v4.view.ViewPager
+        <cy.agorise.crystalwallet.util.ChildViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85457e3..3dae003 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -487,4 +487,9 @@
     <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>
     <string name="user_name_password_placeholder">user_name Password</string>
+    <string name="version_placeholder">v1.0</string>
+    <string name="block_number_placeholder">block# 14966596</string>
+    <string name="current_pin">Current PIN</string>
+    <string name="new_pin">New PIN</string>
+    <string name="confirm_pin">Confirm PIN</string>
 </resources>

From 8192d9930134876ec2b3814d6ca720d00cc2ca5b Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Sun, 21 Jan 2018 14:57:09 -0600
Subject: [PATCH 17/34] Added NoneSecurityFragment

---
 .../fragments/NoneSecurityFragment.java       | 38 +++++++++++++++++++
 .../fragments/SecuritySettingsFragment.java   |  4 +-
 .../crystalwallet/util/ChildViewPager.java    |  3 +-
 .../res/layout/fragment_none_security.xml     | 20 ++++++++++
 .../res/layout/fragment_security_settings.xml | 13 ++++---
 app/src/main/res/values/strings.xml           |  4 ++
 6 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/fragments/NoneSecurityFragment.java
 create mode 100644 app/src/main/res/layout/fragment_none_security.xml

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/NoneSecurityFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/NoneSecurityFragment.java
new file mode 100644
index 0000000..a8cb92b
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/NoneSecurityFragment.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/18/18.
+ */
+
+public class NoneSecurityFragment extends Fragment {
+
+    public NoneSecurityFragment() {
+        // Required empty public constructor
+    }
+
+    public static NoneSecurityFragment newInstance() {
+        NoneSecurityFragment fragment = new NoneSecurityFragment();
+        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_none_security, container, false);
+        ButterKnife.bind(this, v);
+
+        return v;
+    }
+}
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
index 3850627..0407bcf 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
@@ -5,7 +5,6 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,6 +16,7 @@ import cy.agorise.crystalwallet.util.ChildViewPager;
 
 /**
  * Created by xd on 1/17/18.
+ * In this fragment the user should be able to select its preferred security option.
  */
 
 public class SecuritySettingsFragment extends Fragment {
@@ -65,7 +65,7 @@ public class SecuritySettingsFragment extends Fragment {
         public Fragment getItem(int position) {
             switch (position){
                 case 0:
-                    //return new GeneralSettingsFragment();
+                    return new NoneSecurityFragment();
                 case 1:
                     return new PinSecurityFragment();
                 case 2:
diff --git a/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java b/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
index d01cbd5..fbac369 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
@@ -7,6 +7,8 @@ import android.view.MotionEvent;
 
 /**
  * Created by xd on 1/18/18.
+ * This ViewPager is intended to be used inside another ViewPager therefore it has the
+ * setSwipeLocked which disables or enables the swipe gesture.
  */
 
 
@@ -44,5 +46,4 @@ public class ChildViewPager extends ViewPager {
     public boolean canScrollHorizontally(int direction) {
         return !swipeLocked && super.canScrollHorizontally(direction);
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_none_security.xml b/app/src/main/res/layout/fragment_none_security.xml
new file mode 100644
index 0000000..3c4da4e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_none_security.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    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:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="It is recommended to use some kind of security."
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</android.support.constraint.ConstraintLayout>
\ 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
index 0c2f9ce..a70a4e7 100644
--- a/app/src/main/res/layout/fragment_security_settings.xml
+++ b/app/src/main/res/layout/fragment_security_settings.xml
@@ -29,6 +29,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:tabSelectedTextColor="@color/black"
                 app:tabTextColor="@color/black"
                 android:animateLayoutChanges="true">
 
@@ -36,19 +37,19 @@
                     android:id="@+id/tabNone"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="None" />
+                    android:text="@string/none" />
 
                 <android.support.design.widget.TabItem
                     android:id="@+id/tabPin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Pin" />
+                    android:text="@string/pin" />
 
                 <android.support.design.widget.TabItem
                     android:id="@+id/tabPattern"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Pattern" />
+                    android:text="@string/pattern" />
 
             </android.support.design.widget.TabLayout>
 
@@ -77,7 +78,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:layout_marginStart="24dp"
-        android:text="Use &quot;Pocket&quot; Security"
+        android:text="@string/use_pocket_security"
         android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="@+id/vPocketSecurity"
@@ -106,8 +107,10 @@
         android:id="@+id/etPocketPassword"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:inputType="numberPassword"
         app:layout_constraintTop_toBottomOf="@id/tvPocketSecurityUser"
         app:layout_constraintStart_toStartOf="@id/tvPocketSecurity"
-        app:layout_constraintEnd_toEndOf="@id/sPocketSecurity"/>
+        app:layout_constraintEnd_toEndOf="@id/sPocketSecurity"
+        tools:ignore="LabelFor" />
 
 </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 3dae003..4829431 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -492,4 +492,8 @@
     <string name="current_pin">Current PIN</string>
     <string name="new_pin">New PIN</string>
     <string name="confirm_pin">Confirm PIN</string>
+    <string name="use_pocket_security">Use \"Pocket\" Security</string>
+    <string name="none">None</string>
+    <string name="pin">Pin</string>
+    <string name="pattern">Pattern</string>
 </resources>

From 4980700366894d4ef5dd4bb5a51c6bcea839704a Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 9 Jan 2018 01:22:08 -0600
Subject: [PATCH 18/34] Changed Accounts from Fragment to Activity to use the
 SharedElementTransition

---
 app/src/main/AndroidManifest.xml              |   7 +
 .../activities/AccountsActivity.java          |  46 ++++++
 .../activities/BoardActivity.java             |  11 +-
 app/src/main/res/layout/activity_accounts.xml | 145 ++++++++++++++++++
 app/src/main/res/layout/board.xml             |   1 +
 .../res/transition/change_image_transform.xml |   4 +
 app/src/main/res/values/styles.xml            |   8 +
 7 files changed, 220 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
 create mode 100644 app/src/main/res/layout/activity_accounts.xml
 create mode 100644 app/src/main/res/transition/change_image_transform.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 453f8ae..21c88e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,6 +37,13 @@
         <activity android:name=".activities.SettingsActivity"
             android:theme="@style/AppTheme.NoActionBar" >
         </activity>
+        <activity android:name=".activities.AccountsActivity"
+            android:theme="@style/AppTheme.Transparent"
+            android:parentActivityName=".activities.BoardActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activities.BoardActivity" />
+        </activity>
 
         <service android:name=".service.CrystalWalletService"
             android:exported="false"/>
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
new file mode 100644
index 0000000..71489e5
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
@@ -0,0 +1,46 @@
+package cy.agorise.crystalwallet.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.widget.TextView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import cy.agorise.crystalwallet.R;
+
+/**
+ * Created by xd on 1/9/18.
+ *
+ */
+
+public class AccountsActivity extends Activity{
+
+    @BindView(R.id.tvSettings)
+    TextView tvSettings;
+
+    @BindView(R.id.tvClose)
+    TextView tvClose;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_accounts);
+        ButterKnife.bind(this);
+
+    }
+
+    @OnClick(R.id.tvSettings)
+    public void onTvSettingsClick(){
+        onBackPressed();
+        Intent intent = new Intent(this, SettingsActivity.class);
+        startActivity(intent);
+    }
+
+    @OnClick(R.id.tvClose)
+    public void cancel(){
+        onBackPressed();
+    }
+}
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 1ee48f5..7bfb357 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -1,5 +1,6 @@
 package cy.agorise.crystalwallet.activities;
 
+import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.AnimationDrawable;
@@ -177,7 +178,7 @@ public class BoardActivity  extends AppCompatActivity {
      */
     @OnClick(R.id.toolbar_user_img)
     public void accounts() {
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        /*FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         Fragment prev = getSupportFragmentManager().findFragmentByTag("AccountsDialog");
         if (prev != null) {
             ft.remove(prev);
@@ -186,7 +187,13 @@ public class BoardActivity  extends AppCompatActivity {
 
         // Create and show the dialog.
         AccountsFragment newFragment = AccountsFragment.newInstance(this.cryptoNetAccountId);
-        newFragment.show(ft, "AccountsDialog");
+        newFragment.show(ft, "AccountsDialog");*/
+        Intent intent = new Intent(new Intent(this, AccountsActivity.class));
+
+        ActivityOptions options = ActivityOptions
+                .makeSceneTransitionAnimation(this, userImage, "gravatarTransition");
+        startActivity(intent, options.toBundle());
+        //startActivity(intent);
     }
 
     /*
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
new file mode 100644
index 0000000..f1d7d36
--- /dev/null
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -0,0 +1,145 @@
+<android.support.constraint.ConstraintLayout
+    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="wrap_content"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
+
+    <View
+        android:id="@+id/topView"
+        android:layout_width="match_parent"
+        android:background="@color/colorPrimary"
+        android:layout_height="120dp"
+        android:layout_marginEnd="0dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="45dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <cy.agorise.crystalwallet.util.CircularImageView
+        android:id="@+id/user_img"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
+        android:src="@drawable/ken_code_gravatar"
+        android:transitionName="gravatarTransition"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_width="24dp"
+        android:layout_height="45dp"
+        app:srcCompat="@drawable/ic_lightning_24dp"
+        app:layout_constraintStart_toStartOf="@id/user_img"
+        app:layout_constraintBottom_toBottomOf="@id/user_img"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/user_name_placeholder"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:layout_marginTop="20dp"
+        app:layout_constraintTop_toTopOf="@id/topView"
+        app:layout_constraintBottom_toBottomOf="@id/topView"
+        app:layout_constraintStart_toStartOf="@id/topView"
+        app:layout_constraintEnd_toEndOf="@id/topView"/>
+
+    <View
+        android:id="@+id/secondView"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/lightGray"
+        app:layout_constraintTop_toBottomOf="@id/topView"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/my_accounts"
+        android:textColor="@color/darkGray"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:layout_marginStart="32dp"
+        app:layout_constraintTop_toTopOf="@id/secondView"
+        app:layout_constraintStart_toStartOf="@id/secondView"
+        app:layout_constraintBottom_toBottomOf="@id/secondView"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fabAddAccount"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
+        app:fabSize="normal"
+        app:backgroundTint="@color/colorPrimary"
+        app:srcCompat="@drawable/ic_add_24dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="32dp"
+        app:layout_constraintTop_toTopOf="@id/secondView"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <View
+        android:id="@+id/thirdView"
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:background="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/secondView"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/dont_have_multiple_accounts"
+        android:textSize="16sp"
+        android:textAlignment="center"
+        android:layout_marginEnd="64dp"
+        android:layout_marginStart="64dp"
+        app:layout_constraintEnd_toEndOf="@id/thirdView"
+        app:layout_constraintStart_toStartOf="@id/thirdView"
+        app:layout_constraintTop_toTopOf="@id/thirdView"
+        app:layout_constraintBottom_toBottomOf="@id/thirdView"/>
+
+    <View
+        android:id="@+id/forthView"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:background="@color/lightGray"
+        app:layout_constraintTop_toBottomOf="@id/thirdView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <ImageView
+        android:id="@+id/ivSettings"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        app:srcCompat="@drawable/ic_settings_24dp"
+        android:layout_marginStart="24dp"
+        app:layout_constraintTop_toTopOf="@id/forthView"
+        app:layout_constraintBottom_toBottomOf="@id/forthView"
+        app:layout_constraintStart_toStartOf="@id/forthView"/>
+
+    <TextView
+        android:id="@+id/tvSettings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/settings"
+        android:textStyle="bold"
+        android:layout_marginStart="8dp"
+        app:layout_constraintStart_toEndOf="@id/ivSettings"
+        app:layout_constraintTop_toTopOf="@id/forthView"
+        app:layout_constraintBottom_toBottomOf="@id/forthView"/>
+
+    <TextView
+        android:id="@+id/tvClose"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/close"
+        android:textStyle="bold"
+        android:layout_marginEnd="24dp"
+        app:layout_constraintEnd_toEndOf="@id/forthView"
+        app:layout_constraintTop_toTopOf="@id/forthView"
+        app:layout_constraintBottom_toBottomOf="@id/forthView"/>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 31aa573..47c1b7c 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -65,6 +65,7 @@
                         android:layout_height="?attr/actionBarSize"
                         android:layout_marginEnd="32dp"
                         android:src="@drawable/ken_code_gravatar"
+                        android:transitionName="gravatarTransition"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/transition/change_image_transform.xml b/app/src/main/res/transition/change_image_transform.xml
new file mode 100644
index 0000000..c56e8c5
--- /dev/null
+++ b/app/src/main/res/transition/change_image_transform.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
+    <changeImageTransform />
+</transitionSet>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index be0ebc8..3eb5f25 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -34,6 +34,14 @@
         <item name="fontFamily">@font/opensans</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
     </style>
 
+    <style name="AppTheme.Transparent" parent="AppTheme">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>

From 4638425b641e165130d18408a7b53f2ad5871db7 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 11 Jan 2018 19:15:50 -0600
Subject: [PATCH 19/34] Step back to fix sharedelementtransition later

---
 .../activities/AccountsActivity.java          |   5 +-
 .../activities/BoardActivity.java             |  36 +--
 app/src/main/res/layout/activity_accounts.xml | 253 +++++++++---------
 app/src/main/res/layout/board.xml             |   2 +
 .../res/transition/change_image_transform.xml |   4 +-
 app/src/main/res/values/styles.xml            |  10 +
 6 files changed, 169 insertions(+), 141 deletions(-)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
index 71489e5..f0b0aa8 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
@@ -16,7 +16,7 @@ import cy.agorise.crystalwallet.R;
  *
  */
 
-public class AccountsActivity extends Activity{
+public class AccountsActivity extends Activity {
 
     @BindView(R.id.tvSettings)
     TextView tvSettings;
@@ -29,7 +29,6 @@ public class AccountsActivity extends Activity{
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_accounts);
         ButterKnife.bind(this);
-
     }
 
     @OnClick(R.id.tvSettings)
@@ -43,4 +42,4 @@ public class AccountsActivity extends Activity{
     public void cancel(){
         onBackPressed();
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 7bfb357..6ae880b 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -3,42 +3,40 @@ package cy.agorise.crystalwallet.activities;
 import android.app.ActivityOptions;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.graphics.drawable.AnimationDrawable;
 import android.media.MediaPlayer;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.PagerAdapter;
+import android.support.v4.util.Pair;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 
-import butterknife.BindColor;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import cy.agorise.crystalwallet.R;
-import cy.agorise.crystalwallet.fragments.AccountsFragment;
 import cy.agorise.crystalwallet.fragments.BalanceFragment;
 import cy.agorise.crystalwallet.fragments.ContactsFragment;
 import cy.agorise.crystalwallet.fragments.ReceiveTransactionFragment;
 import cy.agorise.crystalwallet.fragments.SendTransactionFragment;
 import cy.agorise.crystalwallet.fragments.TransactionsFragment;
+import cy.agorise.crystalwallet.util.CircularImageView;
 
 /**
  * Created by Henry Varona on 7/10/2017.
+ *
  */
 
 public class BoardActivity  extends AppCompatActivity {
@@ -70,7 +68,10 @@ public class BoardActivity  extends AppCompatActivity {
     public SurfaceView mSurfaceView;
 
     @BindView(R.id.toolbar_user_img)
-    public ImageView userImage;
+    public CircularImageView userImage;
+
+    @BindView(R.id.lightning)
+    public ImageView lightning;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -129,7 +130,7 @@ public class BoardActivity  extends AppCompatActivity {
 
         // Hide Add Contact fab, it won't hide until first page changed...
         // Convert 72dp to pixels (fab is 56dp in diameter + 16dp margin)
-        final int fabDistanceToHide = (int) (72 * Resources.getSystem().getDisplayMetrics().density);;
+        final int fabDistanceToHide = (int) (72 * Resources.getSystem().getDisplayMetrics().density);
         fabAddContact.animate().translationY(fabDistanceToHide)
                 .setInterpolator(new LinearInterpolator()).start();
 
@@ -188,18 +189,21 @@ public class BoardActivity  extends AppCompatActivity {
         // Create and show the dialog.
         AccountsFragment newFragment = AccountsFragment.newInstance(this.cryptoNetAccountId);
         newFragment.show(ft, "AccountsDialog");*/
-        Intent intent = new Intent(new Intent(this, AccountsActivity.class));
+        Intent intent = new Intent(this, AccountsActivity.class);
 
-        ActivityOptions options = ActivityOptions
+        Pair p1 = Pair.create(userImage, "gravatarTransition");
+        Pair p2 = Pair.create(lightning, "lightningTransition");
+
+        ActivityOptionsCompat options = ActivityOptionsCompat
                 .makeSceneTransitionAnimation(this, userImage, "gravatarTransition");
-        startActivity(intent, options.toBundle());
-        //startActivity(intent);
+        //ActivityCompat.startActivity(this, intent, options.toBundle());
+        startActivity(intent);
     }
 
     /*
      * dispatch the user to the receive fragment using this account
      */
-    public void receiveToThisAccount(){
+    public void receiveToThisAccount() {
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         Fragment prev = getSupportFragmentManager().findFragmentByTag("ReceiveDialog");
         if (prev != null) {
@@ -215,7 +219,7 @@ public class BoardActivity  extends AppCompatActivity {
     /*
      * dispatch the user to the send fragment using this account
      */
-    public void sendFromThisAccount(){
+    public void sendFromThisAccount() {
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         Fragment prev = getSupportFragmentManager().findFragmentByTag("SendDialog");
         if (prev != null) {
@@ -229,7 +233,7 @@ public class BoardActivity  extends AppCompatActivity {
     }
 
     private class BoardPagerAdapter extends FragmentStatePagerAdapter {
-        public BoardPagerAdapter(FragmentManager fm) {
+        BoardPagerAdapter(FragmentManager fm) {
             super(fm);
         }
 
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index f1d7d36..0cd3176 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -1,145 +1,156 @@
 <android.support.constraint.ConstraintLayout
     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="wrap_content"
+    android:layout_height="match_parent"
     android:paddingStart="16dp"
     android:paddingEnd="16dp">
 
-    <View
-        android:id="@+id/topView"
+    <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:background="@color/colorPrimary"
-        android:layout_height="120dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="45dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <cy.agorise.crystalwallet.util.CircularImageView
-        android:id="@+id/user_img"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:src="@drawable/ken_code_gravatar"
-        android:transitionName="gravatarTransition"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <View
+            android:id="@+id/topView"
+            android:layout_width="match_parent"
+            android:layout_height="120dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="45dp"
+            android:background="@color/colorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
-        android:layout_width="24dp"
-        android:layout_height="45dp"
-        app:srcCompat="@drawable/ic_lightning_24dp"
-        app:layout_constraintStart_toStartOf="@id/user_img"
-        app:layout_constraintBottom_toBottomOf="@id/user_img"/>
+        <cy.agorise.crystalwallet.util.CircularImageView
+            android:id="@+id/user_img"
+            android:layout_width="90dp"
+            android:layout_height="90dp"
+            android:src="@drawable/ken_code_gravatar"
+            android:transitionName="gravatarTransition"
+            app:layout_constraintEnd_toEndOf="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/user_name_placeholder"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:layout_marginTop="20dp"
-        app:layout_constraintTop_toTopOf="@id/topView"
-        app:layout_constraintBottom_toBottomOf="@id/topView"
-        app:layout_constraintStart_toStartOf="@id/topView"
-        app:layout_constraintEnd_toEndOf="@id/topView"/>
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="45dp"
+            app:layout_constraintBottom_toBottomOf="@id/user_img"
+            app:layout_constraintStart_toStartOf="@id/user_img"
+            app:srcCompat="@drawable/ic_lightning_24dp" />
 
-    <View
-        android:id="@+id/secondView"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@color/lightGray"
-        app:layout_constraintTop_toBottomOf="@id/topView"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="@string/user_name_placeholder"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/topView"
+            app:layout_constraintEnd_toEndOf="@id/topView"
+            app:layout_constraintStart_toStartOf="@id/topView"
+            app:layout_constraintTop_toTopOf="@id/topView" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/my_accounts"
-        android:textColor="@color/darkGray"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:layout_marginStart="32dp"
-        app:layout_constraintTop_toTopOf="@id/secondView"
-        app:layout_constraintStart_toStartOf="@id/secondView"
-        app:layout_constraintBottom_toBottomOf="@id/secondView"/>
+        <View
+            android:id="@+id/secondView"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@color/lightGray"
+            app:layout_constraintTop_toBottomOf="@id/topView" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fabAddAccount"
-        android:layout_width="55dp"
-        android:layout_height="55dp"
-        app:fabSize="normal"
-        app:backgroundTint="@color/colorPrimary"
-        app:srcCompat="@drawable/ic_add_24dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="32dp"
-        app:layout_constraintTop_toTopOf="@id/secondView"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:text="@string/my_accounts"
+            android:textColor="@color/darkGray"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/secondView"
+            app:layout_constraintStart_toStartOf="@id/secondView"
+            app:layout_constraintTop_toTopOf="@id/secondView" />
 
-    <View
-        android:id="@+id/thirdView"
-        android:layout_width="match_parent"
-        android:layout_height="250dp"
-        android:background="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/secondView"/>
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fabAddAccount"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginTop="12dp"
+            app:backgroundTint="@color/colorPrimary"
+            app:fabSize="normal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/secondView"
+            app:srcCompat="@drawable/ic_add_24dp" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/dont_have_multiple_accounts"
-        android:textSize="16sp"
-        android:textAlignment="center"
-        android:layout_marginEnd="64dp"
-        android:layout_marginStart="64dp"
-        app:layout_constraintEnd_toEndOf="@id/thirdView"
-        app:layout_constraintStart_toStartOf="@id/thirdView"
-        app:layout_constraintTop_toTopOf="@id/thirdView"
-        app:layout_constraintBottom_toBottomOf="@id/thirdView"/>
+        <View
+            android:id="@+id/thirdView"
+            android:layout_width="match_parent"
+            android:layout_height="250dp"
+            android:background="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/secondView" />
 
-    <View
-        android:id="@+id/forthView"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:background="@color/lightGray"
-        app:layout_constraintTop_toBottomOf="@id/thirdView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="64dp"
+            android:layout_marginStart="64dp"
+            android:text="@string/dont_have_multiple_accounts"
+            android:textAlignment="center"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="@id/thirdView"
+            app:layout_constraintEnd_toEndOf="@id/thirdView"
+            app:layout_constraintStart_toStartOf="@id/thirdView"
+            app:layout_constraintTop_toTopOf="@id/thirdView" />
 
-    <ImageView
-        android:id="@+id/ivSettings"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        app:srcCompat="@drawable/ic_settings_24dp"
-        android:layout_marginStart="24dp"
-        app:layout_constraintTop_toTopOf="@id/forthView"
-        app:layout_constraintBottom_toBottomOf="@id/forthView"
-        app:layout_constraintStart_toStartOf="@id/forthView"/>
+        <View
+            android:id="@+id/forthView"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:background="@color/lightGray"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/thirdView" />
 
-    <TextView
-        android:id="@+id/tvSettings"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/settings"
-        android:textStyle="bold"
-        android:layout_marginStart="8dp"
-        app:layout_constraintStart_toEndOf="@id/ivSettings"
-        app:layout_constraintTop_toTopOf="@id/forthView"
-        app:layout_constraintBottom_toBottomOf="@id/forthView"/>
+        <ImageView
+            android:id="@+id/ivSettings"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="24dp"
+            app:layout_constraintBottom_toBottomOf="@id/forthView"
+            app:layout_constraintStart_toStartOf="@id/forthView"
+            app:layout_constraintTop_toTopOf="@id/forthView"
+            app:srcCompat="@drawable/ic_settings_24dp" />
 
-    <TextView
-        android:id="@+id/tvClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/close"
-        android:textStyle="bold"
-        android:layout_marginEnd="24dp"
-        app:layout_constraintEnd_toEndOf="@id/forthView"
-        app:layout_constraintTop_toTopOf="@id/forthView"
-        app:layout_constraintBottom_toBottomOf="@id/forthView"/>
+        <TextView
+            android:id="@+id/tvSettings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="@string/settings"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/forthView"
+            app:layout_constraintStart_toEndOf="@id/ivSettings"
+            app:layout_constraintTop_toTopOf="@id/forthView" />
+
+        <TextView
+            android:id="@+id/tvClose"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
+            android:text="@string/close"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/forthView"
+            app:layout_constraintEnd_toEndOf="@id/forthView"
+            app:layout_constraintTop_toTopOf="@id/forthView" />
+
+    </android.support.constraint.ConstraintLayout>
 
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 47c1b7c..a226a85 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -71,9 +71,11 @@
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <ImageView
+                        android:id="@+id/lightning"
                         android:layout_width="16dp"
                         android:layout_height="30dp"
                         app:srcCompat="@drawable/ic_lightning_24dp"
+                        android:transitionName="lightningTransition"
                         android:contentDescription="@string/lightning_icon"
                         app:layout_constraintStart_toStartOf="@id/toolbar_user_img"
                         app:layout_constraintBottom_toBottomOf="@id/toolbar_user_img"/>
diff --git a/app/src/main/res/transition/change_image_transform.xml b/app/src/main/res/transition/change_image_transform.xml
index c56e8c5..655608d 100644
--- a/app/src/main/res/transition/change_image_transform.xml
+++ b/app/src/main/res/transition/change_image_transform.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
-    <changeImageTransform />
+    <changeImageTransform
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:duration="400"/>
 </transitionSet>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3eb5f25..7ab8ddb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -32,12 +32,22 @@
         <item name="android:colorButtonNormal">@color/white</item>
         <item name="android:fontFamily">@font/opensans</item>
         <item name="fontFamily">@font/opensans</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
+        <!-- enable window content transitions -->
+        <item name="android:windowContentTransitions">true</item>
+
+        <!-- specify shared element transitions -->
+        <item name="android:windowSharedElementEnterTransition">
+            @transition/change_image_transform</item>
+        <item name="android:windowSharedElementExitTransition">
+            @transition/change_image_transform</item>
+
     </style>
 
     <style name="AppTheme.Transparent" parent="AppTheme">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:backgroundDimEnabled">true</item>
     </style>

From f2019b1a62a9e7b56c86c3e114649394d5da2307 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 11 Jan 2018 21:23:32 -0600
Subject: [PATCH 20/34] Finished adding elements to GeneralSettings layout

---
 .../res/layout/fragment_general_settings.xml  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/app/src/main/res/layout/fragment_general_settings.xml b/app/src/main/res/layout/fragment_general_settings.xml
index 0a58521..e8edbba 100644
--- a/app/src/main/res/layout/fragment_general_settings.xml
+++ b/app/src/main/res/layout/fragment_general_settings.xml
@@ -150,4 +150,44 @@
         app:layout_constraintStart_toStartOf="@id/vDisplayDateTime"
         app:layout_constraintEnd_toEndOf="@id/vDisplayDateTime"/>
 
+    <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: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" />
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 4bec1dad847eb89549f4bcfbbd628913e6c1a5f2 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 11 Jan 2018 22:30:45 -0600
Subject: [PATCH 21/34] Created BackupsSettingFragment layout

---
 .../activities/SettingsActivity.java          |  6 +-
 .../fragments/BackupsSettingsFragment.java    | 62 ++++++++++++++
 .../res/layout/fragment_backups_settings.xml  | 82 +++++++++++++++++++
 app/src/main/res/values/colors.xml            |  2 +-
 app/src/main/res/values/strings.xml           |  3 +
 5 files changed, 150 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java
 create mode 100644 app/src/main/res/layout/fragment_backups_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 54c7368..e90f86e 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
@@ -17,6 +17,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import cy.agorise.crystalwallet.R;
+import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BalanceFragment;
 import cy.agorise.crystalwallet.fragments.GeneralSettingsFragment;
 
@@ -88,12 +89,9 @@ public class SettingsActivity extends AppCompatActivity{
             switch (position){
                 case 0:
                     return new GeneralSettingsFragment();
-                /*case 1:
-                    return null;
-                case 2:
-                    return null;*/
                 case 1:
                 case 2:
+                    return new BackupsSettingsFragment();
                 case 3:
                     return new BalanceFragment();
             }
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java
new file mode 100644
index 0000000..7d8349e
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java
@@ -0,0 +1,62 @@
+package cy.agorise.crystalwallet.fragments;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cy.agorise.crystalwallet.R;
+
+/**
+ * Created by xd on 1/11/18.
+ */
+
+public class BackupsSettingsFragment extends Fragment{
+    public BackupsSettingsFragment() {
+        // Required empty public constructor
+    }
+
+    public static BackupsSettingsFragment newInstance() {
+        BackupsSettingsFragment fragment = new BackupsSettingsFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @BindView(R.id.tvBinFile)
+    public TextView tvBinFile;
+
+    @BindView(R.id.tvBrainkey)
+    public TextView tvBrainkey;
+
+    @BindView(R.id.tvWIFKey)
+    public TextView tvWIFKey;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View v = inflater.inflate(R.layout.fragment_backups_settings, container, false);
+        ButterKnife.bind(this, v);
+
+        tvBinFile.setText(makeFirstWordsBold(getResources().getString(R.string.bin_file_description)));
+        tvBrainkey.setText(makeFirstWordsBold(getResources().getString(R.string.brainkey_description)));
+        tvWIFKey.setText(makeFirstWordsBold(getResources().getString(R.string.wif_key_description)));
+
+        return v;
+    }
+
+    private SpannableStringBuilder makeFirstWordsBold(String str) {
+        SpannableStringBuilder ssb = new SpannableStringBuilder(str);
+        ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD),
+                0, str.indexOf('.')+1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        return ssb;
+    }
+}
diff --git a/app/src/main/res/layout/fragment_backups_settings.xml b/app/src/main/res/layout/fragment_backups_settings.xml
new file mode 100644
index 0000000..569a63c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_backups_settings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    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/tvBinFile"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginTop="32dp"
+        android:text="@string/bin_file_description"
+        android:textSize="15sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <Button
+        android:id="@+id/btnBinFile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:padding="8dp"
+        android:text="CREATE A BACKUP"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        android:background="@color/colorPrimary"
+        app:layout_constraintTop_toBottomOf="@id/tvBinFile"
+        app:layout_constraintStart_toStartOf="@id/tvBinFile" />
+
+    <TextView
+        android:id="@+id/tvBrainkey"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="@string/brainkey_description"
+        android:textSize="15sp"
+        app:layout_constraintStart_toStartOf="@id/tvBinFile"
+        app:layout_constraintEnd_toEndOf="@id/tvBinFile"
+        app:layout_constraintTop_toBottomOf="@id/btnBinFile"/>
+
+    <Button
+        android:id="@+id/btnBrainkey"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:padding="8dp"
+        android:text="View &amp; Copy"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        android:background="@color/colorPrimary"
+        app:layout_constraintStart_toStartOf="@id/btnBinFile"
+        app:layout_constraintTop_toBottomOf="@id/tvBrainkey"/>
+
+    <TextView
+        android:id="@+id/tvWIFKey"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="@string/wif_key_description"
+        android:textSize="15dp"
+        app:layout_constraintTop_toBottomOf="@id/btnBrainkey"
+        app:layout_constraintStart_toStartOf="@id/tvBrainkey"
+        app:layout_constraintEnd_toEndOf="@id/tvBrainkey" />
+
+    <Button
+        android:id="@+id/btnWIFKey"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:padding="8dp"
+        android:text="View &amp; Copy"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        android:background="@color/colorPrimary"
+        app:layout_constraintStart_toStartOf="@id/btnBrainkey"
+        app:layout_constraintTop_toBottomOf="@id/tvWIFKey"/>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dad7b53..fe57704 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,7 +2,7 @@
 <resources>
     <color name="colorPrimary">#0099d6</color>
     <color name="colorPrimaryDark">#0099d6</color>
-    <color name="colorAccent">#669900</color>
+    <color name="colorAccent">#0099d6</color>
     <color name="gray">#d3d3d3</color>
     <color name="darkGray">#686767</color>
     <color name="lightGray">#E3E3E3</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 84ccf5b..b663d75 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -473,4 +473,7 @@
     <string name="go_back_arrow">Go back arrow</string>
     <string name="settings2">Settings</string>
     <string name="info_icon">Info icon</string>
+    <string name="bin_file_description">Bin file. Always save your backup .bin file to a secret MicroSD card or USB Stick.</string>
+    <string name="brainkey_description">Brainkey. Account recovery words that can be captured or copied, but not edited.</string>
+    <string name="wif_key_description">WIF Key (Advanced). A long string of cryptic text that can be used with other Wallets.</string>
 </resources>

From 132c7f1a29d6e07538a9f684e7253cc4176ef12c Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 10:22:25 -0600
Subject: [PATCH 22/34] Fixed BackupsSettingsFragment buttons' padding and
 strings

---
 .../res/layout/fragment_backups_settings.xml    | 17 ++++++++++-------
 app/src/main/res/values/strings.xml             |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/fragment_backups_settings.xml b/app/src/main/res/layout/fragment_backups_settings.xml
index 569a63c..69474cb 100644
--- a/app/src/main/res/layout/fragment_backups_settings.xml
+++ b/app/src/main/res/layout/fragment_backups_settings.xml
@@ -23,8 +23,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:padding="8dp"
-        android:text="CREATE A BACKUP"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/create_a_backup"
         android:textStyle="bold"
         android:textColor="@color/white"
         android:background="@color/colorPrimary"
@@ -47,8 +48,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:padding="8dp"
-        android:text="View &amp; Copy"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/view_and_copy"
         android:textStyle="bold"
         android:textColor="@color/white"
         android:background="@color/colorPrimary"
@@ -61,7 +63,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:text="@string/wif_key_description"
-        android:textSize="15dp"
+        android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@id/btnBrainkey"
         app:layout_constraintStart_toStartOf="@id/tvBrainkey"
         app:layout_constraintEnd_toEndOf="@id/tvBrainkey" />
@@ -71,8 +73,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:padding="8dp"
-        android:text="View &amp; Copy"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/view_and_copy"
         android:textStyle="bold"
         android:textColor="@color/white"
         android:background="@color/colorPrimary"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b663d75..cb62013 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -476,4 +476,6 @@
     <string name="bin_file_description">Bin file. Always save your backup .bin file to a secret MicroSD card or USB Stick.</string>
     <string name="brainkey_description">Brainkey. Account recovery words that can be captured or copied, but not edited.</string>
     <string name="wif_key_description">WIF Key (Advanced). A long string of cryptic text that can be used with other Wallets.</string>
+    <string name="create_a_backup">CREATE A BACKUP</string>
+    <string name="view_and_copy"><![CDATA[View & Copy]]></string>
 </resources>

From 312de0f74be715b4909d7afc5734298b6d4e3f04 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 11:05:53 -0600
Subject: [PATCH 23/34] Created AccountsSettingsFragment

---
 .../activities/SettingsActivity.java          |   3 +-
 .../fragments/AccountsSettingsFragment.java   |  66 +++++++++++
 .../res/layout/fragment_accounts_settings.xml | 110 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   8 ++
 4 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsSettingsFragment.java
 create mode 100644 app/src/main/res/layout/fragment_accounts_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 e90f86e..5587815 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
@@ -17,6 +17,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import cy.agorise.crystalwallet.R;
+import cy.agorise.crystalwallet.fragments.AccountsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BalanceFragment;
 import cy.agorise.crystalwallet.fragments.GeneralSettingsFragment;
@@ -93,7 +94,7 @@ public class SettingsActivity extends AppCompatActivity{
                 case 2:
                     return new BackupsSettingsFragment();
                 case 3:
-                    return new BalanceFragment();
+                    return new AccountsSettingsFragment();
             }
 
 
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsSettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsSettingsFragment.java
new file mode 100644
index 0000000..5a84c0d
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsSettingsFragment.java
@@ -0,0 +1,66 @@
+package cy.agorise.crystalwallet.fragments;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cy.agorise.crystalwallet.R;
+
+/**
+ * Created by xd on 1/16/18.
+ */
+
+public class AccountsSettingsFragment extends Fragment {
+    public AccountsSettingsFragment() {
+        // Required empty public constructor
+    }
+
+    public static AccountsSettingsFragment newInstance() {
+        AccountsSettingsFragment fragment = new AccountsSettingsFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @BindView(R.id.tvUpgrade)
+    public TextView tvUpgrade;
+
+    @BindView(R.id.tvImport)
+    public  TextView tvImport;
+
+    @BindView(R.id.tvRefresh)
+    public TextView tvRefresh;
+
+    @BindView(R.id.tvRemove)
+    public  TextView tvRemove;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View v = inflater.inflate(R.layout.fragment_accounts_settings, container, false);
+        ButterKnife.bind(this, v);
+
+        tvUpgrade.setText(makeFirstWordsBold(getResources().getString(R.string.upgrade_description)));
+        tvImport.setText(makeFirstWordsBold(getResources().getString(R.string.import_description)));
+        tvRefresh.setText(makeFirstWordsBold(getResources().getString(R.string.refresh_description)));
+        tvRemove.setText(makeFirstWordsBold(getResources().getString(R.string.remove_description)));
+
+        return v;
+    }
+
+    private SpannableStringBuilder makeFirstWordsBold(String str) {
+        SpannableStringBuilder ssb = new SpannableStringBuilder(str);
+        ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD),
+                0, str.indexOf('.')+1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        return ssb;
+    }
+}
diff --git a/app/src/main/res/layout/fragment_accounts_settings.xml b/app/src/main/res/layout/fragment_accounts_settings.xml
new file mode 100644
index 0000000..09f053b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_accounts_settings.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    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: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"/>
+
+    <Button
+        android:id="@+id/btnUpgrade"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        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/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/btnImport"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        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/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/btnRefresh"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        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/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/btnRemove"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        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" />
+
+</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 cb62013..d7e30a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -478,4 +478,12 @@
     <string name="wif_key_description">WIF Key (Advanced). A long string of cryptic text that can be used with other Wallets.</string>
     <string name="create_a_backup">CREATE A BACKUP</string>
     <string name="view_and_copy"><![CDATA[View & Copy]]></string>
+    <string name="upgrade_description">Upgrade to LifeTime Membership (LTM). Bitshares\' LTM accounts pay near-zero fees, get 80% cashback and bonuses for referrals.</string>
+    <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">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>
 </resources>

From a0db8f8a4fdd7e3318c99507da9019776e35ed96 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 11:56:49 -0600
Subject: [PATCH 24/34] Created buttons style to make them comply with Carbon's
 video

---
 .../main/res/layout/fragment_accounts_settings.xml   | 12 ++++--------
 .../main/res/layout/fragment_backups_settings.xml    |  9 +++------
 app/src/main/res/values/styles.xml                   |  9 +++++++++
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/fragment_accounts_settings.xml b/app/src/main/res/layout/fragment_accounts_settings.xml
index 09f053b..c9ba6b6 100644
--- a/app/src/main/res/layout/fragment_accounts_settings.xml
+++ b/app/src/main/res/layout/fragment_accounts_settings.xml
@@ -23,8 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/upgrade"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -48,8 +47,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/import_"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -73,8 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/refresh"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -98,8 +95,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/remove"
         android:textStyle="bold"
         android:textColor="@color/white"
diff --git a/app/src/main/res/layout/fragment_backups_settings.xml b/app/src/main/res/layout/fragment_backups_settings.xml
index 69474cb..f8377bf 100644
--- a/app/src/main/res/layout/fragment_backups_settings.xml
+++ b/app/src/main/res/layout/fragment_backups_settings.xml
@@ -23,8 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/create_a_backup"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -48,8 +47,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/view_and_copy"
         android:textStyle="bold"
         android:textColor="@color/white"
@@ -73,8 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        style="@style/Widget.Button"
         android:text="@string/view_and_copy"
         android:textStyle="bold"
         android:textColor="@color/white"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7ab8ddb..a5ddb74 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -102,4 +102,13 @@
         <item name="android:windowEnterAnimation">@anim/accounts_in</item>
         <item name="android:windowExitAnimation">@anim/accounts_out</item>
     </style>
+
+    <style name="Widget.Button" parent="android:Widget.Button">
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
+        <item name="android:minHeight">16dp</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
 </resources>

From 692a39d16e71e18fa315029776188de4c14dfce8 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 17:26:35 -0600
Subject: [PATCH 25/34] Fixed AccountsFragment theme and almost fixed
 sharedElementTransition

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../activities/AccountsActivity.java          |  3 +-
 .../activities/BoardActivity.java             | 35 +++++++++----------
 .../fragments/AccountsFragment.java           |  2 +-
 app/src/main/res/anim/accounts_in.xml         |  2 +-
 app/src/main/res/layout/activity_accounts.xml |  1 +
 app/src/main/res/layout/board.xml             |  2 ++
 .../res/transition/change_image_transform.xml |  4 +--
 app/src/main/res/values/styles.xml            | 12 ++-----
 9 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 21c88e0..ad92f17 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
             android:theme="@style/AppTheme.NoActionBar" >
         </activity>
         <activity android:name=".activities.AccountsActivity"
-            android:theme="@style/AppTheme.Transparent"
+            android:theme="@style/ActivityDialog"
             android:parentActivityName=".activities.BoardActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
index f0b0aa8..10e001e 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 
 import butterknife.BindView;
@@ -16,7 +17,7 @@ import cy.agorise.crystalwallet.R;
  *
  */
 
-public class AccountsActivity extends Activity {
+public class AccountsActivity extends AppCompatActivity {
 
     @BindView(R.id.tvSettings)
     TextView tvSettings;
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 6ae880b..38a7678 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -7,16 +7,14 @@ import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.util.Pair;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.util.Pair;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
@@ -73,6 +71,9 @@ public class BoardActivity  extends AppCompatActivity {
     @BindView(R.id.lightning)
     public ImageView lightning;
 
+    @BindView(R.id.triangle)
+    public ImageView triangle;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -179,25 +180,21 @@ public class BoardActivity  extends AppCompatActivity {
      */
     @OnClick(R.id.toolbar_user_img)
     public void accounts() {
-        /*FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        Fragment prev = getSupportFragmentManager().findFragmentByTag("AccountsDialog");
-        if (prev != null) {
-            ft.remove(prev);
-        }
-        ft.addToBackStack(null);
-
-        // Create and show the dialog.
-        AccountsFragment newFragment = AccountsFragment.newInstance(this.cryptoNetAccountId);
-        newFragment.show(ft, "AccountsDialog");*/
         Intent intent = new Intent(this, AccountsActivity.class);
 
-        Pair p1 = Pair.create(userImage, "gravatarTransition");
-        Pair p2 = Pair.create(lightning, "lightningTransition");
+        // SharedElementTransition is only available from API level 21
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+            Pair p1 = Pair.create(userImage, "gravatarTransition");
+            Pair p2 = Pair.create(lightning, "lightningTransition");
+            Pair p3 = Pair.create(triangle, "triangleTransition");
 
-        ActivityOptionsCompat options = ActivityOptionsCompat
-                .makeSceneTransitionAnimation(this, userImage, "gravatarTransition");
-        //ActivityCompat.startActivity(this, intent, options.toBundle());
-        startActivity(intent);
+            ActivityOptions options = ActivityOptions
+                    .makeSceneTransitionAnimation(this, p1, p2, p3);
+
+            startActivity(intent, options.toBundle());
+        } else {
+            startActivity(intent);
+        }
     }
 
     /*
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java
index f0e3ae4..130cb2f 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java
@@ -53,7 +53,7 @@ public class AccountsFragment extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AccountsTheme);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
         LayoutInflater inflater = getActivity().getLayoutInflater();
         View view = inflater.inflate(R.layout.fragment_accounts, null);
diff --git a/app/src/main/res/anim/accounts_in.xml b/app/src/main/res/anim/accounts_in.xml
index e229b12..95d3c0d 100644
--- a/app/src/main/res/anim/accounts_in.xml
+++ b/app/src/main/res/anim/accounts_in.xml
@@ -2,7 +2,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false">
     <scale
-        android:interpolator="@android:anim/bounce_interpolator"
+        android:interpolator="@android:anim/anticipate_overshoot_interpolator"
         android:fromXScale="1.0"
         android:toXScale="1.0"
         android:fromYScale="0.0"
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index 0cd3176..8777d9f 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -40,6 +40,7 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="45dp"
+            android:transitionName="lightningTransition"
             app:layout_constraintBottom_toBottomOf="@id/user_img"
             app:layout_constraintStart_toStartOf="@id/user_img"
             app:srcCompat="@drawable/ic_lightning_24dp" />
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index a226a85..12507b1 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -81,9 +81,11 @@
                         app:layout_constraintBottom_toBottomOf="@id/toolbar_user_img"/>
 
                     <ImageView
+                        android:id="@+id/triangle"
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         app:srcCompat="@drawable/ic_arrow_24dp"
+                        android:transitionName="triangleTransition"
                         android:contentDescription="@string/small_triangle_icon"
                         app:layout_constraintEnd_toEndOf="@id/toolbar_user_img"
                         app:layout_constraintBottom_toBottomOf="@id/toolbar_user_img"/>
diff --git a/app/src/main/res/transition/change_image_transform.xml b/app/src/main/res/transition/change_image_transform.xml
index 655608d..459686a 100644
--- a/app/src/main/res/transition/change_image_transform.xml
+++ b/app/src/main/res/transition/change_image_transform.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
-    <changeImageTransform
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:duration="400"/>
+    <changeImageTransform/>
 </transitionSet>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a5ddb74..91f9541 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -35,19 +35,18 @@
         <!-- enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
 
-        <!-- specify shared element transitions -->
+        <!-- specify shared element transitions
         <item name="android:windowSharedElementEnterTransition">
             @transition/change_image_transform</item>
         <item name="android:windowSharedElementExitTransition">
-            @transition/change_image_transform</item>
+            @transition/change_image_transform</item> -->
 
     </style>
 
-    <style name="AppTheme.Transparent" parent="AppTheme">
+    <style name="ActivityDialog" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:backgroundDimEnabled">true</item>
     </style>
@@ -93,11 +92,6 @@
         <item name="android:windowExitAnimation">@anim/receive_transaction_out</item>
     </style>
 
-    <style name="AccountsTheme" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="android:windowBackground">@color/transparent</item>
-        <item name="android:windowAnimationStyle">@style/AccountsAnimation.Window</item>
-    </style>
-
     <style name="AccountsAnimation.Window" parent="@android:style/Animation.Activity">
         <item name="android:windowEnterAnimation">@anim/accounts_in</item>
         <item name="android:windowExitAnimation">@anim/accounts_out</item>

From 76247e214a5ce30e8f08e8b703de65a4d51dd6e9 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 23:38:04 -0600
Subject: [PATCH 26/34] Changed CircleImageView to make transition work

---
 app/build.gradle                                               | 3 ++-
 .../cy/agorise/crystalwallet/activities/BoardActivity.java     | 3 ++-
 app/src/main/res/layout/activity_accounts.xml                  | 2 +-
 app/src/main/res/layout/board.xml                              | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1355a52..396043c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,9 +53,10 @@ dependencies {
     compile 'com.jakewharton:butterknife:8.8.1'
     compile 'com.github.bilthon:graphenej:0.4.6-alpha1'
     compile 'com.google.zxing:core:3.3.1'
-    compile 'me.dm7.barcodescanner:zxing:1.9.8';
+    compile 'me.dm7.barcodescanner:zxing:1.9.8'
 
     compile 'com.squareup.okhttp3:logging-interceptor:3.5.0'
+    compile 'de.hdodenhof:circleimageview:2.2.0'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 38a7678..73ac2d4 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -31,6 +31,7 @@ import cy.agorise.crystalwallet.fragments.ReceiveTransactionFragment;
 import cy.agorise.crystalwallet.fragments.SendTransactionFragment;
 import cy.agorise.crystalwallet.fragments.TransactionsFragment;
 import cy.agorise.crystalwallet.util.CircularImageView;
+import de.hdodenhof.circleimageview.CircleImageView;
 
 /**
  * Created by Henry Varona on 7/10/2017.
@@ -66,7 +67,7 @@ public class BoardActivity  extends AppCompatActivity {
     public SurfaceView mSurfaceView;
 
     @BindView(R.id.toolbar_user_img)
-    public CircularImageView userImage;
+    public CircleImageView userImage;
 
     @BindView(R.id.lightning)
     public ImageView lightning;
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index 8777d9f..f2dc015 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -27,7 +27,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <cy.agorise.crystalwallet.util.CircularImageView
+        <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/user_img"
             android:layout_width="90dp"
             android:layout_height="90dp"
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 12507b1..3880c02 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -59,7 +59,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <cy.agorise.crystalwallet.util.CircularImageView
+                    <de.hdodenhof.circleimageview.CircleImageView
                         android:id="@+id/toolbar_user_img"
                         android:layout_width="?attr/actionBarSize"
                         android:layout_height="?attr/actionBarSize"

From d7dcc6365baefd6b5ba60820c815e9b58cc0a4b8 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 16 Jan 2018 23:45:49 -0600
Subject: [PATCH 27/34] Trick to make collapsingToolbarLayout look better when
 collapsed

---
 app/src/main/res/layout/board.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 3880c02..49f9d44 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -41,6 +41,7 @@
                 android:layout_height="?attr/actionBarSize"
                 android:background="@color/transparent"
                 android:layout_marginTop="8dp"
+                android:layout_marginBottom="-20dp"
                 app:layout_collapseMode="none"
                 app:popupTheme="@style/AppTheme.PopupOverlay">
 

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 28/34] 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>

From c7890db12386ed2f6a4f1480f2605fd602a3764f Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Wed, 17 Jan 2018 22:32:50 -0600
Subject: [PATCH 29/34] Improved SettingsActivity layout

---
 app/src/main/res/layout/activity_settings.xml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index e3a44b9..6bd5fc5 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -15,18 +15,14 @@
         android:background="@color/colorPrimary"
         app:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.design.widget.CollapsingToolbarLayout
-            android:id="@+id/toolbar_layout"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:contentScrim="@color/transparent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:toolbarId="@+id/toolbar">
+            android:layout_height="match_parent">
 
             <SurfaceView
                 android:id="@+id/surface_view"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"/>
 
             <View
                 android:layout_width="match_parent"
@@ -39,7 +35,6 @@
                 android:layout_height="?attr/actionBarSize"
                 android:background="@color/transparent"
                 android:layout_marginTop="8dp"
-                app:layout_collapseMode="none"
                 app:popupTheme="@style/AppTheme.PopupOverlay">
 
                 <android.support.constraint.ConstraintLayout
@@ -82,15 +77,13 @@
 
                 </android.support.constraint.ConstraintLayout>
 
-
             </android.support.v7.widget.Toolbar>
 
             <android.support.design.widget.TabLayout
                 android:id="@+id/tabs"
-                android:layout_gravity="bottom"
+                android:layout_alignParentBottom="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_collapseMode="pin"
                 android:animateLayoutChanges="true">
 
                 <android.support.design.widget.TabItem
@@ -119,14 +112,13 @@
 
             </android.support.design.widget.TabLayout>
 
-        </android.support.design.widget.CollapsingToolbarLayout>
+        </RelativeLayout>
 
     </android.support.design.widget.AppBarLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="?attr/actionBarSize"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <android.support.v4.view.ViewPager

From c21fb6786f03c141fcfa4b1be712c4b79aeb9836 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 18 Jan 2018 13:39:05 -0600
Subject: [PATCH 30/34] Added viewpager to work inside SecuritySettingsFragment

---
 .../fragments/SecuritySettingsFragment.java   |  44 ++++++++
 .../res/layout/fragment_security_settings.xml | 106 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   1 +
 3 files changed, 151 insertions(+)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
index 471200c..e47e8c3 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
@@ -1,11 +1,16 @@
 package cy.agorise.crystalwallet.fragments;
 
 import android.os.Bundle;
+import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import cy.agorise.crystalwallet.R;
 
@@ -26,6 +31,11 @@ public class SecuritySettingsFragment extends Fragment {
         return fragment;
     }
 
+    @BindView(R.id.pager)
+    public ViewPager mPager;
+
+    public SecurityPagerAdapter securityPagerAdapter;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -33,6 +43,40 @@ public class SecuritySettingsFragment extends Fragment {
         View v = inflater.inflate(R.layout.fragment_security_settings, container, false);
         ButterKnife.bind(this, v);
 
+        securityPagerAdapter = new SecurityPagerAdapter(getChildFragmentManager());
+        mPager.setAdapter(securityPagerAdapter);
+
+        TabLayout tabLayout = v.findViewById(R.id.tabs);
+
+        mPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+        tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mPager));
+
         return v;
     }
+
+    private class SecurityPagerAdapter extends FragmentPagerAdapter {
+        SecurityPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            switch (position){
+                case 0:
+                    //return new GeneralSettingsFragment();
+                case 1:
+                    //return new SecuritySettingsFragment();
+                case 2:
+                    return new BackupsSettingsFragment();
+            }
+
+
+            return null; //new OnConstructionFragment();
+        }
+
+        @Override
+        public int getCount() {
+            return 3;
+        }
+    }
 }
diff --git a/app/src/main/res/layout/fragment_security_settings.xml b/app/src/main/res/layout/fragment_security_settings.xml
index d3a737e..0e513fb 100644
--- a/app/src/main/res/layout/fragment_security_settings.xml
+++ b/app/src/main/res/layout/fragment_security_settings.xml
@@ -1,7 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
     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">
 
+    <android.support.design.widget.CoordinatorLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/vPocketSecurity">
+
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/lightGray"
+            app:theme="@style/AppTheme.AppBarOverlay">
+
+            <android.support.design.widget.TabLayout
+                android:id="@+id/tabs"
+                android:layout_alignParentBottom="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:tabTextColor="@color/black"
+                android:animateLayoutChanges="true">
+
+                <android.support.design.widget.TabItem
+                    android:id="@+id/tabNone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="None" />
+
+                <android.support.design.widget.TabItem
+                    android:id="@+id/tabPin"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Pin" />
+
+                <android.support.design.widget.TabItem
+                    android:id="@+id/tabPattern"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Pattern" />
+
+            </android.support.design.widget.TabLayout>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+    </android.support.design.widget.CoordinatorLayout>
+
+    <View
+        android:id="@+id/vPocketSecurity"
+        android:layout_width="match_parent"
+        android:layout_height="140dp"
+        android:background="@color/lightGray"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/tvPocketSecurity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginStart="24dp"
+        android:text="Use &quot;Pocket&quot; Security"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="@+id/vPocketSecurity"
+        app:layout_constraintStart_toStartOf="@id/vPocketSecurity"/>
+
+    <Switch
+        android:id="@+id/sPocketSecurity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="24dp"
+        app:layout_constraintTop_toTopOf="@+id/vPocketSecurity"
+        app:layout_constraintEnd_toEndOf="@id/vPocketSecurity" />
+
+    <TextView
+        android:id="@+id/tvPocketSecurityUser"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/user_name_password_placeholder"
+        tools:layout_editor_absoluteY="8dp"
+        app:layout_constraintTop_toBottomOf="@id/tvPocketSecurity"
+        app:layout_constraintStart_toStartOf="@id/tvPocketSecurity"/>
+    
+    <EditText
+        android:id="@+id/etPocketPassword"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tvPocketSecurityUser"
+        app:layout_constraintStart_toStartOf="@id/tvPocketSecurity"
+        app:layout_constraintEnd_toEndOf="@id/sPocketSecurity"/>
+
 </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 af5eeb8..85457e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -486,4 +486,5 @@
     <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>
+    <string name="user_name_password_placeholder">user_name Password</string>
 </resources>

From cbb42ecaf05149d0a34889a495f637f1973f0a1d Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 18 Jan 2018 16:11:54 -0600
Subject: [PATCH 31/34] Created PinSecurityFragment

---
 .../fragments/PinSecurityFragment.java        | 38 +++++++++++++++
 .../fragments/SecuritySettingsFragment.java   |  3 +-
 .../main/res/layout/fragment_pin_security.xml | 47 +++++++++++++++++++
 3 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/fragments/PinSecurityFragment.java
 create mode 100644 app/src/main/res/layout/fragment_pin_security.xml

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/PinSecurityFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/PinSecurityFragment.java
new file mode 100644
index 0000000..52e2c55
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/PinSecurityFragment.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/18/18.
+ */
+
+public class PinSecurityFragment extends Fragment {
+
+    public PinSecurityFragment() {
+        // Required empty public constructor
+    }
+
+    public static PinSecurityFragment newInstance() {
+        PinSecurityFragment fragment = new PinSecurityFragment();
+        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_pin_security, container, false);
+        ButterKnife.bind(this, v);
+
+        return v;
+    }
+}
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
index e47e8c3..c20e65d 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
@@ -65,12 +65,11 @@ public class SecuritySettingsFragment extends Fragment {
                 case 0:
                     //return new GeneralSettingsFragment();
                 case 1:
-                    //return new SecuritySettingsFragment();
+                    return new PinSecurityFragment();
                 case 2:
                     return new BackupsSettingsFragment();
             }
 
-
             return null; //new OnConstructionFragment();
         }
 
diff --git a/app/src/main/res/layout/fragment_pin_security.xml b/app/src/main/res/layout/fragment_pin_security.xml
new file mode 100644
index 0000000..2f70a6b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_pin_security.xml
@@ -0,0 +1,47 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:id="@+id/tvCurrentPin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="Current PIN"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <EditText
+        android:id="@+id/etCurrentPin"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:inputType="numberPassword"
+        app:layout_constraintTop_toBottomOf="@id/tvCurrentPin"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <EditText
+        android:id="@+id/etNewPin"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="New PIN"
+        android:inputType="numberPassword"
+        app:layout_constraintTop_toBottomOf="@+id/etCurrentPin"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <EditText
+        android:id="@+id/etConfirmPin"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="Confirm PIN"
+        android:inputType="numberPassword"
+        app:layout_constraintTop_toBottomOf="@+id/etNewPin"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 7ee708f05d573e2a5eb3eaf72ee80ae950cf1bc2 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 18 Jan 2018 16:19:24 -0600
Subject: [PATCH 32/34] Automatically get build version from app information

---
 .../crystalwallet/activities/SettingsActivity.java     | 10 ++++++++++
 app/src/main/res/layout/activity_settings.xml          |  1 +
 2 files changed, 11 insertions(+)

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 69fce40..70f68aa 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
@@ -12,10 +12,12 @@ import android.support.v7.widget.Toolbar;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import cy.agorise.crystalwallet.BuildConfig;
 import cy.agorise.crystalwallet.R;
 import cy.agorise.crystalwallet.fragments.AccountsSettingsFragment;
 import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
@@ -41,6 +43,9 @@ public class SettingsActivity extends AppCompatActivity{
     @BindView(R.id.surface_view)
     public SurfaceView mSurfaceView;
 
+    @BindView(R.id.tvBuildVersion)
+    public TextView tvBuildVersion;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -79,6 +84,11 @@ 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 6bd5fc5..a53ac71 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -135,6 +135,7 @@
             android:background="@color/gray">
 
             <TextView
+                android:id="@+id/tvBuildVersion"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"

From 2c46b509dc797f498eeb7b3151ef94846ddef40c Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 18 Jan 2018 17:12:45 -0600
Subject: [PATCH 33/34] Created ChildViewPager that does not listen to swipe
 events

---
 .../fragments/SecuritySettingsFragment.java   |  4 +-
 .../crystalwallet/util/ChildViewPager.java    | 48 +++++++++++++++++++
 app/src/main/res/layout/activity_settings.xml |  4 +-
 .../main/res/layout/fragment_pin_security.xml | 38 +++++++++------
 .../res/layout/fragment_security_settings.xml |  2 +-
 app/src/main/res/values/strings.xml           |  5 ++
 6 files changed, 83 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
index c20e65d..3850627 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
@@ -13,6 +13,7 @@ import android.view.ViewGroup;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import cy.agorise.crystalwallet.R;
+import cy.agorise.crystalwallet.util.ChildViewPager;
 
 /**
  * Created by xd on 1/17/18.
@@ -32,7 +33,7 @@ public class SecuritySettingsFragment extends Fragment {
     }
 
     @BindView(R.id.pager)
-    public ViewPager mPager;
+    public ChildViewPager mPager;
 
     public SecurityPagerAdapter securityPagerAdapter;
 
@@ -45,6 +46,7 @@ public class SecuritySettingsFragment extends Fragment {
 
         securityPagerAdapter = new SecurityPagerAdapter(getChildFragmentManager());
         mPager.setAdapter(securityPagerAdapter);
+        mPager.setSwipeLocked(true);
 
         TabLayout tabLayout = v.findViewById(R.id.tabs);
 
diff --git a/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java b/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
new file mode 100644
index 0000000..d01cbd5
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
@@ -0,0 +1,48 @@
+package cy.agorise.crystalwallet.util;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/**
+ * Created by xd on 1/18/18.
+ */
+
+
+public class ChildViewPager extends ViewPager {
+
+    private boolean swipeLocked;
+
+    public ChildViewPager(Context context) {
+        super(context);
+    }
+
+    public ChildViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public boolean getSwipeLocked() {
+        return swipeLocked;
+    }
+
+    public void setSwipeLocked(boolean swipeLocked) {
+        this.swipeLocked = swipeLocked;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return !swipeLocked && super.onTouchEvent(event);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        return !swipeLocked && super.onInterceptTouchEvent(event);
+    }
+
+    @Override
+    public boolean canScrollHorizontally(int direction) {
+        return !swipeLocked && super.canScrollHorizontally(direction);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index a53ac71..484c17d 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -139,7 +139,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:text="v2.0.0"
+                android:text="@string/version_placeholder"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -148,7 +148,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="block# 14966596"
+                android:text="@string/block_number_placeholder"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_pin_security.xml b/app/src/main/res/layout/fragment_pin_security.xml
index 2f70a6b..0fa46ce 100644
--- a/app/src/main/res/layout/fragment_pin_security.xml
+++ b/app/src/main/res/layout/fragment_pin_security.xml
@@ -1,47 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    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"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/tvCurrentPin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="Current PIN"
+        android:text="@string/current_pin"
+        app:layout_constraintBottom_toTopOf="@+id/etCurrentPin"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <EditText
         android:id="@+id/etCurrentPin"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:inputType="numberPassword"
-        app:layout_constraintTop_toBottomOf="@id/tvCurrentPin"
+        app:layout_constraintBottom_toTopOf="@+id/etNewPin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@+id/tvCurrentPin"
+        tools:ignore="LabelFor" />
 
     <EditText
         android:id="@+id/etNewPin"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:hint="New PIN"
+        android:hint="@string/new_pin"
         android:inputType="numberPassword"
-        app:layout_constraintTop_toBottomOf="@+id/etCurrentPin"
+        app:layout_constraintBottom_toTopOf="@+id/etConfirmPin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@+id/etCurrentPin" />
 
     <EditText
         android:id="@+id/etConfirmPin"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:hint="Confirm PIN"
+        android:hint="@string/confirm_pin"
         android:inputType="numberPassword"
-        app:layout_constraintTop_toBottomOf="@+id/etNewPin"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@+id/etNewPin" />
 
 </android.support.constraint.ConstraintLayout>
\ 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
index 0e513fb..0c2f9ce 100644
--- a/app/src/main/res/layout/fragment_security_settings.xml
+++ b/app/src/main/res/layout/fragment_security_settings.xml
@@ -54,7 +54,7 @@
 
         </android.support.design.widget.AppBarLayout>
 
-        <android.support.v4.view.ViewPager
+        <cy.agorise.crystalwallet.util.ChildViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85457e3..3dae003 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -487,4 +487,9 @@
     <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>
     <string name="user_name_password_placeholder">user_name Password</string>
+    <string name="version_placeholder">v1.0</string>
+    <string name="block_number_placeholder">block# 14966596</string>
+    <string name="current_pin">Current PIN</string>
+    <string name="new_pin">New PIN</string>
+    <string name="confirm_pin">Confirm PIN</string>
 </resources>

From 38938bdff755f5309d50491921a3ec77a513dde5 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Sun, 21 Jan 2018 14:57:09 -0600
Subject: [PATCH 34/34] Added NoneSecurityFragment

---
 .../fragments/NoneSecurityFragment.java       | 38 +++++++++++++++++++
 .../fragments/SecuritySettingsFragment.java   |  4 +-
 .../crystalwallet/util/ChildViewPager.java    |  3 +-
 .../res/layout/fragment_none_security.xml     | 20 ++++++++++
 .../res/layout/fragment_security_settings.xml | 13 ++++---
 app/src/main/res/values/strings.xml           |  4 ++
 6 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/cy/agorise/crystalwallet/fragments/NoneSecurityFragment.java
 create mode 100644 app/src/main/res/layout/fragment_none_security.xml

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/NoneSecurityFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/NoneSecurityFragment.java
new file mode 100644
index 0000000..a8cb92b
--- /dev/null
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/NoneSecurityFragment.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/18/18.
+ */
+
+public class NoneSecurityFragment extends Fragment {
+
+    public NoneSecurityFragment() {
+        // Required empty public constructor
+    }
+
+    public static NoneSecurityFragment newInstance() {
+        NoneSecurityFragment fragment = new NoneSecurityFragment();
+        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_none_security, container, false);
+        ButterKnife.bind(this, v);
+
+        return v;
+    }
+}
diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
index 3850627..0407bcf 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
@@ -5,7 +5,6 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,6 +16,7 @@ import cy.agorise.crystalwallet.util.ChildViewPager;
 
 /**
  * Created by xd on 1/17/18.
+ * In this fragment the user should be able to select its preferred security option.
  */
 
 public class SecuritySettingsFragment extends Fragment {
@@ -65,7 +65,7 @@ public class SecuritySettingsFragment extends Fragment {
         public Fragment getItem(int position) {
             switch (position){
                 case 0:
-                    //return new GeneralSettingsFragment();
+                    return new NoneSecurityFragment();
                 case 1:
                     return new PinSecurityFragment();
                 case 2:
diff --git a/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java b/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
index d01cbd5..fbac369 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
@@ -7,6 +7,8 @@ import android.view.MotionEvent;
 
 /**
  * Created by xd on 1/18/18.
+ * This ViewPager is intended to be used inside another ViewPager therefore it has the
+ * setSwipeLocked which disables or enables the swipe gesture.
  */
 
 
@@ -44,5 +46,4 @@ public class ChildViewPager extends ViewPager {
     public boolean canScrollHorizontally(int direction) {
         return !swipeLocked && super.canScrollHorizontally(direction);
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_none_security.xml b/app/src/main/res/layout/fragment_none_security.xml
new file mode 100644
index 0000000..3c4da4e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_none_security.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    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:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="It is recommended to use some kind of security."
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</android.support.constraint.ConstraintLayout>
\ 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
index 0c2f9ce..a70a4e7 100644
--- a/app/src/main/res/layout/fragment_security_settings.xml
+++ b/app/src/main/res/layout/fragment_security_settings.xml
@@ -29,6 +29,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:tabSelectedTextColor="@color/black"
                 app:tabTextColor="@color/black"
                 android:animateLayoutChanges="true">
 
@@ -36,19 +37,19 @@
                     android:id="@+id/tabNone"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="None" />
+                    android:text="@string/none" />
 
                 <android.support.design.widget.TabItem
                     android:id="@+id/tabPin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Pin" />
+                    android:text="@string/pin" />
 
                 <android.support.design.widget.TabItem
                     android:id="@+id/tabPattern"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Pattern" />
+                    android:text="@string/pattern" />
 
             </android.support.design.widget.TabLayout>
 
@@ -77,7 +78,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:layout_marginStart="24dp"
-        android:text="Use &quot;Pocket&quot; Security"
+        android:text="@string/use_pocket_security"
         android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="@+id/vPocketSecurity"
@@ -106,8 +107,10 @@
         android:id="@+id/etPocketPassword"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:inputType="numberPassword"
         app:layout_constraintTop_toBottomOf="@id/tvPocketSecurityUser"
         app:layout_constraintStart_toStartOf="@id/tvPocketSecurity"
-        app:layout_constraintEnd_toEndOf="@id/sPocketSecurity"/>
+        app:layout_constraintEnd_toEndOf="@id/sPocketSecurity"
+        tools:ignore="LabelFor" />
 
 </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 3dae003..4829431 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -492,4 +492,8 @@
     <string name="current_pin">Current PIN</string>
     <string name="new_pin">New PIN</string>
     <string name="confirm_pin">Confirm PIN</string>
+    <string name="use_pocket_security">Use \"Pocket\" Security</string>
+    <string name="none">None</string>
+    <string name="pin">Pin</string>
+    <string name="pattern">Pattern</string>
 </resources>