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:layout_marginBottom="?attr/actionBarSize"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
+ android:paddingBottom="20dp">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
\ No newline at end of file
+
+
+
+
+
+
\ 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 @@
-
-
-
-
-
-
-
-
+ android:paddingBottom="20dp">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
\ 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 @@
Upgrade
Import Accounts. Import multiple accounts from blockchains such as Bitshares, Bitcoin, Steem, Dash and more.
Import
- Refresh keys. Ony for bithsares accounts.
+ Refresh keys. Ony for bitshares accounts.
Refresh
Remove an account from this Wallet. The account removed will still reside on the blockchain.
Remove