Added preset support

CyBear-Jinni · Jan 25, 2024 · a784195 · a784195
1 parent 6c94c3b
commit a784195
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 195 deletions.
diff --git a/lib/presentation/molecules/devices/ac_molecule.dart b/lib/presentation/molecules/devices/ac_molecule.dart
@@ -29,26 +29,12 @@ class _AcMoleculeState extends State<AcMolecule> {
   }
 
   void setEntityState(EntityActions action) {
-    final VendorsAndServices? vendor =
-        widget.entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()
-            ..addAll([widget.entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
+    final HashSet<String> entitiesId =
+        HashSet.from([widget.entity.deviceCbjUniqueId.getOrCrash()]);
 
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: entitiesId,
         property: EntityProperties.acSwitchState,
         actionType: action,
       ),

diff --git a/lib/presentation/molecules/devices/blind_molecule.dart b/lib/presentation/molecules/devices/blind_molecule.dart
@@ -31,27 +31,12 @@ class _BlindMoleculeState extends State<BlindMolecule> {
   }
 
   void setEntityState(EntityActions action) {
-    final VendorsAndServices? vendor =
-        widget.entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
-
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()
-            ..addAll([widget.entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
+    final HashSet<String> uniqueIdByVendor =
+        HashSet.from([widget.entity.deviceCbjUniqueId.getOrCrash()]);
 
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: uniqueIdByVendor,
         property: EntityProperties.blindsSwitchState,
         actionType: action,
       ),

diff --git a/lib/presentation/molecules/devices/boiler_molecule.dart b/lib/presentation/molecules/devices/boiler_molecule.dart
@@ -29,26 +29,12 @@ class _BoilerMoleculeState extends State<BoilerMolecule> {
   }
 
   void setEntityState(EntityActions action) {
-    final VendorsAndServices? vendor =
-        widget.entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()
-            ..addAll([widget.entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
+    final HashSet<String> uniqueIdByVendor =
+        HashSet.from([widget.entity.deviceCbjUniqueId.getOrCrash()]);
 
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: uniqueIdByVendor,
         property: EntityProperties.boilerSwitchState,
         actionType: action,
       ),

diff --git a/lib/presentation/molecules/devices/dimmable_light_molecule.dart b/lib/presentation/molecules/devices/dimmable_light_molecule.dart
@@ -72,26 +72,12 @@ class _DimmableLightMoleculeState extends State<DimmableLightMolecule> {
     EntityActions action, {
     HashMap<ActionValues, dynamic>? value,
   }) {
-    final VendorsAndServices? vendor =
-        widget.entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
+    final HashSet<String> uniqueIdByVendor =
+        HashSet.from([widget.entity.deviceCbjUniqueId.getOrCrash()]);
 
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()
-            ..addAll([widget.entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: uniqueIdByVendor,
         property: property,
         actionType: action,
         value: value,

diff --git a/lib/presentation/molecules/devices/light_molecule.dart b/lib/presentation/molecules/devices/light_molecule.dart
@@ -18,25 +18,12 @@ class LightMolecule extends StatelessWidget {
   }
 
   void setEntityState(EntityActions action) {
-    final VendorsAndServices? vendor =
-        entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
+    final HashSet<String> uniqueIdByVendor =
+        HashSet.from([entity.deviceCbjUniqueId.getOrCrash()]);
 
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()..addAll([entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: uniqueIdByVendor,
         property: EntityProperties.lightSwitchState,
         actionType: action,
       ),

diff --git a/lib/presentation/molecules/devices/rgb_light_molecule.dart b/lib/presentation/molecules/devices/rgb_light_molecule.dart
@@ -65,26 +65,12 @@ class _RgbwLightMoleculeState extends State<RgbwLightMolecule> {
     EntityActions action, {
     HashMap<ActionValues, dynamic>? value,
   }) {
-    final VendorsAndServices? vendor =
-        widget.entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
+    final HashSet<String> uniqueIdByVendor =
+        HashSet.from([widget.entity.deviceCbjUniqueId.getOrCrash()]);
 
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()
-            ..addAll([widget.entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: uniqueIdByVendor,
         property: entityProperties,
         actionType: action,
         value: value,
@@ -212,26 +198,12 @@ class _LightColorMods extends State<LightColorMods> {
     EntityActions action, {
     HashMap<ActionValues, dynamic>? value,
   }) {
-    final VendorsAndServices? vendor =
-        widget.entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
+    final HashSet<String> uniqueIdByVendor =
+        HashSet.from([widget.entity.deviceCbjUniqueId.getOrCrash()]);
 
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()
-            ..addAll([widget.entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: uniqueIdByVendor,
         property: entityProperties,
         actionType: action,
         value: value,
@@ -246,7 +218,7 @@ class _LightColorMods extends State<LightColorMods> {
     setEntityState(
       EntityProperties.lightColorTemperature,
       EntityActions.changeTemperature,
-      value: HashMap.from({ActionValues.temperature: newColorTemperature}),
+      value: HashMap.from({ActionValues.colorTemperature: newColorTemperature}),
     );
   }
 
@@ -262,7 +234,7 @@ class _LightColorMods extends State<LightColorMods> {
         ActionValues.alpha: newHsvColor.alpha,
         ActionValues.hue: newHsvColor.hue,
         ActionValues.saturation: newHsvColor.saturation,
-        ActionValues.value: newHsvColor.value,
+        ActionValues.colorValue: newHsvColor.value,
       }),
     );
   }

diff --git a/lib/presentation/molecules/devices/smart_plug_molecule.dart b/lib/presentation/molecules/devices/smart_plug_molecule.dart
@@ -28,25 +28,12 @@ class _SmartPlugsMoleculeState extends State<SmartPlugsMolecule> {
   }
 
   void setEntityState(EntityActions action) {
-    final VendorsAndServices? vendor =
-        widget.entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()
-            ..addAll([widget.entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
+    final HashSet<String> uniqueIdByVendor =
+        HashSet.from([widget.entity.deviceCbjUniqueId.getOrCrash()]);
+
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: uniqueIdByVendor,
         property: EntityProperties.lightSwitchState,
         actionType: action,
       ),

diff --git a/lib/presentation/molecules/devices/smart_tv_molecule.dart b/lib/presentation/molecules/devices/smart_tv_molecule.dart
@@ -77,25 +77,12 @@ class _SmartTvMoleculeState extends State<SmartTvMolecule> {
     EntityActions action, {
     HashMap<ActionValues, dynamic>? value,
   }) {
-    final VendorsAndServices? vendor =
-        widget.entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()
-            ..addAll([widget.entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
+    final HashSet<String> uniqueIdByVendor =
+        HashSet.from([widget.entity.deviceCbjUniqueId.getOrCrash()]);
+
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: uniqueIdByVendor,
         property: property,
         actionType: action,
         value: value,

diff --git a/lib/presentation/molecules/devices/switch_molecule.dart b/lib/presentation/molecules/devices/switch_molecule.dart
@@ -28,25 +28,12 @@ class _SwitchMoleculeState extends State<SwitchMolecule> {
   }
 
   void setEntityState(EntityActions action) {
-    final VendorsAndServices? vendor =
-        widget.entity.cbjDeviceVendor.vendorsAndServices;
-    if (vendor == null) {
-      return;
-    }
-    final HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor =
-        HashMap();
-    uniqueIdByVendor.addEntries(
-      [
-        MapEntry(
-          vendor,
-          HashSet<String>()
-            ..addAll([widget.entity.deviceCbjUniqueId.getOrCrash()]),
-        ),
-      ],
-    );
+    final HashSet<String> uniqueIdByVendor =
+        HashSet.from([widget.entity.deviceCbjUniqueId.getOrCrash()]);
+
     ConnectionsService.instance.setEntityState(
       RequestActionObject(
-        uniqueIdByVendor: uniqueIdByVendor,
+        entityIds: uniqueIdByVendor,
         property: EntityProperties.lightSwitchState,
         actionType: action,
       ),

diff --git a/lib/presentation/pages/add_new_area_page.dart b/lib/presentation/pages/add_new_area_page.dart
@@ -34,7 +34,7 @@ class _AddNewAreaFormState extends State<AddNewAreaForm> {
   AreaBackground background = AreaBackground(
     'https://live.staticflickr.com/5220/5486044345_f67abff3e9_h.jpg',
   );
-  AreaTypes areaTypes = AreaTypes(const {});
+  AreaPurposes areaTypes = AreaPurposes(const {});
   AreaEntitiesId areaDevicesId = AreaEntitiesId(const {});
   AreaScenesId areaScenesId = AreaScenesId(const {});
   AreaRoutinesId areaRoutinesId = AreaRoutinesId(const {});
@@ -63,15 +63,15 @@ class _AddNewAreaFormState extends State<AddNewAreaForm> {
   Future _createArea() async {
     final AreaEntity areaEntity = AreaEntity(
       uniqueId: AreaUniqueId.fromUniqueString(areaUniqueId.getOrCrash()),
-      cbjEntityName: AreaDefaultName(cbjEntityName.getOrCrash()),
-      background: AreaBackground(background.getOrCrash()),
-      areaTypes: AreaTypes(areaTypes.getOrCrash()),
-      entitiesId: AreaEntitiesId(areaDevicesId.getOrCrash()),
-      areaScenesId: AreaScenesId(areaScenesId.getOrCrash()),
-      areaRoutinesId: AreaRoutinesId(areaRoutinesId.getOrCrash()),
-      areaBindingsId: AreaBindingsId(areaBindingsId.getOrCrash()),
-      areaMostUsedBy: AreaMostUsedBy(areaMostUsedBy.getOrCrash()),
-      areaPermissions: AreaPermissions(areaPermissions.getOrCrash()),
+      cbjEntityName: cbjEntityName,
+      background: background,
+      purposes: areaTypes,
+      entitiesId: areaDevicesId,
+      scenesId: areaScenesId,
+      routinesId: areaRoutinesId,
+      bindingsId: areaBindingsId,
+      areaMostUsedBy: areaMostUsedBy,
+      areaPermissions: areaPermissions,
     );
 
     ConnectionsService.instance.setNewArea(areaEntity);
@@ -83,9 +83,9 @@ class _AddNewAreaFormState extends State<AddNewAreaForm> {
     });
   }
 
-  Future _areaTypesChanged(Set<String> value) async {
+  Future _areaTypesChanged(Set<AreaPurposesTypes> value) async {
     setState(() {
-      areaTypes = AreaTypes(value);
+      areaTypes = AreaPurposes(value);
     });
   }
 
@@ -148,15 +148,13 @@ class _AddNewAreaFormState extends State<AddNewAreaForm> {
                         }
 
                         return MultiSelectItem(
-                          areaPurposeType.name,
+                          areaPurposeType,
                           areaNameEdited,
                         );
                       }).toList(),
                       listType: MultiSelectListType.CHIP,
-                      onConfirm: (List<String> values) {
-                        _areaTypesChanged(
-                          values.map((e) => e).toSet(),
-                        );
+                      onConfirm: (List<AreaPurposesTypes> values) {
+                        _areaTypesChanged(values.toSet());
                       },
                     ),
                   ],