|
1 | 1 | import 'package:flutter/material.dart'; |
2 | 2 |
|
3 | | -import 'widgets/alpha_picker.dart'; |
4 | | -import 'widgets/hex_picker.dart'; |
5 | 3 | import 'pickers/hsv_picker.dart'; |
6 | 4 | import 'pickers/palette_hue_picker.dart'; |
7 | 5 | import 'pickers/palette_saturation_picker.dart'; |
8 | 6 | import 'pickers/palette_value_picker.dart'; |
9 | 7 | import 'pickers/rgb_picker.dart'; |
10 | 8 | import 'pickers/swatches_picker.dart'; |
11 | 9 | import 'pickers/wheel_picker.dart'; |
| 10 | +import 'widgets/alpha_picker.dart'; |
| 11 | +import 'widgets/hex_picker.dart'; |
12 | 12 |
|
13 | 13 | enum Picker { |
14 | 14 | swatches, |
@@ -70,29 +70,26 @@ class _ColorPickerState extends State<ColorPicker> { |
70 | 70 | late int _index; |
71 | 71 |
|
72 | 72 | void _alphaOnChanged(int value) { |
73 | | - _alpha = value; |
74 | | - _color = _color.withAlpha(_alpha); |
75 | | - widget.onChanged(_color); |
| 73 | + _updateColor(_color.withAlpha(value)); |
76 | 74 | } |
77 | 75 |
|
78 | 76 | void _colorOnChanged(Color value) { |
79 | | - _color = value; |
80 | | - _hSVColor = HSVColor.fromColor(value); |
81 | | - widget.onChanged(value); |
| 77 | + _updateColor(value.withAlpha(_color.alpha)); |
82 | 78 | } |
83 | 79 |
|
84 | 80 | void _hSVColorOnChanged(HSVColor value) { |
85 | | - _color = value.toColor(); |
86 | | - _hSVColor = value; |
87 | | - widget.onChanged(value.toColor()); |
| 81 | + _updateColor(value.toColor().withAlpha(_color.alpha)); |
88 | 82 | } |
89 | 83 |
|
90 | 84 | void _colorWithAlphaOnChanged(Color value) { |
91 | | - _alpha = value.alpha; |
92 | | - final Color color = value.withAlpha(255); |
| 85 | + _updateColor(value); |
| 86 | + } |
| 87 | + |
| 88 | + void _updateColor(Color color) { |
| 89 | + _alpha = color.alpha; |
93 | 90 | _color = color; |
94 | 91 | _hSVColor = HSVColor.fromColor(color); |
95 | | - widget.onChanged(value); |
| 92 | + widget.onChanged(color); |
96 | 93 | } |
97 | 94 |
|
98 | 95 | void _pickerOnChanged(_IPicker? value) { |
|
0 commit comments