From dcc3ea067973b86486ff4ff772be82c13c0c3867 Mon Sep 17 00:00:00 2001
From: Jatin Rao <bjatinrao@gmail.com>
Date: Wed, 21 Mar 2018 19:36:06 +0530
Subject: [PATCH 1/2] Fix for issue #1317 Dividing nav bar into sections

---
 app/src/main/res/menu/drawer.xml | 90 ++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 38 deletions(-)

diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
index ee0bb4726a..b2ba40228c 100644
--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -1,43 +1,57 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/action_home"
-        android:icon="@drawable/ic_home_black_24dp"
-        android:title="@string/navigation_item_home"/>
-
-    <item
-        android:id="@+id/action_nearby"
-        android:icon="@drawable/ic_location_black_24dp"
-        android:title="@string/navigation_item_nearby"/>
-
-    <item
-        android:id="@+id/action_notifications"
-        android:icon="@drawable/ic_notifications_black_24dp"
-        android:title="@string/navigation_item_notification"/>
-
-    <item
-        android:id="@+id/action_about"
-        android:icon="@drawable/ic_info_outline_black_24dp"
-        android:title="@string/navigation_item_about"/>
-
-    <item
-        android:id="@+id/action_settings"
-        android:icon="@drawable/ic_settings_black_24dp"
-        android:title="@string/navigation_item_settings"/>
-
-    <item
-        android:id="@+id/action_introduction"
-        android:icon="@drawable/ic_help_black_24dp"
-        android:title="@string/navigation_item_info"/>
-
-    <item
-        android:id="@+id/action_feedback"
-        android:icon="@drawable/ic_feedback_black_24dp"
-        android:title="@string/navigation_item_feedback"/>
-
+    <group
+        android:id="@+id/drawer_main">
+        <item
+            android:id="@+id/action_home"
+            android:icon="@drawable/ic_home_black_24dp"
+            android:title="@string/navigation_item_home" />
+
+        <item
+            android:id="@+id/action_nearby"
+            android:icon="@drawable/ic_location_black_24dp"
+            android:title="@string/navigation_item_nearby" />
+    </group>
+    <group
+        android:id="@+id/drawer_account"
+        >
+        <item
+            android:id="@+id/action_notifications"
+            android:icon="@drawable/ic_notifications_black_24dp"
+            android:title="@string/navigation_item_notification" />
+
+
+        <item
+            android:id="@+id/action_settings"
+            android:icon="@drawable/ic_settings_black_24dp"
+            android:title="@string/navigation_item_settings" />
+
+    </group>
+    <group
+        android:id="@+id/drawer_contact"
+        >
+        <item
+            android:id="@+id/action_about"
+            android:icon="@drawable/ic_info_outline_black_24dp"
+            android:title="@string/navigation_item_about" />
+        <item
+            android:id="@+id/action_introduction"
+            android:icon="@drawable/ic_help_black_24dp"
+            android:title="@string/navigation_item_info" />
+
+        <item
+            android:id="@+id/action_feedback"
+            android:icon="@drawable/ic_feedback_black_24dp"
+            android:title="@string/navigation_item_feedback" />
+
+
+    </group>
+
+    <group
+        android:id="@+id/drawer_logout"
+        >
     <item
         android:id="@+id/action_logout"
         android:icon="@drawable/ic_exit_to_app_black_24dp"
-        android:title="@string/navigation_item_logout"/>
-
+        android:title="@string/navigation_item_logout" />
+    </group>
 </menu>

From 2ec6855d89178deda01dad409ada816634eeb07d Mon Sep 17 00:00:00 2001
From: Jatin Rao <bjatinrao@gmail.com>
Date: Wed, 21 Mar 2018 19:51:16 +0530
Subject: [PATCH 2/2] Reformated code

---
 app/src/main/res/menu/drawer.xml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
index b2ba40228c..61c0739fe3 100644
--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -1,6 +1,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <group
-        android:id="@+id/drawer_main">
+    <group android:id="@+id/drawer_main">
         <item
             android:id="@+id/action_home"
             android:icon="@drawable/ic_home_black_24dp"
@@ -11,9 +10,7 @@
             android:icon="@drawable/ic_location_black_24dp"
             android:title="@string/navigation_item_nearby" />
     </group>
-    <group
-        android:id="@+id/drawer_account"
-        >
+    <group android:id="@+id/drawer_account">
         <item
             android:id="@+id/action_notifications"
             android:icon="@drawable/ic_notifications_black_24dp"
@@ -26,9 +23,7 @@
             android:title="@string/navigation_item_settings" />
 
     </group>
-    <group
-        android:id="@+id/drawer_contact"
-        >
+    <group android:id="@+id/drawer_contact">
         <item
             android:id="@+id/action_about"
             android:icon="@drawable/ic_info_outline_black_24dp"
@@ -46,12 +41,10 @@
 
     </group>
 
-    <group
-        android:id="@+id/drawer_logout"
-        >
-    <item
-        android:id="@+id/action_logout"
-        android:icon="@drawable/ic_exit_to_app_black_24dp"
-        android:title="@string/navigation_item_logout" />
+    <group android:id="@+id/drawer_logout">
+        <item
+            android:id="@+id/action_logout"
+            android:icon="@drawable/ic_exit_to_app_black_24dp"
+            android:title="@string/navigation_item_logout" />
     </group>
 </menu>