Project structure change in progress

lib/entities/light/light_entity.class.dart

@@ -0,0 +1,79 @@
+part of '../../main.dart';
+
+class LightEntity extends Entity {
+
+  static const SUPPORT_BRIGHTNESS = 1;
+  static const SUPPORT_COLOR_TEMP = 2;
+  static const SUPPORT_EFFECT = 4;
+  static const SUPPORT_FLASH = 8;
+  static const SUPPORT_COLOR = 16;
+  static const SUPPORT_TRANSITION = 32;
+  static const SUPPORT_WHITE_VALUE = 128;
+
+  bool get supportBrightness => ((supportedFeatures &
+  LightEntity.SUPPORT_BRIGHTNESS) ==
+      LightEntity.SUPPORT_BRIGHTNESS);
+  bool get supportColorTemp => ((supportedFeatures &
+  LightEntity.SUPPORT_COLOR_TEMP) ==
+      LightEntity.SUPPORT_COLOR_TEMP);
+  bool get supportEffect => ((supportedFeatures &
+  LightEntity.SUPPORT_EFFECT) ==
+      LightEntity.SUPPORT_EFFECT);
+  bool get supportFlash => ((supportedFeatures &
+  LightEntity.SUPPORT_FLASH) ==
+      LightEntity.SUPPORT_FLASH);
+  bool get supportColor => ((supportedFeatures &
+  LightEntity.SUPPORT_COLOR) ==
+      LightEntity.SUPPORT_COLOR);
+  bool get supportTransition => ((supportedFeatures &
+  LightEntity.SUPPORT_TRANSITION) ==
+      LightEntity.SUPPORT_TRANSITION);
+  bool get supportWhiteValue => ((supportedFeatures &
+  LightEntity.SUPPORT_WHITE_VALUE) ==
+      LightEntity.SUPPORT_WHITE_VALUE);
+
+  int get brightness => _getIntAttributeValue("brightness");
+  int get whiteValue => _getIntAttributeValue("white_value");
+  String get effect => attributes["effect"];
+  int get colorTemp => _getIntAttributeValue("color_temp");
+  double get maxMireds => _getDoubleAttributeValue("max_mireds");
+  double get minMireds => _getDoubleAttributeValue("min_mireds");
+  HSVColor get color => _getColor();
+  bool get isAdditionalControls => ((supportedFeatures != null) && (supportedFeatures != 0));
+  List<String> get effectList => getStringListAttributeValue("effect_list");
+
+  LightEntity(Map rawData, String webHost) : super(rawData, webHost);
+
+  HSVColor _getColor() {
+    List hs = attributes["hs_color"];
+    List rgb = attributes["rgb_color"];
+    try {
+      if (hs != null && hs.isNotEmpty) {
+        double sat = hs[1]/100;
+        String ssat = sat.toStringAsFixed(2);
+        return HSVColor.fromAHSV(1.0, hs[0], double.parse(ssat), 1.0);
+      } else if (rgb != null && rgb.isNotEmpty) {
+        return HSVColor.fromColor(Color.fromARGB(255, rgb[0], rgb[1], rgb[2]));
+      } else {
+        return null;
+      }
+    } catch (e) {
+      return null;
+    }
+  }
+
+  @override
+  Widget _buildStatePart(BuildContext context) {
+    return SwitchStateWidget();
+  }
+
+  @override
+  Widget _buildAdditionalControlsForPage(BuildContext context) {
+    if (!isAdditionalControls || state == EntityState.unavailable) {
+      return Container(height: 0.0, width: 0.0);
+    } else {
+      return LightControlsWidget();
+    }
+  }
+
+}

lib/entities/light/widgets/light_controls.dart

