From e9f87f070c38bb17f2c191161cf0cec498d78967 Mon Sep 17 00:00:00 2001 From: bonima21 <79886034+bonima21@users.noreply.github.com> Date: Sat, 25 Mar 2023 14:33:23 -0400 Subject: [PATCH 1/7] Creating outline textField --- .../java/com/medmapper/v33001/MainActivity.kt | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/medmapper/v33001/MainActivity.kt b/app/src/main/java/com/medmapper/v33001/MainActivity.kt index a5822eb..6e53f08 100644 --- a/app/src/main/java/com/medmapper/v33001/MainActivity.kt +++ b/app/src/main/java/com/medmapper/v33001/MainActivity.kt @@ -8,14 +8,32 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.Surface import androidx.compose.material.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview +import com.google.firebase.auth.FirebaseAuth +import com.google.firebase.auth.FirebaseUser +import com.medmapper.v33001.dto.User import com.medmapper.v33001.ui.theme.MedMapperTheme +import org.koin.androidx.viewmodel.ext.android.viewModel + class MainActivity : ComponentActivity() { + + private var firebaseUser: FirebaseUser? = FirebaseAuth.getInstance().currentUser + private val viewModel: MainViewModel by viewModel() + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { + firebaseUser?.let { + val user = User(it.uid, "") + viewModel.user = user + viewModel.listenToMedicine() + } + val medicine by viewModel.medicine.observeAsState(initial = emptyList()) MedMapperTheme { // A surface container using the 'background' color from the theme Surface( @@ -30,8 +48,12 @@ class MainActivity : ComponentActivity() { } @Composable -fun Greeting(name: String) { - Text(text = "Hello $name!") +fun SpecimenFacts(name:String) { + var medicineName by remember {mutableStateOf("")} + var prescriptionStrength by by remember{mutableStateOf( "")} + var startDate by remember{mutableStateOf( "")} + var intakeFrequency by remember{mutableStateOf("")} + var prescriptionLength by remember{mutableStateOf("")} } @Preview(showBackground = true) From ca0dbef2b05ab5bca484404a8f7fc0e23c1507c9 Mon Sep 17 00:00:00 2001 From: bonima21 <79886034+bonima21@users.noreply.github.com> Date: Sat, 25 Mar 2023 14:40:08 -0400 Subject: [PATCH 2/7] Attempted outlined textfiled complete --- .../java/com/medmapper/v33001/MainActivity.kt | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/app/src/main/java/com/medmapper/v33001/MainActivity.kt b/app/src/main/java/com/medmapper/v33001/MainActivity.kt index 6e53f08..c303bc7 100644 --- a/app/src/main/java/com/medmapper/v33001/MainActivity.kt +++ b/app/src/main/java/com/medmapper/v33001/MainActivity.kt @@ -54,6 +54,33 @@ fun SpecimenFacts(name:String) { var startDate by remember{mutableStateOf( "")} var intakeFrequency by remember{mutableStateOf("")} var prescriptionLength by remember{mutableStateOf("")} + Column { + OutlinedTextField ( + value = medicineName, + onValueChange = {medicineName= it}, + label= {Text(stringResource(R.string.medicineName))} + ) + OutlinedTextField ( + value = prescriptionStrength + onValueChange = {prescriptionStrength= it}, + label= {Text(stringResource(R.string.prescriptionStrength))} + ) + OutlinedTextField ( + value = startDate, + onValueChange = {startDate= it}, + label= {Text(stringResource(R.string.startDate))} + ) + OutlinedTextField ( + value = intakeFrequency, + onValueChange = {intakeFrequency= it}, + label= {Text(stringResource(R.string.intakeFrequency))} + ) + OutlinedTextField ( + value = prescriptionLength, + onValueChange = {prescriptionLength it}, + label= {Text(stringResource(R.string.prescriptionLength))} + } + } @Preview(showBackground = true) From 541dfd71a199352343866adb9f09581dbf9af6ad Mon Sep 17 00:00:00 2001 From: bonima21 <79886034+bonima21@users.noreply.github.com> Date: Sat, 25 Mar 2023 14:46:53 -0400 Subject: [PATCH 3/7] Added save button to textfield --- app/src/main/java/com/medmapper/v33001/MainActivity.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/medmapper/v33001/MainActivity.kt b/app/src/main/java/com/medmapper/v33001/MainActivity.kt index c303bc7..2152863 100644 --- a/app/src/main/java/com/medmapper/v33001/MainActivity.kt +++ b/app/src/main/java/com/medmapper/v33001/MainActivity.kt @@ -1,6 +1,7 @@ package com.medmapper.v33001 import android.os.Bundle +import android.widget.Toast import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.layout.fillMaxSize @@ -54,6 +55,7 @@ fun SpecimenFacts(name:String) { var startDate by remember{mutableStateOf( "")} var intakeFrequency by remember{mutableStateOf("")} var prescriptionLength by remember{mutableStateOf("")} + val context=LocalContext.current Column { OutlinedTextField ( value = medicineName, @@ -79,7 +81,11 @@ fun SpecimenFacts(name:String) { value = prescriptionLength, onValueChange = {prescriptionLength it}, label= {Text(stringResource(R.string.prescriptionLength))} - } + ) + Button ( + onClick = { Toast.makeText(context,text: "$medicineName $prescriptionStrength $startDate $intakeFrequency $prescriptionLength", + Toast.LENGTH_LONG).show()}) + {Text(text="Save Info ")} } From 1d2ce1557205b473b0cd5c2dcab5c336ff098060 Mon Sep 17 00:00:00 2001 From: laeacepj Date: Sun, 9 Apr 2023 09:26:42 -0400 Subject: [PATCH 4/7] Adding style to layouts, attempted to add stylesheet, decided to do inline style --- app/src/main/res/layout/layout.xml | 19 ++++++++++++------- app/src/main/res/layout/layout2.xml | 1 - app/src/main/res/values/style.xml | 6 ------ app/src/main/res/values/stylesheet.xml | 14 ++++++++++++++ 4 files changed, 26 insertions(+), 14 deletions(-) delete mode 100644 app/src/main/res/values/style.xml create mode 100644 app/src/main/res/values/stylesheet.xml diff --git a/app/src/main/res/layout/layout.xml b/app/src/main/res/layout/layout.xml index 9d27e8e..10653ff 100644 --- a/app/src/main/res/layout/layout.xml +++ b/app/src/main/res/layout/layout.xml @@ -1,17 +1,17 @@ - - -// buttons info, my schedule, my medication, share your schedule + android:layout_height="match_parent" + android:background="#637796" + tools:ignore="ExtraText">