|
|
@ -21,7 +21,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel
|
|
|
|
import com.google.accompanist.permissions.ExperimentalPermissionsApi
|
|
|
|
import com.google.accompanist.permissions.ExperimentalPermissionsApi
|
|
|
|
import com.google.accompanist.permissions.PermissionStatus
|
|
|
|
import com.google.accompanist.permissions.PermissionStatus
|
|
|
|
import com.google.android.material.composethemeadapter.MdcTheme
|
|
|
|
import com.google.android.material.composethemeadapter.MdcTheme
|
|
|
|
import com.todoroo.astrid.ui.ReminderControlSet
|
|
|
|
|
|
|
|
import com.todoroo.astrid.ui.ReminderControlSetViewModel
|
|
|
|
import com.todoroo.astrid.ui.ReminderControlSetViewModel
|
|
|
|
import org.tasks.R
|
|
|
|
import org.tasks.R
|
|
|
|
import org.tasks.compose.AddReminderDialog
|
|
|
|
import org.tasks.compose.AddReminderDialog
|
|
|
@ -49,9 +48,7 @@ fun AlarmRow(
|
|
|
|
TaskEditRow(
|
|
|
|
TaskEditRow(
|
|
|
|
iconRes = R.drawable.ic_outline_notifications_24px,
|
|
|
|
iconRes = R.drawable.ic_outline_notifications_24px,
|
|
|
|
content = {
|
|
|
|
content = {
|
|
|
|
val viewState = vm.viewState.collectAsStateLifecycleAware()
|
|
|
|
val viewState = vm.viewState.collectAsStateLifecycleAware().value
|
|
|
|
val current: ReminderControlSet.ViewState = viewState.value
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
when (permissionStatus) {
|
|
|
|
when (permissionStatus) {
|
|
|
|
PermissionStatus.Granted -> {
|
|
|
|
PermissionStatus.Granted -> {
|
|
|
|
Alarms(
|
|
|
|
Alarms(
|
|
|
@ -87,13 +84,13 @@ fun AlarmRow(
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
AddReminderDialog.AddCustomReminderDialog(
|
|
|
|
AddReminderDialog.AddCustomReminderDialog(
|
|
|
|
openDialog = current.showCustomDialog,
|
|
|
|
openDialog = viewState.showCustomDialog,
|
|
|
|
addAlarm = addAlarm,
|
|
|
|
addAlarm = addAlarm,
|
|
|
|
closeDialog = { vm.showCustomDialog(visible = false) }
|
|
|
|
closeDialog = { vm.showCustomDialog(visible = false) }
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
AddReminderDialog.AddRandomReminderDialog(
|
|
|
|
AddReminderDialog.AddRandomReminderDialog(
|
|
|
|
openDialog = current.showRandomDialog,
|
|
|
|
openDialog = viewState.showRandomDialog,
|
|
|
|
addAlarm = addAlarm,
|
|
|
|
addAlarm = addAlarm,
|
|
|
|
closeDialog = { vm.showRandomDialog(visible = false) }
|
|
|
|
closeDialog = { vm.showRandomDialog(visible = false) }
|
|
|
|
)
|
|
|
|
)
|
|
|
|