From 465318eb84f8856aa643bb4dec2578f0ae36387f Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 21 Oct 2020 14:31:00 -0700
Subject: [PATCH] Sign out button is now in the hamburger menu

---
 .../com/example/listify/MainActivity.java     | 17 +++++++++++
 .../example/listify/ui/home/HomeFragment.java | 18 +-----------
 .../app/src/main/res/layout/fragment_home.xml | 12 +-------
 .../main/res/menu/activity_main_drawer.xml    | 28 +++++++++++--------
 4 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/MainActivity.java b/Listify/app/src/main/java/com/example/listify/MainActivity.java
index d18c4f1..ea01bac 100644
--- a/Listify/app/src/main/java/com/example/listify/MainActivity.java
+++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java
@@ -202,6 +202,23 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
         });
     }
 
+    public void onClickSignout(MenuItem m) {
+        m.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                try {
+                    am.signOutUser();
+                    Intent intent = new Intent(MainActivity.this, com.example.listify.ui.LoginPage.class);
+                    startActivity(intent);
+                }
+                catch (Exception e) {
+                    Log.i("Authentication", e.toString());
+                }
+                return false;
+            }
+        });
+    }
+
     @Override
     public void sendNewListName(String name) {
         Properties configs = new Properties();
diff --git a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
index 985d430..28178c9 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
@@ -29,28 +29,12 @@ import java.io.IOException;
 import java.util.Properties;
 
 public class HomeFragment extends Fragment {
-    private Button toLoginPage;
     private Button toDeleteAccountPage;
 
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_home, container, false);
 
-        toLoginPage = (Button) root.findViewById(R.id.button1);
-        toLoginPage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    am.signOutUser();
-                }
-                catch (Exception e) {
-                    Log.i("Authentication", e.toString());
-                }
-                Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class);
-                startActivity(intent);
-            }
-        });
-
-        toDeleteAccountPage = (Button) root.findViewById(R.id.button2);
+        toDeleteAccountPage = (Button) root.findViewById(R.id.button);
         toDeleteAccountPage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/Listify/app/src/main/res/layout/fragment_home.xml b/Listify/app/src/main/res/layout/fragment_home.xml
index 2726aad..a938244 100644
--- a/Listify/app/src/main/res/layout/fragment_home.xml
+++ b/Listify/app/src/main/res/layout/fragment_home.xml
@@ -7,17 +7,7 @@
     tools:context=".ui.home.HomeFragment">
 
     <Button
-        android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="40dp"
-        android:text="Log out"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Button
-        android:id="@+id/button2"
+        android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Delete Account"
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 93efe47..26a2072 100644
--- a/Listify/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Listify/app/src/main/res/menu/activity_main_drawer.xml
@@ -8,22 +8,26 @@
             android:id="@+id/nav_home"
             android:icon="@drawable/ic_menu_camera"
             android:title="@string/menu_home" />
-<!--        <item-->
-<!--            android:id="@+id/nav_gallery"-->
-<!--            android:icon="@drawable/ic_menu_gallery"-->
-<!--            android:title="@string/menu_gallery" />-->
-<!--        <item-->
-<!--            android:id="@+id/nav_slideshow"-->
-<!--            android:icon="@drawable/ic_menu_slideshow"-->
-<!--            android:title="@string/menu_slideshow" />-->
+<!--    <item-->
+<!--        android:id="@+id/nav_gallery"-->
+<!--        android:icon="@drawable/ic_menu_gallery"-->
+<!--        android:title="@string/menu_gallery" />-->
+<!--    <item-->
+<!--        android:id="@+id/nav_slideshow"-->
+<!--        android:icon="@drawable/ic_menu_slideshow"-->
+<!--        android:title="@string/menu_slideshow" />-->
         <item
             android:id="@+id/nav_lists"
             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_create_list"
-            android:icon="@drawable/ic_baseline_add_28"
-            android:title="Create New List"
-            android:onClick="onClickCreateList"/>
+            android:id="@+id/nav_logout"
+            android:title="Sign out"
+            android:onClick="onClickSignout" />
     </group>
 </menu>
\ No newline at end of file