Refactor TodoWidgetConfigureActivity with Material3 components

app/src/main/kotlin/io/homeassistant/companion/android/widgets/todo/TodoWidgetConfigureActivity.kt

@@ -13,23 +13,22 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Button
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Switch
-import androidx.compose.material.SwitchDefaults
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -38,7 +37,14 @@ import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.withCreationCallback
 import io.homeassistant.companion.android.BaseActivity
 import io.homeassistant.companion.android.common.R as commonR
+import io.homeassistant.companion.android.common.compose.composable.HAAccentButton
+import io.homeassistant.companion.android.common.compose.composable.HADropdownItem
+import io.homeassistant.companion.android.common.compose.composable.HADropdownMenu
+import io.homeassistant.companion.android.common.compose.composable.HASwitch
+import io.homeassistant.companion.android.common.compose.composable.HATopBar
+import io.homeassistant.companion.android.common.compose.theme.HATextStyle
 import io.homeassistant.companion.android.common.compose.theme.HATheme
+import io.homeassistant.companion.android.common.compose.theme.LocalHAColorScheme
 import io.homeassistant.companion.android.common.data.integration.Entity
 import io.homeassistant.companion.android.common.data.websocket.impl.entities.AreaRegistryResponse
 import io.homeassistant.companion.android.common.data.websocket.impl.entities.DeviceRegistryResponse
@@ -47,19 +53,14 @@ import io.homeassistant.companion.android.common.util.SdkVersion
 import io.homeassistant.companion.android.database.server.Server
 import io.homeassistant.companion.android.database.widget.WidgetBackgroundType
 import io.homeassistant.companion.android.settings.widgets.ManageWidgetsViewModel
-import io.homeassistant.companion.android.util.compose.ExposedDropdownMenu
-import io.homeassistant.companion.android.util.compose.HomeAssistantAppTheme
-import io.homeassistant.companion.android.util.compose.ServerExposedDropdownMenu
-import io.homeassistant.companion.android.util.compose.WidgetBackgroundTypeExposedDropdownMenu
 import io.homeassistant.companion.android.util.compose.entity.EntityPicker
 import io.homeassistant.companion.android.util.enableEdgeToEdgeCompat
 import io.homeassistant.companion.android.util.getHexForColor
 import io.homeassistant.companion.android.util.previewEntity1
 import io.homeassistant.companion.android.util.previewEntity2
 import io.homeassistant.companion.android.util.previewServer1
 import io.homeassistant.companion.android.util.previewServer2
