Use new compose fragment for reminder control set

app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.kt

@@ -4,18 +4,13 @@ import android.app.Activity
 import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
-import android.view.ViewGroup
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-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.Text
 import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -26,7 +21,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.core.content.res.ResourcesCompat
-import com.google.android.material.composethemeadapter.MdcTheme
 import com.todoroo.andlib.utility.AndroidUtilities
 import dagger.hilt.android.AndroidEntryPoint
 import org.tasks.R
@@ -41,17 +35,16 @@ import org.tasks.data.Alarm.Companion.TYPE_REL_START
 import org.tasks.data.Alarm.Companion.whenDue
 import org.tasks.data.Alarm.Companion.whenOverdue
 import org.tasks.data.Alarm.Companion.whenStarted
-import org.tasks.databinding.ControlSetRemindersBinding
 import org.tasks.date.DateTimeUtils
 import org.tasks.dialogs.DialogBuilder
 import org.tasks.dialogs.MyTimePickerDialog
 import org.tasks.reminders.AlarmToString
-import org.tasks.ui.TaskEditControlFragment
+import org.tasks.ui.TaskEditControlComposeFragment
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ReminderControlSet : TaskEditControlFragment() {
+class ReminderControlSet : TaskEditControlComposeFragment() {
     @Inject lateinit var activity: Activity
     @Inject lateinit var dialogBuilder: DialogBuilder
     @Inject lateinit var alarmToString: AlarmToString
@@ -133,96 +126,87 @@ class ReminderControlSet : TaskEditControlFragment() {
     }
 
     @OptIn(ExperimentalComposeUiApi::class)
-    override fun bind(parent: ViewGroup?) =
+    @Composable
-        ControlSetRemindersBinding.inflate(layoutInflater, parent, true).let {
+    override fun Body() {
-            
+        val alarms = viewModel.selectedAlarms.collectAsStateLifecycleAware()
-            it.alertContainer.setContent {
+        Column {
-                MdcTheme {
+            Spacer(modifier = Modifier.height(8.dp))
-                    val alarms = viewModel.selectedAlarms.collectAsStateLifecycleAware()
+            alarms.value.forEach { alarm ->
-                    Column {
+                AlarmRow(alarmToString.toString(alarm)) {
-                        Spacer(modifier = Modifier.height(8.dp))
+                    viewModel.selectedAlarms.value =
-                        alarms.value.forEach { alarm ->
+                        viewModel.selectedAlarms.value.minus(alarm)
-                            AlarmRow(alarmToString.toString(alarm)) {
+                }
-                                viewModel.selectedAlarms.value =
+            }
-                                    viewModel.selectedAlarms.value.minus(alarm)
+            Row(modifier = Modifier.fillMaxWidth()) {
-                            }
+                Text(
-                        }
+                    text = stringResource(id = R.string.add_reminder),
-                        Row(modifier = Modifier.fillMaxWidth()) {
+                    style = MaterialTheme.typography.body1,
-                            Text(
+                    modifier = Modifier
-                                text = stringResource(id = R.string.add_reminder),
+                        .padding(vertical = 12.dp)
-                                style = MaterialTheme.typography.body1,
+                        .clickable(
-                                modifier = Modifier
+                            interactionSource = remember { MutableInteractionSource() },
-                                    .padding(vertical = 12.dp)
+                            indication = rememberRipple(bounded = false),
-                                    .clickable(
+                            onClick = { addAlarm() }
-                                        interactionSource = remember { MutableInteractionSource() },
+                        )
-                                        indication = rememberRipple(bounded = false),
+                        .alpha(
-                                        onClick = { addAlarm() }
+                            ResourcesCompat.getFloat(
-                                    )
+                                LocalContext.current.resources,
-                                    .alpha(
+                                R.dimen.alpha_disabled
-                                        ResourcesCompat.getFloat(
-                                            LocalContext.current.resources,
-                                            R.dimen.alpha_disabled
-                                        )
-                                    )
                             )
-                            Spacer(modifier = Modifier.weight(1f))
+                        )
-                            val ringMode = remember { this@ReminderControlSet.ringMode }
+                )
-                            if (alarms.value.isNotEmpty()) {
+                Spacer(modifier = Modifier.weight(1f))
-                                Text(
+                val ringMode = remember { this@ReminderControlSet.ringMode }
-                                    text = stringResource(
+                if (alarms.value.isNotEmpty()) {
-                                        id = when (ringMode.value) {
+                    Text(
-                                            2 -> R.string.ring_nonstop
+                        text = stringResource(
-                                            1 -> R.string.ring_five_times
+                            id = when (ringMode.value) {
-                                            else -> R.string.ring_once
+                                2 -> R.string.ring_nonstop
-                                        }
+                                1 -> R.string.ring_five_times
-                                    ),
+                                else -> R.string.ring_once
-                                    style = MaterialTheme.typography.body1.copy(
-                                        textDecoration = TextDecoration.Underline
-                                    ),
-                                    modifier = Modifier
-                                        .padding(vertical = 12.dp, horizontal = 16.dp)
-                                        .clickable(
-                                            interactionSource = remember { MutableInteractionSource() },
-                                            indication = rememberRipple(bounded = false),
-                                            onClick = { onClickRingType() }
-                                        )
-                                )
                             }
-                        }
+                        ),
-                        Spacer(modifier = Modifier.height(8.dp))
+                        style = MaterialTheme.typography.body1.copy(
-                    }
+                            textDecoration = TextDecoration.Underline
-
+                        ),
-                    val openCustomDialog = remember { showCustomDialog }
+                        modifier = Modifier
-                    AddReminderDialog.AddCustomReminderDialog(
+                            .padding(vertical = 12.dp, horizontal = 16.dp)
-                        openCustomDialog,
+                            .clickable(
-                        addAlarm = this::addAlarmRow,
+                                interactionSource = remember { MutableInteractionSource() },
-                        closeDialog = {
+                                indication = rememberRipple(bounded = false),
-                            openCustomDialog.value = false
+                                onClick = { onClickRingType() }
-                            AndroidUtilities.hideKeyboard(activity)
+                            )
-                        }
-                    )
-
-                    val openRandomDialog = remember { showRandomDialog }
-                    AddReminderDialog.AddRandomReminderDialog(
-                        openRandomDialog,
-                        addAlarm = this::addAlarmRow,
-                        closeDialog = {
-                            openRandomDialog.value = false
-                            AndroidUtilities.hideKeyboard(activity)
-                        }
                     )
                 }
             }
-            
+            Spacer(modifier = Modifier.height(8.dp))
-            it.root
         }
 
+        val openCustomDialog = remember { showCustomDialog }
+        AddReminderDialog.AddCustomReminderDialog(
+            openCustomDialog,
+            addAlarm = this::addAlarmRow,
+            closeDialog = {
+                openCustomDialog.value = false
+                AndroidUtilities.hideKeyboard(activity)
+            }
+        )
+
+        val openRandomDialog = remember { showRandomDialog }
+        AddReminderDialog.AddRandomReminderDialog(
+            openRandomDialog,
+            addAlarm = this::addAlarmRow,
+            closeDialog = {
+                openRandomDialog.value = false
+                AndroidUtilities.hideKeyboard(activity)
+            }
+        )
+    }
+
     override val icon = R.drawable.ic_outline_notifications_24px
 
     override fun controlId() = TAG
 
-    override val rootLayout = R.layout.control_set_template_no_padding
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == REQUEST_NEW_ALARM) {
             if (resultCode == Activity.RESULT_OK) {

app/src/main/res/layout/control_set_reminders.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.compose.ui.platform.ComposeView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/alert_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" />

app/src/main/res/layout/control_set_template_no_padding.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:id="@+id/content"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content"
-  android:background="?attr/selectableItemBackground"
-  android:orientation="horizontal">
-
-  <ImageView
-    android:id="@+id/icon"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="top"
-    android:paddingTop="@dimen/task_edit_spacing"
-    android:paddingBottom="@dimen/task_edit_spacing"
-    android:paddingStart="@dimen/keyline_first"
-    android:paddingEnd="@dimen/keyline_second"
-    android:alpha="@dimen/alpha_secondary"
-    android:scaleType="center"
-    app:tint="@color/icon_tint"
-    tools:ignore="ContentDescription"/>
-
-</LinearLayout>