From 41cb2c97694fc7a1d3b9a26942cbdb3b50653c9b Mon Sep 17 00:00:00 2001
From: maskara <maskara@zeta.tech>
Date: Tue, 16 May 2017 11:54:41 +0200
Subject: [PATCH] Add drawer to settings activity

---
 .../commons/settings/SettingsActivity.java    | 18 ++++++---
 app/src/main/res/layout/activity_settings.xml | 40 +++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/layout/activity_settings.xml

diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
index ee06f772f..f1aceb517 100644
--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
@@ -3,14 +3,18 @@ package fr.free.nrw.commons.settings;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatDelegate;
 import android.view.MenuItem;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.theme.NavigationBaseActivity;
+
+public class SettingsActivity extends NavigationBaseActivity {
+    private SettingsFragment settingsFragment;
 
-public class SettingsActivity extends PreferenceActivity {
     private AppCompatDelegate settingsDelegate;
 
     @Override
@@ -22,11 +26,13 @@ public class SettingsActivity extends PreferenceActivity {
             setTheme(R.style.LightAppTheme);
         }
 
-        // Display the fragment as the main content.
-        getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, new SettingsFragment()).commit();
+        settingsFragment = (SettingsFragment) getFragmentManager().findFragmentById(R.id.settingsFragment);
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+
+        ButterKnife.bind(this);
+        initDrawer();
     }
 
     // Get an action bar
@@ -39,7 +45,7 @@ public class SettingsActivity extends PreferenceActivity {
         settingsDelegate.onPostCreate(savedInstanceState);
 
         //Get an up button
-        settingsDelegate.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        //settingsDelegate.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
     //Handle action-bar clicks
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
new file mode 100644
index 000000000..739621929
--- /dev/null
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include
+            android:id="@+id/toolbar"
+            layout="@layout/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <fragment
+            android:id="@+id/settingsFragment"
+            android:name="fr.free.nrw.commons.settings.SettingsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:layout="@xml/preferences"
+            android:layout_below="@id/toolbar"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/drawer_pane"
+        android:layout_width="320dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:background="@android:color/white">
+
+        <FrameLayout
+            android:id="@+id/drawer_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </RelativeLayout>
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file