ammar/syncrow-app
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/syncrow-app.git synced 2025-11-26 12:44:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from SyncrowIOT/SP-1472-FE-On-Mobile-2-3-Gangs-Devices-conditions-Action-names-are-changing-when-we-save-a-routine-then-try-to-edit-it

Browse Source 
Sp 1472 fe on mobile 2 3 gangs devices conditions action names are changing when we save a routine then try to edit it
This commit is contained in:
mohammadnemer1
2025-04-28 11:25:33 +03:00
committed by GitHub
parent 405cccad03 3725d28a5e
commit bde418e52a
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/features/scene/helper/scene_operations_data_helper.dart
View File

@ -841,7 +841,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.assetsIcons3GangSwitch, Assets.assetsIcons3GangSwitch,
'Light 1 Switch', 'L - Light Switch',
OperationDialogType.onOff, OperationDialogType.onOff,
_createOnOffOptions(), _createOnOffOptions(),
isAutomation, isAutomation,
@ -853,7 +853,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.twoGang, Assets.twoGang,
'Light 1 Switch', 'L - Light Switch',
OperationDialogType.onOff, OperationDialogType.onOff,
_createOnOffOptions(), _createOnOffOptions(),
isAutomation, isAutomation,
@ -865,7 +865,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.oneGang, Assets.oneGang,
'Light 1 Switch', 'Light Switch',
OperationDialogType.onOff, OperationDialogType.onOff,
_createOnOffOptions(), _createOnOffOptions(),
isAutomation, isAutomation,
@ -895,7 +895,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.assetsIcons3GangSwitch, Assets.assetsIcons3GangSwitch,
'Light 2 Switch', 'M - Light Switch',
OperationDialogType.onOff, OperationDialogType.onOff,
_createOnOffOptions(), _createOnOffOptions(),
isAutomation, isAutomation,
@ -907,7 +907,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.twoGang, Assets.twoGang,
'Light 2 Switch', 'R - Light Switch',
OperationDialogType.onOff, OperationDialogType.onOff,
_createOnOffOptions(), _createOnOffOptions(),
isAutomation, isAutomation,
@ -935,7 +935,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.assetsIcons3GangSwitch, Assets.assetsIcons3GangSwitch,
'Light 3 Switch', 'R - Light Switch',
OperationDialogType.onOff, OperationDialogType.onOff,
_createOnOffOptions(), _createOnOffOptions(),
isAutomation, isAutomation,
@ -952,7 +952,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.assetsIcons3GangSwitch, Assets.assetsIcons3GangSwitch,
'Light 1 CountDown', 'L - Light CountDown',
isAutomation isAutomation
? OperationDialogType.integerSteps ? OperationDialogType.integerSteps
: OperationDialogType.countdown, : OperationDialogType.countdown,
@ -968,7 +968,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.twoGang, Assets.twoGang,
'Light 1 CountDown', 'L - Light CountDown',
isAutomation isAutomation
? OperationDialogType.integerSteps ? OperationDialogType.integerSteps
: OperationDialogType.countdown, : OperationDialogType.countdown,
@ -1006,7 +1006,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.assetsIcons3GangSwitch, Assets.assetsIcons3GangSwitch,
'Light 2 CountDown', 'M - Light CountDown',
isAutomation isAutomation
? OperationDialogType.integerSteps ? OperationDialogType.integerSteps
: OperationDialogType.countdown, : OperationDialogType.countdown,
@ -1022,7 +1022,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.twoGang, Assets.twoGang,
'Light 2 CountDown', 'R - Light CountDown',
isAutomation isAutomation
? OperationDialogType.integerSteps ? OperationDialogType.integerSteps
: OperationDialogType.countdown, : OperationDialogType.countdown,
@ -1058,7 +1058,7 @@ mixin SceneOperationsDataHelper {
action, action,
action.deviceName, action.deviceName,
Assets.assetsIcons3GangSwitch, Assets.assetsIcons3GangSwitch,
'Light 3 CountDown', 'R - Light CountDown',
isAutomation isAutomation
? OperationDialogType.integerSteps ? OperationDialogType.integerSteps
: OperationDialogType.countdown, : OperationDialogType.countdown,

2
lib/features/scene/view/routines_view.dart
View File

@ -82,6 +82,7 @@ class RoutinesView extends StatelessWidget {
routines: state.scenes, routines: state.scenes,
loadingStates: state.loadingStates, loadingStates: state.loadingStates,
loadingSceneId: state.loadingSceneId, loadingSceneId: state.loadingSceneId,
disablePlayButton: false,
), ),
RoutinesExpansionTile( RoutinesExpansionTile(
title: 'Automation', title: 'Automation',
@ -90,6 +91,7 @@ class RoutinesView extends StatelessWidget {
routines: state.automationList, routines: state.automationList,
loadingStates: state.loadingStates, loadingStates: state.loadingStates,
loadingSceneId: state.loadingSceneId, loadingSceneId: state.loadingSceneId,
disablePlayButton: true,
), ),
const SizedBox(height: 15), const SizedBox(height: 15),
], ],

4
lib/features/scene/widgets/routines_expansion_tile.dart
View File

@ -11,6 +11,7 @@ class RoutinesExpansionTile extends StatelessWidget {
required this.emptyRoutinesMessage, required this.emptyRoutinesMessage,
required this.routines, required this.routines,
required this.loadingStates, required this.loadingStates,
required this.disablePlayButton,
this.loadingSceneId, this.loadingSceneId,
}); });
final String title; final String title;
@ -18,6 +19,7 @@ class RoutinesExpansionTile extends StatelessWidget {
final List<ScenesModel> routines; final List<ScenesModel> routines;
final Map<String, bool> loadingStates; final Map<String, bool> loadingStates;
final String? loadingSceneId; final String? loadingSceneId;
final bool disablePlayButton;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -43,7 +45,7 @@ class RoutinesExpansionTile extends StatelessWidget {
child: SceneGrid( child: SceneGrid(
scenes: routines, scenes: routines,
loadingSceneId: loadingSceneId, loadingSceneId: loadingSceneId,
disablePlayButton: false, disablePlayButton: disablePlayButton,
loadingStates: loadingStates, loadingStates: loadingStates,
), ),
), ),