ammar/syncrow-app
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/syncrow-app.git synced 2026-10-25 08:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

4scene&6scene&sos

Browse Source
This commit is contained in:
mohammad
2024-11-27 15:04:40 +03:00
parent 51b1438d0e
commit 4e506652f8
8 changed files with 65 additions and 32 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
+1 -1
View File
@@ -67,7 +67,7 @@ class SixSelectSceneFourPage extends StatelessWidget {
}
: null,
child: Padding(
padding: const EdgeInsets.all(8.0),
padding: const EdgeInsets.only(left: 10, right: 10),
child: BodyMedium(
text: 'Save',
fontWeight: FontWeight.w700,
lib/features/devices/view/widgets/6_scene_switch/six_scene_screen.dart
+6 -8
View File
@@ -32,7 +32,6 @@ class SixSceneScreen extends StatelessWidget {
child: BlocBuilder<SixSceneBloc, SixSceneState>(
builder: (context, state) {
final _bloc = BlocProvider.of<SixSceneBloc>(context);
SixSceneModel model = SixSceneModel(
scene_1: '',
scene_2: '',
@@ -43,25 +42,25 @@ class SixSceneScreen extends StatelessWidget {
scene_id_group_id: '',
switch_backlight: '',
);
if (state is LoadingNewSate) {
model = state.device;
} else if (state is UpdateState) {
model = state.device;
}
return DefaultScaffold(
title: _bloc.deviceInfo.subspace.subspaceName,
title: _bloc.deviceInfo.name,
actions: [
InkWell(
onTap: () async {
bool val = await Navigator.of(context).push(
var val = await Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => SettingsPage(device: device!),
),
);
if (val == true) {
if (val == null) {
_bloc.add(const SixSceneInitialInfo());
_bloc.add(const SixSceneInitial());
_bloc.add(const SexSceneSwitchInitial());
}
},
child: SvgPicture.asset(Assets.assetsIconsSettings),
@@ -196,11 +195,10 @@ class SixSceneScreen extends StatelessWidget {
);
},
);
if (value == true) {
Future.delayed(
const Duration(
milliseconds: 250), () {
milliseconds: 200), () {
_bloc.add(
const SexSceneSwitchInitial());
});
lib/features/devices/view/widgets/four_scene_switch/four_scene_screen.dart
+7 -2
View File
@@ -50,12 +50,17 @@ class FourSceneScreen extends StatelessWidget {
title: _bloc.deviceInfo.name,
actions: [
InkWell(
onTap: () {
Navigator.of(context).push(
onTap: () async {
var val = await Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => SettingsPage(device: device!),
),
);
if (val == null) {
_bloc.add(const FourSceneInitial());
_bloc.add(const FourSceneInitialInfo());
_bloc.add(const FourSceneSwitchInitial());
}
},
child: SvgPicture.asset(Assets.assetsIconsSettings),
),
lib/features/devices/view/widgets/four_scene_switch/four_select_scene_page.dart
+3 -2
View File
@@ -67,7 +67,7 @@ class FourSelectSceneFourPage extends StatelessWidget {
}
: null,
child: Padding(
padding: const EdgeInsets.all(8.0),
padding: const EdgeInsets.only(left: 10, right: 15),
child: BodyMedium(
text: 'Save',
fontWeight: FontWeight.w700,
@@ -169,7 +169,8 @@ class FourSelectSceneFourPage extends StatelessWidget {
onChanged: (newSelection) {
// If selected, assign the scene
sensorBloc.add(SelectOptionEvent(selectedOption: scene.id));
sensorBloc.add(SelectSceneEvent(selectedSceneId: scene.id,isSelected:newSelection));
sensorBloc.add(SelectSceneEvent(
selectedSceneId: scene.id, isSelected: newSelection));
},
icon: scene.iconInBytes,
title: scene.name,