diff --git a/assets/icons/four_scene_home_icon.svg b/assets/icons/four_scene_home_icon.svg new file mode 100644 index 0000000..8251888 --- /dev/null +++ b/assets/icons/four_scene_home_icon.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/icons/six_scene_home_icon.svg b/assets/icons/six_scene_home_icon.svg new file mode 100644 index 0000000..b4483f3 --- /dev/null +++ b/assets/icons/six_scene_home_icon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/lib/features/devices/bloc/6_scene_switch_bloc/6_scene_bloc.dart b/lib/features/devices/bloc/6_scene_switch_bloc/6_scene_bloc.dart index 08c1051..6fbfb69 100644 --- a/lib/features/devices/bloc/6_scene_switch_bloc/6_scene_bloc.dart +++ b/lib/features/devices/bloc/6_scene_switch_bloc/6_scene_bloc.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart'; import 'package:syncrow_app/features/devices/bloc/6_scene_switch_bloc/6_scene_event.dart'; import 'package:syncrow_app/features/devices/bloc/6_scene_switch_bloc/6_scene_state.dart'; import 'package:syncrow_app/features/devices/model/device_control_model.dart'; @@ -129,8 +130,8 @@ class SixSceneBloc extends Bloc { allDevices.forEach((element) { allDevicesIds.add(element.uuid!); }); + await HomeCubit.getInstance().fetchUnitsByUserId(); CustomSnackBar.displaySnackBar('Save Successfully'); - emit(SaveSelectionSuccessState()); } } catch (e) { diff --git a/lib/features/devices/bloc/four_scene_bloc/four_scene_bloc.dart b/lib/features/devices/bloc/four_scene_bloc/four_scene_bloc.dart index b5aaad0..469515f 100644 --- a/lib/features/devices/bloc/four_scene_bloc/four_scene_bloc.dart +++ b/lib/features/devices/bloc/four_scene_bloc/four_scene_bloc.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart'; import 'package:syncrow_app/features/devices/bloc/four_scene_bloc/four_scene_event.dart'; import 'package:syncrow_app/features/devices/bloc/four_scene_bloc/four_scene_state.dart'; import 'package:syncrow_app/features/devices/model/device_control_model.dart'; @@ -482,7 +483,6 @@ class FourSceneBloc extends Bloc { } emit(UpdateStateList(groupDevices: groupDevices, devices: devices)); } - void _assignDevice( AssignRoomEvent event, Emitter emit) async { try { @@ -498,6 +498,7 @@ class FourSceneBloc extends Bloc { allDevices.forEach((element) { allDevicesIds.add(element.uuid!); }); + await HomeCubit.getInstance().fetchUnitsByUserId(); CustomSnackBar.displaySnackBar('Save Successfully'); emit(SaveSelectionSuccessState()); diff --git a/lib/features/devices/model/device_model.dart b/lib/features/devices/model/device_model.dart index f1af2f3..aee7fbc 100644 --- a/lib/features/devices/model/device_model.dart +++ b/lib/features/devices/model/device_model.dart @@ -78,6 +78,10 @@ class DeviceModel { tempIcon = Assets.waterLeakIcon; } else if (type == DeviceType.PC) { tempIcon = Assets.powerClampIcon; + } else if (type == DeviceType.FourScene) { + tempIcon = Assets.fourSceneHomeIcon; + } else if (type == DeviceType.SixScene) { + tempIcon = Assets.sixSceneHomeIcon; } else { tempIcon = Assets.assetsIconsLogo; } diff --git a/lib/generated/assets.dart b/lib/generated/assets.dart index 6e230c0..7e7ed11 100644 --- a/lib/generated/assets.dart +++ b/lib/generated/assets.dart @@ -1118,4 +1118,6 @@ class Assets { static const String minusIcon = "assets/icons/minus_icon.svg"; static const String addDevicesIcon = "assets/icons/add_devices_icon.svg"; static const String fourSceneIcon = "assets/icons/four_scene_icon.svg"; + static const String fourSceneHomeIcon = "assets/icons/four_scene_home_icon.svg"; + static const String sixSceneHomeIcon = "assets/icons/six_scene_home_icon.svg"; } diff --git a/pubspec.yaml b/pubspec.yaml index 22267ad..5aaacfe 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: This is the mobile application project, developed with Flutter for # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: "none" # Remove this line if you wish to publish to pub.dev -version: 1.0.7+40 +version: 1.0.8+41 environment: sdk: ">=3.0.6 <4.0.0"