Skip to content

Commit 761f93d

Browse files
authored
Merge pull request #152 from rydmike/version-7-1
Merge version 7.1
2 parents a22aeca + fdde47a commit 761f93d

File tree

95 files changed

+2341
-1329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2341
-1329
lines changed

.github/workflows/deploy.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# - Use rpl to fix/modify the index.html file to give it the correct
1919
# href deployment sub-folder.
2020
# - Deploy each built Web App to GitHub pages.
21-
name: Deploy Web
21+
name: Deploy_Web
2222
on:
2323
push:
2424
branches: [none]
@@ -68,14 +68,14 @@ jobs:
6868
- name: "EXAMPLE-1 START BUILD - Flutter clean before build"
6969
run: flutter clean && cd example && flutter clean
7070
- name: "EXAMPLE-1 WEB release build"
71-
run: cd example && flutter build web --web-renderer html --base-href "/flexcolorscheme/basictheme-v7/" --release -t lib/example1_basic_theme_usage/main.dart
71+
run: cd example && flutter build web --web-renderer canvaskit --base-href "/flexcolorscheme/basictheme-v7-1/" --release -t lib/example1_basic_theme_usage/main.dart
7272
- name: "EXAMPLE-1 DEPLOY to GitHub Pages repository, published on commit."
7373
uses: dmnemec/[email protected]
7474
env:
7575
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
7676
with:
7777
source_file: 'example/build/web/.'
78-
destination_folder: 'flexcolorscheme/basictheme-v7'
78+
destination_folder: 'flexcolorscheme/basictheme-v7-1'
7979
destination_repo: 'rydmike/rydmike.github.io'
8080
user_email: '[email protected]'
8181
user_name: 'rydmike'
@@ -84,14 +84,14 @@ jobs:
8484
- name: "EXAMPLE-2 START BUILD - Flutter clean before build"
8585
run: flutter clean && cd example && flutter clean
8686
- name: "EXAMPLE-2 WEB release build"
87-
run: cd example && flutter build web --web-renderer html --base-href "/flexcolorscheme/customtheme-v7/" --release -t lib/example2_custom_theme/main.dart
87+
run: cd example && flutter build web --web-renderer canvaskit --base-href "/flexcolorscheme/customtheme-v7-1/" --release -t lib/example2_custom_theme/main.dart
8888
- name: "EXAMPLE-2 DEPLOY to GitHub Pages repository, published on commit."
8989
uses: dmnemec/[email protected]
9090
env:
9191
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
9292
with:
9393
source_file: 'example/build/web/.'
94-
destination_folder: 'flexcolorscheme/customtheme-v7'
94+
destination_folder: 'flexcolorscheme/customtheme-v7-1'
9595
destination_repo: 'rydmike/rydmike.github.io'
9696
user_email: '[email protected]'
9797
user_name: 'rydmike'
@@ -100,14 +100,14 @@ jobs:
100100
- name: "EXAMPLE-3 START BUILD - Flutter clean before build"
101101
run: flutter clean && cd example && flutter clean
102102
- name: "EXAMPLE-3 WEB release build"
103-
run: cd example && flutter build web --web-renderer html --base-href "/flexcolorscheme/fourthemes-v7/" --release -t lib/example3_four_themes/main.dart
103+
run: cd example && flutter build web --web-renderer canvaskit --base-href "/flexcolorscheme/fourthemes-v7-1/" --release -t lib/example3_four_themes/main.dart
104104
- name: "EXAMPLE-3 DEPLOY to GitHub Pages repository, published on commit."
105105
uses: dmnemec/[email protected]
106106
env:
107107
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
108108
with:
109109
source_file: 'example/build/web/.'
110-
destination_folder: 'flexcolorscheme/fourthemes-v7'
110+
destination_folder: 'flexcolorscheme/fourthemes-v7-1'
111111
destination_repo: 'rydmike/rydmike.github.io'
112112
user_email: '[email protected]'
113113
user_name: 'rydmike'
@@ -116,14 +116,14 @@ jobs:
116116
- name: "EXAMPLE-4 START BUILD - Flutter clean before build"
117117
run: flutter clean && cd example && flutter clean
118118
- name: "EXAMPLE-4 WEB release build"
119-
run: cd example && flutter build web --web-renderer html --base-href "/flexcolorscheme/allthemes-v7/" --release -t lib/example4_all_themes/main.dart
119+
run: cd example && flutter build web --web-renderer canvaskit --base-href "/flexcolorscheme/allthemes-v7-1/" --release -t lib/example4_all_themes/main.dart
120120
- name: "EXAMPLE-4 DEPLOY to GitHub Pages repository, published on commit."
121121
uses: dmnemec/[email protected]
122122
env:
123123
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
124124
with:
125125
source_file: 'example/build/web/.'
126-
destination_folder: 'flexcolorscheme/allthemes-v7'
126+
destination_folder: 'flexcolorscheme/allthemes-v7-1'
127127
destination_repo: 'rydmike/rydmike.github.io'
128128
user_email: '[email protected]'
129129
user_name: 'rydmike'
@@ -132,14 +132,14 @@ jobs:
132132
- name: "EXAMPLE-5 START BUILD - Flutter clean before build"
133133
run: flutter clean && cd example && flutter clean
134134
- name: "EXAMPLE-5 WEB release build"
135-
run: cd example && flutter build web --web-renderer html --base-href "/flexcolorscheme/themesplayground-v7/" --release -t lib/example5_themes_playground/main.dart
135+
run: cd example && flutter build web --web-renderer canvaskit --base-href "/flexcolorscheme/themesplayground-v7-1/" --release -t lib/example5_themes_playground/main.dart
136136
- name: "EXAMPLE-5 DEPLOY to GitHub Pages repository, published on commit."
137137
uses: dmnemec/[email protected]
138138
env:
139139
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
140140
with:
141141
source_file: 'example/build/web/.'
142-
destination_folder: 'flexcolorscheme/themesplayground-v7'
142+
destination_folder: 'flexcolorscheme/themesplayground-v7-1'
143143
destination_repo: 'rydmike/rydmike.github.io'
144144
user_email: '[email protected]'
145145
user_name: 'rydmike'

