Migrate entity widget configuration to Compose by himu-gupta · Pull Request #7007 · home-assistant/android

himu-gupta · 2026-06-12T00:14:23Z

Summary

migrate EntityWidgetConfigureActivity from XML views to Compose and Home Assistant Material 3 components
move configuration state, validation, creation, and update persistence into an assisted ViewModel
preserve server selection, custom attributes, tap actions, widget themes, text colors, and existing widget values
add focused ViewModel tests for restoration, recreation, persistence, and server changes

Screenshots

Light	Dark	Review feedback state

Server picker fix

Testing

./gradlew --no-daemon --console=plain :build-logic:convention:ktlintFormat ktlintFormat
./gradlew --no-daemon --console=plain :app:testFullDebugUnitTest --tests io.homeassistant.companion.android.widgets.entity.EntityWidgetConfigureViewModelTest

home-assistant

Hi @himu-gupta

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

Copilot

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Migrates the Entity widget configuration UI from the legacy XML/ViewBinding implementation to a Jetpack Compose-based screen backed by a new ViewModel, and adds unit tests for key configuration behaviors.

Changes:

Replaced EntityWidgetConfigureActivity’s legacy view logic with Compose UI and a dedicated EntityWidgetConfigureViewModel.
Added a Compose configuration screen with attribute selection UI (including custom attribute entry).
Added unit tests for restoring/persisting widget configuration and handling server changes.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
common/src/main/res/values/strings.xml	Adds a new string resource used by the Compose attribute picker UI.
app/src/test/kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureViewModelTest.kt	Introduces unit tests for the new configuration ViewModel behavior.
app/src/main/res/layout/widget_static_configure.xml	Removes the legacy XML layout now replaced by Compose UI.
app/src/main/kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureViewModel.kt	Adds a new ViewModel managing widget configuration state, persistence, and pin flow.
app/src/main/kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureScreen.kt	Adds the Compose configuration UI (server/entity pickers, attributes, separators, styling options).
app/src/main/kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureActivity.kt	Updates the activity to host Compose UI and delegate configuration actions to the ViewModel.

himu-gupta · 2026-06-12T17:15:36Z

The CLA check is now passing, but the original Home Assistant CLA bot review still shows Changes requested and keeps the PR in a blocked state. Could a maintainer please dismiss the stale review when convenient? All review threads are resolved, the branch is rebased onto the latest main, and the focused tests, ktlint, and full debug build pass.

himu-gupta · 2026-06-14T19:51:56Z

Hi @himu-gupta

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

CLA was signed.

TimoPtr · 2026-06-15T12:41:06Z

Could you update the PR description to add screenshots, thanks.

himu-gupta · 2026-06-16T16:12:56Z

Added light and dark screenshots to the PR description.

TimoPtr · 2026-06-18T12:48:15Z

The UI does already look much better than from the old one.

Things to address

Should be centered
The picker should be aligned with the size of the inputs
Clicking Append attributes could animate nicely the hidden field
The Attributemenu could/should be merge with the Add attribute input, to improve the UX
Changing the entity selected doesn't update the label anymore
Server picker is using the old style

Things to change/discuss

Update widget button logic should be improved (in another PR), to include validation on inputs today you can input a huge number for instance in the Widget text size.
We could add a top left close button in the topbar

TimoPtr

I did a first very quick review of the code to identify the missing bits.

…n system Address review feedback by aligning the Media Player Controls widget configuration screen with the Compose pattern used in home-assistant#7007. - Add MediaPlayerControlsWidgetConfigureViewModel exposing an immutable ViewState, with server/entity/registry flows and a Snackbar message channel; the Activity is now a thin BaseActivity that delegates to it - Add unit tests for the ViewModel (MainDispatcherJUnit5Extension) - Use HATheme + Material 3 throughout to fix the broken dark/light colors - Replace the free-text entity field with EntityPicker, providing the entity/device/area registries for friendlier names - Surface widget create/update errors via Snackbar instead of Toast - Split the screen into smaller composables and use HaDimens for spacing - Proper HACheckbox row click, full-width inputs and action button, and a top-left close button - Regenerate screenshot reference images for the new UI Note: EntityPicker is single-select, so the widget now stores a single media_player entity instead of the previous comma-separated list.

himu-gupta · 2026-06-20T20:43:48Z

Added a review-feedback screenshot to the PR description showing the updated centered form with the modern server picker and append-attributes section expanded, including the merged Add attribute input/chips and entity-derived label.

