Skip to content

Commit

Permalink
Version 2.6.0-dev.3 use FlexSeedScheme instead MatColUtils
Browse files Browse the repository at this point in the history
  • Loading branch information
rydmike committed Aug 30, 2022
1 parent 5b8cd93 commit bbcbfae
Show file tree
Hide file tree
Showing 19 changed files with 166 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
run: flutter test --coverage

- name: Upload test coverage to Codecov
uses: codecov/codecov-action@v1.5.2
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: coverage/lcov.info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
run: flutter test --coverage

- name: Upload test coverage to Codecov
uses: codecov/codecov-action@v1.5.2
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: coverage/lcov.info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
run: flutter test --coverage

- name: Upload test coverage to Codecov
uses: codecov/codecov-action@v1.5.2
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: coverage/lcov.info
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
name: Test
on:
push:
branches: [master]
# branches: [master, v2-6-0-dev-1]
# branches: [master]
branches: [master, v2-6-0-dev-2]
paths-ignore:
- "**.md"

Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
run: flutter test --coverage

- name: Upload test coverage to Codecov
uses: codecov/codecov-action@v1.5.2
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: coverage/lcov.info
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

All notable changes to the **FlexColorPicker** package are documented in this file.

## 2.6.0-dev.3

**August 28, 2022**

This is a dev release that works with Flutter beta 3.3.0-0.5.pre and master channel.
It has more relaxed constraints than 2.6.0-dev.2.

This version no longer depends directly on package `material_color_utilities` it uses
`flex_seed_scheme` instead, with a transitive dependency on `material_color_utilities`.

## 2.6.0-dev.2

**August 21, 2022**
Expand Down
108 changes: 54 additions & 54 deletions coverage/lcov.info
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
SF:lib/src/models/color_picker_action_buttons.dart
DA:51,31
DA:282,1
DA:306,1
DA:307,1
DA:308,1
DA:54,31
DA:285,1
DA:309,1
DA:310,1
DA:311,1
Expand All @@ -19,17 +16,17 @@ DA:320,1
DA:321,1
DA:322,1
DA:323,1
DA:324,1
DA:325,1
DA:327,1
DA:326,1
DA:328,1
DA:329,1
DA:330,1
DA:334,2
DA:337,3
DA:338,1
DA:339,3
DA:331,1
DA:332,1
DA:333,1
DA:337,2
DA:340,3
DA:341,3
DA:341,1
DA:342,3
DA:343,3
DA:344,3
Expand All @@ -50,11 +47,11 @@ DA:358,3
DA:359,3
DA:360,3
DA:361,3
DA:364,1
DA:365,2
DA:366,1
DA:362,3
DA:363,3
DA:364,3
DA:367,1
DA:368,1
DA:368,2
DA:369,1
DA:370,1
DA:371,1
Expand All @@ -74,60 +71,43 @@ DA:384,1
DA:385,1
DA:386,1
DA:387,1
DA:388,1
DA:389,1
DA:390,1
DA:392,1
DA:393,3
DA:394,3
DA:395,3
DA:393,1
DA:395,1
DA:396,3
DA:397,3
DA:398,3
DA:399,3
DA:400,1
DA:401,2
DA:402,2
DA:400,3
DA:401,3
DA:402,3
DA:403,1
DA:404,1
DA:404,2
DA:405,2
DA:407,3
DA:408,3
DA:406,1
DA:407,1
DA:408,2
DA:410,3
DA:411,1
DA:412,2
DA:413,2
DA:411,3
DA:413,3
DA:414,1
DA:416,3
DA:415,2
DA:416,2
DA:417,1
DA:418,2
DA:419,2
DA:419,3
DA:420,1
DA:421,3
DA:421,2
DA:422,2
DA:423,1
DA:425,3
DA:424,3
DA:425,2
DA:426,1
DA:428,3
LF:106
LH:106
end_of_record
SF:lib/src/universal_widgets/dry_intrisinic.dart
DA:20,2
DA:25,2
DA:27,2
DA:31,0
DA:33,0
DA:35,0
DA:36,0
DA:37,0
DA:55,1
DA:60,1
DA:62,1
DA:66,0
DA:68,0
DA:70,0
DA:71,0
DA:72,0
LF:16
LH:6
end_of_record
SF:lib/src/functions/picker_functions.dart
DA:14,2
DA:15,2
Expand Down Expand Up @@ -194,6 +174,26 @@ DA:162,10
LF:62
LH:61
end_of_record
SF:lib/src/universal_widgets/dry_intrisinic.dart
DA:20,2
DA:25,2
DA:27,2
DA:31,0
DA:33,0
DA:35,0
DA:36,0
DA:37,0
DA:55,1
DA:60,1
DA:62,1
DA:66,0
DA:68,0
DA:70,0
DA:71,0
DA:72,0
LF:16
LH:6
end_of_record
SF:lib/src/color_indicator.dart
DA:12,3
DA:26,4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ Future<bool> colorPickerDialog(
).showPickerDialog(
context,
elevation: 4,
actionsPadding: const EdgeInsets.all(16),
// Let's make an even more transparent barrier color than black12
barrierColor: const Color(0x0F000000), // 6% opacity black
constraints:
Expand Down
4 changes: 2 additions & 2 deletions example/lib/demo/utils/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ class App {
// Web demo with inside the app. Shown on the start screen in the demo,
// so people testing it don't have to ask. Also info for the About screen.
static const String appName = 'FlexColorPicker';
static const String version = '2.6.0-dev.2';
static const String version = '2.6.0-dev.3';
static const String packageVersion = 'FlexColorPicker package $version';
static final Uri packageUri = Uri(
scheme: 'https',
host: 'pub.dev',
path: 'packages/flex_color_picker',
);
static const String flutterVersion = 'Channel master 3.1.0-0.0.pre.2111';
static const String flutterVersion = 'Channel beta 3.3.0-0.5.pre';
static const String copyright = '© 2020, 2021, 2022';
static const String author = 'Mike Rydstrom';
static const String license = 'BSD 3-Clause License';
Expand Down
1 change: 1 addition & 0 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ class _ColorPickerPageState extends State<ColorPickerPage> {
customColorSwatchesAndNames: colorsNameMap,
).showPickerDialog(
context,
actionsPadding: const EdgeInsets.all(16),
constraints:
const BoxConstraints(minHeight: 480, minWidth: 300, maxWidth: 320),
);
Expand Down
2 changes: 1 addition & 1 deletion example/macos/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f
path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3

PODFILE CHECKSUM: a884f6dd3f7494f3892ee6c81feea3a3abbf9153
Expand Down
Loading

0 comments on commit bbcbfae

Please sign in to comment.