.github/workflows/deploy_playground.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# - Use rpl to fix/modify the index.html file to give it the correct
1919
# href deployment sub-folder.
2020
# - Deploy each built Web App to GitHub pages.
21-
name: Deploy Playground
21+
name: Deploy_Playground
2222
on:
2323
push:
2424
branches: [none]
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install Flutter and Dart SDK
3434
uses: subosito/flutter-action@v2
3535
with:
36-
channel: "stable"
36+
channel: "beta"
3737
- name: "Show Dart SDK version"
3838
run: dart --version
3939
- name: "Show Flutter SDK version"
@@ -60,14 +60,14 @@ jobs:
6060
- name: "EXAMPLE-5 START BUILD - Flutter clean before build"
6161
run: flutter clean && cd example && flutter clean
6262
- name: "EXAMPLE-5 WEB release build"
63-
run: cd example && flutter build web --web-renderer html --base-href "/flexcolorscheme/themesplayground-v7/" --release -t lib/example5_themes_playground/main.dart
63+
run: cd example && flutter build web --web-renderer canvaskit --base-href "/flexcolorscheme/themesplayground-v7-1/" --release -t lib/example5_themes_playground/main.dart
6464
- name: "EXAMPLE-5 DEPLOY to GitHub Pages repository, published on commit."
6565
uses: dmnemec/[email protected]
6666
env:
6767
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
6868
with:
6969
source_file: 'example/build/web/.'
70-
destination_folder: 'flexcolorscheme/themesplayground-v7'
70+
destination_folder: 'flexcolorscheme/themesplayground-v7-1'
7171
destination_repo: 'rydmike/rydmike.github.io'
7272
user_email: '[email protected]'
7373
user_name: 'rydmike'

CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,48 @@
22

33
All changes to the **FlexColorScheme** (FCS) package are documented here.
44

