From 879f282735ba7d030d88c6269b27cb494a4bebbe Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 10 Nov 2020 20:11:49 -0800
Subject: [PATCH] Moved link to list page to above link to profile page in
 hamburger menu

---
 .../main/res/menu/activity_main_drawer.xml    | 26 +++++++++----------
 .../main/res/navigation/mobile_navigation.xml | 11 ++++----
 Listify/app/src/main/res/values/strings.xml   |  4 +--
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/Listify/app/src/main/res/menu/activity_main_drawer.xml b/Listify/app/src/main/res/menu/activity_main_drawer.xml
index d573500..3cbff13 100644
--- a/Listify/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Listify/app/src/main/res/menu/activity_main_drawer.xml
@@ -6,8 +6,19 @@
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_home"
-            android:icon="@drawable/ic_menu_camera"
+            android:icon="@drawable/ic_baseline_list_alt_28"
             android:title="@string/menu_home" />
+
+        <item
+            android:id="@+id/nav_profile"
+            android:icon="@drawable/ic_baseline_person_24"
+            android:title="@string/menu_profile" />
+
+        <item
+            android:id="@+id/nav_logout"
+            android:title="Sign out"
+            android:onClick="onClickSignout" />
+            
 <!--    <item-->
 <!--        android:id="@+id/nav_gallery"-->
 <!--        android:icon="@drawable/ic_menu_gallery"-->
@@ -16,18 +27,5 @@
 <!--        android:id="@+id/nav_slideshow"-->
 <!--        android:icon="@drawable/ic_menu_slideshow"-->
 <!--        android:title="@string/menu_slideshow" />-->
-        <item
-            android:id="@+id/nav_profile"
-            android:icon="@drawable/ic_baseline_list_alt_28"
-            android:title="@string/menu_lists" />
-<!--    <item-->
-<!--        android:id="@+id/nav_create_list"-->
-<!--        android:icon="@drawable/ic_baseline_add_28"-->
-<!--        android:title="Create New List"-->
-<!--        android:onClick="onClickCreateList" />-->
-        <item
-            android:id="@+id/nav_logout"
-            android:title="Sign out"
-            android:onClick="onClickSignout" />
     </group>
 </menu>
\ No newline at end of file
diff --git a/Listify/app/src/main/res/navigation/mobile_navigation.xml b/Listify/app/src/main/res/navigation/mobile_navigation.xml
index cb76e14..b1c5870 100644
--- a/Listify/app/src/main/res/navigation/mobile_navigation.xml
+++ b/Listify/app/src/main/res/navigation/mobile_navigation.xml
@@ -11,6 +11,12 @@
         android:label="@string/menu_home"
         tools:layout="@layout/fragment_home" />
 
+    <fragment
+        android:id="@+id/nav_profile"
+        android:name="com.example.listify.ui.profile.ProfileFragment"
+        android:label="@string/menu_profile"
+        tools:layout="@layout/fragment_profile" />
+
     <fragment
         android:id="@+id/nav_gallery"
         android:name="com.example.listify.ui.gallery.GalleryFragment"
@@ -23,9 +29,4 @@
         android:label="@string/menu_slideshow"
         tools:layout="@layout/fragment_slideshow" />
 
-    <fragment
-        android:id="@+id/nav_profile"
-        android:name="com.example.listify.ui.profile.ProfileFragment"
-        android:label="@string/menu_lists"
-        tools:layout="@layout/fragment_profile" />
 </navigation>
\ No newline at end of file
diff --git a/Listify/app/src/main/res/values/strings.xml b/Listify/app/src/main/res/values/strings.xml
index ef47675..d21efe1 100644
--- a/Listify/app/src/main/res/values/strings.xml
+++ b/Listify/app/src/main/res/values/strings.xml
@@ -7,7 +7,8 @@
     <string name="nav_header_desc">Navigation header</string>
     <string name="action_settings">Settings</string>
 
-    <string name="menu_home">Profile</string>
+    <string name="menu_home">My Lists</string>
+    <string name="menu_profile">Profile</string>
     <string name="menu_gallery">Gallery</string>
     <string name="menu_slideshow">Slideshow</string>
 
@@ -29,7 +30,6 @@
     <string name="search_button_desc">Search Button</string>
     <string name="title_activity_search_results">SearchResults</string>
     <string name="store_selection">Store selection</string>
-    <string name="menu_lists">My Lists</string>
     <string name="title_activity_item_details">ItemDetails</string>
     <string name="add_to_list">Add to list</string>
     <string name="create_new_list">Add to new list</string>