feat: unify device detail presentation
This commit is contained in:
+9
-9
@@ -59,6 +59,8 @@ import androidx.compose.ui.unit.sp
|
||||
import androidx.hilt.navigation.compose.hiltViewModel
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import com.flagship.abox.manager.designsystem.ABoxSurface
|
||||
import com.flagship.abox.manager.designsystem.ABoxIconButton
|
||||
import com.flagship.abox.manager.designsystem.icon.ABoxIconKey
|
||||
import com.flagship.abox.manager.domain.ProviderProfileId
|
||||
import com.flagship.abox.manager.domain.infrared.PanelLayoutStyle
|
||||
import com.flagship.abox.manager.domain.infrared.PresetCodeLibrary
|
||||
@@ -154,17 +156,15 @@ internal fun InfraredHubScreen(
|
||||
}
|
||||
},
|
||||
navigationIcon = {
|
||||
TextButton(onClick = onBack) {
|
||||
Text(stringResource(R.string.infrared_back))
|
||||
}
|
||||
ABoxIconButton(ABoxIconKey.BACK, "返回", onBack)
|
||||
},
|
||||
actions = {
|
||||
IconButton(
|
||||
ABoxIconButton(
|
||||
key = ABoxIconKey.EDIT,
|
||||
contentDescription = "打开红外设置",
|
||||
onClick = onNavigateToSettings,
|
||||
modifier = Modifier.testTag("hub_settings_button"),
|
||||
) {
|
||||
Text("⚙️", fontSize = 20.sp)
|
||||
}
|
||||
)
|
||||
},
|
||||
)
|
||||
},
|
||||
@@ -199,7 +199,7 @@ internal fun InfraredHubScreen(
|
||||
onClick = { showCreateDialog = true },
|
||||
modifier = Modifier.testTag("hub_add_remote_button"),
|
||||
) {
|
||||
Text("➕ " + stringResource(R.string.infrared_hub_add_remote))
|
||||
Text(stringResource(R.string.infrared_hub_add_remote))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -278,7 +278,7 @@ private fun VirtualRemoteCard(
|
||||
}
|
||||
Text(icon, fontSize = 28.sp)
|
||||
IconButton(onClick = onDelete, modifier = Modifier.testTag("delete_remote_${remote.id.value}")) {
|
||||
Text("🗑️", fontSize = 16.sp)
|
||||
Text(stringResource(R.string.infrared_delete))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+6
-5
@@ -60,6 +60,9 @@ import androidx.compose.ui.unit.sp
|
||||
import androidx.hilt.navigation.compose.hiltViewModel
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import com.flagship.abox.manager.designsystem.ABoxSurface
|
||||
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.infrared.AcFanSpeed
|
||||
import com.flagship.abox.manager.domain.infrared.AcMode
|
||||
import com.flagship.abox.manager.domain.infrared.AcStateSnapshot
|
||||
@@ -175,9 +178,7 @@ internal fun RemotePanelScreen(
|
||||
}
|
||||
},
|
||||
navigationIcon = {
|
||||
TextButton(onClick = onBack) {
|
||||
Text(stringResource(R.string.infrared_back))
|
||||
}
|
||||
ABoxIconButton(ABoxIconKey.BACK, "返回", onBack)
|
||||
},
|
||||
actions = {
|
||||
// 非空调面板显示学习模式开关
|
||||
@@ -185,7 +186,7 @@ internal fun RemotePanelScreen(
|
||||
FilterChip(
|
||||
selected = state.isLearnMode,
|
||||
onClick = onToggleLearnMode,
|
||||
label = { Text(if (state.isLearnMode) "🔴 录制中" else "⚪ 学习模式") },
|
||||
label = { Text(if (state.isLearnMode) "录制中" else "学习模式") },
|
||||
colors = FilterChipDefaults.filterChipColors(
|
||||
selectedContainerColor = Color(0xFFFF5252),
|
||||
selectedLabelColor = Color.White,
|
||||
@@ -222,7 +223,7 @@ internal fun RemotePanelScreen(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||
) {
|
||||
Text("🔴", fontSize = 16.sp)
|
||||
ABoxIcon(ABoxIconKey.PENDING, "录制中", modifier = Modifier.size(20.dp))
|
||||
Text(
|
||||
text = "学习模式已开启:点击任意按键,然后将物理实体遥控器对准转发器按下即可录码",
|
||||
color = Color(0xFFC62828),
|
||||
|
||||
Reference in New Issue
Block a user