适配flutter 3.16.0

.github/workflows/flutter-drive.yml

@@ -53,7 +53,7 @@ jobs:
       # https://github.com/marketplace/actions/flutter-action
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.13.6'
+          flutter-version: '3.16.0'
           channel: 'stable' # or: 'dev' or 'beta'
           architecture: x64
       - run: "flutter clean"
@@ -78,7 +78,7 @@ jobs:
           java-version: '11'
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.13.6'
+          flutter-version: '3.16.0'
           channel: 'stable' # or: 'dev' or 'beta'
           architecture: x64
       - name: "Run Flutter Driver tests"
@@ -104,7 +104,7 @@ jobs:
       # https://github.com/marketplace/actions/flutter-action
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.13.6'
+          flutter-version: '3.16.0'
           channel: 'stable'
           architecture: x64
       - run: "flutter pub get"

.github/workflows/flutter-web-deploy.yml

@@ -5,7 +5,7 @@ name: flutter_deer web deploy
 on:
   push:
     paths:
-      - 'pubspec1.yaml'
+      - 'pubspec.yaml'
 
 jobs:
   web_build_and_deploy:
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/[email protected]
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.13.6'
+          flutter-version: '3.16.0'
           channel: 'stable'
           architecture: x64
       - name: "Web Build 🔧"

README-EN.md

@@ -66,9 +66,9 @@ For web experience, please visit: https://simplezhli.github.io/flutter_deer/
 
 [![Build Status](https://github.com/simplezhli/flutter_deer/workflows/flutter_deer%20driver/badge.svg?branch=master)](https://github.com/simplezhli/flutter_deer/actions?query=workflow%3A%22flutter_deer+driver%22+branch%3Amaster)
 
-    1. Flutter version 3.13.6
+    1. Flutter version 3.16.0
 
-    2. Dart version 3.1.3
+    2. Dart version 3.2.0
 
 ## Precautions to be taken.
 

README.md

@@ -66,9 +66,9 @@ Web体验地址：https://simplezhli.github.io/flutter_deer/
 
 [![Build Status](https://github.com/simplezhli/flutter_deer/workflows/flutter_deer%20driver/badge.svg?branch=master)](https://github.com/simplezhli/flutter_deer/actions?query=workflow%3A%22flutter_deer+driver%22+branch%3Amaster)
 
-    1. Flutter version 3.13.6
+    1. Flutter version 3.16.0
 
-    2. Dart version 3.1.3
+    2. Dart version 3.2.0
 
 ## 注意事项
 

ios/Podfile

@@ -2,7 +2,7 @@
 platform :ios, '11.0'
 
 # source 'https://github.com/CocoaPods/Specs.git'
-
+source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 

lib/account/page/withdrawal_page.dart

@@ -55,11 +55,10 @@ class _WithdrawalPageState extends State<WithdrawalPage> {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         /// 拦截返回，关闭键盘，否则会造成上一页面短暂的组件溢出
         FocusManager.instance.primaryFocus?.unfocus();
-        return Future.value(true);
       },
       child: Scaffold(
         appBar: const MyAppBar(

lib/main.dart

@@ -180,7 +180,7 @@ class MyApp extends StatelessWidget {
 
         /// 保证文字大小不受手机系统设置影响 https://www.kikt.top/posts/flutter/layout/dynamic-text/
         return MediaQuery(
-          data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+          data: MediaQuery.of(context).copyWith(textScaler: TextScaler.noScaling),
           child: child!,
         );
       },

lib/mvp/base_page.dart

@@ -38,11 +38,10 @@ mixin BasePageMixin<T extends StatefulWidget, P extends BasePresenter> on State<
           barrierDismissible: false,
           barrierColor: const Color(0x00FFFFFF), // 默认dialog背景色为半透明黑色，这里修改为透明（1.20添加属性）
           builder:(_) {
-            return WillPopScope(
-              onWillPop: () async {
+            return PopScope(
+              onPopInvoked: (_) {
                 // 拦截到返回键，证明dialog被手动关闭
                 _isShowDialog = false;
-                return Future.value(true);
               },
               child: buildProgress(),
             );

lib/setting/widgets/update_dialog.dart

@@ -39,11 +39,8 @@ class _UpdateDialogState extends State<UpdateDialog> {
   @override
   Widget build(BuildContext context) {
     final Color primaryColor = Theme.of(context).primaryColor;
-    return WillPopScope(
-      onWillPop: () async {
-        /// 使用false禁止返回键返回，达到强制升级目的
-        return true;
-      },
+    return PopScope(
+      canPop: false, /// 使用false禁止返回键返回，达到强制升级目的
       child: Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: Colors.transparent,

lib/widgets/bezier_chart/my_single_child_scroll_view.dart

@@ -363,7 +363,8 @@ class _RenderSingleChildViewport extends RenderBox
 
   @override
   RevealedOffset getOffsetToReveal(RenderObject target, double alignment,
-      {Rect? rect}) {
+      {Rect? rect, Axis? axis,}) {
+    axis = this.axis;
     rect ??= target.paintBounds;
     if (target is! RenderBox)
       return RevealedOffset(offset: offset.pixels, rect: rect);

lib/widgets/double_tap_back_exit_app.dart

@@ -25,21 +25,19 @@ class _DoubleTapBackExitAppState extends State<DoubleTapBackExitApp> {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: _isExit,
+    return PopScope(
+      canPop: _lastTime == null || DateTime.now().difference(_lastTime!) > widget.duration,
+      onPopInvoked: (didPop) {
+        if (!didPop) {
+          Toast.cancelToast();
+          /// 不推荐使用 `dart:io` 的 exit(0)
+          SystemNavigator.pop();
+        } else {
+          _lastTime = DateTime.now();
+          Toast.show('再次点击退出应用');
+        }
+      },
       child: widget.child,
     );
   }
-
-  Future<bool> _isExit() async {
-    if (_lastTime == null || DateTime.now().difference(_lastTime!) > widget.duration) {
-      _lastTime = DateTime.now();
-      Toast.show('再次点击退出应用');
-      return Future.value(false);
-    }
-    Toast.cancelToast();
-    /// 不推荐使用 `dart:io` 的 exit(0)
-    await SystemNavigator.pop();
-    return Future.value(true);
-  }
 }