|
|
@ -11,6 +11,8 @@ import androidx.compose.foundation.layout.Column
|
|
|
|
import androidx.compose.foundation.layout.Row
|
|
|
|
import androidx.compose.foundation.layout.Row
|
|
|
|
import androidx.compose.foundation.layout.Spacer
|
|
|
|
import androidx.compose.foundation.layout.Spacer
|
|
|
|
import androidx.compose.foundation.layout.fillMaxWidth
|
|
|
|
import androidx.compose.foundation.layout.fillMaxWidth
|
|
|
|
|
|
|
|
import androidx.compose.foundation.layout.height
|
|
|
|
|
|
|
|
import androidx.compose.foundation.layout.padding
|
|
|
|
import androidx.compose.material.MaterialTheme
|
|
|
|
import androidx.compose.material.MaterialTheme
|
|
|
|
import androidx.compose.material.Text
|
|
|
|
import androidx.compose.material.Text
|
|
|
|
import androidx.compose.material.ripple.rememberRipple
|
|
|
|
import androidx.compose.material.ripple.rememberRipple
|
|
|
@ -22,6 +24,7 @@ import androidx.compose.ui.draw.alpha
|
|
|
|
import androidx.compose.ui.platform.LocalContext
|
|
|
|
import androidx.compose.ui.platform.LocalContext
|
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
|
import androidx.compose.ui.text.style.TextDecoration
|
|
|
|
import androidx.compose.ui.text.style.TextDecoration
|
|
|
|
|
|
|
|
import androidx.compose.ui.unit.dp
|
|
|
|
import androidx.core.content.res.ResourcesCompat
|
|
|
|
import androidx.core.content.res.ResourcesCompat
|
|
|
|
import com.google.android.material.composethemeadapter.MdcTheme
|
|
|
|
import com.google.android.material.composethemeadapter.MdcTheme
|
|
|
|
import com.todoroo.andlib.utility.AndroidUtilities
|
|
|
|
import com.todoroo.andlib.utility.AndroidUtilities
|
|
|
@ -137,6 +140,7 @@ class ReminderControlSet : TaskEditControlFragment() {
|
|
|
|
MdcTheme {
|
|
|
|
MdcTheme {
|
|
|
|
val alarms = viewModel.selectedAlarms.collectAsStateLifecycleAware()
|
|
|
|
val alarms = viewModel.selectedAlarms.collectAsStateLifecycleAware()
|
|
|
|
Column {
|
|
|
|
Column {
|
|
|
|
|
|
|
|
Spacer(modifier = Modifier.height(8.dp))
|
|
|
|
alarms.value.forEach { alarm ->
|
|
|
|
alarms.value.forEach { alarm ->
|
|
|
|
AlarmRow(alarmToString.toString(alarm)) {
|
|
|
|
AlarmRow(alarmToString.toString(alarm)) {
|
|
|
|
viewModel.selectedAlarms.value =
|
|
|
|
viewModel.selectedAlarms.value =
|
|
|
@ -148,6 +152,7 @@ class ReminderControlSet : TaskEditControlFragment() {
|
|
|
|
text = stringResource(id = R.string.add_reminder),
|
|
|
|
text = stringResource(id = R.string.add_reminder),
|
|
|
|
style = MaterialTheme.typography.body1,
|
|
|
|
style = MaterialTheme.typography.body1,
|
|
|
|
modifier = Modifier
|
|
|
|
modifier = Modifier
|
|
|
|
|
|
|
|
.padding(vertical = 12.dp)
|
|
|
|
.clickable(
|
|
|
|
.clickable(
|
|
|
|
interactionSource = remember { MutableInteractionSource() },
|
|
|
|
interactionSource = remember { MutableInteractionSource() },
|
|
|
|
indication = rememberRipple(bounded = false),
|
|
|
|
indication = rememberRipple(bounded = false),
|
|
|
@ -174,7 +179,9 @@ class ReminderControlSet : TaskEditControlFragment() {
|
|
|
|
style = MaterialTheme.typography.body1.copy(
|
|
|
|
style = MaterialTheme.typography.body1.copy(
|
|
|
|
textDecoration = TextDecoration.Underline
|
|
|
|
textDecoration = TextDecoration.Underline
|
|
|
|
),
|
|
|
|
),
|
|
|
|
modifier = Modifier.clickable(
|
|
|
|
modifier = Modifier
|
|
|
|
|
|
|
|
.padding(vertical = 12.dp, horizontal = 16.dp)
|
|
|
|
|
|
|
|
.clickable(
|
|
|
|
interactionSource = remember { MutableInteractionSource() },
|
|
|
|
interactionSource = remember { MutableInteractionSource() },
|
|
|
|
indication = rememberRipple(bounded = false),
|
|
|
|
indication = rememberRipple(bounded = false),
|
|
|
|
onClick = { onClickRingType() }
|
|
|
|
onClick = { onClickRingType() }
|
|
|
@ -182,6 +189,7 @@ class ReminderControlSet : TaskEditControlFragment() {
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Spacer(modifier = Modifier.height(8.dp))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
val openCustomDialog = remember { showCustomDialog }
|
|
|
|
val openCustomDialog = remember { showCustomDialog }
|
|
|
@ -213,6 +221,8 @@ class ReminderControlSet : TaskEditControlFragment() {
|
|
|
|
|
|
|
|
|
|
|
|
override fun controlId() = TAG
|
|
|
|
override fun controlId() = TAG
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override val rootLayout = R.layout.control_set_template_no_padding
|
|
|
|
|
|
|
|
|
|
|
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
|
|
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
|
|
|
if (requestCode == REQUEST_NEW_ALARM) {
|
|
|
|
if (requestCode == REQUEST_NEW_ALARM) {
|
|
|
|
if (resultCode == Activity.RESULT_OK) {
|
|
|
|
if (resultCode == Activity.RESULT_OK) {
|
|
|
|