himu-gupta · 2026-06-21T13:57:34Z

Added a dedicated server picker fix screenshot to the PR description. This one matches the dark top-of-screen state from your attached image: the server picker now uses the HA dropdown style and is aligned with the selected entity picker.

TimoPtr · 2026-06-23T12:06:30Z

I think we could remove the "Append attribute value" checkbox by only showing the tags to pick. Does it make sense to even allow custom attributes? @jpelgrom wdyt

TimoPtr

Just to let you know that we don't allow usage of autonomous agent, take the time to look at all my comments.

TimoPtr · 2026-06-23T12:07:41Z

+        get() = intent.extras?.getBoolean(ManageWidgetsViewModel.CONFIGURE_REQUEST_LAUNCHER, false) == true

    override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdgeCompat()


Suggested change

enableEdgeToEdgeCompat()

It's already in BaseActivity

TimoPtr · 2026-06-23T12:16:54Z

+    val selectedServerId: Int get() = viewState.selectedServerId
+    val selectedEntityId: String? get() = viewState.selectedEntityId
+    val appendAttributes: Boolean get() = viewState.appendAttributes
+    val selectedAttributeIds: List<String> get() = viewState.selectedAttributeIds
+    val label: String get() = viewState.label
+    val textSize: String get() = viewState.textSize
+    val stateSeparator: String get() = viewState.stateSeparator
+    val attributeSeparator: String get() = viewState.attributeSeparator
+    val selectedTapAction: WidgetTapAction get() = viewState.selectedTapAction
+    val selectedBackgroundType: WidgetBackgroundType get() = viewState.selectedBackgroundType
+    internal val selectedTextColor: EntityWidgetTextColor get() = viewState.selectedTextColor
+    val isUpdateWidget: Boolean get() = viewState.isUpdateWidget


Let's just expose the ViewState.

TimoPtr · 2026-06-23T12:17:20Z

+    internal var widgetId: Int = AppWidgetManager.INVALID_APPWIDGET_ID
+        private set
+
+    val servers = serverManager.serversFlow


Keep this in the ViewState, and make it already a HADropdownItem so mapping happen in the viewModel scope. Same for the selected server it needs to be in the ViewState.

TimoPtr · 2026-06-23T12:20:20Z

+
+    val servers = serverManager.serversFlow
+
+    internal var viewState by mutableStateOf(EntityWidgetConfigureViewState(selectedEntityId = preselectedEntityId))


use a mutableStateFlow

TimoPtr · 2026-06-23T12:31:24Z

+internal data class EntityWidgetTextColors(val white: String, val black: String)
+
+internal enum class EntityWidgetTextColor {
+    WHITE,
+    BLACK,
+}
+
+internal enum class EntityWidgetConfigureError {
+    CREATE,
+    UPDATE,
+}


This is something that is common to all the widget configure screen.

TimoPtr · 2026-06-23T13:09:45Z

+            HADropdownItem(
+                key = WidgetTapAction.REFRESH,
+                label = stringResource(commonR.string.refresh),
+            ),


Let's remember the list to avoid recreating it on every recomposition

TimoPtr · 2026-06-23T13:10:00Z

