Fixed logout button

HackIllinois · Nov 17, 2024 · def5bfb · def5bfb
1 parent a1d8c35
commit def5bfb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt b/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -68,16 +69,24 @@ class ProfileFragment : Fragment() {
         // if not an attendee, set the layout to be the not logged in profile
         if (!hasLoggedIn()) {
             val view = inflater.inflate(R.layout.fragment_profile_not_logged_in, container, false)
-            val logoutButton = view.findViewById<Button>(R.id.logout_button)
-            logoutButton.setOnClickListener {
+            val loginButton = view.findViewById<Button>(R.id.login_button)
+            loginButton.setOnClickListener {
                 val mainActivity: MainActivity = requireActivity() as MainActivity
                 mainActivity.logout()
             }
+
             return view
         }
         if (isStaff()) {
             val view = inflater.inflate(R.layout.fragment_profile_staff, container, false)
-            val logoutButton = view.findViewById<Button>(R.id.logout_button)
+            val loginButton = view.findViewById<Button>(R.id.login_button)
+            loginButton.setOnClickListener {
+//                Log.d("Staff Logout", "Attempting Logout")
+                val mainActivity: MainActivity = requireActivity() as MainActivity
+                mainActivity.logout()
+            }
+
+            val logoutButton = view.findViewById<ImageButton>(R.id.logoutButton)
             logoutButton.setOnClickListener {
                 val mainActivity: MainActivity = requireActivity() as MainActivity
                 mainActivity.logout()

diff --git a/app/src/main/res/layout/fragment_profile_not_logged_in.xml b/app/src/main/res/layout/fragment_profile_not_logged_in.xml
@@ -56,7 +56,7 @@
         app:layout_constraintTop_toBottomOf="@+id/title_textview_profile" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/logout_button"
+        android:id="@+id/login_button"
         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/fragment_profile_staff.xml b/app/src/main/res/layout/fragment_profile_staff.xml
@@ -66,7 +66,7 @@
         app:srcCompat="@drawable/ic_logout" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/logout_button"
+        android:id="@+id/login_button"
         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"