polish scene editor state and destructive affordances

SysAdminDoc · SysAdminDoc · commit a60b9bedb782 · 2026-06-15T01:01:14.000-04:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # OpenTasker
 
-[![Version](https://img.shields.io/badge/version-0.2.64-blue.svg)](https://github.com/SysAdminDoc/OpenTasker/releases)
+[![Version](https://img.shields.io/badge/version-0.2.65-blue.svg)](https://github.com/SysAdminDoc/OpenTasker/releases)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
 [![Platform](https://img.shields.io/badge/platform-Android%208.0%2B-brightgreen.svg)](https://developer.android.com)
 [![Kotlin](https://img.shields.io/badge/kotlin-2.3.21-7f52ff.svg)](https://kotlinlang.org)
@@ -20,7 +20,7 @@
 
 **Planned:** broad device-verified background geofence reliability, elevated (Shizuku) execution, Termux script dispatch, a visual flow authoring editor, and richer plugin UX. See [ROADMAP.md](ROADMAP.md).
 
-> **Status:** the current source version is `0.2.64`. Device-evidence claims (location/calendar/sun) are single-device API 36 data points on `SM-S938B`, not broad background-geofence reliability guarantees. The latest polish pass improves IME handling, compact small-screen bottom navigation with a More menu, variable deletion safety, saveable editor/context/template state, numeric form keyboards, larger day-token touch targets, and accessibility roles for widget/flow/form switch targets.
+> **Status:** the current source version is `0.2.65`. Device-evidence claims (location/calendar/sun) are single-device API 36 data points on `SM-S938B`, not broad background-geofence reliability guarantees. The latest polish pass improves IME handling, compact small-screen bottom navigation with a More menu, variable and scene-element deletion safety, saveable editor/context/template/scene-element state, numeric form keyboards, larger day-token touch targets, and accessibility roles for widget/flow/form switch targets.
 
 ---
 
diff --git a/RESEARCH.md b/RESEARCH.md
@@ -4,7 +4,7 @@ Updated: 2026-06-15 (stricter release-polish pass; replaces previous research co
 
 ## Executive Summary
 
-OpenTasker is a Kotlin/Compose Android automation app at source version 0.2.64 with a Room-backed profile -> context -> task -> action engine, 49 registered runtime actions, engine-handled flow control, FOSS LocationManager geofencing, Locale/Tasker plugin hosting, Tasker XML import, OpenTasker JSON transfer, Quick Settings/widget triggers, OEM battery guidance, and F-Droid/Play release checks. The repo's best trait is explicit failure behavior: unsupported privileged actions fail honestly, imports are review-gated, sensitive run-log data is redacted, destructive variable deletion is now confirmed, and prior high-risk guards remain in place.
+OpenTasker is a Kotlin/Compose Android automation app at source version 0.2.65 with a Room-backed profile -> context -> task -> action engine, 49 registered runtime actions, engine-handled flow control, FOSS LocationManager geofencing, Locale/Tasker plugin hosting, Tasker XML import, OpenTasker JSON transfer, Quick Settings/widget triggers, OEM battery guidance, and F-Droid/Play release checks. The repo's best trait is explicit failure behavior: unsupported privileged actions fail honestly, imports are review-gated, sensitive run-log data is redacted, destructive variable and scene-element deletion are visually confirmed, and prior high-risk guards remain in place.
 
 The highest-value direction is trust and scale before more action breadth. Existing roadmap items already cover target-SDK readiness, Android 17 audio gating, work/private-profile app automation, TalkBack accessibility, profile/task organization, action implementation tests, WorkManager resilience, diagnostics, Tasker XML export, scoped LAN cleartext, date/time templates, camera/mic privacy triggers, Wake-on-LAN, and optional BYO-key AI authoring.
 
@@ -60,7 +60,7 @@ Recent continuation passes found three additional non-duplicate gaps; v0.2.62 cl
 - Target-SDK wording risk remains: live Google target-API pages checked on 2026-06-15 still publish the API 35 / August 31, 2025 requirement, not a public API 36 Play deadline. Target-36 code has shipped, but docs must not mark an unpublished deadline as verified.
 - Android 17 audio risk remains: `MediaActions.kt` and TTS/sound code can run from background profiles while `AutomationService` uses `specialUse|location`; background audio hardening can fail playback or volume changes silently unless a valid foreground-service/while-in-use path exists.
 - Work profile / Private Space risk remains: app-open contexts, package broadcasts, and app launch actions are package-name/current-profile based; no model currently records `UserHandle`, profile labels, hidden-profile state, or profile-local disclosure.
-- Accessibility gap is narrowed but remains: action checkbox rows, profile/context form switches, widget task rows, and flow graph targets now expose better roles/state; numeric fields request numeric keyboards and small day-token controls meet 48 dp minimum height. A full TalkBack sweep and accessibility-checks instrumentation gate are still missing.
+- Accessibility gap is narrowed but remains: action checkbox rows, profile/context form switches, widget task rows, and flow graph targets now expose better roles/state; numeric fields request numeric keyboards, small day-token controls meet 48 dp minimum height, and scene element edit/delete dialog state is restored from stable scene id/index state. A full TalkBack sweep and accessibility-checks instrumentation gate are still missing.
 - Action test gap is narrowed but remains: `core/actions/ActionGuardsTest.kt` now covers key network, URL, wait, ping, and Wake-on-LAN guards, while file, media, settings, app, notification, and download edge cases still need coverage.
 - Network hardening gap closed in v0.2.62: `HttpPostAction` caps request bodies at 1 MB, uses fixed-length streaming, and keeps legacy `body` compatibility under the same cap.
 - New supply-chain gap: `.github/workflows/build.yml` and `release.yml` consume tag-pinned actions (`@v4`), the build workflow has no explicit `permissions`, `gradle/verification-metadata.xml` is absent, and no Dependabot config is present.
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -1,10 +1,10 @@
 # OpenTasker Roadmap
 
-Source-backed product roadmap for OpenTasker v0.2.64 → v0.3.x. Reconciles current repo state with competitive research across Android automation apps, adjacent workflow engines, platform constraints (API 35–36), distribution policy, and dependency changelogs.
+Source-backed product roadmap for OpenTasker v0.2.65 → v0.3.x. Reconciles current repo state with competitive research across Android automation apps, adjacent workflow engines, platform constraints (API 35–36), distribution policy, and dependency changelogs.
 
 **Last updated:** 2026-06-15
-**Roadmap version:** 2026.06.15 stricter release-polish pass (v0.2.64 UI/accessibility/form-state reconciliation)
-**Current app version:** 0.2.64
+**Roadmap version:** 2026.06.15 stricter release-polish pass (v0.2.65 scene-state/accessibility reconciliation)
+**Current app version:** 0.2.65
 **Planning rule:** items marked "Now" must ship before the v0.3.0 public beta claim. Items already completed in 0.2.x are retained in the **Completed Backlog** appendix for traceability and explicitly removed from active tiers.
 
 ## Reconciliation note (2026-05-06 pass)
@@ -133,7 +133,7 @@ Key local constraints:
 
 ### N9 (2026.05.06) - Documentation truth pass post-v0.2.59
 
-**Status:** Partially refreshed through v0.2.64: README, ROADMAP.md, RESEARCH.md, Gradle version values, F-Droid metadata gates, compact More-menu phone navigation, saveable editor/context/template state, numeric keyboard hints, and row-level switch semantics now reflect the target-SDK-36/action-metadata and stricter UI polish passes. Older architecture and readiness docs still need a current-version truth pass before this item closes. [L14]
+**Status:** Partially refreshed through v0.2.65: README, ROADMAP.md, RESEARCH.md, Gradle version values, F-Droid metadata gates, compact More-menu phone navigation, saveable editor/context/template/scene-element state, numeric keyboard hints, row-level switch semantics, and destructive variable/scene-element affordances now reflect the target-SDK-36/action-metadata and stricter UI polish passes. Older architecture and readiness docs still need a current-version truth pass before this item closes. [L14]
 **Description:** Refresh README, CLAUDE.md, ARCHITECTURE.md, IMPROVEMENT_PLAN.md, and FDROID_READINESS.md to reflect the current release. Restructure long status copy into skimmable feature lists where needed. Sync version strings, toolchain versions, workflow filenames, fdroid metadata, Gradle properties, ROADMAP, and CHANGELOG.
 **Sources:** Local repo state [L1][L5], existing improvement plan [L7], dependency/release audit [L14].
 **Category:** docs, dev-experience.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,8 +10,8 @@ val releaseKeystorePath = System.getenv("OPEN_TASKER_RELEASE_KEYSTORE")
 val releaseKeystorePassword = System.getenv("OPEN_TASKER_RELEASE_KEYSTORE_PASSWORD")
 val releaseKeyAlias = System.getenv("OPEN_TASKER_RELEASE_KEY_ALIAS")
 val releaseKeyPassword = System.getenv("OPEN_TASKER_RELEASE_KEY_PASSWORD")
-val appVersionCode = 66
-val appVersionName = "0.2.64"
+val appVersionCode = 67
+val appVersionName = "0.2.65"
 val allowedDistributions = setOf("standard", "fdroid", "play")
 val selectedDistribution = providers.gradleProperty("openTaskerDistribution")
     .orElse("standard")
diff --git a/app/src/main/java/com/opentasker/ui/screens/SceneLibraryScreen.kt b/app/src/main/java/com/opentasker/ui/screens/SceneLibraryScreen.kt
@@ -29,6 +29,7 @@ import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.DropdownMenu
@@ -43,6 +44,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -78,9 +80,30 @@ fun SceneLibraryScreen(
     contentPadding: PaddingValues,
 ) {
     var showCreateDialog by rememberSaveable { mutableStateOf(false) }
-    var elementEditor by remember { mutableStateOf<SceneElementEditorState?>(null) }
-    var pendingElementDelete by remember { mutableStateOf<SceneElementEditorState?>(null) }
+    var elementEditorSceneId by rememberSaveable { mutableStateOf<Long?>(null) }
+    var elementEditorIndex by rememberSaveable { mutableStateOf<Int?>(null) }
+    var pendingElementDeleteSceneId by rememberSaveable { mutableStateOf<Long?>(null) }
+    var pendingElementDeleteIndex by rememberSaveable { mutableStateOf<Int?>(null) }
     val sortedScenes = remember(scenes) { scenes.sortedBy { it.name.lowercase() } }
+    val elementEditor = remember(scenes, elementEditorSceneId, elementEditorIndex) {
+        sceneElementEditorState(scenes, elementEditorSceneId, elementEditorIndex, allowNew = true)
+    }
+    val pendingElementDelete = remember(scenes, pendingElementDeleteSceneId, pendingElementDeleteIndex) {
+        sceneElementEditorState(scenes, pendingElementDeleteSceneId, pendingElementDeleteIndex, allowNew = false)
+    }
+
+    LaunchedEffect(elementEditorSceneId, elementEditor) {
+        if (elementEditorSceneId != null && elementEditor == null) {
+            elementEditorSceneId = null
+            elementEditorIndex = null
+        }
+    }
+    LaunchedEffect(pendingElementDeleteSceneId, pendingElementDelete) {
+        if (pendingElementDeleteSceneId != null && pendingElementDelete == null) {
+            pendingElementDeleteSceneId = null
+            pendingElementDeleteIndex = null
+        }
+    }
 
     if (showCreateDialog) {
         SceneEditorDialog(
@@ -96,7 +119,10 @@ fun SceneLibraryScreen(
         SceneElementEditorDialog(
             state = state,
             tasks = tasks,
-            onDismiss = { elementEditor = null },
+            onDismiss = {
+                elementEditorSceneId = null
+                elementEditorIndex = null
+            },
             onSave = { element ->
                 val updatedScene = if (state.index == null) {
                     state.scene.copy(elements = state.scene.elements + element)
@@ -108,15 +134,19 @@ fun SceneLibraryScreen(
                     )
                 }
                 onUpdateScene(updatedScene, if (state.index == null) "Element added" else "Element updated")
-                elementEditor = null
+                elementEditorSceneId = null
+                elementEditorIndex = null
             },
         )
     }
 
     pendingElementDelete?.let { state ->
         SceneElementDeleteDialog(
             state = state,
-            onDismiss = { pendingElementDelete = null },
+            onDismiss = {
+                pendingElementDeleteSceneId = null
+                pendingElementDeleteIndex = null
+            },
             onConfirm = {
                 val index = state.index
                 if (index != null) {
@@ -125,7 +155,8 @@ fun SceneLibraryScreen(
                         "Element removed",
                     )
                 }
-                pendingElementDelete = null
+                pendingElementDeleteSceneId = null
+                pendingElementDeleteIndex = null
             },
         )
     }
@@ -156,9 +187,18 @@ fun SceneLibraryScreen(
             SceneCard(
                 scene = scene,
                 tasks = tasks,
-                onAddElement = { elementEditor = SceneElementEditorState(scene = scene) },
-                onEditElement = { index, element -> elementEditor = SceneElementEditorState(scene, index, element) },
-                onDeleteElement = { index, element -> pendingElementDelete = SceneElementEditorState(scene, index, element) },
+                onAddElement = {
+                    elementEditorSceneId = scene.id
+                    elementEditorIndex = null
+                },
+                onEditElement = { index, _ ->
+                    elementEditorSceneId = scene.id
+                    elementEditorIndex = index
+                },
+                onDeleteElement = { index, _ ->
+                    pendingElementDeleteSceneId = scene.id
+                    pendingElementDeleteIndex = index
+                },
                 onMoveElement = { index, element ->
                     onUpdateScene(
                         scene.copy(
@@ -175,6 +215,24 @@ fun SceneLibraryScreen(
     }
 }
 
+private fun sceneElementEditorState(
+    scenes: List<Scene>,
+    sceneId: Long?,
+    index: Int?,
+    allowNew: Boolean,
+): SceneElementEditorState? {
+    val scene = scenes.firstOrNull { it.id == sceneId } ?: return null
+    return if (index == null) {
+        if (allowNew) SceneElementEditorState(scene = scene) else null
+    } else {
+        SceneElementEditorState(
+            scene = scene,
+            index = index,
+            element = scene.elements.getOrNull(index) ?: return null,
+        )
+    }
+}
+
 private data class SceneElementEditorState(
     val scene: Scene,
     val index: Int? = null,
@@ -508,6 +566,13 @@ private fun SceneElementDeleteDialog(
     val element = state.element
     AlertDialog(
         onDismissRequest = onDismiss,
+        icon = {
+            Icon(
+                Icons.Filled.Delete,
+                contentDescription = "Remove element",
+                tint = MaterialTheme.colorScheme.error,
+            )
+        },
         title = { Text("Remove element?") },
         text = {
             Text(
@@ -516,7 +581,15 @@ private fun SceneElementDeleteDialog(
             )
         },
         confirmButton = {
-            Button(onClick = onConfirm) { Text("Remove") }
+            Button(
+                onClick = onConfirm,
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = MaterialTheme.colorScheme.error,
+                    contentColor = MaterialTheme.colorScheme.onError,
+                ),
+            ) {
+                Text("Remove Element")
+            }
         },
         dismissButton = {
             TextButton(onClick = onDismiss) { Text("Cancel") }
@@ -534,20 +607,22 @@ private fun SceneElementEditorDialog(
     val initial = remember(state) {
         state.element ?: SceneElementDrafts.defaultElement(state.scene, SceneElementType.BUTTON)
     }
-    var type by remember(state) { mutableStateOf(initial.type.takeIf { it in SceneElementDrafts.editableTypes } ?: SceneElementType.BUTTON) }
-    var x by remember(state) { mutableStateOf(initial.xDp.toString()) }
-    var y by remember(state) { mutableStateOf(initial.yDp.toString()) }
-    var width by remember(state) { mutableStateOf(initial.widthDp.toString()) }
-    var height by remember(state) { mutableStateOf(initial.heightDp.toString()) }
-    var label by remember(state) {
+    var type by rememberSaveable(state.scene.id, state.index) {
+        mutableStateOf(initial.type.takeIf { it in SceneElementDrafts.editableTypes } ?: SceneElementType.BUTTON)
+    }
+    var x by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.xDp.toString()) }
+    var y by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.yDp.toString()) }
+    var width by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.widthDp.toString()) }
+    var height by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.heightDp.toString()) }
+    var label by rememberSaveable(state.scene.id, state.index) {
         mutableStateOf(initial.config["label"] ?: initial.config["text"] ?: "")
     }
-    var sliderMin by remember(state) { mutableStateOf(initial.config["min"] ?: "0") }
-    var sliderMax by remember(state) { mutableStateOf(initial.config["max"] ?: "100") }
-    var sliderValue by remember(state) { mutableStateOf(initial.config["value"] ?: "50") }
-    var imageSource by remember(state) { mutableStateOf(initial.config["source"] ?: "") }
-    var tapTaskId by remember(state) { mutableStateOf(initial.tapTaskId) }
-    var longPressTaskId by remember(state) { mutableStateOf(initial.longPressTaskId) }
+    var sliderMin by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.config["min"] ?: "0") }
+    var sliderMax by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.config["max"] ?: "100") }
+    var sliderValue by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.config["value"] ?: "50") }
+    var imageSource by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.config["source"] ?: "") }
+    var tapTaskId by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.tapTaskId) }
+    var longPressTaskId by rememberSaveable(state.scene.id, state.index) { mutableStateOf(initial.longPressTaskId) }
 
     val parsedX = x.toIntOrNull()
     val parsedY = y.toIntOrNull()
diff --git a/app/src/main/java/com/opentasker/ui/screens/VariablesScreen.kt b/app/src/main/java/com/opentasker/ui/screens/VariablesScreen.kt
@@ -168,7 +168,11 @@ private fun VariableRow(
                 )
             }
             IconButton(onClick = onDelete) {
-                Icon(Icons.Filled.Delete, contentDescription = "Delete variable")
+                Icon(
+                    Icons.Filled.Delete,
+                    contentDescription = "Delete variable",
+                    tint = MaterialTheme.colorScheme.error,
+                )
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,11 @@ private fun VariableRow(`
`168`	`168`	`)`
`169`	`169`	`}`
`170`	`170`	`IconButton(onClick = onDelete) {`
`171`		`- Icon(Icons.Filled.Delete, contentDescription = "Delete variable")`
	`171`	`+ Icon(`
	`172`	`+ Icons.Filled.Delete,`
	`173`	`+ contentDescription = "Delete variable",`
	`174`	`+ tint = MaterialTheme.colorScheme.error,`
	`175`	`+ )`
`172`	`176`	`}`
`173`	`177`	`}`
`174`	`178`	`}`