Merge pull request 'rc/android-ios-parity' (#1) from rc/android-ios-parity into master

Reviewed-on: #1

Makefile

@@ -0,0 +1,55 @@
+# Makefile for HoneyDue KMM — wraps the long-form commands you actually
+# use every day. If you find yourself copy/pasting a command twice, it
+# belongs here.
+#
+# Quick reference
+# ---------------
+#   make verify-snapshots     # fast; run on every PR, CI runs this
+#   make record-snapshots     # slow; regenerate baselines after UI change
+#   make optimize-goldens     # rarely needed — record-snapshots runs this
+#
+.PHONY: help record-snapshots verify-snapshots optimize-goldens \
+        record-ios record-android verify-ios verify-android
+
+help:
+	@echo "HoneyDue KMM — common tasks"
+	@echo ""
+	@echo "  make verify-snapshots    Verify iOS + Android parity goldens (CI gate)"
+	@echo "  make record-snapshots    Regenerate iOS + Android goldens + optimize"
+	@echo "  make optimize-goldens    Run the PNG optimizer across both directories"
+	@echo ""
+	@echo "  make verify-ios          Verify just the iOS gallery"
+	@echo "  make verify-android      Verify just the Android gallery"
+	@echo "  make record-ios          Regenerate just the iOS gallery"
+	@echo "  make record-android      Regenerate just the Android gallery"
+	@echo ""
+
+# ---- Parity gallery (combined) ----
+
+# Regenerate every parity-gallery golden (iOS + Android) and shrink the
+# output PNGs. Slow (~3 min); run after intentional UI changes only.
+record-snapshots:
+	@./scripts/record_snapshots.sh
+
+# Verify current UI matches committed goldens. Fast (~1 min). PR gate.
+verify-snapshots:
+	@./scripts/verify_snapshots.sh
+
+# Optimize every PNG golden in-place (idempotent). Usually invoked
+# automatically by record-snapshots; exposed here for one-off cleanup.
+optimize-goldens:
+	@./scripts/optimize_goldens.sh
+
+# ---- Parity gallery (single platform) ----
+
+record-ios:
+	@./scripts/record_snapshots.sh --ios-only
+
+record-android:
+	@./scripts/record_snapshots.sh --android-only
+
+verify-ios:
+	@./scripts/verify_snapshots.sh --ios-only
+
+verify-android:
+	@./scripts/verify_snapshots.sh --android-only

composeApp/build.gradle.kts

@@ -223,11 +223,21 @@ compose.desktop {
     }
 }
 
-// Roborazzi screenshot-regression plugin (P8). Pin the golden-image
+// Roborazzi screenshot-regression plugin (parity gallery, P2). Pin the
-// output directory inside the test source set so goldens live in git
+// golden-image output directory inside the test source set so goldens live
-// alongside the tests themselves. Anything under build/ is gitignored
+// in git alongside the tests themselves. Anything under build/ is
-// and gets blown away by `gradle clean` — not where committed goldens
+// gitignored and gets blown away by `gradle clean` — not where committed
-// belong.
+// goldens belong.
+//
+// NOTE on path mismatch: `captureRoboImage(filePath = ...)` in
+// ScreenshotTests.kt takes a *relative path* resolved against the Gradle
+// test task's working directory (`composeApp/`). We intentionally point
+// that same path at `src/androidUnitTest/roborazzi/...` — and configure
+// the plugin extension below to match — so record and verify read from
+// and write to the exact same committed-golden location. Any other
+// arrangement results in the "original file was not found" error because
+// the plugin doesn't currently auto-copy between `build/outputs/roborazzi`
+// and the extension outputDir for the KMM Android target.
 roborazzi {
     outputDir.set(layout.projectDirectory.dir("src/androidUnitTest/roborazzi"))
 }

composeApp/src/androidMain/kotlin/com/tt/honeyDue/platform/ImagePicker.android.kt

@@ -8,6 +8,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.core.content.FileProvider
 import java.io.File
 
