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

app/src/main/AndroidManifest.xml

@@ -69,6 +69,12 @@
         <activity
             android:name=".view.general.Homepage4nurse"
             android:exported="false" />
+        <activity
+            android:name=".view.general.PatientActivitiesActivity"
+            android:exported="false" />
+        <activity
+            android:name=".view.general.LogPatientActivityActivity"
+            android:exported="false" />
         <activity
             android:name=".view.general.TaskDetailActivity"
             android:exported="false" />

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/model/Patient.kt

@@ -50,10 +50,12 @@ data class AddPatientResponse(
 ) : BaseModel()
 
 data class PatientActivity(
+    @SerializedName("_id") val id: String,
     @SerializedName("activityType") val activityName: String,
     @SerializedName("activityTimestamp") val timestamp: String,
     @SerializedName("nurse") val loggedBy: String,
     @SerializedName("comment") val comment: String,
+
 )
 
 data class AddPatientActivityResponse(

app/src/main/java/deakin/gopher/guardian/services/api/ApiService.kt

@@ -86,9 +86,15 @@ interface ApiService {
         @Query("patientId") patientId: String,
     ): Response<List<PatientActivity>>
 
+    @DELETE("patients/entryreport/{entryId}")
+    suspend fun deletePatientActivity(
+        @Header("Authorization") token: String,
+        @Path("entryId") entryId: String,
+    ): Response<BaseModel>
+
     @DELETE("patients/{id}")
     suspend fun deletePatient(
         @Header("Authorization") token: String,
         @Path("id") patientId: String,
     ): Response<BaseModel>
-}
+}

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)
         }
     }
-}
+}

app/src/main/java/deakin/gopher/guardian/view/general/Homepage4nurse.kt

@@ -1,5 +1,6 @@
 package deakin.gopher.guardian.view.general
 
+import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import android.widget.TextView
@@ -10,31 +11,60 @@ import deakin.gopher.guardian.services.EmailPasswordAuthService
 import deakin.gopher.guardian.services.NavigationService
 
 class Homepage4nurse : AppCompatActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_homepage4nurse)
 
         val user = SessionManager.getCurrentUser()
-        val titleText: TextView = findViewById(R.id.medicalDiagnosticsTitleTextView)
+
+        val titleText: TextView =
+            findViewById(R.id.medicalDiagnosticsTitleTextView)
+
         titleText.append(" ${user.name.split(" ").getOrNull(0) ?: ""}")
 
-        val patientsButton: Button = findViewById(R.id.patientsButton_nurse)
-        val settingsButton: Button = findViewById(R.id.settingsButton_nurse)
-        val signOutButton: Button = findViewById(R.id.sighOutButton_nurse)
+        // Existing buttons
+        val patientsButton: Button =
+            findViewById(R.id.patientsButton_nurse)
+
+        val settingsButton: Button =
+            findViewById(R.id.settingsButton_nurse)
+
+        val signOutButton: Button =
+            findViewById(R.id.sighOutButton_nurse)
 
+        // New Patient Activities button
+        val patientActivitiesButton: Button =
+            findViewById(R.id.patientActivitiesButton_nurse)
+
+        // Patients button
         patientsButton.setOnClickListener {
             NavigationService(this).onLaunchPatientList()
         }
 
-        // settings button
+        // Settings button
         settingsButton.setOnClickListener {
             NavigationService(this).onSettings()
         }
 
-        // sign out button
+        // Patient Activities button
+        patientActivitiesButton.setOnClickListener {
+
+            // Temporary navigation
+            // Replace PatientActivitiesActivity later if needed
+
+            startActivity(
+                Intent(
+                    this,
+                    PatientActivitiesActivity::class.java
+                )
+            )
+        }
+
+        // Sign out button
         signOutButton.setOnClickListener {
             EmailPasswordAuthService.signOut(this)
             finish()
         }
     }
-}
+}