From 4aca69e765f31b3fe86666dd4c516e89c0204992 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Thu, 26 Mar 2015 18:31:38 +0100
Subject: [PATCH] Link settings and about activity from navigation drawer.

---
 .../java/org/yaaic/activity/MainActivity.java | 16 ++++++-
 .../drawable/navigation_item_background.xml   |  9 ++++
 app/src/main/res/layout/item_drawer.xml       | 47 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  4 +-
 4 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/navigation_item_background.xml

diff --git a/app/src/main/java/org/yaaic/activity/MainActivity.java b/app/src/main/java/org/yaaic/activity/MainActivity.java
index b754c21..c65bf73 100644
--- a/app/src/main/java/org/yaaic/activity/MainActivity.java
+++ b/app/src/main/java/org/yaaic/activity/MainActivity.java
@@ -30,6 +30,7 @@ import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
+import android.view.View;
 
 import org.yaaic.R;
 import org.yaaic.fragment.OverviewFragment;
@@ -44,6 +45,7 @@ import org.yaaic.model.Status;
  */
 public class MainActivity extends ActionBarActivity implements OverviewFragment.Callback, ServiceConnection {
     private ActionBarDrawerToggle toggle;
+    private DrawerLayout drawer;
     private IRCBinder binder;
 
     @Override
@@ -55,7 +57,7 @@ public class MainActivity extends ActionBarActivity implements OverviewFragment.
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer);
+        drawer = (DrawerLayout) findViewById(R.id.drawer);
         toggle = new ActionBarDrawerToggle(this, drawer, toolbar, 0, 0);
 
         drawer.setDrawerListener(toggle);
@@ -113,6 +115,18 @@ public class MainActivity extends ActionBarActivity implements OverviewFragment.
 
     }
 
+    public void onSettings(View view) {
+        drawer.closeDrawers();
+
+        startActivity(new Intent(this, SettingsActivity.class));
+    }
+
+    public void onAbout(View view) {
+        drawer.closeDrawers();
+
+        startActivity(new Intent(this, AboutActivity.class));
+    }
+
     @Override
     public IRCBinder getBinder() {
         return binder;
diff --git a/app/src/main/res/drawable/navigation_item_background.xml b/app/src/main/res/drawable/navigation_item_background.xml
new file mode 100644
index 0000000..95a2503
--- /dev/null
+++ b/app/src/main/res/drawable/navigation_item_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#dddddd">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffff" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_drawer.xml b/app/src/main/res/layout/item_drawer.xml
index c7d3058..1717863 100644
--- a/app/src/main/res/layout/item_drawer.xml
+++ b/app/src/main/res/layout/item_drawer.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Yaaic - Yet Another Android IRC Client
 
 Copyright 2009-2015 Sebastian Kaspari
@@ -27,4 +26,46 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
     android:background="@android:color/white"
     android:clickable="true"
     android:fitsSystemWindows="true"
-    app:insetForeground="#4000" />
\ No newline at end of file
+    android:paddingTop="24dp"
+    app:insetForeground="#4000">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            android:background="@color/divider" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="@drawable/navigation_item_background"
+            android:clickable="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical"
+            android:onClick="onSettings"
+            android:paddingLeft="16dp"
+            android:text="@string/navigation_settings"
+            android:textSize="14sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="@drawable/navigation_item_background"
+            android:clickable="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical"
+            android:onClick="onAbout"
+            android:paddingLeft="16dp"
+            android:text="@string/navigation_about"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+</org.yaaic.view.ScrimInsetsFrameLayout>
\ 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 d43778c..0b8ae5e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,8 +3,8 @@
     <string name="add_server_menu">Add server</string>
     <string name="add_server_list">Add server</string>
 
-    <string name="settings_menu">Settings</string>
-    <string name="about_menu">About</string>
+    <string name="navigation_settings">Settings</string>
+    <string name="navigation_about">About</string>
     <string name="disconnect_menu">Disconnect all</string>
 
     <string name="about_label">About</string>