feat(scene): add scene editor, executor and fakes (phase 1) (#5)
## Summary Adds scene integration phase 1: domain model, fakes, UI, navigation, and tests. ## Changes - **domain**: Add `Scene`, `SceneAction` (SocketPower/InfraredKey), `SceneRepository`, `SceneExecutor`, and execution result models. - **testing/fakes**: Add `FakeSceneRepository` (isolated by `ProviderProfileId`, seeded defaults for the local profile) and `FakeSceneExecutor` (sequential execution, continue-on-failure). - **android/app**: Add scene UI module - list screen, editor screen, execution progress screen - with Hilt-bound ViewModels. - **navigation**: Wire scene routes into `ABoxManagerApp` NavHost. - **strings**: Add `scene_*` entries for en and zh-rCN. - **tests**: Cover `FakeSceneRepository` CRUD/isolation and `FakeSceneExecutor` ordering/continue-on-failure. ## Test plan - [x] `./gradlew :testing:fakes:test` passes. - [x] `FakeSceneRepository` isolates scenes by provider profile. - [x] `FakeSceneExecutor` runs actions in order and continues on failure. ## Notes Phase 1 ships fakes only; real repository/executor backed by the abox gateway will land in a follow-up. --------- Co-authored-by: KremeCN <3265494849@qq.com> Co-authored-by: mxhsnd <2049295946@qq.com> Reviewed-on: #5 Co-authored-by: tzh <3091898014@qq.com>
This commit was merged in pull request #5.
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
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.SocketGateway
|
||||
import com.flagship.abox.manager.domain.infrared.SendVirtualRemoteAction
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.hilt.InstallIn
|
||||
import dagger.hilt.components.SingletonComponent
|
||||
import javax.inject.Singleton
|
||||
|
||||
/**
|
||||
* Production dependency injection module for Scene management and execution.
|
||||
*/
|
||||
@Module
|
||||
@InstallIn(SingletonComponent::class)
|
||||
object SceneIntegrationModule {
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideSceneRepository(): SceneRepository = InMemorySceneRepository()
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideSceneExecutor(
|
||||
socketGateway: SocketGateway,
|
||||
infraredGateway: InfraredGateway,
|
||||
sendVirtualRemoteAction: SendVirtualRemoteAction,
|
||||
): SceneExecutor = DefaultSceneExecutor(
|
||||
socketGateway = socketGateway,
|
||||
infraredGateway = infraredGateway,
|
||||
sendVirtualRemoteAction = sendVirtualRemoteAction,
|
||||
)
|
||||
}
|
||||
@@ -32,6 +32,10 @@ import com.flagship.abox.manager.ui.navigation.deviceDetailGraph
|
||||
import com.flagship.abox.manager.ui.navigation.navigateToSocket
|
||||
import com.flagship.abox.manager.ui.navigation.navigateToTemperatureHumidity
|
||||
import com.flagship.abox.manager.ui.provider.ProviderSelectionRoute
|
||||
import com.flagship.abox.manager.ui.scene.SceneListScreen
|
||||
import com.flagship.abox.manager.ui.scene.SceneRoutes
|
||||
import com.flagship.abox.manager.ui.scene.sceneEditorDestination
|
||||
import com.flagship.abox.manager.ui.scene.sceneExecutionDestination
|
||||
import com.flagship.abox.manager.ui.session.AppSessionUiState
|
||||
import com.flagship.abox.manager.ui.session.AppSessionViewModel
|
||||
import com.flagship.abox.manager.ui.session.SessionActionsViewModel
|
||||
@@ -124,11 +128,26 @@ private fun AuthenticatedNavHost(
|
||||
},
|
||||
)
|
||||
},
|
||||
scenesSlot = {
|
||||
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)) },
|
||||
)
|
||||
},
|
||||
)
|
||||
}
|
||||
deviceDetailGraph(
|
||||
onBackClick = navController::popBackStack,
|
||||
)
|
||||
sceneEditorDestination(
|
||||
onBack = { navController.popBackStack() },
|
||||
onSaved = { navController.popBackStack() },
|
||||
)
|
||||
sceneExecutionDestination(
|
||||
onBack = { navController.popBackStack() },
|
||||
)
|
||||
composable(
|
||||
route = "infrared_hub/{profileId}",
|
||||
arguments = listOf(
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+385
@@ -0,0 +1,385 @@
|
||||
package com.flagship.abox.manager.ui.scene
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
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.DomainResult
|
||||
import com.flagship.abox.manager.domain.ExecutionStrategy
|
||||
import com.flagship.abox.manager.domain.ProviderProfileStore
|
||||
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 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 dagger.hilt.android.lifecycle.HiltViewModel
|
||||
import java.util.UUID
|
||||
import javax.inject.Inject
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.collectLatest
|
||||
import kotlinx.coroutines.flow.update
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
data class SceneEditorState(
|
||||
val sceneId: SceneId? = null,
|
||||
val type: AutomationType = AutomationType.MANUAL,
|
||||
val name: String = "",
|
||||
val description: String = "",
|
||||
val enabled: Boolean = true,
|
||||
val icon: SceneIcon = SceneIcon.HOME,
|
||||
val colorHex: String = "#3F51B5",
|
||||
val triggers: List<SceneTrigger> = emptyList(),
|
||||
val conditions: List<SceneCondition> = emptyList(),
|
||||
val actions: List<SceneAction> = emptyList(),
|
||||
val strategy: ExecutionStrategy = ExecutionStrategy.CONTINUE_ON_ERROR,
|
||||
val concurrencyMode: ConcurrencyMode = ConcurrencyMode.SEQUENTIAL,
|
||||
val enableLogging: Boolean = true,
|
||||
val availableRemotes: List<VirtualRemote> = emptyList(),
|
||||
val isLoading: Boolean = false,
|
||||
val isSaving: Boolean = false,
|
||||
val isSaved: Boolean = false,
|
||||
val errorMessage: String? = null,
|
||||
) {
|
||||
val isValid: Boolean get() = !isLoading && name.isNotBlank() && actions.isNotEmpty() && (type != AutomationType.AUTOMATIC || triggers.isNotEmpty())
|
||||
val isEditing: Boolean get() = sceneId != null
|
||||
}
|
||||
|
||||
@HiltViewModel
|
||||
class SceneEditorViewModel @Inject constructor(
|
||||
private val sceneRepository: SceneRepository,
|
||||
private val virtualRemoteRepository: VirtualRemoteRepository,
|
||||
private val profileStore: ProviderProfileStore,
|
||||
) : ViewModel() {
|
||||
|
||||
private val _state = MutableStateFlow(SceneEditorState())
|
||||
val state: StateFlow<SceneEditorState> = _state.asStateFlow()
|
||||
|
||||
private var initializedSceneId: SceneId? = null
|
||||
private var isInitialized: Boolean = false
|
||||
|
||||
init {
|
||||
observeAvailableRemotes()
|
||||
}
|
||||
|
||||
private fun observeAvailableRemotes() {
|
||||
viewModelScope.launch {
|
||||
profileStore.observeActiveProfile().collectLatest { profile ->
|
||||
if (profile != null) {
|
||||
virtualRemoteRepository.observeRemotes(profile.id, DeviceName("红外控制器")).collectLatest { res ->
|
||||
if (res is DomainResult.Success) {
|
||||
_state.update { it.copy(availableRemotes = res.value) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun initialize(sceneId: SceneId?, initialType: AutomationType? = null) {
|
||||
if (isInitialized && initializedSceneId == sceneId) return
|
||||
isInitialized = true
|
||||
initializedSceneId = sceneId
|
||||
|
||||
if (sceneId == null) {
|
||||
_state.update {
|
||||
SceneEditorState(
|
||||
type = initialType ?: AutomationType.MANUAL,
|
||||
colorHex = if (initialType == AutomationType.AUTOMATIC) "#26A69A" else "#3F51B5",
|
||||
availableRemotes = it.availableRemotes,
|
||||
isLoading = false,
|
||||
)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
_state.update {
|
||||
it.copy(
|
||||
sceneId = sceneId,
|
||||
isLoading = true,
|
||||
errorMessage = null,
|
||||
)
|
||||
}
|
||||
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile()
|
||||
if (profile == null) {
|
||||
_state.update { it.copy(isLoading = false, errorMessage = "No active profile") }
|
||||
return@launch
|
||||
}
|
||||
val scene = (sceneRepository.getScene(profile.id, sceneId) as? DomainResult.Success)?.value
|
||||
if (scene != null) {
|
||||
_state.update {
|
||||
it.copy(
|
||||
sceneId = scene.id,
|
||||
type = scene.type,
|
||||
name = scene.name,
|
||||
description = scene.description,
|
||||
enabled = scene.enabled,
|
||||
icon = scene.icon,
|
||||
colorHex = scene.color.hex,
|
||||
triggers = scene.triggers,
|
||||
conditions = scene.conditions,
|
||||
actions = scene.actions,
|
||||
strategy = scene.strategy,
|
||||
concurrencyMode = scene.concurrencyMode,
|
||||
enableLogging = scene.enableLogging,
|
||||
isLoading = false,
|
||||
)
|
||||
}
|
||||
} else {
|
||||
_state.update { it.copy(isLoading = false, errorMessage = "Scene not found") }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun updateName(name: String) = _state.update { it.copy(name = name, errorMessage = null) }
|
||||
fun updateDescription(desc: String) = _state.update { it.copy(description = desc) }
|
||||
fun updateType(type: AutomationType) = _state.update { it.copy(type = type) }
|
||||
fun updateEnabled(enabled: Boolean) = _state.update { it.copy(enabled = enabled) }
|
||||
fun updateIcon(icon: SceneIcon) = _state.update { it.copy(icon = icon) }
|
||||
fun updateColor(hex: String) = _state.update { it.copy(colorHex = hex) }
|
||||
fun updateStrategy(strategy: ExecutionStrategy) = _state.update { it.copy(strategy = strategy) }
|
||||
fun updateConcurrencyMode(mode: ConcurrencyMode) = _state.update { it.copy(concurrencyMode = mode) }
|
||||
fun updateLogging(enabled: Boolean) = _state.update { it.copy(enableLogging = enabled) }
|
||||
|
||||
// --- Triggers ---
|
||||
fun addTimeTrigger(timeOfDay: String, daysOfWeek: Set<Int> = emptySet()) {
|
||||
val trigger = SceneTrigger.Time(
|
||||
id = SceneTriggerId(UUID.randomUUID().toString()),
|
||||
timeOfDay = timeOfDay,
|
||||
daysOfWeek = daysOfWeek,
|
||||
label = "定时 $timeOfDay",
|
||||
)
|
||||
_state.update { it.copy(triggers = it.triggers + trigger) }
|
||||
}
|
||||
|
||||
fun addTemperatureTrigger(deviceName: String, operator: ComparisonOperator, threshold: Double) {
|
||||
val trigger = SceneTrigger.Temperature(
|
||||
id = SceneTriggerId(UUID.randomUUID().toString()),
|
||||
deviceName = DeviceName(deviceName),
|
||||
operator = operator,
|
||||
thresholdCelsius = threshold,
|
||||
label = "$deviceName 温度 ${operator.symbol} $threshold°C",
|
||||
)
|
||||
_state.update { it.copy(triggers = it.triggers + trigger) }
|
||||
}
|
||||
|
||||
fun addHumidityTrigger(deviceName: String, operator: ComparisonOperator, threshold: Double) {
|
||||
val trigger = SceneTrigger.Humidity(
|
||||
id = SceneTriggerId(UUID.randomUUID().toString()),
|
||||
deviceName = DeviceName(deviceName),
|
||||
operator = operator,
|
||||
thresholdPercent = threshold,
|
||||
label = "$deviceName 湿度 ${operator.symbol} $threshold%",
|
||||
)
|
||||
_state.update { it.copy(triggers = it.triggers + trigger) }
|
||||
}
|
||||
|
||||
fun addDeviceStateTrigger(deviceName: String, expectedState: String) {
|
||||
val trigger = SceneTrigger.DeviceState(
|
||||
id = SceneTriggerId(UUID.randomUUID().toString()),
|
||||
deviceName = DeviceName(deviceName),
|
||||
expectedState = expectedState,
|
||||
label = "$deviceName 状态变为 $expectedState",
|
||||
)
|
||||
_state.update { it.copy(triggers = it.triggers + trigger) }
|
||||
}
|
||||
|
||||
fun removeTrigger(triggerId: SceneTriggerId) =
|
||||
_state.update { it.copy(triggers = it.triggers.filterNot { t -> t.id == triggerId }) }
|
||||
|
||||
// --- Conditions ---
|
||||
fun addTemperatureCondition(deviceName: String, operator: ComparisonOperator, threshold: Double) {
|
||||
val cond = SceneCondition.Temperature(
|
||||
id = SceneConditionId(UUID.randomUUID().toString()),
|
||||
deviceName = DeviceName(deviceName),
|
||||
operator = operator,
|
||||
thresholdCelsius = threshold,
|
||||
)
|
||||
_state.update { it.copy(conditions = it.conditions + cond) }
|
||||
}
|
||||
|
||||
fun addHumidityCondition(deviceName: String, operator: ComparisonOperator, threshold: Double) {
|
||||
val cond = SceneCondition.Humidity(
|
||||
id = SceneConditionId(UUID.randomUUID().toString()),
|
||||
deviceName = DeviceName(deviceName),
|
||||
operator = operator,
|
||||
thresholdPercent = threshold,
|
||||
)
|
||||
_state.update { it.copy(conditions = it.conditions + cond) }
|
||||
}
|
||||
|
||||
fun addSocketPowerCondition(deviceName: String, powerState: SocketPowerState) {
|
||||
val cond = SceneCondition.SocketPower(
|
||||
id = SceneConditionId(UUID.randomUUID().toString()),
|
||||
deviceName = DeviceName(deviceName),
|
||||
expectedState = powerState,
|
||||
)
|
||||
_state.update { it.copy(conditions = it.conditions + cond) }
|
||||
}
|
||||
|
||||
fun addTimeRangeCondition(startTime: String, endTime: String) {
|
||||
val cond = SceneCondition.TimeRange(
|
||||
id = SceneConditionId(UUID.randomUUID().toString()),
|
||||
startTime = startTime,
|
||||
endTime = endTime,
|
||||
)
|
||||
_state.update { it.copy(conditions = it.conditions + cond) }
|
||||
}
|
||||
|
||||
fun removeCondition(conditionId: SceneConditionId) =
|
||||
_state.update { it.copy(conditions = it.conditions.filterNot { c -> c.id == conditionId }) }
|
||||
|
||||
// --- Actions ---
|
||||
fun addSocketAction(deviceName: String, powerState: SocketPowerState) {
|
||||
if (deviceName.isBlank()) return
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile() ?: return@launch
|
||||
val action = SceneAction.SocketPower(
|
||||
id = SceneActionId(UUID.randomUUID().toString()),
|
||||
profileId = profile.id,
|
||||
deviceName = DeviceName(deviceName),
|
||||
powerState = powerState,
|
||||
)
|
||||
_state.update { it.copy(actions = it.actions + action, errorMessage = null) }
|
||||
}
|
||||
}
|
||||
|
||||
fun addVirtualRemoteAction(
|
||||
remoteId: String,
|
||||
remoteDisplayName: String,
|
||||
buttonId: String,
|
||||
buttonDisplayName: String,
|
||||
) {
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile() ?: return@launch
|
||||
val action = SceneAction.VirtualRemoteButton(
|
||||
id = SceneActionId(UUID.randomUUID().toString()),
|
||||
profileId = profile.id,
|
||||
remoteId = remoteId,
|
||||
remoteDisplayName = remoteDisplayName,
|
||||
buttonId = buttonId,
|
||||
buttonDisplayName = buttonDisplayName,
|
||||
)
|
||||
_state.update { it.copy(actions = it.actions + action, errorMessage = null) }
|
||||
}
|
||||
}
|
||||
|
||||
fun addInfraredAction(deviceName: String, key: String) {
|
||||
if (deviceName.isBlank() || key.isBlank()) return
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile() ?: return@launch
|
||||
val action = SceneAction.InfraredKey(
|
||||
id = SceneActionId(UUID.randomUUID().toString()),
|
||||
profileId = profile.id,
|
||||
deviceName = DeviceName(deviceName),
|
||||
key = key,
|
||||
)
|
||||
_state.update { it.copy(actions = it.actions + action, errorMessage = null) }
|
||||
}
|
||||
}
|
||||
|
||||
fun addDelayAction(seconds: Int) {
|
||||
if (seconds <= 0) return
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile() ?: return@launch
|
||||
val action = SceneAction.Delay(
|
||||
id = SceneActionId(UUID.randomUUID().toString()),
|
||||
profileId = profile.id,
|
||||
durationSeconds = seconds,
|
||||
)
|
||||
_state.update { it.copy(actions = it.actions + action, errorMessage = null) }
|
||||
}
|
||||
}
|
||||
|
||||
fun addNotificationAction(title: String, message: String) {
|
||||
if (title.isBlank()) return
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile() ?: return@launch
|
||||
val action = SceneAction.Notification(
|
||||
id = SceneActionId(UUID.randomUUID().toString()),
|
||||
profileId = profile.id,
|
||||
title = title,
|
||||
message = message,
|
||||
)
|
||||
_state.update { it.copy(actions = it.actions + action, errorMessage = null) }
|
||||
}
|
||||
}
|
||||
|
||||
fun removeAction(actionId: SceneActionId) =
|
||||
_state.update { it.copy(actions = it.actions.filterNot { a -> a.id == actionId }) }
|
||||
|
||||
fun moveAction(from: Int, to: Int) {
|
||||
val current = _state.value.actions
|
||||
if (from !in current.indices || to !in current.indices || from == to) return
|
||||
val updated = current.toMutableList().apply { add(to, removeAt(from)) }
|
||||
_state.update { it.copy(actions = updated) }
|
||||
}
|
||||
|
||||
suspend fun getKeyBindings(remoteId: VirtualRemoteId): List<RemoteKeyBinding> {
|
||||
return when (val res = virtualRemoteRepository.getKeyBindings(remoteId)) {
|
||||
is DomainResult.Success -> res.value
|
||||
is DomainResult.Failure -> emptyList()
|
||||
}
|
||||
}
|
||||
|
||||
fun save() {
|
||||
val state = _state.value
|
||||
if (!state.isValid || state.isSaving) return
|
||||
_state.update { it.copy(isSaving = true, errorMessage = null) }
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile()
|
||||
if (profile == null) {
|
||||
_state.update { it.copy(isSaving = false, errorMessage = "No active profile") }
|
||||
return@launch
|
||||
}
|
||||
val scene = Scene(
|
||||
id = state.sceneId ?: SceneId("${profile.id.value}:scene-${UUID.randomUUID()}"),
|
||||
profileId = profile.id,
|
||||
name = state.name.trim(),
|
||||
description = state.description.trim(),
|
||||
type = state.type,
|
||||
enabled = state.enabled,
|
||||
icon = state.icon,
|
||||
color = SceneColor(state.colorHex),
|
||||
triggers = state.triggers,
|
||||
conditions = state.conditions,
|
||||
actions = state.actions,
|
||||
strategy = state.strategy,
|
||||
concurrencyMode = state.concurrencyMode,
|
||||
enableLogging = state.enableLogging,
|
||||
)
|
||||
val result = if (state.isEditing) {
|
||||
sceneRepository.updateScene(profile.id, scene)
|
||||
} else {
|
||||
sceneRepository.createScene(profile.id, scene)
|
||||
}
|
||||
_state.update { current ->
|
||||
when (result) {
|
||||
is DomainResult.Success -> current.copy(isSaving = false, isSaved = true)
|
||||
is DomainResult.Failure -> current.copy(
|
||||
isSaving = false,
|
||||
errorMessage = result.error.detail ?: "Save failed",
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+345
@@ -0,0 +1,345 @@
|
||||
package com.flagship.abox.manager.ui.scene
|
||||
|
||||
import androidx.compose.foundation.BorderStroke
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
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.width
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.itemsIndexed
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.material.icons.filled.Check
|
||||
import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material.icons.filled.PlayArrow
|
||||
import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.material.icons.outlined.HourglassDisabled
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.Card
|
||||
import androidx.compose.material3.CardDefaults
|
||||
import androidx.compose.material3.CircularProgressIndicator
|
||||
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.OutlinedCard
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.hilt.navigation.compose.hiltViewModel
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import com.flagship.abox.manager.R
|
||||
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.SceneExecutionResult
|
||||
import com.flagship.abox.manager.domain.SceneId
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun SceneExecutionScreen(
|
||||
sceneId: SceneId,
|
||||
onBack: () -> Unit,
|
||||
viewModel: SceneExecutionViewModel = hiltViewModel(),
|
||||
) {
|
||||
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
|
||||
LaunchedEffect(sceneId) {
|
||||
viewModel.initialize(sceneId)
|
||||
}
|
||||
|
||||
Scaffold(
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
title = { Text(stringResource(R.string.scene_execution_title), fontWeight = FontWeight.SemiBold) },
|
||||
navigationIcon = {
|
||||
IconButton(onClick = onBack) {
|
||||
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.scene_back))
|
||||
}
|
||||
},
|
||||
)
|
||||
},
|
||||
) { innerPadding ->
|
||||
when (val state = uiState) {
|
||||
SceneExecutionUiState.Loading -> CenteredLoading(innerPadding)
|
||||
is SceneExecutionUiState.Failed -> CenteredMessage(innerPadding, state.message, onRetry = { viewModel.initialize(sceneId) })
|
||||
is SceneExecutionUiState.Ready -> ReadyContent(innerPadding, state.scene.name, viewModel::execute)
|
||||
is SceneExecutionUiState.Running -> RunningContent(innerPadding, state.scene.name)
|
||||
is SceneExecutionUiState.Completed -> CompletedContent(innerPadding, state.result, onBack, onRerun = viewModel::execute)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun CenteredLoading(paddingValues: PaddingValues) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(paddingValues),
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
CircularProgressIndicator()
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun CenteredMessage(paddingValues: PaddingValues, message: String, onRetry: () -> Unit) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(paddingValues)
|
||||
.padding(32.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center,
|
||||
) {
|
||||
Text(message, style = MaterialTheme.typography.bodyLarge, color = MaterialTheme.colorScheme.error)
|
||||
Spacer(Modifier.height(16.dp))
|
||||
Button(onClick = onRetry) {
|
||||
Icon(Icons.Filled.Refresh, contentDescription = null)
|
||||
Spacer(Modifier.width(6.dp))
|
||||
Text(stringResource(R.string.action_retry))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun ReadyContent(
|
||||
paddingValues: PaddingValues,
|
||||
sceneName: String,
|
||||
onExecute: () -> Unit,
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(paddingValues)
|
||||
.padding(24.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center,
|
||||
) {
|
||||
Text(sceneName, style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
Text(stringResource(R.string.scene_exec_ready_hint), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
Spacer(Modifier.height(24.dp))
|
||||
Button(
|
||||
onClick = onExecute,
|
||||
modifier = Modifier.fillMaxWidth(0.6f).height(48.dp),
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
) {
|
||||
Icon(Icons.Filled.PlayArrow, contentDescription = null)
|
||||
Spacer(Modifier.width(6.dp))
|
||||
Text(stringResource(R.string.scene_execution_run), fontWeight = FontWeight.SemiBold)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun RunningContent(paddingValues: PaddingValues, sceneName: String) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(paddingValues)
|
||||
.padding(24.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center,
|
||||
) {
|
||||
CircularProgressIndicator(modifier = Modifier.size(56.dp))
|
||||
Spacer(Modifier.height(20.dp))
|
||||
Text(
|
||||
stringResource(R.string.scene_execution_running, sceneName),
|
||||
style = MaterialTheme.typography.titleMedium,
|
||||
fontWeight = FontWeight.Medium,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun CompletedContent(
|
||||
paddingValues: PaddingValues,
|
||||
result: SceneExecutionResult,
|
||||
onBack: () -> Unit,
|
||||
onRerun: () -> Unit,
|
||||
) {
|
||||
LazyColumn(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(paddingValues),
|
||||
contentPadding = PaddingValues(16.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(12.dp),
|
||||
) {
|
||||
item(key = "summary") {
|
||||
OutlinedCard(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = RoundedCornerShape(16.dp),
|
||||
colors = CardDefaults.outlinedCardColors(
|
||||
containerColor = if (result.allSucceeded) {
|
||||
MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.3f)
|
||||
} else {
|
||||
MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.3f)
|
||||
},
|
||||
),
|
||||
border = BorderStroke(
|
||||
1.dp,
|
||||
if (result.allSucceeded) MaterialTheme.colorScheme.primary.copy(alpha = 0.4f)
|
||||
else MaterialTheme.colorScheme.error.copy(alpha = 0.4f),
|
||||
),
|
||||
) {
|
||||
Column(modifier = Modifier.padding(16.dp)) {
|
||||
Text(
|
||||
text = stringResource(R.string.scene_execution_done),
|
||||
style = MaterialTheme.typography.titleMedium,
|
||||
fontWeight = FontWeight.Bold,
|
||||
)
|
||||
Spacer(Modifier.height(4.dp))
|
||||
Text(
|
||||
text = stringResource(
|
||||
R.string.scene_execution_summary,
|
||||
result.succeededCount,
|
||||
result.failedCount,
|
||||
result.totalActions,
|
||||
),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
if (result.totalDurationMillis > 0) {
|
||||
Spacer(Modifier.height(4.dp))
|
||||
Text(
|
||||
text = stringResource(R.string.scene_execution_duration, result.totalDurationMillis),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
itemsIndexed(result.results, key = { index, _ -> "action_res_$index" }) { index, entry ->
|
||||
ActionResultRow(index + 1, entry)
|
||||
}
|
||||
|
||||
item(key = "buttons") {
|
||||
Spacer(Modifier.height(8.dp))
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp),
|
||||
) {
|
||||
OutlinedButton(
|
||||
onClick = onRerun,
|
||||
modifier = Modifier.weight(1f).height(48.dp),
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
) {
|
||||
Icon(Icons.Filled.Refresh, contentDescription = null, modifier = Modifier.size(18.dp))
|
||||
Spacer(Modifier.width(6.dp))
|
||||
Text(stringResource(R.string.scene_exec_rerun))
|
||||
}
|
||||
Button(
|
||||
onClick = onBack,
|
||||
modifier = Modifier.weight(1f).height(48.dp),
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
) {
|
||||
Text(stringResource(R.string.action_back), fontWeight = FontWeight.SemiBold)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun ActionResultRow(stepNumber: Int, entry: SceneActionExecutionResult) {
|
||||
OutlinedCard(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
colors = CardDefaults.outlinedCardColors(containerColor = MaterialTheme.colorScheme.surface),
|
||||
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f)),
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(14.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Surface(
|
||||
shape = CircleShape,
|
||||
color = when (entry.outcome) {
|
||||
SceneActionOutcome.SUCCESS -> MaterialTheme.colorScheme.primaryContainer
|
||||
SceneActionOutcome.FAILURE -> MaterialTheme.colorScheme.errorContainer
|
||||
SceneActionOutcome.SKIPPED -> MaterialTheme.colorScheme.surfaceVariant
|
||||
},
|
||||
modifier = Modifier.size(32.dp),
|
||||
) {
|
||||
Box(contentAlignment = Alignment.Center) {
|
||||
when (entry.outcome) {
|
||||
SceneActionOutcome.SUCCESS -> Icon(
|
||||
Icons.Filled.Check,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.size(18.dp),
|
||||
)
|
||||
SceneActionOutcome.FAILURE -> Icon(
|
||||
Icons.Filled.Close,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.error,
|
||||
modifier = Modifier.size(18.dp),
|
||||
)
|
||||
SceneActionOutcome.SKIPPED -> Icon(
|
||||
Icons.Outlined.HourglassDisabled,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.size(16.dp),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.width(12.dp))
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Text(
|
||||
text = stringResource(R.string.scene_step_format, stepNumber, entry.action.describe()),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
fontWeight = FontWeight.Medium,
|
||||
)
|
||||
entry.error?.detail?.let { detail ->
|
||||
Spacer(Modifier.height(2.dp))
|
||||
Text(
|
||||
text = detail,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.error,
|
||||
)
|
||||
}
|
||||
}
|
||||
if (entry.executionDurationMillis > 0) {
|
||||
Text(
|
||||
text = "${entry.executionDurationMillis}ms",
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun SceneAction.describe(): String = when (this) {
|
||||
is SceneAction.SocketPower -> stringResource(R.string.scene_action_socket, deviceName.value, powerState.name)
|
||||
is SceneAction.VirtualRemoteButton -> stringResource(R.string.scene_action_remote, remoteDisplayName, buttonDisplayName)
|
||||
is SceneAction.InfraredKey -> stringResource(R.string.scene_action_infrared, deviceName.value, key)
|
||||
is SceneAction.Delay -> stringResource(R.string.scene_action_delay, durationSeconds)
|
||||
is SceneAction.Notification -> stringResource(R.string.scene_action_notification, title)
|
||||
}
|
||||
|
||||
+83
@@ -0,0 +1,83 @@
|
||||
package com.flagship.abox.manager.ui.scene
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.flagship.abox.manager.domain.DomainResult
|
||||
import com.flagship.abox.manager.domain.ProviderProfileStore
|
||||
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.SceneRepository
|
||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||
import javax.inject.Inject
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
sealed interface SceneExecutionUiState {
|
||||
data object Loading : SceneExecutionUiState
|
||||
data class Ready(val scene: Scene) : SceneExecutionUiState
|
||||
data class Running(val scene: Scene) : SceneExecutionUiState
|
||||
data class Completed(val result: SceneExecutionResult) : SceneExecutionUiState
|
||||
data class Failed(val message: String) : SceneExecutionUiState
|
||||
}
|
||||
|
||||
@HiltViewModel
|
||||
class SceneExecutionViewModel @Inject constructor(
|
||||
private val sceneRepository: SceneRepository,
|
||||
private val sceneExecutor: SceneExecutor,
|
||||
private val profileStore: ProviderProfileStore,
|
||||
) : ViewModel() {
|
||||
|
||||
private val _uiState = MutableStateFlow<SceneExecutionUiState>(SceneExecutionUiState.Loading)
|
||||
val uiState: StateFlow<SceneExecutionUiState> = _uiState.asStateFlow()
|
||||
|
||||
private var initializedSceneId: SceneId? = null
|
||||
|
||||
fun initialize(sceneId: SceneId) {
|
||||
if (initializedSceneId == sceneId && _uiState.value !is SceneExecutionUiState.Loading) {
|
||||
return
|
||||
}
|
||||
initializedSceneId = sceneId
|
||||
_uiState.value = SceneExecutionUiState.Loading
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile()
|
||||
if (profile == null) {
|
||||
_uiState.value = SceneExecutionUiState.Failed("No active profile")
|
||||
return@launch
|
||||
}
|
||||
val scene = (sceneRepository.getScene(profile.id, sceneId) as? DomainResult.Success)?.value
|
||||
_uiState.value = if (scene != null) {
|
||||
SceneExecutionUiState.Ready(scene)
|
||||
} else {
|
||||
SceneExecutionUiState.Failed("Scene not found")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun execute() {
|
||||
val current = _uiState.value
|
||||
val scene = when (current) {
|
||||
is SceneExecutionUiState.Ready -> current.scene
|
||||
is SceneExecutionUiState.Completed -> current.result.scene
|
||||
else -> return
|
||||
}
|
||||
_uiState.value = SceneExecutionUiState.Running(scene)
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile()
|
||||
if (profile == null || profile.id != scene.profileId) {
|
||||
_uiState.value = SceneExecutionUiState.Failed("Active profile mismatch")
|
||||
return@launch
|
||||
}
|
||||
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",
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,417 @@
|
||||
package com.flagship.abox.manager.ui.scene
|
||||
|
||||
import android.widget.Toast
|
||||
import androidx.compose.foundation.BorderStroke
|
||||
import androidx.compose.foundation.background
|
||||
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.PaddingValues
|
||||
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.width
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material.icons.filled.Delete
|
||||
import androidx.compose.material.icons.filled.Edit
|
||||
import androidx.compose.material.icons.filled.PlayArrow
|
||||
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.ExtendedFloatingActionButton
|
||||
import androidx.compose.material3.FilledTonalButton
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedCard
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.SecondaryTabRow
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Switch
|
||||
import androidx.compose.material3.Tab
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
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.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.hilt.navigation.compose.hiltViewModel
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import com.flagship.abox.manager.R
|
||||
import com.flagship.abox.manager.domain.AutomationType
|
||||
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 kotlinx.coroutines.flow.collectLatest
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun SceneListScreen(
|
||||
onAddManual: () -> Unit,
|
||||
onAddAutomatic: () -> Unit,
|
||||
onEditScene: (SceneId) -> Unit,
|
||||
onExecuteScene: (SceneId) -> Unit,
|
||||
headerContent: @Composable (() -> Unit)? = null,
|
||||
viewModel: SceneListViewModel = hiltViewModel(),
|
||||
) {
|
||||
val scenes by viewModel.scenes.collectAsStateWithLifecycle()
|
||||
val selectedTab by viewModel.selectedTab.collectAsStateWithLifecycle()
|
||||
val pendingDelete by viewModel.pendingDelete.collectAsStateWithLifecycle()
|
||||
var showFabMenu by remember { mutableStateOf(false) }
|
||||
|
||||
val context = LocalContext.current
|
||||
LaunchedEffect(Unit) {
|
||||
viewModel.userMessage.collectLatest { msg ->
|
||||
if (msg == "executed") {
|
||||
Toast.makeText(context, context.getString(R.string.scene_toast_executed), Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Scaffold(
|
||||
containerColor = Color.Transparent,
|
||||
floatingActionButton = {
|
||||
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()
|
||||
},
|
||||
)
|
||||
DropdownMenuItem(
|
||||
text = { Text(stringResource(R.string.scene_create_automatic)) },
|
||||
leadingIcon = { Icon(Icons.Outlined.Schedule, contentDescription = null) },
|
||||
onClick = {
|
||||
showFabMenu = false
|
||||
onAddAutomatic()
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
) { innerPadding ->
|
||||
LazyColumn(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
contentPadding = PaddingValues(
|
||||
start = 16.dp,
|
||||
end = 16.dp,
|
||||
top = 12.dp,
|
||||
bottom = innerPadding.calculateBottomPadding() + 80.dp,
|
||||
),
|
||||
verticalArrangement = Arrangement.spacedBy(12.dp),
|
||||
) {
|
||||
if (headerContent != null) {
|
||||
item(key = "header") {
|
||||
headerContent()
|
||||
}
|
||||
}
|
||||
|
||||
item(key = "tabs") {
|
||||
SecondaryTabRow(
|
||||
selectedTabIndex = selectedTab.ordinal,
|
||||
containerColor = Color.Transparent,
|
||||
divider = {},
|
||||
modifier = Modifier.fillMaxWidth().clip(RoundedCornerShape(12.dp)),
|
||||
) {
|
||||
SceneFilterTab.entries.forEach { tab ->
|
||||
Tab(
|
||||
selected = selectedTab == tab,
|
||||
onClick = { viewModel.selectTab(tab) },
|
||||
text = {
|
||||
Text(
|
||||
text = when (tab) {
|
||||
SceneFilterTab.ALL -> stringResource(R.string.scene_tab_all)
|
||||
SceneFilterTab.MANUAL -> stringResource(R.string.scene_tab_manual)
|
||||
SceneFilterTab.AUTOMATIC -> stringResource(R.string.scene_tab_automatic)
|
||||
},
|
||||
fontWeight = if (selectedTab == tab) FontWeight.Bold else FontWeight.Normal,
|
||||
)
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (scenes.isEmpty()) {
|
||||
item(key = "empty") {
|
||||
EmptySceneList(modifier = Modifier.fillMaxWidth().padding(vertical = 48.dp))
|
||||
}
|
||||
} else {
|
||||
items(scenes, key = { it.id.value }) { scene ->
|
||||
SceneCard(
|
||||
scene = scene,
|
||||
onClick = {
|
||||
if (scene.type == AutomationType.MANUAL) {
|
||||
onExecuteScene(scene.id)
|
||||
} else {
|
||||
onEditScene(scene.id)
|
||||
}
|
||||
},
|
||||
onQuickExecute = { viewModel.executeQuick(scene) },
|
||||
onToggleEnabled = { viewModel.toggleEnabled(scene) },
|
||||
onEdit = { onEditScene(scene.id) },
|
||||
onDelete = { viewModel.markPendingDelete(scene.id) },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pendingDelete?.let { sceneId ->
|
||||
AlertDialog(
|
||||
onDismissRequest = viewModel::cancelDelete,
|
||||
title = { Text(stringResource(R.string.scene_delete_dialog_title)) },
|
||||
text = { Text(stringResource(R.string.scene_delete_dialog_message)) },
|
||||
confirmButton = {
|
||||
TextButton(onClick = { viewModel.deleteScene(sceneId) }) {
|
||||
Text(stringResource(R.string.scene_delete_confirm), color = MaterialTheme.colorScheme.error)
|
||||
}
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(onClick = viewModel::cancelDelete) {
|
||||
Text(stringResource(R.string.scene_delete_cancel))
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun SceneCard(
|
||||
scene: Scene,
|
||||
onClick: () -> Unit,
|
||||
onQuickExecute: () -> Unit,
|
||||
onToggleEnabled: () -> Unit,
|
||||
onEdit: () -> Unit,
|
||||
onDelete: () -> Unit,
|
||||
) {
|
||||
val accentColor = scene.color.toColorOrNull() ?: MaterialTheme.colorScheme.primary
|
||||
|
||||
OutlinedCard(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clickable(onClick = onClick),
|
||||
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),
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(44.dp)
|
||||
.background(
|
||||
color = accentColor.copy(alpha = 0.12f),
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
),
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
Text(
|
||||
text = scene.icon.displayEmoji(),
|
||||
style = MaterialTheme.typography.titleMedium,
|
||||
)
|
||||
}
|
||||
Spacer(Modifier.width(12.dp))
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp),
|
||||
) {
|
||||
Text(
|
||||
text = scene.name,
|
||||
style = MaterialTheme.typography.titleMedium,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
TypeBadge(type = scene.type)
|
||||
}
|
||||
if (scene.description.isNotBlank()) {
|
||||
Spacer(Modifier.height(2.dp))
|
||||
Text(
|
||||
text = scene.description,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
if (scene.type == AutomationType.AUTOMATIC) {
|
||||
Switch(
|
||||
checked = scene.enabled,
|
||||
onCheckedChange = { onToggleEnabled() },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(Modifier.height(12.dp))
|
||||
|
||||
// Trigger & Action summary and controls
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
) {
|
||||
// Summary text without nested heavy container shells
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(4.dp),
|
||||
) {
|
||||
if (scene.type == AutomationType.AUTOMATIC) {
|
||||
Text(
|
||||
text = if (scene.triggers.isNotEmpty()) {
|
||||
stringResource(R.string.scene_summary_triggers_and_actions, scene.triggers.size, scene.actions.size)
|
||||
} else {
|
||||
stringResource(R.string.scene_summary_actions_only, scene.actions.size)
|
||||
},
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
} else {
|
||||
Text(
|
||||
text = stringResource(R.string.scene_summary_actions_only, scene.actions.size),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
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))
|
||||
}
|
||||
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)
|
||||
}
|
||||
IconButton(onClick = onDelete, modifier = Modifier.size(32.dp)) {
|
||||
Icon(Icons.Filled.Delete, contentDescription = stringResource(R.string.scene_delete), modifier = Modifier.size(18.dp), tint = MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun TypeBadge(type: AutomationType) {
|
||||
val label = when (type) {
|
||||
AutomationType.MANUAL -> stringResource(R.string.scene_tab_manual)
|
||||
AutomationType.AUTOMATIC -> stringResource(R.string.scene_tab_automatic)
|
||||
}
|
||||
Surface(
|
||||
shape = RoundedCornerShape(4.dp),
|
||||
color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
|
||||
border = BorderStroke(0.5.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.4f)),
|
||||
) {
|
||||
Text(
|
||||
text = label,
|
||||
modifier = Modifier.padding(horizontal = 5.dp, vertical = 1.dp),
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun EmptySceneList(modifier: Modifier = Modifier) {
|
||||
Column(
|
||||
modifier = modifier,
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center,
|
||||
) {
|
||||
Text(
|
||||
text = "⚡",
|
||||
style = MaterialTheme.typography.displayMedium,
|
||||
)
|
||||
Spacer(Modifier.size(8.dp))
|
||||
Text(
|
||||
text = stringResource(R.string.scene_empty_title),
|
||||
style = MaterialTheme.typography.titleLarge,
|
||||
textAlign = TextAlign.Center,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
)
|
||||
Spacer(Modifier.size(8.dp))
|
||||
Text(
|
||||
text = stringResource(R.string.scene_empty_message),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
textAlign = TextAlign.Center,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
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? {
|
||||
val cleanHex = hex.removePrefix("#")
|
||||
return runCatching { Color(cleanHex.toLong(16) or 0xFF000000.toInt().toLong()) }.getOrNull()
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
package com.flagship.abox.manager.ui.scene
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.flagship.abox.manager.domain.AutomationType
|
||||
import com.flagship.abox.manager.domain.DomainResult
|
||||
import com.flagship.abox.manager.domain.ProviderProfileStore
|
||||
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 dagger.hilt.android.lifecycle.HiltViewModel
|
||||
import javax.inject.Inject
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.flow.MutableSharedFlow
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.SharedFlow
|
||||
import kotlinx.coroutines.flow.SharingStarted
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asSharedFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.combine
|
||||
import kotlinx.coroutines.flow.flatMapLatest
|
||||
import kotlinx.coroutines.flow.flowOf
|
||||
import kotlinx.coroutines.flow.map
|
||||
import kotlinx.coroutines.flow.stateIn
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
enum class SceneFilterTab {
|
||||
ALL,
|
||||
MANUAL,
|
||||
AUTOMATIC,
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@HiltViewModel
|
||||
class SceneListViewModel @Inject constructor(
|
||||
private val sceneRepository: SceneRepository,
|
||||
private val sceneExecutor: SceneExecutor,
|
||||
private val profileStore: ProviderProfileStore,
|
||||
) : ViewModel() {
|
||||
|
||||
private val _selectedTab = MutableStateFlow(SceneFilterTab.ALL)
|
||||
val selectedTab: StateFlow<SceneFilterTab> = _selectedTab.asStateFlow()
|
||||
|
||||
private val allScenes: StateFlow<List<Scene>> = profileStore.observeActiveProfile()
|
||||
.flatMapLatest { profile ->
|
||||
if (profile == null) {
|
||||
flowOf(DomainResult.Success(emptyList()))
|
||||
} else {
|
||||
sceneRepository.observeScenes(profile.id)
|
||||
}
|
||||
}
|
||||
.map { result -> (result as? DomainResult.Success)?.value.orEmpty() }
|
||||
.stateIn(
|
||||
scope = viewModelScope,
|
||||
started = SharingStarted.WhileSubscribed(5_000),
|
||||
initialValue = emptyList(),
|
||||
)
|
||||
|
||||
val scenes: StateFlow<List<Scene>> = combine(allScenes, _selectedTab) { list, tab ->
|
||||
when (tab) {
|
||||
SceneFilterTab.ALL -> list
|
||||
SceneFilterTab.MANUAL -> list.filter { it.type == AutomationType.MANUAL }
|
||||
SceneFilterTab.AUTOMATIC -> list.filter { it.type == AutomationType.AUTOMATIC }
|
||||
}
|
||||
}.stateIn(
|
||||
scope = viewModelScope,
|
||||
started = SharingStarted.WhileSubscribed(5_000),
|
||||
initialValue = emptyList(),
|
||||
)
|
||||
|
||||
private val _pendingDelete = MutableStateFlow<SceneId?>(null)
|
||||
val pendingDelete: StateFlow<SceneId?> = _pendingDelete.asStateFlow()
|
||||
|
||||
private val _userMessage = MutableSharedFlow<String>()
|
||||
val userMessage: SharedFlow<String> = _userMessage.asSharedFlow()
|
||||
|
||||
fun selectTab(tab: SceneFilterTab) {
|
||||
_selectedTab.value = tab
|
||||
}
|
||||
|
||||
fun toggleEnabled(scene: Scene) {
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile() ?: return@launch
|
||||
val updated = scene.copy(enabled = !scene.enabled)
|
||||
sceneRepository.updateScene(profile.id, updated)
|
||||
}
|
||||
}
|
||||
|
||||
fun executeQuick(scene: Scene) {
|
||||
viewModelScope.launch {
|
||||
sceneExecutor.execute(scene)
|
||||
_userMessage.emit("executed")
|
||||
}
|
||||
}
|
||||
|
||||
fun deleteScene(sceneId: SceneId) {
|
||||
viewModelScope.launch {
|
||||
val profile = profileStore.activeProfile() ?: return@launch
|
||||
sceneRepository.deleteScene(profile.id, sceneId)
|
||||
_pendingDelete.value = null
|
||||
}
|
||||
}
|
||||
|
||||
fun cancelDelete() {
|
||||
_pendingDelete.value = null
|
||||
}
|
||||
|
||||
fun markPendingDelete(sceneId: SceneId) {
|
||||
_pendingDelete.value = sceneId
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,119 @@
|
||||
package com.flagship.abox.manager.ui.scene
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.navigation.NavGraphBuilder
|
||||
import androidx.navigation.NavHostController
|
||||
import androidx.navigation.NavType
|
||||
import androidx.navigation.compose.NavHost
|
||||
import androidx.navigation.compose.composable
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import androidx.navigation.navArgument
|
||||
import com.flagship.abox.manager.domain.AutomationType
|
||||
import com.flagship.abox.manager.domain.SceneId
|
||||
|
||||
/**
|
||||
* Scene navigation routes.
|
||||
*/
|
||||
object SceneRoutes {
|
||||
const val LIST = "scene/list"
|
||||
const val EDITOR = "scene/editor"
|
||||
const val EDITOR_MANUAL = "scene/editor/manual"
|
||||
const val EDITOR_AUTOMATIC = "scene/editor/automatic"
|
||||
const val EDITOR_WITH_ID = "scene/editor/{sceneId}"
|
||||
const val EXECUTION = "scene/execution/{sceneId}"
|
||||
|
||||
fun editorFor(sceneId: SceneId): String = "scene/editor/${sceneId.value}"
|
||||
fun executionFor(sceneId: SceneId): String = "scene/execution/${sceneId.value}"
|
||||
}
|
||||
|
||||
/**
|
||||
* Embedded navigation host for the scenes tab in [MainAppShell].
|
||||
*/
|
||||
@Composable
|
||||
fun SceneNavHost(
|
||||
modifier: Modifier = Modifier,
|
||||
navController: NavHostController = rememberNavController(),
|
||||
) {
|
||||
NavHost(
|
||||
navController = navController,
|
||||
startDestination = SceneRoutes.LIST,
|
||||
modifier = modifier,
|
||||
) {
|
||||
sceneListDestination(
|
||||
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)) },
|
||||
)
|
||||
sceneEditorDestination(
|
||||
onBack = { navController.popBackStack() },
|
||||
onSaved = {
|
||||
navController.popBackStack(SceneRoutes.LIST, inclusive = false)
|
||||
},
|
||||
)
|
||||
sceneExecutionDestination(
|
||||
onBack = { navController.popBackStack() },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fun NavGraphBuilder.sceneListDestination(
|
||||
onAddManual: () -> Unit,
|
||||
onAddAutomatic: () -> Unit,
|
||||
onEditScene: (SceneId) -> Unit,
|
||||
onExecuteScene: (SceneId) -> Unit,
|
||||
headerContent: @Composable (() -> Unit)? = null,
|
||||
) {
|
||||
composable(SceneRoutes.LIST) {
|
||||
SceneListScreen(
|
||||
onAddManual = onAddManual,
|
||||
onAddAutomatic = onAddAutomatic,
|
||||
onEditScene = onEditScene,
|
||||
onExecuteScene = onExecuteScene,
|
||||
headerContent = headerContent,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fun NavGraphBuilder.sceneEditorDestination(
|
||||
onBack: () -> Unit,
|
||||
onSaved: () -> Unit,
|
||||
) {
|
||||
composable(SceneRoutes.EDITOR) {
|
||||
SceneEditorScreen(sceneId = null, initialType = AutomationType.MANUAL, onBack = onBack, onSaved = onSaved)
|
||||
}
|
||||
composable(SceneRoutes.EDITOR_MANUAL) {
|
||||
SceneEditorScreen(sceneId = null, initialType = AutomationType.MANUAL, onBack = onBack, onSaved = onSaved)
|
||||
}
|
||||
composable(SceneRoutes.EDITOR_AUTOMATIC) {
|
||||
SceneEditorScreen(sceneId = null, initialType = AutomationType.AUTOMATIC, onBack = onBack, onSaved = onSaved)
|
||||
}
|
||||
composable(
|
||||
route = SceneRoutes.EDITOR_WITH_ID,
|
||||
arguments = listOf(navArgument("sceneId") { type = NavType.StringType }),
|
||||
) { backStackEntry ->
|
||||
val id = backStackEntry.arguments?.getString("sceneId")
|
||||
SceneEditorScreen(
|
||||
sceneId = id?.let { SceneId(it) },
|
||||
initialType = null,
|
||||
onBack = onBack,
|
||||
onSaved = onSaved,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fun NavGraphBuilder.sceneExecutionDestination(
|
||||
onBack: () -> Unit,
|
||||
) {
|
||||
composable(
|
||||
route = SceneRoutes.EXECUTION,
|
||||
arguments = listOf(navArgument("sceneId") { type = NavType.StringType }),
|
||||
) { backStackEntry ->
|
||||
val id = backStackEntry.arguments?.getString("sceneId")
|
||||
SceneExecutionScreen(
|
||||
sceneId = SceneId(requireNotNull(id) { "sceneId argument is required" }),
|
||||
onBack = onBack,
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user