🚀 Migrate to Flutter 3.7 (#410)

dddrop · AlexV525 · web-flow · commit e3bf8e90b938 · 2023-02-07T16:38:45.000+08:00
- Migrate `extended_image` `^6.2.0` to `^7.0.0` - Fix some deprecated changes from Material Theme System Updates - Fix a deprecated override of `buildViewportChrome` (flutter/flutter#111715) - Remove a unnecessary override --------- Co-authored-by: Alex Li <github@alexv525.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ that can be found in the LICENSE file. -->
 
 # Changelog
 
+## 8.4.0
+
+### Breaking changes
+
+- Migrate to Flutter 3.7, drop supports for previous Flutter versions.
+
 ## 8.3.2+1
 
 ### Improvements
@@ -138,7 +144,9 @@ To know more about breaking changes, see [Migration Guide][].
 
 ## 7.3.0
 
-Migrate to Flutter 3, drop supports for previous Flutter versions.
+### Breaking changes
+
+- Migrate to Flutter 3, drop supports for previous Flutter versions.
 
 ## 7.2.0
 
diff --git a/README-ZH.md b/README-ZH.md
@@ -126,12 +126,12 @@ Language: [English](README.md) | 中文
 
 ### 版本兼容
 
-|        | 2.8.0 | 2.10.0 | 3.0.0 | 3.3.0 |
-|--------|:-----:|:------:|:-----:|:-----:|
-| 8.0.0+ |  不适用  |  不适用   |   ✅   |   ✅   |
-| 7.3.0+ |  不适用  |  不适用   |   ✅   |   ✅   |
-| 7.0.0+ |   ✅   |   ✅    |   ❌   |   ❌   |
-| 6.3.0+ |   ✅   |   ✅    |   ❌   |   ❌   |
+|        | 2.10.0 | 3.0.0 | 3.3.0 | 3.7.0 |
+|--------|:------:|:-----:|:-----:|:-----:|
+| 8.4.0+ |   ❌    |   ❌   |   ❌   |   ✅   |
+| 8.0.0+ |   ❌    |   ✅   |   ✅   |   ❌   |
+| 7.3.0+ |   ❌    |   ✅   |   ✅   |   ❌   |
+| 7.0.0+ |   ✅    |   ❌   |   ❌   |   ❌   |
 
 如果在 `flutter pub get` 时遇到了 `resolve conflict` 失败问题，
 请使用 `dependency_overrides` 解决。
diff --git a/README.md b/README.md
@@ -132,12 +132,12 @@ before you have any questions.
 
 ### Versions compatibility
 
-|        | 2.8.0 | 2.10.0 | 3.0.0 | 3.3.0 |
-|--------|:-----:|:------:|:-----:|:-----:|
-| 8.0.0+ |  N/A  |  N/A   |   ✅   |   ✅   |
-| 7.3.0+ |  N/A  |  N/A   |   ✅   |   ✅   |
-| 7.0.0+ |   ✅   |   ✅    |   ❌   |   ❌   |
-| 6.3.0+ |   ✅   |   ✅    |   ❌   |   ❌   |
+|        | 2.10.0 | 3.0.0 | 3.3.0 | 3.7.0 |
+|--------|:------:|:-----:|:-----:|:-----:|
+| 8.4.0+ |   ❌    |   ❌   |   ❌   |   ✅   |
+| 8.0.0+ |   ❌    |   ✅   |   ✅   |   ❌   |
+| 7.3.0+ |   ❌    |   ✅   |   ✅   |   ❌   |
+| 7.0.0+ |   ✅    |   ❌   |   ❌   |   ❌   |
 
 If you got a `resolve conflict` error when running `flutter pub get`,
 please use `dependency_overrides` to fix it.
diff --git a/example/lib/customs/custom_picker_page.dart b/example/lib/customs/custom_picker_page.dart
@@ -124,7 +124,7 @@ class _MethodListView extends StatelessWidget {
                   const SizedBox(height: 5),
                   Text(
                     model.description,
-                    style: Theme.of(context).textTheme.caption,
+                    style: Theme.of(context).textTheme.bodySmall,
                     overflow: TextOverflow.fade,
                   ),
                 ],
diff --git a/example/lib/customs/pickers/directory_file_asset_picker.dart b/example/lib/customs/pickers/directory_file_asset_picker.dart
@@ -808,8 +808,8 @@ class FileAssetPickerBuilder
                   : textDelegate.confirm,
               style: TextStyle(
                 color: provider.isSelectedNotEmpty
-                    ? theme.textTheme.bodyText1?.color
-                    : theme.textTheme.caption?.color,
+                    ? theme.textTheme.bodyLarge?.color
+                    : theme.textTheme.bodySmall?.color,
                 fontSize: 17.0,
                 fontWeight: FontWeight.normal,
               ),
@@ -1066,7 +1066,7 @@ class FileAssetPickerBuilder
                   style: TextStyle(
                     color: isSelectedNotEmpty
                         ? null
-                        : theme.textTheme.caption?.color,
+                        : theme.textTheme.bodySmall?.color,
                     fontSize: 18.0,
                   ),
                 );
@@ -1129,7 +1129,7 @@ class FileAssetPickerBuilder
                               '${index + 1}',
                               style: TextStyle(
                                 color: isSelected
-                                    ? theme.textTheme.bodyText1?.color
+                                    ? theme.textTheme.bodyLarge?.color
                                     : null,
                                 fontSize: isAppleOS ? 16.0 : 14.0,
                                 fontWeight: isAppleOS
@@ -1493,8 +1493,8 @@ class FileAssetPickerViewerBuilderDelegate
               style: TextStyle(
                 color: () {
                   return provider.isSelectedNotEmpty
-                      ? themeData.textTheme.bodyText1?.color
-                      : themeData.textTheme.caption?.color;
+                      ? themeData.textTheme.bodyLarge?.color
+                      : themeData.textTheme.bodySmall?.color;
                 }(),
                 fontSize: 17.0,
                 fontWeight: FontWeight.normal,
diff --git a/example/lib/customs/pickers/insta_asset_picker.dart b/example/lib/customs/pickers/insta_asset_picker.dart
@@ -297,11 +297,6 @@ class InstaAssetPickerBuilder extends DefaultAssetPickerBuilderDelegate {
   final ValueNotifier<AssetEntity?> _previewAsset =
       ValueNotifier<AssetEntity?>(null);
 
-  @override
-  void initState(AssetPickerState<AssetEntity, AssetPathEntity> state) {
-    super.initState(state);
-  }
-
   @override
   void dispose() {
     if (!keepScrollOffset) {
@@ -684,8 +679,10 @@ class InstaAssetPickerBuilder extends DefaultAssetPickerBuilderDelegate {
       height: _kIndicatorSize,
       padding: const EdgeInsets.all(2),
       decoration: BoxDecoration(
-        border: Border.all(color: theme.selectedRowColor),
-        color: isSelected ? themeColor : theme.selectedRowColor.withOpacity(.2),
+        border: Border.all(color: theme.unselectedWidgetColor),
+        color: isSelected
+            ? themeColor
+            : theme.unselectedWidgetColor.withOpacity(.2),
         shape: BoxShape.circle,
       ),
       child: FittedBox(
@@ -714,8 +711,8 @@ class InstaAssetPickerBuilder extends DefaultAssetPickerBuilderDelegate {
               duration: switchingPathDuration,
               padding: const EdgeInsets.all(4),
               color: isPreview
-                  ? theme.selectedRowColor.withOpacity(.5)
-                  : theme.backgroundColor.withOpacity(.1),
+                  ? theme.unselectedWidgetColor.withOpacity(.5)
+                  : theme.colorScheme.background.withOpacity(.1),
               child: Align(
                 alignment: AlignmentDirectional.topEnd,
                 child: isSelected && !isSingleAssetMode
diff --git a/example/lib/customs/pickers/multi_tabs_assets_picker.dart b/example/lib/customs/pickers/multi_tabs_assets_picker.dart
@@ -408,8 +408,8 @@ class MultiTabAssetPickerBuilder extends DefaultAssetPickerBuilderDelegate {
                 : textDelegate.confirm,
             style: TextStyle(
               color: p.isSelectedNotEmpty
-                  ? theme.textTheme.bodyText1?.color
-                  : theme.textTheme.caption?.color,
+                  ? theme.textTheme.bodyLarge?.color
+                  : theme.textTheme.bodySmall?.color,
               fontSize: 17,
               fontWeight: FontWeight.normal,
             ),
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -59,10 +59,10 @@ class NoGlowScrollBehavior extends ScrollBehavior {
   const NoGlowScrollBehavior();
 
   @override
-  Widget buildViewportChrome(
+  Widget buildOverscrollIndicator(
     BuildContext context,
     Widget child,
-    AxisDirection axisDirection,
+    ScrollableDetails details,
   ) =>
       child;
 }
diff --git a/example/lib/pages/home_page.dart b/example/lib/pages/home_page.dart
@@ -76,14 +76,14 @@ class _HomePageState extends State<HomePage> {
                 sortKey: const OrdinalSortKey(0),
                 child: Text(
                   'WeChat Asset Picker',
-                  style: Theme.of(context).textTheme.headline6,
+                  style: Theme.of(context).textTheme.titleLarge,
                 ),
               ),
               Semantics(
                 sortKey: const OrdinalSortKey(0.1),
                 child: Text(
                   'Version: ${packageVersion ?? 'unknown'}',
-                  style: Theme.of(context).textTheme.caption,
+                  style: Theme.of(context).textTheme.bodySmall,
                 ),
               ),
             ],
diff --git a/example/lib/widgets/method_list_view.dart b/example/lib/widgets/method_list_view.dart
@@ -64,7 +64,7 @@ class _MethodListViewState extends State<MethodListView> {
                   const SizedBox(height: 5),
                   Text(
                     model.description,
-                    style: Theme.of(context).textTheme.caption,
+                    style: Theme.of(context).textTheme.bodySmall,
                   ),
                 ],
               ),
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,6 +1,6 @@
 name: wechat_assets_picker_demo
 description: The demo project for the wechat_assets_picker package.
-version: 8.3.2+33
+version: 8.4.0+34
 publish_to: none
 
 environment:
diff --git a/lib/src/delegates/asset_picker_builder_delegate.dart b/lib/src/delegates/asset_picker_builder_delegate.dart
@@ -404,7 +404,7 @@ abstract class AssetPickerBuilderDelegate<Asset, Path> {
             textDelegate.gifIndicator,
             style: TextStyle(
               color: isAppleOS
-                  ? theme.textTheme.bodyText2?.color
+                  ? theme.textTheme.bodyMedium?.color
                   : theme.primaryColor,
               fontSize: 13,
               fontWeight: FontWeight.w500,
@@ -494,7 +494,7 @@ abstract class AssetPickerBuilderDelegate<Asset, Path> {
             Expanded(
               child: ScaleText(
                 textDelegate.accessAllTip,
-                style: context.themeData.textTheme.caption?.copyWith(
+                style: context.themeData.textTheme.bodySmall?.copyWith(
                   fontSize: 14,
                 ),
                 semanticsLabel: semanticsTextDelegate.accessAllTip,
@@ -1513,8 +1513,8 @@ class DefaultAssetPickerBuilderDelegate
                 : textDelegate.confirm,
             style: TextStyle(
               color: p.isSelectedNotEmpty
-                  ? theme.textTheme.bodyText1?.color
-                  : theme.textTheme.caption?.color,
+                  ? theme.textTheme.bodyLarge?.color
+                  : theme.textTheme.bodySmall?.color,
               fontSize: 17,
               fontWeight: FontWeight.normal,
             ),
@@ -1657,7 +1657,7 @@ class DefaultAssetPickerBuilderDelegate
                       ),
                     ],
                   ),
-                  style: context.themeData.textTheme.caption?.copyWith(
+                  style: context.themeData.textTheme.bodySmall?.copyWith(
                     fontSize: 14,
                   ),
                 ),
@@ -1888,7 +1888,7 @@ class DefaultAssetPickerBuilderDelegate
                                 ScaleText(
                                   '($semanticsCount)',
                                   style: TextStyle(
-                                    color: theme.textTheme.caption?.color,
+                                    color: theme.textTheme.bodySmall?.color,
                                     fontSize: 17,
                                   ),
                                   maxLines: 1,
@@ -1970,7 +1970,7 @@ class DefaultAssetPickerBuilderDelegate
                 style: TextStyle(
                   color: p.isSelectedNotEmpty
                       ? null
-                      : c.themeData.textTheme.caption?.color,
+                      : c.themeData.textTheme.bodySmall?.color,
                   fontSize: 17,
                 ),
                 maxScaleFactor: 1.2,
@@ -2019,7 +2019,7 @@ class DefaultAssetPickerBuilderDelegate
           decoration: BoxDecoration(
             border: !selected
                 ? Border.all(
-                    color: context.themeData.selectedRowColor,
+                    color: context.themeData.unselectedWidgetColor,
                     width: indicatorSize / 25,
                   )
                 : null,
@@ -2075,7 +2075,7 @@ class DefaultAssetPickerBuilderDelegate
               padding: EdgeInsets.all(indicatorSize * .35),
               color: selected
                   ? theme.colorScheme.primary.withOpacity(.45)
-                  : theme.backgroundColor.withOpacity(.1),
+                  : theme.colorScheme.background.withOpacity(.1),
               child: selected && !isSingleAssetMode
                   ? Align(
                       alignment: AlignmentDirectional.topStart,
@@ -2087,7 +2087,7 @@ class DefaultAssetPickerBuilderDelegate
                           child: Text(
                             '${index + 1}',
                             style: TextStyle(
-                              color: theme.textTheme.bodyText1?.color
+                              color: theme.textTheme.bodyLarge?.color
                                   ?.withOpacity(.75),
                               fontWeight: FontWeight.w600,
                               height: 1,
diff --git a/lib/src/delegates/asset_picker_delegate.dart b/lib/src/delegates/asset_picker_delegate.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by an Apache license that can be found
 // in the LICENSE file.
 
-// ignore_for_file: deprecated_member_use
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:photo_manager/photo_manager.dart';
@@ -208,10 +207,8 @@ class AssetPickerDelegate {
         primaryColorDark: Colors.grey[50],
         canvasColor: Colors.grey[100],
         scaffoldBackgroundColor: Colors.grey[50],
-        bottomAppBarColor: Colors.grey[50],
         cardColor: Colors.grey[50],
         highlightColor: Colors.transparent,
-        toggleableActiveColor: themeColor,
         textSelectionTheme: TextSelectionThemeData(
           cursorColor: themeColor,
           selectionColor: themeColor.withAlpha(100),
@@ -228,9 +225,7 @@ class AssetPickerDelegate {
         buttonTheme: ButtonThemeData(buttonColor: themeColor),
         colorScheme: ColorScheme(
           primary: Colors.grey[50]!,
-          primaryVariant: Colors.grey[50],
           secondary: themeColor,
-          secondaryVariant: themeColor,
           background: Colors.grey[50]!,
           surface: Colors.grey[50]!,
           brightness: Brightness.light,
@@ -249,10 +244,8 @@ class AssetPickerDelegate {
       primaryColorDark: Colors.grey[900],
       canvasColor: Colors.grey[850],
       scaffoldBackgroundColor: Colors.grey[900],
-      bottomAppBarColor: Colors.grey[900],
       cardColor: Colors.grey[900],
       highlightColor: Colors.transparent,
-      toggleableActiveColor: themeColor,
       textSelectionTheme: TextSelectionThemeData(
         cursorColor: themeColor,
         selectionColor: themeColor.withAlpha(100),
@@ -269,9 +262,7 @@ class AssetPickerDelegate {
       buttonTheme: ButtonThemeData(buttonColor: themeColor),
       colorScheme: ColorScheme(
         primary: Colors.grey[900]!,
-        primaryVariant: Colors.grey[900],
         secondary: themeColor,
-        secondaryVariant: themeColor,
         background: Colors.grey[900]!,
         surface: Colors.grey[900]!,
         brightness: Brightness.dark,
diff --git a/lib/src/delegates/asset_picker_viewer_builder_delegate.dart b/lib/src/delegates/asset_picker_viewer_builder_delegate.dart
@@ -861,10 +861,12 @@ class DefaultAssetPickerViewerBuilderDelegate
             child: ScaleText(
               buildText(),
               style: TextStyle(
-                color: themeData.textTheme.bodyText1?.color,
+                color: themeData.textTheme.bodyLarge?.color,
                 fontSize: 17,
                 fontWeight: FontWeight.normal,
               ),
+              overflow: TextOverflow.fade,
+              softWrap: false,
               semanticsLabel: () {
                 if (isWeChatMoment && hasVideo) {
                   return semanticsTextDelegate.confirm;
diff --git a/lib/src/widget/asset_picker_app_bar.dart b/lib/src/widget/asset_picker_app_bar.dart
@@ -131,7 +131,7 @@ class AssetPickerAppBar extends StatelessWidget implements PreferredSizeWidget {
                     ? Alignment.center
                     : AlignmentDirectional.centerStart,
                 child: DefaultTextStyle(
-                  style: theme.textTheme.headline6!.copyWith(fontSize: 23.0),
+                  style: theme.textTheme.titleLarge!.copyWith(fontSize: 23.0),
                   maxLines: 1,
                   softWrap: false,
                   overflow: TextOverflow.ellipsis,
diff --git a/lib/src/widget/builder/audio_page_builder.dart b/lib/src/widget/builder/audio_page_builder.dart
@@ -168,7 +168,7 @@ class _AudioPageBuilderState extends State<AudioPageBuilder> {
       onLongPressHint:
           Singleton.textDelegate.semanticsTextDelegate.sActionPlayHint,
       child: ColoredBox(
-        color: context.themeData.backgroundColor,
+        color: context.themeData.colorScheme.background,
         child: isLoaded
             ? Column(
                 mainAxisAlignment: MainAxisAlignment.center,
diff --git a/lib/src/widget/builder/locally_available_builder.dart b/lib/src/widget/builder/locally_available_builder.dart
@@ -97,7 +97,7 @@ class _LocallyAvailableBuilderState extends State<LocallyAvailableBuilder> {
                 ScaleText(
                   '  iCloud ${(progress * 100).toInt()}%',
                   style: TextStyle(
-                    color: context.themeData.textTheme.bodyText2?.color
+                    color: context.themeData.textTheme.bodyMedium?.color
                         ?.withOpacity(.4),
                   ),
                 ),
diff --git a/lib/src/widget/scale_text.dart b/lib/src/widget/scale_text.dart
diff --git a/pubspec.yaml b/pubspec.yaml
