Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Solution for issue #79 #83

Merged
merged 2 commits into from
Oct 17, 2023
Merged

Solution for issue #79 #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a821c7
Requested focus for the text field after navigation is finished
MJJacobs01 Oct 16, 2023
838c2b1
Fixed syntax
MJJacobs01 Oct 16, 2023
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
33 changes: 24 additions & 9 deletions app/src/main/java/com/waseefakhtar/doseapp/feature/addmedication/AddMedicationRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,19 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableLongStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
Expand Down Expand Up @@ -75,7 +80,6 @@ fun DefaultPreview() {
fun AddMedicationRoute(
onBackClicked: () -> Unit,
navigateToMedicationConfirm: (List<Medication>) -> Unit,
modifier: Modifier = Modifier,
viewModel: AddMedicationViewModel = hiltViewModel()
) {
val analyticsHelper = AnalyticsHelper.getInstance(LocalContext.current)
Expand All @@ -93,11 +97,16 @@ fun AddMedicationScreen(
var medicationName by rememberSaveable { mutableStateOf("") }
var numberOfDosage by rememberSaveable { mutableStateOf("1") }
var recurrence by rememberSaveable { mutableStateOf(Recurrence.Daily.name) }
var endDate by rememberSaveable { mutableStateOf(Date().time) }
var endDate by rememberSaveable { mutableLongStateOf(Date().time) }
var isMorningSelected by rememberSaveable { mutableStateOf(false) }
var isAfternoonSelected by rememberSaveable { mutableStateOf(false) }
var isEveningSelected by rememberSaveable { mutableStateOf(false) }
var isNightSelected by rememberSaveable { mutableStateOf(false) }
val focusRequester = remember { FocusRequester() }

LaunchedEffect(Unit) {
focusRequester.requestFocus()
}

Column(
modifier = Modifier
Expand Down Expand Up @@ -132,7 +141,9 @@ fun AddMedicationScreen(
style = MaterialTheme.typography.bodyLarge
)
TextField(
modifier = Modifier.fillMaxWidth(),
modifier = Modifier
.fillMaxWidth()
.focusRequester(focusRequester),
value = medicationName,
onValueChange = { medicationName = it },
// label = { Text(text = stringResource(id = R.string.medication_name)) },
Expand Down Expand Up @@ -199,7 +210,7 @@ fun AddMedicationScreen(
style = MaterialTheme.typography.bodyLarge
)

var selectionCount by rememberSaveable { mutableStateOf(0) }
var selectionCount by rememberSaveable { mutableIntStateOf(0) }
val scope = rememberCoroutineScope()
val context = LocalContext.current

Expand Down Expand Up @@ -356,7 +367,10 @@ fun AddMedicationScreen(
Toast.LENGTH_LONG
).show()

val event = String.format(AnalyticsEvents.ADD_MEDICATION_MEDICATION_VALUE_INVALIDATED, invalidatedValue)
val event = String.format(
AnalyticsEvents.ADD_MEDICATION_MEDICATION_VALUE_INVALIDATED,
invalidatedValue
)
analyticsHelper.logEvent(event)
},
onValidate = {
Expand Down Expand Up @@ -415,7 +429,8 @@ private fun validateMedication(
if (eveningSelection) timesOfDay.add(TimesOfDay.Evening)
if (nightSelection) timesOfDay.add(TimesOfDay.Night)

val medications = viewModel.createMedications(name, dosage, recurrence, Date(endDate), timesOfDay)
val medications =
viewModel.createMedications(name, dosage, recurrence, Date(endDate), timesOfDay)

onValidate(medications)
}
Expand Down Expand Up @@ -519,9 +534,9 @@ fun EndDateTextField(endDate: (Long) -> Unit) {
val context = LocalContext.current

val calendar = Calendar.getInstance()
val year: Int = calendar.get(Calendar.YEAR)
val month: Int = calendar.get(Calendar.MONTH)
val day: Int = calendar.get(Calendar.DAY_OF_MONTH)
val year: Int = calendar[Calendar.YEAR]
val month: Int = calendar[Calendar.MONTH]
val day: Int = calendar[Calendar.DAY_OF_MONTH]
calendar.time = Date()

val datePickerDialog =
Expand Down
Loading