Skip to content

Commit 364355b

Browse files
committed
Release Version 1.1.5
1 parent 201b444 commit 364355b

File tree

6 files changed

+33
-25
lines changed

6 files changed

+33
-25
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
All notable changes to the **FlexColorPicker** package will be documented in this file.
44

5+
## [1.1.5] - March 3, 2021
6+
* Bug fix `selectedPickerTypeColor`: When color was undefined, the thumb did not receive the same text color as the
7+
default and only one before in version 1.1.3 and earlier, in dark-mode. This broke compatibility with past style
8+
when using dark-mode. This fix restores the correct past style when the `selectedPickerTypeColor` is undefined.
9+
510
## [1.1.4] - March 3, 2021
611
* New property `selectedPickerTypeColor`: Defines the color of the thumb on the slider that shows the selected picker.
712
* New property `colorCodePrefixStyle`: Defines the text style of the prefix for the color code.

example/pubspec.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,56 +7,56 @@ packages:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.5.0"
10+
version: "2.5.0-nullsafety.1"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
1414
name: boolean_selector
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "2.1.0"
17+
version: "2.1.0-nullsafety.1"
1818
characters:
1919
dependency: transitive
2020
description:
2121
name: characters
2222
url: "https://pub.dartlang.org"
2323
source: hosted
24-
version: "1.1.0"
24+
version: "1.1.0-nullsafety.3"
2525
charcode:
2626
dependency: transitive
2727
description:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.2.0"
31+
version: "1.2.0-nullsafety.1"
3232
clock:
3333
dependency: transitive
3434
description:
3535
name: clock
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "1.1.0"
38+
version: "1.1.0-nullsafety.1"
3939
collection:
4040
dependency: transitive
4141
description:
4242
name: collection
4343
url: "https://pub.dartlang.org"
4444
source: hosted
45-
version: "1.15.0"
45+
version: "1.15.0-nullsafety.3"
4646
fake_async:
4747
dependency: transitive
4848
description:
4949
name: fake_async
5050
url: "https://pub.dartlang.org"
5151
source: hosted
52-
version: "1.2.0"
52+
version: "1.2.0-nullsafety.1"
5353
flex_color_picker:
5454
dependency: "direct main"
5555
description:
5656
path: ".."
5757
relative: true
5858
source: path
59-
version: "1.1.4"
59+
version: "1.1.5"
6060
flutter:
6161
dependency: "direct main"
6262
description: flutter
@@ -73,21 +73,21 @@ packages:
7373
name: matcher
7474
url: "https://pub.dartlang.org"
7575
source: hosted
76-
version: "0.12.10"
76+
version: "0.12.10-nullsafety.1"
7777
meta:
7878
dependency: transitive
7979
description:
8080
name: meta
8181
url: "https://pub.dartlang.org"
8282
source: hosted
83-
version: "1.3.0"
83+
version: "1.3.0-nullsafety.3"
8484
path:
8585
dependency: transitive
8686
description:
8787
name: path
8888
url: "https://pub.dartlang.org"
8989
source: hosted
90-
version: "1.8.0"
90+
version: "1.8.0-nullsafety.1"
9191
sky_engine:
9292
dependency: transitive
9393
description: flutter
@@ -99,55 +99,55 @@ packages:
9999
name: source_span
100100
url: "https://pub.dartlang.org"
101101
source: hosted
102-
version: "1.8.1"
102+
version: "1.8.0-nullsafety.2"
103103
stack_trace:
104104
dependency: transitive
105105
description:
106106
name: stack_trace
107107
url: "https://pub.dartlang.org"
108108
source: hosted
109-
version: "1.10.0"
109+
version: "1.10.0-nullsafety.1"
110110
stream_channel:
111111
dependency: transitive
112112
description:
113113
name: stream_channel
114114
url: "https://pub.dartlang.org"
115115
source: hosted
116-
version: "2.1.0"
116+
version: "2.1.0-nullsafety.1"
117117
string_scanner:
118118
dependency: transitive
119119
description:
120120
name: string_scanner
121121
url: "https://pub.dartlang.org"
122122
source: hosted
123-
version: "1.1.0"
123+
version: "1.1.0-nullsafety.1"
124124
term_glyph:
125125
dependency: transitive
126126
description:
127127
name: term_glyph
128128
url: "https://pub.dartlang.org"
129129
source: hosted
130-
version: "1.2.0"
130+
version: "1.2.0-nullsafety.1"
131131
test_api:
132132
dependency: transitive
133133
description:
134134
name: test_api
135135
url: "https://pub.dartlang.org"
136136
source: hosted
137-
version: "0.2.19"
137+
version: "0.2.19-nullsafety.2"
138138
typed_data:
139139
dependency: transitive
140140
description:
141141
name: typed_data
142142
url: "https://pub.dartlang.org"
143143
source: hosted
144-
version: "1.3.0"
144+
version: "1.3.0-nullsafety.3"
145145
vector_math:
146146
dependency: transitive
147147
description:
148148
name: vector_math
149149
url: "https://pub.dartlang.org"
150150
source: hosted
151-
version: "2.1.0"
151+
version: "2.1.0-nullsafety.3"
152152
sdks:
153-
dart: ">=2.12.0-0.0 <3.0.0"
153+
dart: ">=2.10.0-110 <2.11.0"

example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: color_picker_example
22
description: Simple example of how to use the FlexColorPicker package.
3-
version: 1.1.4
3+
version: 1.1.5
44

55
environment:
66
sdk: ">=2.7.0 <3.0.0"
77

88
dependencies:
9-
flex_color_picker: ^1.1.4
9+
flex_color_picker: ^1.1.5
1010

1111
flutter:
1212
sdk: flutter

example/windows/flutter/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ add_custom_command(
9191
${FLUTTER_TOOL_ENVIRONMENT}
9292
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
9393
windows-x64 $<CONFIG>
94+
VERBATIM
9495
)
9596
add_custom_target(flutter_assemble DEPENDS
9697
"${FLUTTER_LIBRARY}"

lib/src/color_picker.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -764,9 +764,11 @@ class _ColorPickerState extends State<ColorPicker> {
764764
color: Color(0xFFFFFFFF),
765765
darkColor: Color(0xFF636366),
766766
);
767+
767768
// Define thumb onColor based on thumb color brightness.
768-
final Color _thumbOnColor =
769-
ThemeData.estimateBrightnessForColor(_thumbColor) == Brightness.light
769+
final Color _thumbOnColor = widget.selectedPickerTypeColor == null
770+
? null
771+
: ThemeData.estimateBrightnessForColor(_thumbColor) == Brightness.light
770772
? Colors.black
771773
: Colors.white;
772774

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flex_color_picker
22
description: A customizable Flutter primary, accent and custom color picker. Includes an optional HSV wheel color picker.
3-
version: 1.1.4
3+
version: 1.1.5
44
homepage: https://github.com/rydmike/flex_color_picker
55

66
environment:

0 commit comments

Comments
 (0)