|
|
|
|
@ -25,11 +25,10 @@ import androidx.compose.material3.RadioButton
|
|
|
|
|
import androidx.compose.material3.Text
|
|
|
|
|
import androidx.compose.runtime.Composable
|
|
|
|
|
import androidx.compose.runtime.LaunchedEffect
|
|
|
|
|
import androidx.compose.runtime.getValue
|
|
|
|
|
import androidx.compose.runtime.MutableState
|
|
|
|
|
import androidx.compose.runtime.mutableStateOf
|
|
|
|
|
import androidx.compose.runtime.remember
|
|
|
|
|
import androidx.compose.runtime.saveable.rememberSaveable
|
|
|
|
|
import androidx.compose.runtime.setValue
|
|
|
|
|
import androidx.compose.ui.Alignment.Companion.CenterVertically
|
|
|
|
|
import androidx.compose.ui.ExperimentalComposeUiApi
|
|
|
|
|
import androidx.compose.ui.Modifier
|
|
|
|
|
@ -63,99 +62,141 @@ import java.util.concurrent.TimeUnit
|
|
|
|
|
|
|
|
|
|
@ExperimentalComposeUiApi
|
|
|
|
|
object AddReminderDialog {
|
|
|
|
|
// Helper functions for converting between Alarm properties and UI state
|
|
|
|
|
private fun unitIndexToMillis(unitIndex: Int): Long = when (unitIndex) {
|
|
|
|
|
1 -> TimeUnit.HOURS.toMillis(1)
|
|
|
|
|
2 -> TimeUnit.DAYS.toMillis(1)
|
|
|
|
|
3 -> TimeUnit.DAYS.toMillis(7)
|
|
|
|
|
else -> TimeUnit.MINUTES.toMillis(1)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun timeToAmountAndUnit(time: Long): Pair<Int, Int> {
|
|
|
|
|
val absTime = kotlin.math.abs(time)
|
|
|
|
|
return when {
|
|
|
|
|
absTime == 0L -> 0 to 0 // Default to minutes when time is 0
|
|
|
|
|
absTime % TimeUnit.DAYS.toMillis(7) == 0L ->
|
|
|
|
|
(absTime / TimeUnit.DAYS.toMillis(7)).toInt() to 3
|
|
|
|
|
absTime % TimeUnit.DAYS.toMillis(1) == 0L ->
|
|
|
|
|
(absTime / TimeUnit.DAYS.toMillis(1)).toInt() to 2
|
|
|
|
|
absTime % TimeUnit.HOURS.toMillis(1) == 0L ->
|
|
|
|
|
(absTime / TimeUnit.HOURS.toMillis(1)).toInt() to 1
|
|
|
|
|
else ->
|
|
|
|
|
(absTime / TimeUnit.MINUTES.toMillis(1)).toInt() to 0
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
fun AddRandomReminderDialog(
|
|
|
|
|
alarm: Alarm?,
|
|
|
|
|
updateAlarm: (Alarm) -> Unit,
|
|
|
|
|
viewState: ViewState,
|
|
|
|
|
addAlarm: (Alarm) -> Unit,
|
|
|
|
|
closeDialog: () -> Unit,
|
|
|
|
|
) {
|
|
|
|
|
// Create working copy from alarm or use defaults
|
|
|
|
|
var workingCopy by rememberSaveable {
|
|
|
|
|
mutableStateOf(alarm ?: Alarm(time = 15 * TimeUnit.MINUTES.toMillis(1), type = TYPE_RANDOM))
|
|
|
|
|
val time = rememberSaveable { mutableStateOf(15) }
|
|
|
|
|
val units = rememberSaveable { mutableStateOf(0) }
|
|
|
|
|
if (viewState.showRandomDialog) {
|
|
|
|
|
AlertDialog(
|
|
|
|
|
onDismissRequest = closeDialog,
|
|
|
|
|
text = { AddRandomReminder(time, units) },
|
|
|
|
|
confirmButton = {
|
|
|
|
|
Constants.TextButton(text = R.string.ok, onClick = {
|
|
|
|
|
time.value.takeIf { it > 0 }?.let { i ->
|
|
|
|
|
addAlarm(Alarm(time = i * units.millis, type = TYPE_RANDOM))
|
|
|
|
|
closeDialog()
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
dismissButton = {
|
|
|
|
|
Constants.TextButton(
|
|
|
|
|
text = R.string.cancel,
|
|
|
|
|
onClick = closeDialog
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
} else {
|
|
|
|
|
time.value = 15
|
|
|
|
|
units.value = 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AlertDialog(
|
|
|
|
|
onDismissRequest = closeDialog,
|
|
|
|
|
text = {
|
|
|
|
|
AddRandomReminder(
|
|
|
|
|
alarm = workingCopy,
|
|
|
|
|
updateAlarm = { workingCopy = it }
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
confirmButton = {
|
|
|
|
|
Constants.TextButton(text = R.string.ok, onClick = {
|
|
|
|
|
val (amount, _) = timeToAmountAndUnit(workingCopy.time)
|
|
|
|
|
if (amount > 0) {
|
|
|
|
|
updateAlarm(workingCopy)
|
|
|
|
|
closeDialog()
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
dismissButton = {
|
|
|
|
|
Constants.TextButton(
|
|
|
|
|
text = R.string.cancel,
|
|
|
|
|
onClick = closeDialog
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
fun AddCustomReminderDialog(
|
|
|
|
|
alarm: Alarm?,
|
|
|
|
|
updateAlarm: (Alarm) -> Unit,
|
|
|
|
|
viewState: ViewState,
|
|
|
|
|
addAlarm: (Alarm) -> Unit,
|
|
|
|
|
closeDialog: () -> Unit,
|
|
|
|
|
) {
|
|
|
|
|
// Create working copy from alarm or use defaults
|
|
|
|
|
var workingCopy by rememberSaveable {
|
|
|
|
|
mutableStateOf(
|
|
|
|
|
alarm ?: Alarm(
|
|
|
|
|
time = -1 * 15 * TimeUnit.MINUTES.toMillis(1),
|
|
|
|
|
type = TYPE_REL_END
|
|
|
|
|
val openDialog = viewState.showCustomDialog
|
|
|
|
|
val time = rememberSaveable { mutableStateOf(15) }
|
|
|
|
|
val units = rememberSaveable { mutableStateOf(0) }
|
|
|
|
|
val openRecurringDialog = rememberSaveable { mutableStateOf(false) }
|
|
|
|
|
val interval = rememberSaveable { mutableStateOf(0) }
|
|
|
|
|
val recurringUnits = rememberSaveable { mutableStateOf(0) }
|
|
|
|
|
val repeat = rememberSaveable { mutableStateOf(0) }
|
|
|
|
|
if (openDialog) {
|
|
|
|
|
if (!openRecurringDialog.value) {
|
|
|
|
|
AlertDialog(
|
|
|
|
|
onDismissRequest = closeDialog,
|
|
|
|
|
text = {
|
|
|
|
|
AddCustomReminder(
|
|
|
|
|
time,
|
|
|
|
|
units,
|
|
|
|
|
interval,
|
|
|
|
|
recurringUnits,
|
|
|
|
|
repeat,
|
|
|
|
|
showRecurring = {
|
|
|
|
|
openRecurringDialog.value = true
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
confirmButton = {
|
|
|
|
|
Constants.TextButton(text = R.string.ok, onClick = {
|
|
|
|
|
time.value.takeIf { it >= 0 }?.let { i ->
|
|
|
|
|
addAlarm(
|
|
|
|
|
Alarm(
|
|
|
|
|
time = -1 * i * units.millis,
|
|
|
|
|
type = TYPE_REL_END,
|
|
|
|
|
repeat = repeat.value,
|
|
|
|
|
interval = interval.value * recurringUnits.millis
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
closeDialog()
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
dismissButton = {
|
|
|
|
|
Constants.TextButton(
|
|
|
|
|
text = R.string.cancel,
|
|
|
|
|
onClick = closeDialog
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
AddRepeatReminderDialog(
|
|
|
|
|
openDialog = openRecurringDialog,
|
|
|
|
|
initialInterval = interval.value,
|
|
|
|
|
initialUnits = recurringUnits.value,
|
|
|
|
|
initialRepeat = repeat.value,
|
|
|
|
|
selected = { i, u, r ->
|
|
|
|
|
interval.value = i
|
|
|
|
|
recurringUnits.value = u
|
|
|
|
|
repeat.value = r
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
} else {
|
|
|
|
|
time.value = 15
|
|
|
|
|
units.value = 0
|
|
|
|
|
interval.value = 0
|
|
|
|
|
recurringUnits.value = 0
|
|
|
|
|
repeat.value = 0
|
|
|
|
|
}
|
|
|
|
|
var showRecurringDialog by rememberSaveable { mutableStateOf(false) }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!showRecurringDialog) {
|
|
|
|
|
@Composable
|
|
|
|
|
fun AddRepeatReminderDialog(
|
|
|
|
|
openDialog: MutableState<Boolean>,
|
|
|
|
|
initialInterval: Int,
|
|
|
|
|
initialUnits: Int,
|
|
|
|
|
initialRepeat: Int,
|
|
|
|
|
selected: (Int, Int, Int) -> Unit,
|
|
|
|
|
) {
|
|
|
|
|
val interval = rememberSaveable { mutableStateOf(initialInterval) }
|
|
|
|
|
val units = rememberSaveable { mutableStateOf(initialUnits) }
|
|
|
|
|
val repeat = rememberSaveable { mutableStateOf(initialRepeat) }
|
|
|
|
|
val closeDialog = {
|
|
|
|
|
openDialog.value = false
|
|
|
|
|
}
|
|
|
|
|
if (openDialog.value) {
|
|
|
|
|
AlertDialog(
|
|
|
|
|
onDismissRequest = closeDialog,
|
|
|
|
|
text = {
|
|
|
|
|
AddCustomReminder(
|
|
|
|
|
alarm = workingCopy,
|
|
|
|
|
updateAlarm = { workingCopy = it },
|
|
|
|
|
showRecurring = { showRecurringDialog = true }
|
|
|
|
|
AddRecurringReminder(
|
|
|
|
|
openDialog.value,
|
|
|
|
|
interval,
|
|
|
|
|
units,
|
|
|
|
|
repeat,
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
confirmButton = {
|
|
|
|
|
Constants.TextButton(text = R.string.ok, onClick = {
|
|
|
|
|
val (amount, _) = timeToAmountAndUnit(workingCopy.time)
|
|
|
|
|
if (amount >= 0) {
|
|
|
|
|
updateAlarm(workingCopy)
|
|
|
|
|
closeDialog()
|
|
|
|
|
if (interval.value > 0 && repeat.value > 0) {
|
|
|
|
|
selected(interval.value, units.value, repeat.value)
|
|
|
|
|
openDialog.value = false
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
@ -166,74 +207,19 @@ object AddReminderDialog {
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
} else {
|
|
|
|
|
interval.value = initialInterval.takeIf { it > 0 } ?: 15
|
|
|
|
|
units.value = initialUnits
|
|
|
|
|
repeat.value = initialRepeat.takeIf { it > 0 } ?: 4
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (showRecurringDialog) {
|
|
|
|
|
AddRepeatReminderDialog(
|
|
|
|
|
alarm = workingCopy,
|
|
|
|
|
updateAlarm = { workingCopy = it },
|
|
|
|
|
closeDialog = { showRecurringDialog = false }
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
fun AddRepeatReminderDialog(
|
|
|
|
|
alarm: Alarm,
|
|
|
|
|
updateAlarm: (Alarm) -> Unit,
|
|
|
|
|
closeDialog: () -> Unit,
|
|
|
|
|
) {
|
|
|
|
|
// Create working copy with defaults if no recurrence set
|
|
|
|
|
var workingCopy by rememberSaveable {
|
|
|
|
|
mutableStateOf(
|
|
|
|
|
if (alarm.interval == 0L && alarm.repeat == 0) {
|
|
|
|
|
// Default to 15 minutes, 4 times
|
|
|
|
|
alarm.copy(
|
|
|
|
|
interval = 15 * TimeUnit.MINUTES.toMillis(1),
|
|
|
|
|
repeat = 4
|
|
|
|
|
)
|
|
|
|
|
} else {
|
|
|
|
|
alarm
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AlertDialog(
|
|
|
|
|
onDismissRequest = closeDialog,
|
|
|
|
|
text = {
|
|
|
|
|
AddRecurringReminder(
|
|
|
|
|
alarm = workingCopy,
|
|
|
|
|
updateAlarm = { workingCopy = it }
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
confirmButton = {
|
|
|
|
|
Constants.TextButton(text = R.string.ok, onClick = {
|
|
|
|
|
val (intervalAmount, _) = timeToAmountAndUnit(workingCopy.interval)
|
|
|
|
|
if (intervalAmount > 0 && workingCopy.repeat > 0) {
|
|
|
|
|
updateAlarm(workingCopy)
|
|
|
|
|
closeDialog()
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
dismissButton = {
|
|
|
|
|
Constants.TextButton(
|
|
|
|
|
text = R.string.cancel,
|
|
|
|
|
onClick = closeDialog
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
fun AddRandomReminder(
|
|
|
|
|
alarm: Alarm,
|
|
|
|
|
updateAlarm: (Alarm) -> Unit,
|
|
|
|
|
time: MutableState<Int>,
|
|
|
|
|
units: MutableState<Int>,
|
|
|
|
|
) {
|
|
|
|
|
val (initialAmount, initialUnit) = timeToAmountAndUnit(alarm.time)
|
|
|
|
|
var selectedUnit by rememberSaveable { mutableStateOf(initialUnit) }
|
|
|
|
|
val amount = if (alarm.time == 0L) 0 else (alarm.time / unitIndexToMillis(selectedUnit)).toInt()
|
|
|
|
|
val scrollState = rememberScrollState()
|
|
|
|
|
|
|
|
|
|
Column(
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.fillMaxWidth()
|
|
|
|
|
@ -242,27 +228,14 @@ object AddReminderDialog {
|
|
|
|
|
CenteredH6(text = stringResource(id = R.string.randomly_every, "").trim())
|
|
|
|
|
val focusRequester = remember { FocusRequester() }
|
|
|
|
|
OutlinedIntInput(
|
|
|
|
|
value = amount,
|
|
|
|
|
onValueChange = { newAmount ->
|
|
|
|
|
val amt = newAmount ?: 0
|
|
|
|
|
updateAlarm(alarm.copy(time = amt * unitIndexToMillis(selectedUnit)))
|
|
|
|
|
},
|
|
|
|
|
time,
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.fillMaxWidth()
|
|
|
|
|
.focusRequester(focusRequester)
|
|
|
|
|
)
|
|
|
|
|
Spacer(modifier = Modifier.height(16.dp))
|
|
|
|
|
options.forEachIndexed { index, option ->
|
|
|
|
|
RadioRow(
|
|
|
|
|
index = index,
|
|
|
|
|
option = option,
|
|
|
|
|
timeAmount = amount,
|
|
|
|
|
unitIndex = selectedUnit,
|
|
|
|
|
onUnitSelected = { newUnit ->
|
|
|
|
|
selectedUnit = newUnit
|
|
|
|
|
updateAlarm(alarm.copy(time = amount * unitIndexToMillis(newUnit)))
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
RadioRow(index, option, time, units)
|
|
|
|
|
}
|
|
|
|
|
ShowKeyboard(true, focusRequester)
|
|
|
|
|
}
|
|
|
|
|
@ -270,19 +243,14 @@ object AddReminderDialog {
|
|
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
fun AddCustomReminder(
|
|
|
|
|
alarm: Alarm,
|
|
|
|
|
updateAlarm: (Alarm) -> Unit,
|
|
|
|
|
time: MutableState<Int>,
|
|
|
|
|
units: MutableState<Int>,
|
|
|
|
|
interval: MutableState<Int>,
|
|
|
|
|
recurringUnits: MutableState<Int>,
|
|
|
|
|
repeat: MutableState<Int>,
|
|
|
|
|
showRecurring: () -> Unit,
|
|
|
|
|
) {
|
|
|
|
|
val (initialAmount, initialUnit) = timeToAmountAndUnit(alarm.time)
|
|
|
|
|
var selectedUnit by rememberSaveable { mutableStateOf(initialUnit) }
|
|
|
|
|
val amount = if (alarm.time == 0L) 0 else kotlin.math.abs(alarm.time / unitIndexToMillis(selectedUnit)).toInt()
|
|
|
|
|
|
|
|
|
|
val (initialIntervalAmount, initialIntervalUnit) = timeToAmountAndUnit(alarm.interval)
|
|
|
|
|
val intervalAmount = if (alarm.interval == 0L) 0 else (alarm.interval / unitIndexToMillis(initialIntervalUnit)).toInt()
|
|
|
|
|
|
|
|
|
|
val scrollState = rememberScrollState()
|
|
|
|
|
|
|
|
|
|
Column(
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.fillMaxWidth()
|
|
|
|
|
@ -291,11 +259,7 @@ object AddReminderDialog {
|
|
|
|
|
CenteredH6(resId = R.string.custom_notification)
|
|
|
|
|
val focusRequester = remember { FocusRequester() }
|
|
|
|
|
OutlinedIntInput(
|
|
|
|
|
value = amount,
|
|
|
|
|
onValueChange = { newAmount ->
|
|
|
|
|
val amt = newAmount ?: 0
|
|
|
|
|
updateAlarm(alarm.copy(time = -1 * amt * unitIndexToMillis(selectedUnit)))
|
|
|
|
|
},
|
|
|
|
|
time,
|
|
|
|
|
minValue = 0,
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.fillMaxWidth()
|
|
|
|
|
@ -303,17 +267,7 @@ object AddReminderDialog {
|
|
|
|
|
)
|
|
|
|
|
Spacer(modifier = Modifier.height(16.dp))
|
|
|
|
|
options.forEachIndexed { index, option ->
|
|
|
|
|
RadioRow(
|
|
|
|
|
index = index,
|
|
|
|
|
option = option,
|
|
|
|
|
timeAmount = amount,
|
|
|
|
|
unitIndex = selectedUnit,
|
|
|
|
|
onUnitSelected = { newUnit ->
|
|
|
|
|
selectedUnit = newUnit
|
|
|
|
|
updateAlarm(alarm.copy(time = -1 * amount * unitIndexToMillis(newUnit)))
|
|
|
|
|
},
|
|
|
|
|
formatString = R.string.alarm_before_due
|
|
|
|
|
)
|
|
|
|
|
RadioRow(index, option, time, units, R.string.alarm_before_due)
|
|
|
|
|
}
|
|
|
|
|
Divider(modifier = Modifier.padding(vertical = 4.dp), thickness = 1.dp)
|
|
|
|
|
Row(modifier = Modifier
|
|
|
|
|
@ -334,11 +288,11 @@ object AddReminderDialog {
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
val repeating = alarm.repeat > 0 && intervalAmount > 0
|
|
|
|
|
val repeating = repeat.value > 0 && interval.value > 0
|
|
|
|
|
val text = if (repeating) {
|
|
|
|
|
LocalContext.current.resources.getRepeatString(
|
|
|
|
|
alarm.repeat,
|
|
|
|
|
alarm.interval
|
|
|
|
|
repeat.value,
|
|
|
|
|
interval.value * recurringUnits.millis
|
|
|
|
|
)
|
|
|
|
|
} else {
|
|
|
|
|
stringResource(id = R.string.repeat_option_does_not_repeat)
|
|
|
|
|
@ -351,9 +305,11 @@ object AddReminderDialog {
|
|
|
|
|
.align(CenterVertically)
|
|
|
|
|
)
|
|
|
|
|
if (repeating) {
|
|
|
|
|
ClearButton(onClick = {
|
|
|
|
|
updateAlarm(alarm.copy(repeat = 0, interval = 0))
|
|
|
|
|
})
|
|
|
|
|
ClearButton {
|
|
|
|
|
repeat.value = 0
|
|
|
|
|
interval.value = 0
|
|
|
|
|
recurringUnits.value = 0
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ShowKeyboard(true, focusRequester)
|
|
|
|
|
@ -362,14 +318,12 @@ object AddReminderDialog {
|
|
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
fun AddRecurringReminder(
|
|
|
|
|
alarm: Alarm,
|
|
|
|
|
updateAlarm: (Alarm) -> Unit,
|
|
|
|
|
openDialog: Boolean,
|
|
|
|
|
interval: MutableState<Int>,
|
|
|
|
|
units: MutableState<Int>,
|
|
|
|
|
repeat: MutableState<Int>
|
|
|
|
|
) {
|
|
|
|
|
val (initialIntervalAmount, initialIntervalUnit) = timeToAmountAndUnit(alarm.interval)
|
|
|
|
|
var selectedUnit by rememberSaveable { mutableStateOf(initialIntervalUnit) }
|
|
|
|
|
val intervalAmount = if (alarm.interval == 0L) 0 else (alarm.interval / unitIndexToMillis(selectedUnit)).toInt()
|
|
|
|
|
val scrollState = rememberScrollState()
|
|
|
|
|
|
|
|
|
|
Column(
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.fillMaxWidth()
|
|
|
|
|
@ -378,40 +332,24 @@ object AddReminderDialog {
|
|
|
|
|
CenteredH6(text = stringResource(id = R.string.repeats_plural, "").trim())
|
|
|
|
|
val focusRequester = remember { FocusRequester() }
|
|
|
|
|
OutlinedIntInput(
|
|
|
|
|
value = intervalAmount,
|
|
|
|
|
onValueChange = { newAmount ->
|
|
|
|
|
val amt = newAmount ?: 0
|
|
|
|
|
updateAlarm(alarm.copy(interval = amt * unitIndexToMillis(selectedUnit)))
|
|
|
|
|
},
|
|
|
|
|
time = interval,
|
|
|
|
|
modifier = Modifier.focusRequester(focusRequester),
|
|
|
|
|
)
|
|
|
|
|
Spacer(modifier = Modifier.height(16.dp))
|
|
|
|
|
options.forEachIndexed { index, option ->
|
|
|
|
|
RadioRow(
|
|
|
|
|
index = index,
|
|
|
|
|
option = option,
|
|
|
|
|
timeAmount = intervalAmount,
|
|
|
|
|
unitIndex = selectedUnit,
|
|
|
|
|
onUnitSelected = { newUnit ->
|
|
|
|
|
selectedUnit = newUnit
|
|
|
|
|
updateAlarm(alarm.copy(interval = intervalAmount * unitIndexToMillis(newUnit)))
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
RadioRow(index, option, interval, units)
|
|
|
|
|
}
|
|
|
|
|
Divider(modifier = Modifier.padding(vertical = 4.dp), thickness = 1.dp)
|
|
|
|
|
Row(modifier = Modifier.fillMaxWidth()) {
|
|
|
|
|
OutlinedIntInput(
|
|
|
|
|
value = alarm.repeat,
|
|
|
|
|
onValueChange = { newRepeat ->
|
|
|
|
|
updateAlarm(alarm.copy(repeat = newRepeat ?: 0))
|
|
|
|
|
},
|
|
|
|
|
time = repeat,
|
|
|
|
|
modifier = Modifier.weight(0.5f),
|
|
|
|
|
autoSelect = false,
|
|
|
|
|
)
|
|
|
|
|
BodyText(
|
|
|
|
|
text = LocalContext.current.resources.getQuantityString(
|
|
|
|
|
R.plurals.repeat_times,
|
|
|
|
|
alarm.repeat
|
|
|
|
|
repeat.value
|
|
|
|
|
),
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.weight(0.5f)
|
|
|
|
|
@ -419,7 +357,7 @@ object AddReminderDialog {
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ShowKeyboard(true, focusRequester)
|
|
|
|
|
ShowKeyboard(openDialog, focusRequester)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -429,6 +367,14 @@ object AddReminderDialog {
|
|
|
|
|
R.plurals.reminder_days,
|
|
|
|
|
R.plurals.reminder_week,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
private val MutableState<Int>.millis: Long
|
|
|
|
|
get() = when (value) {
|
|
|
|
|
1 -> TimeUnit.HOURS.toMillis(1)
|
|
|
|
|
2 -> TimeUnit.DAYS.toMillis(1)
|
|
|
|
|
3 -> TimeUnit.DAYS.toMillis(7)
|
|
|
|
|
else -> TimeUnit.MINUTES.toMillis(1)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ExperimentalComposeUiApi
|
|
|
|
|
@ -445,48 +391,25 @@ fun ShowKeyboard(visible: Boolean, focusRequester: FocusRequester) {
|
|
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
fun OutlinedIntInput(
|
|
|
|
|
value: Int?,
|
|
|
|
|
onValueChange: (Int?) -> Unit,
|
|
|
|
|
time: MutableState<Int>,
|
|
|
|
|
modifier: Modifier = Modifier,
|
|
|
|
|
minValue: Int = 1,
|
|
|
|
|
autoSelect: Boolean = true,
|
|
|
|
|
) {
|
|
|
|
|
var textFieldValue by remember {
|
|
|
|
|
val value = rememberSaveable(stateSaver = TextFieldValue.Saver) {
|
|
|
|
|
val text = time.value.toString()
|
|
|
|
|
mutableStateOf(
|
|
|
|
|
TextFieldValue(
|
|
|
|
|
text = value?.toString() ?: "",
|
|
|
|
|
selection = if (autoSelect) {
|
|
|
|
|
TextRange(0, value?.toString()?.length ?: 0)
|
|
|
|
|
} else {
|
|
|
|
|
TextRange.Zero
|
|
|
|
|
}
|
|
|
|
|
text = text,
|
|
|
|
|
selection = TextRange(0, if (autoSelect) text.length else 0)
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Sync when external value changes, but don't interfere with user editing
|
|
|
|
|
LaunchedEffect(value) {
|
|
|
|
|
val currentParsedValue = textFieldValue.text.toIntOrNull()
|
|
|
|
|
// Only sync if the new value is different from what we currently parse to,
|
|
|
|
|
// and don't sync if the text field is empty (user is actively deleting)
|
|
|
|
|
if (currentParsedValue != value && textFieldValue.text.isNotEmpty()) {
|
|
|
|
|
val newText = value?.toString() ?: ""
|
|
|
|
|
textFieldValue = TextFieldValue(
|
|
|
|
|
text = newText,
|
|
|
|
|
selection = if (autoSelect) {
|
|
|
|
|
TextRange(0, newText.length)
|
|
|
|
|
} else {
|
|
|
|
|
textFieldValue.selection
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
OutlinedTextField(
|
|
|
|
|
value = textFieldValue,
|
|
|
|
|
value = value.value,
|
|
|
|
|
onValueChange = {
|
|
|
|
|
textFieldValue = it.copy(text = it.text.filter { t -> t.isDigit() })
|
|
|
|
|
onValueChange(textFieldValue.text.toIntOrNull())
|
|
|
|
|
value.value = it.copy(text = it.text.filter { t -> t.isDigit() })
|
|
|
|
|
time.value = value.value.text.toIntOrNull() ?: 0
|
|
|
|
|
},
|
|
|
|
|
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
|
|
|
|
|
modifier = modifier.padding(horizontal = 16.dp),
|
|
|
|
|
@ -496,7 +419,7 @@ fun OutlinedIntInput(
|
|
|
|
|
focusedBorderColor = MaterialTheme.colorScheme.onSurface,
|
|
|
|
|
unfocusedBorderColor = MaterialTheme.colorScheme.onSurface,
|
|
|
|
|
),
|
|
|
|
|
isError = textFieldValue.text.toIntOrNull()?.let { it < minValue } ?: true,
|
|
|
|
|
isError = value.value.text.toIntOrNull()?.let { it < minValue } ?: true,
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -522,24 +445,23 @@ fun CenteredH6(text: String) {
|
|
|
|
|
fun RadioRow(
|
|
|
|
|
index: Int,
|
|
|
|
|
option: Int,
|
|
|
|
|
timeAmount: Int,
|
|
|
|
|
unitIndex: Int,
|
|
|
|
|
onUnitSelected: (Int) -> Unit,
|
|
|
|
|
time: MutableState<Int>,
|
|
|
|
|
units: MutableState<Int>,
|
|
|
|
|
formatString: Int? = null,
|
|
|
|
|
) {
|
|
|
|
|
val optionString = LocalContext.current.resources.getQuantityString(option, timeAmount)
|
|
|
|
|
val optionString = LocalContext.current.resources.getQuantityString(option, time.value)
|
|
|
|
|
Row(
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.fillMaxWidth()
|
|
|
|
|
.clickable { onUnitSelected(index) }
|
|
|
|
|
.clickable { units.value = index }
|
|
|
|
|
) {
|
|
|
|
|
RadioButton(
|
|
|
|
|
selected = index == unitIndex,
|
|
|
|
|
onClick = { onUnitSelected(index) },
|
|
|
|
|
selected = index == units.value,
|
|
|
|
|
onClick = { units.value = index },
|
|
|
|
|
modifier = Modifier.align(CenterVertically)
|
|
|
|
|
)
|
|
|
|
|
BodyText(
|
|
|
|
|
text = if (index == unitIndex) {
|
|
|
|
|
text = if (index == units.value) {
|
|
|
|
|
formatString
|
|
|
|
|
?.let { stringResource(id = formatString, optionString) }
|
|
|
|
|
?: optionString
|
|
|
|
|
@ -584,14 +506,8 @@ fun AddAlarmDialog(
|
|
|
|
|
dismiss()
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
TYPE_REL_END -> {
|
|
|
|
|
if (viewState.replace.time < 0) {
|
|
|
|
|
// Custom reminder (before due)
|
|
|
|
|
addCustom()
|
|
|
|
|
dismiss()
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// TODO: if replacing custom alarm show custom picker
|
|
|
|
|
// TODO: prepopulate pickers with existing values
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
CustomDialog(visible = viewState.showAddAlarm, onDismiss = dismiss) {
|
|
|
|
|
@ -639,11 +555,11 @@ fun AddAlarmDialog(
|
|
|
|
|
fun AddCustomReminderOne() =
|
|
|
|
|
TasksTheme {
|
|
|
|
|
AddReminderDialog.AddCustomReminder(
|
|
|
|
|
alarm = Alarm(
|
|
|
|
|
time = -1 * TimeUnit.MINUTES.toMillis(1),
|
|
|
|
|
type = TYPE_REL_END
|
|
|
|
|
),
|
|
|
|
|
updateAlarm = {},
|
|
|
|
|
time = remember { mutableStateOf(1) },
|
|
|
|
|
units = remember { mutableStateOf(0) },
|
|
|
|
|
interval = remember { mutableStateOf(0) },
|
|
|
|
|
recurringUnits = remember { mutableStateOf(0) },
|
|
|
|
|
repeat = remember { mutableStateOf(0) },
|
|
|
|
|
showRecurring = {},
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
@ -655,11 +571,11 @@ fun AddCustomReminderOne() =
|
|
|
|
|
fun AddCustomReminder() =
|
|
|
|
|
TasksTheme {
|
|
|
|
|
AddReminderDialog.AddCustomReminder(
|
|
|
|
|
alarm = Alarm(
|
|
|
|
|
time = -15 * TimeUnit.HOURS.toMillis(1),
|
|
|
|
|
type = TYPE_REL_END
|
|
|
|
|
),
|
|
|
|
|
updateAlarm = {},
|
|
|
|
|
time = remember { mutableStateOf(15) },
|
|
|
|
|
units = remember { mutableStateOf(1) },
|
|
|
|
|
interval = remember { mutableStateOf(0) },
|
|
|
|
|
recurringUnits = remember { mutableStateOf(0) },
|
|
|
|
|
repeat = remember { mutableStateOf(0) },
|
|
|
|
|
showRecurring = {},
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
@ -671,13 +587,10 @@ fun AddCustomReminder() =
|
|
|
|
|
fun AddRepeatingReminderOne() =
|
|
|
|
|
TasksTheme {
|
|
|
|
|
AddReminderDialog.AddRecurringReminder(
|
|
|
|
|
alarm = Alarm(
|
|
|
|
|
time = -1 * TimeUnit.MINUTES.toMillis(1),
|
|
|
|
|
type = TYPE_REL_END,
|
|
|
|
|
interval = TimeUnit.MINUTES.toMillis(1),
|
|
|
|
|
repeat = 1
|
|
|
|
|
),
|
|
|
|
|
updateAlarm = {},
|
|
|
|
|
openDialog = true,
|
|
|
|
|
interval = remember { mutableStateOf(1) },
|
|
|
|
|
units = remember { mutableStateOf(0) },
|
|
|
|
|
repeat = remember { mutableStateOf(1) },
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -688,13 +601,10 @@ fun AddRepeatingReminderOne() =
|
|
|
|
|
fun AddRepeatingReminder() =
|
|
|
|
|
TasksTheme {
|
|
|
|
|
AddReminderDialog.AddRecurringReminder(
|
|
|
|
|
alarm = Alarm(
|
|
|
|
|
time = -15 * TimeUnit.HOURS.toMillis(1),
|
|
|
|
|
type = TYPE_REL_END,
|
|
|
|
|
interval = 15 * TimeUnit.HOURS.toMillis(1),
|
|
|
|
|
repeat = 4
|
|
|
|
|
),
|
|
|
|
|
updateAlarm = {},
|
|
|
|
|
openDialog = true,
|
|
|
|
|
interval = remember { mutableStateOf(15) },
|
|
|
|
|
units = remember { mutableStateOf(1) },
|
|
|
|
|
repeat = remember { mutableStateOf(4) },
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -705,11 +615,8 @@ fun AddRepeatingReminder() =
|
|
|
|
|
fun AddRandomReminderOne() =
|
|
|
|
|
TasksTheme {
|
|
|
|
|
AddReminderDialog.AddRandomReminder(
|
|
|
|
|
alarm = Alarm(
|
|
|
|
|
time = TimeUnit.MINUTES.toMillis(1),
|
|
|
|
|
type = TYPE_RANDOM
|
|
|
|
|
),
|
|
|
|
|
updateAlarm = {}
|
|
|
|
|
time = remember { mutableStateOf(1) },
|
|
|
|
|
units = remember { mutableStateOf(0) }
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -720,11 +627,8 @@ fun AddRandomReminderOne() =
|
|
|
|
|
fun AddRandomReminder() =
|
|
|
|
|
TasksTheme {
|
|
|
|
|
AddReminderDialog.AddRandomReminder(
|
|
|
|
|
alarm = Alarm(
|
|
|
|
|
time = 15 * TimeUnit.HOURS.toMillis(1),
|
|
|
|
|
type = TYPE_RANDOM
|
|
|
|
|
),
|
|
|
|
|
updateAlarm = {}
|
|
|
|
|
time = remember { mutableStateOf(15) },
|
|
|
|
|
units = remember { mutableStateOf(1) }
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|