Skip to content
Open

UI #33

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ dependencies {
implementation "androidx.compose.ui:ui:$compose_ui_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
implementation 'androidx.compose.material:material:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
59 changes: 57 additions & 2 deletions app/src/main/java/com/medmapper/v33001/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,21 +1,40 @@
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
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<MainViewModel>()

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(
Expand All @@ -30,8 +49,44 @@ 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("")}
val context=LocalContext.current
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))}
)
Button (
onClick = { Toast.makeText(context,text: "$medicineName $prescriptionStrength $startDate $intakeFrequency $prescriptionLength",
Toast.LENGTH_LONG).show()})
{Text(text="Save Info ")}

}

@Preview(showBackground = true)
Expand Down
21 changes: 13 additions & 8 deletions app/src/main/res/layout/layout.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/Button_1"
android:layout_width="413dp"
android:layout_height="match_parent">


// buttons info, my schedule, my medication, share your schedule
android:layout_height="match_parent"
android:background="#6892d4"
tools:ignore="ExtraText">
<Button
android:id="@+id/button1"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="137dp"
android:layout_height="100dp"
android:background="@android:color/darker_gray"
android:background="#cce0ff"
android:text="@string/my_schedule"
android:textColor="@android:color/black"
android:textSize="16sp"
Expand All @@ -22,7 +22,7 @@
style="?android:attr/buttonBarButtonStyle"
android:layout_width="137dp"
android:layout_height="100dp"
android:background="@android:color/darker_gray"
android:background="#cce0ff"
android:text="@string/my_medication"
android:textColor="@android:color/black"
android:textSize="16sp"
Expand All @@ -33,12 +33,11 @@
style="?android:attr/buttonBarButtonStyle"
android:layout_width="137dp"
android:layout_height="100dp"
android:background="@android:color/darker_gray"
android:background="#cce0ff"
android:text="@string/share_your_schedule"
android:textColor="@android:color/black"
android:textSize="16sp"
android:translationY="90dp" />
// text view info, font, color, size
<TextView
android:id="@+id/textView2"
android:layout_width="200dp"
Expand All @@ -48,6 +47,8 @@
android:textAllCaps="false"
android:textColor="#000000"
android:textSize="34sp"
android:background="#ffffff"

android:translationX="-202dp"
android:translationY="-20dp" />

Expand All @@ -59,6 +60,7 @@
android:textAlignment="center"
android:textColor="#000000"
android:textSize="34sp"
android:background="#cce0ff"
android:translationX="-600dp"
android:translationY="190dp" />

Expand All @@ -70,6 +72,7 @@
android:textAlignment="center"
android:textColor="#000000"
android:textSize="34sp"
android:background="#cce0ff"
android:translationX="-988dp"
android:translationY="290dp" />

Expand All @@ -81,6 +84,7 @@
android:textAlignment="center"
android:textColor="#000000"
android:textSize="34sp"
android:background="#cce0ff"
android:translationX="-1376dp"
android:translationY="390dp" />

Expand All @@ -92,6 +96,7 @@
android:textAlignment="center"
android:textColor="#000000"
android:textSize="34sp"
android:background="#cce0ff"
android:translationX="-1765dp"
android:translationY="490dp" />

Expand Down
21 changes: 10 additions & 11 deletions app/src/main/res/layout/layout2.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

// buttons info, my schedule, my medication, share your schedule
android:layout_height="match_parent"
android:background="#6892d4">

<Button
android:id="@+id/button1"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="137dp"
android:layout_height="100dp"
android:background="@android:color/darker_gray"
android:background="#cce0ff"
android:text="@string/my_schedule"
android:textColor="@android:color/black"
android:textSize="16sp"

android:translationY="99dp" />
// text view info, font, color, size
<TextView
android:id="@+id/textView"
android:layout_width="350dp"
Expand All @@ -24,45 +23,44 @@
android:textColor="#000000"
android:textSize="24sp"
android:textStyle="bold"
android:background="#cce0ff"

