From 64f5484d90b91f6b083609b883d434dea2fe374a Mon Sep 17 00:00:00 2001 From: wryther Date: Thu, 30 Mar 2023 20:51:01 -0400 Subject: [PATCH 1/5] Corrected selectedMedicine attribute to mirror Medicine id attribute --- app/src/main/java/com/medmapper/v33001/MainViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/medmapper/v33001/MainViewModel.kt b/app/src/main/java/com/medmapper/v33001/MainViewModel.kt index ce63c9b..803a437 100644 --- a/app/src/main/java/com/medmapper/v33001/MainViewModel.kt +++ b/app/src/main/java/com/medmapper/v33001/MainViewModel.kt @@ -67,14 +67,14 @@ class MainViewModel(var medicineService : IMedicineService) /*= MedicineService( user?.let { user -> val document = - if (selectedMedicine.medicationID == null || selectedMedicine.medicationID.isEmpty()) { + if (selectedMedicine.id == null || selectedMedicine.id.isEmpty()) { // create a new medicine firestore.collection("users").document(user.uid).collection("medications").document() } else { // update an existing specimen firestore.collection("users").document(user.uid).collection("medications").document() } - selectedMedicine.medicationID = document.id + selectedMedicine.id = document.id val handle = document.set(selectedMedicine) handle.addOnSuccessListener { Log.d("Firebase", "Document Saved") } handle.addOnFailureListener { Log.d("Firebase", "Save failed $it") } From a99a71c0294206771be4deeb09f429d2b18230f5 Mon Sep 17 00:00:00 2001 From: wryther Date: Thu, 30 Mar 2023 20:51:54 -0400 Subject: [PATCH 2/5] Changed Medicine DTO constructors to vars --- .../java/com/medmapper/v33001/dto/Medicine.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt b/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt index 99d6144..ec2655e 100644 --- a/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt +++ b/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt @@ -3,16 +3,16 @@ package com.medmapper.v33001.dto import java.time.LocalDate data class Medicine( - val id: String = "", - val uid: String = "", - val name: String = "", - val quantity: Int = 0, - val prescriptionStrength: String = "", - val startDate: LocalDate = LocalDate.now(), - val prescriptionLength: String = "", - val time: Long = 0, + var id: String = "", + var uid: String = "", + var name: String = "", + var quantity: Int = 0, + var prescriptionStrength: String = "", + var startDate: LocalDate = LocalDate.now(), + var prescriptionLength: String = "", + var time: Long = 0, // Frequency per 24 hours - val frequency: Int = 0) { + var frequency: Int = 0) { override fun toString(): String { return "$name, $quantity , $prescriptionStrength" } From cd5b697e7aaeebb1b406d3f25d3bab2d50e99731 Mon Sep 17 00:00:00 2001 From: wryther Date: Thu, 30 Mar 2023 20:55:31 -0400 Subject: [PATCH 3/5] Changed medicine to medication for better consistency --- app/src/main/res/layout/layout3.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/layout3.xml b/app/src/main/res/layout/layout3.xml index b876cdc..7a515cf 100644 --- a/app/src/main/res/layout/layout3.xml +++ b/app/src/main/res/layout/layout3.xml @@ -76,7 +76,7 @@ android:id="@+id/button10" android:layout_width="234dp" android:layout_height="78dp" - android:text="Add new Medicine " + android:text="Add new Medication " app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.497" app:layout_constraintStart_toStartOf="parent" @@ -93,7 +93,7 @@ android:text="Name" app:layout_constraintStart_toStartOf="parent" tools:layout_editor_absoluteY="100dp" - tools:text="Medicine Name" /> + tools:text="Medication Name" /> Date: Sat, 1 Apr 2023 12:24:18 -0400 Subject: [PATCH 4/5] Fixed end of xml file --- app/src/main/res/layout/layout3.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/layout3.xml b/app/src/main/res/layout/layout3.xml index 7a515cf..4bc77e1 100644 --- a/app/src/main/res/layout/layout3.xml +++ b/app/src/main/res/layout/layout3.xml @@ -155,3 +155,4 @@ + \ No newline at end of file From 2760c77215aa072490ec8908867e07debd8adf7a Mon Sep 17 00:00:00 2001 From: wryther Date: Sat, 1 Apr 2023 23:06:48 -0400 Subject: [PATCH 5/5] Making mutableStateOf private --- app/src/main/java/com/medmapper/v33001/MainViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/medmapper/v33001/MainViewModel.kt b/app/src/main/java/com/medmapper/v33001/MainViewModel.kt index 803a437..f24e3d7 100644 --- a/app/src/main/java/com/medmapper/v33001/MainViewModel.kt +++ b/app/src/main/java/com/medmapper/v33001/MainViewModel.kt @@ -18,7 +18,7 @@ class MainViewModel(var medicineService : IMedicineService) /*= MedicineService( internal val NEW_MEDICATION = "New Medication" var medicine : MutableLiveData> = MutableLiveData>() - var selectedMedicine by mutableStateOf(Medicine()) + private var selectedMedicine by mutableStateOf(Medicine()) var user: User? = null private lateinit var firestore: FirebaseFirestore