yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Current color for color picker fix

Browse Source
This commit is contained in:
Yegor Vialov 2019-02-10 18:24:54 +02:00
parent b399357517
commit d0e0bf3571
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/entity_widgets/common/light_color_picker.dart
View File

@ -24,19 +24,28 @@ class LightColorPickerState extends State<LightColorPicker> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<Widget> colors = []; List<Widget> colorRows = [];
Border border; Border border;
bool isSomethingSelected = false;
Logger.d("Current colotfor picker: [${widget.color.hue}, ${widget.color.saturation}]"); Logger.d("Current colotfor picker: [${widget.color.hue}, ${widget.color.saturation}]");
for (double saturation = 1.0; saturation >= (0.0 + widget.saturationStep); saturation = double.parse((saturation - widget.saturationStep).toStringAsFixed(2))) { for (double saturation = 1.0; saturation >= (0.0 + widget.saturationStep); saturation = double.parse((saturation - widget.saturationStep).toStringAsFixed(2))) {
List<Widget> rowChildren = []; List<Widget> rowChildren = [];
Logger.d("$saturation"); //Logger.d("$saturation");
double roundedSaturation = double.parse(widget.color.saturation.toStringAsFixed(1));
//Logger.d("Rounded saturation=$roundedSaturation");
for (double hue = 0; hue <= (365 - widget.hueStep); for (double hue = 0; hue <= (365 - widget.hueStep);
hue += widget.hueStep) { hue += widget.hueStep) {
if (widget.color.hue.round() >= hue && widget.color.hue.round() < (hue+widget.hueStep) && widget.color.saturation == saturation) { bool isExactHue = widget.color.hue.round() == hue;
bool isHueInRange = widget.color.hue.round() > hue && widget.color.hue.round() < (hue+widget.hueStep);
bool isExactSaturation = roundedSaturation == saturation;
bool isSaturationInRange = roundedSaturation > saturation && roundedSaturation < double.parse((saturation+widget.saturationStep).toStringAsFixed(1));
if ((isExactHue || isHueInRange) && (isExactSaturation || isSaturationInRange)) {
//Logger.d("$isExactHue $isHueInRange $isExactSaturation $isSaturationInRange (${saturation+widget.saturationStep})");
border = Border.all( border = Border.all(
width: 2.0, width: 2.0,
color: Colors.white, color: Colors.white,
); );
isSomethingSelected = true;
} else { } else {
border = null; border = null;
} }
@ -56,19 +65,23 @@ class LightColorPickerState extends State<LightColorPicker> {
) )
); );
} }
colors.add( colorRows.add(
Row( Row(
children: rowChildren, children: rowChildren,
) )
); );
} }
colors.add( colorRows.add(
Flexible( Flexible(
child: GestureDetector( child: GestureDetector(
child: Container( child: Container(
height: 40.0, height: 40.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white color: Colors.white,
border: isSomethingSelected ? null : Border.all(
width: 2.0,
color: Colors.amber[200],
)
), ),
), ),
onTap: () => widget.onColorSelected(HSVColor.fromAHSV(1.0, 30.0, 0.0, 1.0)), onTap: () => widget.onColorSelected(HSVColor.fromAHSV(1.0, 30.0, 0.0, 1.0)),
@ -78,7 +91,8 @@ class LightColorPickerState extends State<LightColorPicker> {
return Padding( return Padding(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: colors, crossAxisAlignment: CrossAxisAlignment.center,
children: colorRows,
), ),
padding: widget.padding, padding: widget.padding,
); );

2
lib/entity_widgets/controls/light_controls.dart
View File

@ -117,7 +117,7 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
return UniversalSlider( return UniversalSlider(
title: "Color temperature", title: "Color temperature",
leading: Text("Cold", style: TextStyle(color: Colors.lightBlue),), leading: Text("Cold", style: TextStyle(color: Colors.lightBlue),),
value: _tmpColorTemp.toDouble(), value: _tmpColorTemp == null ? 0 : _tmpColorTemp.toDouble(),
onChangeEnd: (value) => _setColorTemp(entity, value), onChangeEnd: (value) => _setColorTemp(entity, value),
max: entity.maxMireds, max: entity.maxMireds,
min: entity.minMireds, min: entity.minMireds,