android:translationX="-100dp"
android:translationY="180dp" />
// text view info, font, color, size
<EditText
android:id="@+id/editTextTextEmailAddress"
android:layout_width="350dp"
android:layout_height="50dp"
android:ems="10"
android:textColor="@color/white"
android:inputType="textEmailAddress"
android:text="@string/enter_email_of_recipient"
android:translationX="-450dp"
android:translationY="450dp" />
// buttons info, my schedule, my medication, share your schedule

<Button
android:id="@+id/button2"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="137dp"
android:layout_height="100dp"
android:background="@android:color/darker_gray"
android:background="#cce0ff"
android:text="@string/my_medication"
android:textColor="@android:color/black"
android:textSize="16sp"
android:translationX="-702dp"
android:translationY="99dp" />
// buttons info, my schedule, my medication, share your schedule

<Button
android:id="@+id/button3"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="137dp"
android:layout_height="100dp"
android:background="@android:color/darker_gray"
android:background="#cce0ff"
android:text="@string/share_your_schedule"
android:textColor="@android:color/black"
android:textSize="16sp"
android:translationX="-702dp"
android:translationY="90dp" />
// text view info, font, color, size
<TextView
android:id="@+id/textView2"
android:layout_width="200dp"
Expand All @@ -72,6 +70,7 @@
android:textAllCaps="false"
android:textColor="#000000"
android:textSize="34sp"
android:background="#ffffff"
android:translationX="-902dp"
android:translationY="-20dp" />
</LinearLayout>
15 changes: 15 additions & 0 deletions app/src/main/res/layout/layout3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/Button_1"
android:layout_width="413dp"
android:background="#6892d4"
android:layout_height="match_parent">


Expand Down Expand Up @@ -41,13 +42,16 @@
android:layout_marginStart="16dp"
android:text="Schedule "
app:layout_constraintStart_toStartOf="parent"
android:background="#cce0ff"
tools:layout_editor_absoluteY="12dp" />

<Button
android:id="@+id/button8"
android:layout_width="118dp"
android:layout_height="79dp"
android:text="Medications"
android:background="#cce0ff"

app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/button9"
app:layout_constraintHorizontal_bias="0.498"
Expand All @@ -59,6 +63,8 @@
android:layout_width="142dp"
android:layout_height="74dp"
android:layout_marginTop="12dp"
android:background="#cce0ff"

android:text="Share My Schedule "
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="273dp" />
Expand All @@ -81,6 +87,8 @@
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="1dp"
android:background="#cce0ff"

android:textSize="20sp" />

<EditText
Expand All @@ -91,6 +99,7 @@
android:ems="10"
android:inputType="textPersonName"
android:text="Name"
android:textColor="@color/white"
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="100dp"
tools:text="Medicine Name" />
Expand All @@ -101,6 +110,7 @@
android:layout_height="44dp"
android:layout_marginStart="12dp"
android:ems="10"
android:textColor="@color/white"
android:inputType="textEmailAddress"
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="166dp"
Expand All @@ -113,6 +123,7 @@
android:layout_marginStart="12dp"
android:ems="10"
android:inputType="date"
android:textColor="@color/white"
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="221dp"
tools:text="Start Date..." />
Expand All @@ -125,6 +136,7 @@
android:ems="10"
android:inputType="textPersonName"
android:text="Name"
android:textColor="@color/white"
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="279dp"
tools:text="Intake Frequency.." />
Expand All @@ -136,6 +148,7 @@
android:layout_marginStart="16dp"
android:ems="10"
android:inputType="textPersonName"
android:textColor="@color/white"
android:text="Name"
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="347dp"
Expand All @@ -147,6 +160,8 @@
android:layout_height="58dp"
android:layout_marginBottom="16dp"
android:text="Save"
android:background="#cce0ff"

app:layout_constraintBottom_toBottomOf="parent"
tools:layout_editor_absoluteX="134dp"
android:textSize="20sp"/>
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values/style.xml

This file was deleted.

14 changes: 14 additions & 0 deletions app/src/main/res/values/stylesheet.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"></meta>
</head>


</html>
// will be used to add style to the layouts


</resources>