-import io.homeassistant.companion.android.util.safeBottomWindowInsets
-import io.homeassistant.companion.android.util.safeTopWindowInsets
+import io.homeassistant.companion.android.widgets.common.WidgetUtils
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
@@ -105,7 +106,7 @@ class TodoWidgetConfigureActivity : BaseActivity() {
         viewModel.onSetup(widgetId, supportedTextColors)
 
         setContent {
-            HomeAssistantAppTheme {
+            HATheme {
                 TodoWidgetConfigureScreen(
                     viewModel = viewModel,
                     onActionClick = { onActionClick() },
@@ -210,98 +211,134 @@ private fun TodoWidgetConfigureView(
     areaRegistry: List<AreaRegistryResponse>? = null,
 ) {
     Scaffold(
+        contentWindowInsets = WindowInsets.safeDrawing,
         topBar = {
-            TopAppBar(
-                title = { Text(stringResource(commonR.string.widget_todo_label)) },
-                windowInsets = safeTopWindowInsets(),
-                backgroundColor = colorResource(commonR.color.colorBackground),
-                contentColor = colorResource(commonR.color.colorOnBackground),
-            )
+            HATopBar(title = { Text(stringResource(commonR.string.widget_todo_label)) })
         },
     ) { padding ->
         Column(
             modifier = Modifier
                 .verticalScroll(rememberScrollState())
-                .windowInsetsPadding(safeBottomWindowInsets())
                 .padding(padding)
                 .padding(all = 16.dp),
-            verticalArrangement = Arrangement.spacedBy(8.dp),
+            verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
             if (servers.size > 1) {
-                ServerExposedDropdownMenu(
+                ServerDropdownMenu(
                     servers = servers,
                     current = selectedServerId,
                     onSelected = { onServerSelected(it) },
                     modifier = Modifier.padding(bottom = 16.dp),
                 )
             }
 
-            // TODO use new theme for Material3 components https://github.com/home-assistant/android/issues/6303
-            HATheme {
-                EntityPicker(
-                    entities = entities,
-                    selectedEntityId = selectedEntityId,
-                    onEntitySelectedId = { onEntitySelected(it) },
-                    onEntityCleared = { onEntitySelected(null) },
-                    entityRegistry = entityRegistry,
-                    deviceRegistry = deviceRegistry,
-                    areaRegistry = areaRegistry,
-                    addButtonText = stringResource(commonR.string.todo_widget_select_list),
-                )
-            }
+            EntityPicker(
+                entities = entities,
+                selectedEntityId = selectedEntityId,
+                onEntitySelectedId = { onEntitySelected(it) },
+                onEntityCleared = { onEntitySelected(null) },
+                entityRegistry = entityRegistry,
+                deviceRegistry = deviceRegistry,
+                areaRegistry = areaRegistry,
+                addButtonText = stringResource(commonR.string.todo_widget_select_list),
+            )
 
+            val colorScheme = LocalHAColorScheme.current
             Row(
-                modifier = Modifier.clickable { onShowCompletedChanged(!showCompleted) },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clickable { onShowCompletedChanged(!showCompleted) },
             ) {
                 Text(
                     text = stringResource(commonR.string.widget_todo_show_completed),
+                    style = HATextStyle.Body.copy(textAlign = TextAlign.Start),
+                    color = colorScheme.colorTextPrimary,
                     modifier = Modifier
                         .align(Alignment.CenterVertically)
                         .weight(1f),
                 )
 
-                Switch(
+                HASwitch(
                     checked = showCompleted,
                     onCheckedChange = { onShowCompletedChanged(it) },
-                    colors = SwitchDefaults.colors(
-                        uncheckedThumbColor = colorResource(commonR.color.colorSwitchUncheckedThumb),
-                    ),
                 )
             }
 
-            WidgetBackgroundTypeExposedDropdownMenu(
+            WidgetBackgroundTypeDropdownMenu(
                 current = selectedBackgroundType,
                 onSelected = { onBackgroundTypeSelected(it) },
                 modifier = Modifier.padding(bottom = 16.dp),
             )
 
             if (selectedBackgroundType == WidgetBackgroundType.TRANSPARENT) {
-                ExposedDropdownMenu(
-                    label = stringResource(commonR.string.widget_text_color_title),
-                    keys = listOf(
-                        stringResource(commonR.string.widget_text_color_black),
-                        stringResource(commonR.string.widget_text_color_white),
+                HADropdownMenu(
+                    items = listOf(
+                        HADropdownItem(
+                            key = 0,
+                            label = stringResource(commonR.string.widget_text_color_black),
+                        ),
+                        HADropdownItem(
+                            key = 1,
+                            label = stringResource(commonR.string.widget_text_color_white),
+                        ),
                     ),
-                    currentIndex = textColorIndex,
-                    onSelected = { onTextColorSelected(it) },
+                    selectedKey = textColorIndex,
+                    onItemSelected = onTextColorSelected,
+                    label = stringResource(commonR.string.widget_text_color_title),
                     modifier = Modifier.padding(bottom = 16.dp),
                 )
             }
 
-            Button(
+            HAAccentButton(
+                text = stringResource(if (isUpdateWidget) commonR.string.update_widget else commonR.string.add_widget),
                 modifier = Modifier.fillMaxWidth(),
-                onClick = { onActionClick() },
-            ) {
-                Text(stringResource(if (isUpdateWidget) commonR.string.update_widget else commonR.string.add_widget))
-            }
+                onClick = onActionClick,
+            )
         }
     }
 }
 
+@Composable
+private fun ServerDropdownMenu(
+    servers: List<Server>,
+    current: Int?,
+    onSelected: (Int) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    HADropdownMenu(
+        items = servers.map { HADropdownItem(key = it.id, label = it.friendlyName) },
+        selectedKey = current,
+        onItemSelected = onSelected,
+        label = stringResource(commonR.string.server_select),
+        modifier = modifier,
+    )
+}
+
+@Composable
+private fun WidgetBackgroundTypeDropdownMenu(
+    current: WidgetBackgroundType?,
+    onSelected: (WidgetBackgroundType) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val context = LocalContext.current
+    val options = remember { WidgetUtils.getBackgroundOptionList(context) }
+    val selectedKey = remember(current, options) {
+        current?.let { WidgetUtils.getSelectedBackgroundOption(context, it, options) }
+    }
+
+    HADropdownMenu(
+        items = options.mapIndexed { index, label -> HADropdownItem(key = index, label = label) },
+        selectedKey = selectedKey,
+        onItemSelected = { index -> onSelected(WidgetUtils.getWidgetBackgroundType(context, options[index])) },
+        label = stringResource(commonR.string.widget_background_type_title),
+        modifier = modifier,
+    )
+}
+
 @Preview
 @Composable
 private fun TodoWidgetConfigureViewPreview() {
-    HomeAssistantAppTheme {
+    HATheme {
         TodoWidgetConfigureView(
             servers = listOf(
                 previewServer1,