5+
## 7.1.0
6+
7+
**May 12, 2023**
8+
9+
FlexColorScheme v7.1.0 supports new theming features in Flutter 3.10, it thus requires minimum Flutter 3.10 and Dart 3.0.
10+
11+
**NEW**
12+
13+
* Added support for "bring shadows back" adaptive theming feature to `BottomAppBar` and `BottomSheet`.
14+
* Added `datePickerTheme` to `FlexSubThemes`.
15+
* Added properties `datePickerDialogRadius` and `datePickerHeaderBackgroundSchemeColor` to `FlexSubThemesData`.
16+
17+
**CHANGE**
18+
19+
- Updated to use minimum `flex_seed_scheme ^1.3.0`. This version, no longer depends on `material_color_utilities`, thus avoiding all version issues and conflicts when Flutter changes what breaking version of `material_color_utilities` it uses on different channels and versions.
20+
21+
**THEMES PLAYGROUND**
22+
- Themes Playground 7.1 for FlexColorScheme 7.1 can be found [here](https://rydmike.com/flexcolorscheme/themesplayground-v7-1).
23+
24+
* **NEW**
25+
- Added selection of themed header color scheme color for the DatePickerDialog on the Dialogs panel.
26+
- Added showing SearchBar with SearchView to the AppBar panel.
27+
- Added showing SearchBar with SearchView to the Widget Showcase.
28+
29+
* **UPDATE**
30+
- Reviewed and updated status of all known theming issues in info expands.
31+
- The SKIA **canvaskit** renderer is again being used to build all the web examples, including the Themes Playground.
32+
- Updated all examples to use new `ListenableBuilder` instead of `AnimatedBuilder` where appropriate.
33+
34+
535
## 7.0.5
636

737
**Apr 29, 2023**
838

939
- **Fix:** [#143](https://github.com/rydmike/flex_color_scheme/issues/143) Glitches in highlighting effect on mouse hover over `FlexThemeModeSwitch` and `FlexThemeModeOptionButton`.
1040

41+
## 7.1.0-dev.1
42+
43+
**Apr 24, 2023**
44+
45+
* [Detailed changelog](https://github.com/rydmike/flex_color_scheme/blob/master/changelog/changelog_7_1_0_dev_1.md)
46+
1147
## 7.0.4
1248

1349
**Apr 22, 2023**

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ When you opt in on using the component sub-themes in Material-2 mode, border rad
3636

3737
You can also opt in on using Material-3. The Material-3 mode component sub-theming is far less opinionated, using mostly Material-3 defaults. It offers many quick settings to customize Material-3 to fit your custom design goals.
3838

39-
In Flutter 3.7 and later, using Material-3 design is ready for production use. Some minor issues still exist, please refer to the FlexColorScheme docs [known issues](https://docs.flexcolorscheme.com/known_issues) chapter for more information on status of known **theming** issues in Flutter.
39+
In Flutter **3.7 and later**, using Material-3 design is ready for production use. Some minor issues still exist, please refer to the FlexColorScheme docs [known issues](https://docs.flexcolorscheme.com/known_issues) chapter for more information on status of known **theming** issues in Flutter.
4040

4141
<table>
4242
<tr>
@@ -138,11 +138,11 @@ Complete generated package [**API documentation**](https://pub.dev/documentation
138138

139139
To make it even easier to configure and setup **FlexColorScheme**, it comes with a WEB companion app called the **Themes Playground**.
140140

141-
The [**Themes Playground**](https://rydmike.com/flexcolorscheme/themesplayground-v7) is a useful tool to find **FlexColorScheme** themes and settings you like. You can use it to discover what you can do with FlexColorScheme. The playground persists all its settings. You can reset settings back to their default values, so you can always start over if you get lost in all the configuration possibilities.
141+
The [**Themes Playground**](https://rydmike.com/flexcolorscheme/themesplayground-v7-1) is a useful tool to find **FlexColorScheme** themes and settings you like. You can use it to discover what you can do with FlexColorScheme. The playground persists all its settings. You can reset settings back to their default values, so you can always start over if you get lost in all the configuration possibilities.
142142

143143
The most useful and popular feature of the **Themes Playground** is that it can generate **FlexColorScheme API** setup code needed to produce the shown active theme configuration. It even shows and modifies the code as you change settings. You can show the code side-by-side as you change settings. This is a fun way to get familiar with the API. Beware, fiddling with all the different themes and settings can be quite fun and addictive, happy theming! 💙
144144

145-
The latest **Themes Playground v7** build can be used as a [web app here](https://rydmike.com/flexcolorscheme/themesplayground-v7).
145+
The latest **Themes Playground v7.1** build can be used as a [web app here](https://rydmike.com/flexcolorscheme/themesplayground-v7-1).
146146

147147
For guidance on how to use the Themes Playground, please read the [Themes Playground chapter](https://docs.flexcolorscheme.com/playground) available in the documentation site.
148148

@@ -156,6 +156,8 @@ The Playground app is also the last step in the package tutorial series. The [tu
156156

157157
### Older versions of the Themes Playground
158158

159+
If you are using **FlexColorScheme version 7.0**, you can go here to use [**Themes Playground V7.0**](https://rydmike.com/flexcolorscheme/themesplayground-v7) and generate API setup code for version 7.0. If you can, prefer updating to version 7.1.
160+
159161
If you are using **FlexColorScheme version 6**, you can go here to use [**Themes Playground V6**](https://rydmike.com/flexcolorscheme/themesplayground-v6) and generate API setup code for version 6. It supports FlexColorScheme version 6.1, you can also use this version of the Playground with FlexColorScheme version 6.0. If you do, you may have to delete some generated API config setup code for properties only available in version 6.1 that are not supported by FlexColorScheme 6.0. You will see those as unsupported API errors when you copy/paste the Themes Playground code to Flutter if you use 6.0 and not 6.1. Delete such rows, or you can of course upgrade the package to 6.1 to get those features.
160162

161163
If you are using **FlexColorScheme version 5**, you can go here to use [**Themes Playground V5**](https://rydmike.com/flexcolorscheme/themesplayground-v5), to generate API setup code for it.

all_lint_rules.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# A list of all linter rules. Up-to-date auto generated list of all
1+
# A list of all linter rules. Up to date auto generated list of all
22
# lint rules can be found here:
33
# https://dart-lang.github.io/linter/lints/options/options.html
44
linter:
55
rules:
66
- always_declare_return_types
77
- always_put_control_body_on_new_line
88
- always_put_required_named_parameters_first
9-
- always_require_non_null_named_parameters
109
- always_specify_types
1110
- always_use_package_imports
1211
- annotate_overrides
@@ -35,8 +34,6 @@ linter:
3534
- avoid_relative_lib_imports
3635
- avoid_renaming_method_parameters
3736
- avoid_return_types_on_setters
38-
- avoid_returning_null
39-
- avoid_returning_null_for_future
4037
- avoid_returning_null_for_void
4138
- avoid_returning_this
4239
- avoid_setters_without_getters
@@ -67,21 +64,23 @@ linter:
6764
- dangling_library_doc_comments
6865
- depend_on_referenced_packages
6966
- deprecated_consistency
67+
- deprecated_member_use_from_same_package
7068
- diagnostic_describe_all_properties
7169
- directives_ordering
7270
- discarded_futures
7371
- do_not_use_environment
7472
- empty_catches
7573
- empty_constructor_bodies
7674
- empty_statements
77-
- enable_null_safety
7875
- eol_at_end_of_file
7976
- exhaustive_cases
8077
- file_names
8178
- flutter_style_todos
8279
- hash_and_equals
8380
- implementation_imports
8481
- implicit_call_tearoffs
82+
- implicit_reopen
83+
- invalid_case_patterns
8584
- iterable_contains_unrelated_type
8685
- join_return_with_assignment
8786
- leading_newlines_in_multiline_strings
@@ -92,12 +91,14 @@ linter:
9291
- lines_longer_than_80_chars
9392
- list_remove_unrelated_type
9493
- literal_only_boolean_expressions
94+
- matching_super_parameters
9595
- missing_whitespace_between_adjacent_strings
9696
- no_adjacent_strings_in_list
9797
- no_default_cases
9898
- no_duplicate_case_values
9999
- no_leading_underscores_for_library_prefixes
100100
- no_leading_underscores_for_local_identifiers
101+
- no_literal_bool_comparisons
101102
- no_logic_in_create_state
102103
- no_runtimeType_toString
103104
- non_constant_identifier_names
@@ -124,7 +125,6 @@ linter:
124125
- prefer_constructors_over_static_methods
125126
- prefer_contains
126127
- prefer_double_quotes
127-
- prefer_equal_for_default_values
128128
- prefer_expression_function_bodies
129129
- prefer_final_fields
130130
- prefer_final_in_for_each
@@ -169,9 +169,11 @@ linter:
169169
- tighten_type_of_initializing_formals
170170
- type_annotate_public_apis
171171
- type_init_formals
172+
- type_literal_in_constant_pattern
172173
- unawaited_futures
173174
- unnecessary_await_in_return
174175
- unnecessary_brace_in_string_interps
176+
- unnecessary_breaks
175177
- unnecessary_const
176178
- unnecessary_constructor_name
177179
- unnecessary_final

0 commit comments

Comments
 (0)