fix: stabilize adaptive navigation state

feat: add adaptive authenticated navigation
feat: separate session and credential actions
2026-08-26 15:29:41 +08:00 · 2026-08-26 15:29:41 +08:00 · 2026-08-26 12:57:44 +08:00 · 2026-08-26 12:19:38 +08:00 · 2026-08-26 11:38:32 +08:00 · 2026-08-26 11:38:32 +08:00
192 changed files with 6960 additions and 10226 deletions
@@ -1,133 +0,0 @@
-<p align="center">
-  <img src="android/app/src/main/res/drawable/ic_abox_logo_master.png" width="112" alt="ABox Manager logo">
-</p>
-
-<h1 align="center">ABox Manager</h1>
-
-<p align="center">
-  面向 Android 手机和平板的 ABox 智能家居管理应用
-</p>
-
-## 项目介绍
-
-ABox Manager 使用 ABSDK 连接局域网中的 ABox 网关，为智能插座、温湿度传感器和红外控制器提供统一的设备管理体验。应用同时包含不依赖账号、网络或真实硬件的本地体验模式，可用于浏览界面和验证主要操作流程。
-
-当前正式版本为 **1.0.0**，由 **Flagship** 团队开发。
-
-## 主要功能
-
- ABox 登录、自动登录、加密凭据与会话失效处理；
- 智能插座状态查询、开关控制和命令后状态确认；
- 温度与湿度读取，以及无数据、错误和离线状态展示；
- 预置红外码库下载，以及自定义遥控器按键学习；
- 遥控器布局、按钮、硬件槽位和顺序管理；
- 手动指令与基于时间、温度、湿度和设备状态的自动指令；
- 插座、红外、延迟和系统通知动作；
- 按 profile 隔离并持久化的活动记录；
- 浅色、深色、动态颜色、强调色与界面缩放；
- 英文和简体中文本地化；
- 独立且确定性的本地体验环境。
-
-## 技术栈
-
- Kotlin 2.4
- Jetpack Compose 与 Material
- Navigation Compose
- Hilt
- Coroutines 与 StateFlow
- Room
- DataStore 与 Android Keystore
- WorkManager
- 多模块 Gradle 工程
-
-核心模块：
-
-```text
-domain/                     领域模型、端口和用例
-absdk-bridge/               ABSDK 0630 防腐层
-runtime/simulation/         本地体验模拟运行时
-testing/fakes/              测试专用 Fake
-android/core/               设计系统、偏好、设备目录和会话
-android/feature/infrared/   红外遥控器功能
-android/feature/automation/ 情景、自动化和活动记录
-android/app/                应用组合根、导航和设备界面
-```
-
-完整依赖方向和数据边界见 [架构文档](docs/architecture.md)。
-
-## 开发环境
-
- JDK 17
- Android SDK 37
- Android Studio，或能够运行 Gradle Wrapper 的 Android 开发环境
- Windows、macOS 或 Linux
-
-项目最低支持 Android 8.0（API 26），目标 SDK 为 36。
-
-克隆仓库后，确保 Android SDK 路径已由 Android Studio 写入本机 `local.properties`，然后构建调试 APK：
-
-```powershell
-.\gradlew.bat :android:app:assembleDebug
-```
-
-macOS 或 Linux：
-
-```bash
-./gradlew :android:app:assembleDebug
-```
-
-APK 输出位置：
-
-```text
-android/app/build/outputs/apk/debug/app-debug.apk
-```
-
-连接模拟器或 Android 设备后可以安装：
-
-```bash
-adb install -r android/app/build/outputs/apk/debug/app-debug.apk
-```
-
-## 使用方式
-
-### ABox
-
-设备需要与 ABox 网关处于可用的局域网环境，并使用有效账号登录。ABSDK 通过设备名称匹配网关设备；App 中的设备名称必须与网关实际名称一致。
-
-首次初始化 ABox profile 时，App 会按设备类型补充以下默认记录：
-
- `智能插座`
- `温湿度传感器`
- `红外控制器`
-
-已有同类型设备不会被迁移、重命名或覆盖。
-
-### 本地体验
-
-本地体验无需账号和网络，使用独立模拟数据。它适合浏览产品和验证界面流程，但不能作为真实 ABox、网络或硬件验收结果。
-
-## 文档
-
- [项目概览](docs/project-overview.md)
- [架构说明](docs/architecture.md)
- [ABSDK 0630 已确认事实与边界](docs/protocol/absdk-0630.md)
- [设备数据能力矩阵](docs/testing/device-data-capability-matrix.md)
- [红外硬件验证](docs/testing/infrared-hardware-validation.md)
- [正式版局域网硬件验收](docs/testing/release-lan-hardware-validation.md)
- [完整文档索引](docs/README.md)
-
-## 安全边界
-
-厂商 ABSDK JAR 使用明文 HTTP，并依赖外部局域网环境完成域名到网关的访问。真实 ABox 功能只能在已授权、受控的局域网中使用。
-
-不得在日志、截图、问题报告或测试记录中提交密码、Token、完整网关地址、完整硬件标识、原始红外码值或未脱敏 SDK 响应。
-
-## 贡献流程
-
-`main` 是受保护分支。所有修改必须从最新 `main` 创建专用分支，通过 Pull Request 合并，不得直接在 `main` 上开发或推送。详细规则见 [AGENTS.md](AGENTS.md)。
-
-## 第三方资料
-
-内置的部分红外预置来源于 Flipper-IRDB，并按照 CC0 1.0 提供。来源、转换范围和归属信息见 [Flipper-IRDB attribution](docs/third-party/flipper-irdb.md)。
-
-仓库中的厂商 SDK、接口资料和第三方内容分别受其自身许可或授权条件约束；本仓库当前未声明覆盖整个项目的统一开源许可证。
@@ -133,25 +133,6 @@ class AbsdkBridge internal constructor(
        }
    }

-    override suspend fun commandPower(
-        profileId: ProviderProfileId,
-        deviceName: DeviceName,
-        powerState: SocketPowerState,
-    ): DomainResult<Unit> = serialized {
-        withActiveSession(profileId) {
-            when (val control = call {
-                client.setSocketPower(deviceName.value, powerState.toSdkStatus())
-            }) {
-                is ClientCall.Failed -> DomainResult.Failure(control.error)
-                is ClientCall.Completed -> if (control.response.isSuccess()) {
-                    DomainResult.Success(Unit)
-                } else {
-                    DomainResult.Failure(AbsdkErrorMapper.fromResponse(control.response))
-                }
-            }
-        }
-    }
-
    override suspend fun getReading(
        profileId: ProviderProfileId,
        deviceName: DeviceName,
@@ -20,7 +20,7 @@ android {
        minSdk = 26
        targetSdk = 36
        versionCode = 1
-        versionName = "1.0.0"
+        versionName = "0.1.0"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -67,11 +67,8 @@ dependencies {
    implementation(project(":domain"))
    implementation(project(":android:core:designsystem"))
    implementation(project(":android:core:preferences"))
-    implementation(project(":android:core:devicecatalog"))
    implementation(project(":android:core:session"))
    implementation(project(":android:feature:infrared"))
-    implementation(project(":android:feature:automation"))
-    implementation(libs.androidx.hilt.work)
    implementation(project(":absdk-bridge"))
    implementation(project(":runtime:simulation"))
    debugImplementation(project(":testing:fakes"))
@@ -1,55 +0,0 @@
-package com.flagship.abox.manager.ui.devicecenter
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.flagship.abox.manager.designsystem.ABoxTheme
-import com.flagship.abox.manager.domain.DeviceDescriptor
-import com.flagship.abox.manager.domain.DeviceId
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.ProviderProfileId
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class DeviceCenterScreenTest {
-    @get:Rule
-    val composeRule = createAndroidComposeRule<ComponentActivity>()
-
-    @Test
-    fun configuredDeviceCardRendersWithSaveableGridKey() {
-        val profileId = ProviderProfileId("profile-1")
-        val device = DeviceDescriptor(
-            id = DeviceId("profile-1:socket-1"),
-            profileId = profileId,
-            name = DeviceName("socket-1"),
-            type = DeviceType.SOCKET,
-        )
-        val card = DeviceCardUiModel(
-            key = DeviceCardKey(profileId, device.name),
-            device = device,
-        )
-
-        composeRule.setContent {
-            ABoxTheme {
-                DeviceCenterScreen(
-                    state = DeviceCenterUiState(
-                        profileId = profileId,
-                        cards = listOf(card),
-                        content = DeviceCenterContent.CONTENT,
-                    ),
-                    onFilterChanged = {},
-                    onOpenDevice = {},
-                    onConfigureDevice = { _, _ -> },
-                    onQuickAction = {},
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag("device_card_profile-1:socket-1").assertIsDisplayed()
-    }
-}
@@ -1,24 +1,26 @@
 package com.flagship.abox.manager.ui.preferences

 import androidx.activity.ComponentActivity
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material3.Text
+import androidx.compose.ui.unit.dp
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.test.assertCountEquals
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.assertIsSelected
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.getUnclippedBoundsInRoot
+import androidx.compose.ui.test.assertWidthIsAtLeast
+import androidx.compose.ui.test.assertHeightIsAtLeast
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.onAllNodesWithTag
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.flagship.abox.manager.designsystem.ABoxTheme
 import com.flagship.abox.manager.preferences.DesignRenderer
 import com.flagship.abox.manager.preferences.UiPreferences
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,98 +31,60 @@ class SettingsScreenTest {
    val composeRule = createAndroidComposeRule<ComponentActivity>()

    @Test
-    fun interfaceStyleOpensMenuBeforeChangingRenderer() {
-        val actions = mutableListOf<SettingsUiAction>()
+    fun settingsUsesChineseLabelsSelectedStateAndAccessibleControlBounds() {
        composeRule.setContent {
            ABoxTheme {
                SettingsScreen(
-                    state = SettingsUiState(preferences = UiPreferences(renderer = DesignRenderer.MATERIAL3), loaded = true),
-                    onAction = actions::add,
+                    state = SettingsUiState(
+                        preferences = UiPreferences(renderer = DesignRenderer.MATERIAL3),
+                        loaded = true,
+                    ),
+                    onAction = {},
                )
            }
        }

-        composeRule.onNodeWithTag("settings-style-entry").performClick()
-
-        assertTrue(actions.isEmpty())
-        composeRule.onNodeWithTag("settings-style-menu").assertIsDisplayed()
-        composeRule.onNodeWithText("Miuix").performClick()
-        assertEquals(SettingsUiAction.SetRenderer(DesignRenderer.MIUIX), actions.single())
+        composeRule.onNodeWithText("界面设置").assertIsDisplayed()
+        composeRule.onNodeWithText("渲染器").assertIsDisplayed()
+        composeRule.onNodeWithText("Material 3").assertIsSelected()
+        composeRule.onNodeWithText("跟随系统").assertIsSelected()
+        composeRule.onNodeWithText("动态取色").assertIsDisplayed()
+        composeRule.onNodeWithText("系统辅助功能").assertIsDisplayed()
+        composeRule.onNodeWithTag("settings-dynamic-color")
+            .assertWidthIsAtLeast(48.dp)
+            .assertHeightIsAtLeast(48.dp)
+        composeRule.onNodeWithTag("settings-blur")
+            .assertWidthIsAtLeast(48.dp)
+            .assertHeightIsAtLeast(48.dp)
+        composeRule.onNodeWithTag("settings-haptics")
+            .assertWidthIsAtLeast(48.dp)
+            .assertHeightIsAtLeast(48.dp)
    }

    @Test
-    fun materialThemeShowsEveryMaterialOptionInReferenceOrder() {
-        showTheme(DesignRenderer.MATERIAL3)
-
-        assertVerticalOrder(
-            "settings-material-colors",
-            "settings-theme-mode",
-            "settings-color-style",
-            "settings-color-standard",
-            "settings-interface-scale",
-        )
-        composeRule.onAllNodesWithTag("settings-renderer-selector").assertCountEquals(0)
-        composeRule.onAllNodesWithTag("settings-liquid-glass").assertCountEquals(0)
-    }
-
-    @Test
-    fun miuixThemeShowsEveryMiuixOptionInReferenceOrder() {
-        showTheme(DesignRenderer.MIUIX)
-
-        assertVerticalOrder(
-            "settings-theme-mode",
-            "settings-miuix-accent",
-            "settings-blur",
-            "settings-floating-navigation",
-            "settings-liquid-glass",
-            "settings-interface-scale",
-        )
-        composeRule.onAllNodesWithTag("settings-renderer-selector").assertCountEquals(0)
-        composeRule.onAllNodesWithTag("settings-color-style").assertCountEquals(0)
-        composeRule.onAllNodesWithTag("settings-color-standard").assertCountEquals(0)
-    }
-
-    @Test
-    fun themeDetailRemainsOpenWhenRendererChangesFromHomeMenu() {
+    fun switchingRendererKeepsCurrentlyRenderedTestScreenPresent() {
        var preferences by mutableStateOf(UiPreferences(renderer = DesignRenderer.MATERIAL3))
-        val experienceState = SettingsExperienceState()
        composeRule.setContent {
            ABoxTheme(preferences = preferences) {
-                SettingsExperience(
-                    state = SettingsUiState(preferences = preferences, loaded = true),
-                    experienceState = experienceState,
-                    onAction = { action ->
-                        if (action is SettingsUiAction.SetRenderer) preferences = preferences.copy(renderer = action.value)
-                    },
-                    onExit = {},
-                )
+                Column {
+                    Text("当前测试内容")
+                    SettingsScreen(
+                        state = SettingsUiState(preferences = preferences, loaded = true),
+                        onAction = { action ->
+                            if (action is SettingsUiAction.SetRenderer) {
+                                preferences = preferences.copy(renderer = action.value)
+                            }
+                        },
+                        modifier = Modifier.weight(1f),
+                    )
+                }
            }
        }

-        composeRule.onNodeWithTag("settings-style-entry").performClick()
        composeRule.onNodeWithText("Miuix").performClick()
-        composeRule.onNodeWithTag("settings-theme-entry").performClick()
+        composeRule.waitForIdle()

-        composeRule.onNodeWithTag("settings-theme-detail").assertIsDisplayed()
-        composeRule.onNodeWithTag("settings-miuix-accent").assertIsDisplayed()
-    }
-
-    private fun showTheme(renderer: DesignRenderer) {
-        composeRule.setContent {
-            val experienceState = remember { SettingsExperienceState("THEME") }
-            ABoxTheme {
-                SettingsExperience(
-                    state = SettingsUiState(preferences = UiPreferences(renderer = renderer), loaded = true),
-                    experienceState = experienceState,
-                    onAction = {},
-                    onExit = {},
-                )
-            }
-        }
-    }
-
-    private fun assertVerticalOrder(vararg tags: String) {
-        val tops = tags.map { tag -> composeRule.onNodeWithTag(tag).getUnclippedBoundsInRoot().top }
-        assertTrue("Expected controls in reference-image order: ${tags.toList()}", tops.zipWithNext().all { it.first < it.second })
+        composeRule.onNodeWithText("当前测试内容").assertIsDisplayed()
+        composeRule.onNodeWithText("Miuix").assertIsSelected()
    }
 }
@@ -1,40 +0,0 @@
-package com.flagship.abox.manager.ui.scene
-
-import androidx.activity.ComponentActivity
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.FilterChip
-import androidx.compose.material3.Text
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.test.getUnclippedBoundsInRoot
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.unit.dp
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.flagship.abox.manager.designsystem.ABoxTheme
-import org.junit.Assert.assertTrue
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class SceneChoiceFlowTest {
-    @get:Rule
-    val composeRule = createAndroidComposeRule<ComponentActivity>()
-
-    @Test
-    fun choicesWrapOntoAnotherLineAtNarrowEnglishWidth() {
-        composeRule.setContent {
-            ABoxTheme {
-                SceneChoiceFlow(modifier = Modifier.width(240.dp)) {
-                    listOf("Socket", "Remote", "Delay", "Notify").forEach { label ->
-                        FilterChip(selected = false, onClick = {}, label = { Text(label) })
-                    }
-                }
-            }
-        }
-
-        val firstTop = composeRule.onNodeWithText("Socket").getUnclippedBoundsInRoot().top
-        val lastTop = composeRule.onNodeWithText("Notify").getUnclippedBoundsInRoot().top
-        assertTrue("The final choice should wrap below the first row", lastTop > firstTop)
-    }
-}
@@ -1,73 +0,0 @@
-package com.flagship.abox.manager.ui.shell
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.flagship.abox.manager.designsystem.ABoxTheme
-import org.junit.Assert.assertEquals
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class AccountProviderDialogTest {
-    @get:Rule
-    val composeRule = createAndroidComposeRule<ComponentActivity>()
-
-    @Test
-    fun dialogExposesAccountActionsAndClose() {
-        var closed = 0
-        composeRule.setContent {
-            ABoxTheme {
-                AccountProviderDialog(
-                    userName = "user",
-                    providerName = "ABox",
-                    onDismissRequest = { closed++ },
-                    onOpenSettings = {},
-                    onSwitchProvider = {},
-                    onEndSession = {},
-                    onForgetCredentials = {},
-                )
-            }
-        }
-
-        composeRule.onNodeWithText("账户与提供方").assertIsDisplayed()
-        composeRule.onNodeWithTag("account_dialog_close").performClick()
-
-        assertEquals(1, closed)
-    }
-
-    @Test
-    fun destructiveActionsRequireSeparateConfirmation() {
-        var ended = 0
-        var forgotten = 0
-        composeRule.setContent {
-            ABoxTheme {
-                AccountProviderDialog(
-                    userName = "user",
-                    providerName = "ABox",
-                    onDismissRequest = {},
-                    onOpenSettings = {},
-                    onSwitchProvider = {},
-                    onEndSession = { ended++ },
-                    onForgetCredentials = { forgotten++ },
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag("account_dialog_end_session").performClick()
-        composeRule.onNodeWithText("退出当前会话").assertIsDisplayed()
-        composeRule.onNodeWithTag("account_dialog_confirm").performClick()
-        assertEquals(1, ended)
-        assertEquals(0, forgotten)
-
-        composeRule.onNodeWithTag("account_dialog_forget_credentials").performClick()
-        composeRule.onNodeWithText("清除保存的凭据").assertIsDisplayed()
-        composeRule.onNodeWithTag("account_dialog_confirm").performClick()
-        assertEquals(1, forgotten)
-    }
-}
@@ -1,41 +0,0 @@
-package com.flagship.abox.manager.ui.socket
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.flagship.abox.manager.designsystem.ABoxTheme
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.SocketPowerState
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class SocketDetailScreenTest {
-    @get:Rule
-    val composeRule = createAndroidComposeRule<ComponentActivity>()
-
-    @Test
-    fun awaitingConfirmationShowsMainControlAndWarning() {
-        composeRule.setContent {
-            ABoxTheme {
-                SocketScreen(
-                    state = SocketUiState(
-                        profileId = ProviderProfileId("p1"),
-                        deviceName = DeviceName("socket-1"),
-                        powerState = SocketPowerState.ON,
-                        operation = SocketOperationState.AwaitingConfirmation(SocketPowerState.OFF),
-                    ),
-                    onEvent = {},
-                    onBackClick = {},
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag("socket_power_dial").assertIsDisplayed()
-        composeRule.onNodeWithTag("socket_awaiting_confirmation").assertIsDisplayed()
-    }
-}
@@ -1,43 +0,0 @@
-package com.flagship.abox.manager.ui.temperaturehumidity
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.assertCountEquals
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onAllNodesWithTag
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.flagship.abox.manager.designsystem.ABoxTheme
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.ProviderProfileId
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class TemperatureHumidityDetailScreenTest {
-    @get:Rule
-    val composeRule = createAndroidComposeRule<ComponentActivity>()
-
-    @Test
-    fun partialReadingRendersOnlyAvailableMetric() {
-        composeRule.setContent {
-            ABoxTheme {
-                TemperatureHumidityScreen(
-                    state = TemperatureHumidityUiState(
-                        profileId = ProviderProfileId("p1"),
-                        deviceName = DeviceName("sensor-1"),
-                        temperature = "24.2",
-                        humidity = null,
-                    ),
-                    onEvent = {},
-                    onBackClick = {},
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag("sensor_metric_temperature").assertIsDisplayed()
-        composeRule.onAllNodesWithTag("sensor_metric_humidity").assertCountEquals(0)
-        composeRule.onNodeWithTag("sensor_monitoring_notice").assertIsDisplayed()
-    }
-}
@@ -0,0 +1,22 @@
+package com.flagship.abox.manager.di
+
+import com.flagship.abox.manager.domain.DeviceCatalog
+import com.flagship.abox.manager.testing.fakes.FakeDeviceCatalog
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object FoundationModule {
+    // TEMPORARY boundary: ABSDK has no device catalog, and the provider-scoped production
+    // ABox catalog is owned by the device-catalog module. Until that exists, debug builds
+    // keep the fake ABox catalog here. Do NOT route ABox catalog requests to
+    // SimulationDeviceCatalog; release builds must not request a DeviceCatalog binding
+    // until a real release consumer appears.
+    @Provides
+    @Singleton
+    fun provideDeviceCatalog(): DeviceCatalog = FakeDeviceCatalog()
+}
@@ -1,27 +1,12 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <application
        android:name=".ABoxManagerApplication"
-        android:enableOnBackInvokedCallback="false"
        android:allowBackup="false"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
        android:label="@string/app_name"
        android:supportsRtl="true"
        android:usesCleartextTraffic="true"
        android:theme="@style/Theme.ABoxManager">
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
-        </provider>
        <activity
            android:name=".MainActivity"
            android:exported="true">
@@ -1,22 +1,7 @@
 package com.flagship.abox.manager

 import android.app.Application
-import androidx.hilt.work.HiltWorkerFactory
-import androidx.work.Configuration
-import com.flagship.abox.manager.automation.runtime.AutomationBootstrapper
 import dagger.hilt.android.HiltAndroidApp
-import javax.inject.Inject

@HiltAndroidApp
-class ABoxManagerApplication : Application(), Configuration.Provider {
-    @Inject lateinit var workerFactory: HiltWorkerFactory
-    @Inject lateinit var automationBootstrapper: AutomationBootstrapper
-
-    override fun getWorkManagerConfiguration(): Configuration =
-        Configuration.Builder().setWorkerFactory(workerFactory).build()
-
-    override fun onCreate() {
-        super.onCreate()
-        automationBootstrapper.start()
-    }
-}
+class ABoxManagerApplication : Application()
@@ -1,38 +1,19 @@
 package com.flagship.abox.manager

-import android.Manifest
-import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.core.content.ContextCompat
 import com.flagship.abox.manager.ui.ABoxManagerApp
 import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
-    private val notificationPermissionLauncher =
-        registerForActivityResult(ActivityResultContracts.RequestPermission()) {}
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        enableEdgeToEdge()
        setContent {
            ABoxManagerApp()
        }
-        requestNotificationPermissionIfNeeded()
-    }
-
-    private fun requestNotificationPermissionIfNeeded() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
-            ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
-        ) {
-            return
-        }
-
-        notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
    }
 }
@@ -2,16 +2,12 @@ package com.flagship.abox.manager.di

 import com.flagship.abox.manager.absdk.bridge.AbsdkBridge
 import com.flagship.abox.manager.domain.InfraredGateway
-import com.flagship.abox.manager.domain.DeviceCatalog
 import com.flagship.abox.manager.domain.ProviderProfileStore
 import com.flagship.abox.manager.domain.SocketGateway
 import com.flagship.abox.manager.domain.TemperatureHumidityGateway
 import com.flagship.abox.manager.simulation.SimulationInfraredGateway
 import com.flagship.abox.manager.simulation.SimulationSocketGateway
 import com.flagship.abox.manager.simulation.SimulationTemperatureHumidityGateway
-import com.flagship.abox.manager.simulation.SimulationDeviceCatalog
-import com.flagship.abox.manager.devicecatalog.RoutingDeviceCatalog
-import com.flagship.abox.manager.devicecatalog.data.RoomConfiguredDeviceRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -26,18 +22,6 @@ import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
 object DeviceGatewayModule {
-    @Provides
-    @Singleton
-    fun provideSimulationDeviceCatalog(): SimulationDeviceCatalog = SimulationDeviceCatalog()
-
-    @Provides
-    @Singleton
-    fun provideDeviceCatalog(
-        profileStore: ProviderProfileStore,
-        configured: RoomConfiguredDeviceRepository,
-        simulation: SimulationDeviceCatalog,
-    ): DeviceCatalog = RoutingDeviceCatalog(profileStore, configured, simulation)
-
    @Provides
    @Singleton
    fun provideSimulationSocketGateway(): SimulationSocketGateway = SimulationSocketGateway()
@@ -62,15 +62,6 @@ internal class RoutingSocketGateway(
        is DomainResult.Success -> delegate(provider.value).getStatus(profileId, deviceName)
    }

-    override suspend fun commandPower(
-        profileId: ProviderProfileId,
-        deviceName: DeviceName,
-        powerState: SocketPowerState,
-    ): DomainResult<Unit> = when (val provider = resolver.resolve(profileId)) {
-        is DomainResult.Failure -> provider
-        is DomainResult.Success -> delegate(provider.value).commandPower(profileId, deviceName, powerState)
-    }
-
    override suspend fun setPower(
        profileId: ProviderProfileId,
        deviceName: DeviceName,
@@ -1,14 +1,12 @@
 package com.flagship.abox.manager.di

 import com.flagship.abox.manager.domain.DefaultSceneExecutor
+import com.flagship.abox.manager.domain.InMemorySceneRepository
 import com.flagship.abox.manager.domain.InfraredGateway
 import com.flagship.abox.manager.domain.SceneExecutor
 import com.flagship.abox.manager.domain.SceneRepository
-import com.flagship.abox.manager.domain.NotificationGateway
 import com.flagship.abox.manager.domain.SocketGateway
 import com.flagship.abox.manager.domain.infrared.SendVirtualRemoteAction
-import com.flagship.abox.manager.domain.ActivityEventWriter
-import com.flagship.abox.manager.ui.scene.RecordingSceneExecutor
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -21,21 +19,19 @@ import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
 object SceneIntegrationModule {
+    @Provides
+    @Singleton
+    fun provideSceneRepository(): SceneRepository = InMemorySceneRepository()
+
    @Provides
    @Singleton
    fun provideSceneExecutor(
        socketGateway: SocketGateway,
        infraredGateway: InfraredGateway,
        sendVirtualRemoteAction: SendVirtualRemoteAction,
-        notificationGateway: NotificationGateway,
-        activityWriter: ActivityEventWriter,
-    ): SceneExecutor = RecordingSceneExecutor(
-        delegate = DefaultSceneExecutor(
-            socketGateway = socketGateway,
-            infraredGateway = infraredGateway,
-            sendVirtualRemoteAction = sendVirtualRemoteAction,
-            notificationGateway = notificationGateway,
-        ),
-        writer = activityWriter,
+    ): SceneExecutor = DefaultSceneExecutor(
+        socketGateway = socketGateway,
+        infraredGateway = infraredGateway,
+        sendVirtualRemoteAction = sendVirtualRemoteAction,
    )
 }
@@ -5,12 +5,12 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.material3.ExperimentalMaterial3Api
 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
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -19,22 +19,17 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flagship.abox.manager.designsystem.ABoxLoadingIndicator
 import com.flagship.abox.manager.designsystem.ABoxSurface
 import com.flagship.abox.manager.designsystem.ABoxTheme
-import com.flagship.abox.manager.designsystem.ABoxBackLayer
 import com.flagship.abox.manager.domain.ProviderProfile
 import com.flagship.abox.manager.domain.Username
 import com.flagship.abox.manager.ui.login.LoginRoute
 import com.flagship.abox.manager.ui.login.LoginViewModel
 import com.flagship.abox.manager.ui.navigation.AuthenticatedNavigation
-import com.flagship.abox.manager.ui.about.AboutScreen
-import com.flagship.abox.manager.ui.preferences.SettingsRoute
-import com.flagship.abox.manager.ui.preferences.SettingsExperienceState
 import com.flagship.abox.manager.ui.preferences.SettingsViewModel
 import com.flagship.abox.manager.ui.provider.ProviderSelectionRoute
 import com.flagship.abox.manager.ui.session.AppSessionUiState
 import com.flagship.abox.manager.ui.session.AppSessionViewModel
 import com.flagship.abox.manager.ui.session.SessionActionsViewModel
-import com.flagship.abox.manager.ui.shell.AccountProviderDialog
-import com.flagship.abox.manager.ui.session.SessionUiAction
+import com.flagship.abox.manager.ui.shell.AccountProviderBottomSheet

@Composable
 fun ABoxManagerApp(
@@ -48,12 +43,6 @@ fun ABoxManagerApp(
    val settingsState = settingsViewModel.uiState.collectAsStateWithLifecycle().value
    val actionError = actionState.errorMessage?.asString()
    val screenKey = sessionState.screenKey()
-    var showAccountDialog by rememberSaveable(screenKey) { mutableStateOf(false) }
-    var showSettings by rememberSaveable(screenKey) { mutableStateOf(false) }
-    var showAbout by rememberSaveable(screenKey) { mutableStateOf(false) }
-    val settingsExperienceState = rememberSaveable(screenKey, saver = SettingsExperienceState.Saver) {
-        SettingsExperienceState()
-    }

    LaunchedEffect(screenKey) {
        sessionActionsViewModel.dismissError()
@@ -85,87 +74,42 @@ fun ABoxManagerApp(
                is AppSessionUiState.Authenticated -> AuthenticatedNavHost(
                    username = state.username,
                    profile = state.profile,
+                    actionInProgress = actionState.inProgress,
+                    errorMessage = actionError,
                    onLogout = sessionActionsViewModel::logout,
-                    onSessionAction = sessionActionsViewModel::dispatch,
-                    showAccountDialog = showAccountDialog,
-                    showSettings = showSettings,
-                    showAbout = showAbout,
-                    settingsExperienceState = settingsExperienceState,
-                    onShowAccountDialogChange = { showAccountDialog = it },
-                    onShowSettingsChange = { showSettings = it },
-                    onShowAboutChange = { showAbout = it },
                )
            }
        }
    }
 }

+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 private fun AuthenticatedNavHost(
    username: Username,
    profile: ProviderProfile,
+    actionInProgress: Boolean,
+    errorMessage: String?,
    onLogout: () -> Unit,
-    onSessionAction: (SessionUiAction) -> Unit,
-    showAccountDialog: Boolean,
-    showSettings: Boolean,
-    showAbout: Boolean,
-    settingsExperienceState: SettingsExperienceState,
-    onShowAccountDialogChange: (Boolean) -> Unit,
-    onShowSettingsChange: (Boolean) -> Unit,
-    onShowAboutChange: (Boolean) -> Unit,
 ) {
-    Box(Modifier.fillMaxSize()) {
-        AuthenticatedNavigation(
-            username = username,
-            profile = profile,
-            onLogout = onLogout,
-            onProviderClick = { onShowAccountDialogChange(true) },
-            onAvatarClick = { onShowAccountDialogChange(true) },
-        )
-        if (showSettings) {
-            ABoxBackLayer(
-                onBack = { onShowSettingsChange(false) },
-                enabled = settingsExperienceState.isHome,
-            ) {
-                SettingsRoute(
-                    experienceState = settingsExperienceState,
-                    onExit = { onShowSettingsChange(false) },
-                )
-            }
-        }
-        if (showAbout) {
-            ABoxBackLayer(onBack = { onShowAboutChange(false) }) {
-                AboutScreen(onBack = { onShowAboutChange(false) })
-            }
-        }
-    }
+    var showAccountSheet by remember { mutableStateOf(false) }

-    if (showAccountDialog) {
-        AccountProviderDialog(
+    AuthenticatedNavigation(
+        username = username,
+        profile = profile,
+        onLogout = onLogout,
+        onProviderClick = { showAccountSheet = true },
+        onAvatarClick = { showAccountSheet = true },
+    )
+
+    if (showAccountSheet) {
+        AccountProviderBottomSheet(
            userName = username.value,
            providerName = profile.displayName,
-            onDismissRequest = { onShowAccountDialogChange(false) },
-            onOpenSettings = {
-                onShowAccountDialogChange(false)
-                settingsExperienceState.showTheme(returnToHome = false)
-                onShowSettingsChange(true)
-            },
-            onOpenAbout = {
-                onShowAccountDialogChange(false)
-                onShowAboutChange(true)
-            },
-            onSwitchProvider = {
-                onShowAccountDialogChange(false)
-                onSessionAction(SessionUiAction.SwitchProvider)
-            },
-            onEndSession = {
-                onShowAccountDialogChange(false)
-                onSessionAction(SessionUiAction.EndSession)
-            },
-            onForgetCredentials = {
-                onShowAccountDialogChange(false)
-                onSessionAction(SessionUiAction.ForgetSavedCredentials)
-            },
+            onDismissRequest = { showAccountSheet = false },
+            onLogout = onLogout,
+            actionInProgress = actionInProgress,
+            errorMessage = errorMessage,
        )
    }
 }
@@ -1,221 +0,0 @@
-package com.flagship.abox.manager.ui.about
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Language
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import com.flagship.abox.manager.R
-import com.flagship.abox.manager.designsystem.ABoxIconButton
-import com.flagship.abox.manager.designsystem.icon.ABoxIconKey
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AboutScreen(
-    onBack: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    val context = LocalContext.current
-    val packageInfo = remember(context.packageName) {
-        runCatching {
-            context.packageManager.getPackageInfo(context.packageName, 0)
-        }.getOrNull()
-    }
-    val versionName = packageInfo?.versionName ?: stringResource(R.string.about_unknown)
-    val versionCode = packageInfo?.let {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) it.longVersionCode else {
-            @Suppress("DEPRECATION")
-            it.versionCode.toLong()
-        }
-    }
-
-    Scaffold(
-        modifier = modifier.fillMaxSize(),
-        topBar = {
-            TopAppBar(
-                title = { Text(stringResource(R.string.about_title)) },
-                navigationIcon = {
-                    ABoxIconButton(
-                        key = ABoxIconKey.BACK,
-                        contentDescription = stringResource(R.string.action_back),
-                        onClick = onBack,
-                    )
-                },
-            )
-        },
-    ) { padding ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .verticalScroll(rememberScrollState())
-                .padding(horizontal = 20.dp, vertical = 24.dp),
-            verticalArrangement = Arrangement.spacedBy(24.dp),
-        ) {
-            Column(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(10.dp),
-            ) {
-                Image(
-                    painter = painterResource(R.drawable.ic_abox_logo_master),
-                    contentDescription = stringResource(R.string.app_name),
-                    modifier = Modifier
-                        .size(88.dp)
-                        .clip(RoundedCornerShape(16.dp)),
-                )
-                Text(
-                    stringResource(R.string.app_name),
-                    style = MaterialTheme.typography.headlineMedium,
-                    fontWeight = FontWeight.Bold,
-                )
-                Text(
-                    stringResource(R.string.about_tagline),
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-            }
-
-            AboutSection(stringResource(R.string.about_app_info)) {
-                AboutValueRow(stringResource(R.string.about_version), "$versionName (${versionCode ?: stringResource(R.string.about_unknown)})")
-                AboutValueRow(stringResource(R.string.about_package), context.packageName)
-                AboutValueRow(stringResource(R.string.about_platform), stringResource(R.string.about_platform_value))
-            }
-
-            AboutSection(stringResource(R.string.about_product)) {
-                Text(
-                    stringResource(R.string.about_product_desc),
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-            }
-
-            AboutSection(stringResource(R.string.about_team)) {
-                TeamMember("KremeCN", stringResource(R.string.about_role_foundation), "https://github.com/KremeCN", "https://kimico.de/")
-                TeamMember("alZerNest", stringResource(R.string.about_role_devices), "https://github.com/alZerNest")
-                TeamMember("Aurum", stringResource(R.string.about_role_environment))
-                TeamMember("Moler", stringResource(R.string.about_role_infrared), "https://github.com/mxhsnd", "https://emoler.net/")
-                TeamMember("tzh", stringResource(R.string.about_role_scenes))
-            }
-
-            Text(
-                stringResource(R.string.about_copyright),
-                modifier = Modifier.fillMaxWidth(),
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-            )
-            Spacer(Modifier.height(12.dp))
-        }
-    }
-}
-
-@Composable
-private fun AboutSection(
-    title: String,
-    content: @Composable () -> Unit,
-) {
-    Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
-        Text(title, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-        Card(
-            modifier = Modifier.fillMaxWidth(),
-            shape = RoundedCornerShape(8.dp),
-            colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
-        ) {
-            Column(
-                modifier = Modifier.fillMaxWidth().padding(16.dp),
-                verticalArrangement = Arrangement.spacedBy(14.dp),
-            ) {
-                content()
-            }
-        }
-    }
-}
-
-@Composable
-private fun AboutValueRow(label: String, value: String) {
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Text(label, color = MaterialTheme.colorScheme.onSurfaceVariant)
-        Text(value, fontWeight = FontWeight.Medium, modifier = Modifier.padding(start = 16.dp))
-    }
-}
-
-@Composable
-private fun TeamMember(
-    name: String,
-    role: String,
-    githubUrl: String? = null,
-    personalUrl: String? = null,
-) {
-    val uriHandler = LocalUriHandler.current
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Text(name, fontWeight = FontWeight.SemiBold)
-            if (githubUrl != null) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_github),
-                    contentDescription = stringResource(R.string.about_link_github),
-                    modifier = Modifier
-                        .padding(start = 6.dp)
-                        .size(18.dp)
-                        .clickable { uriHandler.openUri(githubUrl) },
-                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-            }
-            if (personalUrl != null) {
-                Icon(
-                    imageVector = Icons.Outlined.Language,
-                    contentDescription = stringResource(R.string.about_link_personal),
-                    modifier = Modifier
-                        .padding(start = 6.dp)
-                        .size(18.dp)
-                        .clickable { uriHandler.openUri(personalUrl) },
-                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-            }
-        }
-        Text(
-            role,
-            modifier = Modifier.padding(start = 16.dp),
-            style = MaterialTheme.typography.bodySmall,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-    }
-}
@@ -1,122 +0,0 @@
-package com.flagship.abox.manager.ui.defaults
-
-import android.content.Context
-import com.flagship.abox.manager.devicecatalog.data.ConfiguredDeviceRepository
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.ProviderProfileStore
-import com.flagship.abox.manager.domain.ProviderType
-import com.flagship.abox.manager.domain.infrared.InfraredKeyStatus
-import com.flagship.abox.manager.domain.infrared.PanelLayoutStyle
-import com.flagship.abox.manager.domain.infrared.PresetCodeLibrary
-import com.flagship.abox.manager.domain.infrared.RemoteDeviceType
-import com.flagship.abox.manager.domain.infrared.RemoteKeyBinding
-import com.flagship.abox.manager.domain.infrared.TransmissionMode
-import com.flagship.abox.manager.domain.infrared.VirtualRemote
-import com.flagship.abox.manager.domain.infrared.VirtualRemoteId
-import com.flagship.abox.manager.domain.infrared.VirtualRemoteRepository
-import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-import javax.inject.Singleton
-import kotlinx.coroutines.flow.first
-
-@Singleton
-class ABoxDefaultContentInitializer @Inject constructor(
-    @ApplicationContext context: Context,
-    private val profileStore: ProviderProfileStore,
-    private val deviceRepository: ConfiguredDeviceRepository,
-    private val remoteRepository: VirtualRemoteRepository,
-) {
-    private val preferences = context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
-
-    suspend fun initialize(profileId: ProviderProfileId) {
-        val profile = profileStore.activeProfile()
-        if (profile?.id != profileId || profile.type != ProviderType.ABOX) return
-
-        val marker = "$MARKER_PREFIX${profileId.value}"
-        if (preferences.getInt(marker, 0) >= CONTENT_VERSION) return
-
-        if (!ensureDevices(profileId)) return
-        if (!ensureCustomRemotes(profileId)) return
-        preferences.edit().putInt(marker, CONTENT_VERSION).apply()
-    }
-
-    private suspend fun ensureDevices(profileId: ProviderProfileId): Boolean {
-        val existing = when (val result = deviceRepository.observe(profileId).first()) {
-            is DomainResult.Success -> result.value
-            is DomainResult.Failure -> return false
-        }
-        val defaults = listOf(
-            DeviceName("智能插座") to DeviceType.SOCKET,
-            DeviceName("温湿度传感器") to DeviceType.TEMPERATURE_HUMIDITY,
-            DeviceName("红外控制器") to DeviceType.INFRARED,
-        )
-        for ((name, type) in defaults) {
-            if (existing.any { it.type == type }) continue
-            if (deviceRepository.add(profileId, name, type) is DomainResult.Failure) return false
-        }
-        return true
-    }
-
-    private suspend fun ensureCustomRemotes(profileId: ProviderProfileId): Boolean {
-        val deviceName = DeviceName("红外控制器")
-        val existing = when (val result = remoteRepository.observeRemotes(profileId, deviceName).first()) {
-            is DomainResult.Success -> result.value
-            is DomainResult.Failure -> return false
-        }
-        val now = System.currentTimeMillis()
-        val remotes = listOf(
-            customRemote(profileId, deviceName, "custom-tv", "自定义电视遥控器", PanelLayoutStyle.TV_NAV, now),
-            customRemote(profileId, deviceName, "custom-panel", "自定义面板遥控器", PanelLayoutStyle.GRID, now + 1),
-        )
-        for (remote in remotes) {
-            if (existing.any { it.id == remote.id }) continue
-            val templates = PresetCodeLibrary.getTemplatesForType(
-                type = RemoteDeviceType.CUSTOM,
-                layoutStyle = remote.layoutStyle,
-            )
-            val bindings = templates.mapIndexed { index, template ->
-                RemoteKeyBinding(
-                    id = "${remote.id.value}:${index + 1}",
-                    remoteId = remote.id,
-                    profileId = profileId,
-                    hardwareDeviceName = deviceName,
-                    buttonId = template.buttonId,
-                    displayName = template.displayName,
-                    assignedSlot = null,
-                    rawHexCode = null,
-                    status = InfraredKeyStatus.UNLEARNED,
-                )
-            }
-            if (remoteRepository.createRemote(remote, bindings) is DomainResult.Failure) return false
-        }
-        return true
-    }
-
-    private fun customRemote(
-        profileId: ProviderProfileId,
-        deviceName: DeviceName,
-        idSuffix: String,
-        displayName: String,
-        layout: PanelLayoutStyle,
-        createdAt: Long,
-    ) = VirtualRemote(
-        id = VirtualRemoteId("${profileId.value}:default:$idSuffix"),
-        profileId = profileId,
-        deviceName = deviceName,
-        displayName = displayName,
-        type = RemoteDeviceType.CUSTOM,
-        layoutStyle = layout,
-        transmissionMode = TransmissionMode.STATIC_SLOTS,
-        createdAtEpochMillis = createdAt,
-        updatedAtEpochMillis = createdAt,
-    )
-
-    private companion object {
-        const val PREFERENCES_NAME = "abox_default_content"
-        const val MARKER_PREFIX = "content_version_"
-        const val CONTENT_VERSION = 1
-    }
-}
@@ -1,55 +0,0 @@
-package com.flagship.abox.manager.ui.devicecenter
-
-import com.flagship.abox.manager.domain.DeviceDescriptor
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.SocketPowerState
-import com.flagship.abox.manager.domain.infrared.SlotQuotaSummary
-
-data class DeviceCardKey(val profileId: ProviderProfileId, val deviceName: DeviceName)
-
-fun DeviceCardKey.saveableKey(): String = "${profileId.value}\u0000${deviceName.value}"
-
-enum class DeviceCategoryFilter { ALL, SOCKET, SENSOR, INFRARED }
-data class DeviceCardUiModel(
-    val key: DeviceCardKey,
-    val device: DeviceDescriptor,
-    val displayName: String = device.name.value,
-    val typeLabel: String = when (device.type) {
-        DeviceType.SOCKET -> "插座"
-        DeviceType.TEMPERATURE_HUMIDITY -> "温湿度"
-        DeviceType.INFRARED -> "红外控制器"
-    },
-    val detail: DeviceCardDetail = DeviceCardDetail.Loading,
-)
-
-sealed interface DeviceCardDetail {
-    data object Loading : DeviceCardDetail
-    data class Socket(
-        val powerState: SocketPowerState,
-        val operating: Boolean = false,
-        val pendingTarget: SocketPowerState? = null,
-        val lastConfirmedAtMillis: Long? = null,
-    ) : DeviceCardDetail
-    data class Sensor(
-        val temperature: String?,
-        val humidity: String?,
-        val refreshing: Boolean = false,
-        val lastUpdatedAtMillis: Long? = null,
-    ) : DeviceCardDetail
-    data class Infrared(
-        val remoteNames: List<String>,
-        val quota: SlotQuotaSummary,
-    ) : DeviceCardDetail
-    data object Offline : DeviceCardDetail
-    data object Unavailable : DeviceCardDetail
-}
-enum class DeviceCenterContent { LOADING, CONTENT, EMPTY, ERROR }
-data class DeviceCenterUiState(
-    val profileId: ProviderProfileId? = null,
-    val filter: DeviceCategoryFilter = DeviceCategoryFilter.ALL,
-    val cards: List<DeviceCardUiModel> = emptyList(),
-    val selectedCard: DeviceCardKey? = null,
-    val content: DeviceCenterContent = DeviceCenterContent.LOADING,
-)
@@ -1,31 +0,0 @@
-package com.flagship.abox.manager.ui.devicecenter
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.ProviderProfileId
-
-@Composable
-fun DeviceCenterRoute(
-    profileId: ProviderProfileId,
-    onOpenDevice: (String, DeviceType) -> Unit,
-    modifier: Modifier = Modifier,
-    viewModel: DeviceCenterViewModel = hiltViewModel(),
-) {
-    val state = viewModel.uiState.collectAsStateWithLifecycle().value
-    LaunchedEffect(profileId) { viewModel.initialize(profileId) }
-    DeviceCenterScreen(
-        state = state,
-        onFilterChanged = viewModel::setFilter,
-        onOpenDevice = { card -> onOpenDevice(card.device.name.value, card.device.type) },
-        onConfigureDevice = viewModel::addConfiguredDevice,
-        onQuickAction = { card ->
-            if (card.device.type == DeviceType.SOCKET) viewModel.toggleSocket(card)
-            else viewModel.refreshDevice(card)
-        },
-        modifier = modifier,
-    )
-}
@@ -1,350 +0,0 @@
-package com.flagship.abox.manager.ui.devicecenter
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.border
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Button
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.flagship.abox.manager.R
-import com.flagship.abox.manager.designsystem.ABoxCard
-import com.flagship.abox.manager.designsystem.ABoxEmptyState
-import com.flagship.abox.manager.designsystem.ABoxFilterChip
-import com.flagship.abox.manager.designsystem.icon.ABoxIcon
-import com.flagship.abox.manager.designsystem.icon.ABoxIconKey
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.SocketPowerState
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-
-@Composable
-fun DeviceCenterScreen(
-    state: DeviceCenterUiState,
-    onFilterChanged: (DeviceCategoryFilter) -> Unit,
-    onOpenDevice: (DeviceCardUiModel) -> Unit,
-    onConfigureDevice: (String, DeviceType) -> Unit,
-    onQuickAction: (DeviceCardUiModel) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    var showConfiguration by remember { mutableStateOf(false) }
-    Column(
-        modifier = modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 12.dp),
-        verticalArrangement = Arrangement.spacedBy(12.dp),
-    ) {
-        Column(modifier = Modifier.padding(horizontal = 2.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) {
-            Text(stringResource(R.string.device_center_heading), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-            Text(stringResource(R.string.device_center_description), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-        }
-        when (state.content) {
-            DeviceCenterContent.LOADING -> Text(stringResource(R.string.device_center_loading), modifier = Modifier.testTag("device_center_loading"))
-            DeviceCenterContent.EMPTY -> ABoxEmptyState(
-                title = stringResource(R.string.device_center_empty_title),
-                description = stringResource(R.string.device_center_empty_description),
-                modifier = Modifier.testTag("device_center_empty"),
-                action = {
-                    Button(onClick = { showConfiguration = true }) { Text(stringResource(R.string.device_center_configure)) }
-                },
-            )
-            DeviceCenterContent.ERROR -> Text(stringResource(R.string.device_center_error), modifier = Modifier.testTag("device_center_error"))
-            DeviceCenterContent.CONTENT -> LazyVerticalGrid(
-                columns = GridCells.Adaptive(minSize = 220.dp),
-                contentPadding = PaddingValues(bottom = 24.dp),
-                horizontalArrangement = Arrangement.spacedBy(12.dp),
-                verticalArrangement = Arrangement.spacedBy(12.dp),
-                modifier = Modifier.testTag("device_center_grid"),
-            ) {
-                items(state.cards, key = { it.key.saveableKey() }) { card ->
-                    when (card.device.type) {
-                        DeviceType.SOCKET -> SocketDeviceCard(card, { onOpenDevice(card) }, { onQuickAction(card) })
-                        DeviceType.TEMPERATURE_HUMIDITY -> SensorDeviceCard(card, { onOpenDevice(card) }, { onQuickAction(card) })
-                        DeviceType.INFRARED -> InfraredDeviceCard(card, { onOpenDevice(card) })
-                    }
-                }
-            }
-        }
-    }
-
-    if (showConfiguration) {
-        DeviceConfigurationDialog(
-            onDismiss = { showConfiguration = false },
-            onConfirm = { name, type ->
-                showConfiguration = false
-                onConfigureDevice(name, type)
-            },
-        )
-    }
-}
-
-@Composable
-private fun DeviceConfigurationDialog(
-    onDismiss: () -> Unit,
-    onConfirm: (String, DeviceType) -> Unit,
-) {
-    var name by remember { mutableStateOf("") }
-    var type by remember { mutableStateOf(DeviceType.SOCKET) }
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.device_center_configure_title)) },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                OutlinedTextField(
-                    value = name,
-                    onValueChange = { name = it },
-                    label = { Text(stringResource(R.string.device_center_device_name)) },
-                    singleLine = true,
-                    modifier = Modifier.fillMaxWidth(),
-                )
-                FilterRow(
-                    selected = when (type) {
-                        DeviceType.SOCKET -> DeviceCategoryFilter.SOCKET
-                        DeviceType.TEMPERATURE_HUMIDITY -> DeviceCategoryFilter.SENSOR
-                        DeviceType.INFRARED -> DeviceCategoryFilter.INFRARED
-                    },
-                    onSelected = { selected ->
-                        type = when (selected) {
-                            DeviceCategoryFilter.SOCKET -> DeviceType.SOCKET
-                            DeviceCategoryFilter.SENSOR -> DeviceType.TEMPERATURE_HUMIDITY
-                            DeviceCategoryFilter.INFRARED -> DeviceType.INFRARED
-                            DeviceCategoryFilter.ALL -> type
-                        }
-                    },
-                )
-            }
-        },
-        confirmButton = {
-            Button(onClick = { onConfirm(name.trim(), type) }, enabled = name.isNotBlank()) { Text(stringResource(R.string.action_confirm)) }
-        },
-        dismissButton = { Button(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } },
-    )
-}
-
-@Composable
-private fun FilterRow(
-    selected: DeviceCategoryFilter,
-    onSelected: (DeviceCategoryFilter) -> Unit,
-) {
-    androidx.compose.foundation.lazy.LazyRow(
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        item { FilterChipItem(DeviceCategoryFilter.ALL, "全部", selected, onSelected) }
-        item { FilterChipItem(DeviceCategoryFilter.SOCKET, "插座", selected, onSelected) }
-        item { FilterChipItem(DeviceCategoryFilter.SENSOR, "温湿度", selected, onSelected) }
-        item { FilterChipItem(DeviceCategoryFilter.INFRARED, "红外", selected, onSelected) }
-    }
-}
-
-@Composable
-private fun FilterChipItem(
-    filter: DeviceCategoryFilter,
-    label: String,
-    selected: DeviceCategoryFilter,
-    onSelected: (DeviceCategoryFilter) -> Unit,
-) {
-    ABoxFilterChip(selected = selected == filter, label = label, onClick = { onSelected(filter) })
-}
-
-@Composable
-private fun SocketDeviceCard(card: DeviceCardUiModel, onOpen: () -> Unit, onToggle: () -> Unit) {
-    val detail = card.detail as? DeviceCardDetail.Socket
-    val isOffline = card.detail is DeviceCardDetail.Offline
-    val isAwaitingConfirmation = detail?.pendingTarget != null && !detail.operating
-    val isOn = detail?.powerState == SocketPowerState.ON
-    DeviceSurface(card, onOpen, minimumHeight = 0.dp) {
-        DeviceHeader(
-            icon = ABoxIconKey.SOCKET,
-            title = card.displayName,
-            subtitle = "${stringResource(R.string.socket_title)} · ${when { isOffline -> stringResource(R.string.device_status_offline); detail == null -> stringResource(R.string.device_status_unavailable); detail.operating -> stringResource(R.string.device_status_switching); isAwaitingConfirmation -> stringResource(R.string.device_status_awaiting_confirmation); isOn -> stringResource(R.string.device_status_on); else -> stringResource(R.string.device_status_off) }}",
-            action = {
-                Surface(
-                    modifier = Modifier
-                        .size(48.dp)
-                        .border(
-                            width = if (isOn) 2.dp else 1.dp,
-                            color = if (isOn) MaterialTheme.colorScheme.primary.copy(alpha = 0.45f)
-                            else MaterialTheme.colorScheme.outline,
-                            shape = CircleShape,
-                        ),
-                    shape = CircleShape,
-                    color = if (isOn) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.surface,
-                    tonalElevation = if (isOn) 6.dp else 0.dp,
-                ) {
-                    IconButton(
-                        onClick = onToggle,
-                        enabled = !isOffline && detail != null && !detail.operating && !isAwaitingConfirmation,
-                    ) {
-                        if (detail?.operating == true) {
-                            CircularProgressIndicator(
-                                modifier = Modifier.size(20.dp),
-                                color = if (isOn) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.primary,
-                            )
-                        } else {
-                            ABoxIcon(
-                                ABoxIconKey.POWER,
-                                if (isOn) "关闭插座" else "开启插座",
-                                modifier = Modifier.size(22.dp),
-                            )
-                        }
-                    }
-                }
-            },
-        )
-        CardFooter(
-            left = when {
-                isOffline -> stringResource(R.string.device_status_offline)
-                isAwaitingConfirmation -> stringResource(R.string.device_status_awaiting_confirmation)
-                detail?.lastConfirmedAtMillis != null -> stringResource(R.string.device_status_confirmed)
-                else -> stringResource(R.string.device_status_waiting_first_confirmation)
-            },
-            right = stringResource(R.string.device_open_control_panel),
-            modifier = Modifier.padding(top = 24.dp),
-        )
-    }
-}
-
-@Composable
-private fun SensorDeviceCard(card: DeviceCardUiModel, onOpen: () -> Unit, onRefresh: () -> Unit) {
-    val detail = card.detail as? DeviceCardDetail.Sensor
-    val isOffline = card.detail is DeviceCardDetail.Offline
-    DeviceSurface(card, onOpen, minimumHeight = 190.dp) {
-        DeviceHeader(
-            icon = ABoxIconKey.SENSOR,
-            title = card.displayName,
-            subtitle = if (isOffline) {
-                "${stringResource(R.string.device_sensor_subtitle)} · ${stringResource(R.string.device_status_offline)}"
-            } else {
-                stringResource(R.string.device_sensor_subtitle)
-            },
-            action = {
-                IconButton(onClick = onRefresh, enabled = detail?.refreshing != true) {
-                    if (detail?.refreshing == true) CircularProgressIndicator(Modifier.size(20.dp))
-                    else ABoxIcon(ABoxIconKey.REFRESH, "刷新温湿度")
-                }
-            },
-        )
-        Row(Modifier.fillMaxWidth().padding(vertical = 22.dp), horizontalArrangement = Arrangement.SpaceEvenly) {
-            Metric("环境温度", detail?.temperature, "°C", ABoxIconKey.TEMPERATURE)
-            Surface(Modifier.width(1.dp).height(48.dp), color = MaterialTheme.colorScheme.outlineVariant) {}
-            Metric("相对湿度", detail?.humidity, "%", ABoxIconKey.HUMIDITY)
-        }
-        CardFooter(
-            if (isOffline) stringResource(R.string.device_status_offline) else stringResource(R.string.device_live_reading),
-            stringResource(R.string.device_details),
-            Modifier.padding(top = 4.dp),
-        )
-    }
-}
-
-@Composable
-private fun InfraredDeviceCard(card: DeviceCardUiModel, onOpen: () -> Unit) {
-    val detail = card.detail as? DeviceCardDetail.Infrared
-    DeviceSurface(card, onOpen, minimumHeight = 172.dp) {
-        DeviceHeader(
-            icon = ABoxIconKey.INFRARED,
-            title = card.displayName,
-            subtitle = stringResource(R.string.device_infrared_subtitle, detail?.remoteNames?.size ?: 0),
-        )
-        Text(
-            text = stringResource(R.string.device_infrared_mounted, detail?.remoteNames?.joinToString("、")?.takeIf { it.isNotBlank() } ?: stringResource(R.string.device_infrared_no_remotes)),
-            style = MaterialTheme.typography.bodySmall,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-            modifier = Modifier.padding(top = 22.dp, bottom = 18.dp),
-        )
-        CardFooter(
-            left = detail?.quota?.let { stringResource(R.string.device_infrared_slots, it.usedCount, it.totalCapacity) } ?: stringResource(R.string.device_infrared_slots_unavailable),
-            right = stringResource(R.string.device_infrared_center),
-        )
-    }
-}
-
-@Composable
-private fun DeviceSurface(
-    card: DeviceCardUiModel,
-    onOpen: () -> Unit,
-    minimumHeight: androidx.compose.ui.unit.Dp,
-    content: @Composable androidx.compose.foundation.layout.ColumnScope.() -> Unit,
-) {
-    Card(
-        modifier = Modifier.fillMaxWidth().testTag("device_card_${card.device.id.value}"),
-        shape = RoundedCornerShape(6.dp),
-        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
-    ) {
-        Column(
-            Modifier
-                .fillMaxWidth()
-                .defaultMinSize(minHeight = minimumHeight)
-                .clickable(onClick = onOpen)
-                .padding(horizontal = 18.dp, vertical = 18.dp),
-            verticalArrangement = Arrangement.spacedBy(4.dp),
-            content = content,
-        )
-    }
-}
-
-@Composable
-private fun DeviceHeader(icon: ABoxIconKey, title: String, subtitle: String, action: (@Composable () -> Unit)? = null) {
-    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-        Surface(shape = RoundedCornerShape(6.dp), color = MaterialTheme.colorScheme.primaryContainer) {
-            ABoxIcon(icon, subtitle, Modifier.padding(10.dp).size(24.dp))
-        }
-        Column(Modifier.weight(1f).padding(start = 12.dp)) {
-            Text(title, fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis)
-            Text(subtitle, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-        }
-        action?.invoke()
-    }
-}
-
-@Composable
-private fun Metric(label: String, value: String?, unit: String, icon: ABoxIconKey) {
-    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            ABoxIcon(icon, label, Modifier.size(18.dp))
-            Text(value ?: stringResource(R.string.device_metric_no_data), style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 6.dp))
-            if (value != null) Text(unit, style = MaterialTheme.typography.labelMedium, modifier = Modifier.padding(start = 2.dp))
-        }
-        Text(label, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-    }
-}
-
-@Composable
-private fun CardFooter(left: String, right: String, modifier: Modifier = Modifier) {
-    Row(modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-        Text(left, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-        Text(right, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.Bold)
-    }
-}
@@ -1,216 +0,0 @@
-package com.flagship.abox.manager.ui.devicecenter
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.flagship.abox.manager.domain.DeviceCatalog
-import com.flagship.abox.manager.domain.DeviceDescriptor
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.DomainError
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.SocketGateway
-import com.flagship.abox.manager.domain.SocketPowerState
-import com.flagship.abox.manager.domain.TemperatureHumidityGateway
-import com.flagship.abox.manager.domain.infrared.VirtualRemoteRepository
-import com.flagship.abox.manager.devicecatalog.data.ConfiguredDeviceRepository
-import com.flagship.abox.manager.ui.defaults.ABoxDefaultContentInitializer
-import com.flagship.abox.manager.domain.ActivityEventWriter
-import com.flagship.abox.manager.domain.ActivityEventKind
-import com.flagship.abox.manager.domain.ActivityOutcome
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.first
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-
-@HiltViewModel
-class DeviceCenterViewModel @Inject constructor(
-    private val catalog: DeviceCatalog,
-    private val configuredRepository: ConfiguredDeviceRepository,
-    private val socketGateway: SocketGateway,
-    private val temperatureHumidityGateway: TemperatureHumidityGateway,
-    private val virtualRemoteRepository: VirtualRemoteRepository,
-    private val defaultContentInitializer: ABoxDefaultContentInitializer,
-    private val activityWriter: ActivityEventWriter,
-) : ViewModel() {
-    private val _uiState = MutableStateFlow(DeviceCenterUiState())
-    val uiState: StateFlow<DeviceCenterUiState> = _uiState.asStateFlow()
-    private var catalogJob: Job? = null
-    private var allCards: List<DeviceCardUiModel> = emptyList()
-
-    fun initialize(profileId: ProviderProfileId) {
-        if (_uiState.value.profileId == profileId && catalogJob?.isActive == true) return
-        catalogJob?.cancel()
-        allCards = emptyList()
-        _uiState.value = DeviceCenterUiState(profileId = profileId)
-        catalogJob = viewModelScope.launch {
-            defaultContentInitializer.initialize(profileId)
-            catalog.observeDevices(profileId).collectLatest { result ->
-                when (result) {
-                    is DomainResult.Success -> {
-                        allCards = result.value.map(::toCard)
-                        publishCards()
-                        refreshAllCards()
-                    }
-                    is DomainResult.Failure -> _uiState.value = _uiState.value.copy(content = DeviceCenterContent.ERROR)
-                }
-            }
-        }
-    }
-
-    fun setFilter(filter: DeviceCategoryFilter) {
-        _uiState.value = _uiState.value.copy(filter = filter)
-        publishCards()
-    }
-
-    fun select(device: DeviceDescriptor) {
-        _uiState.value = _uiState.value.copy(selectedCard = DeviceCardKey(device.profileId, device.name))
-    }
-
-    fun addConfiguredDevice(name: String, type: DeviceType) {
-        val profileId = _uiState.value.profileId ?: return
-        viewModelScope.launch { configuredRepository.add(profileId, com.flagship.abox.manager.domain.DeviceName(name), type) }
-    }
-
-    fun removeConfiguredDevice(device: DeviceCardUiModel) {
-        val profileId = _uiState.value.profileId ?: return
-        viewModelScope.launch { configuredRepository.remove(profileId, device.device.name) }
-    }
-
-    fun refreshDevice(card: DeviceCardUiModel) {
-        when (card.device.type) {
-            DeviceType.SOCKET -> refreshSocket(card)
-            DeviceType.TEMPERATURE_HUMIDITY -> refreshSensor(card)
-            DeviceType.INFRARED -> refreshInfrared(card)
-        }
-    }
-
-    fun toggleSocket(card: DeviceCardUiModel) {
-        val detail = card.detail as? DeviceCardDetail.Socket ?: return
-        if (detail.operating) return
-        val target = if (detail.powerState == SocketPowerState.ON) SocketPowerState.OFF else SocketPowerState.ON
-        updateCard(card.key) { it.copy(detail = detail.copy(operating = true, pendingTarget = target)) }
-        viewModelScope.launch {
-            val command = socketGateway.commandPower(card.device.profileId, card.device.name, target)
-            activityWriter.recordDevice(
-                card.device.profileId,
-                card.device.name,
-                ActivityEventKind.SOCKET_COMMAND,
-                command.activityOutcome(),
-                command.activityErrorCode(),
-            )
-            if (command is DomainResult.Success) {
-                repeat(CONFIRMATION_ATTEMPTS) { attempt ->
-                    if (attempt > 0) delay(CONFIRMATION_RETRY_DELAY_MILLIS)
-                    when (val confirmed = socketGateway.getStatus(card.device.profileId, card.device.name)) {
-                        is DomainResult.Success -> if (confirmed.value.powerState == target) {
-                            activityWriter.recordDevice(card.device.profileId, card.device.name, ActivityEventKind.SOCKET_CONFIRMATION, ActivityOutcome.SUCCEEDED)
-                            updateCard(card.key) {
-                                it.copy(detail = DeviceCardDetail.Socket(target, lastConfirmedAtMillis = System.currentTimeMillis()))
-                            }
-                            return@launch
-                        }
-                        is DomainResult.Failure -> Unit
-                    }
-                }
-                activityWriter.recordDevice(
-                    card.device.profileId,
-                    card.device.name,
-                    ActivityEventKind.SOCKET_CONFIRMATION,
-                    ActivityOutcome.AWAITING_CONFIRMATION,
-                )
-                updateCard(card.key) { it.copy(detail = detail.copy(operating = false, pendingTarget = target)) }
-            } else {
-                updateCard(card.key) { it.copy(detail = detail.copy(operating = false, pendingTarget = null)) }
-            }
-        }
-    }
-
-    private fun refreshAllCards() = allCards.forEach(::refreshDevice)
-
-    private fun refreshSocket(card: DeviceCardUiModel) {
-        viewModelScope.launch {
-            when (val result = socketGateway.getStatus(card.device.profileId, card.device.name)) {
-                is DomainResult.Success -> updateCard(card.key) {
-                    it.copy(detail = DeviceCardDetail.Socket(result.value.powerState, lastConfirmedAtMillis = System.currentTimeMillis()))
-                }
-                is DomainResult.Failure -> updateCard(card.key) {
-                    it.copy(detail = if (result.error is DomainError.DeviceOffline) DeviceCardDetail.Offline else DeviceCardDetail.Unavailable)
-                }
-            }
-        }
-    }
-
-    private fun refreshSensor(card: DeviceCardUiModel) {
-        val previous = card.detail as? DeviceCardDetail.Sensor
-        updateCard(card.key) { it.copy(detail = previous?.copy(refreshing = true) ?: DeviceCardDetail.Loading) }
-        viewModelScope.launch {
-            when (val result = temperatureHumidityGateway.getReading(card.device.profileId, card.device.name)) {
-                is DomainResult.Success -> updateCard(card.key) {
-                    it.copy(detail = DeviceCardDetail.Sensor(
-                        temperature = result.value.temperature,
-                        humidity = result.value.humidity,
-                        lastUpdatedAtMillis = System.currentTimeMillis(),
-                    ))
-                }
-                is DomainResult.Failure -> updateCard(card.key) {
-                    it.copy(
-                        detail = if (result.error is DomainError.DeviceOffline) {
-                            DeviceCardDetail.Offline
-                        } else {
-                            previous?.copy(refreshing = false) ?: DeviceCardDetail.Unavailable
-                        },
-                    )
-                }
-            }
-        }
-    }
-
-    private fun refreshInfrared(card: DeviceCardUiModel) {
-        viewModelScope.launch {
-            val remotes = virtualRemoteRepository.observeRemotes(card.device.profileId, card.device.name).first()
-            val quota = virtualRemoteRepository.observeSlotQuota(card.device.profileId, card.device.name).first()
-            if (remotes is DomainResult.Success && quota is DomainResult.Success) {
-                updateCard(card.key) {
-                    it.copy(detail = DeviceCardDetail.Infrared(remotes.value.map { remote -> remote.displayName }, quota.value))
-                }
-            } else updateCard(card.key) { it.copy(detail = DeviceCardDetail.Unavailable) }
-        }
-    }
-
-    private fun updateCard(key: DeviceCardKey, transform: (DeviceCardUiModel) -> DeviceCardUiModel) {
-        allCards = allCards.map { if (it.key == key) transform(it) else it }
-        publishCards()
-    }
-
-    private fun publishCards() {
-        val filter = _uiState.value.filter
-        val cards = allCards.filter { filter.matches(it.device.type) }
-        _uiState.value = _uiState.value.copy(cards = cards, content = if (allCards.isEmpty()) DeviceCenterContent.EMPTY else DeviceCenterContent.CONTENT)
-    }
-
-    private fun toCard(device: DeviceDescriptor) = DeviceCardUiModel(DeviceCardKey(device.profileId, device.name), device)
-
-    private companion object {
-        const val CONFIRMATION_ATTEMPTS = 4
-        const val CONFIRMATION_RETRY_DELAY_MILLIS = 500L
-    }
-}
-
-private fun DomainResult<*>.activityOutcome(): ActivityOutcome =
-    if (this is DomainResult.Success) ActivityOutcome.SUCCEEDED else ActivityOutcome.FAILED
-
-private fun DomainResult<*>.activityErrorCode(): String? =
-    (this as? DomainResult.Failure)?.error?.externalCode
-
-private fun DeviceCategoryFilter.matches(type: DeviceType): Boolean = when (this) {
-    DeviceCategoryFilter.ALL -> true
-    DeviceCategoryFilter.SOCKET -> type == DeviceType.SOCKET
-    DeviceCategoryFilter.SENSOR -> type == DeviceType.TEMPERATURE_HUMIDITY
-    DeviceCategoryFilter.INFRARED -> type == DeviceType.INFRARED
-}
@@ -1,6 +1,7 @@
 package com.flagship.abox.manager.ui.navigation

 import android.net.Uri
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -39,10 +40,8 @@ import com.flagship.abox.manager.domain.Username
 import com.flagship.abox.manager.infrared.hub.InfraredHubRoute
 import com.flagship.abox.manager.infrared.panel.RemotePanelRoute
 import com.flagship.abox.manager.infrared.ui.InfraredControlRoute
-import com.flagship.abox.manager.ui.devicecenter.DeviceCenterRoute
-import com.flagship.abox.manager.automation.ui.activity.ActivityRoute
+import com.flagship.abox.manager.ui.devicecontrollist.DeviceListScreen
 import com.flagship.abox.manager.ui.scene.SceneListScreen
-import com.flagship.abox.manager.ui.preferences.SettingsRoute
 import com.flagship.abox.manager.ui.scene.SceneRoutes
 import com.flagship.abox.manager.ui.scene.sceneEditorDestination
 import com.flagship.abox.manager.ui.scene.sceneExecutionDestination
@@ -159,11 +158,12 @@ fun AuthenticatedNavigationStateHost(
        }

        val selection = selectedDevice ?: return@LaunchedEffect
+        if (savedSelection != selection) {
+            savedSelection = selection
+        }
+
        when (detailPresentation(windowSizeClass, selection)) {
            DetailPresentation.PANE -> {
-                if (savedSelection != selection) {
-                    savedSelection = selection
-                }
                if (currentRoute != MainTab.DEVICES.route) {
                    navController.popBackStack(MainTab.DEVICES.route, inclusive = false)
                }
@@ -173,9 +173,6 @@ fun AuthenticatedNavigationStateHost(
                    navController.navigate(deviceRoute(selection)) {
                        launchSingleTop = true
                    }
-                    savedSelection = null
-                } else if (savedSelection != null) {
-                    savedSelection = null
                }
            }
        }
@@ -186,6 +183,7 @@ fun AuthenticatedNavigationStateHost(
        selectedDevice = selectedDevice,
        detailPresentation = selectedPresentation,
    )
+
    content(
        snapshot,
        { tab ->
@@ -202,9 +200,18 @@ fun AuthenticatedNavigationStateHost(
                }
            }
        },
-        { deviceName, type -> savedSelection = DeviceSelection(profileId, deviceName, type) },
+        { deviceName, type ->
+            savedSelection = DeviceSelection(profileId, deviceName, type)
+        },
        { savedSelection = null },
    )
+
+    BackHandler(enabled = selectedDevice != null || navController.previousBackStackEntry != null) {
+        savedSelection = null
+        if (currentRoute != MainTab.DEVICES.route) {
+            navController.popBackStack()
+        }
+    }
 }

@Composable
@@ -214,7 +221,6 @@ fun AuthenticatedNavigation(
    onLogout: () -> Unit,
    onProviderClick: () -> Unit,
    onAvatarClick: () -> Unit,
-    onOpenSettings: () -> Unit = {},
    windowSizeClass: ABoxWindowSizeClass? = null,
 ) {
    val resolvedWindowSizeClass = windowSizeClass ?: widthClass(LocalConfiguration.current.screenWidthDp)
@@ -231,28 +237,33 @@ fun AuthenticatedNavigation(
                        profile.id,
                        selection.deviceName,
                    )
-                    DeviceType.INFRARED -> Routes.infraredHub(profile.id.value, selection.deviceName.value)
+                    DeviceType.INFRARED -> "${Routes.INFRARED_HUB}/${Uri.encode(profile.id.value)}"
                }
            },
            selectionForRoute = { route -> profile.selectionForRoute(route) },
        ) { snapshot, onTabClick, onSelectDevice, onClearDeviceSelection ->
            val currentTab = MainTab.fromRoute(snapshot.currentRoute) ?: MainTab.DEVICES
-            AuthenticatedGraphContent(
-                navController = navController,
-                profile = profile,
-                username = username,
+            MainAppShell(
                currentTab = currentTab,
                windowSizeClass = resolvedWindowSizeClass,
-                isExpandedDevicePane = snapshot.detailPresentation == DetailPresentation.PANE &&
-                    snapshot.currentRoute == MainTab.DEVICES.route,
-                selectedDevice = snapshot.selectedDevice,
+                userName = username.value,
+                providerName = profile.displayName,
                onTabClick = onTabClick,
-                onSelectDevice = onSelectDevice,
-                onClearDeviceSelection = onClearDeviceSelection,
                onProviderClick = onProviderClick,
                onAvatarClick = onAvatarClick,
-                onLogout = onLogout,
-                onOpenSettings = onOpenSettings,
+                content = { paddingValues ->
+                    AuthenticatedGraphContent(
+                        navController = navController,
+                        profile = profile,
+                        paddingValues = paddingValues,
+                        isExpandedDevicePane = snapshot.detailPresentation == DetailPresentation.PANE &&
+                            snapshot.currentRoute == MainTab.DEVICES.route,
+                        selectedDevice = snapshot.selectedDevice,
+                        onSelectDevice = onSelectDevice,
+                        onClearDeviceSelection = onClearDeviceSelection,
+                        onLogout = onLogout,
+                    )
+                },
            )
        }
    }
@@ -262,36 +273,45 @@ fun AuthenticatedNavigation(
 private fun AuthenticatedGraphContent(
    navController: NavHostController,
    profile: ProviderProfile,
-    username: Username,
-    currentTab: MainTab,
-    windowSizeClass: ABoxWindowSizeClass,
+    paddingValues: PaddingValues,
    isExpandedDevicePane: Boolean,
    selectedDevice: DeviceSelection?,
-    onTabClick: (MainTab) -> Unit,
    onSelectDevice: (DeviceName, DeviceType) -> Unit,
    onClearDeviceSelection: () -> Unit,
-    onProviderClick: () -> Unit,
-    onAvatarClick: () -> Unit,
    onLogout: () -> Unit,
-    onOpenSettings: () -> Unit,
 ) {
-    AuthenticatedNavHost(
-        modifier = Modifier.fillMaxSize(),
-        navController = navController,
-        profile = profile,
-        username = username,
-        currentTab = currentTab,
-        windowSizeClass = windowSizeClass,
-        isExpandedDevicePane = isExpandedDevicePane,
-        selectedDevice = selectedDevice,
-        onTabClick = onTabClick,
-        onSelectDevice = onSelectDevice,
-        onClearDeviceSelection = onClearDeviceSelection,
-        onProviderClick = onProviderClick,
-        onAvatarClick = onAvatarClick,
-        onLogout = onLogout,
-        onOpenSettings = onOpenSettings,
-    )
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(paddingValues),
+    ) {
+        if (isExpandedDevicePane && selectedDevice != null) {
+            Row(modifier = Modifier.fillMaxSize()) {
+                AuthenticatedNavHost(
+                    modifier = Modifier.weight(1f),
+                    navController = navController,
+                    profile = profile,
+                    onSelectDevice = onSelectDevice,
+                    onClearDeviceSelection = onClearDeviceSelection,
+                    onLogout = onLogout,
+                )
+                DeviceDetailPane(
+                    modifier = Modifier.weight(1f),
+                    selection = selectedDevice,
+                    onBack = onClearDeviceSelection,
+                )
+            }
+        } else {
+            AuthenticatedNavHost(
+                modifier = Modifier.fillMaxSize(),
+                navController = navController,
+                profile = profile,
+                onSelectDevice = onSelectDevice,
+                onClearDeviceSelection = onClearDeviceSelection,
+                onLogout = onLogout,
+            )
+        }
+    }
 }

@Composable
@@ -299,127 +319,48 @@ private fun AuthenticatedNavHost(
    modifier: Modifier,
    navController: NavHostController,
    profile: ProviderProfile,
-    username: Username,
-    currentTab: MainTab,
-    windowSizeClass: ABoxWindowSizeClass,
-    isExpandedDevicePane: Boolean,
-    selectedDevice: DeviceSelection?,
-    onTabClick: (MainTab) -> Unit,
    onSelectDevice: (DeviceName, DeviceType) -> Unit,
    onClearDeviceSelection: () -> Unit,
-    onProviderClick: () -> Unit,
-    onAvatarClick: () -> Unit,
    onLogout: () -> Unit,
-    onOpenSettings: () -> Unit,
 ) {
-    val activeBackStackEntry by navController.currentBackStackEntryAsState()
-    val activeRoute = activeBackStackEntry?.actualRoute()
-    var backNavigationInFlight by remember { mutableStateOf(false) }
-    LaunchedEffect(activeRoute) {
-        backNavigationInFlight = false
-    }
-    val navigateBackFromDetail: () -> Unit = {
-        val liveRoute = navController.currentBackStackEntry?.actualRoute()
-        val isMainDestination = MainTab.entries.any { it.route == liveRoute }
-        if (!backNavigationInFlight && !isMainDestination) {
-            backNavigationInFlight = true
-            if (!navController.popBackStack()) {
-                backNavigationInFlight = false
-            }
-        }
-    }
-
    NavHost(
        navController = navController,
        startDestination = MainTab.DEVICES.route,
        modifier = modifier,
    ) {
        composable(MainTab.DEVICES.route) {
-            MainAppShell(
-                currentTab = currentTab,
-                windowSizeClass = windowSizeClass,
-                userName = username.value,
-                providerName = profile.displayName,
-                onTabClick = onTabClick,
-                onProviderClick = onProviderClick,
-                onAvatarClick = onAvatarClick,
-            ) { paddingValues ->
-                Row(Modifier.fillMaxSize().padding(paddingValues)) {
-                    DeviceCenterRoute(
-                        profileId = profile.id,
-                        onOpenDevice = { deviceName, type -> onSelectDevice(DeviceName(deviceName), type) },
-                        modifier = Modifier.weight(1f),
-                    )
-                    if (isExpandedDevicePane && selectedDevice != null) {
-                        DeviceDetailPane(
-                            modifier = Modifier.weight(1f),
-                            selection = selectedDevice,
-                            onBack = onClearDeviceSelection,
-                        )
-                    }
-                }
-            }
+            DeviceRoot(onSelectDevice = onSelectDevice)
        }
        composable(MainTab.SCENES.route) {
-            MainAppShell(
-                currentTab = currentTab,
-                windowSizeClass = windowSizeClass,
-                userName = username.value,
-                providerName = profile.displayName,
-                onTabClick = onTabClick,
-                onProviderClick = onProviderClick,
-                onAvatarClick = onAvatarClick,
-            ) { paddingValues ->
-                Box(Modifier.fillMaxSize().padding(paddingValues)) {
-                    SceneListScreen(
-                        onAddManual = { navController.navigate(SceneRoutes.EDITOR_MANUAL) },
-                        onAddAutomatic = { navController.navigate(SceneRoutes.EDITOR_AUTOMATIC) },
-                        onEditScene = { sceneId -> navController.navigate(SceneRoutes.editorFor(sceneId)) },
-                        onExecuteScene = { sceneId -> navController.navigate(SceneRoutes.executionFor(sceneId)) },
-                    )
-                }
-            }
+            SceneListScreen(
+                onAddManual = { navController.navigate(SceneRoutes.EDITOR_MANUAL) },
+                onAddAutomatic = { navController.navigate(SceneRoutes.EDITOR_AUTOMATIC) },
+                onEditScene = { sceneId -> navController.navigate(SceneRoutes.editorFor(sceneId)) },
+                onExecuteScene = { sceneId -> navController.navigate(SceneRoutes.executionFor(sceneId)) },
+            )
        }
        composable(MainTab.ACTIVITY.route) {
-            MainAppShell(
-                currentTab = currentTab,
-                windowSizeClass = windowSizeClass,
-                userName = username.value,
-                providerName = profile.displayName,
-                onTabClick = onTabClick,
-                onProviderClick = onProviderClick,
-                onAvatarClick = onAvatarClick,
-            ) { paddingValues ->
-                Box(Modifier.fillMaxSize().padding(paddingValues)) {
-                    ActivityRoute(profileId = profile.id)
-                }
-            }
-        }
-        composable(Routes.SETTINGS) {
-            SettingsRoute()
+            ActivityDestination()
        }
        deviceDetailGraph(
            onBackClick = {
                onClearDeviceSelection()
-                navigateBackFromDetail()
+                navController.popBackStack()
            },
        )
        sceneEditorDestination(
-            onBack = navigateBackFromDetail,
+            onBack = navController::popBackStack,
            onSaved = { navController.popBackStack(MainTab.SCENES.route, inclusive = false) },
        )
-        sceneExecutionDestination(onBack = navigateBackFromDetail)
+        sceneExecutionDestination(onBack = navController::popBackStack)
        composable(
-            route = Routes.INFRARED_HUB,
-            arguments = listOf(
-                navArgument("profileId") { type = NavType.StringType },
-                navArgument("deviceName") { type = NavType.StringType },
-            ),
-        ) { entry ->
+            route = "${Routes.INFRARED_HUB}/{profileId}",
+            arguments = listOf(navArgument("profileId") { type = NavType.StringType }),
+        ) {
            InfraredHubRoute(
                onBack = {
                    onClearDeviceSelection()
-                    navigateBackFromDetail()
+                    navController.popBackStack()
                },
                onOpenRemote = { remoteId ->
                    navController.navigate(
@@ -427,8 +368,7 @@ private fun AuthenticatedNavHost(
                    )
                },
                onOpenSettings = {
-                    val deviceName = entry.arguments?.getString("deviceName").orEmpty()
-                    navController.navigate(Routes.infraredSettings(profile.id.value, deviceName))
+                    navController.navigate("${Routes.INFRARED_SETTINGS}/${Uri.encode(profile.id.value)}")
                },
                onSessionInvalid = onLogout,
            )
@@ -441,25 +381,37 @@ private fun AuthenticatedNavHost(
            ),
        ) {
            RemotePanelRoute(
-                onBack = navigateBackFromDetail,
+                onBack = navController::popBackStack,
                onSessionInvalid = onLogout,
            )
        }
        composable(
-            route = Routes.INFRARED_SETTINGS,
-            arguments = listOf(
-                navArgument("profileId") { type = NavType.StringType },
-                navArgument("deviceName") { type = NavType.StringType },
-            ),
+            route = "${Routes.INFRARED_SETTINGS}/{profileId}",
+            arguments = listOf(navArgument("profileId") { type = NavType.StringType }),
        ) {
            InfraredControlRoute(
-                onBack = navigateBackFromDetail,
+                onBack = navController::popBackStack,
                onSessionInvalid = onLogout,
            )
        }
    }
 }

+@Composable
+private fun DeviceRoot(
+    modifier: Modifier = Modifier,
+    onSelectDevice: (DeviceName, DeviceType) -> Unit,
+) {
+    DeviceListScreen(
+        modifier = modifier,
+        onSocketClick = { onSelectDevice(DeviceName("Zigbee插座控制器"), DeviceType.SOCKET) },
+        onTemperatureHumidityClick = {
+            onSelectDevice(DeviceName("温湿度传感器"), DeviceType.TEMPERATURE_HUMIDITY)
+        },
+        onInfraredClick = { onSelectDevice(DeviceName("红外遥控器"), DeviceType.INFRARED) },
+    )
+}
+
@Composable
 private fun DeviceDetailPane(
    selection: DeviceSelection,
@@ -500,6 +452,16 @@ private fun DeviceDetailPane(
    }
 }

+@Composable
+private fun ActivityDestination() {
+    Box(modifier = Modifier.fillMaxSize().padding(24.dp)) {
+        Text(
+            text = androidx.compose.ui.res.stringResource(R.string.activity_placeholder_title),
+            style = MaterialTheme.typography.headlineMedium,
+        )
+    }
+}
+
 private fun ProviderProfile.selectionForRoute(route: String?): DeviceSelection? {
    val parts = route?.split('/') ?: return null
    return when {
@@ -513,9 +475,9 @@ private fun ProviderProfile.selectionForRoute(route: String?): DeviceSelection?
            deviceName = DeviceName(parts.drop(3).joinToString("/").decodeRoutePart()),
            type = DeviceType.TEMPERATURE_HUMIDITY,
        )
-        parts.size >= 3 && parts[0] == "infrared_hub" -> DeviceSelection(
+        parts.size >= 2 && parts[0] == Routes.INFRARED_HUB -> DeviceSelection(
            profileId = id,
-            deviceName = DeviceName(parts[2].decodeRoutePart()),
+            deviceName = DeviceName("红外遥控器"),
            type = DeviceType.INFRARED,
        )
        else -> null
@@ -1,21 +1,12 @@
 package com.flagship.abox.manager.ui.navigation

-import android.net.Uri
-
 object Routes {
    const val STARTUP = "startup"
    const val PROVIDER_SELECTION = "provider_selection"
    const val LOGIN = "login"
    const val AUTHENTICATED = "authenticated"
-    const val SETTINGS = "settings"

-    const val INFRARED_HUB = "infrared_hub/{profileId}/{deviceName}"
+    const val INFRARED_HUB = "infrared_hub"
    const val INFRARED_PANEL = "infrared_panel"
-    const val INFRARED_SETTINGS = "infrared_settings/{profileId}/{deviceName}"
-
-    fun infraredHub(profileId: String, deviceName: String): String =
-        "infrared_hub/${Uri.encode(profileId)}/${Uri.encode(deviceName)}"
-
-    fun infraredSettings(profileId: String, deviceName: String): String =
-        "infrared_settings/${Uri.encode(profileId)}/${Uri.encode(deviceName)}"
+    const val INFRARED_SETTINGS = "infrared_settings"
 }
@@ -1,595 +1,227 @@
 package com.flagship.abox.manager.ui.preferences

-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.ArrowBack
-import androidx.compose.material.icons.outlined.Check
-import androidx.compose.material.icons.outlined.ChevronRight
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Switch
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import android.os.Build
+import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.compose.runtime.saveable.Saver
 import com.flagship.abox.manager.R
+import com.flagship.abox.manager.designsystem.ABoxCard
 import com.flagship.abox.manager.designsystem.ABoxErrorState
-import com.flagship.abox.manager.designsystem.LocalABoxShapes
-import com.flagship.abox.manager.designsystem.icon.ABoxIcon
-import com.flagship.abox.manager.designsystem.icon.ABoxIconKey
-import com.flagship.abox.manager.preferences.AccentPreference
-import com.flagship.abox.manager.designsystem.tokens.ABoxAccentPalette
-import com.flagship.abox.manager.designsystem.ABoxBackLayer
-import com.flagship.abox.manager.designsystem.ABoxSurface
+import com.flagship.abox.manager.designsystem.ABoxFilterChip
+import com.flagship.abox.manager.designsystem.ABoxPreferenceGroup
+import com.flagship.abox.manager.designsystem.ABoxSwitch
 import com.flagship.abox.manager.preferences.AppThemeMode
 import com.flagship.abox.manager.preferences.DesignRenderer
-import com.flagship.abox.manager.preferences.InterfaceScale
-import com.flagship.abox.manager.preferences.ColorStandard
-import com.flagship.abox.manager.preferences.ColorStyle
 import com.flagship.abox.manager.preferences.NavigationPresentation

-private enum class SettingsDestination { HOME, THEME }
-
-@Stable
-class SettingsExperienceState(initialDestination: String = SettingsDestination.HOME.name) {
-    var destination: String by mutableStateOf(initialDestination)
-    var themeBackReturnsHome: Boolean by mutableStateOf(true)
-    val isHome: Boolean get() = destination == SettingsDestination.HOME.name
-
-    fun showHome() {
-        destination = SettingsDestination.HOME.name
-    }
-
-    fun showTheme(returnToHome: Boolean = true) {
-        themeBackReturnsHome = returnToHome
-        destination = SettingsDestination.THEME.name
-    }
-
-    companion object {
-        val Saver: Saver<SettingsExperienceState, String> = Saver(
-            save = { "${it.destination}|${it.themeBackReturnsHome}" },
-            restore = { saved ->
-                val parts = saved.split('|', limit = 2)
-                SettingsExperienceState(parts.first()).apply {
-                    themeBackReturnsHome = parts.getOrNull(1)?.toBooleanStrictOrNull() ?: true
-                }
-            },
-        )
-    }
-}
-
@Composable
 fun SettingsRoute(
-    experienceState: SettingsExperienceState = SettingsExperienceState(),
-    onExit: () -> Unit = {},
    viewModel: SettingsViewModel = hiltViewModel(),
 ) {
    val state = viewModel.uiState.collectAsStateWithLifecycle().value
-    SettingsExperience(state, experienceState, viewModel::onAction, onExit)
-}
-
-@Composable
-fun SettingsExperience(
-    state: SettingsUiState,
-    experienceState: SettingsExperienceState,
-    onAction: (SettingsUiAction) -> Unit,
-    onExit: () -> Unit,
-) {
-    val destination = runCatching { SettingsDestination.valueOf(experienceState.destination) }
-        .getOrDefault(SettingsDestination.HOME)
-    Box(Modifier.fillMaxSize()) {
-        ABoxSurface(modifier = Modifier.fillMaxSize()) {
-            SettingsHomeScreen(
-                state = state,
-                onOpenTheme = { experienceState.showTheme(returnToHome = true) },
-                onBack = onExit,
-                onAction = onAction,
-            )
-        }
-        if (destination == SettingsDestination.THEME) {
-            val leaveTheme = {
-                if (experienceState.themeBackReturnsHome) experienceState.showHome() else onExit()
-            }
-            ABoxBackLayer(onBack = leaveTheme) {
-                ABoxSurface(modifier = Modifier.fillMaxSize()) {
-                    ThemeSettingsScreen(
-                        state = state,
-                        onBack = leaveTheme,
-                        onAction = onAction,
-                    )
-                }
-            }
-        }
-    }
+    SettingsScreen(state = state, onAction = viewModel::onAction)
 }

+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun SettingsScreen(
    state: SettingsUiState,
    onAction: (SettingsUiAction) -> Unit,
    modifier: Modifier = Modifier,
-) = SettingsHomeScreen(state, onOpenTheme = {}, onBack = {}, onAction = onAction, modifier = modifier)
-
-@Composable
-private fun SettingsHomeScreen(
-    state: SettingsUiState,
-    onOpenTheme: () -> Unit,
-    onBack: () -> Unit,
-    onAction: (SettingsUiAction) -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    var styleMenuExpanded by remember { mutableStateOf(false) }
-    SettingsPage(modifier = modifier, title = stringResource(R.string.settings_title), onBack = onBack) {
-        SettingsGroup {
-            Box(Modifier.fillMaxWidth()) {
-                SettingsLinkRow(
-                    icon = ABoxIconKey.SETTINGS,
-                    title = stringResource(R.string.settings_style_entry),
-                    description = stringResource(R.string.settings_renderer_description),
-                    value = rendererLabel(state.preferences.renderer),
-                    modifier = Modifier.testTag("settings-style-entry"),
-                ) { styleMenuExpanded = true }
-                Box(modifier = Modifier.align(Alignment.TopEnd)) {
-                    DropdownMenu(
-                        expanded = styleMenuExpanded,
-                        onDismissRequest = { styleMenuExpanded = false },
-                        modifier = Modifier.testTag("settings-style-menu"),
-                    ) {
-                        DesignRenderer.entries.forEach { renderer ->
-                            DropdownMenuItem(
-                                text = { Text(rendererLabel(renderer)) },
-                                trailingIcon = {
-                                    if (renderer == state.preferences.renderer) Icon(Icons.Outlined.Check, null)
-                                },
-                                onClick = {
-                                    styleMenuExpanded = false
-                                    onAction(SettingsUiAction.SetRenderer(renderer))
-                                },
-                            )
-                        }
-                    }
-                }
-            }
-            GroupDivider()
-            SettingsLinkRow(
-                icon = ABoxIconKey.THEME,
-                title = stringResource(R.string.settings_theme_entry),
-                description = stringResource(R.string.settings_theme_entry_description),
-                value = null,
-                modifier = Modifier.testTag("settings-theme-entry"),
-                onClick = onOpenTheme,
-            )
-        }
-
-        SettingsGroup {
-            SettingsSwitchRow(
-                icon = ABoxIconKey.FEEDBACK,
-                title = stringResource(R.string.settings_haptics),
-                description = stringResource(R.string.settings_haptics_description),
-                checked = state.preferences.hapticsEnabled,
-                tag = "settings-haptics",
-            ) { onAction(SettingsUiAction.SetHaptics(it)) }
-        }
-
-        SettingsGroup {
-            SettingsInfoRow(
-                icon = ABoxIconKey.SETTINGS,
-                title = stringResource(R.string.settings_accessibility_card_title),
-                description = stringResource(R.string.settings_accessibility_description),
-            )
-        }
-        SettingsError(state)
-    }
-}
-
-@Composable
-private fun ThemeSettingsScreen(
-    state: SettingsUiState,
-    onBack: () -> Unit,
-    onAction: (SettingsUiAction) -> Unit,
-) {
-    SettingsPage(
-        title = stringResource(R.string.settings_theme_detail_title),
-        onBack = onBack,
-        modifier = Modifier.testTag("settings-theme-detail"),
-    ) {
-        ThemePreview(state)
-        when (state.preferences.renderer) {
-            DesignRenderer.MATERIAL3 -> MaterialThemeOptions(state, onAction)
-            DesignRenderer.MIUIX -> MiuixThemeOptions(state, onAction)
-        }
-        SettingsError(state)
-    }
-}
-
-@Composable
-private fun ColumnScope.MaterialThemeOptions(state: SettingsUiState, onAction: (SettingsUiAction) -> Unit) {
-    val manualColorsEnabled = !state.preferences.dynamicColorEnabled || Build.VERSION.SDK_INT < Build.VERSION_CODES.S
-    SettingsGroup(modifier = Modifier.testTag("settings-material-colors")) {
-        SettingsSwitchRow(
-            icon = ABoxIconKey.THEME,
-            title = stringResource(R.string.settings_dynamic_color),
-            description = stringResource(R.string.settings_dynamic_color_description),
-            checked = state.preferences.dynamicColorEnabled,
-            tag = "settings-dynamic-color",
-        ) { onAction(SettingsUiAction.SetDynamicColor(it)) }
-        GroupDivider()
-        AccentSelector(state, onAction)
-    }
-    ThemeModeSelector(state, onAction, Modifier.testTag("settings-theme-mode"))
-    EnumSettingRow(
-        modifier = Modifier.testTag("settings-color-style"),
-        icon = ABoxIconKey.THEME,
-        title = stringResource(R.string.settings_color_style),
-        value = colorStyleLabel(state.preferences.colorStyle),
-        values = ColorStyle.entries,
-        label = { colorStyleLabel(it) },
-        onSelected = { onAction(SettingsUiAction.SetColorStyle(it)) },
-        enabled = manualColorsEnabled,
-    )
-    EnumSettingRow(
-        modifier = Modifier.testTag("settings-color-standard"),
-        icon = ABoxIconKey.SETTINGS,
-        title = stringResource(R.string.settings_color_standard),
-        value = colorStandardLabel(state.preferences.colorStandard),
-        values = ColorStandard.entries,
-        label = { colorStandardLabel(it) },
-        onSelected = { onAction(SettingsUiAction.SetColorStandard(it)) },
-        enabled = manualColorsEnabled,
-    )
-    SettingsGroup(modifier = Modifier.testTag("settings-interface-scale")) { ScaleSelector(state, onAction) }
-}
-
-@Composable
-private fun ColumnScope.MiuixThemeOptions(state: SettingsUiState, onAction: (SettingsUiAction) -> Unit) {
-    val renderEffectsSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
-    val floatingEnabled = state.preferences.navigationPresentation == NavigationPresentation.FLOATING
-    ThemeModeSelector(state, onAction, Modifier.testTag("settings-theme-mode"))
-    SettingsGroup(modifier = Modifier.testTag("settings-miuix-accent")) {
-        SettingsSwitchRow(
-            icon = ABoxIconKey.THEME,
-            title = stringResource(R.string.settings_dynamic_color),
-            description = stringResource(R.string.settings_dynamic_color_description),
-            checked = state.preferences.dynamicColorEnabled,
-            tag = "settings-dynamic-color",
-        ) { onAction(SettingsUiAction.SetDynamicColor(it)) }
-        GroupDivider()
-        AccentSelector(state, onAction)
-    }
-    SettingsGroup(modifier = Modifier.testTag("settings-blur")) {
-        SettingsSwitchRow(
-            icon = ABoxIconKey.EFFECTS,
-            title = stringResource(R.string.settings_blur),
-            description = stringResource(R.string.settings_blur_description),
-            checked = state.preferences.blurEnabled,
-            tag = "settings-blur-switch",
-            enabled = renderEffectsSupported,
-            unavailableDescription = if (renderEffectsSupported) null else stringResource(R.string.settings_requires_android_13),
-        ) { onAction(SettingsUiAction.SetBlur(it)) }
-    }
-    SettingsGroup(modifier = Modifier.testTag("settings-floating-navigation")) {
-        SettingsSwitchRow(
-            icon = ABoxIconKey.EFFECTS,
-            title = stringResource(R.string.settings_navigation_floating),
-            description = stringResource(R.string.settings_navigation_floating_description),
-            checked = state.preferences.navigationPresentation == NavigationPresentation.FLOATING,
-            tag = "settings-floating-navigation-switch",
-        ) { onAction(SettingsUiAction.SetNavigation(if (it) NavigationPresentation.FLOATING else NavigationPresentation.STANDARD)) }
-    }
-    SettingsGroup(modifier = Modifier.testTag("settings-liquid-glass")) {
-        SettingsSwitchRow(
-            icon = ABoxIconKey.EFFECTS,
-            title = stringResource(R.string.settings_liquid_glass),
-            description = stringResource(R.string.settings_liquid_glass_description),
-            checked = state.preferences.liquidGlassEnabled,
-            tag = "settings-liquid-glass-switch",
-            enabled = renderEffectsSupported && floatingEnabled,
-            unavailableDescription = when {
-                !floatingEnabled -> stringResource(R.string.settings_requires_floating_navigation)
-                !renderEffectsSupported -> stringResource(R.string.settings_requires_android_13)
-                else -> null
-            },
-        ) { onAction(SettingsUiAction.SetLiquidGlass(it)) }
-    }
-    SettingsGroup(modifier = Modifier.testTag("settings-interface-scale")) { ScaleSelector(state, onAction) }
-}
-
-@Composable
-private fun SettingsPage(
-    title: String,
-    onBack: () -> Unit,
-    modifier: Modifier = Modifier,
-    content: @Composable ColumnScope.() -> Unit,
-) {
-    Column(modifier = modifier.fillMaxSize().statusBarsPadding()) {
-        Row(
-            modifier = Modifier.fillMaxWidth().height(72.dp).padding(horizontal = 12.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            IconButton(onClick = onBack) { Icon(Icons.AutoMirrored.Outlined.ArrowBack, stringResource(R.string.action_back)) }
-            Text(title, style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold)
-        }
+    Scaffold(
+        modifier = modifier.fillMaxSize(),
+        topBar = { TopAppBar(title = { Text(stringResource(R.string.settings_title)) }) },
+    ) { contentPadding ->
        Column(
-            modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(horizontal = 16.dp, vertical = 12.dp),
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(contentPadding)
+                .verticalScroll(rememberScrollState())
+                .padding(horizontal = 16.dp, vertical = 12.dp),
            verticalArrangement = Arrangement.spacedBy(16.dp),
-            content = content,
-        )
+        ) {
+            ABoxPreferenceGroup(title = stringResource(R.string.settings_style_section)) {
+                PreferenceRow(
+                    title = stringResource(R.string.settings_renderer_label),
+                    description = stringResource(R.string.settings_renderer_description),
+                ) {
+                    Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        ABoxFilterChip(
+                            selected = state.preferences.renderer == DesignRenderer.MATERIAL3,
+                            label = stringResource(R.string.settings_renderer_material3),
+                            onClick = { onAction(SettingsUiAction.SetRenderer(DesignRenderer.MATERIAL3)) },
+                        )
+                        ABoxFilterChip(
+                            selected = state.preferences.renderer == DesignRenderer.MIUIX,
+                            label = stringResource(R.string.settings_renderer_miuix),
+                            onClick = { onAction(SettingsUiAction.SetRenderer(DesignRenderer.MIUIX)) },
+                        )
+                    }
+                }
+            }
+
+            ABoxPreferenceGroup(title = stringResource(R.string.settings_theme_section)) {
+                PreferenceRow(
+                    title = stringResource(R.string.settings_theme_label),
+                    description = null,
+                ) {
+                    Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        ThemeChip(AppThemeMode.SYSTEM, state, onAction, R.string.settings_theme_system)
+                        ThemeChip(AppThemeMode.LIGHT, state, onAction, R.string.settings_theme_light)
+                        ThemeChip(AppThemeMode.DARK, state, onAction, R.string.settings_theme_dark)
+                    }
+                }
+                SwitchPreference(
+                    title = stringResource(R.string.settings_dynamic_color),
+                    description = stringResource(R.string.settings_dynamic_color_description),
+                    checked = state.preferences.dynamicColorEnabled,
+                    modifier = Modifier.testTag("settings-dynamic-color"),
+                    onCheckedChange = { onAction(SettingsUiAction.SetDynamicColor(it)) },
+                )
+            }
+
+            ABoxPreferenceGroup(title = stringResource(R.string.settings_surface_section)) {
+                SwitchPreference(
+                    title = stringResource(R.string.settings_blur),
+                    description = stringResource(R.string.settings_blur_description),
+                    checked = state.preferences.blurEnabled,
+                    modifier = Modifier.testTag("settings-blur"),
+                    onCheckedChange = { onAction(SettingsUiAction.SetBlur(it)) },
+                )
+                PreferenceRow(
+                    title = stringResource(R.string.settings_navigation),
+                    description = null,
+                ) {
+                    Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        NavigationChip(
+                            presentation = NavigationPresentation.STANDARD,
+                            selected = state.preferences.navigationPresentation == NavigationPresentation.STANDARD,
+                            label = stringResource(R.string.settings_navigation_standard),
+                            onAction = onAction,
+                        )
+                        NavigationChip(
+                            presentation = NavigationPresentation.FLOATING,
+                            selected = state.preferences.navigationPresentation == NavigationPresentation.FLOATING,
+                            label = stringResource(R.string.settings_navigation_floating),
+                            onAction = onAction,
+                        )
+                    }
+                }
+            }
+
+            ABoxPreferenceGroup(title = stringResource(R.string.settings_feedback_section)) {
+                SwitchPreference(
+                    title = stringResource(R.string.settings_haptics),
+                    description = stringResource(R.string.settings_haptics_description),
+                    checked = state.preferences.hapticsEnabled,
+                    modifier = Modifier.testTag("settings-haptics"),
+                    onCheckedChange = { onAction(SettingsUiAction.SetHaptics(it)) },
+                )
+            }
+
+            ABoxPreferenceGroup(title = stringResource(R.string.settings_accessibility_section)) {
+                ABoxCard(
+                    title = stringResource(R.string.settings_accessibility_card_title),
+                    subtitle = stringResource(R.string.settings_accessibility_description),
+                )
+            }
+
+            state.error?.let { error ->
+                ABoxErrorState(
+                    title = stringResource(R.string.settings_error_save),
+                    description = error.asString(),
+                )
+            }
+        }
    }
 }

@Composable
-private fun SettingsGroup(
-    modifier: Modifier = Modifier,
-    content: @Composable ColumnScope.() -> Unit,
+private fun ThemeChip(
+    mode: AppThemeMode,
+    state: SettingsUiState,
+    onAction: (SettingsUiAction) -> Unit,
+    labelRes: Int,
 ) {
-    Surface(
-        modifier = modifier.fillMaxWidth(),
-        shape = RoundedCornerShape(LocalABoxShapes.current.largeCornerRadius),
-        color = MaterialTheme.colorScheme.surfaceContainer,
-        content = { Column(content = content) },
+    ABoxFilterChip(
+        selected = state.preferences.themeMode == mode,
+        label = stringResource(labelRes),
+        onClick = { onAction(SettingsUiAction.SetThemeMode(mode)) },
    )
 }

@Composable
-private fun ThemePreview(state: SettingsUiState) {
-    Surface(
-        modifier = Modifier.fillMaxWidth().height(190.dp),
-        shape = RoundedCornerShape(LocalABoxShapes.current.largeCornerRadius),
-        color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.55f),
-    ) {
-        Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            Surface(
-                modifier = Modifier.width(184.dp).height(142.dp),
-                shape = RoundedCornerShape(24.dp),
-                color = MaterialTheme.colorScheme.surface,
-                tonalElevation = 3.dp,
-            ) {
-                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                    Row(verticalAlignment = Alignment.CenterVertically) {
-                        Box(Modifier.size(22.dp).background(MaterialTheme.colorScheme.primary, CircleShape))
-                        Spacer(Modifier.width(8.dp))
-                        Box(Modifier.height(10.dp).weight(1f).background(MaterialTheme.colorScheme.surfaceVariant, CircleShape))
-                    }
-                    Box(Modifier.fillMaxWidth().height(58.dp).background(MaterialTheme.colorScheme.primaryContainer, RoundedCornerShape(14.dp)))
-                    Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                        repeat(3) { Box(Modifier.weight(1f).height(18.dp).background(if (it == 0) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.surfaceVariant, CircleShape)) }
-                    }
-                }
-            }
-            Text(
-                text = "${rendererLabel(state.preferences.renderer)} · ${state.preferences.interfaceScale.percent}%",
-                modifier = Modifier.align(Alignment.BottomCenter).padding(bottom = 8.dp),
-                style = MaterialTheme.typography.labelMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-            )
-        }
-    }
-}
-
-@Composable
-private fun RendererSelector(state: SettingsUiState, onAction: (SettingsUiAction) -> Unit) {
-    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(10.dp)) {
-        RendererOption(DesignRenderer.MATERIAL3, state.preferences.renderer, Modifier.weight(1f).testTag("settings-renderer-primary"), onAction)
-        RendererOption(DesignRenderer.MIUIX, state.preferences.renderer, Modifier.weight(1f).testTag("settings-renderer-secondary"), onAction)
-    }
-}
-
-@Composable
-private fun RendererOption(value: DesignRenderer, selected: DesignRenderer, modifier: Modifier, onAction: (SettingsUiAction) -> Unit) {
-    val active = value == selected
-    Surface(
-        modifier = modifier.clickable { onAction(SettingsUiAction.SetRenderer(value)) },
-        shape = RoundedCornerShape(18.dp),
-        color = if (active) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant,
-        border = if (active) androidx.compose.foundation.BorderStroke(2.dp, MaterialTheme.colorScheme.primary) else null,
-    ) {
-        Row(Modifier.padding(horizontal = 16.dp, vertical = 14.dp), verticalAlignment = Alignment.CenterVertically) {
-            Text(rendererLabel(value), modifier = Modifier.weight(1f), fontWeight = FontWeight.SemiBold)
-            if (active) Icon(Icons.Outlined.Check, null, tint = MaterialTheme.colorScheme.primary)
-        }
-    }
-}
-
-@Composable
-private fun ThemeModeSelector(
-    state: SettingsUiState,
+private fun NavigationChip(
+    presentation: NavigationPresentation,
+    selected: Boolean,
+    label: String,
    onAction: (SettingsUiAction) -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    Row(modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(4.dp)) {
-        AppThemeMode.entries.forEach { mode ->
-            val selected = state.preferences.themeMode == mode
-            Surface(
-                modifier = Modifier.weight(1f).clickable { onAction(SettingsUiAction.SetThemeMode(mode)) },
-                shape = RoundedCornerShape(14.dp),
-                color = if (selected) MaterialTheme.colorScheme.primaryContainer else Color.Transparent,
-            ) {
-                Text(themeLabel(mode), Modifier.padding(vertical = 14.dp), textAlign = TextAlign.Center, fontWeight = if (selected) FontWeight.Bold else FontWeight.Normal)
-            }
-        }
-    }
+    ABoxFilterChip(
+        selected = selected,
+        label = label,
+        onClick = { onAction(SettingsUiAction.SetNavigation(presentation)) },
+    )
 }

@Composable
-private fun <T> EnumSettingRow(
-    modifier: Modifier,
-    icon: ABoxIconKey,
+private fun PreferenceRow(
    title: String,
-    value: String,
-    values: List<T>,
-    label: @Composable (T) -> String,
-    onSelected: (T) -> Unit,
-    enabled: Boolean = true,
+    description: String?,
+    content: @Composable () -> Unit,
 ) {
-    var expanded by remember { mutableStateOf(false) }
-    SettingsGroup(modifier = modifier) {
-        Box(Modifier.fillMaxWidth().alpha(if (enabled) 1f else 0.42f)) {
-            SettingsLinkRow(
-                icon = icon,
-                title = title,
-                description = stringResource(R.string.settings_tap_to_choose),
-                value = value,
-                enabled = enabled,
-                onClick = { expanded = true },
-            )
-            DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
-                values.forEach { option ->
-                    val optionLabel = label(option)
-                    DropdownMenuItem(
-                        text = { Text(optionLabel) },
-                        trailingIcon = { if (optionLabel == value) Icon(Icons.Outlined.Check, null) },
-                        onClick = {
-                            expanded = false
-                            onSelected(option)
-                        },
-                    )
-                }
-            }
+    Column(
+        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        Text(text = title, style = MaterialTheme.typography.titleMedium)
+        description?.let {
+            Text(text = it, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
        }
+        content()
    }
 }

@Composable
-private fun AccentSelector(state: SettingsUiState, onAction: (SettingsUiAction) -> Unit) {
-    val dark = when (state.preferences.themeMode) {
-        AppThemeMode.DARK -> true
-        AppThemeMode.LIGHT -> false
-        AppThemeMode.SYSTEM -> androidx.compose.foundation.isSystemInDarkTheme()
-    }
-    val manualColorsEnabled = !state.preferences.dynamicColorEnabled || Build.VERSION.SDK_INT < Build.VERSION_CODES.S
-    Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
-        Text(stringResource(R.string.settings_accent_label), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold)
-        Row(
-            modifier = Modifier.fillMaxWidth().alpha(if (manualColorsEnabled) 1f else 0.42f),
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            AccentPreference.entries.forEach { accent ->
-                val color = ABoxAccentPalette.preview(
-                    accent = accent,
-                    style = state.preferences.colorStyle,
-                    standard = state.preferences.colorStandard,
-                    dark = dark,
-                )
-                Box(
-                    modifier = Modifier.size(44.dp).background(color, CircleShape)
-                        .then(if (state.preferences.accentPreference == accent) Modifier.border(3.dp, MaterialTheme.colorScheme.onSurface, CircleShape) else Modifier)
-                        .clickable(enabled = manualColorsEnabled) { onAction(SettingsUiAction.SetAccent(accent)) },
-                    contentAlignment = Alignment.Center,
-                ) {
-                    if (state.preferences.accentPreference == accent) Icon(Icons.Outlined.Check, null, tint = Color.White)
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun ScaleSelector(state: SettingsUiState, onAction: (SettingsUiAction) -> Unit) {
-    Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
-        SettingsRowHeader(ABoxIconKey.SCALE, stringResource(R.string.settings_scale), stringResource(R.string.settings_scale_description))
-        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-            InterfaceScale.entries.forEach { scale ->
-                val selected = state.preferences.interfaceScale == scale
-                Surface(
-                    modifier = Modifier.weight(1f).clickable { onAction(SettingsUiAction.SetInterfaceScale(scale)) },
-                    shape = RoundedCornerShape(14.dp),
-                    color = if (selected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.surface,
-                    contentColor = if (selected) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.onSurface,
-                ) { Text("${scale.percent}%", Modifier.padding(vertical = 12.dp), textAlign = TextAlign.Center, fontWeight = FontWeight.Bold) }
-            }
-        }
-    }
-}
-
-@Composable
-private fun SettingsLinkRow(icon: ABoxIconKey, title: String, description: String, value: String?, modifier: Modifier = Modifier, enabled: Boolean = true, onClick: () -> Unit) {
-    Row(modifier.fillMaxWidth().clickable(enabled = enabled, onClick = onClick).padding(14.dp), verticalAlignment = Alignment.CenterVertically) {
-        SettingsRowHeader(icon, title, description, Modifier.weight(1f))
-        if (value != null) Text(value, color = MaterialTheme.colorScheme.onSurfaceVariant)
-        Icon(Icons.Outlined.ChevronRight, null, tint = MaterialTheme.colorScheme.onSurfaceVariant)
-    }
-}
-
-@Composable
-private fun SettingsSwitchRow(
-    icon: ABoxIconKey,
+private fun SwitchPreference(
    title: String,
    description: String,
    checked: Boolean,
-    tag: String,
-    enabled: Boolean = true,
-    unavailableDescription: String? = null,
-    onChange: (Boolean) -> Unit,
+    modifier: Modifier,
+    onCheckedChange: (Boolean) -> Unit,
 ) {
    Row(
-        Modifier.fillMaxWidth().clickable(enabled = enabled) { onChange(!checked) }.padding(14.dp).alpha(if (enabled) 1f else 0.5f),
+        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
    ) {
-        SettingsRowHeader(icon, title, unavailableDescription ?: description, Modifier.weight(1f))
-        Switch(checked, onCheckedChange = onChange, enabled = enabled, modifier = Modifier.testTag(tag))
-    }
-}
-
-@Composable
-private fun SettingsInfoRow(icon: ABoxIconKey, title: String, description: String) {
-    SettingsRowHeader(icon, title, description, Modifier.padding(16.dp))
-}
-
-@Composable
-private fun SettingsRowHeader(icon: ABoxIconKey, title: String, description: String, modifier: Modifier = Modifier) {
-    Row(modifier, verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp)) {
-        ABoxIcon(icon, title, Modifier.size(28.dp))
-        Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) {
-            Text(title, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold)
-            Text(description, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
+        Column(modifier = Modifier.weight(1f)) {
+            Text(text = title, style = MaterialTheme.typography.titleMedium)
+            Text(text = description, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
        }
+        ABoxSwitch(
+            checked = checked,
+            onCheckedChange = onCheckedChange,
+            contentDescription = title,
+            modifier = modifier,
+        )
    }
 }
-
-@Composable private fun GroupDivider() = Box(Modifier.fillMaxWidth().padding(start = 58.dp).height(1.dp).background(MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.55f)))
-
-@Composable private fun SettingsError(state: SettingsUiState) { state.error?.let { ABoxErrorState(stringResource(R.string.settings_error_save), it.asString()) } }
-
-@Composable private fun rendererLabel(renderer: DesignRenderer) = stringResource(if (renderer == DesignRenderer.MATERIAL3) R.string.settings_renderer_primary else R.string.settings_renderer_secondary)
-@Composable private fun themeLabel(mode: AppThemeMode) = stringResource(when (mode) { AppThemeMode.SYSTEM -> R.string.settings_theme_system; AppThemeMode.LIGHT -> R.string.settings_theme_light; AppThemeMode.DARK -> R.string.settings_theme_dark })
-@Composable private fun colorStyleLabel(value: ColorStyle) = stringResource(when (value) { ColorStyle.TONAL_SPOT -> R.string.settings_color_style_tonal; ColorStyle.EXPRESSIVE -> R.string.settings_color_style_expressive; ColorStyle.FIDELITY -> R.string.settings_color_style_fidelity })
-@Composable private fun colorStandardLabel(value: ColorStandard) = stringResource(when (value) { ColorStandard.SPEC_2021 -> R.string.settings_color_standard_2021; ColorStandard.SPEC_2025 -> R.string.settings_color_standard_2025 })
@@ -4,11 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.flagship.abox.manager.R
 import com.flagship.abox.manager.preferences.AppThemeMode
-import com.flagship.abox.manager.preferences.AccentPreference
 import com.flagship.abox.manager.preferences.DesignRenderer
-import com.flagship.abox.manager.preferences.InterfaceScale
-import com.flagship.abox.manager.preferences.ColorStandard
-import com.flagship.abox.manager.preferences.ColorStyle
 import com.flagship.abox.manager.preferences.NavigationPresentation
 import com.flagship.abox.manager.preferences.PreferenceField
 import com.flagship.abox.manager.preferences.UiPreferences
@@ -66,30 +62,6 @@ class SettingsViewModel @Inject constructor(
                field = PreferenceField.HAPTICS,
                transform = { it.copy(hapticsEnabled = action.value) },
            )
-            is SettingsUiAction.SetInterfaceScale -> update(
-                field = PreferenceField.INTERFACE_SCALE,
-                transform = { it.copy(interfaceScale = action.value) },
-            )
-            is SettingsUiAction.SetAccent -> update(
-                field = PreferenceField.ACCENT,
-                transform = { it.copy(accentPreference = action.value) },
-            )
-            is SettingsUiAction.SetColorStyle -> update(
-                field = PreferenceField.COLOR_STYLE,
-                transform = { it.copy(colorStyle = action.value) },
-            )
-            is SettingsUiAction.SetColorStandard -> update(
-                field = PreferenceField.COLOR_STANDARD,
-                transform = { it.copy(colorStandard = action.value) },
-            )
-            is SettingsUiAction.SetLiquidGlass -> update(
-                field = PreferenceField.LIQUID_GLASS,
-                transform = { it.copy(liquidGlassEnabled = action.value) },
-            )
-            is SettingsUiAction.SetPredictiveBack -> update(
-                field = PreferenceField.PREDICTIVE_BACK,
-                transform = { it.copy(predictiveBackEnabled = action.value) },
-            )
            SettingsUiAction.DismissError -> _uiState.value = _uiState.value.copy(error = null)
        }
    }
@@ -146,11 +118,5 @@ sealed interface SettingsUiAction {
    data class SetBlur(val value: Boolean) : SettingsUiAction
    data class SetNavigation(val value: NavigationPresentation) : SettingsUiAction
    data class SetHaptics(val value: Boolean) : SettingsUiAction
-    data class SetInterfaceScale(val value: InterfaceScale) : SettingsUiAction
-    data class SetAccent(val value: AccentPreference) : SettingsUiAction
-    data class SetColorStyle(val value: ColorStyle) : SettingsUiAction
-    data class SetColorStandard(val value: ColorStandard) : SettingsUiAction
-    data class SetLiquidGlass(val value: Boolean) : SettingsUiAction
-    data class SetPredictiveBack(val value: Boolean) : SettingsUiAction
    data object DismissError : SettingsUiAction
 }
@@ -1,94 +0,0 @@
-package com.flagship.abox.manager.ui.scene
-
-import com.flagship.abox.manager.domain.ActivityEventWriter
-import com.flagship.abox.manager.domain.ActivityEventKind
-import com.flagship.abox.manager.domain.ActivityOutcome
-import com.flagship.abox.manager.domain.ActivitySource
-import com.flagship.abox.manager.domain.ActivityTarget
-import com.flagship.abox.manager.domain.ActivityTargetType
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.Scene
-import com.flagship.abox.manager.domain.SceneAction
-import com.flagship.abox.manager.domain.SceneActionExecutionResult
-import com.flagship.abox.manager.domain.SceneActionOutcome
-import com.flagship.abox.manager.domain.SceneExecutionId
-import com.flagship.abox.manager.domain.SceneExecutionResult
-import com.flagship.abox.manager.domain.SceneExecutionSource
-import com.flagship.abox.manager.domain.SceneExecutionUpdate
-import com.flagship.abox.manager.domain.SceneExecutor
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.onEach
-
-class RecordingSceneExecutor(
-    private val delegate: SceneExecutor,
-    private val writer: ActivityEventWriter,
-) : SceneExecutor {
-    override suspend fun execute(scene: Scene): DomainResult<SceneExecutionResult> {
-        val result = delegate.execute(scene)
-        if (scene.enableLogging) {
-            when (result) {
-                is DomainResult.Success -> {
-                    result.value.results.forEach { recordStep(scene, it, ActivitySource.USER) }
-                    recordScene(scene, if (result.value.failedCount == 0) ActivityOutcome.SUCCEEDED else ActivityOutcome.FAILED, ActivitySource.USER)
-                }
-                is DomainResult.Failure -> recordScene(scene, ActivityOutcome.FAILED, ActivitySource.USER, result.error.externalCode)
-            }
-        }
-        return result
-    }
-
-    override fun execute(
-        scene: Scene,
-        executionId: SceneExecutionId,
-        source: SceneExecutionSource,
-    ): Flow<SceneExecutionUpdate> {
-        val activitySource = if (source == SceneExecutionSource.AUTOMATION) ActivitySource.AUTOMATION else ActivitySource.USER
-        return delegate.execute(scene, executionId, source).onEach { update ->
-            if (!scene.enableLogging) return@onEach
-            when (update) {
-                is SceneExecutionUpdate.StepFinished -> recordStep(scene, update.result, activitySource)
-                is SceneExecutionUpdate.Completed -> recordScene(
-                    scene,
-                    if (update.result.failedCount == 0) ActivityOutcome.SUCCEEDED else ActivityOutcome.FAILED,
-                    activitySource,
-                )
-                is SceneExecutionUpdate.Rejected -> recordScene(scene, ActivityOutcome.FAILED, activitySource, update.error.externalCode)
-                else -> Unit
-            }
-        }
-    }
-
-    private fun recordScene(scene: Scene, outcome: ActivityOutcome, source: ActivitySource, errorCode: String? = null) {
-        writer.record(
-            scene.profileId,
-            ActivityEventKind.SCENE_EXECUTION,
-            source,
-            outcome,
-            ActivityTarget(ActivityTargetType.SCENE, scene.id.value, scene.name),
-            errorCode,
-        )
-    }
-
-    private fun recordStep(scene: Scene, result: SceneActionExecutionResult, source: ActivitySource) {
-        writer.record(
-            scene.profileId,
-            ActivityEventKind.SCENE_ACTION,
-            source,
-            when (result.outcome) {
-                SceneActionOutcome.SUCCESS -> ActivityOutcome.SUCCEEDED
-                SceneActionOutcome.FAILURE -> ActivityOutcome.FAILED
-                SceneActionOutcome.SKIPPED -> ActivityOutcome.CANCELLED
-            },
-            result.action.activityTarget(),
-            result.error?.externalCode,
-        )
-    }
-}
-
-private fun SceneAction.activityTarget(): ActivityTarget = when (this) {
-    is SceneAction.SocketPower -> ActivityTarget(ActivityTargetType.DEVICE, deviceName.value, deviceName.value)
-    is SceneAction.InfraredKey -> ActivityTarget(ActivityTargetType.INFRARED_KEY, key, deviceName.value)
-    is SceneAction.VirtualRemoteButton -> ActivityTarget(ActivityTargetType.REMOTE, remoteId, "$remoteDisplayName · $buttonDisplayName")
-    is SceneAction.Delay -> ActivityTarget(ActivityTargetType.SCENE_ACTION, id.value, "Delay ${durationSeconds}s")
-    is SceneAction.Notification -> ActivityTarget(ActivityTargetType.SCENE_ACTION, id.value, title)
-}
@@ -6,9 +6,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.FlowRowScope
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -84,11 +81,12 @@ import com.flagship.abox.manager.domain.SceneIcon
 import com.flagship.abox.manager.domain.SceneId
 import com.flagship.abox.manager.domain.SceneTrigger
 import com.flagship.abox.manager.domain.SocketPowerState
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.DeviceDescriptor
 import com.flagship.abox.manager.domain.infrared.RemoteKeyBinding
 import com.flagship.abox.manager.domain.infrared.VirtualRemote

+private const val DEFAULT_SOCKET_DEVICE_NAME = "Zigbee插座控制器"
+private const val DEFAULT_TH_DEVICE_NAME = "温湿度传感器"
+private const val DEFAULT_IR_DEVICE_NAME = "红外控制器"

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -218,6 +216,93 @@ private fun SceneEditorContent(
                    }
                }

+                item(key = "icon_color_card") {
+                    OutlinedCard(
+                        modifier = Modifier.fillMaxWidth(),
+                        shape = RoundedCornerShape(16.dp),
+                        colors = CardDefaults.outlinedCardColors(containerColor = MaterialTheme.colorScheme.surface),
+                        border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f)),
+                    ) {
+                        Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
+                            Text(
+                                stringResource(R.string.scene_section_other),
+                                style = MaterialTheme.typography.titleSmall,
+                                fontWeight = FontWeight.Bold,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            )
+                            Row(
+                                modifier = Modifier.fillMaxWidth(),
+                                horizontalArrangement = Arrangement.SpaceBetween,
+                            ) {
+                                listOf(
+                                    SceneIcon.HOME to "Home",
+                                    SceneIcon.NIGHT to "Night",
+                                    SceneIcon.AWAY to "Away",
+                                    SceneIcon.MOVIE to "Movie",
+                                    SceneIcon.CUSTOM to "Custom",
+                                ).forEach { (icon, name) ->
+                                    val isSelected = state.icon == icon
+                                    Surface(
+                                        shape = RoundedCornerShape(12.dp),
+                                        color = if (isSelected) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
+                                        modifier = Modifier
+                                            .size(52.dp)
+                                            .clickable { viewModel.updateIcon(icon) },
+                                        border = if (isSelected) BorderStroke(2.dp, MaterialTheme.colorScheme.primary) else null,
+                                    ) {
+                                        Box(contentAlignment = Alignment.Center) {
+                                            Icon(
+                                                imageVector = when (icon) {
+                                                    SceneIcon.HOME -> Icons.Outlined.CheckCircle
+                                                    SceneIcon.NIGHT -> Icons.Outlined.Schedule
+                                                    SceneIcon.AWAY -> Icons.Outlined.HourglassDisabled
+                                                    SceneIcon.MOVIE -> Icons.Outlined.PlayCircle
+                                                    else -> Icons.Outlined.Settings
+                                                },
+                                                contentDescription = name,
+                                                tint = if (isSelected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant,
+                                                modifier = Modifier.size(26.dp),
+                                            )
+                                        }
+                                    }
+                                }
+                            }
+                            Row(
+                                modifier = Modifier.fillMaxWidth(),
+                                horizontalArrangement = Arrangement.SpaceBetween,
+                            ) {
+                                listOf(
+                                    "#3F51B5", "#E91E63", "#26A69A", "#FF8A65", "#673AB7", "#4CAF50",
+                                ).forEach { hex ->
+                                    val isSelected = state.colorHex.equals(hex, ignoreCase = true)
+                                    val parsedColor = try {
+                                        Color(android.graphics.Color.parseColor(hex))
+                                    } catch (e: Exception) {
+                                        MaterialTheme.colorScheme.primary
+                                    }
+                                    Box(
+                                        modifier = Modifier
+                                            .size(36.dp)
+                                            .clip(CircleShape)
+                                            .background(parsedColor)
+                                            .clickable { viewModel.updateColor(hex) },
+                                        contentAlignment = Alignment.Center,
+                                    ) {
+                                        if (isSelected) {
+                                            Icon(
+                                                Icons.Filled.Check,
+                                                contentDescription = null,
+                                                tint = Color.White,
+                                                modifier = Modifier.size(20.dp),
+                                            )
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
                if (state.type == AutomationType.AUTOMATIC) {
                    item(key = "triggers_card") {
                        OutlinedCard(
@@ -420,7 +505,7 @@ private fun SceneEditorContent(

                            Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
                                Text(stringResource(R.string.scene_concurrency_mode), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium)
-                                SceneChoiceFlow {
+                                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                                    FilterChip(
                                        selected = state.concurrencyMode == ConcurrencyMode.SEQUENTIAL,
                                        onClick = { viewModel.updateConcurrencyMode(ConcurrencyMode.SEQUENTIAL) },
@@ -436,7 +521,7 @@ private fun SceneEditorContent(

                            Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
                                Text(stringResource(R.string.scene_error_policy), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium)
-                                SceneChoiceFlow {
+                                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                                    FilterChip(
                                        selected = state.strategy == ExecutionStrategy.CONTINUE_ON_ERROR,
                                        onClick = { viewModel.updateStrategy(ExecutionStrategy.CONTINUE_ON_ERROR) },
@@ -465,93 +550,6 @@ private fun SceneEditorContent(
                    }
                }

-                item(key = "icon_color_card") {
-                    OutlinedCard(
-                        modifier = Modifier.fillMaxWidth(),
-                        shape = RoundedCornerShape(16.dp),
-                        colors = CardDefaults.outlinedCardColors(containerColor = MaterialTheme.colorScheme.surface),
-                        border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f)),
-                    ) {
-                        Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                            Text(
-                                stringResource(R.string.scene_section_other),
-                                style = MaterialTheme.typography.titleSmall,
-                                fontWeight = FontWeight.Bold,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            )
-                            Row(
-                                modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.SpaceBetween,
-                            ) {
-                                listOf(
-                                    SceneIcon.HOME to "Home",
-                                    SceneIcon.NIGHT to "Night",
-                                    SceneIcon.AWAY to "Away",
-                                    SceneIcon.MOVIE to "Movie",
-                                    SceneIcon.CUSTOM to "Custom",
-                                ).forEach { (icon, name) ->
-                                    val isSelected = state.icon == icon
-                                    Surface(
-                                        shape = RoundedCornerShape(12.dp),
-                                        color = if (isSelected) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
-                                        modifier = Modifier
-                                            .size(52.dp)
-                                            .clickable { viewModel.updateIcon(icon) },
-                                        border = if (isSelected) BorderStroke(2.dp, MaterialTheme.colorScheme.primary) else null,
-                                    ) {
-                                        Box(contentAlignment = Alignment.Center) {
-                                            Icon(
-                                                imageVector = when (icon) {
-                                                    SceneIcon.HOME -> Icons.Outlined.CheckCircle
-                                                    SceneIcon.NIGHT -> Icons.Outlined.Schedule
-                                                    SceneIcon.AWAY -> Icons.Outlined.HourglassDisabled
-                                                    SceneIcon.MOVIE -> Icons.Outlined.PlayCircle
-                                                    else -> Icons.Outlined.Settings
-                                                },
-                                                contentDescription = name,
-                                                tint = if (isSelected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant,
-                                                modifier = Modifier.size(26.dp),
-                                            )
-                                        }
-                                    }
-                                }
-                            }
-                            Row(
-                                modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.SpaceBetween,
-                            ) {
-                                listOf(
-                                    "#3F51B5", "#E91E63", "#26A69A", "#FF8A65", "#673AB7", "#4CAF50",
-                                ).forEach { hex ->
-                                    val isSelected = state.colorHex.equals(hex, ignoreCase = true)
-                                    val parsedColor = try {
-                                        Color(android.graphics.Color.parseColor(hex))
-                                    } catch (e: Exception) {
-                                        MaterialTheme.colorScheme.primary
-                                    }
-                                    Box(
-                                        modifier = Modifier
-                                            .size(36.dp)
-                                            .clip(CircleShape)
-                                            .background(parsedColor)
-                                            .clickable { viewModel.updateColor(hex) },
-                                        contentAlignment = Alignment.Center,
-                                    ) {
-                                        if (isSelected) {
-                                            Icon(
-                                                Icons.Filled.Check,
-                                                contentDescription = null,
-                                                tint = Color.White,
-                                                modifier = Modifier.size(20.dp),
-                                            )
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
                item(key = "save_section") {
                    state.errorMessage?.let {
                        Text(it, color = MaterialTheme.colorScheme.error, style = MaterialTheme.typography.bodyMedium)
@@ -574,7 +572,6 @@ private fun SceneEditorContent(

    if (showTriggerDialog) {
        AddTriggerDialog(
-            availableDevices = state.availableDevices,
            onDismiss = { showTriggerDialog = false },
            onAdd = { triggerType, devName, time, temp, hum, op ->
                when (triggerType) {
@@ -589,7 +586,6 @@ private fun SceneEditorContent(

    if (showConditionDialog) {
        AddConditionDialog(
-            availableDevices = state.availableDevices,
            onDismiss = { showConditionDialog = false },
            onAddTemp = { devName, op, temp ->
                viewModel.addTemperatureCondition(devName, op, temp)
@@ -613,7 +609,6 @@ private fun SceneEditorContent(
    if (showActionDialog) {
        AddActionDialog(
            availableRemotes = state.availableRemotes,
-            availableDevices = state.availableDevices,
            onDismiss = { showActionDialog = false },
            viewModel = viewModel,
            onAddSocket = { name, power ->
@@ -750,7 +745,7 @@ private fun ActionItemRow(

@Composable
 private fun SceneTrigger.describe(): String = when (this) {
-    is SceneTrigger.Time -> "定时 $timeOfDay"
+    is SceneTrigger.Time -> "⏰ $timeOfDay"
    is SceneTrigger.Temperature -> stringResource(R.string.scene_trigger_desc_temp, operator.symbol, thresholdCelsius.toInt().toString())
    is SceneTrigger.Humidity -> stringResource(R.string.scene_trigger_desc_humidity, operator.symbol, thresholdPercent.toInt().toString())
    is SceneTrigger.DeviceState -> stringResource(R.string.scene_trigger_desc_device, deviceName.value, expectedState)
@@ -773,28 +768,13 @@ private fun SceneAction.describe(): String = when (this) {
    is SceneAction.Notification -> stringResource(R.string.scene_action_notification, title)
 }

-@OptIn(ExperimentalLayoutApi::class)
-@Composable
-internal fun SceneChoiceFlow(
-    modifier: Modifier = Modifier,
-    content: @Composable FlowRowScope.() -> Unit,
-) {
-    FlowRow(
-        modifier = modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-        verticalArrangement = Arrangement.spacedBy(4.dp),
-        content = content,
-    )
-}
-
@Composable
 private fun AddTriggerDialog(
-    availableDevices: List<DeviceDescriptor>,
    onDismiss: () -> Unit,
    onAdd: (type: Int, deviceName: String, time: String, temp: Double, hum: Double, op: ComparisonOperator) -> Unit,
 ) {
    var selectedType by remember { mutableIntStateOf(0) }
-    var deviceName by remember { mutableStateOf("") }
+    var deviceName by remember { mutableStateOf(DEFAULT_TH_DEVICE_NAME) }
    var timeInput by remember { mutableStateOf("07:30") }
    var tempThreshold by remember { mutableDoubleStateOf(28.0) }
    var humThreshold by remember { mutableDoubleStateOf(40.0) }
@@ -802,18 +782,14 @@ private fun AddTriggerDialog(

    val timeRegex = remember { Regex("^([01]\\d|2[0-3]):[0-5]\\d$") }
    val isTimeValid = timeRegex.matches(timeInput.trim())
-    val matchingDevices = availableDevices.filter {
-        it.type == if (selectedType == 1 || selectedType == 2) DeviceType.TEMPERATURE_HUMIDITY else DeviceType.SOCKET
-    }
-    val isDeviceValid = selectedType == 0 && isTimeValid || selectedType != 0 &&
-        matchingDevices.any { it.name.value == deviceName }
+    val isDeviceValid = selectedType == 0 || deviceName.isNotBlank()

    AlertDialog(
        onDismissRequest = onDismiss,
        title = { Text(stringResource(R.string.scene_dialog_add_trigger_title)) },
        text = {
            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                SceneChoiceFlow {
+                Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                    FilterChip(selected = selectedType == 0, onClick = { selectedType = 0 }, label = { Text(stringResource(R.string.scene_chip_time)) })
                    FilterChip(selected = selectedType == 1, onClick = { selectedType = 1 }, label = { Text(stringResource(R.string.scene_chip_temp)) })
                    FilterChip(selected = selectedType == 2, onClick = { selectedType = 2 }, label = { Text(stringResource(R.string.scene_chip_humidity)) })
@@ -833,17 +809,14 @@ private fun AddTriggerDialog(
                        )
                    }
                    1, 2 -> {
-                        Text(stringResource(R.string.scene_device_name_label))
-                        SceneChoiceFlow {
-                            matchingDevices.forEach { device ->
-                                FilterChip(
-                                    selected = deviceName == device.name.value,
-                                    onClick = { deviceName = device.name.value },
-                                    label = { Text(device.name.value) },
-                                )
-                            }
-                        }
-                        SceneChoiceFlow {
+                        OutlinedTextField(
+                            value = deviceName,
+                            onValueChange = { deviceName = it },
+                            label = { Text(stringResource(R.string.scene_device_name_label)) },
+                            singleLine = true,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                        Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                            FilterChip(selected = operator == ComparisonOperator.GREATER_THAN, onClick = { operator = ComparisonOperator.GREATER_THAN }, label = { Text(stringResource(R.string.scene_chip_above)) })
                            FilterChip(selected = operator == ComparisonOperator.LESS_THAN, onClick = { operator = ComparisonOperator.LESS_THAN }, label = { Text(stringResource(R.string.scene_chip_below)) })
                        }
@@ -875,7 +848,6 @@ private fun AddTriggerDialog(

@Composable
 private fun AddConditionDialog(
-    availableDevices: List<DeviceDescriptor>,
    onDismiss: () -> Unit,
    onAddTemp: (deviceName: String, ComparisonOperator, Double) -> Unit,
    onAddHumidity: (deviceName: String, ComparisonOperator, Double) -> Unit,
@@ -883,9 +855,9 @@ private fun AddConditionDialog(
    onAddTimeRange: (String, String) -> Unit,
 ) {
    var selectedType by remember { mutableIntStateOf(0) }
-    var tempDeviceName by remember { mutableStateOf("") }
-    var humDeviceName by remember { mutableStateOf("") }
-    var socketDeviceName by remember { mutableStateOf("") }
+    var tempDeviceName by remember { mutableStateOf(DEFAULT_TH_DEVICE_NAME) }
+    var humDeviceName by remember { mutableStateOf(DEFAULT_TH_DEVICE_NAME) }
+    var socketDeviceName by remember { mutableStateOf(DEFAULT_SOCKET_DEVICE_NAME) }
    var operator by remember { mutableStateOf(ComparisonOperator.GREATER_THAN) }
    var tempVal by remember { mutableDoubleStateOf(26.0) }
    var humVal by remember { mutableDoubleStateOf(50.0) }
@@ -898,13 +870,10 @@ private fun AddConditionDialog(
    val isEndTimeValid = timeRegex.matches(endTime.trim())
    val isTimeRangeValid = isStartTimeValid && isEndTimeValid

-    val sensors = availableDevices.filter { it.type == DeviceType.TEMPERATURE_HUMIDITY }
-    val sockets = availableDevices.filter { it.type == DeviceType.SOCKET }
-
    val isDeviceValid = when (selectedType) {
-        0 -> sensors.any { it.name.value == tempDeviceName }
-        1 -> sensors.any { it.name.value == humDeviceName }
-        2 -> sockets.any { it.name.value == socketDeviceName }
+        0 -> tempDeviceName.isNotBlank()
+        1 -> humDeviceName.isNotBlank()
+        2 -> socketDeviceName.isNotBlank()
        else -> true
    }

@@ -913,7 +882,7 @@ private fun AddConditionDialog(
        title = { Text(stringResource(R.string.scene_dialog_add_condition_title)) },
        text = {
            Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                SceneChoiceFlow {
+                Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                    FilterChip(selected = selectedType == 0, onClick = { selectedType = 0 }, label = { Text(stringResource(R.string.scene_chip_temp)) })
                    FilterChip(selected = selectedType == 1, onClick = { selectedType = 1 }, label = { Text(stringResource(R.string.scene_chip_humidity)) })
                    FilterChip(selected = selectedType == 2, onClick = { selectedType = 2 }, label = { Text(stringResource(R.string.scene_chip_socket)) })
@@ -921,13 +890,14 @@ private fun AddConditionDialog(
                }
                when (selectedType) {
                    0 -> {
-                        Text(stringResource(R.string.scene_device_name_label))
-                        SceneChoiceFlow {
-                            sensors.forEach { device ->
-                                FilterChip(selected = tempDeviceName == device.name.value, onClick = { tempDeviceName = device.name.value }, label = { Text(device.name.value) })
-                            }
-                        }
-                        SceneChoiceFlow {
+                        OutlinedTextField(
+                            value = tempDeviceName,
+                            onValueChange = { tempDeviceName = it },
+                            label = { Text(stringResource(R.string.scene_device_name_label)) },
+                            singleLine = true,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                        Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                            FilterChip(selected = operator == ComparisonOperator.GREATER_THAN, onClick = { operator = ComparisonOperator.GREATER_THAN }, label = { Text(stringResource(R.string.scene_chip_above)) })
                            FilterChip(selected = operator == ComparisonOperator.LESS_THAN, onClick = { operator = ComparisonOperator.LESS_THAN }, label = { Text(stringResource(R.string.scene_chip_below)) })
                        }
@@ -935,13 +905,14 @@ private fun AddConditionDialog(
                        Slider(value = tempVal.toFloat(), onValueChange = { tempVal = it.toDouble() }, valueRange = 10f..40f)
                    }
                    1 -> {
-                        Text(stringResource(R.string.scene_device_name_label))
-                        SceneChoiceFlow {
-                            sensors.forEach { device ->
-                                FilterChip(selected = humDeviceName == device.name.value, onClick = { humDeviceName = device.name.value }, label = { Text(device.name.value) })
-                            }
-                        }
-                        SceneChoiceFlow {
+                        OutlinedTextField(
+                            value = humDeviceName,
+                            onValueChange = { humDeviceName = it },
+                            label = { Text(stringResource(R.string.scene_device_name_label)) },
+                            singleLine = true,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                        Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                            FilterChip(selected = operator == ComparisonOperator.GREATER_THAN, onClick = { operator = ComparisonOperator.GREATER_THAN }, label = { Text(stringResource(R.string.scene_chip_above)) })
                            FilterChip(selected = operator == ComparisonOperator.LESS_THAN, onClick = { operator = ComparisonOperator.LESS_THAN }, label = { Text(stringResource(R.string.scene_chip_below)) })
                        }
@@ -949,14 +920,15 @@ private fun AddConditionDialog(
                        Slider(value = humVal.toFloat(), onValueChange = { humVal = it.toDouble() }, valueRange = 10f..90f)
                    }
                    2 -> {
-                        Text(stringResource(R.string.scene_device_name_label))
-                        SceneChoiceFlow {
-                            sockets.forEach { device ->
-                                FilterChip(selected = socketDeviceName == device.name.value, onClick = { socketDeviceName = device.name.value }, label = { Text(device.name.value) })
-                            }
-                        }
+                        OutlinedTextField(
+                            value = socketDeviceName,
+                            onValueChange = { socketDeviceName = it },
+                            label = { Text(stringResource(R.string.scene_device_name_label)) },
+                            singleLine = true,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
                        Text(stringResource(R.string.scene_target_socket_state))
-                        SceneChoiceFlow {
+                        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                            FilterChip(selected = socketPower == SocketPowerState.ON, onClick = { socketPower = SocketPowerState.ON }, label = { Text(stringResource(R.string.scene_chip_power_on)) })
                            FilterChip(selected = socketPower == SocketPowerState.OFF, onClick = { socketPower = SocketPowerState.OFF }, label = { Text(stringResource(R.string.scene_chip_power_off)) })
                        }
@@ -1013,7 +985,6 @@ private fun AddConditionDialog(
@Composable
 private fun AddActionDialog(
    availableRemotes: List<VirtualRemote>,
-    availableDevices: List<com.flagship.abox.manager.domain.DeviceDescriptor>,
    onDismiss: () -> Unit,
    viewModel: SceneEditorViewModel,
    onAddSocket: (deviceName: String, powerState: SocketPowerState) -> Unit,
@@ -1026,7 +997,7 @@ private fun AddActionDialog(
    val defaultNotifyTitle = stringResource(R.string.scene_default_notify_title)
    val defaultNotifyMsg = stringResource(R.string.scene_default_notify_msg)

-    var socketName by remember { mutableStateOf(availableDevices.firstOrNull { it.type == DeviceType.SOCKET }?.name?.value.orEmpty()) }
+    var socketName by remember { mutableStateOf(DEFAULT_SOCKET_DEVICE_NAME) }
    var socketPower by remember { mutableStateOf(SocketPowerState.ON) }

    var selectedRemoteIndex by remember { mutableIntStateOf(0) }
@@ -1061,7 +1032,7 @@ private fun AddActionDialog(
        title = { Text(stringResource(R.string.scene_dialog_add_action_title)) },
        text = {
            Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                SceneChoiceFlow {
+                Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                    FilterChip(selected = actionType == 0, onClick = { actionType = 0 }, label = { Text(stringResource(R.string.scene_chip_socket)) })
                    FilterChip(selected = actionType == 1, onClick = { actionType = 1 }, label = { Text(stringResource(R.string.scene_chip_remote)) })
                    FilterChip(selected = actionType == 2, onClick = { actionType = 2 }, label = { Text(stringResource(R.string.scene_chip_delay)) })
@@ -1069,18 +1040,15 @@ private fun AddActionDialog(
                }
                when (actionType) {
                    0 -> {
-                        Text(stringResource(R.string.scene_select_socket))
-                        SceneChoiceFlow {
-                            availableDevices.filter { it.type == DeviceType.SOCKET }.forEach { device ->
-                                FilterChip(
-                                    selected = socketName == device.name.value,
-                                    onClick = { socketName = device.name.value },
-                                    label = { Text(device.name.value) },
-                                )
-                            }
-                        }
+                        OutlinedTextField(
+                            value = socketName,
+                            onValueChange = { socketName = it },
+                            label = { Text(stringResource(R.string.scene_select_socket)) },
+                            singleLine = true,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
                        Text(stringResource(R.string.scene_socket_power_state))
-                        SceneChoiceFlow {
+                        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                            FilterChip(selected = socketPower == SocketPowerState.ON, onClick = { socketPower = SocketPowerState.ON }, label = { Text(stringResource(R.string.scene_chip_power_on)) })
                            FilterChip(selected = socketPower == SocketPowerState.OFF, onClick = { socketPower = SocketPowerState.OFF }, label = { Text(stringResource(R.string.scene_chip_power_off)) })
                        }
@@ -1088,9 +1056,10 @@ private fun AddActionDialog(
                    1 -> {
                        if (availableRemotes.isEmpty()) {
                            Text(stringResource(R.string.scene_no_virtual_remotes))
+                            OutlinedTextField(value = selectedButtonId, onValueChange = { selectedButtonId = it }, label = { Text(stringResource(R.string.scene_remote_button_slot_label)) }, singleLine = true)
                        } else {
                            Text(stringResource(R.string.scene_select_virtual_remote))
-                            SceneChoiceFlow {
+                            Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                                availableRemotes.forEachIndexed { idx, remote ->
                                    FilterChip(
                                        selected = selectedRemoteIndex == idx,
@@ -1101,7 +1070,7 @@ private fun AddActionDialog(
                            }
                            Text(stringResource(R.string.scene_select_remote_button))
                            if (keyBindings.isNotEmpty()) {
-                                SceneChoiceFlow {
+                                Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                                    keyBindings.take(4).forEach { binding ->
                                        val label = binding.displayName.ifBlank { binding.buttonId }
                                        FilterChip(
@@ -1137,8 +1106,8 @@ private fun AddActionDialog(
        },
        confirmButton = {
            val canConfirm = when (actionType) {
-                0 -> availableDevices.any { it.type == DeviceType.SOCKET && it.name.value == socketName }
-                1 -> availableRemotes.isNotEmpty() && selectedButtonId.isNotBlank()
+                0 -> socketName.isNotBlank()
+                1 -> selectedButtonId.isNotBlank()
                3 -> notifyTitle.isNotBlank()
                else -> true
            }
@@ -1150,6 +1119,8 @@ private fun AddActionDialog(
                            val remote = availableRemotes.getOrNull(selectedRemoteIndex)
                            if (remote != null) {
                                onAddRemote(remote.id.value, remote.displayName, selectedButtonId, selectedButtonName)
+                            } else {
+                                onAddRemote("default-ir", DEFAULT_IR_DEVICE_NAME, selectedButtonId, selectedButtonName)
                            }
                        }
                        2 -> onAddDelay(delaySeconds)
@@ -6,9 +6,6 @@ import com.flagship.abox.manager.domain.AutomationType
 import com.flagship.abox.manager.domain.ComparisonOperator
 import com.flagship.abox.manager.domain.ConcurrencyMode
 import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.DeviceCatalog
-import com.flagship.abox.manager.domain.DeviceDescriptor
-import com.flagship.abox.manager.domain.DeviceType
 import com.flagship.abox.manager.domain.DomainResult
 import com.flagship.abox.manager.domain.ExecutionStrategy
 import com.flagship.abox.manager.domain.ProviderProfileStore
@@ -28,7 +25,6 @@ import com.flagship.abox.manager.domain.infrared.RemoteKeyBinding
 import com.flagship.abox.manager.domain.infrared.VirtualRemote
 import com.flagship.abox.manager.domain.infrared.VirtualRemoteId
 import com.flagship.abox.manager.domain.infrared.VirtualRemoteRepository
-import com.flagship.abox.manager.automation.runtime.AutomationScheduler
 import dagger.hilt.android.lifecycle.HiltViewModel
 import java.util.UUID
 import javax.inject.Inject
@@ -54,7 +50,6 @@ data class SceneEditorState(
    val concurrencyMode: ConcurrencyMode = ConcurrencyMode.SEQUENTIAL,
    val enableLogging: Boolean = true,
    val availableRemotes: List<VirtualRemote> = emptyList(),
-    val availableDevices: List<DeviceDescriptor> = emptyList(),
    val isLoading: Boolean = false,
    val isSaving: Boolean = false,
    val isSaved: Boolean = false,
@@ -69,8 +64,6 @@ class SceneEditorViewModel @Inject constructor(
    private val sceneRepository: SceneRepository,
    private val virtualRemoteRepository: VirtualRemoteRepository,
    private val profileStore: ProviderProfileStore,
-    private val deviceCatalog: DeviceCatalog,
-    private val automationScheduler: AutomationScheduler? = null,
 ) : ViewModel() {

    private val _state = MutableStateFlow(SceneEditorState())
@@ -81,23 +74,6 @@ class SceneEditorViewModel @Inject constructor(

    init {
        observeAvailableRemotes()
-        observeAvailableDevices()
-    }
-
-    private fun observeAvailableDevices() {
-        viewModelScope.launch {
-            profileStore.observeActiveProfile().collectLatest { profile ->
-                if (profile == null) {
-                    _state.update { it.copy(availableDevices = emptyList()) }
-                } else {
-                    deviceCatalog.observeDevices(profile.id).collectLatest { result ->
-                        if (result is DomainResult.Success) {
-                            _state.update { it.copy(availableDevices = result.value) }
-                        }
-                    }
-                }
-            }
-        }
    }

    private fun observeAvailableRemotes() {
@@ -215,13 +191,11 @@ class SceneEditorViewModel @Inject constructor(
    }

    fun addDeviceStateTrigger(deviceName: String, expectedState: String) {
-        val parsedState = runCatching { SocketPowerState.valueOf(expectedState.trim().uppercase()) }.getOrNull()
-            ?: return
        val trigger = SceneTrigger.DeviceState(
            id = SceneTriggerId(UUID.randomUUID().toString()),
            deviceName = DeviceName(deviceName),
-            expectedState = parsedState,
-            label = "$deviceName 状态变为 ${parsedState.name}",
+            expectedState = expectedState,
+            label = "$deviceName 状态变为 $expectedState",
        )
        _state.update { it.copy(triggers = it.triggers + trigger) }
    }
@@ -397,10 +371,7 @@ class SceneEditorViewModel @Inject constructor(
            }
            _state.update { current ->
                when (result) {
-                    is DomainResult.Success -> {
-                        automationScheduler?.reconcile(profile.id)
-                        current.copy(isSaving = false, isSaved = true)
-                    }
+                    is DomainResult.Success -> current.copy(isSaving = false, isSaved = true)
                    is DomainResult.Failure -> current.copy(
                        isSaving = false,
                        errorMessage = result.error.detail ?: "Save failed",
@@ -8,9 +8,6 @@ import com.flagship.abox.manager.domain.Scene
 import com.flagship.abox.manager.domain.SceneExecutionResult
 import com.flagship.abox.manager.domain.SceneExecutor
 import com.flagship.abox.manager.domain.SceneId
-import com.flagship.abox.manager.domain.SceneExecutionId
-import com.flagship.abox.manager.domain.SceneExecutionSource
-import com.flagship.abox.manager.domain.SceneExecutionUpdate
 import com.flagship.abox.manager.domain.SceneRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -18,7 +15,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.flow.collect

 sealed interface SceneExecutionUiState {
    data object Loading : SceneExecutionUiState
@@ -75,19 +71,11 @@ class SceneExecutionViewModel @Inject constructor(
                _uiState.value = SceneExecutionUiState.Failed("Active profile mismatch")
                return@launch
            }
-            sceneExecutor.execute(
-                scene = scene,
-                executionId = SceneExecutionId("manual-${scene.id.value}"),
-                source = SceneExecutionSource.USER,
-            ).collect { update ->
-                when (update) {
-                    is SceneExecutionUpdate.Completed -> _uiState.value = SceneExecutionUiState.Completed(update.result)
-                    is SceneExecutionUpdate.Rejected -> _uiState.value = SceneExecutionUiState.Failed(
-                        update.error.detail ?: "Execution failed",
-                    )
-                    is SceneExecutionUpdate.Started -> _uiState.value = SceneExecutionUiState.Running(update.scene)
-                    else -> Unit
-                }
+            when (val result = sceneExecutor.execute(scene)) {
+                is DomainResult.Success -> _uiState.value = SceneExecutionUiState.Completed(result.value)
+                is DomainResult.Failure -> _uiState.value = SceneExecutionUiState.Failed(
+                    result.error.detail ?: "Execution failed",
+                )
            }
        }
    }
@@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
@@ -29,11 +28,10 @@ import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.material.icons.outlined.Schedule
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.ExtendedFloatingActionButton
-import androidx.compose.material3.FloatingActionButtonDefaults
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -51,7 +49,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.snapshotFlow
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -71,10 +68,7 @@ import com.flagship.abox.manager.domain.Scene
 import com.flagship.abox.manager.domain.SceneColor
 import com.flagship.abox.manager.domain.SceneIcon
 import com.flagship.abox.manager.domain.SceneId
-import com.flagship.abox.manager.designsystem.icon.ABoxIcon
-import com.flagship.abox.manager.designsystem.icon.ABoxIconKey
 import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.distinctUntilChanged

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -90,59 +84,50 @@ fun SceneListScreen(
    val selectedTab by viewModel.selectedTab.collectAsStateWithLifecycle()
    val pendingDelete by viewModel.pendingDelete.collectAsStateWithLifecycle()
    var showFabMenu by remember { mutableStateOf(false) }
-    var fabExpanded by remember { mutableStateOf(true) }
-    val listState = rememberLazyListState()
-
-    LaunchedEffect(listState) {
-        var previousIndex = 0
-        var previousOffset = 0
-        snapshotFlow { listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
-            .distinctUntilChanged()
-            .collect { (index, offset) ->
-                val movingUp = index > previousIndex || (index == previousIndex && offset > previousOffset)
-                val movingDown = index < previousIndex || (index == previousIndex && offset < previousOffset)
-                if (movingUp) fabExpanded = false
-                if (movingDown || (index == 0 && offset == 0)) fabExpanded = true
-                previousIndex = index
-                previousOffset = offset
-            }
-    }

    val context = LocalContext.current
    LaunchedEffect(Unit) {
        viewModel.userMessage.collectLatest { msg ->
-            val messageRes = if (msg == "executed") R.string.scene_toast_executed else R.string.scene_toast_failed
-            Toast.makeText(context, context.getString(messageRes), Toast.LENGTH_SHORT).show()
+            if (msg == "executed") {
+                Toast.makeText(context, context.getString(R.string.scene_toast_executed), Toast.LENGTH_SHORT).show()
+            }
        }
    }

    Scaffold(
        containerColor = Color.Transparent,
        floatingActionButton = {
-            ExtendedFloatingActionButton(
-                onClick = { showFabMenu = true },
-                expanded = fabExpanded,
-                icon = {
-                    Icon(
-                        Icons.Filled.Add,
-                        contentDescription = stringResource(R.string.scene_create_action),
+            Box {
+                ExtendedFloatingActionButton(
+                    onClick = { showFabMenu = true },
+                    icon = { Icon(Icons.Filled.Add, contentDescription = null) },
+                    text = { Text(stringResource(R.string.scene_create_action)) },
+                )
+                DropdownMenu(
+                    expanded = showFabMenu,
+                    onDismissRequest = { showFabMenu = false },
+                ) {
+                    DropdownMenuItem(
+                        text = { Text(stringResource(R.string.scene_create_manual)) },
+                        leadingIcon = { Icon(Icons.Outlined.Bolt, contentDescription = null) },
+                        onClick = {
+                            showFabMenu = false
+                            onAddManual()
+                        },
                    )
-                },
-                text = { Text(stringResource(R.string.scene_create_action), fontWeight = FontWeight.Bold) },
-                shape = RoundedCornerShape(18.dp),
-                containerColor = MaterialTheme.colorScheme.primary,
-                contentColor = MaterialTheme.colorScheme.onPrimary,
-                elevation = FloatingActionButtonDefaults.elevation(
-                    defaultElevation = 6.dp,
-                    pressedElevation = 10.dp,
-                    focusedElevation = 8.dp,
-                    hoveredElevation = 8.dp,
-                ),
-            )
+                    DropdownMenuItem(
+                        text = { Text(stringResource(R.string.scene_create_automatic)) },
+                        leadingIcon = { Icon(Icons.Outlined.Schedule, contentDescription = null) },
+                        onClick = {
+                            showFabMenu = false
+                            onAddAutomatic()
+                        },
+                    )
+                }
+            }
        },
    ) { innerPadding ->
        LazyColumn(
-            state = listState,
            modifier = Modifier.fillMaxSize(),
            contentPadding = PaddingValues(
                start = 16.dp,
@@ -226,68 +211,6 @@ fun SceneListScreen(
            },
        )
    }
-
-    if (showFabMenu) {
-        ModalBottomSheet(onDismissRequest = { showFabMenu = false }) {
-            Column(
-                modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
-                verticalArrangement = Arrangement.spacedBy(10.dp),
-            ) {
-                Text(stringResource(R.string.scene_create_sheet_title), style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
-                Text(
-                    stringResource(R.string.scene_create_sheet_description),
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-                SceneCreationOption(
-                    icon = ABoxIconKey.SCENES,
-                    title = stringResource(R.string.scene_create_manual),
-                    description = stringResource(R.string.scene_create_manual_description),
-                    onClick = {
-                        showFabMenu = false
-                        onAddManual()
-                    },
-                )
-                SceneCreationOption(
-                    icon = ABoxIconKey.PENDING,
-                    title = stringResource(R.string.scene_create_automatic),
-                    description = stringResource(R.string.scene_create_automatic_description),
-                    onClick = {
-                        showFabMenu = false
-                        onAddAutomatic()
-                    },
-                )
-                Spacer(Modifier.height(20.dp))
-            }
-        }
-    }
-}
-
-@Composable
-private fun SceneCreationOption(
-    icon: ABoxIconKey,
-    title: String,
-    description: String,
-    onClick: () -> Unit,
-) {
-    Surface(
-        modifier = Modifier.fillMaxWidth().clickable(onClick = onClick),
-        shape = RoundedCornerShape(8.dp),
-        color = MaterialTheme.colorScheme.surfaceVariant,
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth().padding(16.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Surface(shape = RoundedCornerShape(8.dp), color = MaterialTheme.colorScheme.primaryContainer) {
-                ABoxIcon(icon, title, modifier = Modifier.padding(10.dp).size(24.dp))
-            }
-            Column(Modifier.weight(1f).padding(start = 14.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
-                Text(title, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                Text(description, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-            }
-        }
-    }
 }

@Composable
@@ -327,10 +250,9 @@ private fun SceneCard(
                        ),
                    contentAlignment = Alignment.Center,
                ) {
-                    ABoxIcon(
-                        key = scene.icon.toABoxIconKey(),
-                        contentDescription = scene.name,
-                        modifier = Modifier.size(28.dp),
+                    Text(
+                        text = scene.icon.displayEmoji(),
+                        style = MaterialTheme.typography.titleMedium,
                    )
                }
                Spacer(Modifier.width(12.dp))
@@ -401,17 +323,19 @@ private fun SceneCard(
                }

                Row(verticalAlignment = Alignment.CenterVertically) {
-                    FilledTonalButton(
-                        onClick = onQuickExecute,
-                        contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp),
-                        modifier = Modifier.height(32.dp),
-                        shape = RoundedCornerShape(8.dp),
-                    ) {
-                        Icon(Icons.Filled.PlayArrow, contentDescription = null, modifier = Modifier.size(16.dp))
+                    if (scene.type == AutomationType.MANUAL) {
+                        FilledTonalButton(
+                            onClick = onQuickExecute,
+                            contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp),
+                            modifier = Modifier.height(32.dp),
+                            shape = RoundedCornerShape(8.dp),
+                        ) {
+                            Icon(Icons.Filled.PlayArrow, contentDescription = null, modifier = Modifier.size(16.dp))
+                            Spacer(Modifier.width(4.dp))
+                            Text(stringResource(R.string.scene_action_run_now), style = MaterialTheme.typography.labelMedium)
+                        }
                        Spacer(Modifier.width(4.dp))
-                        Text(stringResource(R.string.scene_action_run_now), style = MaterialTheme.typography.labelMedium)
                    }
-                    Spacer(Modifier.width(4.dp))
                    IconButton(onClick = onEdit, modifier = Modifier.size(32.dp)) {
                        Icon(Icons.Filled.Edit, contentDescription = stringResource(R.string.scene_edit), modifier = Modifier.size(18.dp), tint = MaterialTheme.colorScheme.onSurfaceVariant)
                    }
@@ -451,7 +375,10 @@ private fun EmptySceneList(modifier: Modifier = Modifier) {
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.Center,
    ) {
-        ABoxIcon(ABoxIconKey.SCENES, contentDescription = "暂无情景", modifier = Modifier.size(48.dp))
+        Text(
+            text = "⚡",
+            style = MaterialTheme.typography.displayMedium,
+        )
        Spacer(Modifier.size(8.dp))
        Text(
            text = stringResource(R.string.scene_empty_title),
@@ -469,19 +396,19 @@ private fun EmptySceneList(modifier: Modifier = Modifier) {
    }
 }

-fun SceneIcon.toABoxIconKey(): ABoxIconKey = when (this) {
-    SceneIcon.HOME -> ABoxIconKey.DEVICES
-    SceneIcon.OFFICE -> ABoxIconKey.ACTIVITY
-    SceneIcon.NIGHT -> ABoxIconKey.PENDING
-    SceneIcon.MOVIE -> ABoxIconKey.SCENES
-    SceneIcon.AWAY -> ABoxIconKey.OFFLINE
-    SceneIcon.READING -> ABoxIconKey.DEVICES
-    SceneIcon.DINING -> ABoxIconKey.DEVICES
-    SceneIcon.GAMING -> ABoxIconKey.SCENES
-    SceneIcon.THERMOSTAT -> ABoxIconKey.TEMPERATURE
-    SceneIcon.LIGHT -> ABoxIconKey.POWER
-    SceneIcon.CLEAN -> ABoxIconKey.REFRESH
-    SceneIcon.CUSTOM -> ABoxIconKey.UNKNOWN_DEVICE
+fun SceneIcon.displayEmoji(): String = when (this) {
+    SceneIcon.HOME -> "🏠"
+    SceneIcon.OFFICE -> "💼"
+    SceneIcon.NIGHT -> "🌙"
+    SceneIcon.MOVIE -> "🎬"
+    SceneIcon.AWAY -> "🚶"
+    SceneIcon.READING -> "📖"
+    SceneIcon.DINING -> "🍽️"
+    SceneIcon.GAMING -> "🎮"
+    SceneIcon.THERMOSTAT -> "🌡️"
+    SceneIcon.LIGHT -> "💡"
+    SceneIcon.CLEAN -> "🧹"
+    SceneIcon.CUSTOM -> "✨"
 }

 internal fun SceneColor.toColorOrNull(): Color? {
@@ -9,7 +9,6 @@ import com.flagship.abox.manager.domain.Scene
 import com.flagship.abox.manager.domain.SceneExecutor
 import com.flagship.abox.manager.domain.SceneId
 import com.flagship.abox.manager.domain.SceneRepository
-import com.flagship.abox.manager.automation.runtime.AutomationScheduler
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -39,7 +38,6 @@ class SceneListViewModel @Inject constructor(
    private val sceneRepository: SceneRepository,
    private val sceneExecutor: SceneExecutor,
    private val profileStore: ProviderProfileStore,
-    private val automationScheduler: AutomationScheduler? = null,
 ) : ViewModel() {

    private val _selectedTab = MutableStateFlow(SceneFilterTab.ALL)
@@ -86,29 +84,21 @@ class SceneListViewModel @Inject constructor(
        viewModelScope.launch {
            val profile = profileStore.activeProfile() ?: return@launch
            val updated = scene.copy(enabled = !scene.enabled)
-            if (sceneRepository.updateScene(profile.id, updated) is DomainResult.Success) {
-                automationScheduler?.reconcile(profile.id)
-            }
+            sceneRepository.updateScene(profile.id, updated)
        }
    }

    fun executeQuick(scene: Scene) {
        viewModelScope.launch {
-            when (val result = sceneExecutor.execute(scene)) {
-                is DomainResult.Success -> {
-                    _userMessage.emit(if (result.value.failedCount == 0) "executed" else "failed")
-                }
-                is DomainResult.Failure -> _userMessage.emit("failed")
-            }
+            sceneExecutor.execute(scene)
+            _userMessage.emit("executed")
        }
    }

    fun deleteScene(sceneId: SceneId) {
        viewModelScope.launch {
            val profile = profileStore.activeProfile() ?: return@launch
-            if (sceneRepository.deleteScene(profile.id, sceneId) is DomainResult.Success) {
-                automationScheduler?.reconcile(profile.id)
-            }
+            sceneRepository.deleteScene(profile.id, sceneId)
            _pendingDelete.value = null
        }
    }
@@ -0,0 +1,183 @@
+package com.flagship.abox.manager.ui.shell
+
+import androidx.compose.foundation.background
+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.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ExitToApp
+import androidx.compose.material.icons.filled.CloudDone
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.flagship.abox.manager.R
+import com.flagship.abox.manager.designsystem.ABoxButton
+import com.flagship.abox.manager.designsystem.ABoxUserAvatar
+
+/**
+ * Account and Provider management bottom sheet triggered by clicking the top bar user avatar.
+ * Allows viewing current session info and signing out.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AccountProviderBottomSheet(
+    userName: String,
+    providerName: String,
+    onDismissRequest: () -> Unit,
+    onLogout: () -> Unit,
+    actionInProgress: Boolean,
+    errorMessage: String?,
+    modifier: Modifier = Modifier,
+    sheetState: SheetState = rememberModalBottomSheetState(),
+) {
+    ModalBottomSheet(
+        onDismissRequest = onDismissRequest,
+        sheetState = sheetState,
+        modifier = modifier,
+        containerColor = MaterialTheme.colorScheme.surface,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .verticalScroll(rememberScrollState())
+                .padding(horizontal = 24.dp)
+                .padding(bottom = 32.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+        ) {
+            // Header with large avatar & user info
+            ABoxUserAvatar(
+                name = userName,
+                onClick = {},
+                size = 56.dp,
+            )
+
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(4.dp),
+            ) {
+                Text(
+                    text = userName.ifBlank { stringResource(R.string.account_sheet_title) },
+                    style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+                    color = MaterialTheme.colorScheme.onSurface,
+                )
+                Text(
+                    text = stringResource(R.string.account_sheet_signed_in_as),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+
+            HorizontalDivider(
+                modifier = Modifier.padding(vertical = 4.dp),
+                color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f),
+            )
+
+            // Provider Info Card
+            Card(
+                modifier = Modifier.fillMaxWidth(),
+                colors = CardDefaults.cardColors(
+                    containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
+                ),
+                shape = RoundedCornerShape(16.dp),
+            ) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(16.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(12.dp),
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .size(40.dp)
+                            .clip(CircleShape)
+                            .background(MaterialTheme.colorScheme.primaryContainer),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.CloudDone,
+                            contentDescription = null,
+                            tint = MaterialTheme.colorScheme.onPrimaryContainer,
+                            modifier = Modifier.size(22.dp),
+                        )
+                    }
+
+                    Column(modifier = Modifier.weight(1f)) {
+                        Text(
+                            text = stringResource(R.string.account_sheet_provider),
+                            style = MaterialTheme.typography.labelMedium,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        )
+                        Text(
+                            text = providerName,
+                            style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.SemiBold),
+                            color = MaterialTheme.colorScheme.onSurface,
+                        )
+                    }
+                }
+            }
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            // Action button
+            ABoxButton(
+                onClick = onLogout,
+                enabled = !actionInProgress,
+                modifier = Modifier.fillMaxWidth(),
+            ) {
+                Icon(
+                    imageVector = Icons.AutoMirrored.Filled.ExitToApp,
+                    contentDescription = null,
+                    modifier = Modifier.size(20.dp),
+                )
+                Spacer(modifier = Modifier.size(8.dp))
+                Text(stringResource(R.string.account_sheet_logout))
+            }
+
+            errorMessage?.let { error ->
+                Text(
+                    text = error,
+                    color = MaterialTheme.colorScheme.error,
+                    style = MaterialTheme.typography.bodyMedium,
+                )
+            }
+
+            TextButton(
+                onClick = onDismissRequest,
+                enabled = !actionInProgress,
+                modifier = Modifier.fillMaxWidth(),
+            ) {
+                Text(
+                    text = stringResource(R.string.account_sheet_close),
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+        }
+    }
+}
@@ -1,185 +0,0 @@
-package com.flagship.abox.manager.ui.shell
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.Logout
-import androidx.compose.material.icons.outlined.CloudDone
-import androidx.compose.material.icons.outlined.Palette
-import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.res.stringResource
-import com.flagship.abox.manager.R
-import com.flagship.abox.manager.designsystem.ABoxButton
-import com.flagship.abox.manager.designsystem.ABoxUserAvatar
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AccountProviderDialog(
-    userName: String,
-    providerName: String,
-    onDismissRequest: () -> Unit,
-    onOpenSettings: () -> Unit,
-    onOpenAbout: () -> Unit,
-    onSwitchProvider: () -> Unit,
-    onEndSession: () -> Unit,
-    onForgetCredentials: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    var confirmLogout by remember { mutableStateOf(false) }
-    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
-
-    ModalBottomSheet(
-        onDismissRequest = onDismissRequest,
-        sheetState = sheetState,
-        modifier = modifier.testTag("account_dialog"),
-        dragHandle = {
-            Surface(
-                modifier = Modifier.padding(top = 10.dp, bottom = 6.dp).size(width = 40.dp, height = 4.dp),
-                shape = RoundedCornerShape(2.dp),
-                color = MaterialTheme.colorScheme.outlineVariant,
-            ) {}
-        },
-    ) {
-        Column(
-            modifier = Modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(horizontal = 20.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(14.dp),
-        ) {
-            ABoxUserAvatar(
-                name = userName,
-                onClick = {},
-                size = 76.dp,
-                contentDescription = stringResource(R.string.account_current),
-            )
-            Text(
-                text = stringResource(R.string.account_greeting, userName.ifBlank { stringResource(R.string.account_current) }),
-                style = MaterialTheme.typography.headlineSmall,
-                fontWeight = FontWeight.Bold,
-            )
-            Text(
-                text = userName.ifBlank { stringResource(R.string.account_current) },
-                style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-            )
-
-            Surface(
-                modifier = Modifier.fillMaxWidth(),
-                shape = RoundedCornerShape(8.dp),
-                color = MaterialTheme.colorScheme.surfaceVariant,
-            ) {
-                Row(
-                    modifier = Modifier.fillMaxWidth().padding(16.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(14.dp),
-                ) {
-                    Icon(Icons.Outlined.CloudDone, contentDescription = stringResource(R.string.account_connection_method), modifier = Modifier.size(26.dp))
-                    Column {
-                        Text(stringResource(R.string.account_connection_method), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
-                        Text(providerName, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    }
-                }
-            }
-
-            AccountSheetAction(
-                icon = Icons.Outlined.Palette,
-                label = stringResource(R.string.account_interface_settings),
-                description = stringResource(R.string.account_interface_settings_desc),
-                tag = "account_dialog_open_settings",
-                onClick = onOpenSettings,
-            )
-            AccountSheetAction(
-                icon = Icons.Outlined.Info,
-                label = stringResource(R.string.account_about),
-                description = stringResource(R.string.account_about_desc),
-                tag = "account_dialog_open_about",
-                onClick = onOpenAbout,
-            )
-            AccountSheetAction(
-                icon = Icons.AutoMirrored.Outlined.Logout,
-                label = stringResource(R.string.account_logout),
-                description = stringResource(R.string.account_logout_desc),
-                tag = "account_dialog_end_session",
-                dangerous = true,
-                onClick = { confirmLogout = true },
-            )
-            Spacer(Modifier.height(28.dp))
-        }
-    }
-
-    if (confirmLogout) {
-        AlertDialog(
-            onDismissRequest = { confirmLogout = false },
-            title = { Text(stringResource(R.string.account_logout)) },
-            text = { Text(stringResource(R.string.account_logout_confirm)) },
-            confirmButton = {
-                ABoxButton(
-                    onClick = {
-                        confirmLogout = false
-                        onEndSession()
-                    },
-                    modifier = Modifier.testTag("account_dialog_confirm"),
-                ) { Text(stringResource(R.string.account_logout)) }
-            },
-            dismissButton = { TextButton(onClick = { confirmLogout = false }) { Text(stringResource(R.string.action_cancel)) } },
-        )
-    }
-}
-
-@Composable
-private fun AccountSheetAction(
-    icon: androidx.compose.ui.graphics.vector.ImageVector,
-    label: String,
-    description: String,
-    tag: String,
-    dangerous: Boolean = false,
-    onClick: () -> Unit,
-) {
-    TextButton(
-        onClick = onClick,
-        modifier = Modifier.fillMaxWidth().testTag(tag),
-    ) {
-        Row(
-            modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(14.dp),
-        ) {
-            Icon(
-                icon,
-                contentDescription = label,
-                tint = if (dangerous) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurface,
-            )
-            Column(Modifier.weight(1f)) {
-                Text(label, color = if (dangerous) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurface)
-                Text(description, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-            }
-        }
-    }
-}
@@ -25,7 +25,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
@@ -36,10 +35,6 @@ import com.flagship.abox.manager.R
 import com.flagship.abox.manager.designsystem.ABoxNavigationBar
 import com.flagship.abox.manager.designsystem.ABoxNavigationBarItem
 import com.flagship.abox.manager.designsystem.ABoxUserAvatar
-import com.flagship.abox.manager.designsystem.LocalABoxNavigationPresentation
-import com.flagship.abox.manager.designsystem.LocalABoxRenderer
-import com.flagship.abox.manager.preferences.DesignRenderer
-import com.flagship.abox.manager.preferences.NavigationPresentation

 /** Stateless authenticated shell; navigation state belongs to AuthenticatedNavigation. */
@Composable
@@ -51,103 +46,59 @@ fun MainAppShell(
    onTabClick: (MainTab) -> Unit,
    onProviderClick: () -> Unit,
    onAvatarClick: () -> Unit,
-    showNavigationChrome: Boolean = true,
    content: @Composable (PaddingValues) -> Unit,
 ) {
    val useRail = navigationPresentation(windowSizeClass) == MainNavigationPresentation.NAVIGATION_RAIL
-    val renderer = LocalABoxRenderer.current
-    val floating = renderer == DesignRenderer.MIUIX &&
-        LocalABoxNavigationPresentation.current == NavigationPresentation.FLOATING && !useRail

    Scaffold(
        modifier = Modifier.fillMaxSize(),
        topBar = {
-            if (showNavigationChrome) {
-                ProviderTopBar(
-                    currentTab = currentTab,
-                    providerName = providerName,
-                    userName = userName,
-                    onProviderClick = onProviderClick,
-                    onAvatarClick = onAvatarClick,
-                )
-            }
+            ProviderTopBar(
+                currentTab = currentTab,
+                providerName = providerName,
+                userName = userName,
+                onProviderClick = onProviderClick,
+                onAvatarClick = onAvatarClick,
+            )
        },
        bottomBar = {
-            if (showNavigationChrome && !useRail) {
-                MainBottomBar(currentTab, onTabClick, renderer, floating)
+            if (!useRail) {
+                ABoxNavigationBar {
+                    MainTab.entries.forEach { tab ->
+                        val selected = tab == currentTab
+                        ABoxNavigationBarItem(
+                            selected = selected,
+                            onClick = { onTabClick(tab) },
+                            modifier = Modifier.testTag("main_tab_${tab.name.lowercase()}"),
+                            icon = {
+                                Icon(
+                                    imageVector = if (selected) tab.selectedIcon else tab.unselectedIcon,
+                                    contentDescription = stringResource(tab.labelRes),
+                                )
+                            },
+                            label = { Text(stringResource(tab.labelRes)) },
+                        )
+                    }
+                }
            }
        },
    ) { innerPadding ->
        Row(
            modifier = Modifier.fillMaxSize(),
        ) {
-            if (showNavigationChrome && useRail) {
+            if (useRail) {
                MainNavigationRail(
                    currentTab = currentTab,
                    onTabClick = onTabClick,
                )
            }
-            Box(
-                modifier = Modifier.weight(1f).fillMaxHeight(),
-            ) {
+            Box(modifier = Modifier.weight(1f).fillMaxHeight()) {
                content(innerPadding)
            }
        }
    }
 }

-@Composable
-private fun MainBottomBar(
-    currentTab: MainTab,
-    onTabClick: (MainTab) -> Unit,
-    renderer: DesignRenderer,
-    floating: Boolean,
-) {
-    if (renderer == DesignRenderer.MIUIX) {
-        Surface(
-            modifier = if (floating) {
-                Modifier.padding(horizontal = 20.dp, vertical = 8.dp).clip(RoundedCornerShape(36.dp))
-            } else {
-                Modifier
-            },
-            shape = if (floating) RoundedCornerShape(36.dp) else RoundedCornerShape(0.dp),
-            color = MaterialTheme.colorScheme.surfaceContainer,
-            tonalElevation = if (floating) 3.dp else 0.dp,
-        ) {
-            ABoxNavigationBar(containerColor = Color.Transparent) {
-                MainTab.entries.forEach { tab ->
-                    val selected = tab == currentTab
-                    ABoxNavigationBarItem(
-                        selected = tab == currentTab,
-                        onClick = { onTabClick(tab) },
-                        modifier = Modifier.testTag("main_tab_${tab.name.lowercase()}"),
-                        icon = {
-                            Icon(
-                                imageVector = if (selected) tab.selectedIcon else tab.unselectedIcon,
-                                contentDescription = stringResource(tab.labelRes),
-                            )
-                        },
-                        label = { Text(stringResource(tab.labelRes)) },
-                    )
-                }
-            }
-        }
-    } else {
-        ABoxNavigationBar {
-            MainTab.entries.forEach { tab ->
-                val selected = tab == currentTab
-                ABoxNavigationBarItem(
-                    selected = selected,
-                    onClick = { onTabClick(tab) },
-                    modifier = Modifier.testTag("main_tab_${tab.name.lowercase()}"),
-                    icon = { Icon(if (selected) tab.selectedIcon else tab.unselectedIcon, stringResource(tab.labelRes)) },
-                    label = { Text(stringResource(tab.labelRes)) },
-                )
-            }
-        }
-    }
-}
-
@Composable
 private fun ProviderTopBar(
    currentTab: MainTab,
@@ -157,24 +108,24 @@ private fun ProviderTopBar(
    onAvatarClick: () -> Unit,
 ) {
    Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .statusBarsPadding()
-                .padding(horizontal = 16.dp, vertical = 8.dp),
+        modifier = Modifier
+            .fillMaxWidth()
+            .statusBarsPadding()
+            .padding(horizontal = 16.dp, vertical = 8.dp),
+    ) {
+        Surface(
+            modifier = Modifier.fillMaxWidth(),
+            shape = RoundedCornerShape(32.dp),
+            color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
+            tonalElevation = 2.dp,
        ) {
-            Surface(
-                modifier = Modifier.fillMaxWidth(),
-                shape = RoundedCornerShape(32.dp),
-                color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
-                tonalElevation = 2.dp,
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(64.dp)
+                    .padding(horizontal = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
            ) {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(64.dp)
-                        .padding(horizontal = 8.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
                Row(
                    modifier = Modifier
                        .clip(RoundedCornerShape(24.dp))
@@ -219,8 +170,8 @@ private fun ProviderTopBar(
                        contentDescription = stringResource(R.string.action_account),
                    )
                }
-                }
            }
+        }
    }
 }

@@ -2,7 +2,6 @@ package com.flagship.abox.manager.ui.socket

 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -13,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
@@ -23,6 +23,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 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
@@ -37,8 +38,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -48,17 +47,12 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flagship.abox.manager.R
 import com.flagship.abox.manager.designsystem.ABoxButton
-import com.flagship.abox.manager.designsystem.ABoxDeviceDetailScaffold
-import com.flagship.abox.manager.designsystem.ABoxIconButton
 import com.flagship.abox.manager.designsystem.ABoxLoadingIndicator
-import com.flagship.abox.manager.designsystem.ABoxStatus
-import com.flagship.abox.manager.designsystem.ABoxStatusBanner
-import com.flagship.abox.manager.designsystem.icon.ABoxIcon
-import com.flagship.abox.manager.designsystem.icon.ABoxIconKey
 import com.flagship.abox.manager.domain.DeviceName
 import com.flagship.abox.manager.domain.SocketPowerState
-import java.text.DateFormat
+import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale

@Composable
 fun SocketRoute(
@@ -85,29 +79,38 @@ fun SocketScreen(
    modifier: Modifier = Modifier,
 ) {
    val scrollState = rememberScrollState()
-    val configuration = LocalConfiguration.current
-    var showDeviceNameDialog by remember { mutableStateOf(false) }
-    ABoxDeviceDetailScaffold(
+    var showEditNameDialog by remember { mutableStateOf(false) }
+
+    Scaffold(
        modifier = modifier.fillMaxSize(),
-        title = state.deviceName?.value ?: stringResource(R.string.socket_title),
-        onBack = onBackClick,
-        subtitle = stringResource(R.string.socket_detail_subtitle),
-        icon = ABoxIconKey.SOCKET,
-        action = {
-            Row {
-                ABoxIconButton(
-                    key = ABoxIconKey.EDIT,
-                    contentDescription = stringResource(R.string.socket_name_settings),
-                    onClick = { showDeviceNameDialog = true },
-                    enabled = !state.isOperating,
-                )
-                ABoxIconButton(
-                    key = ABoxIconKey.REFRESH,
-                    contentDescription = stringResource(R.string.action_refresh),
-                    onClick = { onEvent(SocketUiEvent.Refresh) },
-                    enabled = !state.isLoading && !state.isOperating,
-                )
-            }
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        text = state.deviceName?.value ?: stringResource(R.string.socket_title),
+                        style = MaterialTheme.typography.titleLarge,
+                    )
+                },
+                navigationIcon = {
+                    IconButton(onClick = onBackClick) {
+                        Text("<", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+                    }
+                },
+                actions = {
+                    IconButton(
+                        onClick = { showEditNameDialog = true },
+                        enabled = !state.isLoading && !state.isOperating,
+                    ) {
+                        Text("✎", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    }
+                    IconButton(
+                        onClick = { onEvent(SocketUiEvent.Refresh) },
+                        enabled = !state.isLoading && !state.isOperating,
+                    ) {
+                        Text("↻", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    }
+                },
+            )
        },
    ) { paddingValues ->
        Column(
@@ -133,28 +136,20 @@ fun SocketScreen(
                )
            }

-            Box(modifier = Modifier.fillMaxWidth().height(64.dp)) {
-                SocketOperationBanner(operation = state.operation)
-            }
-
            // Central Status Card
            Card(
                modifier = Modifier
                    .fillMaxWidth()
-                    .padding(top = 8.dp, bottom = 18.dp),
+                    .padding(vertical = 16.dp),
                colors = CardDefaults.cardColors(
-                    containerColor = if (state.isPowerOn) {
-                        MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.72f)
-                    } else {
-                        MaterialTheme.colorScheme.surfaceVariant
-                    },
+                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
                ),
                shape = MaterialTheme.shapes.large,
            ) {
                Column(
                    modifier = Modifier
                        .fillMaxWidth()
-                        .padding(horizontal = 24.dp, vertical = 32.dp),
+                        .padding(32.dp),
                    horizontalAlignment = Alignment.CenterHorizontally,
                    verticalArrangement = Arrangement.Center,
                ) {
@@ -162,16 +157,13 @@ fun SocketScreen(
                        powerState = state.powerState,
                        isOffline = state.isOffline,
                        isLoading = state.isLoading,
-                        isOperating = state.isOperating,
-                        enabled = state.isActionEnabled,
-                        onClick = { onEvent(SocketUiEvent.TogglePower) },
                    )

-                    Spacer(modifier = Modifier.height(24.dp))
+                    Spacer(modifier = Modifier.height(20.dp))

                    Text(
                        text = stringResource(R.string.socket_status_label),
-                        style = MaterialTheme.typography.labelLarge,
+                        style = MaterialTheme.typography.labelMedium,
                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                    )

@@ -182,7 +174,7 @@ fun SocketScreen(
                            state.powerState == SocketPowerState.OFF -> stringResource(R.string.socket_status_off)
                            else -> stringResource(R.string.socket_status_unknown)
                        },
-                        style = MaterialTheme.typography.headlineSmall,
+                        style = MaterialTheme.typography.headlineMedium,
                        fontWeight = FontWeight.Bold,
                        color = when {
                            state.isOffline -> MaterialTheme.colorScheme.error
@@ -193,9 +185,7 @@ fun SocketScreen(
                    )

                    state.lastConfirmedTimeMillis?.let { timeMillis ->
-                        val formattedTime = remember(timeMillis, configuration) {
-                            DateFormat.getTimeInstance(DateFormat.MEDIUM).format(Date(timeMillis))
-                        }
+                        val formattedTime = SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date(timeMillis))
                        Text(
                            text = stringResource(R.string.socket_confirmed_at, formattedTime),
                            style = MaterialTheme.typography.bodySmall,
@@ -206,58 +196,93 @@ fun SocketScreen(
                }
            }

-            Text(
-                text = stringResource(R.string.socket_confirmation_hint),
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            Spacer(modifier = Modifier.height(16.dp))
+
+            // Main Toggle Action Button
+            ABoxButton(
+                onClick = { onEvent(SocketUiEvent.TogglePower) },
+                enabled = state.isActionEnabled,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(56.dp),
+            ) {
+                if (state.isOperating) {
+                    ABoxLoadingIndicator(modifier = Modifier.size(24.dp))
+                    Spacer(modifier = Modifier.width(12.dp))
+                    Text(stringResource(R.string.socket_operating_label))
+                } else {
+                    Text(
+                        text = if (state.isPowerOn) {
+                            stringResource(R.string.socket_action_turn_off)
+                        } else {
+                            stringResource(R.string.socket_action_turn_on)
+                        },
+                        style = MaterialTheme.typography.titleMedium,
+                    )
+                }
+            }
+
+            Spacer(modifier = Modifier.height(12.dp))
+
+            // Dedicated Segmented Action Buttons
+            Row(
                modifier = Modifier.fillMaxWidth(),
-            )
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+            ) {
+                OutlinedButton(
+                    onClick = { onEvent(SocketUiEvent.SetPower(SocketPowerState.ON)) },
+                    enabled = state.isActionEnabled && state.powerState != SocketPowerState.ON,
+                    modifier = Modifier.weight(1f).height(48.dp),
+                ) {
+                    Text(stringResource(R.string.socket_action_turn_on))
+                }
+
+                OutlinedButton(
+                    onClick = { onEvent(SocketUiEvent.SetPower(SocketPowerState.OFF)) },
+                    enabled = state.isActionEnabled && state.powerState != SocketPowerState.OFF,
+                    modifier = Modifier.weight(1f).height(48.dp),
+                ) {
+                    Text(stringResource(R.string.socket_action_turn_off))
+                }
+            }
        }
    }

-    if (showDeviceNameDialog) {
-        DeviceNameDialog(
-            currentName = state.deviceName?.value.orEmpty(),
-            title = stringResource(R.string.socket_name_settings),
-            description = stringResource(R.string.gateway_device_name_socket_desc),
-            onDismiss = { showDeviceNameDialog = false },
-            onConfirm = { name ->
-                showDeviceNameDialog = false
-                onEvent(SocketUiEvent.ChangeDeviceName(DeviceName(name)))
+    if (showEditNameDialog) {
+        var inputName by remember(state.deviceName) { mutableStateOf(state.deviceName?.value.orEmpty()) }
+        AlertDialog(
+            onDismissRequest = { showEditNameDialog = false },
+            title = { Text(stringResource(R.string.dialog_edit_device_name_title)) },
+            text = {
+                OutlinedTextField(
+                    value = inputName,
+                    onValueChange = { inputName = it },
+                    label = { Text(stringResource(R.string.dialog_edit_device_name_hint)) },
+                    singleLine = true,
+                    modifier = Modifier.fillMaxWidth(),
+                )
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        val trimmed = inputName.trim()
+                        if (trimmed.isNotBlank()) {
+                            onEvent(SocketUiEvent.ChangeDeviceName(DeviceName(trimmed)))
+                        }
+                        showEditNameDialog = false
+                    },
+                    enabled = inputName.isNotBlank(),
+                ) {
+                    Text(stringResource(R.string.action_confirm))
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { showEditNameDialog = false }) {
+                    Text(stringResource(R.string.action_cancel))
+                }
            },
        )
    }
-
-}
-
-@Composable
-private fun DeviceNameDialog(
-    currentName: String,
-    title: String,
-    description: String,
-    onDismiss: () -> Unit,
-    onConfirm: (String) -> Unit,
-) {
-    var value by remember(currentName) { mutableStateOf(currentName) }
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(title) },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                Text(description, style = MaterialTheme.typography.bodySmall)
-                OutlinedTextField(
-                    value = value,
-                    onValueChange = { value = it },
-                    label = { Text(stringResource(R.string.gateway_device_name)) },
-                    singleLine = true,
-                )
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = { onConfirm(value.trim()) }, enabled = value.isNotBlank()) { Text(stringResource(R.string.action_save_device_name)) }
-        },
-        dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } },
-    )
 }

@Composable
@@ -265,9 +290,6 @@ private fun PowerIndicatorBadge(
    powerState: SocketPowerState?,
    isOffline: Boolean,
    isLoading: Boolean,
-    isOperating: Boolean,
-    enabled: Boolean,
-    onClick: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
    val indicatorColor = when {
@@ -279,74 +301,24 @@ private fun PowerIndicatorBadge(

    Box(
        modifier = modifier
-            .size(160.dp)
+            .size(96.dp)
            .clip(CircleShape)
            .background(indicatorColor.copy(alpha = 0.15f))
-            .border(4.dp, indicatorColor, CircleShape)
-            .clickable(enabled = enabled, onClickLabel = "切换插座电源", onClick = onClick)
-            .testTag("socket_power_dial"),
+            .border(3.dp, indicatorColor, CircleShape),
        contentAlignment = Alignment.Center,
    ) {
-        Column(horizontalAlignment = Alignment.CenterHorizontally) {
-            if (isLoading || isOperating) {
-                ABoxLoadingIndicator(modifier = Modifier.size(44.dp))
-            } else {
-                ABoxIcon(
-                    key = ABoxIconKey.POWER,
-                    contentDescription = if (powerState == SocketPowerState.ON) "插座已开启" else "插座已关闭",
-                    modifier = Modifier.size(52.dp),
-                )
-            }
-            Spacer(Modifier.height(10.dp))
+        if (isLoading) {
+            ABoxLoadingIndicator(modifier = Modifier.size(36.dp))
+        } else {
            Text(
-                text = when {
-                    isOperating -> stringResource(R.string.device_status_switching)
-                    powerState == SocketPowerState.ON -> stringResource(R.string.socket_status_on)
-                    powerState == SocketPowerState.OFF -> stringResource(R.string.socket_status_off)
-                    else -> stringResource(R.string.device_status_unavailable)
-                },
-                style = MaterialTheme.typography.titleMedium,
-                fontWeight = FontWeight.Bold,
+                text = if (powerState == SocketPowerState.ON) "⚡" else "○",
+                style = MaterialTheme.typography.headlineLarge,
+                color = indicatorColor,
            )
        }
    }
 }

-@Composable
-private fun SocketOperationBanner(
-    operation: SocketOperationState,
-    modifier: Modifier = Modifier,
-) {
-    when (operation) {
-        is SocketOperationState.PendingCommand -> ABoxStatusBanner(
-            state = ABoxStatus.PENDING,
-            contentDescription = "正在发送电源指令",
-            modifier = modifier,
-        )
-        is SocketOperationState.RefreshingConfirmation -> ABoxStatusBanner(
-            state = ABoxStatus.PENDING,
-            contentDescription = "正在确认插座状态",
-            modifier = modifier,
-        )
-        is SocketOperationState.AwaitingConfirmation -> ABoxStatusBanner(
-            state = ABoxStatus.WARNING,
-            contentDescription = "指令已发送，等待状态确认",
-            modifier = modifier.testTag("socket_awaiting_confirmation"),
-        )
-        is SocketOperationState.Failed -> ABoxStatusBanner(
-            state = ABoxStatus.ERROR,
-            contentDescription = "插座操作失败",
-            modifier = modifier,
-        )
-        SocketOperationState.Unavailable -> ABoxStatusBanner(
-            state = ABoxStatus.OFFLINE,
-            contentDescription = "插座当前不可用",
-            modifier = modifier,
-        )
-        SocketOperationState.IdleConfirmed -> Unit
-    }
-}
-
@Composable
 private fun OfflineBanner(
    onRetry: () -> Unit,
@@ -405,11 +377,9 @@ private fun ErrorBanner(
                style = MaterialTheme.typography.bodySmall,
                modifier = Modifier.weight(1f),
            )
-            ABoxIconButton(
-                key = ABoxIconKey.CLOSE,
-                contentDescription = "关闭错误提示",
-                onClick = onDismiss,
-            )
+            TextButton(onClick = onDismiss) {
+                Text("✕")
+            }
        }
    }
 }
@@ -14,27 +14,14 @@ data class SocketUiState(
    val isOffline: Boolean = false,
    val errorMessage: UiText? = null,
    val lastConfirmedTimeMillis: Long? = null,
-    val operation: SocketOperationState = SocketOperationState.IdleConfirmed,
 ) {
    val isActionEnabled: Boolean
-        get() = !isLoading && operation !is SocketOperationState.PendingCommand &&
-            operation !is SocketOperationState.RefreshingConfirmation &&
-            operation !is SocketOperationState.AwaitingConfirmation &&
-            !isOffline && profileId != null && deviceName != null
+        get() = !isLoading && !isOperating && !isOffline && profileId != null && deviceName != null

    val isPowerOn: Boolean
        get() = powerState == SocketPowerState.ON
 }

-sealed interface SocketOperationState {
-    data object IdleConfirmed : SocketOperationState
-    data class PendingCommand(val target: SocketPowerState) : SocketOperationState
-    data class RefreshingConfirmation(val target: SocketPowerState) : SocketOperationState
-    data class AwaitingConfirmation(val target: SocketPowerState) : SocketOperationState
-    data class Failed(val target: SocketPowerState) : SocketOperationState
-    data object Unavailable : SocketOperationState
-}
-
 sealed interface SocketUiEvent {
    data class Initialize(val profileId: ProviderProfileId, val deviceName: DeviceName) : SocketUiEvent
    data class ChangeDeviceName(val deviceName: DeviceName) : SocketUiEvent
@@ -9,18 +9,13 @@ import com.flagship.abox.manager.domain.DomainResult
 import com.flagship.abox.manager.domain.ProviderProfileId
 import com.flagship.abox.manager.domain.SocketGateway
 import com.flagship.abox.manager.domain.SocketPowerState
-import com.flagship.abox.manager.devicecatalog.data.ConfiguredDeviceRepository
 import com.flagship.abox.manager.ui.common.DomainErrorMapper
-import com.flagship.abox.manager.domain.ActivityEventWriter
-import com.flagship.abox.manager.domain.ActivityEventKind
-import com.flagship.abox.manager.domain.ActivityOutcome
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.delay
 import java.net.URLDecoder
 import java.nio.charset.StandardCharsets
 import javax.inject.Inject
@@ -28,8 +23,6 @@ import javax.inject.Inject
@HiltViewModel
 class SocketViewModel @Inject constructor(
    private val socketGateway: SocketGateway,
-    private val configuredDeviceRepository: ConfiguredDeviceRepository,
-    private val activityWriter: ActivityEventWriter,
    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {

@@ -63,7 +56,6 @@ class SocketViewModel @Inject constructor(
                    it.copy(
                        profileId = event.profileId,
                        deviceName = event.deviceName,
-                        operation = SocketOperationState.Unavailable,
                    )
                }
                loadStatus()
@@ -71,19 +63,16 @@ class SocketViewModel @Inject constructor(

            is SocketUiEvent.ChangeDeviceName -> {
                val trimmed = event.deviceName.value.trim()
-                val current = _state.value
-                val profileId = current.profileId
-                val oldName = current.deviceName
-                if (trimmed.isNotBlank() && trimmed != oldName?.value && profileId != null && oldName != null) {
-                    viewModelScope.launch {
-                        when (val result = configuredDeviceRepository.rename(profileId, oldName, DeviceName(trimmed))) {
-                            is DomainResult.Success -> {
-                                _state.update { it.copy(deviceName = DeviceName(trimmed), powerState = null, errorMessage = null, lastConfirmedTimeMillis = null) }
-                                loadStatus()
-                            }
-                            is DomainResult.Failure -> _state.update { it.copy(errorMessage = DomainErrorMapper.map(result.error)) }
-                        }
+                if (trimmed.isNotBlank() && trimmed != _state.value.deviceName?.value) {
+                    _state.update {
+                        it.copy(
+                            deviceName = DeviceName(trimmed),
+                            powerState = null,
+                            errorMessage = null,
+                            lastConfirmedTimeMillis = null,
+                        )
                    }
+                    loadStatus()
                }
            }

@@ -126,7 +115,6 @@ class SocketViewModel @Inject constructor(
                            isOffline = false,
                            errorMessage = null,
                            lastConfirmedTimeMillis = System.currentTimeMillis(),
-                            operation = SocketOperationState.IdleConfirmed,
                        )
                    }
                }
@@ -138,7 +126,6 @@ class SocketViewModel @Inject constructor(
                            isLoading = false,
                            isOffline = isOffline,
                            errorMessage = DomainErrorMapper.map(result.error),
-                            operation = SocketOperationState.Unavailable,
                        )
                    }
                }
@@ -152,83 +139,36 @@ class SocketViewModel @Inject constructor(
        val deviceName = current.deviceName ?: return

        // Prevent duplicate action if currently operating, loading or offline
-        if (current.isOperating || current.isLoading || current.isOffline || !current.isActionEnabled) {
+        if (current.isOperating || current.isLoading || current.isOffline) {
            return
        }

-        _state.update { it.copy(isOperating = true, errorMessage = null, operation = SocketOperationState.PendingCommand(targetState)) }
        viewModelScope.launch {
-            when (val result = socketGateway.commandPower(profileId, deviceName, targetState)) {
+            _state.update { it.copy(isOperating = true, errorMessage = null) }
+            when (val result = socketGateway.setPower(profileId, deviceName, targetState)) {
                is DomainResult.Success -> {
-                    activityWriter.recordDevice(profileId, deviceName, ActivityEventKind.SOCKET_COMMAND, ActivityOutcome.SUCCEEDED)
                    _state.update {
                        it.copy(
-                            isOperating = true,
+                            powerState = result.value.powerState,
+                            isOperating = false,
                            isOffline = false,
                            errorMessage = null,
-                            operation = SocketOperationState.RefreshingConfirmation(targetState),
-                        )
-                    }
-                    var confirmationError: DomainError? = null
-                    repeat(CONFIRMATION_ATTEMPTS) { attempt ->
-                        if (attempt > 0) delay(CONFIRMATION_RETRY_DELAY_MILLIS)
-                        when (val confirmation = socketGateway.getStatus(profileId, deviceName)) {
-                            is DomainResult.Success -> if (confirmation.value.powerState == targetState) {
-                                activityWriter.recordDevice(
-                                    profileId,
-                                    deviceName,
-                                    ActivityEventKind.SOCKET_CONFIRMATION,
-                                    ActivityOutcome.SUCCEEDED,
-                                )
-                                _state.update {
-                                    it.copy(
-                                        powerState = targetState,
-                                        isOperating = false,
-                                        isOffline = false,
-                                        errorMessage = null,
-                                        lastConfirmedTimeMillis = System.currentTimeMillis(),
-                                        operation = SocketOperationState.IdleConfirmed,
-                                    )
-                                }
-                                return@launch
-                            }
-                            is DomainResult.Failure -> confirmationError = confirmation.error
-                        }
-                    }
-                    activityWriter.recordDevice(
-                        profileId,
-                        deviceName,
-                        ActivityEventKind.SOCKET_CONFIRMATION,
-                        ActivityOutcome.AWAITING_CONFIRMATION,
-                        confirmationError?.externalCode,
-                    )
-                    _state.update {
-                        it.copy(
-                            isOperating = false,
-                            isOffline = confirmationError is DomainError.DeviceOffline,
-                            errorMessage = confirmationError?.let(DomainErrorMapper::map),
-                            operation = SocketOperationState.AwaitingConfirmation(targetState),
+                            lastConfirmedTimeMillis = System.currentTimeMillis(),
                        )
                    }
                }
+
                is DomainResult.Failure -> {
-                    activityWriter.recordDevice(profileId, deviceName, ActivityEventKind.SOCKET_COMMAND, ActivityOutcome.FAILED, result.error.externalCode)
                    val isOffline = result.error is DomainError.DeviceOffline
                    _state.update {
                        it.copy(
                            isOperating = false,
                            isOffline = isOffline,
                            errorMessage = DomainErrorMapper.map(result.error),
-                            operation = SocketOperationState.Failed(targetState),
                        )
                    }
                }
            }
        }
    }
-
-    private companion object {
-        const val CONFIRMATION_ATTEMPTS = 4
-        const val CONFIRMATION_RETRY_DELAY_MILLIS = 500L
-    }
 }
@@ -31,8 +31,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -41,14 +39,11 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flagship.abox.manager.R
 import com.flagship.abox.manager.designsystem.ABoxButton
-import com.flagship.abox.manager.designsystem.ABoxDeviceDetailScaffold
 import com.flagship.abox.manager.designsystem.ABoxLoadingIndicator
-import com.flagship.abox.manager.designsystem.ABoxIconButton
-import com.flagship.abox.manager.designsystem.icon.ABoxIcon
-import com.flagship.abox.manager.designsystem.icon.ABoxIconKey
 import com.flagship.abox.manager.domain.DeviceName
-import java.text.DateFormat
+import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale

@Composable
 fun TemperatureHumidityRoute(
@@ -75,20 +70,37 @@ fun TemperatureHumidityScreen(
    modifier: Modifier = Modifier,
 ) {
    val scrollState = rememberScrollState()
-    val configuration = LocalConfiguration.current
-    var showDeviceNameDialog by remember { mutableStateOf(false) }
-    ABoxDeviceDetailScaffold(
+    var showEditNameDialog by remember { mutableStateOf(false) }
+
+    Scaffold(
        modifier = modifier.fillMaxSize(),
-        title = state.deviceName?.value ?: stringResource(R.string.th_title),
-        onBack = onBackClick,
-        subtitle = stringResource(R.string.device_sensor_subtitle),
-        icon = ABoxIconKey.SENSOR,
-        action = {
-            ABoxIconButton(
-                key = ABoxIconKey.EDIT,
-                    contentDescription = stringResource(R.string.sensor_name_settings),
-                onClick = { showDeviceNameDialog = true },
-                enabled = !state.isLoading && !state.isRefreshing,
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        text = state.deviceName?.value ?: stringResource(R.string.th_title),
+                        style = MaterialTheme.typography.titleLarge,
+                    )
+                },
+                navigationIcon = {
+                    IconButton(onClick = onBackClick) {
+                        Text("<", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+                    }
+                },
+                actions = {
+                    IconButton(
+                        onClick = { showEditNameDialog = true },
+                        enabled = !state.isLoading && !state.isRefreshing,
+                    ) {
+                        Text("✎", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    }
+                    IconButton(
+                        onClick = { onEvent(TemperatureHumidityUiEvent.Refresh) },
+                        enabled = !state.isLoading && !state.isRefreshing,
+                    ) {
+                        Text("↻", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    }
+                },
            )
        },
    ) { paddingValues ->
@@ -139,41 +151,31 @@ fun TemperatureHumidityScreen(
                )
            } else {
                // Telemetry Cards Row / Column
-                Text(
-                    text = stringResource(R.string.sensor_current_readings),
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Bold,
-                    modifier = Modifier.fillMaxWidth().padding(top = 8.dp, bottom = 10.dp),
-                )
                Row(
                    modifier = Modifier
                        .fillMaxWidth()
-                        .padding(bottom = 16.dp),
+                        .padding(vertical = 12.dp),
                    horizontalArrangement = Arrangement.spacedBy(16.dp),
                ) {
                    TelemetryMetricCard(
                        title = stringResource(R.string.th_temperature_label),
-                        value = state.temperature,
+                        value = state.temperature ?: "--",
                        unit = stringResource(R.string.th_unit_celsius),
-                        icon = ABoxIconKey.TEMPERATURE,
-                        testTag = "sensor_metric_temperature",
+                        icon = "🌡️",
                        modifier = Modifier.weight(1f),
                    )

                    TelemetryMetricCard(
                        title = stringResource(R.string.th_humidity_label),
-                        value = state.humidity,
+                        value = state.humidity ?: "--",
                        unit = stringResource(R.string.th_unit_percent),
-                        icon = ABoxIconKey.HUMIDITY,
-                        testTag = "sensor_metric_humidity",
+                        icon = "💧",
                        modifier = Modifier.weight(1f),
                    )
                }

                state.lastUpdatedTimeMillis?.let { timeMillis ->
-                    val formattedTime = remember(timeMillis, configuration) {
-                        DateFormat.getTimeInstance(DateFormat.MEDIUM).format(Date(timeMillis))
-                    }
+                    val formattedTime = SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date(timeMillis))
                    Text(
                        text = stringResource(R.string.th_last_updated, formattedTime),
                        style = MaterialTheme.typography.bodySmall,
@@ -187,7 +189,7 @@ fun TemperatureHumidityScreen(

            // Read-Only Informational Card
            Card(
-                modifier = Modifier.fillMaxWidth().testTag("sensor_monitoring_notice"),
+                modifier = Modifier.fillMaxWidth(),
                colors = CardDefaults.cardColors(
                    containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
                ),
@@ -199,13 +201,13 @@ fun TemperatureHumidityScreen(
                        .padding(16.dp),
                ) {
                    Text(
-                        text = stringResource(R.string.sensor_monitoring_title),
+                        text = stringResource(R.string.th_read_only_notice),
                        style = MaterialTheme.typography.titleSmall,
                        fontWeight = FontWeight.SemiBold,
                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                    )
                    Text(
-                        text = stringResource(R.string.sensor_monitoring_description),
+                        text = stringResource(R.string.th_read_only_description),
                        style = MaterialTheme.typography.bodySmall,
                        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.85f),
                        modifier = Modifier.padding(top = 4.dp),
@@ -213,7 +215,7 @@ fun TemperatureHumidityScreen(
                }
            }

-            Spacer(modifier = Modifier.height(16.dp))
+            Spacer(modifier = Modifier.height(24.dp))

            // Refresh Button
            ABoxButton(
@@ -221,7 +223,7 @@ fun TemperatureHumidityScreen(
                enabled = !state.isLoading && !state.isRefreshing && state.profileId != null,
                modifier = Modifier
                    .fillMaxWidth()
-                    .height(56.dp),
+                    .height(52.dp),
            ) {
                if (state.isRefreshing || state.isLoading) {
                    ABoxLoadingIndicator(modifier = Modifier.size(22.dp))
@@ -237,59 +239,53 @@ fun TemperatureHumidityScreen(
        }
    }

-    if (showDeviceNameDialog) {
-        SensorDeviceNameDialog(
-            currentName = state.deviceName?.value.orEmpty(),
-            onDismiss = { showDeviceNameDialog = false },
-            onConfirm = { name ->
-                showDeviceNameDialog = false
-                onEvent(TemperatureHumidityUiEvent.ChangeDeviceName(DeviceName(name)))
+    if (showEditNameDialog) {
+        var inputName by remember(state.deviceName) { mutableStateOf(state.deviceName?.value.orEmpty()) }
+        AlertDialog(
+            onDismissRequest = { showEditNameDialog = false },
+            title = { Text(stringResource(R.string.dialog_edit_device_name_title)) },
+            text = {
+                OutlinedTextField(
+                    value = inputName,
+                    onValueChange = { inputName = it },
+                    label = { Text(stringResource(R.string.dialog_edit_device_name_hint)) },
+                    singleLine = true,
+                    modifier = Modifier.fillMaxWidth(),
+                )
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        val trimmed = inputName.trim()
+                        if (trimmed.isNotBlank()) {
+                            onEvent(TemperatureHumidityUiEvent.ChangeDeviceName(DeviceName(trimmed)))
+                        }
+                        showEditNameDialog = false
+                    },
+                    enabled = inputName.isNotBlank(),
+                ) {
+                    Text(stringResource(R.string.action_confirm))
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { showEditNameDialog = false }) {
+                    Text(stringResource(R.string.action_cancel))
+                }
            },
        )
    }
-
-}
-
-@Composable
-private fun SensorDeviceNameDialog(
-    currentName: String,
-    onDismiss: () -> Unit,
-    onConfirm: (String) -> Unit,
-) {
-    var value by remember(currentName) { mutableStateOf(currentName) }
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.sensor_name_settings)) },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                Text(stringResource(R.string.gateway_device_name_sensor_desc), style = MaterialTheme.typography.bodySmall)
-                OutlinedTextField(
-                    value = value,
-                    onValueChange = { value = it },
-                    label = { Text(stringResource(R.string.gateway_device_name)) },
-                    singleLine = true,
-                )
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = { onConfirm(value.trim()) }, enabled = value.isNotBlank()) { Text(stringResource(R.string.action_save_device_name)) }
-        },
-        dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } },
-    )
 }

@Composable
 private fun TelemetryMetricCard(
    title: String,
-    value: String?,
+    value: String,
    unit: String,
-    icon: ABoxIconKey,
-    testTag: String,
+    icon: String,
    modifier: Modifier = Modifier,
 ) {
-    if (value == null) return
    Card(
-        modifier = modifier.testTag(testTag),
+        modifier = modifier,
        colors = CardDefaults.cardColors(
            containerColor = MaterialTheme.colorScheme.surfaceVariant,
        ),
@@ -302,7 +298,10 @@ private fun TelemetryMetricCard(
            horizontalAlignment = Alignment.CenterHorizontally,
            verticalArrangement = Arrangement.Center,
        ) {
-            ABoxIcon(icon, contentDescription = title, modifier = Modifier.size(28.dp))
+            Text(
+                text = icon,
+                style = MaterialTheme.typography.headlineMedium,
+            )

            Spacer(modifier = Modifier.height(8.dp))

@@ -324,12 +323,14 @@ private fun TelemetryMetricCard(
                    fontWeight = FontWeight.Bold,
                    color = MaterialTheme.colorScheme.primary,
                )
-                Text(
-                    text = " $unit",
-                    style = MaterialTheme.typography.titleMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.padding(bottom = 4.dp),
-                )
+                if (value != "--") {
+                    Text(
+                        text = " $unit",
+                        style = MaterialTheme.typography.titleMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        modifier = Modifier.padding(bottom = 4.dp),
+                    )
+                }
            }
        }
    }
@@ -354,11 +355,7 @@ private fun NoDataCard(
            horizontalAlignment = Alignment.CenterHorizontally,
            verticalArrangement = Arrangement.Center,
        ) {
-            ABoxIcon(
-                key = ABoxIconKey.SENSOR,
-                contentDescription = "暂无传感器数据",
-                modifier = Modifier.size(40.dp),
-            )
+            Text("📭", style = MaterialTheme.typography.displaySmall)
            Spacer(modifier = Modifier.height(12.dp))
            Text(
                text = stringResource(R.string.th_no_data_title),
@@ -437,11 +434,9 @@ private fun ErrorBanner(
                style = MaterialTheme.typography.bodySmall,
                modifier = Modifier.weight(1f),
            )
-            ABoxIconButton(
-                key = ABoxIconKey.CLOSE,
-                contentDescription = "关闭错误提示",
-                onClick = onDismiss,
-            )
+            TextButton(onClick = onDismiss) {
+                Text("✕")
+            }
        }
    }
 }
@@ -16,11 +16,11 @@ data class TemperatureHumidityUiState(
    val errorMessage: UiText? = null,
    val lastUpdatedTimeMillis: Long? = null,
 ) {
-    val formattedTemperature: String?
-        get() = temperature?.takeIf { it.isNotBlank() }?.let { "$it °C" }
+    val formattedTemperature: String
+        get() = if (temperature.isNullOrBlank()) "--" else "$temperature °C"

-    val formattedHumidity: String?
-        get() = humidity?.takeIf { it.isNotBlank() }?.let { "$it %" }
+    val formattedHumidity: String
+        get() = if (humidity.isNullOrBlank()) "--" else "$humidity %"

    val hasValidData: Boolean
        get() = !temperature.isNullOrBlank() || !humidity.isNullOrBlank()
@@ -8,11 +8,7 @@ import com.flagship.abox.manager.domain.DomainError
 import com.flagship.abox.manager.domain.DomainResult
 import com.flagship.abox.manager.domain.ProviderProfileId
 import com.flagship.abox.manager.domain.TemperatureHumidityGateway
-import com.flagship.abox.manager.devicecatalog.data.ConfiguredDeviceRepository
 import com.flagship.abox.manager.ui.common.DomainErrorMapper
-import com.flagship.abox.manager.domain.ActivityEventWriter
-import com.flagship.abox.manager.domain.ActivityEventKind
-import com.flagship.abox.manager.domain.ActivityOutcome
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -26,8 +22,6 @@ import javax.inject.Inject
@HiltViewModel
 class TemperatureHumidityViewModel @Inject constructor(
    private val thGateway: TemperatureHumidityGateway,
-    private val configuredDeviceRepository: ConfiguredDeviceRepository,
-    private val activityWriter: ActivityEventWriter,
    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {

@@ -68,19 +62,18 @@ class TemperatureHumidityViewModel @Inject constructor(

            is TemperatureHumidityUiEvent.ChangeDeviceName -> {
                val trimmed = event.deviceName.value.trim()
-                val current = _state.value
-                val profileId = current.profileId
-                val oldName = current.deviceName
-                if (trimmed.isNotBlank() && trimmed != oldName?.value && profileId != null && oldName != null) {
-                    viewModelScope.launch {
-                        when (val result = configuredDeviceRepository.rename(profileId, oldName, DeviceName(trimmed))) {
-                            is DomainResult.Success -> {
-                                _state.update { it.copy(deviceName = DeviceName(trimmed), temperature = null, humidity = null, hasNoData = false, errorMessage = null, lastUpdatedTimeMillis = null) }
-                                loadReading(isRefresh = false)
-                            }
-                            is DomainResult.Failure -> _state.update { it.copy(errorMessage = DomainErrorMapper.map(result.error)) }
-                        }
+                if (trimmed.isNotBlank() && trimmed != _state.value.deviceName?.value) {
+                    _state.update {
+                        it.copy(
+                            deviceName = DeviceName(trimmed),
+                            temperature = null,
+                            humidity = null,
+                            hasNoData = false,
+                            errorMessage = null,
+                            lastUpdatedTimeMillis = null,
+                        )
                    }
+                    loadReading(isRefresh = false)
                }
            }

@@ -107,13 +100,12 @@ class TemperatureHumidityViewModel @Inject constructor(

            when (val result = thGateway.getReading(profileId, deviceName)) {
                is DomainResult.Success -> {
-                    if (isRefresh) activityWriter.recordDevice(profileId, deviceName, ActivityEventKind.SENSOR_REFRESH, ActivityOutcome.SUCCEEDED)
                    val reading = result.value
-                    val isBlankData = reading.temperature.isNullOrBlank() && reading.humidity.isNullOrBlank()
+                    val isBlankData = reading.temperature.isBlank() && reading.humidity.isBlank()
                    _state.update {
                        it.copy(
-                            temperature = reading.temperature?.takeIf { t -> t.isNotBlank() },
-                            humidity = reading.humidity?.takeIf { h -> h.isNotBlank() },
+                            temperature = reading.temperature.takeIf { t -> t.isNotBlank() },
+                            humidity = reading.humidity.takeIf { h -> h.isNotBlank() },
                            isLoading = false,
                            isRefreshing = false,
                            isOffline = false,
@@ -125,7 +117,6 @@ class TemperatureHumidityViewModel @Inject constructor(
                }

                is DomainResult.Failure -> {
-                    if (isRefresh) activityWriter.recordDevice(profileId, deviceName, ActivityEventKind.SENSOR_REFRESH, ActivityOutcome.FAILED, result.error.externalCode)
                    val isOffline = result.error is DomainError.DeviceOffline
                    val hasNoData = result.error is DomainError.NoData
                    _state.update {
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.58 2,12.26c0,4.53 2.87,8.37 6.84,9.73c0.5,0.09 0.68,-0.22 0.68,-0.49c0,-0.24 -0.01,-0.88 -0.01,-1.49c-2.78,0.62 -3.37,-1.37 -3.37,-1.37c-0.45,-1.18 -1.11,-1.5 -1.11,-1.5c-0.91,-0.64 0.07,-0.62 0.07,-0.62c1.01,0.07 1.53,1.06 1.53,1.06c0.89,1.57 2.34,1.12 2.91,0.86c0.09,-0.66 0.35,-1.12 0.63,-1.38c-2.22,-0.26 -4.56,-1.14 -4.56,-5.07c0,-1.12 0.39,-2.03 1.03,-2.75c-0.1,-0.26 -0.45,-1.3 0.1,-2.71c0,0 0.84,-0.28 2.75,1.05c0.8,-0.23 1.65,-0.34 2.5,-0.34c0.85,0 1.7,0.12 2.5,0.34c1.91,-1.33 2.75,-1.05 2.75,-1.05c0.55,1.41 0.2,2.45 0.1,2.71c0.64,0.71 1.03,1.63 1.03,2.75c0,3.94 -2.34,4.8 -4.57,5.06c0.36,0.31 0.68,0.92 0.68,1.86c0,1.34 -0.01,2.42 -0.01,2.75c0,0.27 0.18,0.58 0.69,0.48c3.97,-1.36 6.83,-5.2 6.83,-9.73C22,6.58 17.52,2 12,2z"/>
-</vector>
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<color xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#F8FAFC" />
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-</adaptive-icon>
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">ABox 家庭</string>
+    <string name="app_name">ABox Manager</string>
    <string name="provider_selection_title">选择提供方</string>
    <string name="provider_selection_description">选择当前配置的连接方式。不同提供方之间的会话、凭据和本地数据相互隔离。</string>
    <string name="provider_abox_name">ABox</string>
@@ -57,7 +57,6 @@
    <string name="scene_empty_message">点击右下角按钮，建立一键指令或带触发器的自动指令。</string>
    <string name="scene_action_run_now">立即执行</string>
    <string name="scene_toast_executed">指令已触发执行</string>
-    <string name="scene_toast_failed">指令执行失败</string>

    <!-- Scene: delete dialog -->
    <string name="scene_delete_dialog_title">删除指令</string>
@@ -83,9 +82,9 @@
    <string name="scene_section_other">其他选项与外观</string>

    <!-- Add Buttons -->
-    <string name="scene_add_trigger">新增触发器</string>
-    <string name="scene_add_condition">新增条件</string>
-    <string name="scene_add_action_btn">新增动作</string>
+    <string name="scene_add_trigger">＋ 新增触发器</string>
+    <string name="scene_add_condition">＋ 新增条件</string>
+    <string name="scene_add_action_btn">＋ 新增动作</string>
    <string name="scene_add_action">添加</string>
    <string name="scene_save_action">保存指令</string>

@@ -105,10 +104,10 @@

    <!-- Trigger Types & Dialog -->
    <string name="scene_dialog_add_trigger_title">选择触发器类型</string>
-    <string name="scene_trigger_type_time">定时时间触发</string>
-    <string name="scene_trigger_type_temp">环境温度触发</string>
-    <string name="scene_trigger_type_humidity">环境湿度触发</string>
-    <string name="scene_trigger_type_device">插座状态变更触发</string>
+    <string name="scene_trigger_type_time">⏰ 定时时间触发</string>
+    <string name="scene_trigger_type_temp">🌡️ 环境温度触发</string>
+    <string name="scene_trigger_type_humidity">💧 环境湿度触发</string>
+    <string name="scene_trigger_type_device">🔌 插座状态变更触发</string>
    <string name="scene_trigger_time_label">触发时间点（如：07:30）</string>
    <string name="scene_trigger_temp_threshold">温度阈值 (°C)</string>
    <string name="scene_trigger_humidity_threshold">湿度阈值 (%)</string>
@@ -119,19 +118,19 @@

    <!-- Condition Types & Dialog -->
    <string name="scene_dialog_add_condition_title">选择限制条件</string>
-    <string name="scene_condition_type_temp">环境温度范围</string>
-    <string name="scene_condition_type_humidity">环境湿度范围</string>
-    <string name="scene_condition_type_socket">插座当前电源状态</string>
-    <string name="scene_condition_type_time_range">生效时间区间</string>
+    <string name="scene_condition_type_temp">🌡️ 环境温度范围</string>
+    <string name="scene_condition_type_humidity">💧 环境湿度范围</string>
+    <string name="scene_condition_type_socket">🔌 插座当前电源状态</string>
+    <string name="scene_condition_type_time_range">🕒 生效时间区间</string>
    <string name="scene_condition_start_time">起始时间（如：22:00）</string>
    <string name="scene_condition_end_time">结束时间（如：07:00）</string>

    <!-- Action Types & Dialog -->
    <string name="scene_dialog_add_action_title">选择执行动作</string>
-    <string name="scene_action_type_socket">智能插座控制</string>
-    <string name="scene_action_type_virtual_remote">红外遥控按键</string>
-    <string name="scene_action_type_delay">延时等待（缓冲）</string>
-    <string name="scene_action_type_notification">发送系统提示</string>
+    <string name="scene_action_type_socket">🔌 智能插座控制</string>
+    <string name="scene_action_type_virtual_remote">📺 红外遥控按键</string>
+    <string name="scene_action_type_delay">⏱️ 延时等待 (缓冲)</string>
+    <string name="scene_action_type_notification">🔔 发送系统提示</string>
    <string name="scene_select_socket">选择目标插座</string>
    <string name="scene_socket_power_state">设定电源状态</string>
    <string name="scene_select_virtual_remote">选择虚拟遥控器</string>
@@ -145,8 +144,8 @@
    <string name="scene_action_socket">插座【%1$s】: 设为 %2$s</string>
    <string name="scene_action_remote">遥控【%1$s】: 发送 %2$s</string>
    <string name="scene_action_infrared">红外【%1$s】: 槽位 %2$s</string>
-    <string name="scene_action_delay">等待 %1$d 秒</string>
-    <string name="scene_action_notification">提示：%1$s</string>
+    <string name="scene_action_delay">⏱️ 等待 %1$d 秒</string>
+    <string name="scene_action_notification">🔔 提示: %1$s</string>

    <!-- Scene: execution -->
    <string name="scene_execution_title">执行指令</string>
@@ -165,13 +164,13 @@
    <!-- 校验与弹窗选项/占位文案 -->
    <string name="scene_trigger_time_error">时间格式无效（请按 HH:mm 格式输入，如 07:30）</string>
    <string name="scene_condition_time_error">时间格式无效（请按 HH:mm 格式输入，如 22:00）</string>
-    <string name="scene_chip_time">定时</string>
-    <string name="scene_chip_temp">温度</string>
-    <string name="scene_chip_humidity">湿度</string>
-    <string name="scene_chip_socket">插座</string>
-    <string name="scene_chip_remote">遥控</string>
-    <string name="scene_chip_delay">延时</string>
-    <string name="scene_chip_notify">提示</string>
+    <string name="scene_chip_time">⏰ 定时</string>
+    <string name="scene_chip_temp">🌡️ 温度</string>
+    <string name="scene_chip_humidity">💧 湿度</string>
+    <string name="scene_chip_socket">🔌 插座</string>
+    <string name="scene_chip_remote">📺 遥控</string>
+    <string name="scene_chip_delay">⏱️ 延时</string>
+    <string name="scene_chip_notify">🔔 提示</string>
    <string name="scene_chip_above">&gt; 高于</string>
    <string name="scene_chip_below">&lt; 低于</string>
    <string name="scene_chip_power_on">开启</string>
@@ -185,7 +184,7 @@
    <string name="scene_empty_triggers_hint">尚未添加触发器，请点击下方按钮添加</string>
    <string name="scene_empty_conditions_hint">尚未添加限制条件，请点击下方按钮添加</string>
    <string name="scene_empty_actions_hint">尚未添加执行动作，请点击下方按钮添加</string>
-    <string name="scene_summary_triggers_and_actions">%1$d 个触发器 · %2$d 个动作</string>
+    <string name="scene_summary_triggers_and_actions">⚡ %1$d 个触发器  •  %2$d 个动作</string>
    <string name="scene_summary_actions_only">%1$d 个执行动作</string>
    <string name="scene_exec_ready_hint">点击下方按钮立即开始执行</string>
    <string name="scene_exec_rerun">重新执行</string>
@@ -223,6 +222,8 @@
    <string name="socket_status_offline">已离线</string>
    <string name="socket_status_unknown">未知状态</string>
    <string name="socket_action_toggle">切换电源</string>
+    <string name="socket_action_turn_on">开启插座</string>
+    <string name="socket_action_turn_off">关闭插座</string>
    <string name="socket_operating_label">正在切换状态…</string>
    <string name="socket_confirmed_at">已于 %1$s 确认状态</string>

@@ -258,147 +259,4 @@
    <string name="error_operation_failed">操作执行失败，请重试。</string>
    <string name="error_no_data">暂无可用数据。</string>
    <string name="error_unknown">发生未知错误。</string>
-
-    <!-- Interface settings -->
-    <string name="settings_title">界面设置</string>
-    <string name="settings_style_section">样式</string>
-    <string name="settings_renderer_label">渲染器</string>
-    <string name="settings_renderer_description">选择应用使用的界面渲染方式</string>
-    <string name="settings_renderer_material3">Material</string>
-    <string name="settings_renderer_miuix">Miuix</string>
-    <string name="settings_theme_section">主题</string>
-    <string name="settings_theme_label">主题模式</string>
-    <string name="settings_theme_system">跟随系统</string>
-    <string name="settings_theme_light">浅色</string>
-    <string name="settings_theme_dark">深色</string>
-    <string name="settings_dynamic_color">动态取色</string>
-    <string name="settings_dynamic_color_description">使用系统壁纸颜色生成界面配色</string>
-    <string name="settings_surface_section">界面效果</string>
-    <string name="settings_blur">模糊效果</string>
-    <string name="settings_blur_description">在支持的界面中启用背景模糊</string>
-    <string name="settings_navigation">导航样式</string>
-    <string name="settings_navigation_standard">标准导航栏</string>
-    <string name="settings_navigation_floating">悬浮导航栏</string>
-    <string name="settings_feedback_section">交互反馈</string>
-    <string name="settings_haptics">触觉反馈</string>
-    <string name="settings_haptics_description">操作时提供轻微震动反馈</string>
-    <string name="settings_accessibility_section">系统辅助功能</string>
-    <string name="settings_accessibility_card_title">遵循系统辅助功能设置</string>
-    <string name="settings_accessibility_description">动画、字体大小和对比度等辅助功能由系统设置控制，应用会遵循系统偏好。</string>
-    <string name="settings_error_save">无法保存界面设置，请重试</string>
-    <string name="settings_style_entry">界面风格</string>
-    <string name="settings_theme_entry">主题</string>
-    <string name="settings_theme_entry_description">配色、明暗、视觉效果与缩放</string>
-    <string name="settings_theme_detail_title">主题</string>
-    <string name="settings_renderer_primary">Material</string>
-    <string name="settings_renderer_secondary">Miuix</string>
-    <string name="settings_navigation_floating_description">让底部导航独立悬浮在页面内容上方</string>
-    <string name="settings_accent_label">强调色</string>
-    <string name="settings_scale">界面缩放</string>
-    <string name="settings_scale_description">调整界面元素的显示比例</string>
-    <string name="settings_color_style">色彩风格</string>
-    <string name="settings_color_style_tonal">Tonal Spot</string>
-    <string name="settings_color_style_expressive">Expressive</string>
-    <string name="settings_color_style_fidelity">Fidelity</string>
-    <string name="settings_color_standard">色彩规范</string>
-    <string name="settings_color_standard_2021">Spec 2021</string>
-    <string name="settings_color_standard_2025">Spec 2025</string>
-    <string name="settings_liquid_glass">液态玻璃</string>
-    <string name="settings_liquid_glass_description">为悬浮底栏启用半透明玻璃质感</string>
-    <string name="settings_predictive_back">预测性返回手势</string>
-    <string name="settings_predictive_back_description">侧滑返回时预览即将返回的页面</string>
-    <string name="settings_tap_to_choose">点击选择</string>
-    <string name="settings_requires_android_13">需要 Android 13 或更高版本</string>
-    <string name="settings_requires_floating_navigation">请先启用悬浮底栏</string>
-
-    <!-- Redesigned device center and account surfaces -->
-    <string name="device_center_heading">已连接终端设备</string>
-    <string name="device_center_description">选择需要控制或查看状态的终端设备</string>
-    <string name="device_center_loading">正在加载设备</string>
-    <string name="device_center_empty_title">尚未配置可管理设备</string>
-    <string name="device_center_empty_description">请先配置网关设备名称和类型</string>
-    <string name="device_center_configure">配置设备</string>
-    <string name="device_center_error">设备列表加载失败</string>
-    <string name="device_center_configure_title">配置设备</string>
-    <string name="device_center_device_name">设备名称</string>
-    <string name="device_status_unavailable">状态不可用</string>
-    <string name="device_status_offline">离线</string>
-    <string name="device_status_switching">正在切换</string>
-    <string name="device_status_awaiting_confirmation">等待状态确认</string>
-    <string name="device_status_on">已开启</string>
-    <string name="device_status_off">已关闭</string>
-    <string name="device_status_confirmed">状态已确认</string>
-    <string name="device_status_waiting_first_confirmation">等待首次确认</string>
-    <string name="device_open_control_panel">控制面板</string>
-    <string name="device_sensor_subtitle">环境传感器 · 只读监控</string>
-    <string name="device_live_reading">实时设备读数</string>
-    <string name="device_details">详情</string>
-    <string name="device_metric_no_data">无数据</string>
-    <string name="device_infrared_subtitle">红外控制器 · %1$d 个虚拟遥控器</string>
-    <string name="device_infrared_mounted">已挂载：%1$s</string>
-    <string name="device_infrared_no_remotes">暂无遥控器</string>
-    <string name="device_infrared_slots">硬件槽位 %1$d/%2$d</string>
-    <string name="device_infrared_slots_unavailable">槽位状态不可用</string>
-    <string name="device_infrared_center">红外中枢</string>
-    <string name="account_current">当前账户</string>
-    <string name="account_greeting">%1$s，您好</string>
-    <string name="account_connection_method">连接方式</string>
-    <string name="account_interface_settings">主题</string>
-    <string name="account_interface_settings_desc">配色、明暗、视觉效果与缩放</string>
-    <string name="account_logout">退出当前会话</string>
-    <string name="account_logout_desc">结束当前连接并返回登录流程</string>
-    <string name="account_logout_confirm">确定退出当前会话吗？</string>
-    <string name="account_about">关于</string>
-    <string name="account_about_desc">App 信息、版本与开发团队</string>
-    <string name="about_title">关于</string>
-    <string name="about_tagline">面向 Android 的 ABox 智能家居管理应用</string>
-    <string name="about_app_info">App 信息</string>
-    <string name="about_version">版本</string>
-    <string name="about_package">应用包名</string>
-    <string name="about_platform">平台</string>
-    <string name="about_platform_value">Android 手机与平板</string>
-    <string name="about_product">产品介绍</string>
-    <string name="about_product_desc">ABox 家庭通过 ABSDK 连接 ABox 网关，提供设备控制、红外遥控器、情景、自动化与活动记录。本地体验提供独立的模拟环境，不使用 ABox 凭据。</string>
-    <string name="about_team">开发团队</string>
-    <string name="about_role_foundation">项目架构与全模块开发</string>
-    <string name="about_role_devices">设备目录与导航</string>
-    <string name="about_role_environment">插座与环境传感器</string>
-    <string name="about_role_infrared">红外遥控器</string>
-    <string name="about_role_scenes">情景与应用集成</string>
-    <string name="about_copyright">由 Flagship 开发团队共同构建。</string>
-    <string name="about_unknown">未知</string>
-    <string name="about_link_github">GitHub 主页</string>
-    <string name="about_link_personal">个人主页</string>
-    <string name="scene_create_sheet_title">新建指令</string>
-    <string name="scene_create_sheet_description">选择指令的启动方式</string>
-    <string name="scene_create_manual_description">手动点击运行，适合常用的一键设备组合。</string>
-    <string name="scene_create_automatic_description">根据时间、设备状态或传感器条件自动执行。</string>
-    <string name="socket_detail_subtitle">智能插座 · 状态确认控制</string>
-    <string name="socket_name_settings">设置插座设备名称</string>
-    <string name="sensor_name_settings">设置传感器设备名称</string>
-    <string name="gateway_device_name">网关设备名称</string>
-    <string name="gateway_device_name_socket_desc">用于匹配和控制网关设备，必须与网关中的名称完全一致。</string>
-    <string name="gateway_device_name_sensor_desc">用于匹配和读取网关设备，必须与网关中的名称完全一致。</string>
-    <string name="action_save_device_name">保存设备名称</string>
-    <string name="socket_confirmation_hint">指令只有在网关回读到结果状态后才会确认。等待确认时可使用刷新操作。</string>
-    <string name="sensor_current_readings">当前读数</string>
-    <string name="sensor_monitoring_title">实时环境监控</string>
-    <string name="sensor_monitoring_description">数据直接来自当前设备。缺失指标保持不显示，不使用估算值或占位数据。</string>
-    <string name="infrared_center_title">红外遥控中心</string>
-    <string name="infrared_settings_title">红外设备设置</string>
-    <string name="infrared_settings_subtitle">遥控器、槽位与网关设备名称</string>
-    <string name="infrared_manage_title">虚拟遥控器</string>
-    <string name="infrared_remote_count">%1$d 个遥控器</string>
-    <string name="infrared_add_remote">添加遥控器</string>
-    <string name="infrared_hardware_slots_title">硬件槽位</string>
-    <string name="infrared_gateway_name_title">网关设备名称</string>
-    <string name="infrared_gateway_name_desc">用于在网关中匹配红外控制器，必须与网关中的设备名称完全一致。</string>
-    <string name="infrared_save_name">保存设备名称</string>
-    <string name="infrared_edit_remote">编辑遥控器</string>
-    <string name="infrared_move_remote">调整遥控器顺序</string>
-    <string name="infrared_move_up">上移</string>
-    <string name="infrared_move_down">下移</string>
-    <string name="infrared_delete_remote">删除遥控器</string>
-    <string name="infrared_layout">面板布局</string>
-    <string name="infrared_transmission_mode">传输模式</string>
 </resources>
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">ABox Home</string>
+    <string name="app_name">ABox Manager</string>
    <string name="provider_selection_title">Choose a provider</string>
    <string name="provider_selection_description">Choose how this profile connects. Sessions, credentials, and local data stay isolated between providers.</string>
    <string name="provider_abox_name">ABox</string>
@@ -57,7 +57,6 @@
    <string name="scene_empty_message">Tap the button below to create instant commands or trigger-based automatic rules.</string>
    <string name="scene_action_run_now">Run Now</string>
    <string name="scene_toast_executed">Command triggered</string>
-    <string name="scene_toast_failed">Command execution failed</string>

    <!-- Scene: delete dialog -->
    <string name="scene_delete_dialog_title">Delete Command</string>
@@ -83,9 +82,9 @@
    <string name="scene_section_other">Other Options &amp; Appearance</string>

    <!-- Add Buttons -->
-    <string name="scene_add_trigger">Add Trigger</string>
-    <string name="scene_add_condition">Add Condition</string>
-    <string name="scene_add_action_btn">Add Action</string>
+    <string name="scene_add_trigger">＋ Add Trigger</string>
+    <string name="scene_add_condition">＋ Add Condition</string>
+    <string name="scene_add_action_btn">＋ Add Action</string>
    <string name="scene_add_action">Add</string>
    <string name="scene_save_action">Save Command</string>

@@ -105,10 +104,10 @@

    <!-- Trigger Types & Dialog -->
    <string name="scene_dialog_add_trigger_title">Select Trigger Type</string>
-    <string name="scene_trigger_type_time">Time / Schedule Trigger</string>
-    <string name="scene_trigger_type_temp">Temperature Threshold</string>
-    <string name="scene_trigger_type_humidity">Humidity Threshold</string>
-    <string name="scene_trigger_type_device">Socket State Changed</string>
+    <string name="scene_trigger_type_time">⏰ Time / Schedule Trigger</string>
+    <string name="scene_trigger_type_temp">🌡️ Temperature Threshold</string>
+    <string name="scene_trigger_type_humidity">💧 Humidity Threshold</string>
+    <string name="scene_trigger_type_device">🔌 Socket State Changed</string>
    <string name="scene_trigger_time_label">Trigger Time (e.g. 07:30)</string>
    <string name="scene_trigger_temp_threshold">Temperature Threshold (°C)</string>
    <string name="scene_trigger_humidity_threshold">Humidity Threshold (%)</string>
@@ -119,19 +118,19 @@

    <!-- Condition Types & Dialog -->
    <string name="scene_dialog_add_condition_title">Select Condition</string>
-    <string name="scene_condition_type_temp">Temperature Range</string>
-    <string name="scene_condition_type_humidity">Humidity Range</string>
-    <string name="scene_condition_type_socket">Current Socket Power</string>
-    <string name="scene_condition_type_time_range">Active Time Range</string>
+    <string name="scene_condition_type_temp">🌡️ Temperature Range</string>
+    <string name="scene_condition_type_humidity">💧 Humidity Range</string>
+    <string name="scene_condition_type_socket">🔌 Current Socket Power</string>
+    <string name="scene_condition_type_time_range">🕒 Active Time Range</string>
    <string name="scene_condition_start_time">Start Time (e.g. 22:00)</string>
    <string name="scene_condition_end_time">End Time (e.g. 07:00)</string>

    <!-- Action Types & Dialog -->
    <string name="scene_dialog_add_action_title">Select Action</string>
-    <string name="scene_action_type_socket">Smart Socket Control</string>
-    <string name="scene_action_type_virtual_remote">Infrared Remote Button</string>
-    <string name="scene_action_type_delay">Delay / Buffer Timer</string>
-    <string name="scene_action_type_notification">System Notification</string>
+    <string name="scene_action_type_socket">🔌 Smart Socket Control</string>
+    <string name="scene_action_type_virtual_remote">📺 Infrared Remote Button</string>
+    <string name="scene_action_type_delay">⏱️ Delay / Buffer Timer</string>
+    <string name="scene_action_type_notification">🔔 System Notification</string>
    <string name="scene_select_socket">Select Target Socket</string>
    <string name="scene_socket_power_state">Target Power State</string>
    <string name="scene_select_virtual_remote">Select Virtual Remote</string>
@@ -145,8 +144,8 @@
    <string name="scene_action_socket">Socket [%1$s]: Set %2$s</string>
    <string name="scene_action_remote">Remote [%1$s]: Send %2$s</string>
    <string name="scene_action_infrared">Infrared [%1$s]: Slot %2$s</string>
-    <string name="scene_action_delay">Delay %1$d seconds</string>
-    <string name="scene_action_notification">Notify: %1$s</string>
+    <string name="scene_action_delay">⏱️ Delay %1$d seconds</string>
+    <string name="scene_action_notification">🔔 Notify: %1$s</string>

    <!-- Scene: execution -->
    <string name="scene_execution_title">Execute Command</string>
@@ -165,13 +164,13 @@
    <!-- Validation & dialog chips / placeholders -->
    <string name="scene_trigger_time_error">Invalid time format (use HH:mm, e.g. 07:30)</string>
    <string name="scene_condition_time_error">Invalid time format (use HH:mm, e.g. 22:00)</string>
-    <string name="scene_chip_time">Schedule</string>
-    <string name="scene_chip_temp">Temperature</string>
-    <string name="scene_chip_humidity">Humidity</string>
-    <string name="scene_chip_socket">Socket</string>
-    <string name="scene_chip_remote">Remote</string>
-    <string name="scene_chip_delay">Delay</string>
-    <string name="scene_chip_notify">Notify</string>
+    <string name="scene_chip_time">⏰ Schedule</string>
+    <string name="scene_chip_temp">🌡️ Temperature</string>
+    <string name="scene_chip_humidity">💧 Humidity</string>
+    <string name="scene_chip_socket">🔌 Socket</string>
+    <string name="scene_chip_remote">📺 Remote</string>
+    <string name="scene_chip_delay">⏱️ Delay</string>
+    <string name="scene_chip_notify">🔔 Notify</string>
    <string name="scene_chip_above">&gt; Above</string>
    <string name="scene_chip_below">&lt; Below</string>
    <string name="scene_chip_power_on">Turn ON</string>
@@ -185,7 +184,7 @@
    <string name="scene_empty_triggers_hint">No triggers configured. Tap + below to add.</string>
    <string name="scene_empty_conditions_hint">No conditions configured. Tap + below to add.</string>
    <string name="scene_empty_actions_hint">No actions configured. Tap + below to add.</string>
-    <string name="scene_summary_triggers_and_actions">%1$d triggers · %2$d actions</string>
+    <string name="scene_summary_triggers_and_actions">⚡ %1$d triggers  •  %2$d actions</string>
    <string name="scene_summary_actions_only">%1$d actions</string>
    <string name="scene_exec_ready_hint">Tap the button below to run immediately</string>
    <string name="scene_exec_rerun">Re-run</string>
@@ -223,6 +222,8 @@
    <string name="socket_status_offline">Offline</string>
    <string name="socket_status_unknown">Unknown</string>
    <string name="socket_action_toggle">Toggle Power</string>
+    <string name="socket_action_turn_on">Turn ON</string>
+    <string name="socket_action_turn_off">Turn OFF</string>
    <string name="socket_operating_label">Updating socket state…</string>
    <string name="socket_confirmed_at">Confirmed at %1$s</string>

@@ -260,145 +261,30 @@
    <string name="error_unknown">An unexpected error occurred.</string>

    <!-- Interface settings -->
-    <string name="settings_title">Interface settings</string>
-    <string name="settings_style_section">Style</string>
-    <string name="settings_renderer_label">Renderer</string>
-    <string name="settings_renderer_description">Choose the interface renderer used by the app</string>
-    <string name="settings_renderer_material3">Material</string>
+    <string name="settings_title">界面设置</string>
+    <string name="settings_style_section">样式</string>
+    <string name="settings_renderer_label">渲染器</string>
+    <string name="settings_renderer_description">选择应用使用的界面渲染方式</string>
+    <string name="settings_renderer_material3">Material 3</string>
    <string name="settings_renderer_miuix">Miuix</string>
-    <string name="settings_theme_section">Theme</string>
-    <string name="settings_theme_label">Theme mode</string>
-    <string name="settings_theme_system">Follow system</string>
-    <string name="settings_theme_light">Light</string>
-    <string name="settings_theme_dark">Dark</string>
-    <string name="settings_dynamic_color">Dynamic color</string>
-    <string name="settings_dynamic_color_description">Generate interface colors from the system wallpaper</string>
-    <string name="settings_surface_section">Surface effects</string>
-    <string name="settings_blur">Blur effects</string>
-    <string name="settings_blur_description">Enable background blur on supported screens</string>
-    <string name="settings_navigation">Navigation style</string>
-    <string name="settings_navigation_standard">Standard navigation</string>
-    <string name="settings_navigation_floating">Floating navigation</string>
-    <string name="settings_feedback_section">Interaction feedback</string>
-    <string name="settings_haptics">Haptic feedback</string>
-    <string name="settings_haptics_description">Provide subtle vibration feedback for actions</string>
-    <string name="settings_accessibility_section">System accessibility</string>
-    <string name="settings_accessibility_card_title">Follow system accessibility settings</string>
-    <string name="settings_accessibility_description">Animation, font size, contrast and other accessibility options are controlled by the system.</string>
-    <string name="settings_error_save">Unable to save interface settings. Try again.</string>
-    <string name="settings_style_entry">Interface style</string>
-    <string name="settings_theme_entry">Theme</string>
-    <string name="settings_theme_entry_description">Colors, brightness, effects and scale</string>
-    <string name="settings_theme_detail_title">Theme</string>
-    <string name="settings_renderer_primary">Material</string>
-    <string name="settings_renderer_secondary">Miuix</string>
-    <string name="settings_navigation_floating_description">Use a detached navigation surface above page content</string>
-    <string name="settings_accent_label">Accent color</string>
-    <string name="settings_scale">Interface scale</string>
-    <string name="settings_scale_description">Adjust the size of interface elements</string>
-    <string name="settings_color_style">Color style</string>
-    <string name="settings_color_style_tonal">Tonal Spot</string>
-    <string name="settings_color_style_expressive">Expressive</string>
-    <string name="settings_color_style_fidelity">Fidelity</string>
-    <string name="settings_color_standard">Color standard</string>
-    <string name="settings_color_standard_2021">Spec 2021</string>
-    <string name="settings_color_standard_2025">Spec 2025</string>
-    <string name="settings_liquid_glass">Liquid glass</string>
-    <string name="settings_liquid_glass_description">Apply a translucent glass surface to floating navigation</string>
-    <string name="settings_predictive_back">Predictive back gesture</string>
-    <string name="settings_predictive_back_description">Preview the destination while swiping back</string>
-    <string name="settings_tap_to_choose">Tap to choose</string>
-    <string name="settings_requires_android_13">Requires Android 13 or later</string>
-    <string name="settings_requires_floating_navigation">Enable floating navigation first</string>
-
-    <!-- Redesigned device center and account surfaces -->
-    <string name="device_center_heading">Connected devices</string>
-    <string name="device_center_description">Select a device to control it or view its current state</string>
-    <string name="device_center_loading">Loading devices</string>
-    <string name="device_center_empty_title">No manageable devices configured</string>
-    <string name="device_center_empty_description">Configure a gateway device name and type first</string>
-    <string name="device_center_configure">Configure device</string>
-    <string name="device_center_error">Unable to load devices</string>
-    <string name="device_center_configure_title">Configure device</string>
-    <string name="device_center_device_name">Device name</string>
-    <string name="device_status_unavailable">Status unavailable</string>
-    <string name="device_status_offline">Offline</string>
-    <string name="device_status_switching">Switching</string>
-    <string name="device_status_awaiting_confirmation">Awaiting confirmation</string>
-    <string name="device_status_on">On</string>
-    <string name="device_status_off">Off</string>
-    <string name="device_status_confirmed">State confirmed</string>
-    <string name="device_status_waiting_first_confirmation">Waiting for first confirmation</string>
-    <string name="device_open_control_panel">Control panel</string>
-    <string name="device_sensor_subtitle">Environment sensor · Read-only monitoring</string>
-    <string name="device_live_reading">Live device reading</string>
-    <string name="device_details">Details</string>
-    <string name="device_metric_no_data">No data</string>
-    <string name="device_infrared_subtitle">Infrared controller · %1$d virtual remotes</string>
-    <string name="device_infrared_mounted">Mounted: %1$s</string>
-    <string name="device_infrared_no_remotes">No remotes</string>
-    <string name="device_infrared_slots">Hardware slots %1$d/%2$d</string>
-    <string name="device_infrared_slots_unavailable">Slot state unavailable</string>
-    <string name="device_infrared_center">Infrared center</string>
-    <string name="account_current">Current account</string>
-    <string name="account_greeting">Hello, %1$s</string>
-    <string name="account_connection_method">Connection method</string>
-    <string name="account_interface_settings">Theme</string>
-    <string name="account_interface_settings_desc">Colors, brightness, effects and scale</string>
-    <string name="account_logout">Sign out</string>
-    <string name="account_logout_desc">End the current connection and return to sign-in</string>
-    <string name="account_logout_confirm">Sign out of the current session?</string>
-    <string name="account_about">About</string>
-    <string name="account_about_desc">App information, version, and development team</string>
-    <string name="about_title">About</string>
-    <string name="about_tagline">ABox smart home management for Android</string>
-    <string name="about_app_info">App information</string>
-    <string name="about_version">Version</string>
-    <string name="about_package">Package</string>
-    <string name="about_platform">Platform</string>
-    <string name="about_platform_value">Android phones and tablets</string>
-    <string name="about_product">Product</string>
-    <string name="about_product_desc">ABox Home connects to an ABox gateway through ABSDK and provides device control, infrared remotes, scenes, automation, and activity history. Local Experience offers an isolated simulation environment without using ABox credentials.</string>
-    <string name="about_team">Development team</string>
-    <string name="about_role_foundation">Project architecture and development across all modules</string>
-    <string name="about_role_devices">Device catalog and navigation</string>
-    <string name="about_role_environment">Socket and environment sensors</string>
-    <string name="about_role_infrared">Infrared remotes</string>
-    <string name="about_role_scenes">Scenes and integration</string>
-    <string name="about_copyright">Developed by Flagship.</string>
-    <string name="about_unknown">Unknown</string>
-    <string name="about_link_github">GitHub profile</string>
-    <string name="about_link_personal">Personal website</string>
-    <string name="scene_create_sheet_title">New command</string>
-    <string name="scene_create_sheet_description">Choose how the command starts</string>
-    <string name="scene_create_manual_description">Run manually for frequently used device combinations.</string>
-    <string name="scene_create_automatic_description">Run automatically from time, device, or sensor conditions.</string>
-    <string name="socket_detail_subtitle">Smart socket · confirmed control</string>
-    <string name="socket_name_settings">Set socket device name</string>
-    <string name="sensor_name_settings">Set sensor device name</string>
-    <string name="gateway_device_name">Gateway device name</string>
-    <string name="gateway_device_name_socket_desc">Used to match and control the gateway device. It must exactly match the gateway name.</string>
-    <string name="gateway_device_name_sensor_desc">Used to match and read the gateway device. It must exactly match the gateway name.</string>
-    <string name="action_save_device_name">Save device name</string>
-    <string name="socket_confirmation_hint">A command is confirmed only after the gateway reports the resulting state. Refresh while confirmation is pending.</string>
-    <string name="sensor_current_readings">Current readings</string>
-    <string name="sensor_monitoring_title">Live environment monitoring</string>
-    <string name="sensor_monitoring_description">Values come directly from the current device. Missing metrics remain absent; no estimates or placeholders are used.</string>
-    <string name="infrared_center_title">Infrared remote center</string>
-    <string name="infrared_settings_title">Infrared device settings</string>
-    <string name="infrared_settings_subtitle">Remotes, slots, and gateway device name</string>
-    <string name="infrared_manage_title">Virtual remotes</string>
-    <string name="infrared_remote_count">%1$d remotes</string>
-    <string name="infrared_add_remote">Add remote</string>
-    <string name="infrared_hardware_slots_title">Hardware slots</string>
-    <string name="infrared_gateway_name_title">Gateway device name</string>
-    <string name="infrared_gateway_name_desc">Used to match the infrared controller in the gateway. It must exactly match the gateway name.</string>
-    <string name="infrared_save_name">Save device name</string>
-    <string name="infrared_edit_remote">Edit remote</string>
-    <string name="infrared_move_remote">Reorder remote</string>
-    <string name="infrared_move_up">Move up</string>
-    <string name="infrared_move_down">Move down</string>
-    <string name="infrared_delete_remote">Delete remote</string>
-    <string name="infrared_layout">Panel layout</string>
-    <string name="infrared_transmission_mode">Transmission mode</string>
+    <string name="settings_theme_section">主题</string>
+    <string name="settings_theme_label">主题模式</string>
+    <string name="settings_theme_system">跟随系统</string>
+    <string name="settings_theme_light">浅色</string>
+    <string name="settings_theme_dark">深色</string>
+    <string name="settings_dynamic_color">动态取色</string>
+    <string name="settings_dynamic_color_description">使用系统壁纸颜色生成界面配色</string>
+    <string name="settings_surface_section">界面效果</string>
+    <string name="settings_blur">模糊效果</string>
+    <string name="settings_blur_description">在支持的界面中启用背景模糊</string>
+    <string name="settings_navigation">导航样式</string>
+    <string name="settings_navigation_standard">标准导航栏</string>
+    <string name="settings_navigation_floating">悬浮导航栏</string>
+    <string name="settings_feedback_section">交互反馈</string>
+    <string name="settings_haptics">触觉反馈</string>
+    <string name="settings_haptics_description">操作时提供轻微震动反馈</string>
+    <string name="settings_accessibility_section">系统辅助功能</string>
+    <string name="settings_accessibility_card_title">遵循系统辅助功能设置</string>
+    <string name="settings_accessibility_description">动画、字体大小和对比度等辅助功能由系统设置控制，应用会遵循系统偏好。</string>
+    <string name="settings_error_save">无法保存界面设置，请重试</string>
 </resources>
@@ -20,6 +20,6 @@ fun AppSmokePreview() {
            dynamicColorEnabled = false,
        ),
    ) {
-        Text("ABox Home")
+        Text("ABox Manager")
    }
 }
@@ -1,86 +0,0 @@
-package com.flagship.abox.manager.ui.devicecenter
-
-import com.flagship.abox.manager.domain.DeviceCatalog
-import com.flagship.abox.manager.domain.DeviceDescriptor
-import com.flagship.abox.manager.domain.DeviceId
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.DomainError
-import com.flagship.abox.manager.devicecatalog.data.ConfiguredDeviceRepository
-import com.flagship.abox.manager.testing.MainDispatcherRule
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotEquals
-import org.junit.Rule
-import org.junit.Test
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class DeviceCenterViewModelTest {
-    @get:Rule
-    val mainDispatcherRule = MainDispatcherRule(UnconfinedTestDispatcher())
-
-    @Test
-    fun catalogEmissionMapsCardsAndFilterLocally() = runTest {
-        val profile = ProviderProfileId("p1")
-        val catalog = TestCatalog(listOf(
-            descriptor(profile, "plug", DeviceType.SOCKET),
-            descriptor(profile, "sensor", DeviceType.TEMPERATURE_HUMIDITY),
-        ))
-        val viewModel = DeviceCenterViewModel(catalog, TestConfiguredRepository())
-        viewModel.initialize(profile)
-        viewModel.setFilter(DeviceCategoryFilter.SOCKET)
-
-        assertEquals(listOf("plug"), viewModel.uiState.value.cards.map { it.displayName })
-    }
-
-    @Test
-    fun profileChangeClearsSelectionAndLoadsNewCards() = runTest {
-        val first = ProviderProfileId("one")
-        val second = ProviderProfileId("two")
-        val catalog = TestCatalog(listOf(descriptor(first, "old", DeviceType.SOCKET)))
-        val viewModel = DeviceCenterViewModel(catalog, TestConfiguredRepository())
-        viewModel.initialize(first)
-        viewModel.select(catalog.devices.single())
-        catalog.emit(listOf(descriptor(second, "new", DeviceType.INFRARED)))
-        viewModel.initialize(second)
-
-        assertEquals(second, viewModel.uiState.value.profileId)
-        assertEquals(null, viewModel.uiState.value.selectedCard)
-        assertEquals(listOf("new"), viewModel.uiState.value.cards.map { it.displayName })
-    }
-
-    @Test
-    fun deviceCardKeyHasBundleCompatibleStableRepresentation() {
-        val first = DeviceCardKey(ProviderProfileId("profile-a"), DeviceName("socket-1"))
-        val same = DeviceCardKey(ProviderProfileId("profile-a"), DeviceName("socket-1"))
-        val differentProfile = DeviceCardKey(ProviderProfileId("profile-b"), DeviceName("socket-1"))
-
-        assertEquals(first.saveableKey(), same.saveableKey())
-        assertNotEquals(first.saveableKey(), differentProfile.saveableKey())
-    }
-
-    private fun descriptor(profile: ProviderProfileId, name: String, type: DeviceType) =
-        DeviceDescriptor(DeviceId("${profile.value}:$name"), profile, DeviceName(name), type)
-
-    private class TestCatalog(initial: List<DeviceDescriptor>) : DeviceCatalog {
-        val devices = initial.toMutableList()
-        private val state = MutableStateFlow<DomainResult<List<DeviceDescriptor>>>(DomainResult.Success(initial))
-        override fun observeDevices(profileId: ProviderProfileId): Flow<DomainResult<List<DeviceDescriptor>>> = state
-        fun emit(value: List<DeviceDescriptor>) { devices.clear(); devices.addAll(value); state.value = DomainResult.Success(value) }
-    }
-
-    private class TestConfiguredRepository : ConfiguredDeviceRepository {
-        override fun observe(profileId: ProviderProfileId): Flow<DomainResult<List<DeviceDescriptor>>> =
-            MutableStateFlow(DomainResult.Success(emptyList()))
-        override suspend fun add(profileId: ProviderProfileId, name: DeviceName, type: DeviceType): DomainResult<DeviceDescriptor> =
-            DomainResult.Failure(DomainError.InvalidRequest())
-        override suspend fun remove(profileId: ProviderProfileId, deviceName: DeviceName): DomainResult<Unit> =
-            DomainResult.Success(Unit)
-    }
-}
@@ -2,11 +2,7 @@ package com.flagship.abox.manager.ui.preferences

 import com.flagship.abox.manager.R
 import com.flagship.abox.manager.preferences.AppThemeMode
-import com.flagship.abox.manager.preferences.AccentPreference
 import com.flagship.abox.manager.preferences.DesignRenderer
-import com.flagship.abox.manager.preferences.InterfaceScale
-import com.flagship.abox.manager.preferences.ColorStandard
-import com.flagship.abox.manager.preferences.ColorStyle
 import com.flagship.abox.manager.ui.common.UiText.StringResource
 import com.flagship.abox.manager.preferences.NavigationPresentation
 import com.flagship.abox.manager.preferences.UiPreferences
@@ -87,39 +83,6 @@ class SettingsViewModelTest {
        assertEquals(repository.value, viewModel.uiState.value.preferences)
    }

-    @Test
-    fun scaleAndAccentUpdatesPersistThroughRepository() = runTest {
-        val repository = RecordingUiPreferencesRepository()
-        val viewModel = SettingsViewModel(repository)
-        advanceUntilIdle()
-
-        viewModel.onAction(SettingsUiAction.SetInterfaceScale(InterfaceScale.COMPACT))
-        advanceUntilIdle()
-        viewModel.onAction(SettingsUiAction.SetAccent(AccentPreference.ROSE))
-        advanceUntilIdle()
-
-        assertEquals(InterfaceScale.COMPACT, repository.value.interfaceScale)
-        assertEquals(AccentPreference.ROSE, repository.value.accentPreference)
-    }
-
-    @Test
-    fun styleSpecificThemeOptionsPersistThroughRepository() = runTest {
-        val repository = RecordingUiPreferencesRepository()
-        val viewModel = SettingsViewModel(repository)
-        advanceUntilIdle()
-
-        viewModel.onAction(SettingsUiAction.SetColorStyle(ColorStyle.FIDELITY))
-        viewModel.onAction(SettingsUiAction.SetColorStandard(ColorStandard.SPEC_2025))
-        viewModel.onAction(SettingsUiAction.SetLiquidGlass(true))
-        viewModel.onAction(SettingsUiAction.SetPredictiveBack(false))
-        advanceUntilIdle()
-
-        assertEquals(ColorStyle.FIDELITY, repository.value.colorStyle)
-        assertEquals(ColorStandard.SPEC_2025, repository.value.colorStandard)
-        assertTrue(repository.value.liquidGlassEnabled)
-        assertEquals(false, repository.value.predictiveBackEnabled)
-    }
-

    private class RecordingUiPreferencesRepository(
        initial: UiPreferences = UiPreferences(),
@@ -20,7 +20,6 @@ import com.flagship.abox.manager.domain.SocketPowerState
 import com.flagship.abox.manager.testing.MainDispatcherRule
 import com.flagship.abox.manager.testing.fakes.FakeProviderProfileStore
 import com.flagship.abox.manager.testing.fakes.FakeSceneRepository
-import com.flagship.abox.manager.testing.fakes.FakeDeviceCatalog
 import com.flagship.abox.manager.testing.fakes.FakeVirtualRemoteRepository
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.advanceUntilIdle
@@ -40,7 +39,6 @@ class SceneEditorViewModelTest {
    private val profileStore = FakeProviderProfileStore()
    private val sceneRepository = FakeSceneRepository()
    private val virtualRemoteRepository = FakeVirtualRemoteRepository()
-    private val deviceCatalog = FakeDeviceCatalog()
    private val profileId = ProviderProfileId("local-experience")

    private val existingScene = Scene(
@@ -68,7 +66,7 @@ class SceneEditorViewModelTest {
    @Test
    fun initializeWithNullPreparesNewScene() = runTest {
        setupProfile()
-        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore, deviceCatalog)
+        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore)
        viewModel.initialize(null, AutomationType.MANUAL)

        val state = viewModel.state.value
@@ -81,7 +79,7 @@ class SceneEditorViewModelTest {
    @Test
    fun initializeWithExistingSceneLoadsState() = runTest {
        setupProfile()
-        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore, deviceCatalog)
+        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore)
        viewModel.initialize(existingScene.id)

        // Immediately binds sceneId and enters loading state
@@ -103,7 +101,7 @@ class SceneEditorViewModelTest {
    @Test
    fun addingAndReorderingActionsUpdatesState() = runTest {
        setupProfile()
-        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore, deviceCatalog)
+        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore)
        viewModel.initialize(null, AutomationType.MANUAL)
        viewModel.updateName("My New Scene")

@@ -131,7 +129,7 @@ class SceneEditorViewModelTest {
    @Test
    fun addingTriggersAndConditionsForAutomaticRule() = runTest {
        setupProfile()
-        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore, deviceCatalog)
+        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore)
        viewModel.initialize(null, AutomationType.AUTOMATIC)
        viewModel.updateName("Auto Rule")

@@ -155,7 +153,7 @@ class SceneEditorViewModelTest {
    @Test
    fun saveNewScenePersistsToRepository() = runTest {
        setupProfile()
-        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore, deviceCatalog)
+        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore)
        viewModel.initialize(null, AutomationType.MANUAL)
        viewModel.updateName("Brand New Scene")
        viewModel.addSocketAction("socket-main", SocketPowerState.OFF)
@@ -172,7 +170,7 @@ class SceneEditorViewModelTest {
    @Test
    fun automaticSceneWithoutTriggersIsInvalid() = runTest {
        setupProfile()
-        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore, deviceCatalog)
+        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore)
        viewModel.initialize(null, AutomationType.AUTOMATIC)
        viewModel.updateName("Auto Without Trigger")
        viewModel.addSocketAction("socket-1", SocketPowerState.ON)
@@ -190,7 +188,7 @@ class SceneEditorViewModelTest {
    @Test
    fun initializeIsIdempotentAndPreservesDraftState() = runTest {
        setupProfile()
-        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore, deviceCatalog)
+        val viewModel = SceneEditorViewModel(sceneRepository, virtualRemoteRepository, profileStore)
        viewModel.initialize(existingScene.id)
        advanceUntilIdle()

@@ -157,32 +157,6 @@ class SocketViewModelTest {
        assertNotNull(state.errorMessage)
    }

-    @Test
-    fun commandSuccessReadsBackConfirmedState() = runTest {
-        val viewModel = SocketViewModel(fakeSocketGateway, SavedStateHandle())
-        viewModel.onEvent(SocketUiEvent.Initialize(profileId, deviceName))
-
-        viewModel.onEvent(SocketUiEvent.SetPower(SocketPowerState.ON))
-
-        assertEquals(SocketPowerState.ON, viewModel.state.value.powerState)
-        assertEquals(SocketOperationState.IdleConfirmed, viewModel.state.value.operation)
-    }
-
-    @Test
-    fun readbackFailureKeepsLastConfirmedStateAndMarksAwaitingConfirmation() = runTest {
-        val viewModel = SocketViewModel(fakeSocketGateway, SavedStateHandle())
-        viewModel.onEvent(SocketUiEvent.Initialize(profileId, deviceName))
-        fakeSocketGateway.setError(profileId, deviceName, DomainError.Network(detail = "Readback failed"))
-
-        viewModel.onEvent(SocketUiEvent.SetPower(SocketPowerState.ON))
-
-        assertEquals(SocketPowerState.OFF, viewModel.state.value.powerState)
-        assertEquals(
-            SocketOperationState.AwaitingConfirmation(SocketPowerState.ON),
-            viewModel.state.value.operation,
-        )
-    }
-
    @Test
    fun refresh_queriesUpdatedGatewayStatus() = runTest {
        val viewModel = SocketViewModel(fakeSocketGateway, SavedStateHandle())
@@ -129,8 +129,8 @@ class TemperatureHumidityViewModelTest {
        assertTrue(state.hasNoData)
        assertNull(state.temperature)
        assertNull(state.humidity)
-        assertNull(state.formattedTemperature)
-        assertNull(state.formattedHumidity)
+        assertEquals("--", state.formattedTemperature)
+        assertEquals("--", state.formattedHumidity)
        assertFalse(state.hasValidData)
    }

@@ -190,16 +190,4 @@ class TemperatureHumidityViewModelTest {
        viewModel.onEvent(TemperatureHumidityUiEvent.ClearError)
        assertNull(viewModel.state.value.errorMessage)
    }
-
-    @Test
-    fun partialReadingKeepsAvailableMetric() = runTest {
-        fakeGateway.setReading(
-            TemperatureHumidityReading(profileId, deviceName, temperature = "26.5", humidity = null),
-        )
-        val viewModel = TemperatureHumidityViewModel(fakeGateway, SavedStateHandle())
-        viewModel.onEvent(TemperatureHumidityUiEvent.Initialize(profileId, deviceName))
-
-        assertEquals("26.5", viewModel.state.value.temperature)
-        assertNull(viewModel.state.value.humidity)
-    }
 }
@@ -38,7 +38,6 @@ dependencies {
    implementation(libs.compose.ui.tooling.preview)
    implementation(libs.compose.material3)
    implementation(libs.compose.material.icons.extended)
-    implementation(libs.androidx.activity.compose)
    implementation(libs.miuix.ui.android)
    debugImplementation(libs.compose.ui.tooling)
    screenshotTestImplementation(libs.compose.screenshot.test)
@@ -1,7 +1,5 @@
 package com.flagship.abox.manager.designsystem

-import androidx.activity.compose.BackHandler
-
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -19,7 +17,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -47,9 +44,6 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -482,19 +476,13 @@ fun ABoxDeviceDetailScaffold(
    title: String,
    onBack: () -> Unit,
    modifier: Modifier = Modifier,
-    subtitle: String? = null,
-    icon: ABoxIconKey = ABoxIconKey.UNKNOWN_DEVICE,
-    action: (@Composable () -> Unit)? = null,
    content: @Composable (PaddingValues) -> Unit,
 ) {
    Scaffold(
        modifier = modifier.fillMaxSize(),
        topBar = {
            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .statusBarsPadding()
-                    .padding(horizontal = 8.dp, vertical = 8.dp),
+                modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 8.dp),
                verticalAlignment = Alignment.CenterVertically,
            ) {
                ABoxIconButton(
@@ -502,38 +490,11 @@ fun ABoxDeviceDetailScaffold(
                    contentDescription = "返回",
                    onClick = onBack,
                )
-                Surface(
-                    shape = RoundedCornerShape(14.dp),
-                    color = MaterialTheme.colorScheme.primaryContainer,
-                    modifier = Modifier.padding(start = 4.dp),
-                ) {
-                    ABoxIcon(
-                        key = icon,
-                        contentDescription = subtitle ?: title,
-                        modifier = Modifier.padding(9.dp).size(24.dp),
-                    )
-                }
-                Column(
-                    modifier = Modifier.weight(1f).padding(start = 12.dp),
-                    verticalArrangement = Arrangement.spacedBy(2.dp),
-                ) {
-                    Text(
-                        text = title,
-                        style = MaterialTheme.typography.titleLarge,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                    if (subtitle != null) {
-                        Text(
-                            text = subtitle,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                        )
-                    }
-                }
-                action?.invoke()
+                Text(
+                    text = title,
+                    style = MaterialTheme.typography.titleLarge,
+                    modifier = Modifier.padding(start = 8.dp),
+                )
            }
        },
        content = content,
@@ -682,16 +643,3 @@ fun RowScope.ABoxNavigationBarItem(
        ),
    )
 }
-
-@Composable
-fun ABoxBackLayer(
-    onBack: () -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    content: @Composable () -> Unit,
-) {
-    BackHandler(enabled = enabled, onBack = onBack)
-    Box(modifier = modifier.fillMaxSize()) {
-        content()
-    }
-}
@@ -12,8 +12,6 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Density
 import com.flagship.abox.manager.designsystem.renderer.ABoxRendererAdapters
 import com.flagship.abox.manager.preferences.DesignRenderer
 import com.flagship.abox.manager.designsystem.tokens.ABoxColorTokens
@@ -22,7 +20,6 @@ import com.flagship.abox.manager.designsystem.tokens.ABoxThemeDefaults
 import com.flagship.abox.manager.designsystem.tokens.ABoxThemeResolution
 import com.flagship.abox.manager.designsystem.tokens.ABoxThemeResolver
 import com.flagship.abox.manager.preferences.AppThemeMode
-import com.flagship.abox.manager.preferences.NavigationPresentation
 import com.flagship.abox.manager.preferences.UiPreferences

 val LocalABoxColors = staticCompositionLocalOf { ABoxThemeDefaults.lightColors }
@@ -32,9 +29,6 @@ val LocalABoxShapes = staticCompositionLocalOf { ABoxThemeDefaults.material3Shap
 val LocalABoxRenderer = staticCompositionLocalOf { DesignRenderer.MATERIAL3 }
 val LocalABoxReducedMotion = staticCompositionLocalOf { false }
 val LocalABoxBlurEnabled = staticCompositionLocalOf { false }
-val LocalABoxNavigationPresentation = staticCompositionLocalOf { NavigationPresentation.STANDARD }
-val LocalABoxLiquidGlassEnabled = staticCompositionLocalOf { false }
-val LocalABoxPredictiveBackEnabled = staticCompositionLocalOf { false }

@Composable
 fun ABoxTheme(
@@ -84,14 +78,8 @@ internal fun ABoxThemeContent(
        dynamicColorTokens = dynamicColorTokens,
    )
    val renderer = ABoxRendererAdapters.forRenderer(resolution.renderer)
-    val density = LocalDensity.current
-    val scaledDensity = Density(
-        density = density.density * (preferences.interfaceScale.percent / 100f),
-        fontScale = density.fontScale,
-    )

    CompositionLocalProvider(
-        LocalDensity provides scaledDensity,
        LocalABoxColors provides resolution.colorTokens,
        LocalABoxSpacing provides ABoxSpacing(),
        LocalABoxTypography provides ABoxTypography,
@@ -99,9 +87,6 @@ internal fun ABoxThemeContent(
        LocalABoxRenderer provides resolution.renderer,
        LocalABoxReducedMotion provides reducedMotion,
        LocalABoxBlurEnabled provides resolution.blurEnabled,
-        LocalABoxNavigationPresentation provides preferences.navigationPresentation,
-        LocalABoxLiquidGlassEnabled provides preferences.liquidGlassEnabled,
-        LocalABoxPredictiveBackEnabled provides false,
    ) {
        renderer.Render(
            resolution = resolution,
@@ -11,11 +11,6 @@ import androidx.compose.material.icons.outlined.Edit
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.icons.outlined.History
-import androidx.compose.material.icons.outlined.Palette
-import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.outlined.Tune
-import androidx.compose.material.icons.outlined.Vibration
-import androidx.compose.material.icons.outlined.ViewCarousel
 import androidx.compose.material.icons.outlined.Layers
 import androidx.compose.material.icons.outlined.Power
 import androidx.compose.material.icons.outlined.PowerSettingsNew
@@ -56,11 +51,6 @@ enum class ABoxIconKey {
    WARNING,
    ERROR,
    UNKNOWN_DEVICE,
-    SETTINGS,
-    THEME,
-    EFFECTS,
-    FEEDBACK,
-    SCALE,
 }

 /** Design-system-owned device categories; this module does not depend on domain models. */
@@ -104,11 +94,6 @@ object ABoxIconMapper {
        ABoxIconKey.WARNING -> Icons.Outlined.Warning
        ABoxIconKey.ERROR -> Icons.Outlined.ErrorOutline
        ABoxIconKey.UNKNOWN_DEVICE -> Icons.AutoMirrored.Outlined.HelpOutline
-        ABoxIconKey.SETTINGS -> Icons.Outlined.Settings
-        ABoxIconKey.THEME -> Icons.Outlined.Palette
-        ABoxIconKey.EFFECTS -> Icons.Outlined.ViewCarousel
-        ABoxIconKey.FEEDBACK -> Icons.Outlined.Vibration
-        ABoxIconKey.SCALE -> Icons.Outlined.Tune
    }
 }

@@ -6,7 +6,10 @@ import com.flagship.abox.manager.preferences.DesignRenderer

 internal interface ABoxRendererAdapter {
    @Composable
-    fun Render(resolution: ABoxThemeResolution, content: @Composable () -> Unit)
+    fun Render(
+        resolution: ABoxThemeResolution,
+        content: @Composable () -> Unit,
+    )
 }

 internal object ABoxRendererAdapters {
@@ -13,11 +13,11 @@ internal object MiuixRendererAdapter : ABoxRendererAdapter {
        content: @Composable () -> Unit,
    ) {
        val colors = if (resolution.isDarkTheme) darkColorScheme() else lightColorScheme()
-        MiuixTheme(colors = colors) {
-            androidx.compose.material3.MaterialTheme(
-                colorScheme = com.flagship.abox.manager.designsystem.materialColorScheme(resolution),
-                typography = com.flagship.abox.manager.designsystem.ABoxTypography,
-                shapes = com.flagship.abox.manager.designsystem.ABoxShapes(resolution.shapeTokens),
+        MiuixTheme(
+            colors = colors,
+        ) {
+            Material3RendererAdapter.Render(
+                resolution = resolution,
                content = content,
            )
        }
@@ -2,13 +2,9 @@ package com.flagship.abox.manager.designsystem.tokens

 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.lerp
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.flagship.abox.manager.preferences.AppThemeMode
-import com.flagship.abox.manager.preferences.AccentPreference
-import com.flagship.abox.manager.preferences.ColorStandard
-import com.flagship.abox.manager.preferences.ColorStyle
 import com.flagship.abox.manager.preferences.DesignRenderer
 import com.flagship.abox.manager.preferences.UiPreferences

@@ -125,13 +121,7 @@ object ABoxThemeResolver {
        val colorTokens = if (preferences.dynamicColorEnabled && sdkInt >= 31 && dynamicColorTokens != null) {
            dynamicColorTokens
        } else {
-            ABoxAccentPalette.resolve(
-                base = brandTokens,
-                accent = preferences.accentPreference,
-                style = preferences.colorStyle,
-                standard = preferences.colorStandard,
-                dark = isDarkTheme,
-            )
+            brandTokens
        }
        val shapeTokens = when (preferences.renderer) {
            DesignRenderer.MATERIAL3 -> ABoxThemeDefaults.material3Shapes
@@ -147,87 +137,3 @@ object ABoxThemeResolver {
        )
    }
 }
-
-object ABoxAccentPalette {
-    fun preview(
-        accent: AccentPreference,
-        style: ColorStyle,
-        standard: ColorStandard,
-        dark: Boolean,
-    ): Color = resolve(
-        base = if (dark) ABoxThemeDefaults.darkColors else ABoxThemeDefaults.lightColors,
-        accent = accent,
-        style = style,
-        standard = standard,
-        dark = dark,
-    ).primary
-
-    fun resolve(
-        base: ABoxColorTokens,
-        accent: AccentPreference,
-        style: ColorStyle,
-        standard: ColorStandard,
-        dark: Boolean,
-    ): ABoxColorTokens {
-        val source = source(accent, dark)
-        val primary = when (style) {
-            ColorStyle.TONAL_SPOT -> lerp(source, base.surface, if (dark) 0.08f else 0.12f)
-            ColorStyle.EXPRESSIVE -> expressive(accent, dark)
-            ColorStyle.FIDELITY -> source
-        }
-        val deviceSensor = when (style) {
-            ColorStyle.EXPRESSIVE -> expressiveSensor(accent, dark)
-            ColorStyle.FIDELITY -> lerp(source, base.success, 0.38f)
-            ColorStyle.TONAL_SPOT -> base.deviceSensor
-        }
-        val deviceInfrared = when (style) {
-            ColorStyle.EXPRESSIVE -> expressiveInfrared(accent, dark)
-            ColorStyle.FIDELITY -> lerp(source, base.deviceInfrared, 0.46f)
-            ColorStyle.TONAL_SPOT -> base.deviceInfrared
-        }
-        val styled = base.copy(
-            primary = primary,
-            deviceSocket = primary,
-            deviceSensor = deviceSensor,
-            deviceInfrared = deviceInfrared,
-        )
-        return when (standard) {
-            ColorStandard.SPEC_2021 -> styled
-            ColorStandard.SPEC_2025 -> styled.copy(
-                surface = if (dark) Color(0xFF0C1114) else Color(0xFFFAF9FC),
-                surfaceContainer = if (dark) Color(0xFF242C30) else Color(0xFFE9E8EE),
-                outline = if (dark) Color(0xFFA7B2B7) else Color(0xFF596267),
-                primary = lerp(primary, if (dark) Color.White else Color.Black, 0.08f),
-                deviceSocket = lerp(primary, if (dark) Color.White else Color.Black, 0.08f),
-            )
-        }
-    }
-
-    private fun source(accent: AccentPreference, dark: Boolean): Color = when (accent) {
-        AccentPreference.BLUE -> if (dark) Color(0xFF9CCAFF) else Color(0xFF4F6FA9)
-        AccentPreference.GREEN -> if (dark) Color(0xFF7EDFA7) else Color(0xFF2F7D57)
-        AccentPreference.AMBER -> if (dark) Color(0xFFFFC46B) else Color(0xFFA66700)
-        AccentPreference.ROSE -> if (dark) Color(0xFFFFB1C1) else Color(0xFFA94C68)
-        AccentPreference.VIOLET -> if (dark) Color(0xFFD4BBFF) else Color(0xFF7659A8)
-    }
-
-    private fun expressive(accent: AccentPreference, dark: Boolean): Color = when (accent) {
-        AccentPreference.BLUE -> if (dark) Color(0xFF72D6FF) else Color(0xFF006B91)
-        AccentPreference.GREEN -> if (dark) Color(0xFF69E6B1) else Color(0xFF007A54)
-        AccentPreference.AMBER -> if (dark) Color(0xFFFFC24B) else Color(0xFF9A5C00)
-        AccentPreference.ROSE -> if (dark) Color(0xFFFFA8C4) else Color(0xFFB12F62)
-        AccentPreference.VIOLET -> if (dark) Color(0xFFC9B5FF) else Color(0xFF7048B8)
-    }
-
-    private fun expressiveSensor(accent: AccentPreference, dark: Boolean): Color = when (accent) {
-        AccentPreference.BLUE, AccentPreference.VIOLET -> if (dark) Color(0xFF78DFA2) else Color(0xFF26764A)
-        AccentPreference.GREEN, AccentPreference.AMBER -> if (dark) Color(0xFF79D6F3) else Color(0xFF006985)
-        AccentPreference.ROSE -> if (dark) Color(0xFFFFC45F) else Color(0xFF8B5B00)
-    }
-
-    private fun expressiveInfrared(accent: AccentPreference, dark: Boolean): Color = when (accent) {
-        AccentPreference.BLUE, AccentPreference.GREEN -> if (dark) Color(0xFFD1B8FF) else Color(0xFF7453A5)
-        AccentPreference.AMBER, AccentPreference.ROSE -> if (dark) Color(0xFF9FCBFF) else Color(0xFF38639A)
-        AccentPreference.VIOLET -> if (dark) Color(0xFFFFB0C7) else Color(0xFFA43E62)
-    }
-}
@@ -26,26 +26,8 @@ class ABoxThemeResolverTest {
        )

        assertFalse(light.isDarkTheme)
-        assertEquals(
-            ABoxAccentPalette.resolve(
-                ABoxThemeDefaults.lightColors,
-                UiPreferences().accentPreference,
-                UiPreferences().colorStyle,
-                UiPreferences().colorStandard,
-                false,
-            ),
-            light.colorTokens,
-        )
-        assertEquals(
-            ABoxAccentPalette.resolve(
-                ABoxThemeDefaults.darkColors,
-                UiPreferences().accentPreference,
-                UiPreferences().colorStyle,
-                UiPreferences().colorStandard,
-                true,
-            ),
-            dark.colorTokens,
-        )
+        assertEquals(ABoxThemeDefaults.lightColors, light.colorTokens)
+        assertEquals(ABoxThemeDefaults.darkColors, dark.colorTokens)
    }

    @Test
@@ -60,16 +42,7 @@ class ABoxThemeResolverTest {
            dynamicColorTokens = dynamicTokens,
        )

-        assertEquals(
-            ABoxAccentPalette.resolve(
-                ABoxThemeDefaults.lightColors,
-                UiPreferences().accentPreference,
-                UiPreferences().colorStyle,
-                UiPreferences().colorStandard,
-                false,
-            ),
-            resolution.colorTokens,
-        )
+        assertEquals(ABoxThemeDefaults.lightColors, resolution.colorTokens)
    }

    @Test
@@ -84,16 +57,7 @@ class ABoxThemeResolverTest {
            dynamicColorTokens = dynamicTokens,
        )

-        assertEquals(
-            ABoxAccentPalette.resolve(
-                ABoxThemeDefaults.darkColors,
-                UiPreferences().accentPreference,
-                UiPreferences().colorStyle,
-                UiPreferences().colorStandard,
-                true,
-            ),
-            resolution.colorTokens,
-        )
+        assertEquals(ABoxThemeDefaults.darkColors, resolution.colorTokens)
    }

    @Test
@@ -1,46 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.kapt)
-    alias(libs.plugins.hilt.android)
-}
-
-android {
-    namespace = "com.flagship.abox.manager.devicecatalog"
-    compileSdk = 37
-
-    defaultConfig {
-        minSdk = 26
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-}
-
-kotlin {
-    compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) }
-}
-
-kapt {
-    correctErrorTypes = true
-    arguments { arg("room.schemaLocation", "$projectDir/schemas") }
-}
-
-dependencies {
-    api(project(":domain"))
-    implementation(libs.room.runtime)
-    implementation(libs.room.ktx)
-    kapt(libs.room.compiler)
-    implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
-    implementation(libs.kotlinx.coroutines.core)
-    testImplementation(libs.junit)
-    testImplementation(libs.kotlinx.coroutines.test)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.test.runner)
-    androidTestImplementation(libs.room.testing)
-    androidTestImplementation(libs.kotlinx.coroutines.test)
-}
@@ -1,57 +0,0 @@
-package com.flagship.abox.manager.devicecatalog
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.flagship.abox.manager.devicecatalog.data.DeviceCatalogDatabase
-import com.flagship.abox.manager.devicecatalog.data.RoomConfiguredDeviceRepository
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.runTest
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class RoomConfiguredDeviceCatalogTest {
-    private lateinit var database: DeviceCatalogDatabase
-    private lateinit var repository: RoomConfiguredDeviceRepository
-
-    @Before
-    fun setUp() {
-        database = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), DeviceCatalogDatabase::class.java).build()
-        repository = RoomConfiguredDeviceRepository(database.configuredDeviceDao())
-    }
-
-    @After
-    fun tearDown() = database.close()
-
-    @Test
-    fun configuredDevicesAreIsolatedByProfile() = runTest {
-        repository.add(ProviderProfileId("one"), DeviceName("plug"), DeviceType.SOCKET)
-        val result = repository.observeDevices(ProviderProfileId("two")).first() as DomainResult.Success
-        assertTrue(result.value.isEmpty())
-    }
-
-    @Test
-    fun sameProfileRejectsDuplicateDeviceNameAcrossTypes() = runTest {
-        val profile = ProviderProfileId("one")
-        assertTrue(repository.add(profile, DeviceName("same"), DeviceType.SOCKET) is DomainResult.Success)
-        assertTrue(repository.add(profile, DeviceName("same"), DeviceType.INFRARED) is DomainResult.Failure)
-    }
-
-    @Test
-    fun removeEmitsUpdatedCatalog() = runTest {
-        val profile = ProviderProfileId("one")
-        repository.add(profile, DeviceName("plug"), DeviceType.SOCKET)
-        repository.remove(profile, DeviceName("plug"))
-        val result = repository.observeDevices(profile).first() as DomainResult.Success
-        assertEquals(emptyList<Any>(), result.value)
-    }
-}
@@ -1,27 +0,0 @@
-package com.flagship.abox.manager.devicecatalog
-
-import com.flagship.abox.manager.domain.DeviceCatalog
-import com.flagship.abox.manager.domain.DeviceDescriptor
-import com.flagship.abox.manager.domain.DomainError
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.ProviderProfileStore
-import com.flagship.abox.manager.domain.ProviderType
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.flow
-
-class RoutingDeviceCatalog(
-    private val profileStore: ProviderProfileStore,
-    private val abox: DeviceCatalog,
-    private val local: DeviceCatalog,
-) : DeviceCatalog {
-    override fun observeDevices(profileId: ProviderProfileId): Flow<DomainResult<List<DeviceDescriptor>>> = flow {
-        val active = profileStore.activeProfile()
-        if (active?.id != profileId) {
-            emit(DomainResult.Failure(DomainError.InvalidRequest(detail = "Provider profile is not active")))
-            return@flow
-        }
-        emitAll(if (active.type == ProviderType.ABOX) abox.observeDevices(profileId) else local.observeDevices(profileId))
-    }
-}
@@ -1,22 +0,0 @@
-package com.flagship.abox.manager.devicecatalog.data
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface ConfiguredDeviceDao {
-    @Query("SELECT * FROM configured_devices WHERE profileId = :profileId ORDER BY deviceName")
-    fun observe(profileId: String): Flow<List<ConfiguredDeviceEntity>>
-
-    @Insert(onConflict = OnConflictStrategy.ABORT)
-    suspend fun insert(device: ConfiguredDeviceEntity)
-
-    @Query("DELETE FROM configured_devices WHERE profileId = :profileId AND deviceName = :deviceName")
-    suspend fun remove(profileId: String, deviceName: String): Int
-
-    @Query("UPDATE configured_devices SET id = :newId, deviceName = :newName WHERE profileId = :profileId AND deviceName = :oldName")
-    suspend fun rename(profileId: String, oldName: String, newName: String, newId: String): Int
-}
@@ -1,16 +0,0 @@
-package com.flagship.abox.manager.devicecatalog.data
-
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-
-@Entity(
-    tableName = "configured_devices",
-    indices = [Index(value = ["profileId", "deviceName"], unique = true)],
-)
-data class ConfiguredDeviceEntity(
-    @PrimaryKey val id: String,
-    val profileId: String,
-    val deviceName: String,
-    val deviceType: String,
-)
@@ -1,74 +0,0 @@
-package com.flagship.abox.manager.devicecatalog.data
-
-import com.flagship.abox.manager.domain.DeviceCatalog
-import com.flagship.abox.manager.domain.DeviceDescriptor
-import com.flagship.abox.manager.domain.DeviceId
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.DeviceType
-import com.flagship.abox.manager.domain.DomainError
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-
-interface ConfiguredDeviceRepository {
-    fun observe(profileId: ProviderProfileId): Flow<DomainResult<List<DeviceDescriptor>>>
-    suspend fun add(profileId: ProviderProfileId, name: DeviceName, type: DeviceType): DomainResult<DeviceDescriptor>
-    suspend fun remove(profileId: ProviderProfileId, deviceName: DeviceName): DomainResult<Unit>
-    suspend fun rename(profileId: ProviderProfileId, oldName: DeviceName, newName: DeviceName): DomainResult<Unit> =
-        DomainResult.Failure(DomainError.InvalidRequest(detail = "Device rename is not supported"))
-}
-
-class RoomConfiguredDeviceRepository(
-    private val dao: ConfiguredDeviceDao,
-) : ConfiguredDeviceRepository, DeviceCatalog {
-    override fun observe(profileId: ProviderProfileId): Flow<DomainResult<List<DeviceDescriptor>>> =
-        dao.observe(profileId.value).map { entities -> DomainResult.Success(entities.map { it.toDomain() }) }
-
-    override fun observeDevices(profileId: ProviderProfileId): Flow<DomainResult<List<DeviceDescriptor>>> = observe(profileId)
-
-    override suspend fun add(profileId: ProviderProfileId, name: DeviceName, type: DeviceType): DomainResult<DeviceDescriptor> {
-        if (profileId.value.isBlank() || name.value.isBlank()) {
-            return DomainResult.Failure(DomainError.InvalidRequest(detail = "Profile and device name are required"))
-        }
-        val descriptor = DeviceDescriptor(DeviceId("${profileId.value}:${name.value}"), profileId, name, type)
-        return try {
-            dao.insert(descriptor.toEntity())
-            DomainResult.Success(descriptor)
-        } catch (error: Exception) {
-            DomainResult.Failure(DomainError.InvalidRequest(detail = error.message ?: "Duplicate device name"))
-        }
-    }
-
-    override suspend fun remove(profileId: ProviderProfileId, deviceName: DeviceName): DomainResult<Unit> = try {
-        dao.remove(profileId.value, deviceName.value)
-        DomainResult.Success(Unit)
-    } catch (error: Exception) {
-        DomainResult.Failure(DomainError.Unknown(detail = error.message ?: "Unable to remove device"))
-    }
-
-    override suspend fun rename(profileId: ProviderProfileId, oldName: DeviceName, newName: DeviceName): DomainResult<Unit> {
-        if (newName.value.isBlank()) return DomainResult.Failure(DomainError.InvalidRequest(detail = "Device name is required"))
-        return try {
-            val changed = dao.rename(profileId.value, oldName.value, newName.value, "${profileId.value}:${newName.value}")
-            if (changed == 1) DomainResult.Success(Unit)
-            else DomainResult.Failure(DomainError.InvalidRequest(detail = "Device was not found"))
-        } catch (error: Exception) {
-            DomainResult.Failure(DomainError.InvalidRequest(detail = error.message ?: "Duplicate device name"))
-        }
-    }
-}
-
-private fun ConfiguredDeviceEntity.toDomain() = DeviceDescriptor(
-    id = DeviceId(id),
-    profileId = ProviderProfileId(profileId),
-    name = DeviceName(deviceName),
-    type = DeviceType.valueOf(deviceType),
-)
-
-private fun DeviceDescriptor.toEntity() = ConfiguredDeviceEntity(
-    id = id.value,
-    profileId = profileId.value,
-    deviceName = name.value,
-    deviceType = type.name,
-)
@@ -1,9 +0,0 @@
-package com.flagship.abox.manager.devicecatalog.data
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-
-@Database(entities = [ConfiguredDeviceEntity::class], version = 1, exportSchema = false)
-abstract class DeviceCatalogDatabase : RoomDatabase() {
-    abstract fun configuredDeviceDao(): ConfiguredDeviceDao
-}
@@ -1,31 +0,0 @@
-package com.flagship.abox.manager.devicecatalog.di
-
-import android.content.Context
-import androidx.room.Room
-import com.flagship.abox.manager.devicecatalog.data.ConfiguredDeviceRepository
-import com.flagship.abox.manager.devicecatalog.data.DeviceCatalogDatabase
-import com.flagship.abox.manager.devicecatalog.data.RoomConfiguredDeviceRepository
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-object DeviceCatalogModule {
-    @Provides
-    @Singleton
-    fun provideDatabase(@ApplicationContext context: Context): DeviceCatalogDatabase =
-        Room.databaseBuilder(context, DeviceCatalogDatabase::class.java, "abox_devices.db").build()
-
-    @Provides
-    @Singleton
-    fun provideRepository(database: DeviceCatalogDatabase): RoomConfiguredDeviceRepository =
-        RoomConfiguredDeviceRepository(database.configuredDeviceDao())
-
-    @Provides
-    @Singleton
-    fun provideConfiguredDeviceRepository(repository: RoomConfiguredDeviceRepository): ConfiguredDeviceRepository = repository
-}
@@ -64,16 +64,6 @@ class DataStoreUiPreferencesRepository internal constructor(
        navigationPresentation = preferences[NAVIGATION]?.enumOrDefault(NavigationPresentation.STANDARD)
            ?: NavigationPresentation.STANDARD,
        hapticsEnabled = preferences[HAPTICS] ?: true,
-        interfaceScale = preferences[INTERFACE_SCALE]?.enumOrDefault(InterfaceScale.STANDARD)
-            ?: InterfaceScale.STANDARD,
-        accentPreference = preferences[ACCENT]?.enumOrDefault(AccentPreference.BLUE)
-            ?: AccentPreference.BLUE,
-        colorStyle = preferences[COLOR_STYLE]?.enumOrDefault(ColorStyle.TONAL_SPOT)
-            ?: ColorStyle.TONAL_SPOT,
-        colorStandard = preferences[COLOR_STANDARD]?.enumOrDefault(ColorStandard.SPEC_2021)
-            ?: ColorStandard.SPEC_2021,
-        liquidGlassEnabled = preferences[LIQUID_GLASS] ?: false,
-        predictiveBackEnabled = preferences[PREDICTIVE_BACK] ?: false,
    )

    private fun MutablePreferences.putAll(preferences: UiPreferences) {
@@ -83,12 +73,6 @@ class DataStoreUiPreferencesRepository internal constructor(
        this[BLUR] = preferences.blurEnabled
        this[NAVIGATION] = preferences.navigationPresentation.name
        this[HAPTICS] = preferences.hapticsEnabled
-        this[INTERFACE_SCALE] = preferences.interfaceScale.name
-        this[ACCENT] = preferences.accentPreference.name
-        this[COLOR_STYLE] = preferences.colorStyle.name
-        this[COLOR_STANDARD] = preferences.colorStandard.name
-        this[LIQUID_GLASS] = preferences.liquidGlassEnabled
-        this[PREDICTIVE_BACK] = preferences.predictiveBackEnabled
    }

    private inline fun <reified T : Enum<T>> String.enumOrDefault(default: T): T =
@@ -105,11 +89,5 @@ class DataStoreUiPreferencesRepository internal constructor(
        val BLUR = booleanPreferencesKey("blur")
        val NAVIGATION = stringPreferencesKey("navigation")
        val HAPTICS = booleanPreferencesKey("haptics")
-        val INTERFACE_SCALE = stringPreferencesKey("interface_scale")
-        val ACCENT = stringPreferencesKey("accent")
-        val COLOR_STYLE = stringPreferencesKey("color_style")
-        val COLOR_STANDARD = stringPreferencesKey("color_standard")
-        val LIQUID_GLASS = booleanPreferencesKey("liquid_glass")
-        val PREDICTIVE_BACK = booleanPreferencesKey("predictive_back")
    }
 }
@@ -16,31 +16,6 @@ enum class NavigationPresentation {
    FLOATING,
 }

-enum class InterfaceScale(val percent: Int) {
-    COMPACT(85),
-    STANDARD(100),
-    LARGE(115),
-}
-
-enum class AccentPreference {
-    BLUE,
-    GREEN,
-    AMBER,
-    ROSE,
-    VIOLET,
-}
-
-enum class ColorStyle {
-    TONAL_SPOT,
-    EXPRESSIVE,
-    FIDELITY,
-}
-
-enum class ColorStandard {
-    SPEC_2021,
-    SPEC_2025,
-}
-
 enum class PreferenceField {
    RENDERER,
    THEME_MODE,
@@ -48,12 +23,6 @@ enum class PreferenceField {
    BLUR,
    NAVIGATION,
    HAPTICS,
-    INTERFACE_SCALE,
-    ACCENT,
-    COLOR_STYLE,
-    COLOR_STANDARD,
-    LIQUID_GLASS,
-    PREDICTIVE_BACK,
 }

 data class UiPreferences(
@@ -63,10 +32,4 @@ data class UiPreferences(
    val blurEnabled: Boolean = false,
    val navigationPresentation: NavigationPresentation = NavigationPresentation.STANDARD,
    val hapticsEnabled: Boolean = true,
-    val interfaceScale: InterfaceScale = InterfaceScale.STANDARD,
-    val accentPreference: AccentPreference = AccentPreference.BLUE,
-    val colorStyle: ColorStyle = ColorStyle.TONAL_SPOT,
-    val colorStandard: ColorStandard = ColorStandard.SPEC_2021,
-    val liquidGlassEnabled: Boolean = false,
-    val predictiveBackEnabled: Boolean = false,
 )
@@ -45,24 +45,6 @@ class DataStoreUiPreferencesRepositoryTest {
        assertEquals(UiPreferencesWriteResult.Success, repository.update {
            it.copy(hapticsEnabled = false)
        })
-        assertEquals(UiPreferencesWriteResult.Success, repository.update {
-            it.copy(interfaceScale = InterfaceScale.LARGE)
-        })
-        assertEquals(UiPreferencesWriteResult.Success, repository.update {
-            it.copy(accentPreference = AccentPreference.GREEN)
-        })
-        assertEquals(UiPreferencesWriteResult.Success, repository.update {
-            it.copy(colorStyle = ColorStyle.EXPRESSIVE)
-        })
-        assertEquals(UiPreferencesWriteResult.Success, repository.update {
-            it.copy(colorStandard = ColorStandard.SPEC_2025)
-        })
-        assertEquals(UiPreferencesWriteResult.Success, repository.update {
-            it.copy(liquidGlassEnabled = true)
-        })
-        assertEquals(UiPreferencesWriteResult.Success, repository.update {
-            it.copy(predictiveBackEnabled = false)
-        })

        assertEquals(
            UiPreferences(
@@ -72,12 +54,6 @@ class DataStoreUiPreferencesRepositoryTest {
                blurEnabled = true,
                navigationPresentation = NavigationPresentation.FLOATING,
                hapticsEnabled = false,
-                interfaceScale = InterfaceScale.LARGE,
-                accentPreference = AccentPreference.GREEN,
-                colorStyle = ColorStyle.EXPRESSIVE,
-                colorStandard = ColorStandard.SPEC_2025,
-                liquidGlassEnabled = true,
-                predictiveBackEnabled = false,
            ),
            repository.observe().first(),
        )
@@ -1,58 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.kotlin.kapt)
-    alias(libs.plugins.hilt.android)
-}
-
-android {
-    namespace = "com.flagship.abox.manager.automation"
-    compileSdk = 37
-
-    defaultConfig {
-        minSdk = 26
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildFeatures { compose = true }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-}
-
-kotlin {
-    compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) }
-}
-
-kapt {
-    correctErrorTypes = true
-}
-
-dependencies {
-    api(project(":domain"))
-    implementation(libs.room.runtime)
-    implementation(libs.room.ktx)
-    kapt(libs.room.compiler)
-    implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
-    implementation(libs.androidx.work.runtime.ktx)
-    implementation(libs.androidx.hilt.work)
-    kapt(libs.androidx.hilt.compiler)
-    implementation(libs.androidx.lifecycle.process)
-    implementation(platform(libs.compose.bom))
-    implementation(libs.compose.ui)
-    implementation(libs.compose.material3)
-    implementation(libs.androidx.lifecycle.viewmodel.ktx)
-    implementation(libs.androidx.lifecycle.runtime.compose)
-    implementation(libs.androidx.hilt.navigation.compose)
-    testImplementation(libs.junit)
-    testImplementation(libs.kotlinx.coroutines.test)
-    implementation(libs.kotlinx.coroutines.core)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.test.runner)
-    androidTestImplementation(libs.room.testing)
-    androidTestImplementation(libs.kotlinx.coroutines.test)
-}
@@ -1,83 +0,0 @@
-package com.flagship.abox.manager.automation
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.flagship.abox.manager.automation.data.ActivityEventEntity
-import com.flagship.abox.manager.automation.data.AutomationDatabase
-import com.flagship.abox.manager.automation.data.RoomActivityRepository
-import com.flagship.abox.manager.automation.data.RoomAutomationRuntimeRepository
-import com.flagship.abox.manager.domain.ActivityEvent
-import com.flagship.abox.manager.domain.ActivityEventCursor
-import com.flagship.abox.manager.domain.ActivityEventId
-import com.flagship.abox.manager.domain.ActivityEventKind
-import com.flagship.abox.manager.domain.ActivityOutcome
-import com.flagship.abox.manager.domain.ActivitySource
-import com.flagship.abox.manager.domain.ActivityTarget
-import com.flagship.abox.manager.domain.ActivityTargetType
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.SceneId
-import com.flagship.abox.manager.domain.SceneTriggerId
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.runTest
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class AutomationDatabaseTest {
-    private lateinit var database: AutomationDatabase
-    private lateinit var activityRepository: RoomActivityRepository
-    private lateinit var runtimeRepository: RoomAutomationRuntimeRepository
-
-    @Before
-    fun setUp() {
-        database = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AutomationDatabase::class.java).build()
-        activityRepository = RoomActivityRepository(database.automationDao())
-        runtimeRepository = RoomAutomationRuntimeRepository(database.automationDao())
-    }
-
-    @After
-    fun tearDown() = database.close()
-
-    @Test
-    fun activityEventsAreIsolatedByProfileAndPageByCursor() = runTest {
-        activityRepository.append(event("profile-a", "a", 10L))
-        activityRepository.append(event("profile-a", "b", 10L))
-        activityRepository.append(event("profile-b", "c", 10L))
-
-        val first = activityRepository.observeLatest(ProviderProfileId("profile-a"), 1).first()
-        val firstEvent = (first as DomainResult.Success).value.single()
-        val next = activityRepository.loadBefore(
-            ProviderProfileId("profile-a"),
-            ActivityEventCursor(firstEvent.occurredAtEpochMillis, firstEvent.id),
-            1,
-        )
-
-        assertEquals("b", firstEvent.id.value)
-        assertEquals(listOf("a"), (next as DomainResult.Success).value.map { it.id.value })
-    }
-
-    @Test
-    fun occurrenceClaimIsAtomic() = runTest {
-        val first = runtimeRepository.claimOccurrence(ProviderProfileId("p"), SceneId("s"), SceneTriggerId("t"), "occurrence")
-        val second = runtimeRepository.claimOccurrence(ProviderProfileId("p"), SceneId("s"), SceneTriggerId("t"), "occurrence")
-
-        assertTrue((first as DomainResult.Success).value)
-        assertEquals(false, (second as DomainResult.Success).value)
-    }
-
-    private fun event(profile: String, id: String, time: Long) = ActivityEvent(
-        id = ActivityEventId(id),
-        profileId = ProviderProfileId(profile),
-        occurredAtEpochMillis = time,
-        kind = ActivityEventKind.SOCKET_COMMAND,
-        source = ActivitySource.USER,
-        outcome = ActivityOutcome.SUCCEEDED,
-        target = ActivityTarget(ActivityTargetType.DEVICE, id, "设备"),
-    )
-}
@@ -1,61 +0,0 @@
-package com.flagship.abox.manager.automation.data
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface AutomationDao {
-    @Query("SELECT * FROM activity_events WHERE profileId = :profileId ORDER BY occurredAtEpochMillis DESC, id DESC LIMIT :limit")
-    fun observeLatest(profileId: String, limit: Int): Flow<List<ActivityEventEntity>>
-
-    @Query(
-        "SELECT * FROM activity_events WHERE profileId = :profileId AND " +
-            "(occurredAtEpochMillis < :beforeTime OR (occurredAtEpochMillis = :beforeTime AND id < :beforeId)) " +
-            "ORDER BY occurredAtEpochMillis DESC, id DESC LIMIT :limit",
-    )
-    suspend fun loadBefore(profileId: String, beforeTime: Long, beforeId: String, limit: Int): List<ActivityEventEntity>
-
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insertEvent(event: ActivityEventEntity): Long
-
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun claimOccurrence(occurrence: AutomationOccurrenceEntity): Long
-
-    @Query("SELECT * FROM scenes WHERE profileId = :profileId ORDER BY updatedAtEpochMillis, id")
-    fun observeScenes(profileId: String): Flow<List<SceneEntity>>
-
-    @Query("SELECT * FROM scenes WHERE profileId = :profileId ORDER BY updatedAtEpochMillis, id")
-    suspend fun getScenes(profileId: String): List<SceneEntity>
-
-    @Query("SELECT * FROM scenes WHERE profileId = :profileId AND id = :sceneId LIMIT 1")
-    suspend fun getScene(profileId: String, sceneId: String): SceneEntity?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun upsertScene(scene: SceneEntity)
-
-    @Query("DELETE FROM scenes WHERE profileId = :profileId AND id = :sceneId")
-    suspend fun deleteScene(profileId: String, sceneId: String): Int
-
-    @Query("SELECT * FROM automation_trigger_state WHERE profileId = :profileId AND sceneId = :sceneId AND triggerId = :triggerId LIMIT 1")
-    suspend fun getTriggerState(profileId: String, sceneId: String, triggerId: String): AutomationTriggerStateEntity?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun upsertTriggerState(state: AutomationTriggerStateEntity)
-
-    @Transaction
-    suspend fun transitionTriggerState(state: AutomationTriggerStateEntity): Boolean {
-        val previous = getTriggerState(state.profileId, state.sceneId, state.triggerId)?.matched ?: false
-        upsertTriggerState(state)
-        return !previous && state.matched
-    }
-
-    @Query("DELETE FROM automation_trigger_state WHERE profileId = :profileId AND sceneId = :sceneId")
-    suspend fun deleteTriggerStates(profileId: String, sceneId: String): Int
-
-    @Query("DELETE FROM automation_trigger_state WHERE profileId = :profileId AND sceneId = :sceneId AND triggerId = :triggerId")
-    suspend fun deleteTriggerState(profileId: String, sceneId: String, triggerId: String): Int
-}
@@ -1,18 +0,0 @@
-package com.flagship.abox.manager.automation.data
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-
-@Database(
-    entities = [
-        ActivityEventEntity::class,
-        AutomationOccurrenceEntity::class,
-        SceneEntity::class,
-        AutomationTriggerStateEntity::class,
-    ],
-    version = 2,
-    exportSchema = false,
-)
-abstract class AutomationDatabase : RoomDatabase() {
-    abstract fun automationDao(): AutomationDao
-}
@@ -1,59 +0,0 @@
-package com.flagship.abox.manager.automation.data
-
-import androidx.room.Entity
-import androidx.room.Index
-
-@Entity(
-    tableName = "activity_events",
-    primaryKeys = ["profileId", "id"],
-    indices = [Index(value = ["profileId", "occurredAtEpochMillis", "id"])],
-)
-data class ActivityEventEntity(
-    val profileId: String,
-    val id: String,
-    val occurredAtEpochMillis: Long,
-    val kind: String,
-    val source: String,
-    val outcome: String,
-    val targetType: String,
-    val targetStableId: String,
-    val targetDisplayName: String,
-    val errorCode: String?,
-)
-
-@Entity(
-    tableName = "automation_occurrences",
-    primaryKeys = ["profileId", "sceneId", "triggerId", "occurrenceKey"],
-)
-data class AutomationOccurrenceEntity(
-    val profileId: String,
-    val sceneId: String,
-    val triggerId: String,
-    val occurrenceKey: String,
-)
-
-@Entity(
-    tableName = "scenes",
-    primaryKeys = ["profileId", "id"],
-    indices = [Index(value = ["profileId", "type", "enabled"])],
-)
-data class SceneEntity(
-    val profileId: String,
-    val id: String,
-    val type: String,
-    val enabled: Boolean,
-    val document: String,
-    val updatedAtEpochMillis: Long,
-)
-
-@Entity(
-    tableName = "automation_trigger_state",
-    primaryKeys = ["profileId", "sceneId", "triggerId"],
-)
-data class AutomationTriggerStateEntity(
-    val profileId: String,
-    val sceneId: String,
-    val triggerId: String,
-    val matched: Boolean,
-    val updatedAtEpochMillis: Long,
-)
@@ -1,35 +0,0 @@
-package com.flagship.abox.manager.automation.data
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-val MIGRATION_1_2 = object : Migration(1, 2) {
-    override fun migrate(db: SupportSQLiteDatabase) {
-        db.execSQL(
-            """
-            CREATE TABLE IF NOT EXISTS scenes (
-                profileId TEXT NOT NULL,
-                id TEXT NOT NULL,
-                type TEXT NOT NULL,
-                enabled INTEGER NOT NULL,
-                document TEXT NOT NULL,
-                updatedAtEpochMillis INTEGER NOT NULL,
-                PRIMARY KEY(profileId, id)
-            )
-            """.trimIndent(),
-        )
-        db.execSQL("CREATE INDEX IF NOT EXISTS index_scenes_profileId_type_enabled ON scenes(profileId, type, enabled)")
-        db.execSQL(
-            """
-            CREATE TABLE IF NOT EXISTS automation_trigger_state (
-                profileId TEXT NOT NULL,
-                sceneId TEXT NOT NULL,
-                triggerId TEXT NOT NULL,
-                matched INTEGER NOT NULL,
-                updatedAtEpochMillis INTEGER NOT NULL,
-                PRIMARY KEY(profileId, sceneId, triggerId)
-            )
-            """.trimIndent(),
-        )
-    }
-}
@@ -1,70 +0,0 @@
-package com.flagship.abox.manager.automation.data
-
-import com.flagship.abox.manager.domain.ActivityEvent
-import com.flagship.abox.manager.domain.ActivityEventCursor
-import com.flagship.abox.manager.domain.ActivityEventId
-import com.flagship.abox.manager.domain.ActivityEventKind
-import com.flagship.abox.manager.domain.ActivityOutcome
-import com.flagship.abox.manager.domain.ActivityRepository
-import com.flagship.abox.manager.domain.ActivitySource
-import com.flagship.abox.manager.domain.ActivityTarget
-import com.flagship.abox.manager.domain.ActivityTargetType
-import com.flagship.abox.manager.domain.DomainError
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-
-class RoomActivityRepository(private val dao: AutomationDao) : ActivityRepository {
-    override fun observeLatest(profileId: ProviderProfileId, limit: Int): Flow<DomainResult<List<ActivityEvent>>> =
-        dao.observeLatest(profileId.value, limit.coerceAtLeast(0)).map { entities -> DomainResult.Success(entities.map { it.toDomain() }) }
-
-    override suspend fun loadBefore(profileId: ProviderProfileId, before: ActivityEventCursor, limit: Int): DomainResult<List<ActivityEvent>> = try {
-        DomainResult.Success(dao.loadBefore(profileId.value, before.occurredAtEpochMillis, before.id.value, limit.coerceAtLeast(0)).map { it.toDomain() })
-    } catch (error: Exception) {
-        DomainResult.Failure(DomainError.Unknown(detail = "Activity storage unavailable"))
-    }
-
-    override suspend fun append(event: ActivityEvent): DomainResult<Unit> = try {
-        dao.insertEvent(event.toEntity())
-        DomainResult.Success(Unit)
-    } catch (error: Exception) {
-        DomainResult.Failure(DomainError.Unknown(detail = "Activity storage unavailable"))
-    }
-}
-
-private fun ActivityEventEntity.toDomain() = ActivityEvent(
-    id = ActivityEventId(id),
-    profileId = ProviderProfileId(profileId),
-    occurredAtEpochMillis = occurredAtEpochMillis,
-    kind = kind.toActivityEventKind(),
-    source = source.toActivitySource(),
-    outcome = outcome.toActivityOutcome(),
-    target = ActivityTarget(targetType.toActivityTargetType(), targetStableId, targetDisplayName),
-    errorCode = errorCode,
-)
-
-private fun String.toActivityEventKind(): ActivityEventKind =
-    runCatching { ActivityEventKind.valueOf(this) }.getOrDefault(ActivityEventKind.SCENE_ACTION)
-
-private fun String.toActivitySource(): ActivitySource =
-    runCatching { ActivitySource.valueOf(this) }.getOrDefault(ActivitySource.SYSTEM)
-
-private fun String.toActivityOutcome(): ActivityOutcome =
-    runCatching { ActivityOutcome.valueOf(this) }.getOrDefault(ActivityOutcome.FAILED)
-
-private fun String.toActivityTargetType(): ActivityTargetType =
-    runCatching { ActivityTargetType.valueOf(this) }.getOrDefault(ActivityTargetType.SCENE_ACTION)
-
-private fun ActivityEvent.toEntity() = ActivityEventEntity(
-    profileId = profileId.value,
-    id = id.value,
-    occurredAtEpochMillis = occurredAtEpochMillis,
-    kind = kind.name,
-    source = source.name,
-    outcome = outcome.name,
-    targetType = target.type.name,
-    targetStableId = target.stableId,
-    targetDisplayName = target.displayName,
-    errorCode = errorCode,
-)
@@ -1,60 +0,0 @@
-package com.flagship.abox.manager.automation.data
-
-import com.flagship.abox.manager.domain.DomainError
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.SceneId
-import com.flagship.abox.manager.domain.SceneTriggerId
-
-interface AutomationRuntimeRepository {
-    suspend fun claimOccurrence(profileId: ProviderProfileId, sceneId: SceneId, triggerId: SceneTriggerId, occurrenceKey: String): DomainResult<Boolean>
-    suspend fun isMatched(profileId: ProviderProfileId, sceneId: SceneId, triggerId: SceneTriggerId): DomainResult<Boolean>
-    suspend fun transitionMatch(profileId: ProviderProfileId, sceneId: SceneId, triggerId: SceneTriggerId, isMatched: Boolean, nowEpochMillis: Long): DomainResult<Boolean>
-}
-
-class RoomAutomationRuntimeRepository(private val dao: AutomationDao) : AutomationRuntimeRepository {
-    override suspend fun isMatched(
-        profileId: ProviderProfileId,
-        sceneId: SceneId,
-        triggerId: SceneTriggerId,
-    ): DomainResult<Boolean> = try {
-        DomainResult.Success(dao.getTriggerState(profileId.value, sceneId.value, triggerId.value)?.matched ?: false)
-    } catch (error: Exception) {
-        DomainResult.Failure(DomainError.Unknown(detail = "Automation storage unavailable"))
-    }
-
-    override suspend fun claimOccurrence(
-        profileId: ProviderProfileId,
-        sceneId: SceneId,
-        triggerId: SceneTriggerId,
-        occurrenceKey: String,
-    ): DomainResult<Boolean> = try {
-        val inserted = dao.claimOccurrence(
-            AutomationOccurrenceEntity(profileId.value, sceneId.value, triggerId.value, occurrenceKey),
-        )
-        DomainResult.Success(inserted != -1L)
-    } catch (error: Exception) {
-        DomainResult.Failure(DomainError.Unknown(detail = "Automation storage unavailable"))
-    }
-
-    override suspend fun transitionMatch(
-        profileId: ProviderProfileId,
-        sceneId: SceneId,
-        triggerId: SceneTriggerId,
-        isMatched: Boolean,
-        nowEpochMillis: Long,
-    ): DomainResult<Boolean> = try {
-        val transitioned = dao.transitionTriggerState(
-            AutomationTriggerStateEntity(
-                profileId = profileId.value,
-                sceneId = sceneId.value,
-                triggerId = triggerId.value,
-                matched = isMatched,
-                updatedAtEpochMillis = nowEpochMillis,
-            ),
-        )
-        DomainResult.Success(transitioned)
-    } catch (error: Exception) {
-        DomainResult.Failure(DomainError.Unknown(detail = "Automation storage unavailable"))
-    }
-}
@@ -1,125 +0,0 @@
-package com.flagship.abox.manager.automation.data
-
-import android.content.Context
-import androidx.room.withTransaction
-import com.flagship.abox.manager.domain.AutomationType
-import com.flagship.abox.manager.domain.ComparisonOperator
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.DomainError
-import com.flagship.abox.manager.domain.DomainResult
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.Scene
-import com.flagship.abox.manager.domain.SceneAction
-import com.flagship.abox.manager.domain.SceneActionId
-import com.flagship.abox.manager.domain.SceneColor
-import com.flagship.abox.manager.domain.SceneCondition
-import com.flagship.abox.manager.domain.SceneConditionId
-import com.flagship.abox.manager.domain.SceneIcon
-import com.flagship.abox.manager.domain.SceneId
-import com.flagship.abox.manager.domain.SceneRepository
-import com.flagship.abox.manager.domain.SceneTrigger
-import com.flagship.abox.manager.domain.SceneTriggerId
-import com.flagship.abox.manager.domain.SocketPowerState
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.map
-
-class RoomSceneRepository(
-    context: Context,
-    private val database: AutomationDatabase,
-) : SceneRepository {
-    private val dao = database.automationDao()
-    private val seedPreferences = context.getSharedPreferences("scene_seed_state", Context.MODE_PRIVATE)
-
-    override fun observeScenes(profileId: ProviderProfileId): Flow<DomainResult<List<Scene>>> = flow {
-        ensureSeeded(profileId)
-        emitAll(dao.observeScenes(profileId.value)
-            .map<List<SceneEntity>, DomainResult<List<Scene>>> { entities -> DomainResult.Success(entities.map(SceneDocumentCodec::decode)) }
-            .catch { emit(DomainResult.Failure(DomainError.Unknown(detail = "Scene storage unavailable"))) })
-    }
-
-    override suspend fun getScene(profileId: ProviderProfileId, sceneId: SceneId): DomainResult<Scene?> = runCatching {
-        dao.getScene(profileId.value, sceneId.value)?.let(SceneDocumentCodec::decode)
-    }.fold({ DomainResult.Success(it) }, { DomainResult.Failure(DomainError.Unknown(detail = "Scene storage unavailable")) })
-
-    override suspend fun createScene(profileId: ProviderProfileId, scene: Scene): DomainResult<Scene> = save(profileId, scene, requireExisting = false)
-
-    override suspend fun updateScene(profileId: ProviderProfileId, scene: Scene): DomainResult<Scene> = save(profileId, scene, requireExisting = true)
-
-    override suspend fun deleteScene(profileId: ProviderProfileId, sceneId: SceneId): DomainResult<Unit> = runCatching {
-        val deleted = dao.deleteScene(profileId.value, sceneId.value)
-        dao.deleteTriggerStates(profileId.value, sceneId.value)
-        if (deleted == 0) throw IllegalArgumentException("Scene not found")
-    }.fold({ DomainResult.Success(Unit) }, { DomainResult.Failure(DomainError.InvalidRequest(detail = it.message)) })
-
-    private suspend fun save(profileId: ProviderProfileId, scene: Scene, requireExisting: Boolean): DomainResult<Scene> {
-        if (scene.profileId != profileId || scene.actions.any { it.profileId != profileId }) {
-            return DomainResult.Failure(DomainError.InvalidRequest(detail = "Scene profile mismatch"))
-        }
-        return runCatching {
-            database.withTransaction {
-                val existing = dao.getScene(profileId.value, scene.id.value)
-                if (requireExisting && existing == null) throw IllegalArgumentException("Scene not found")
-                if (!requireExisting && existing != null) throw IllegalArgumentException("Scene already exists")
-                dao.upsertScene(scene.toEntity())
-                existing?.let(SceneDocumentCodec::decode)?.triggers.orEmpty()
-                    .filter { previous -> scene.triggers.none { current -> current.hasSameDefinitionAs(previous) } }
-                    .forEach { changed ->
-                        dao.deleteTriggerState(profileId.value, scene.id.value, changed.id.value)
-                    }
-            }
-            scene
-        }.fold({ DomainResult.Success(it) }, { DomainResult.Failure(DomainError.InvalidRequest(detail = it.message)) })
-    }
-
-    private fun SceneTrigger.hasSameDefinitionAs(other: SceneTrigger): Boolean = when {
-        this is SceneTrigger.Time && other is SceneTrigger.Time ->
-            id == other.id && timeOfDay == other.timeOfDay && daysOfWeek == other.daysOfWeek
-        this is SceneTrigger.Temperature && other is SceneTrigger.Temperature ->
-            id == other.id && deviceName == other.deviceName && operator == other.operator && thresholdCelsius == other.thresholdCelsius
-        this is SceneTrigger.Humidity && other is SceneTrigger.Humidity ->
-            id == other.id && deviceName == other.deviceName && operator == other.operator && thresholdPercent == other.thresholdPercent
-        this is SceneTrigger.DeviceState && other is SceneTrigger.DeviceState ->
-            id == other.id && deviceName == other.deviceName && expectedState == other.expectedState
-        else -> false
-    }
-
-    private suspend fun ensureSeeded(profileId: ProviderProfileId) {
-        val marker = "seed_v1_${profileId.value}"
-        if (seedPreferences.getBoolean(marker, false)) return
-        defaultScenes(profileId).forEach { scene ->
-            dao.upsertScene(scene.toEntity())
-        }
-        seedPreferences.edit().putBoolean(marker, true).apply()
-    }
-
-    private fun Scene.toEntity() = SceneEntity(profileId.value, id.value, type.name, enabled, SceneDocumentCodec.encode(this), System.currentTimeMillis())
-
-    private fun defaultScenes(profileId: ProviderProfileId): List<Scene> = listOf(
-        Scene(
-            SceneId("${profileId.value}:scene-arriving-home"), profileId, "回家模式", "开启智能插座",
-            AutomationType.MANUAL, true, SceneIcon.HOME, SceneColor("#4CAF50"),
-            actions = listOf(SceneAction.SocketPower(SceneActionId("${profileId.value}:arrive:socket"), profileId, DeviceName("智能插座"), SocketPowerState.ON)),
-        ),
-        Scene(
-            SceneId("${profileId.value}:scene-leaving-home"), profileId, "离家模式", "关闭智能插座",
-            AutomationType.MANUAL, true, SceneIcon.AWAY, SceneColor("#FF8A65"),
-            actions = listOf(SceneAction.SocketPower(SceneActionId("${profileId.value}:leave:socket"), profileId, DeviceName("智能插座"), SocketPowerState.OFF)),
-        ),
-        Scene(
-            SceneId("${profileId.value}:scene-temperature-alert"), profileId, "高温提醒", "室温高于 28°C 时发送提醒",
-            AutomationType.AUTOMATIC, true, SceneIcon.THERMOSTAT, SceneColor("#EF5350"),
-            triggers = listOf(SceneTrigger.Temperature(SceneTriggerId("${profileId.value}:temp-alert"), DeviceName("温湿度传感器"), ComparisonOperator.GREATER_THAN, 28.0, "温度高于 28°C")),
-            actions = listOf(SceneAction.Notification(SceneActionId("${profileId.value}:temp-alert:notification"), profileId, "温度提醒", "当前室温已高于 28°C")),
-        ),
-        Scene(
-            SceneId("${profileId.value}:scene-cooling-auto"), profileId, "高温自动降温", "当室温高于 28°C 时开启插座",
-            AutomationType.AUTOMATIC, true, SceneIcon.THERMOSTAT, SceneColor("#26A69A"),
-            triggers = listOf(SceneTrigger.Temperature(SceneTriggerId("${profileId.value}:cooling-temp"), DeviceName("温湿度传感器"), ComparisonOperator.GREATER_THAN, 28.0, "温度高于 28°C")),
-            conditions = listOf(SceneCondition.SocketPower(SceneConditionId("${profileId.value}:cooling-socket"), DeviceName("智能插座"), SocketPowerState.OFF)),
-            actions = listOf(SceneAction.SocketPower(SceneActionId("${profileId.value}:cooling:on"), profileId, DeviceName("智能插座"), SocketPowerState.ON)),
-        ),
-    )
-}
@@ -1,135 +0,0 @@
-package com.flagship.abox.manager.automation.data
-
-import com.flagship.abox.manager.domain.AutomationType
-import com.flagship.abox.manager.domain.ComparisonOperator
-import com.flagship.abox.manager.domain.ConcurrencyMode
-import com.flagship.abox.manager.domain.DeviceName
-import com.flagship.abox.manager.domain.ExecutionStrategy
-import com.flagship.abox.manager.domain.ProviderProfileId
-import com.flagship.abox.manager.domain.Scene
-import com.flagship.abox.manager.domain.SceneAction
-import com.flagship.abox.manager.domain.SceneActionId
-import com.flagship.abox.manager.domain.SceneColor
-import com.flagship.abox.manager.domain.SceneCondition
-import com.flagship.abox.manager.domain.SceneConditionId
-import com.flagship.abox.manager.domain.SceneIcon
-import com.flagship.abox.manager.domain.SceneId
-import com.flagship.abox.manager.domain.SceneTrigger
-import com.flagship.abox.manager.domain.SceneTriggerId
-import com.flagship.abox.manager.domain.SocketPowerState
-import org.json.JSONArray
-import org.json.JSONObject
-
-internal object SceneDocumentCodec {
-    fun encode(scene: Scene): String = JSONObject()
-        .put("name", scene.name)
-        .put("description", scene.description)
-        .put("type", scene.type.name)
-        .put("enabled", scene.enabled)
-        .put("icon", scene.icon.name)
-        .put("color", scene.color.hex)
-        .put("strategy", scene.strategy.name)
-        .put("concurrency", scene.concurrencyMode.name)
-        .put("logging", scene.enableLogging)
-        .put("triggers", JSONArray().apply { scene.triggers.forEach { put(encodeTrigger(it)) } })
-        .put("conditions", JSONArray().apply { scene.conditions.forEach { put(encodeCondition(it)) } })
-        .put("actions", JSONArray().apply { scene.actions.forEach { put(encodeAction(it)) } })
-        .toString()
-
-    fun decode(entity: SceneEntity): Scene {
-        val document = JSONObject(entity.document)
-        val profileId = ProviderProfileId(entity.profileId)
-        return Scene(
-            id = SceneId(entity.id),
-            profileId = profileId,
-            name = document.getString("name"),
-            description = document.optString("description"),
-            type = enumValue(document.getString("type"), AutomationType.MANUAL),
-            enabled = document.optBoolean("enabled", true),
-            icon = enumValue(document.optString("icon"), SceneIcon.HOME),
-            color = SceneColor(document.optString("color", "#3F51B5")),
-            triggers = document.optJSONArray("triggers").objects().map(::decodeTrigger),
-            conditions = document.optJSONArray("conditions").objects().map(::decodeCondition),
-            actions = document.optJSONArray("actions").objects().map { decodeAction(it, profileId) },
-            strategy = enumValue(document.optString("strategy"), ExecutionStrategy.CONTINUE_ON_ERROR),
-            concurrencyMode = enumValue(document.optString("concurrency"), ConcurrencyMode.SEQUENTIAL),
-            enableLogging = document.optBoolean("logging", true),
-        )
-    }
-
-    private fun encodeTrigger(trigger: SceneTrigger): JSONObject = JSONObject().put("id", trigger.id.value).apply {
-        when (trigger) {
-            is SceneTrigger.Time -> put("kind", "time").put("time", trigger.timeOfDay)
-                .put("days", JSONArray(trigger.daysOfWeek.sorted())).put("label", trigger.label)
-            is SceneTrigger.Temperature -> put("kind", "temperature").put("device", trigger.deviceName.value)
-                .put("operator", trigger.operator.name).put("threshold", trigger.thresholdCelsius).put("label", trigger.label)
-            is SceneTrigger.Humidity -> put("kind", "humidity").put("device", trigger.deviceName.value)
-                .put("operator", trigger.operator.name).put("threshold", trigger.thresholdPercent).put("label", trigger.label)
-            is SceneTrigger.DeviceState -> put("kind", "device_state").put("device", trigger.deviceName.value)
-                .put("state", trigger.expectedState.name).put("label", trigger.label)
-        }
-    }
-
-    private fun decodeTrigger(value: JSONObject): SceneTrigger {
-        val id = SceneTriggerId(value.getString("id"))
-        return when (value.getString("kind")) {
-            "time" -> SceneTrigger.Time(id, value.getString("time"), value.optJSONArray("days").ints().toSet(), value.optString("label"))
-            "temperature" -> SceneTrigger.Temperature(id, DeviceName(value.getString("device")), enumValue(value.getString("operator"), ComparisonOperator.GREATER_THAN), value.getDouble("threshold"), value.optString("label"))
-            "humidity" -> SceneTrigger.Humidity(id, DeviceName(value.getString("device")), enumValue(value.getString("operator"), ComparisonOperator.GREATER_THAN), value.getDouble("threshold"), value.optString("label"))
-            "device_state" -> SceneTrigger.DeviceState(id, DeviceName(value.getString("device")), enumValue(value.getString("state"), SocketPowerState.OFF), value.optString("label"))
-            else -> error("Unsupported trigger kind")
-        }
-    }
-
-    private fun encodeCondition(condition: SceneCondition): JSONObject = JSONObject().put("id", condition.id.value).apply {
-        when (condition) {
-            is SceneCondition.Temperature -> put("kind", "temperature").put("device", condition.deviceName.value)
-                .put("operator", condition.operator.name).put("threshold", condition.thresholdCelsius)
-            is SceneCondition.Humidity -> put("kind", "humidity").put("device", condition.deviceName.value)
-                .put("operator", condition.operator.name).put("threshold", condition.thresholdPercent)
-            is SceneCondition.SocketPower -> put("kind", "socket").put("device", condition.deviceName.value)
-                .put("state", condition.expectedState.name)
-            is SceneCondition.TimeRange -> put("kind", "time_range").put("start", condition.startTime).put("end", condition.endTime)
-        }
-    }
-
-    private fun decodeCondition(value: JSONObject): SceneCondition {
-        val id = SceneConditionId(value.getString("id"))
-        return when (value.getString("kind")) {
-            "temperature" -> SceneCondition.Temperature(id, DeviceName(value.getString("device")), enumValue(value.getString("operator"), ComparisonOperator.GREATER_THAN), value.getDouble("threshold"))
-            "humidity" -> SceneCondition.Humidity(id, DeviceName(value.getString("device")), enumValue(value.getString("operator"), ComparisonOperator.GREATER_THAN), value.getDouble("threshold"))
-            "socket" -> SceneCondition.SocketPower(id, DeviceName(value.getString("device")), enumValue(value.getString("state"), SocketPowerState.OFF))
-            "time_range" -> SceneCondition.TimeRange(id, value.getString("start"), value.getString("end"))
-            else -> error("Unsupported condition kind")
-        }
-    }
-
-    private fun encodeAction(action: SceneAction): JSONObject = JSONObject().put("id", action.id.value).apply {
-        when (action) {
-            is SceneAction.SocketPower -> put("kind", "socket").put("device", action.deviceName.value).put("state", action.powerState.name)
-            is SceneAction.VirtualRemoteButton -> put("kind", "remote").put("remoteId", action.remoteId)
-                .put("remoteName", action.remoteDisplayName).put("buttonId", action.buttonId).put("buttonName", action.buttonDisplayName)
-            is SceneAction.InfraredKey -> put("kind", "infrared").put("device", action.deviceName.value).put("key", action.key)
-            is SceneAction.Delay -> put("kind", "delay").put("seconds", action.durationSeconds)
-            is SceneAction.Notification -> put("kind", "notification").put("title", action.title).put("message", action.message)
-        }
-    }
-
-    private fun decodeAction(value: JSONObject, profileId: ProviderProfileId): SceneAction {
-        val id = SceneActionId(value.getString("id"))
-        return when (value.getString("kind")) {
-            "socket" -> SceneAction.SocketPower(id, profileId, DeviceName(value.getString("device")), enumValue(value.getString("state"), SocketPowerState.OFF))
-            "remote" -> SceneAction.VirtualRemoteButton(id, profileId, value.getString("remoteId"), value.optString("remoteName"), value.getString("buttonId"), value.optString("buttonName"))
-            "infrared" -> SceneAction.InfraredKey(id, profileId, DeviceName(value.getString("device")), value.getString("key"))
-            "delay" -> SceneAction.Delay(id, profileId, value.getInt("seconds"))
-            "notification" -> SceneAction.Notification(id, profileId, value.getString("title"), value.optString("message"))
-            else -> error("Unsupported action kind")
-        }
-    }
-
-    private inline fun <reified T : Enum<T>> enumValue(value: String, fallback: T): T =
-        enumValues<T>().firstOrNull { it.name == value } ?: fallback
-
-    private fun JSONArray?.objects(): List<JSONObject> = if (this == null) emptyList() else List(length()) { getJSONObject(it) }
-    private fun JSONArray?.ints(): List<Int> = if (this == null) emptyList() else List(length()) { getInt(it) }
-}
@@ -1,116 +0,0 @@
-package com.flagship.abox.manager.automation.di
-
-import android.content.Context
-import androidx.room.Room
-import com.flagship.abox.manager.automation.data.AutomationDatabase
-import com.flagship.abox.manager.automation.data.AutomationRuntimeRepository
-import com.flagship.abox.manager.automation.data.RoomActivityRepository
-import com.flagship.abox.manager.automation.data.RoomAutomationRuntimeRepository
-import com.flagship.abox.manager.automation.data.RoomSceneRepository
-import com.flagship.abox.manager.automation.data.MIGRATION_1_2
-import com.flagship.abox.manager.automation.runtime.AutomationBootstrapper
-import com.flagship.abox.manager.automation.runtime.AutomationEngine
-import com.flagship.abox.manager.automation.runtime.AutomationScheduleStore
-import com.flagship.abox.manager.automation.runtime.AutomationScheduler
-import com.flagship.abox.manager.automation.runtime.DefaultAutomationEngine
-import com.flagship.abox.manager.automation.runtime.ProfileAutomationScheduler
-import com.flagship.abox.manager.automation.runtime.WorkManagerAutomationScheduleStore
-import com.flagship.abox.manager.domain.ActivityEventWriter
-import com.flagship.abox.manager.domain.ActivityRepository
-import com.flagship.abox.manager.domain.NotificationGateway
-import com.flagship.abox.manager.domain.ProviderProfileStore
-import com.flagship.abox.manager.domain.SceneExecutor
-import com.flagship.abox.manager.domain.SceneRepository
-import com.flagship.abox.manager.domain.SessionCoordinator
-import com.flagship.abox.manager.domain.SocketGateway
-import com.flagship.abox.manager.domain.TemperatureHumidityGateway
-import com.flagship.abox.manager.automation.notification.AndroidNotificationGateway
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-
-@Module
-@InstallIn(SingletonComponent::class)
-object AutomationModule {
-    @Provides
-    @Singleton
-    fun provideDatabase(@ApplicationContext context: Context): AutomationDatabase =
-        Room.databaseBuilder(context, AutomationDatabase::class.java, "abox_automation.db")
-            .addMigrations(MIGRATION_1_2)
-            .build()
-
-    @Provides
-    @Singleton
-    fun provideActivityRepository(database: AutomationDatabase): ActivityRepository = RoomActivityRepository(database.automationDao())
-
-    @Provides
-    @Singleton
-    fun provideActivityEventWriter(repository: ActivityRepository): ActivityEventWriter =
-        ActivityEventWriter(repository, CoroutineScope(SupervisorJob() + Dispatchers.IO))
-
-    @Provides
-    @Singleton
-    fun provideRuntimeRepository(database: AutomationDatabase): AutomationRuntimeRepository = RoomAutomationRuntimeRepository(database.automationDao())
-
-    @Provides
-    @Singleton
-    fun provideSceneRepository(
-        @ApplicationContext context: Context,
-        database: AutomationDatabase,
-    ): SceneRepository = RoomSceneRepository(context, database)
-
-    @Provides
-    @Singleton
-    fun provideAutomationEngine(
-        sceneRepository: SceneRepository,
-        runtimeRepository: AutomationRuntimeRepository,
-        temperatureHumidityGateway: TemperatureHumidityGateway,
-        socketGateway: SocketGateway,
-        sceneExecutor: SceneExecutor,
-    ): AutomationEngine = DefaultAutomationEngine(
-        sceneRepository,
-        runtimeRepository,
-        temperatureHumidityGateway,
-        socketGateway,
-        sceneExecutor,
-    )
-
-    @Provides
-    @Singleton
-    fun provideAutomationScheduleStore(@ApplicationContext context: Context): AutomationScheduleStore =
-        WorkManagerAutomationScheduleStore(context)
-
-    @Provides
-    @Singleton
-    fun provideAutomationScheduler(
-        profileStore: ProviderProfileStore,
-        sessionCoordinator: SessionCoordinator,
-        sceneRepository: SceneRepository,
-        scheduleStore: AutomationScheduleStore,
-    ): AutomationScheduler = ProfileAutomationScheduler(profileStore, sessionCoordinator, sceneRepository, scheduleStore)
-
-    @Provides
-    @Singleton
-    fun provideAutomationScope(): CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
-    @Provides
-    @Singleton
-    fun provideAutomationBootstrapper(
-        profileStore: ProviderProfileStore,
-        sessionCoordinator: SessionCoordinator,
-        scheduler: AutomationScheduler,
-        engine: AutomationEngine,
-        scope: CoroutineScope,
-    ): AutomationBootstrapper = AutomationBootstrapper(profileStore, sessionCoordinator, scheduler, engine, scope)
-
-    @Provides
-    @Singleton
-    fun provideNotificationGateway(@ApplicationContext context: Context): NotificationGateway =
-        AndroidNotificationGateway(context)
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
KremeCN	05d44578b9	fix: stabilize adaptive navigation state	2026-08-26 15:29:41 +08:00
KremeCN	54eef78a46	feat: add adaptive authenticated navigation	2026-08-26 15:29:41 +08:00
KremeCN	c1c21551fb	feat: separate session and credential actions	2026-08-26 12:57:44 +08:00
KremeCN	283f56a3b6	feat: add persistent interface settings	2026-08-26 12:19:38 +08:00
KremeCN	b24ca98e14	fix: correct ABox switch semantics and motion	2026-08-26 11:38:32 +08:00
KremeCN	063a3f8dab	feat: add semantic ABox UI components	2026-08-26 11:38:32 +08:00
KremeCN	cae2ea9ce0	fix: contain Material renderer adapter	2026-08-26 09:56:58 +08:00
KremeCN	4055c53362	feat: add dual-renderer design tokens	2026-08-26 09:56:58 +08:00
KremeCN	686176b148	fix: rethrow UI preference transform IO failures	2026-08-26 07:42:55 +08:00
KremeCN	79b47fc354	feat: persist global UI preferences	2026-08-26 07:42:55 +08:00
KremeCN	b39b3f95c7	test: add Compose screenshot baseline	2026-08-26 07:10:34 +08:00
KremeCN	94e3e394af	build: modernize Android Compose toolchain	2026-08-26 06:38:26 +08:00