ammar/syncrow-app
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/syncrow-app.git synced 2026-10-24 20:37:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes issues

Browse Source
This commit is contained in:
mohammad
2024-11-27 14:23:00 +03:00
parent 80d92de625
commit 51b1438d0e
15 changed files with 405 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/devices/view/widgets/6_scene_switch/select_scene_page.dart
+6 -3
View File
@@ -37,8 +37,10 @@ class SixSelectSceneFourPage extends StatelessWidget {
builder: (context, state) {
final sensorBloc = BlocProvider.of<SixSceneBloc>(context);
if (state is SaveSelectionSuccessState) {
Navigator.of(context).pop(true);
Navigator.of(context).pop(true);
Future.delayed(const Duration(milliseconds: 250), () {
Navigator.of(context).pop(true);
Navigator.of(context).pop(true);
});
}
return DefaultScaffold(
title: 'Select Scene',
@@ -163,7 +165,8 @@ class SixSelectSceneFourPage extends StatelessWidget {
disablePlayButton: false,
onChanged: (isSelected) {
sensorBloc.add(SelectOptionEvent(selectedOption: scene.id));
sensorBloc.add(SelectSceneEvent(unitId: scene.id));
sensorBloc.add(SelectSceneEvent(
selectedSceneId: scene.id, isSelected: isSelected));
},
icon: scene.iconInBytes,
title: scene.name,
lib/features/devices/view/widgets/6_scene_switch/six_scene_screen.dart
+7 -5
View File
@@ -196,12 +196,14 @@ class SixSceneScreen extends StatelessWidget {
);
},
);
if (value == true) {
_bloc.add(const SixSceneInitial());
_bloc.add(
const SixSceneInitialInfo());
_bloc.add(
const SexSceneSwitchInitial());
Future.delayed(
const Duration(
milliseconds: 250), () {
_bloc.add(
const SexSceneSwitchInitial());
});
}
},
child: Column(
lib/features/devices/view/widgets/four_scene_switch/four_scene_screen.dart
+7 -5
View File
@@ -175,12 +175,14 @@ class FourSceneScreen extends StatelessWidget {
);
},
);
if (value == true) {
_bloc.add(const FourSceneInitial());
_bloc.add(
const FourSceneInitialInfo());
_bloc.add(
const FourSceneSwitchInitial());
Future.delayed(
const Duration(
milliseconds: 250), () {
_bloc.add(
const FourSceneSwitchInitial());
});
}
},
child: Column(
lib/features/devices/view/widgets/four_scene_switch/four_select_scene_page.dart
+45 -39
View File
@@ -37,8 +37,10 @@ class FourSelectSceneFourPage extends StatelessWidget {
builder: (context, state) {
final sensorBloc = BlocProvider.of<FourSceneBloc>(context);
if (state is SaveSelectionSuccessState) {
Navigator.of(context).pop(true);
Navigator.of(context).pop(true);
Future.delayed(const Duration(milliseconds: 250), () {
Navigator.of(context).pop(true);
Navigator.of(context).pop(true);
});
}
return DefaultScaffold(
title: 'Select Scene',
@@ -153,55 +155,25 @@ class FourSelectSceneFourPage extends StatelessWidget {
),
itemBuilder: (context, index) {
final scene = scenes[index];
// Check if this scene is currently selected
bool isSelected = scene.id ==
(state is SceneSelectionUpdatedState
? state.selectedSceneId
: sensorBloc.selectedFormApiSceneId);
return SceneItem(
id: scene.id,
value: isSelected,
value: isSelected, // Pass isSelected to the SceneItem
disablePlayButton: false,
onChanged: (isSelected) {
onChanged: (newSelection) {
// If selected, assign the scene
sensorBloc.add(SelectOptionEvent(selectedOption: scene.id));
sensorBloc.add(SelectSceneEvent(selectedSceneId: scene.id));
sensorBloc.add(SelectSceneEvent(selectedSceneId: scene.id,isSelected:newSelection));
},
icon: scene.iconInBytes,
title: scene.name,
);
// if (index == scenes.length) {
// return InkWell(
// onTap: () => Navigator.pushNamed(
// NavigationService.navigatorKey.currentContext!,
// Routes.sceneTasksRoute,
// arguments: SceneSettingsRouteArguments(
// sceneType: '',
// sceneId: '',
// sceneName: '',
// ),
// ),
// child: CreateSceneItem(),
// );
// } else {
// final scene = scenes[index];
// bool isSelected = scene.id ==
// (state is SceneSelectionUpdatedState
// ? state.selectedSceneId
// : sensorBloc.selectedFormApiSceneId);
// return SceneItem(
// id: scene.id,
// value: isSelected,
// disablePlayButton: false,
// onChanged: (isSelected) {
// sensorBloc.add(SelectOptionEvent(selectedOption: scene.id));
// sensorBloc.add(SelectSceneEvent(selectedSceneId: scene.id));
// },
// icon: scene.iconInBytes,
// title: scene.name,
// );
// }
},
);
}
@@ -317,3 +289,37 @@ class CreateSceneItem extends StatelessWidget {
);
}
}
// if (index == scenes.length) {
// return InkWell(
// onTap: () => Navigator.pushNamed(
// NavigationService.navigatorKey.currentContext!,
// Routes.sceneTasksRoute,
// arguments: SceneSettingsRouteArguments(
// sceneType: '',
// sceneId: '',
// sceneName: '',
// ),
// ),
// child: CreateSceneItem(),
// );
// } else {
// final scene = scenes[index];
// bool isSelected = scene.id ==
// (state is SceneSelectionUpdatedState
// ? state.selectedSceneId
// : sensorBloc.selectedFormApiSceneId);
// return SceneItem(
// id: scene.id,
// value: isSelected,
// disablePlayButton: false,
// onChanged: (isSelected) {
// sensorBloc.add(SelectOptionEvent(selectedOption: scene.id));
// sensorBloc.add(SelectSceneEvent(selectedSceneId: scene.id));
// },
// icon: scene.iconInBytes,
// title: scene.name,
// );
// }