+    onTextColorSelected: (EntityWidgetTextColor) -> Unit,
+) {
+    HADropdownMenu(
+        items = buildList {


same here remember

TimoPtr · 2026-06-23T13:10:10Z

+
+    if (selectedBackgroundType == WidgetBackgroundType.TRANSPARENT) {
+        HADropdownMenu(
+            items = listOf(


TimoPtr · 2026-06-23T13:11:29Z

+        onClick = onActionClick,
+        modifier = Modifier
+            .formControlWidth()
+            .testTag(ENTITY_WIDGET_ACTION_BUTTON_TAG),


Let's not use TAG when you can use the text

TimoPtr · 2026-06-23T13:14:09Z

+                verticalArrangement = Arrangement.spacedBy(HADimens.SPACE2),
+            ) {
+                unselectedAttributes.forEach { attributeId ->
+                    InputChip(


Since it's a M3 element it has the wrong colors, you need to use the HAColors (like you did for the the selected one ) so it gets the proper colors for light/dark and not the one from m3. The text needs to use a proper style too.

You could open a first PR that makes a HAInputChip for instance.

home-assistant · 2026-06-23T13:19:47Z

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

TimoPtr · 2026-06-23T13:24:17Z

Also I would like to see a close button in the topbar

- Move media-player entity filtering and name resolution into the view model (uiState.availableEntities / selectedEntities) so the screen no longer filters or resolves names itself. - Drop the wrapper Column in favour of a formControlWidth() modifier and extract EntityPickerSection, matching the entity widget (home-assistant#7007). - Add a 'Selected entities:' title and a divider to the selection list. - remember() the background-type option list. - Replace the throwing check() in updateWidgetConfiguration() with a Boolean result that surfaces a user message; guard it in the activity. - Share the entity/registry flows eagerly since the uiState combine keeps them subscribed for the view model's lifetime. - Add a setScreen() test helper and a single combined interaction test covering the toggles, remove, action and close callbacks.

home-assistant Bot added the cla-needed label Jun 12, 2026

home-assistant Bot requested changes Jun 12, 2026

View reviewed changes

home-assistant Bot added cla-recheck cla-signed and removed cla-recheck cla-needed labels Jun 12, 2026

himu-gupta marked this pull request as ready for review June 12, 2026 00:31

Copilot AI review requested due to automatic review settings June 12, 2026 00:31

Copilot AI reviewed Jun 12, 2026

View reviewed changes

sgallese mentioned this pull request Jun 12, 2026

Test widget background type mapping #7010

Closed

himu-gupta force-pushed the feat/entity-widget-compose branch from f9669f5 to 3a51bce Compare June 12, 2026 17:12

github-advanced-security AI found potential problems Jun 12, 2026

View reviewed changes

Comment thread ...in/kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureActivity.kt Fixed

Comment thread ...n/kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureViewModel.kt Fixed

himu-gupta mentioned this pull request Jun 17, 2026

Rework UI of configure widget screens #6289

Open

TimoPtr marked this pull request as draft June 18, 2026 12:48

TimoPtr requested changes Jun 18, 2026

View reviewed changes

TimoPtr mentioned this pull request Jun 18, 2026

Refactor MediaPlayerControlsWidgetConfigureActivity to Compose and Material 3 #7018

Draft

4 tasks

himu-gupta added 5 commits June 20, 2026 22:52

Migrate entity widget configuration to Compose

0a28ab1

Preserve entity widget validation behavior

574c79b

Address entity widget review feedback

fc180e2

Fix widget API level lint findings

5641414

Address entity widget configure review feedback

eca4235

himu-gupta force-pushed the feat/entity-widget-compose branch from 218f3fd to eca4235 Compare June 20, 2026 19:55

himu-gupta marked this pull request as ready for review June 21, 2026 14:12

himu-gupta added 2 commits June 21, 2026 17:17

Address entity widget picker review feedback

6691e0e

Address entity widget compose review

e483268

himu-gupta force-pushed the feat/entity-widget-compose branch from c2c3670 to e483268 Compare June 21, 2026 15:11

github-advanced-security AI found potential problems Jun 21, 2026

View reviewed changes

Comment thread ...main/kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureScreen.kt Fixed

Comment thread ...main/kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureScreen.kt Fixed

himu-gupta and others added 2 commits June 22, 2026 21:20

Fix entity widget compose lint

be29796

Merge branch 'main' into feat/entity-widget-compose

6f85bd7

TimoPtr requested changes Jun 23, 2026

View reviewed changes

home-assistant Bot marked this pull request as draft June 23, 2026 13:19

TimoPtr linked an issue Jul 21, 2026 that may be closed by this pull request

Migrate EnityWidgetConfigureActivity to compose and EntityPicker #7230

Open


		val servers = serverManager.serversFlow

		internal var viewState by mutableStateOf(EntityWidgetConfigureViewState(selectedEntityId = preselectedEntityId))

Uh oh!

Uh oh!

Conversation

himu-gupta commented Jun 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Screenshots

Testing

Uh oh!

home-assistant Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

himu-gupta commented Jun 12, 2026

Uh oh!

Uh oh!

Uh oh!

himu-gupta commented Jun 14, 2026

Uh oh!

TimoPtr commented Jun 15, 2026

Uh oh!

himu-gupta commented Jun 16, 2026

Uh oh!

TimoPtr commented Jun 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TimoPtr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

himu-gupta commented Jun 20, 2026

Uh oh!

himu-gupta commented Jun 21, 2026

Uh oh!

Uh oh!

Uh oh!

TimoPtr commented Jun 23, 2026

Uh oh!

TimoPtr left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

home-assistant Bot commented Jun 23, 2026

Uh oh!

himu-gupta commented Jun 12, 2026 •

edited

Loading

TimoPtr commented Jun 18, 2026 •

edited

Loading