From b59e17175a4633b6653cc7154fc9723414126f72 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 28 Dec 2017 13:23:25 -0600
Subject: [PATCH] AccountsFragment now opens GeneralSettings and minor fixes

---
 .../fragments/AccountsFragment.java           | 24 ++++++++++++++-----
 app/src/main/res/layout/fragment_accounts.xml |  6 ++---
 2 files changed, 21 insertions(+), 9 deletions(-)

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 260fa6c..9991cef 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java
@@ -1,6 +1,7 @@
 package cy.agorise.crystalwallet.fragments;
 
 import android.app.Dialog;
+import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
@@ -10,15 +11,21 @@ import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import cy.agorise.crystalwallet.R;
+import cy.agorise.crystalwallet.activities.GeneralSettingsActivity;
 
 public class AccountsFragment extends DialogFragment {
 
+    @BindView(R.id.tvGeneralSettings)
+    TextView tvGeneralSettings;
+
     @BindView(R.id.tvClose)
     TextView tvClose;
 
@@ -51,11 +58,7 @@ public class AccountsFragment extends DialogFragment {
         View view = inflater.inflate(R.layout.fragment_accounts, null);
         ButterKnife.bind(this, view);
 
-        builder.setView(view);
-        Dialog dialog = builder.create();
-
-        return dialog;
-
+        return builder.setView(view).create();
     }
 
     @Override
@@ -63,7 +66,16 @@ public class AccountsFragment extends DialogFragment {
         super.onResume();
 
         // Force dialog fragment to use the full width of the screen
-        getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        Window dialogWindow = getDialog().getWindow();
+        assert dialogWindow != null;
+        dialogWindow.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+    }
+
+    @OnClick(R.id.tvGeneralSettings)
+    public void onBtnGeneralSettingsClick(){
+        dismiss();
+        Intent intent = new Intent(getActivity(), GeneralSettingsActivity.class);
+        startActivity(intent);
     }
 
     @OnClick(R.id.tvClose)
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index 25dc617..85a8df3 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -110,7 +110,7 @@
         app:layout_constraintEnd_toEndOf="parent"/>
 
     <ImageView
-        android:id="@+id/ivSettings"
+        android:id="@+id/ivGeneralSettings"
         android:layout_width="20dp"
         android:layout_height="20dp"
         app:srcCompat="@drawable/ic_settings_24dp"
@@ -120,13 +120,13 @@
         app:layout_constraintStart_toStartOf="@id/forthView"/>
 
     <TextView
-        android:id="@+id/tvSettings"
+        android:id="@+id/tvGeneralSettings"
         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_constraintStart_toEndOf="@id/ivGeneralSettings"
         app:layout_constraintTop_toTopOf="@id/forthView"
         app:layout_constraintBottom_toBottomOf="@id/forthView"/>