@@ -0,0 +1,218 @@
+part of '../../../main.dart';
+
+class LightControlsWidget extends StatefulWidget {
+
+  @override
+  _LightControlsWidgetState createState() => _LightControlsWidgetState();
+
+}
+
+class _LightControlsWidgetState extends State<LightControlsWidget> {
+
+  int _tmpBrightness;
+  int _tmpWhiteValue;
+  int _tmpColorTemp = 0;
+  HSVColor _tmpColor = HSVColor.fromAHSV(1.0, 30.0, 0.0, 1.0);
+  bool _changedHere = false;
+  String _tmpEffect;
+
+  void _resetState(LightEntity entity) {
+    _tmpBrightness = entity.brightness ?? 1;
+    _tmpWhiteValue = entity.whiteValue ?? 0;
+    _tmpColorTemp = entity.colorTemp ?? entity.minMireds?.toInt();
+    _tmpColor = entity.color ?? _tmpColor;
+    _tmpEffect = entity.effect;
+  }
+
+  void _setBrightness(LightEntity entity, double value) {
+    setState(() {
+      _tmpBrightness = value.round();
+      _changedHere = true;
+      eventBus.fire(new ServiceCallEvent(
+          entity.domain, "turn_on", entity.entityId,
+          {"brightness": _tmpBrightness}));
+    });
+  }
+
+  void _setWhiteValue(LightEntity entity, double value) {
+    setState(() {
+      _tmpWhiteValue = value.round();
+      _changedHere = true;
+      eventBus.fire(new ServiceCallEvent(
+            entity.domain, "turn_on", entity.entityId,
+            {"white_value": _tmpWhiteValue}));
+
+    });
+  }
+
+  void _setColorTemp(LightEntity entity, double value) {
+    setState(() {
+      _tmpColorTemp = value.round();
+      _changedHere = true;
+      eventBus.fire(new ServiceCallEvent(
+          entity.domain, "turn_on", entity.entityId,
+          {"color_temp": _tmpColorTemp}));
+    });
+  }
+
+  void _setColor(LightEntity entity, HSVColor color) {
+    setState(() {
+      _tmpColor = color;
+      _changedHere = true;
+      Logger.d( "HS Color: [${color.hue}, ${color.saturation}]");
+      eventBus.fire(new ServiceCallEvent(
+        entity.domain, "turn_on", entity.entityId,
+          {"hs_color": [color.hue, color.saturation*100]}));
+    });
+  }
+
+  void _setEffect(LightEntity entity, String value) {
+    setState(() {
+      _tmpEffect = value;
+      _changedHere = true;
+      if (_tmpEffect != null) {
+        eventBus.fire(new ServiceCallEvent(
+            entity.domain, "turn_on", entity.entityId,
+            {"effect": "$value"}));
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final entityModel = EntityModel.of(context);
+    final LightEntity entity = entityModel.entityWrapper.entity;
+    if (!_changedHere) {
+      _resetState(entity);
+    } else {
+      _changedHere = false;
+    }
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: <Widget>[
+        _buildBrightnessControl(entity),
+        _buildWhiteValueControl(entity),
+        _buildColorTempControl(entity),
+        _buildColorControl(entity),
+        _buildEffectControl(entity)
+      ],
+    );
+  }
+
+  Widget _buildBrightnessControl(LightEntity entity) {
+    if ((entity.supportBrightness) && (_tmpBrightness != null)) {
+      return UniversalSlider(
+        onChanged: (value) {
+          setState(() {
+            _changedHere = true;
+            _tmpBrightness = value.round();
+          });
+        },
+        min: 1.0,
+        max: 255.0,
+        onChangeEnd: (value) => _setBrightness(entity, value),
+        value: _tmpBrightness == null ? 1.0 : _tmpBrightness.toDouble(),
+        leading: Icon(Icons.brightness_5),
+        title: "Brightness",
+      );
+    } else {
+      return Container(width: 0.0, height: 0.0);
+    }
+  }
+
+  Widget _buildWhiteValueControl(LightEntity entity) {
+    if ((entity.supportWhiteValue) && (_tmpWhiteValue != null)) {
+      return UniversalSlider(
+        onChanged: (value) {
+          setState(() {
+            _changedHere = true;
+            _tmpWhiteValue = value.round();
+          });
+        },
+        min: 0.0,
+        max: 255.0,
+        onChangeEnd: (value) => _setWhiteValue(entity, value),
+        value: _tmpWhiteValue == null ? 0.0 : _tmpWhiteValue.toDouble(),
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:file-word-box")),
+        title: "White",
+      );
+    } else {
+      return Container(width: 0.0, height: 0.0);
+    }
+  }
+
+  Widget _buildColorTempControl(LightEntity entity) {
+    if (entity.supportColorTemp) {
+      return UniversalSlider(
+        title: "Color temperature",
+        leading: Text("Cold", style: TextStyle(color: Colors.lightBlue),),
+        value:  _tmpColorTemp == null ? entity.maxMireds : _tmpColorTemp.toDouble(),
+        onChangeEnd: (value) => _setColorTemp(entity, value),
+        max: entity.maxMireds,
+        min: entity.minMireds,
+        onChanged: (value) {
+          setState(() {
+            _changedHere = true;
+            _tmpColorTemp = value.round();
+          });
+        },
+        closing: Text("Warm", style: TextStyle(color: Colors.amberAccent),),
+      );
+    } else {
+      return Container(width: 0.0, height: 0.0);
+    }
+  }
+
+  Widget _buildColorControl(LightEntity entity) {
+    if (entity.supportColor) {
+      HSVColor savedColor = HomeAssistant().savedColor;
+      return Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          LightColorPicker(
+            color: _tmpColor,
+            onColorSelected: (color) => _setColor(entity, color),
+          ),
+          Row(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              FlatButton(
+                color: _tmpColor.toColor(),
+                child: Text('Copy color'),
+                onPressed: _tmpColor == null ? null : () {
+                  setState(() {
+                    HomeAssistant().savedColor = _tmpColor;
+                  });
+                },
+              ),
+              FlatButton(
+                color: savedColor?.toColor() ?? Colors.transparent,
+                child: Text('Paste color'),
+                onPressed: savedColor == null ? null : () {
+                  _setColor(entity, savedColor);
+                },
+              )
+            ],
+          )
+        ],
+      );
+    } else {
+      return Container(width: 0.0, height: 0.0);
+    }
+  }
+
+  Widget _buildEffectControl(LightEntity entity) {
+    if ((entity.supportEffect) && (entity.effectList != null)) {
+      return ModeSelectorWidget(
+          onChange: (effect) => _setEffect(entity, effect),
+          caption: "Effect",
+          options: entity.effectList,
+          value: _tmpEffect
+      );
+    } else {
+      return Container(width: 0.0, height: 0.0);
+    }
+  }
+
+
+}