@@ -58,6 +59,15 @@ actual fun rememberImagePicker(
 actual fun rememberCameraPicker(
     onImageCaptured: (ImageData) -> Unit
 ): () -> Unit {
+    // Compose previews and Roborazzi snapshot tests run without a
+    // `FileProvider` resolvable cache path — `getUriForFile` throws
+    // `Failed to find configured root...` because the test cache dir
+    // isn't registered in the manifest's `file_paths.xml`. The launch
+    // callback is never invoked in a preview/snapshot anyway, so
+    // returning a no-op keeps the composition clean.
+    if (LocalInspectionMode.current) {
+        return {}
+    }
     val context = LocalContext.current
 
     // Create a temp file URI for the camera to save to

composeApp/src/androidMain/kotlin/com/tt/honeyDue/ui/support/TestTagSupport.android.kt

@@ -0,0 +1,9 @@
+package com.tt.honeyDue.ui.support
+
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
+
+@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class)
+actual fun Modifier.enableTestTagsAsResourceId(): Modifier =
+    this.semantics { testTagsAsResourceId = true }

composeApp/src/androidUnitTest/kotlin/com/tt/honeyDue/architecture/NoIndependentViewModelStateFileScanTest.kt

@@ -0,0 +1,130 @@
+package com.tt.honeyDue.architecture
+
+import java.io.File
+import kotlin.test.Test
+import kotlin.test.fail
+
+/**
+ * Architecture regression gate.
+ *
+ * Scans `composeApp/src/commonMain/kotlin/com/tt/honeyDue/viewmodel/` and
+ * asserts every ViewModel either:
+ *   a) accepts `dataManager: IDataManager` as a constructor parameter, or
+ *   b) is explicitly allowlisted in [WORKFLOW_ONLY_VMS] as a
+ *      workflow/mutation-only VM.
+ *
+ * Prevents the Dec 3 2025 regression (4 VMs holding independent
+ * `MutableStateFlow` read-state instead of deriving from DataManager).
+ * See `docs/parity-gallery.md` "Known limitations" for the history.
+ *
+ * Workflow / write-only (no read-state to mirror):
+ *   * `TaskCompletionViewModel`  — single-shot create mutation
+ *   * `OnboardingViewModel`       — wizard form + per-step ApiResult
+ *   * `PasswordResetViewModel`    — wizard form + per-step ApiResult
+ *
+ * Everyone else must accept the `dataManager` ctor param.
+ */
+class NoIndependentViewModelStateFileScanTest {
+
+    @Test
+    fun every_read_state_vm_accepts_iDataManager_ctor_param() {
+        val vmSources = findViewModelSources()
+        val violations = mutableListOf<String>()
+
+        vmSources.forEach { file ->
+            val name = file.name
+            if (name in WORKFLOW_ONLY_VMS) return@forEach
+
+            val body = file.readText()
+            val hasCtorParam = body.contains(Regex("""dataManager:\s*IDataManager"""))
+            if (!hasCtorParam) {
+                violations.add(
+                    "$name — expected `dataManager: IDataManager = DataManager` " +
+                        "constructor parameter. Without this, read-state can't derive " +
+                        "from the DataManager single source of truth and snapshot " +
+                        "tests can't substitute a fixture. " +
+                        "If this VM genuinely has no read-state (workflow / mutation only), " +
+                        "add its filename to WORKFLOW_ONLY_VMS with justification.",
+                )
+            }
+        }
+
+        if (violations.isNotEmpty()) {
+            fail(
+                "ViewModel architecture regression (see docs/parity-gallery.md):\n" +
+                    violations.joinToString(separator = "\n") { "  - $it" },
+            )
+        }
+    }
+
+    @Test
+    fun read_state_flows_should_be_derived_not_independent() {
+        val vmSources = findViewModelSources()
+        val violations = mutableListOf<String>()
+
+        // Names of fields that track one-shot mutation/workflow feedback —
+        // exempt from the "must be derived" rule.
+        val mutationFieldPrefixes = listOf(
+            "create", "update", "delete", "toggle", "download",
+            "upload", "archive", "unarchive", "cancel", "uncancel",
+            "mark", "generate", "request", "submit", "login", "register",
+            "reset", "forgot", "verify", "apple", "google",
+            "join", "addNew", "addTask", "taskAddNew",
+            "action", "currentStep", "resetToken", "email", "selected",
+            // Local-only state not cached by DataManager:
+            "category", // NotificationPreferencesViewModel per-channel local toggles
+        )
+
+        vmSources.forEach { file ->
+            val name = file.name
+            if (name in WORKFLOW_ONLY_VMS) return@forEach
+            if (name == "AuthViewModel.kt") return@forEach  // 11 one-shot states, all mutation-feedback; allowlisted as a file
+
+            val body = file.readText()
+            val mutableReads = Regex("""private val (_[a-zA-Z]+State)\s*=\s*MutableStateFlow""")
+                .findAll(body).map { it.groupValues[1] }.toList()
+
+            mutableReads.forEach { fieldName ->
+                val root = fieldName.removePrefix("_").removeSuffix("State")
+                val isMutationFeedback = mutationFieldPrefixes.any {
+                    root.lowercase().startsWith(it.lowercase())
+                }
+                if (!isMutationFeedback) {
+                    violations.add(
+                        "$name — field `$fieldName` looks like cached read-state " +
+                            "(not matching any mutation-feedback prefix). Derive it from " +
+                            "DataManager via `dataManager.xxx.map { ... }.stateIn(...)` " +
+                            "instead of owning a MutableStateFlow. If this field really " +
+                            "is mutation feedback, add its name prefix to " +
+                            "mutationFieldPrefixes in this test.",
+                    )
+                }
+            }
+        }
+
+        if (violations.isNotEmpty()) {
+            fail(
+                "ViewModel state-ownership regression (see docs/parity-gallery.md):\n" +
+                    violations.joinToString(separator = "\n") { "  - $it" },
+            )
+        }
+    }
+
+    private fun findViewModelSources(): List<File> {
+        // Test cwd is `composeApp/` — resolve from the project dir.
+        val vmDir = File("src/commonMain/kotlin/com/tt/honeyDue/viewmodel")
+        check(vmDir.exists()) {
+            "expected VM source directory not found: ${vmDir.absolutePath} (cwd=${File(".").absolutePath})"
+        }
+        return vmDir.listFiles { f -> f.extension == "kt" }?.toList().orEmpty()
+    }
+
+    companion object {
+        /** VMs that legitimately don't need DataManager injection. */
+        val WORKFLOW_ONLY_VMS: Set<String> = setOf(
+            "TaskCompletionViewModel.kt",
+            "OnboardingViewModel.kt",
+            "PasswordResetViewModel.kt",
+        )
+    }
+}

composeApp/src/androidUnitTest/kotlin/com/tt/honeyDue/screenshot/GalleryManifestParityTest.kt

@@ -0,0 +1,68 @@
+package com.tt.honeyDue.screenshot
+
+import com.tt.honeyDue.testing.GalleryScreens
+import com.tt.honeyDue.testing.Platform
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+/**
+ * Parity gate — asserts [gallerySurfaces] is exactly the set of screens
+ * declared in [GalleryScreens] with [Platform.ANDROID] in their platforms.
+ *
+ * If this fails, either:
+ *   - A new screen was added to [gallerySurfaces] but missing from the
+ *     canonical manifest — update [GalleryScreens.all].
+ *   - A new screen was added to the manifest but not wired into
+ *     [gallerySurfaces] — add the corresponding `GallerySurface(...)`
+ *     entry.
+ *   - A rename landed on only one side — reconcile.
+ *
+ * This keeps Android and iOS from silently drifting apart in coverage.
+ * The iOS equivalent (`GalleryManifestParityTest.swift`) enforces the
+ * same invariant on the Swift test file.
+ */
+class GalleryManifestParityTest {
+
+    @Test
+    fun android_surfaces_match_manifest_exactly() {
+        val actual = gallerySurfaces.map { it.name }.toSet()
+        val expected = GalleryScreens.forAndroid.keys
+
+        val missing = expected - actual
+        val extra = actual - expected
+
+        if (missing.isNotEmpty() || extra.isNotEmpty()) {
+            val message = buildString {
+                appendLine("Android GallerySurfaces drifted from canonical manifest.")
+                if (missing.isNotEmpty()) {
+                    appendLine()
+                    appendLine("Screens in manifest but missing from GallerySurfaces.kt:")
+                    missing.sorted().forEach { appendLine("  - $it") }
+                }
+                if (extra.isNotEmpty()) {
+                    appendLine()
+                    appendLine("Screens in GallerySurfaces.kt but missing from manifest:")
+                    extra.sorted().forEach { appendLine("  - $it") }
+                }
+                appendLine()
+                appendLine("Reconcile by editing com.tt.honeyDue.testing.GalleryScreens and/or")
+                appendLine("com.tt.honeyDue.screenshot.GallerySurfaces so both agree.")
+            }
+            kotlin.test.fail(message)
+        }
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun no_duplicate_surface_names() {
+        val duplicates = gallerySurfaces.map { it.name }
+            .groupingBy { it }
+            .eachCount()
+            .filterValues { it > 1 }
+        assertTrue(
+            duplicates.isEmpty(),
+            "Duplicate surface names in GallerySurfaces.kt: $duplicates",
+        )
+    }
+}

composeApp/src/androidUnitTest/kotlin/com/tt/honeyDue/screenshot/GallerySurfaces.kt

@@ -0,0 +1,383 @@
+@file:OptIn(androidx.compose.material3.ExperimentalMaterial3Api::class)
+package com.tt.honeyDue.screenshot
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import com.tt.honeyDue.testing.Fixtures
+import com.tt.honeyDue.ui.screens.AddDocumentScreen
+import com.tt.honeyDue.ui.screens.AddResidenceScreen
+import com.tt.honeyDue.ui.screens.AllTasksScreen
+import com.tt.honeyDue.ui.screens.BiometricLockScreen
+import com.tt.honeyDue.ui.screens.CompleteTaskScreen
+import com.tt.honeyDue.ui.screens.ContractorDetailScreen
+import com.tt.honeyDue.ui.screens.ContractorsScreen
+import com.tt.honeyDue.ui.screens.DocumentDetailScreen
+import com.tt.honeyDue.ui.screens.DocumentsScreen
+import com.tt.honeyDue.ui.screens.EditDocumentScreen
+import com.tt.honeyDue.ui.screens.EditResidenceScreen
+import com.tt.honeyDue.ui.screens.EditTaskScreen
+import com.tt.honeyDue.ui.screens.ForgotPasswordScreen
+import com.tt.honeyDue.ui.screens.HomeScreen
+import com.tt.honeyDue.ui.screens.LoginScreen
+import com.tt.honeyDue.ui.screens.ManageUsersScreen
+import com.tt.honeyDue.ui.screens.NotificationPreferencesScreen
+import com.tt.honeyDue.ui.screens.ProfileScreen
+import com.tt.honeyDue.ui.screens.RegisterScreen
+import com.tt.honeyDue.ui.screens.ResetPasswordScreen
+import com.tt.honeyDue.ui.screens.ResidenceDetailScreen
+import com.tt.honeyDue.ui.screens.ResidencesScreen
+import com.tt.honeyDue.ui.screens.VerifyEmailScreen
+import com.tt.honeyDue.ui.screens.VerifyResetCodeScreen
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingCreateAccountContent
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingFirstTaskContent
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingHomeProfileContent
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingJoinResidenceContent
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingLocationContent
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingNameResidenceContent
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingSubscriptionContent
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingValuePropsContent
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingVerifyEmailContent
+import com.tt.honeyDue.ui.screens.onboarding.OnboardingWelcomeContent
+import com.tt.honeyDue.ui.screens.residence.JoinResidenceScreen
+import com.tt.honeyDue.ui.screens.subscription.FeatureComparisonScreen
+import com.tt.honeyDue.ui.screens.task.AddTaskWithResidenceScreen
+import com.tt.honeyDue.ui.screens.task.TaskSuggestionsScreen
+import com.tt.honeyDue.ui.screens.task.TaskTemplatesBrowserScreen
+import com.tt.honeyDue.ui.screens.theme.ThemeSelectionScreen
+import com.tt.honeyDue.viewmodel.ContractorViewModel
+import com.tt.honeyDue.viewmodel.DocumentViewModel
+import com.tt.honeyDue.viewmodel.OnboardingViewModel
+import com.tt.honeyDue.viewmodel.PasswordResetViewModel
+
+/**
+ * Declarative manifest of every Android gallery surface. Must stay in sync
+ * with the canonical [com.tt.honeyDue.testing.GalleryScreens] manifest —
+ * [GalleryManifestParityTest] fails CI if the two drift.
+ *
+ * Scope: the screens users land on. We deliberately skip:
+ *   - dialogs that live inside a host screen (already captured on the host),
+ *   - animation sub-views / decorative components in AnimationTesting/,
+ *   - widget views (Android Glance / iOS WidgetKit — separate surface),
+ *   - shared helper composables (loaders, error rows, thumbnails — they
+ *     only appear as part of a parent screen).
+ *
+ * Detail-VM pattern (contractor_detail, document_detail, edit_document):
+ * the VM is created with the fixture id already pre-selected, so
+ * `stateIn(SharingStarted.Eagerly, initialValue = dataManager.x[id])`
+ * emits `Success(entity)` on first composition. Without this pre-select,
+ * the screens' own `LaunchedEffect(id) { vm.loadX(id) }` dispatches the id
+ * assignment to a coroutine that runs *after* Roborazzi captures the
+ * frame — so both empty and populated captures would render the `Idle`
+ * state and be byte-identical.
+ *
+ * Screens that require a construction-time ViewModel
+ * ([OnboardingViewModel], [PasswordResetViewModel]) instantiate it inline
+ * here. The production code paths start the viewmodel's own
+ * `launch { APILayer.xxx() }` on first composition — those calls fail fast
+ * in the hermetic Robolectric environment, but the composition itself
+ * renders the surface from the injected
+ * [com.tt.honeyDue.data.LocalDataManager] before any network result
+ * arrives, which is exactly what we want to compare against iOS.
+ */
+data class GallerySurface(
+    /** Snake-case identifier; used as the golden file-name prefix. */
+    val name: String,
+    val content: @Composable () -> Unit,
+) {
+    /**
+     * ParameterizedRobolectricTestRunner uses `toString()` in the test
+     * display name when the `{0}` pattern is set. The default data-class
+     * toString includes the composable lambda hash — not useful. Override
+     * so test reports show `ScreenshotTests[login]` instead of
+     * `ScreenshotTests[GallerySurface(name=login, content=...@abc123)]`.
+     */
+    override fun toString(): String = name
+}
+
+val gallerySurfaces: List<GallerySurface> = listOf(
+    // ---------- Auth ----------
+    GallerySurface("login") {
+        LoginScreen(
+            onLoginSuccess = {},
+            onNavigateToRegister = {},
+            onNavigateToForgotPassword = {},
+        )
+    },
+    GallerySurface("register") {
+        RegisterScreen(
+            onRegisterSuccess = {},
+            onNavigateBack = {},
+        )
+    },
+    GallerySurface("forgot_password") {
+        ForgotPasswordScreen(
+            onNavigateBack = {},
+            onNavigateToVerify = {},
+            onNavigateToReset = {},
+            viewModel = PasswordResetViewModel(),
+        )
+    },
+    GallerySurface("verify_reset_code") {
+        VerifyResetCodeScreen(
+            onNavigateBack = {},
+            onNavigateToReset = {},
+            viewModel = PasswordResetViewModel(),
+        )
+    },
+    GallerySurface("reset_password") {
+        ResetPasswordScreen(
+            onPasswordResetSuccess = {},
+            onNavigateBack = {},
+            viewModel = PasswordResetViewModel(),
+        )
+    },
+    GallerySurface("verify_email") {
+        VerifyEmailScreen(
+            onVerifySuccess = {},
+            onLogout = {},
+        )
+    },
+
+    // ---------- Onboarding ----------
+    GallerySurface("onboarding_welcome") {
+        OnboardingWelcomeContent(
+            onStartFresh = {},
+            onJoinExisting = {},
+            onLogin = {},
+        )
+    },
+    GallerySurface("onboarding_value_props") {
+        OnboardingValuePropsContent(onContinue = {})
+    },
+    GallerySurface("onboarding_create_account") {
+        OnboardingCreateAccountContent(
+            viewModel = OnboardingViewModel(),
+            onAccountCreated = {},
+        )
+    },
+    GallerySurface("onboarding_verify_email") {
+        OnboardingVerifyEmailContent(
+            viewModel = OnboardingViewModel(),
+            onVerified = {},
+        )
+    },
+    GallerySurface("onboarding_location") {
+        OnboardingLocationContent(
+            viewModel = OnboardingViewModel(),
+            onLocationDetected = {},
+            onSkip = {},
+        )
+    },
+    GallerySurface("onboarding_name_residence") {
+        OnboardingNameResidenceContent(
+            viewModel = OnboardingViewModel(),
+            onContinue = {},
+        )
+    },
+    GallerySurface("onboarding_home_profile") {
+        OnboardingHomeProfileContent(
+            viewModel = OnboardingViewModel(),
+            onContinue = {},
+            onSkip = {},
+        )
+    },
+    GallerySurface("onboarding_join_residence") {
+        OnboardingJoinResidenceContent(
+            viewModel = OnboardingViewModel(),
+            onJoined = {},
+        )
+    },
+    GallerySurface("onboarding_first_task") {
+        OnboardingFirstTaskContent(
+            viewModel = OnboardingViewModel(),
+            onTasksAdded = {},
+        )
+    },
+    GallerySurface("onboarding_subscription") {
+        OnboardingSubscriptionContent(
+            onSubscribe = {},
+            onSkip = {},
+        )
+    },
+
+    // ---------- Home (Android-only dashboard) ----------
+    GallerySurface("home") {
+        HomeScreen(
+            onNavigateToResidences = {},
+            onNavigateToTasks = {},
+            onLogout = {},
+        )
+    },
+
+    // ---------- Residences ----------
+    GallerySurface("residences") {
+        ResidencesScreen(
+            onResidenceClick = {},
+            onAddResidence = {},
+            onJoinResidence = {},
+            onLogout = {},
+        )
+    },
+    GallerySurface("residence_detail") {
+        ResidenceDetailScreen(
+            residenceId = Fixtures.primaryHome.id,
+            onNavigateBack = {},
+            onNavigateToEditResidence = {},
+            onNavigateToEditTask = {},
+        )
+    },
+    GallerySurface("add_residence") {
+        AddResidenceScreen(
+            onNavigateBack = {},
+            onResidenceCreated = {},
+        )
+    },
+    GallerySurface("edit_residence") {
+        EditResidenceScreen(
+            residence = Fixtures.primaryHome,
+            onNavigateBack = {},
+            onResidenceUpdated = {},
+        )
+    },
+    GallerySurface("join_residence") {
+        JoinResidenceScreen(
+            onNavigateBack = {},
+            onJoined = {},
+        )
+    },
+    GallerySurface("manage_users") {
+        ManageUsersScreen(
+            residenceId = Fixtures.primaryHome.id,
+            residenceName = Fixtures.primaryHome.name,
+            isPrimaryOwner = true,
+            residenceOwnerId = Fixtures.primaryHome.ownerId,
+            onNavigateBack = {},
+        )
+    },
+
+    // ---------- Tasks ----------
+    GallerySurface("all_tasks") {
+        AllTasksScreen(onNavigateToEditTask = {})
+    },
+    GallerySurface("add_task_with_residence") {
+        AddTaskWithResidenceScreen(
+            residenceId = Fixtures.primaryHome.id,
+            onNavigateBack = {},
+            onCreated = {},
+        )
+    },
+    GallerySurface("edit_task") {
+        EditTaskScreen(
+            task = Fixtures.tasks.first(),
+            onNavigateBack = {},
+            onTaskUpdated = {},
+        )
+    },
+    GallerySurface("complete_task") {
+        val task = Fixtures.tasks.first()
+        CompleteTaskScreen(
+            taskId = task.id,
+            taskTitle = task.title,
+            residenceName = Fixtures.primaryHome.name,
+            onNavigateBack = {},
+            onComplete = { _, _ -> },
+        )
+    },
+    GallerySurface("task_suggestions") {
+        TaskSuggestionsScreen(
+            residenceId = Fixtures.primaryHome.id,
+            onNavigateBack = {},
+            onSuggestionAccepted = {},
+        )
+    },
+    GallerySurface("task_templates_browser") {
+        TaskTemplatesBrowserScreen(
+            residenceId = Fixtures.primaryHome.id,
+            onNavigateBack = {},
+        )
+    },
+
+    // ---------- Contractors ----------
+    GallerySurface("contractors") {
+        ContractorsScreen(
+            onNavigateBack = {},
+            onNavigateToContractorDetail = {},
+        )
+    },
+    GallerySurface("contractor_detail") {
+        val id = Fixtures.contractors.first().id
+        // Pass `initialSelectedContractorId` at VM construction so the
+        // synchronous `stateIn` initial-value closure observes both the
+        // id AND the fixture-seeded `dataManager.contractorDetail[id]`,
+        // emitting `Success(contractor)` on first composition. Without
+        // this the screen's own `LaunchedEffect(id) { vm.loadContractorDetail(id) }`
+        // dispatches the id assignment to a coroutine that runs after
+        // the frame is captured, leaving both empty and populated
+        // captures byte-identical on the `Idle` branch.
+        val vm = remember { ContractorViewModel(initialSelectedContractorId = id) }
+        ContractorDetailScreen(
+            contractorId = id,
+            onNavigateBack = {},
+            viewModel = vm,
+        )
+    },
+
+    // ---------- Documents ----------
+    GallerySurface("documents") {
+        DocumentsScreen(
+            onNavigateBack = {},
+            residenceId = Fixtures.primaryHome.id,
+        )
+    },
+    GallerySurface("document_detail") {
+        val id = Fixtures.documents.first().id ?: 0
+        val vm = remember { DocumentViewModel(initialSelectedDocumentId = id) }
+        DocumentDetailScreen(
+            documentId = id,
+            onNavigateBack = {},
+            onNavigateToEdit = { _ -> },
+            documentViewModel = vm,
+        )
+    },
+    GallerySurface("add_document") {
+        AddDocumentScreen(
+            residenceId = Fixtures.primaryHome.id,
+            onNavigateBack = {},
+            onDocumentCreated = {},
+        )
+    },
+    GallerySurface("edit_document") {
+        val id = Fixtures.documents.first().id ?: 0
+        val vm = remember { DocumentViewModel(initialSelectedDocumentId = id) }
+        EditDocumentScreen(
+            documentId = id,
+            onNavigateBack = {},
+            documentViewModel = vm,
+        )
+    },
+
+    // ---------- Profile / settings ----------
+    GallerySurface("profile") {
+        ProfileScreen(
+            onNavigateBack = {},
+            onLogout = {},
+        )
+    },
+    GallerySurface("notification_preferences") {
+        NotificationPreferencesScreen(onNavigateBack = {})
+    },
+    GallerySurface("theme_selection") {
+        ThemeSelectionScreen(onNavigateBack = {})
+    },
+    GallerySurface("biometric_lock") {
+        BiometricLockScreen(onUnlocked = {})
+    },
+
+    // ---------- Subscription ----------
+    GallerySurface("feature_comparison") {
+        FeatureComparisonScreen(
+            onNavigateBack = {},
+            onNavigateToUpgrade = {},
+        )
+    },
+)

composeApp/src/androidUnitTest/kotlin/com/tt/honeyDue/screenshot/ScreenshotTests.kt

@@ -1,485 +1,236 @@
 @file:OptIn(androidx.compose.material3.ExperimentalMaterial3Api::class)
 package com.tt.honeyDue.screenshot
 
-import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Task
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.unit.dp
+import androidx.test.core.app.ApplicationProvider
-import androidx.compose.material3.ExperimentalMaterial3Api
-import com.github.takahirom.roborazzi.RoborazziOptions
 import com.github.takahirom.roborazzi.captureRoboImage
+import com.tt.honeyDue.data.IDataManager
+import com.tt.honeyDue.data.LocalDataManager
+import com.tt.honeyDue.testing.FixtureDataManager
+import com.tt.honeyDue.testing.GalleryCategory
+import com.tt.honeyDue.testing.GalleryScreens
 import com.tt.honeyDue.ui.theme.AppThemes
 import com.tt.honeyDue.ui.theme.HoneyDueTheme
-import com.tt.honeyDue.ui.theme.ThemeColors
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
 /**
- * Roborazzi-driven screenshot regression tests (P8).
+ * Parity-gallery Roborazzi snapshot tests.
  *
- * Runs entirely on the Robolectric unit-test classpath — no emulator
+ * Variant matrix (driven by [GalleryCategory] in the canonical
- * required. The goal is to catch accidental UI drift (colour, spacing,
+ * [GalleryScreens] manifest):
- * typography) on PRs by diffing generated PNGs against a committed
- * golden set.
  *
- * Matrix: 6 surfaces × 3 themes (Default / Ocean / Midnight) × 2 modes
+ *   DataCarrying surfaces — capture 4 variants:
- * (light / dark) = 36 images. This is a conservative baseline; the full
+ *     surface_empty_light.png      (empty fixture, no lookups,  light)
- * 11-theme matrix would produce 132+ images and is deferred.
+ *     surface_empty_dark.png       (empty fixture, no lookups,  dark)
+ *     surface_populated_light.png  (populated fixture,          light)
+ *     surface_populated_dark.png   (populated fixture,          dark)
  *
- * Implementation notes:
+ *   DataFree surfaces — capture 2 variants:
- * - We use the top-level `captureRoboImage(path) { composable }` form
+ *     surface_light.png            (empty fixture, lookups seeded, light)
- *   from roborazzi-compose. That helper registers
+ *     surface_dark.png             (empty fixture, lookups seeded, dark)
- *   `RoborazziTransparentActivity` at runtime via Robolectric's shadow
- *   PackageManager, so we don't need `createComposeRule()` /
- *   `ActivityScenarioRule<ComponentActivity>` and therefore avoid the
- *   "Unable to resolve activity for Intent MAIN/LAUNCHER cmp=.../ComponentActivity"
- *   failure that bit the initial scaffolding (RoboMonitoringInstrumentation:102).
- * - Goldens land under `composeApp/build/outputs/roborazzi/`, which the
- *   Roborazzi Gradle plugin picks up for record / verify / compare.
  *
- * Workflow:
+ *   The `empty` fixture for DataCarrying variants passes
- * - Initial record: `./gradlew :composeApp:recordRoborazziDebug`
+ *   `seedLookups = false` so form dropdowns render their empty state
- * - Verify in CI:    `./gradlew :composeApp:verifyRoborazziDebug`
+ *   (yielding a visible populated-vs-empty diff for forms that read
- * - View diffs:      `./gradlew :composeApp:compareRoborazziDebug`
+ *   lookups from `DataManager`). The `empty` fixture for DataFree
+ *   variants passes `seedLookups = true` because those screens expect
+ *   realistic production lookups even when the user has no entities yet.
+ *
+ *   DataFree surfaces omit the populated variant entirely — the screens
+ *   render no entity data, so `populated` would be byte-identical to
+ *   `empty` and add zero signal.
+ *
+ * Granular CI failures: one parameterized test per surface means the
+ * report shows `ScreenshotTests[login]`, `ScreenshotTests[tasks]`, etc.
+ * rather than one monolithic failure when any surface drifts.
+ *
+ * Why the goldens land directly under `src/androidUnitTest/roborazzi/`:
+ * Roborazzi resolves `captureRoboImage(filePath = …)` relative to the
+ * Gradle test task's working directory (the module root). Writing to
+ * the same directory where goldens are committed means record and
+ * verify round-trip through one canonical location.
  */
-@RunWith(RobolectricTestRunner::class)
+@RunWith(ParameterizedRobolectricTestRunner::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
 @Config(qualifiers = "w360dp-h800dp-mdpi")
-class ScreenshotTests {
+class ScreenshotTests(
+    private val surface: GallerySurface,
+) {
 
-    // ---------- Login screen showcase ----------
+    /**
-
+     * Compose Multiplatform's `stringResource()` loads text via a
-    @Test
+     * JVM-static context held by `AndroidContextProvider`. Under
-    fun loginScreen_default_light() = runScreen("login_default_light", AppThemes.Default, darkTheme = false) {
+     * Robolectric unit tests the `ContentProvider` that normally
-        LoginShowcase()
+     * populates it never runs, so every `stringResource(...)` call throws
+     * "Android context is not initialized."
+     *
+     * Install the context eagerly via reflection before each test.
+     * `AndroidContextProvider` is `internal`, but its static slot is
+     * writable through the generated `Companion.setANDROID_CONTEXT`
+     * accessor.
+     */
+    @Before
+    fun bootstrapComposeResources() {
+        val appContext = ApplicationProvider.getApplicationContext<android.content.Context>()
+        val providerClass = Class.forName("org.jetbrains.compose.resources.AndroidContextProvider")
+        val companionField = providerClass.getDeclaredField("Companion").apply { isAccessible = true }
+        val companion = companionField.get(null)
+        val setter = companion.javaClass.getMethod("setANDROID_CONTEXT", android.content.Context::class.java)
+        setter.invoke(companion, appContext)
     }
 
     @Test
-    fun loginScreen_default_dark() = runScreen("login_default_dark", AppThemes.Default, darkTheme = true) {
+    fun captureAllVariants() {
-        LoginShowcase()
+        val screen = GalleryScreens.forAndroid[surface.name]
-    }
+            ?: error(
+                "Surface '${surface.name}' is in GallerySurfaces.kt but not in " +
+                    "GalleryScreens.all (canonical manifest). " +
+                    "GalleryManifestParityTest should have caught this.",
+            )
 
-    @Test
+        val variants = when (screen.category) {
-    fun loginScreen_ocean_light() = runScreen("login_ocean_light", AppThemes.Ocean, darkTheme = false) {
+            GalleryCategory.DataCarrying -> Variant.dataCarrying
-        LoginShowcase()
+            GalleryCategory.DataFree -> Variant.dataFree
-    }
+        }
 
-    @Test
+        variants.forEach { variant ->
-    fun loginScreen_ocean_dark() = runScreen("login_ocean_dark", AppThemes.Ocean, darkTheme = true) {
+            val fileName = "${surface.name}${variant.fileSuffix}.png"
-        LoginShowcase()
+            val fixture = variant.dataManager()
-    }
+            seedSingleton(fixture)
-
+            // Flush the main-thread Looper so any `stateIn(... Eagerly)`
-    @Test
+            // collectors on VMs reused across captures have processed the
-    fun loginScreen_midnight_light() = runScreen("login_midnight_light", AppThemes.Midnight, darkTheme = false) {
+            // DataManager update before we snapshot. Without this, VMs
-        LoginShowcase()
+            // might see the previous variant's data because coroutine
-    }
+            // emissions race the capture call.
-
+            shadowOf(android.os.Looper.getMainLooper()).idle()
-    @Test
+            captureRoboImage(filePath = "src/androidUnitTest/roborazzi/$fileName") {
-    fun loginScreen_midnight_dark() = runScreen("login_midnight_dark", AppThemes.Midnight, darkTheme = true) {
+                HoneyDueTheme(
-        LoginShowcase()
+                    themeColors = AppThemes.Default,
-    }
+                    darkTheme = variant.darkTheme,
-
+                ) {
-    // ---------- Tasks list showcase ----------
+                    // `LocalInspectionMode = true` signals to production
-
+                    // composables that they're rendering in a hermetic
-    @Test
+                    // preview/test environment. Camera pickers, gated push
-    fun tasksScreen_default_light() = runScreen("tasks_default_light", AppThemes.Default, darkTheme = false) {
+                    // registrations, and animation callbacks use this flag
-        TasksShowcase()
+                    // to short-circuit calls that require real Android
-    }
+                    // subsystems (e.g. `FileProvider` paths that aren't
-
+                    // resolvable under Robolectric's test data dir).
-    @Test
+                    CompositionLocalProvider(
-    fun tasksScreen_default_dark() = runScreen("tasks_default_dark", AppThemes.Default, darkTheme = true) {
+                        LocalDataManager provides fixture,
-        TasksShowcase()
+                        LocalInspectionMode provides true,
-    }
+                    ) {
-
+                        Box(Modifier.fillMaxSize()) {
-    @Test
+                            surface.content()
-    fun tasksScreen_ocean_light() = runScreen("tasks_ocean_light", AppThemes.Ocean, darkTheme = false) {
+                        }
-        TasksShowcase()
+                    }
-    }
+                }
-
-    @Test
-    fun tasksScreen_ocean_dark() = runScreen("tasks_ocean_dark", AppThemes.Ocean, darkTheme = true) {
-        TasksShowcase()
-    }
-
-    @Test
-    fun tasksScreen_midnight_light() = runScreen("tasks_midnight_light", AppThemes.Midnight, darkTheme = false) {
-        TasksShowcase()
-    }
-
-    @Test
-    fun tasksScreen_midnight_dark() = runScreen("tasks_midnight_dark", AppThemes.Midnight, darkTheme = true) {
-        TasksShowcase()
-    }
-
-    // ---------- Residences list showcase ----------
-
-    @Test
-    fun residencesScreen_default_light() = runScreen("residences_default_light", AppThemes.Default, darkTheme = false) {
-        ResidencesShowcase()
-    }
-
-    @Test
-    fun residencesScreen_default_dark() = runScreen("residences_default_dark", AppThemes.Default, darkTheme = true) {
-        ResidencesShowcase()
-    }
-
-    @Test
-    fun residencesScreen_ocean_light() = runScreen("residences_ocean_light", AppThemes.Ocean, darkTheme = false) {
-        ResidencesShowcase()
-    }
-
-    @Test
-    fun residencesScreen_ocean_dark() = runScreen("residences_ocean_dark", AppThemes.Ocean, darkTheme = true) {
-        ResidencesShowcase()
-    }
-
-    @Test
-    fun residencesScreen_midnight_light() = runScreen("residences_midnight_light", AppThemes.Midnight, darkTheme = false) {
-        ResidencesShowcase()
-    }
-
-    @Test
-    fun residencesScreen_midnight_dark() = runScreen("residences_midnight_dark", AppThemes.Midnight, darkTheme = true) {
-        ResidencesShowcase()
-    }
-
-    // ---------- Profile/theme-selection / complete-task showcases ----------
-
-    @Test
-    fun profileScreen_default_light() = runScreen("profile_default_light", AppThemes.Default, darkTheme = false) {
-        ProfileShowcase()
-    }
-
-    @Test
-    fun profileScreen_default_dark() = runScreen("profile_default_dark", AppThemes.Default, darkTheme = true) {
-        ProfileShowcase()
-    }
-
-    @Test
-    fun profileScreen_ocean_light() = runScreen("profile_ocean_light", AppThemes.Ocean, darkTheme = false) {
-        ProfileShowcase()
-    }
-
-    @Test
-    fun profileScreen_ocean_dark() = runScreen("profile_ocean_dark", AppThemes.Ocean, darkTheme = true) {
-        ProfileShowcase()
-    }
-
-    @Test
-    fun profileScreen_midnight_light() = runScreen("profile_midnight_light", AppThemes.Midnight, darkTheme = false) {
-        ProfileShowcase()
-    }
-
-    @Test
-    fun profileScreen_midnight_dark() = runScreen("profile_midnight_dark", AppThemes.Midnight, darkTheme = true) {
-        ProfileShowcase()
-    }
-
-    @Test
-    fun themeSelection_default_light() = runScreen("themes_default_light", AppThemes.Default, darkTheme = false) {
-        ThemePaletteShowcase()
-    }
-
-    @Test
-    fun themeSelection_default_dark() = runScreen("themes_default_dark", AppThemes.Default, darkTheme = true) {
-        ThemePaletteShowcase()
-    }
-
-    @Test
-    fun themeSelection_ocean_light() = runScreen("themes_ocean_light", AppThemes.Ocean, darkTheme = false) {
-        ThemePaletteShowcase()
-    }
-
-    @Test
-    fun themeSelection_ocean_dark() = runScreen("themes_ocean_dark", AppThemes.Ocean, darkTheme = true) {
-        ThemePaletteShowcase()
-    }
-
-    @Test
-    fun themeSelection_midnight_light() = runScreen("themes_midnight_light", AppThemes.Midnight, darkTheme = false) {
-        ThemePaletteShowcase()
-    }
-
-    @Test
-    fun themeSelection_midnight_dark() = runScreen("themes_midnight_dark", AppThemes.Midnight, darkTheme = true) {
-        ThemePaletteShowcase()
-    }
-
-    @Test
-    fun completeTask_default_light() = runScreen("complete_task_default_light", AppThemes.Default, darkTheme = false) {
-        CompleteTaskShowcase()
-    }
-
-    @Test
-    fun completeTask_default_dark() = runScreen("complete_task_default_dark", AppThemes.Default, darkTheme = true) {
-        CompleteTaskShowcase()
-    }
-
-    @Test
-    fun completeTask_ocean_light() = runScreen("complete_task_ocean_light", AppThemes.Ocean, darkTheme = false) {
-        CompleteTaskShowcase()
-    }
-
-    @Test
-    fun completeTask_ocean_dark() = runScreen("complete_task_ocean_dark", AppThemes.Ocean, darkTheme = true) {
-        CompleteTaskShowcase()
-    }
-
-    @Test
-    fun completeTask_midnight_light() = runScreen("complete_task_midnight_light", AppThemes.Midnight, darkTheme = false) {
-        CompleteTaskShowcase()
-    }
-
-    @Test
-    fun completeTask_midnight_dark() = runScreen("complete_task_midnight_dark", AppThemes.Midnight, darkTheme = true) {
-        CompleteTaskShowcase()
-    }
-
-    // ---------- Shared runner ----------
-
-    private fun runScreen(
-        name: String,
-        theme: ThemeColors,
-        darkTheme: Boolean,
-        content: @Composable () -> Unit,
-    ) {
-        captureRoboImage(
-            filePath = "build/outputs/roborazzi/$name.png",
-            roborazziOptions = RoborazziOptions(),
-        ) {
-            HoneyDueTheme(darkTheme = darkTheme, themeColors = theme) {
-                content()
             }
         }
+        // Reset after suite so other tests don't inherit state.
+        com.tt.honeyDue.data.DataManager.setSubscription(null)
+    }
+
+    /**
+     * Mirror every StateFlow on `fixture` onto the `DataManager` singleton
+     * so code paths that bypass `LocalDataManager` (screens that call
+     * `DataManager.x` directly, VMs whose default-arg resolves to the
+     * singleton, `SubscriptionHelper` free-tier gate) see the same data.
+     *
+     * Critical: clear the singleton first so the previous variant's
+     * writes don't leak into this variant's `empty` render.
+     */
+    private fun seedSingleton(fixture: IDataManager) {
+        val dm = com.tt.honeyDue.data.DataManager
+        dm.clear()
+        dm.setSubscription(fixture.subscription.value)
+        dm.setCurrentUser(fixture.currentUser.value)
+        fixture.myResidences.value?.let { dm.setMyResidences(it) }
+        dm.setResidences(fixture.residences.value)
+        fixture.totalSummary.value?.let { dm.setTotalSummary(it) }
+        fixture.allTasks.value?.let { dm.setAllTasks(it) }
+        dm.setDocuments(fixture.documents.value)
+        dm.setContractors(fixture.contractors.value)
+        dm.setFeatureBenefits(fixture.featureBenefits.value)
+        dm.setUpgradeTriggers(fixture.upgradeTriggers.value)
+        dm.setTaskCategories(fixture.taskCategories.value)
+        dm.setTaskPriorities(fixture.taskPriorities.value)
+        dm.setTaskFrequencies(fixture.taskFrequencies.value)
+        fixture.contractorsByResidence.value.forEach { (rid, list) ->
+            dm.setContractorsForResidence(rid, list)
+        }
+        fixture.contractorDetail.value.values.forEach { dm.setContractorDetail(it) }
+        fixture.documentDetail.value.values.forEach { dm.setDocumentDetail(it) }
+        fixture.taskCompletions.value.forEach { (taskId, completions) ->
+            dm.setTaskCompletions(taskId, completions)
+        }
+        fixture.tasksByResidence.value.forEach { (rid, cols) ->
+            dm.setTasksForResidence(rid, cols)
+        }
+        fixture.notificationPreferences.value?.let { dm.setNotificationPreferences(it) }
+    }
+
+    companion object {
+        @JvmStatic
+        @ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
+        fun surfaces(): List<Array<Any>> =
+            gallerySurfaces.map { arrayOf<Any>(it) }
     }
 }
 
-// ============ Theme-agnostic showcase composables ============
+/**
-//
+ * One render-variant captured per surface. The `dataManager` factory is
-// Each mirrors the *surface* (not the full data pipeline) of its named
+ * invoked lazily so each capture gets a pristine fixture (avoiding
-// production screen. This keeps Roborazzi tests hermetic — no Ktor
+ * cross-test StateFlow mutation).
-// client, no DataManager, no ViewModel — while still exercising every
+ *
-// colour slot in the MaterialTheme that ships with the app.
+ * @property fileSuffix Appended to the surface name to form the PNG
-
+ *   filename. Includes a leading `_`. Examples: `_empty_light`,
-@Composable
+ *   `_populated_dark`, `_light`, `_dark`.
-private fun LoginShowcase() {
+ */
-    Scaffold { padding ->
+private data class Variant(
-        Column(
+    val fileSuffix: String,
-            modifier = Modifier
+    val darkTheme: Boolean,
-                .fillMaxSize()
+    val dataManager: () -> IDataManager,
-                .padding(padding)
+) {
-                .padding(24.dp),
+    companion object {
-            verticalArrangement = Arrangement.spacedBy(16.dp),
+        /**
-        ) {
+         * DataCarrying surfaces: 4 variants. `empty` captures pass
-            Text(
+         * `seedLookups = false` so form dropdowns render empty in the
-                "honeyDue",
+         * empty-variant PNGs — letting screens that read lookups produce
-                style = MaterialTheme.typography.headlineLarge,
+         * a visible diff against the populated variant.
-                color = MaterialTheme.colorScheme.primary,
+         */
-            )
+        val dataCarrying: List<Variant> = listOf(
-            Text(
+            Variant("_empty_light", darkTheme = false) {
-                "Keep your home running",
+                FixtureDataManager.empty(seedLookups = false)
-                style = MaterialTheme.typography.bodyMedium,
+            },
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            Variant("_empty_dark", darkTheme = true) {
-            )
+                FixtureDataManager.empty(seedLookups = false)
-            OutlinedTextField(value = "testuser", onValueChange = {}, label = { Text("Username") })
+            },
-            OutlinedTextField(value = "•••••••••", onValueChange = {}, label = { Text("Password") })
+            Variant("_populated_light", darkTheme = false) { FixtureDataManager.populated() },
-            Button(onClick = {}, modifier = Modifier.fillMaxSize(1f)) {
+            Variant("_populated_dark", darkTheme = true) { FixtureDataManager.populated() },
-                Text("Sign In")
-            }
-            TextButton(onClick = {}) { Text("Forgot password?") }
-        }
-    }
-}
-
-@Composable
-private fun TasksShowcase() {
-    Scaffold(topBar = {
-        TopAppBar(
-            title = { Text("Tasks") },
-            colors = TopAppBarDefaults.topAppBarColors(
-                containerColor = MaterialTheme.colorScheme.surface,
-            ),
         )
-    }) { padding ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-        ) {
-            listOf("Replace HVAC filter", "Test smoke alarms", "Clean gutters").forEach { title ->
-                Card(
-                    colors = CardDefaults.cardColors(
-                        containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                    ),
-                    shape = RoundedCornerShape(12.dp),
-                ) {
-                    Row(
-                        modifier = Modifier.padding(16.dp),
-                        horizontalArrangement = Arrangement.spacedBy(12.dp),
-                    ) {
-                        Icon(Icons.Filled.Task, null, tint = MaterialTheme.colorScheme.primary)
-                        Text(title, style = MaterialTheme.typography.bodyLarge)
-                    }
-                }
-            }
-            Button(onClick = {}, colors = ButtonDefaults.buttonColors()) {
-                Icon(Icons.Filled.Add, null)
-                Text("New task", modifier = Modifier.padding(start = 8.dp))
-            }
-        }
-    }
-}
 
-@Composable
+        /**
-private fun ResidencesShowcase() {
+         * DataFree surfaces: 2 variants (light/dark only). Lookups are
-    Scaffold(topBar = {
+         * seeded because forms expect them to be present in production
-        TopAppBar(title = { Text("Residences") })
+         * (a user with zero entities still sees the priority picker).
-    }) { padding ->
+         * The populated variant is deliberately omitted — DataFree
-        Column(
+         * surfaces render no entity data, so `populated` would be
-            modifier = Modifier
+         * byte-identical to `empty`.
-                .fillMaxSize()
+         */
-                .padding(padding)
+        val dataFree: List<Variant> = listOf(
-                .padding(16.dp),
+            Variant("_light", darkTheme = false) { FixtureDataManager.empty(seedLookups = true) },
-            verticalArrangement = Arrangement.spacedBy(12.dp),
+            Variant("_dark", darkTheme = true) { FixtureDataManager.empty(seedLookups = true) },
-        ) {
+        )
-            Card(
-                colors = CardDefaults.cardColors(
-                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                ),
-                shape = RoundedCornerShape(12.dp),
-            ) {
-                Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
-                    Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
-                        Icon(Icons.Filled.Home, null, tint = MaterialTheme.colorScheme.primary)
-                        Text("Primary Home", style = MaterialTheme.typography.titleMedium)
-                    }
-                    Text(
-                        "1234 Sunflower Lane",
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                }
-            }
-            OutlinedButton(onClick = {}) { Text("Add residence") }
-        }
-    }
-}
-
-@Composable
-private fun ProfileShowcase() {
-    Scaffold(topBar = { TopAppBar(title = { Text("Profile") }) }) { padding ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-        ) {
-            Text(
-                "testuser",
-                style = MaterialTheme.typography.titleLarge,
-                color = MaterialTheme.colorScheme.onBackground,
-            )
-            Text(
-                "claude@treymail.com",
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-            )
-            listOf("Notifications", "Theme", "Help").forEach { label ->
-                Card(
-                    colors = CardDefaults.cardColors(
-                        containerColor = MaterialTheme.colorScheme.surface,
-                    ),
-                ) {
-                    Text(label, modifier = Modifier.padding(16.dp))
-                }
-            }
-            Button(
-                onClick = {},
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = MaterialTheme.colorScheme.error,
-                ),
-            ) { Text("Log out") }
-        }
-    }
-}
-
-@Composable
-private fun ThemePaletteShowcase() {
-    Scaffold(topBar = { TopAppBar(title = { Text("Theme") }) }) { padding ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(8.dp),
-        ) {
-            listOf(
-                "Primary" to MaterialTheme.colorScheme.primary,
-                "Secondary" to MaterialTheme.colorScheme.secondary,
-                "Tertiary" to MaterialTheme.colorScheme.tertiary,
-                "Surface" to MaterialTheme.colorScheme.surface,
-                "Error" to MaterialTheme.colorScheme.error,
-            ).forEach { (label, color) ->
-                Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
-                    Card(
-                        colors = CardDefaults.cardColors(containerColor = color),
-                        shape = RoundedCornerShape(8.dp),
-                    ) {
-                        Column(Modifier.padding(24.dp)) { Text(" ", color = Color.Transparent) }
-                    }
-                    Text(label, color = MaterialTheme.colorScheme.onBackground)
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun CompleteTaskShowcase() {
-    Scaffold(topBar = { TopAppBar(title = { Text("Complete Task") }) }) { padding ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-        ) {
-            Text("Test smoke alarms", style = MaterialTheme.typography.titleMedium)
-            OutlinedTextField(value = "42.50", onValueChange = {}, label = { Text("Actual cost") })
-            OutlinedTextField(value = "All alarms passed.", onValueChange = {}, label = { Text("Notes") })
-            Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                OutlinedButton(onClick = {}) { Text("Cancel") }
-                Button(onClick = {}) { Text("Mark complete") }
-            }
-        }
     }
 }