Skip to content

Commit ec7e119

Browse files
authored
chore(deps): upgrade example to flutter 3.22.2 (#1231)
1 parent a89a511 commit ec7e119

File tree

61 files changed

+107
-79
lines changed

Some content is hidden

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

61 files changed

+107
-79
lines changed

.github/workflows/ads_consent_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/ads_consent_client
2121
coverage_excludes: "lib/src/generated/*.dart"

.github/workflows/api.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
1818
with:
19-
dart_sdk: 3.3.4
19+
dart_sdk: 3.4.3
2020
working_directory: flutter_news_example/api
2121
analyze_directories: "routes lib test"
2222
coverage_excludes: "**/*.g.dart"

.github/workflows/app_ui.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/app_ui
2121
coverage_excludes: "lib/src/generated/*.dart"

.github/workflows/article_repository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
1818
with:
19-
dart_sdk: 3.3.4
19+
dart_sdk: 3.4.3
2020
working_directory: flutter_news_example/packages/article_repository

.github/workflows/authentication_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
1818
with:
19-
dart_sdk: 3.3.4
19+
dart_sdk: 3.4.3
2020
working_directory: flutter_news_example/packages/authentication_client/authentication_client

.github/workflows/deep_link_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/deep_link_client

.github/workflows/email_launcher.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/email_launcher
2121
coverage_excludes: "lib/src/generated/*.dart"

.github/workflows/firebase_authentication_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/authentication_client/firebase_authentication_client

.github/workflows/firebase_notifications_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/notifications_client/firebase_notifications_client

.github/workflows/flutter_news_example.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: subosito/flutter-action@v2.16.0
3737
with:
3838
channel: ${{matrix.channel}}
39-
flutter-version: "3.19.6"
39+
flutter-version: "3.22.2"
4040
cache: false
4141

4242
- name: Install Dependencies

.github/workflows/form_inputs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
1818
with:
19-
dart_sdk: 3.3.4
19+
dart_sdk: 3.4.3
2020
working_directory: flutter_news_example/packages/form_inputs

.github/workflows/in_app_purchase_repository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/in_app_purchase_repository

.github/workflows/news_blocks.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ jobs:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
1818
with:
1919
coverage_excludes: "**/*.g.dart"
20-
dart_sdk: 3.3.4
20+
dart_sdk: 3.4.3
2121
working_directory: flutter_news_example/api/packages/news_blocks

.github/workflows/news_blocks_ui.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/news_blocks_ui
2121
coverage_excludes: "lib/src/generated/*.dart"

.github/workflows/news_repository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/news_repository

.github/workflows/notifications_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
1818
with:
19-
dart_sdk: 3.3.4
19+
dart_sdk: 3.4.3
2020
working_directory: flutter_news_example/packages/notifications_client/notifications_client

.github/workflows/notifications_repository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/notifications_repository

.github/workflows/one_signal_notifications_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/notifications_client/one_signal_notifications_client

.github/workflows/package_info_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
1818
with:
19-
dart_sdk: 3.3.4
19+
dart_sdk: 3.4.3
2020
working_directory: flutter_news_example/packages/package_info_client

.github/workflows/permission_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/permission_client

.github/workflows/persistent_storage.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ jobs:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
1919
coverage_excludes: "**/*.g.dart"
20-
flutter_version: 3.19.6
20+
flutter_version: 3.22.2
2121
working_directory: flutter_news_example/packages/storage/persistent_storage

.github/workflows/purchase_client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/purchase_client

.github/workflows/secure_storage.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ jobs:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
1919
coverage_excludes: "**/*.g.dart"
20-
flutter_version: 3.19.6
20+
flutter_version: 3.22.2
2121
working_directory: flutter_news_example/packages/storage/secure_storage

.github/workflows/share_launcher.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/share_launcher

.github/workflows/storage.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
1818
with:
19-
dart_sdk: 3.3.4
19+
dart_sdk: 3.4.3
2020
working_directory: flutter_news_example/packages/storage/storage

.github/workflows/token_storage.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
1818
with:
19-
dart_sdk: 3.3.4
19+
dart_sdk: 3.4.3
2020
working_directory: flutter_news_example/packages/authentication_client/token_storage

.github/workflows/user_repository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
build:
1717
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
1818
with:
19-
flutter_version: 3.19.6
19+
flutter_version: 3.22.2
2020
working_directory: flutter_news_example/packages/user_repository

codemagic.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ workflows:
4848
working_directory: flutter_news_example
4949
max_build_duration: 60
5050
environment:
51-
flutter: 3.19.6
51+
flutter: 3.22.2
5252
xcode: latest
5353
cocoapods: default
5454
vars:
@@ -144,7 +144,7 @@ workflows:
144144
working_directory: flutter_news_example
145145
max_build_duration: 60
146146
environment:
147-
flutter: 3.19.6
147+
flutter: 3.22.2
148148
xcode: latest
149149
cocoapods: default
150150
vars:

flutter_news_example/lib/categories/widgets/categories_tab_bar.dart

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class CategoriesTabBar extends StatelessWidget implements PreferredSizeWidget {
1313
@override
1414
Widget build(BuildContext context) {
1515
return TabBar(
16+
tabAlignment: TabAlignment.start,
1617
controller: controller,
1718
isScrollable: true,
1819
tabs: tabs,

flutter_news_example/packages/app_ui/lib/src/theme/app_theme.dart

+14-9
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AppTheme {
3939
ColorScheme get _colorScheme {
4040
return ColorScheme.light(
4141
secondary: AppColors.secondary,
42-
background: _backgroundColor,
42+
surface: _backgroundColor,
4343
);
4444
}
4545

@@ -210,19 +210,24 @@ class AppTheme {
210210

211211
SwitchThemeData get _switchTheme {
212212
return SwitchThemeData(
213-
thumbColor:
214-
MaterialStateProperty.resolveWith((Set<MaterialState> states) {
215-
if (states.contains(MaterialState.selected)) {
213+
thumbColor: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
214+
if (states.contains(WidgetState.selected)) {
216215
return AppColors.darkAqua;
217216
}
218217
return AppColors.eerieBlack;
219218
}),
220-
trackColor:
221-
MaterialStateProperty.resolveWith((Set<MaterialState> states) {
222-
if (states.contains(MaterialState.selected)) {
219+
trackColor: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
220+
if (states.contains(WidgetState.selected)) {
223221
return AppColors.primaryContainer;
224222
}
225-
return AppColors.paleSky;
223+
return AppColors.grey;
224+
}),
225+
trackOutlineColor:
226+
WidgetStateProperty.resolveWith((Set<WidgetState> states) {
227+
if (states.contains(WidgetState.selected)) {
228+
return AppColors.primaryContainer;
229+
}
230+
return AppColors.grey;
226231
}),
227232
);
228233
}
@@ -288,7 +293,7 @@ class AppDarkTheme extends AppTheme {
288293
return const ColorScheme.dark().copyWith(
289294
primary: AppColors.white,
290295
secondary: AppColors.secondary,
291-
background: AppColors.grey.shade900,
296+
surface: AppColors.grey.shade900,
292297
);
293298
}
294299

flutter_news_example/packages/app_ui/lib/src/widgets/app_button.dart

+11-11
Original file line numberDiff line numberDiff line change
@@ -388,19 +388,19 @@ class AppButton extends StatelessWidget {
388388
return ElevatedButton(
389389
onPressed: onPressed,
390390
style: ButtonStyle(
391-
maximumSize: MaterialStateProperty.all(_maximumSize),
392-
padding: MaterialStateProperty.all(_padding),
393-
minimumSize: MaterialStateProperty.all(_minimumSize),
394-
textStyle: MaterialStateProperty.all(textStyle),
391+
maximumSize: WidgetStateProperty.all(_maximumSize),
392+
padding: WidgetStateProperty.all(_padding),
393+
minimumSize: WidgetStateProperty.all(_minimumSize),
394+
textStyle: WidgetStateProperty.all(textStyle),
395395
backgroundColor: onPressed == null
396-
? MaterialStateProperty.all(_disabledButtonColor)
397-
: MaterialStateProperty.all(_buttonColor),
398-
elevation: MaterialStateProperty.all(_elevation),
396+
? WidgetStateProperty.all(_disabledButtonColor)
397+
: WidgetStateProperty.all(_buttonColor),
398+
elevation: WidgetStateProperty.all(_elevation),
399399
foregroundColor: onPressed == null
400-
? MaterialStateProperty.all(_disabledForegroundColor)
401-
: MaterialStateProperty.all(_foregroundColor),
402-
side: MaterialStateProperty.all(_borderSide),
403-
shape: MaterialStateProperty.all(
400+
? WidgetStateProperty.all(_disabledForegroundColor)
401+
: WidgetStateProperty.all(_foregroundColor),
402+
side: WidgetStateProperty.all(_borderSide),
403+
shape: WidgetStateProperty.all(
404404
RoundedRectangleBorder(
405405
borderRadius: BorderRadius.circular(100),
406406
),

flutter_news_example/packages/app_ui/lib/src/widgets/app_switch.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ class AppSwitch extends StatelessWidget {
4444
),
4545
),
4646
Padding(
47-
padding: const EdgeInsets.only(
48-
top: AppSpacing.xxs,
49-
),
47+
padding: const EdgeInsets.only(left: AppSpacing.xs),
5048
child: Switch(
5149
value: value,
5250
onChanged: onChanged,

flutter_news_example/packages/app_ui/test/theme/app_theme_test.dart

+29-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void main() {
4949
.themeData
5050
.switchTheme
5151
.thumbColor
52-
?.resolve({MaterialState.selected}),
52+
?.resolve({WidgetState.selected}),
5353
equals(AppColors.darkAqua),
5454
);
5555
});
@@ -69,15 +69,39 @@ void main() {
6969
.themeData
7070
.switchTheme
7171
.trackColor
72-
?.resolve({MaterialState.selected}),
72+
?.resolve({WidgetState.selected}),
7373
equals(AppColors.primaryContainer),
7474
);
7575
});
7676

77-
test('returns paleSky when not selected', () {
77+
test('returns grey when not selected', () {
7878
expect(
7979
const AppTheme().themeData.switchTheme.trackColor?.resolve({}),
80-
equals(AppColors.paleSky),
80+
equals(AppColors.grey),
81+
);
82+
});
83+
});
84+
85+
group('trackOutlineColor', () {
86+
test('returns primaryContainer when selected', () {
87+
expect(
88+
const AppTheme()
89+
.themeData
90+
.switchTheme
91+
.trackOutlineColor
92+
?.resolve({WidgetState.selected}),
93+
equals(AppColors.primaryContainer),
94+
);
95+
});
96+
97+
test('returns grey when not selected', () {
98+
expect(
99+
const AppTheme()
100+
.themeData
101+
.switchTheme
102+
.trackOutlineColor
103+
?.resolve({}),
104+
equals(AppColors.grey),
81105
);
82106
});
83107
});
@@ -123,7 +147,7 @@ void main() {
123147

124148
test('background is grey.shade900', () {
125149
expect(
126-
const AppDarkTheme().themeData.colorScheme.background,
150+
const AppDarkTheme().themeData.colorScheme.surface,
127151
AppColors.grey.shade900,
128152
);
129153
});

flutter_news_example/packages/news_blocks_ui/test/src/slideshow_test.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ void main() {
196196
final currentPage = tester
197197
.widget<PageView>(find.byKey(slideshowPageViewKey))
198198
.controller
199-
.page;
199+
?.page;
200200

201201
// Check current page
202202
expect(currentPage, 2);
@@ -237,7 +237,7 @@ void main() {
237237
final currentPage = tester
238238
.widget<PageView>(find.byKey(slideshowPageViewKey))
239239
.controller
240-
.page;
240+
?.page;
241241

242242
// Check current page
243243
expect(currentPage, 1);

0 commit comments

Comments
 (0)