widget、util、demo迁移完成

hiepns · pull · Apr 20, 2021 · Apr 22, 2021 · Apr 22, 2021 · Apr 23, 2021
commit 03be4e2e5273f96020bd725ed700a684aeaac2e9
diff --git a/README-EN.md b/README-EN.md
@@ -75,7 +75,7 @@ Web：https://simplezhli.github.io/flutter_deer/
 
 - I have added a relative path to the design drawings in the page notes. I can search or find the corresponding page. I hope it will help you.
 
-- This project uses the FlutterJsonBeanFactory plugin to generate beans. 
+- This project uses the [FlutterJsonBeanFactory](https://github.com/zhangruiyu/FlutterJsonBeanFactory) plugin to generate beans.
 
 ## Summary of experience
 

diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ Web体验地址：https://simplezhli.github.io/flutter_deer/
 
 - 因为页面有点多，一开始可能会导致页面无法与设计图对应上。我在代码注释中有添加设计图的相对路径，可以搜索或查找到对应页面，希望对你有帮助。
 
-- 本项目使用FlutterJsonBeanFactory插件来生成Bean。FlutterJsonBeanFactory插件使用可以查看[这篇文章](https://www.jianshu.com/p/14cbcbaa74b7)。
+- 本项目使用[FlutterJsonBeanFactory](https://github.com/zhangruiyu/FlutterJsonBeanFactory)插件来生成Bean。
 
 - Web受制于js等资源过大和部署在Github上，访问会慢一些。
 

diff --git a/docs/Web问题汇总.md b/docs/Web问题汇总.md
@@ -40,6 +40,12 @@
 
 目前处理方法是添加`RepaintBoundary`。
 
+## 按钮的大小在移动端与Web端不同
+
+可以`ThemeData`中全局指定`visualDensity`属性为`VisualDensity.standard`。
+
+详情见[Buttons not respecting default dimensions](https://github.com/flutter/flutter/issues/77142)
+
 ## 指定渲染引擎
 
 ```
@@ -51,5 +57,10 @@ flutter run -d chrome --release --web-renderer canvaskit
 > 总结：HTML渲染相较于CanvasKit渲染，UI还原度差一些，但综合性能相对较好。
 
 
+## 历史问题
+
+- 2.0.0已知问题(~~#79351~~)。
+
+
 
 
diff --git a/lib/account/account_router.dart b/lib/account/account_router.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:fluro/fluro.dart';
 import 'package:flutter_deer/routers/i_router.dart';
 
@@ -35,7 +34,7 @@ class AccountRouter implements IRouterProvider{
     router.define(accountRecordListPage, handler: Handler(handlerFunc: (_, __) => const AccountRecordListPage()));
     router.define(addWithdrawalAccountPage, handler: Handler(handlerFunc: (_, __) => const AddWithdrawalAccountPage()));
     router.define(bankSelectPage, handler: Handler(handlerFunc: (_, Map<String, List<String>> params) {
-      final int type = int.parse(params['type']?.first);
+      final int type = int.parse(params['type']?.first ?? '0');
       return BankSelectPage(type: type);
     }));
     router.define(citySelectPage, handler: Handler(handlerFunc: (_, __) => const CitySelectPage()));

diff --git a/lib/account/widgets/rise_number_text.dart b/lib/account/widgets/rise_number_text.dart
@@ -1,17 +1,16 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 
 // 简易实现数字滚动效果
 class RiseNumberText extends StatefulWidget {
 
   const RiseNumberText(this.number,{
-    Key key,
+    Key? key,
     this.style,
     this.duration = 1200
   }): super(key: key);
 
   final num number;
-  final TextStyle style;
+  final TextStyle? style;
   final int duration;
 
   @override
@@ -20,8 +19,8 @@ class RiseNumberText extends StatefulWidget {
 
 class _RiseNumberTextState extends State<RiseNumberText> with SingleTickerProviderStateMixin {
 
-  Animation<double> _animation;
-  AnimationController _controller;
+  late Animation<double> _animation;
+  late AnimationController _controller;
   num _fromNumber = 0;
 
   @override
@@ -46,7 +45,7 @@ class _RiseNumberTextState extends State<RiseNumberText> with SingleTickerProvid
 
   @override
   void dispose() {
-    _controller?.dispose();
+    _controller.dispose();
     super.dispose();
   }
 

diff --git a/lib/account/widgets/sms_verify_dialog.dart b/lib/account/widgets/sms_verify_dialog.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'dart:async';
 
 import 'package:flutter/material.dart';
@@ -17,7 +16,7 @@ import 'package:flutter_deer/widgets/my_button.dart';
 /// 骚操作：借腹生子
 class SMSVerifyDialog extends StatefulWidget {
 
-  const SMSVerifyDialog({Key key}) : super(key: key);
+  const SMSVerifyDialog({Key? key}) : super(key: key);
 
   @override
   _SMSVerifyDialogState createState() => _SMSVerifyDialogState();
@@ -28,8 +27,8 @@ class _SMSVerifyDialogState extends State<SMSVerifyDialog> {
   /// 倒计时秒数
   final int _second = 60;
   /// 当前秒数
-  int _currentSecond;
-  StreamSubscription _subscription;
+  late int _currentSecond;
+  StreamSubscription? _subscription;
   bool _clickable = true;
 
   final FocusNode _focusNode = FocusNode();
@@ -131,7 +130,7 @@ class _SMSVerifyDialogState extends State<SMSVerifyDialog> {
                     /// https://github.com/flutter/flutter/issues/47191
                     /// https://github.com/flutter/flutter/pull/57264 
                     /// 1.19.0已修复，小于此版本需添加addPostFrameCallback处理，否则会错误触发onChanged。
-                    SchedulerBinding.instance.addPostFrameCallback((_) {
+                    SchedulerBinding.instance!.addPostFrameCallback((_) {
                       _controller.clear();
                     });
                   }

diff --git a/lib/account/widgets/withdrawal_account_item.dart b/lib/account/widgets/withdrawal_account_item.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'dart:math';
 
 import 'package:flutter/material.dart';
@@ -11,9 +10,9 @@ import 'package:flutter_deer/widgets/load_image.dart';
 class WithdrawalAccountItem extends StatefulWidget {
 
   const WithdrawalAccountItem({
-    Key key,
-    @required this.data,
-    this.onLongPress,
+    Key? key,
+    required this.data,
+    required this.onLongPress,
   }): super(key: key);
 
   final WithdrawalAccountModel data;
@@ -26,8 +25,8 @@ class WithdrawalAccountItem extends StatefulWidget {
 /// 3D翻转动画 https://medium.com/flutterpub/flutter-flip-card-animation-with-3d-effect-4284af04f5a
 class _WithdrawalAccountItemState extends State<WithdrawalAccountItem> with SingleTickerProviderStateMixin {
 
-  AnimationController _animationController;
-  Animation<double> _animation;
+  late AnimationController _animationController;
+  late Animation<double> _animation;
   AnimationStatus _animationStatus = AnimationStatus.dismissed;
 
   @override
@@ -142,9 +141,9 @@ class _WithdrawalAccountItemState extends State<WithdrawalAccountItem> with Sing
 class AccountCard extends StatefulWidget {
 
   const AccountCard({
-    Key key,
-    @required this.child,
-    this.type
+    Key? key,
+    required this.child,
+    required this.type
   }): super(key: key);
 
   final Widget child;

diff --git a/lib/account/widgets/withdrawal_password_setting.dart b/lib/account/widgets/withdrawal_password_setting.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/res/resources.dart';
 import 'package:flutter_deer/routers/fluro_navigator.dart';
@@ -12,7 +11,7 @@ import 'package:vibration/vibration.dart';
 /// design/6店铺-账户/index.html#artboard13
 class WithdrawalPasswordSetting extends StatefulWidget {
 
-  const WithdrawalPasswordSetting({Key key}) : super(key: key);
+  const WithdrawalPasswordSetting({Key? key}) : super(key: key);
 
   @override
   _WithdrawalPasswordSettingState createState() => _WithdrawalPasswordSettingState();
@@ -125,7 +124,7 @@ class _WithdrawalPasswordSettingState extends State<WithdrawalPasswordSetting> {
           }
 
           /// 点击时给予振动反馈
-          if (!Device.isDesktop && await Vibration.hasVibrator()) {
+          if (!Device.isDesktop && (await Vibration.hasVibrator() ?? false)) {
             Vibration.vibrate(duration: 10);
           }
 

diff --git a/lib/demo/demo_page.dart b/lib/demo/demo_page.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/demo/focus/focus_demo_page.dart';
 import 'package:flutter_deer/demo/lottie/lottie_demo.dart';
@@ -14,7 +13,7 @@ import 'package:flutter_deer/widgets/my_app_bar.dart';
 
 class DemoPage extends StatefulWidget {
 
-  const DemoPage({Key key}) : super(key: key);
+  const DemoPage({Key? key}) : super(key: key);
 
   @override
   _DemoPageState createState() => _DemoPageState();

diff --git a/lib/demo/focus/focus_demo_page.dart b/lib/demo/focus/focus_demo_page.dart
@@ -1,12 +1,11 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/res/resources.dart';
 import 'package:flutter_deer/util/theme_utils.dart';
 
 
 /// 博客：https://weilu.blog.csdn.net/article/details/107132031
 class FocusDemoPage extends StatefulWidget {
-  const FocusDemoPage({Key key, this.title}) : super(key: key);
+  const FocusDemoPage({Key? key, required this.title}) : super(key: key);
 
   final String title;
 
@@ -47,7 +46,7 @@ class _FocusDemoPageState extends State<FocusDemoPage> {
 //              FocusScope.of(context).unfocus();
 //              _focusNode.unfocus();
 //              FocusManager.instance.primaryFocus.unfocus();
-              WidgetsBinding.instance.addPostFrameCallback((_) {
+              WidgetsBinding.instance!.addPostFrameCallback((_) {
                 debugDumpFocusTree();
               });
             },

diff --git a/lib/demo/navigator/books_app_state.dart b/lib/demo/navigator/books_app_state.dart
@@ -1,14 +1,13 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/demo/navigator/book_entity.dart';
 
 class BooksAppState extends ChangeNotifier {
 
   BooksAppState() : _selectedIndex = 0;
 
-  int _selectedIndex;
+  late int _selectedIndex;
 
-  Book _selectedBook;
+  Book? _selectedBook;
 
   final List<Book> books = <Book>[
     Book('Stranger in a Strange Land', 'Robert A. Heinlein'),
@@ -29,9 +28,9 @@ class BooksAppState extends ChangeNotifier {
     notifyListeners();
   }
 
-  Book get selectedBook => _selectedBook;
+  Book? get selectedBook => _selectedBook;
 
-  set selectedBook(Book book) {
+  set selectedBook(Book? book) {
     _selectedBook = book;
     notifyListeners();
   }
@@ -40,7 +39,7 @@ class BooksAppState extends ChangeNotifier {
     if (!books.contains(_selectedBook)) {
       return 0;
     }
-    return books.indexOf(_selectedBook);
+    return books.indexOf(_selectedBook!);
   }
 
   void setSelectedBookById(int id) {

diff --git a/lib/demo/navigator/books_main.dart b/lib/demo/navigator/books_main.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/demo/navigator/parser/route_information_parser.dart';
 import 'package:flutter_deer/demo/navigator/delegate/router_delegate.dart';
@@ -7,7 +6,7 @@ import 'package:flutter_deer/demo/navigator/delegate/router_delegate.dart';
 /// https://weilu.blog.csdn.net/article/details/108902282
 class NestedRouterDemo extends StatefulWidget {
 
-  const NestedRouterDemo({Key key}) : super(key: key);
+  const NestedRouterDemo({Key? key}) : super(key: key);
 
   @override
   _NestedRouterDemoState createState() => _NestedRouterDemoState();

diff --git a/lib/demo/navigator/delegate/inner_router_delegate.dart b/lib/demo/navigator/delegate/inner_router_delegate.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/demo/navigator/book_entity.dart';
 import 'package:flutter_deer/demo/navigator/books_app_state.dart';
@@ -39,7 +38,7 @@ class InnerRouterDelegate extends RouterDelegate<BookRoutePath>
           if (appState.selectedBook != null)
             MaterialPage<dynamic>(
               key: ValueKey(appState.selectedBook),
-              child: BookDetailsScreen(book: appState.selectedBook),
+              child: BookDetailsScreen(book: appState.selectedBook!),
             ),
         ] else
           const FadeAnimationPage(
@@ -70,7 +69,7 @@ class InnerRouterDelegate extends RouterDelegate<BookRoutePath>
 
 class FadeAnimationPage extends Page<void> {
 
-  const FadeAnimationPage({LocalKey key, this.child}) : super(key: key);
+  const FadeAnimationPage({LocalKey? key, required this.child}) : super(key: key);
 
   final Widget child;
 

diff --git a/lib/demo/navigator/delegate/router_delegate.dart b/lib/demo/navigator/delegate/router_delegate.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/demo/navigator/screen/app_shell.dart';
 import 'package:flutter_deer/demo/navigator/book_entity.dart';

diff --git a/lib/demo/navigator/parser/route_information_parser.dart b/lib/demo/navigator/parser/route_information_parser.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 
 import '../book_entity.dart';
@@ -7,22 +6,22 @@ class BookRouteInformationParser extends RouteInformationParser<BookRoutePath> {
   @override
   Future<BookRoutePath> parseRouteInformation(
       RouteInformation routeInformation) async {
-    final uri = Uri.parse(routeInformation.location);
+    final uri = Uri.parse(routeInformation.location!);
 
     if (uri.pathSegments.isNotEmpty && uri.pathSegments.first == 'settings') {
       return BooksSettingsPath();
     } else {
       if (uri.pathSegments.length >= 2) {
         if (uri.pathSegments[0] == 'book') {
-          return BooksDetailsPath(int.tryParse(uri.pathSegments[1]));
+          return BooksDetailsPath(int.tryParse(uri.pathSegments[1])!);
         }
       }
       return BooksListPath();
     }
   }
 
   @override
-  RouteInformation restoreRouteInformation(BookRoutePath configuration) {
+  RouteInformation? restoreRouteInformation(BookRoutePath configuration) {
     if (configuration is BooksListPath) {
       return const RouteInformation(location: '/home');
     }

diff --git a/lib/demo/navigator/screen/app_shell.dart b/lib/demo/navigator/screen/app_shell.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/demo/navigator/books_app_state.dart';
 import 'package:flutter_deer/demo/navigator/delegate/inner_router_delegate.dart';
@@ -7,8 +6,8 @@ import 'package:flutter_deer/demo/navigator/delegate/inner_router_delegate.dart'
 class AppShell extends StatefulWidget {
 
   const AppShell({
-    Key key,
-    @required this.appState,
+    Key? key,
+    required this.appState,
   }): super(key: key);
 
   final BooksAppState appState;
@@ -18,8 +17,8 @@ class AppShell extends StatefulWidget {
 }
 
 class _AppShellState extends State<AppShell> {
-  InnerRouterDelegate _routerDelegate;
-  ChildBackButtonDispatcher _backButtonDispatcher;
+  late InnerRouterDelegate _routerDelegate;
+  late ChildBackButtonDispatcher _backButtonDispatcher;
 
   @override
   void initState() {
@@ -38,7 +37,7 @@ class _AppShellState extends State<AppShell> {
     super.didChangeDependencies();
     // Defer back button dispatching to the child router
     _backButtonDispatcher = Router.of(context)
-        .backButtonDispatcher
+        .backButtonDispatcher!
         .createChildBackButtonDispatcher();
   }
 

diff --git a/lib/provider/base_list_provider.dart b/lib/provider/base_list_provider.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/widgets/state_layout.dart';
 

diff --git a/lib/provider/locale_provider.dart b/lib/provider/locale_provider.dart
@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'dart:ui';
 
 import 'package:sp_util/sp_util.dart';
@@ -8,8 +7,8 @@ import 'package:flutter_deer/common/common.dart';
 
 class LocaleProvider extends ChangeNotifier {
 
-  Locale get locale {
-    final String locale = SpUtil.getString(Constant.locale);
+  Locale? get locale {
+    final String locale = SpUtil.getString(Constant.locale) ?? '';
     switch(locale) {
       case 'zh':
         return const Locale('zh', 'CN');