UI state and access refinement (OTP, navigation, error handling)

app/src/main/java/deakin/gopher/guardian/TrainingActivity.kt

@@ -1,20 +1,58 @@
 package deakin.gopher.guardian
 
+import android.content.Intent
 import android.os.Bundle
+import android.widget.ImageView
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.GravityCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import com.google.android.material.navigation.NavigationView
+import com.google.firebase.auth.FirebaseAuth
+import deakin.gopher.guardian.view.general.Homepage4caretaker
+import deakin.gopher.guardian.view.general.LoginActivity
 
 class TrainingActivity : AppCompatActivity() {
+
+    private lateinit var menuButton: ImageView
+    private lateinit var drawerLayout: DrawerLayout
+    private lateinit var navigationView: NavigationView
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContentView(R.layout.activity_training2)
+
+        menuButton = findViewById(R.id.menuButton)
+        drawerLayout = findViewById(R.id.drawer_layout)
+        navigationView = findViewById(R.id.nav_view)
+
+        menuButton.setOnClickListener {
+            drawerLayout.openDrawer(GravityCompat.START)
+        }
+
+        navigationView.setNavigationItemSelectedListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.nav_home -> {
+                    startActivity(Intent(this, Homepage4caretaker::class.java))
+                }
+
+                R.id.nav_signout -> {
+                    FirebaseAuth.getInstance().signOut()
+                    startActivity(Intent(this, LoginActivity::class.java))
+                    finish()
+                }
+            }
+            drawerLayout.closeDrawer(GravityCompat.START)
+            true
+        }
+
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
             val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
             insets
         }
     }
-}
+}

app/src/main/java/deakin/gopher/guardian/view/caretaker/CaretakerProfileActivity.kt

@@ -4,20 +4,31 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import android.widget.ImageView
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import com.google.android.material.navigation.NavigationView
+import com.google.firebase.auth.FirebaseAuth
 import deakin.gopher.guardian.R
 import deakin.gopher.guardian.view.general.BaseActivity
 import deakin.gopher.guardian.view.general.Homepage4caretaker
+import deakin.gopher.guardian.view.general.LoginActivity
 
 class CaretakerProfileActivity : BaseActivity() {
     private lateinit var backButton: Button
     private lateinit var editButton: ImageView
+    private lateinit var menuButton: ImageView
+    private lateinit var drawerLayout: DrawerLayout
+    private lateinit var navigationView: NavigationView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_caretakerprofile)
 
         backButton = findViewById(R.id.backBtn)
         editButton = findViewById(R.id.editButton)
+        menuButton = findViewById(R.id.menuButton)
+        drawerLayout = findViewById(R.id.drawer_layout)
+        navigationView = findViewById(R.id.nav_view)
 
         backButton.setOnClickListener {
             val medicalDiagnosticsActivityIntent =
@@ -30,5 +41,26 @@ class CaretakerProfileActivity : BaseActivity() {
                 Intent(this, EditCaretakerProfileActivity::class.java)
             startActivity(medicalDiagnosticsActivityIntent)
         }
+
+        menuButton.setOnClickListener {
+            drawerLayout.openDrawer(GravityCompat.START)
+        }
+
+        navigationView.setNavigationItemSelectedListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.nav_home -> {
+                    startActivity(Intent(this, Homepage4caretaker::class.java))
+                }
+
+                R.id.nav_signout -> {
+                    FirebaseAuth.getInstance().signOut()
+                    startActivity(Intent(this, LoginActivity::class.java))
+                    finish()
+                }
+            }
+
+            drawerLayout.closeDrawer(GravityCompat.START)
+            true
+        }
     }
-}
+}

app/src/main/java/deakin/gopher/guardian/view/caretaker/EditCaretakerProfileActivity.kt

@@ -3,20 +3,54 @@ package deakin.gopher.guardian.view.caretaker
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.Toast
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import com.google.android.material.navigation.NavigationView
+import com.google.firebase.auth.FirebaseAuth
 import deakin.gopher.guardian.R
 import deakin.gopher.guardian.view.general.BaseActivity
+import deakin.gopher.guardian.view.general.LoginActivity
 
 class EditCaretakerProfileActivity : BaseActivity() {
     private lateinit var saveButton: Button
-    val emojiCodePoint = 0x1F97A
-    val emojiString = String(Character.toChars(emojiCodePoint))
+    private lateinit var menuButton: ImageView
+    private lateinit var drawerLayout: DrawerLayout
+    private lateinit var navigationView: NavigationView
+
+    private val emojiCodePoint = 0x1F97A
+    private val emojiString = String(Character.toChars(emojiCodePoint))
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_edit_caretakerprofile)
 
         saveButton = findViewById(R.id.btnSave)
+        menuButton = findViewById(R.id.menuButton)
+        drawerLayout = findViewById(R.id.drawer_layout)
+        navigationView = findViewById(R.id.nav_view)
+
+        menuButton.setOnClickListener {
+            drawerLayout.openDrawer(GravityCompat.START)
+        }
+
+        navigationView.setNavigationItemSelectedListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.nav_home -> {
+                    startActivity(Intent(this, CaretakerProfileActivity::class.java))
+                }
+
+                R.id.nav_signout -> {
+                    FirebaseAuth.getInstance().signOut()
+                    startActivity(Intent(this, LoginActivity::class.java))
+                    finish()
+                }
+            }
+
+            drawerLayout.closeDrawer(GravityCompat.START)
+            true
+        }
 
         saveButton.setOnClickListener {
             Toast.makeText(this, "Why Firebase not working? $emojiString", Toast.LENGTH_LONG).show()
@@ -25,4 +59,4 @@ class EditCaretakerProfileActivity : BaseActivity() {
             startActivity(medicalDiagnosticsActivityIntent)
         }
     }
-}
+}