🎨 Update codes according to analyzer.

openjmu · Feb 19, 2020 · b7b2ca4 · b7b2ca4
1 parent 77e2c58
commit b7b2ca4
Show file tree

Hide file tree

Showing 22 changed files with 525 additions and 444 deletions.
diff --git a/lib/api/user_api.dart b/lib/api/user_api.dart
@@ -77,7 +77,7 @@ class UserAPI {
     if (uid == null) {
       return currentUser;
     } else {
-      return NetUtils.getWithCookieAndHeaderSet(
+      return NetUtils.getWithCookieAndHeaderSet<void>(
         API.userInfo,
         data: <String, dynamic>{'uid': uid},
       );

diff --git a/lib/constants/constants.dart b/lib/constants/constants.dart
@@ -10,6 +10,7 @@ import 'package:openjmu/constants/constants.dart';
 export 'package:dartx/dartx.dart';
 export 'package:dio/dio.dart' show Response;
 export 'package:ff_annotation_route/ff_annotation_route.dart' show FFRoute, PageRouteType;
+export 'package:hive/hive.dart' show Box;
 export 'package:oktoast/oktoast.dart' hide showToast;
 export 'package:pedantic/pedantic.dart';
 export 'package:url_launcher/url_launcher.dart';

diff --git a/lib/openjmu_route_helper.dart b/lib/openjmu_route_helper.dart
diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart
@@ -443,28 +443,33 @@ class LoginPageState extends State<LoginPage> with SingleTickerProviderStateMixi
       );
 
   void loginButtonPressed(context) {
-    if (_formKey.currentState.validate()) {
-      _formKey.currentState.save();
-      setState(() {
-        _login = true;
-      });
-      DataUtils.login(_username, _password).then((result) {
-        if (result) {
-          navigatorState.pushNamedAndRemoveUntil(
-            Routes.OPENJMU_HOME,
-            (_) => false,
-            arguments: {'initAction': null},
-          );
-        } else {
+    try {
+      if (_formKey.currentState.validate()) {
+        _formKey.currentState.save();
+        setState(() {
+          _login = true;
+        });
+        DataUtils.login(_username, _password).then((result) {
+          if (result) {
+            navigatorState.pushNamedAndRemoveUntil(
+              Routes.OPENJMU_HOME,
+              (_) => false,
+              arguments: {'initAction': null},
+            );
+          } else {
+            _login = false;
+            if (mounted) setState(() {});
+          }
+        }).catchError((e) {
+          debugPrint('Failed when login: $e');
+          showCenterErrorToast('登录失败');
           _login = false;
           if (mounted) setState(() {});
-        }
-      }).catchError((e) {
-        debugPrint('Failed when login: $e');
-        showToast('登录失败');
-        _login = false;
-        if (mounted) setState(() {});
-      });
+        });
+      }
+    } catch (e) {
+      debugPrint('Failed when login: $e');
+      showCenterErrorToast('登录失败');
     }
   }
 

diff --git a/lib/pages/user/user_page.dart b/lib/pages/user/user_page.dart
@@ -469,7 +469,10 @@ class _UserPageState extends State<UserPage>
                 'pics': [
                   ImageBean(
                     id: widget.uid,
-                    imageUrl: '${API.userAvatar}?uid=${widget.uid}&size=f640',
+                    imageUrl: '${API.userAvatar}?'
+                        'uid=${widget.uid}'
+                        '&size=f640'
+                        '&_t=${UserAPI.avatarLastModified}',
                   ),
                 ],
                 'heroPrefix': 'user-page-avatar-',

diff --git a/lib/providers/settings_provider.dart b/lib/providers/settings_provider.dart
@@ -10,7 +10,7 @@ import 'package:openjmu/constants/constants.dart';
 
 class SettingsProvider extends ChangeNotifier {
   /// For test page.
-  /// TODO: Set this to false before release.
+  /// Set this to [false] before release.
   bool _debug = !kReleaseMode && false;
   bool get debug => _debug;
   set debug(bool value) {
@@ -26,10 +26,10 @@ class SettingsProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  List<int> _homeStartUpIndex = [0, 0, 0];
+  List<int> _homeStartUpIndex = <int>[0, 0, 0];
   List<int> get homeStartUpIndex => _homeStartUpIndex;
   set homeStartUpIndex(List<int> value) {
-    _homeStartUpIndex = List.from(value);
+    _homeStartUpIndex = List<int>.from(value);
     notifyListeners();
   }
 
@@ -72,12 +72,14 @@ class SettingsProvider extends ChangeNotifier {
   bool get launchFromSystemBrowser => _launchFromSystemBrowser;
   set launchFromSystemBrowser(bool value) {
     assert(value != null);
-    if (_launchFromSystemBrowser == value) return;
+    if (_launchFromSystemBrowser == value) {
+      return;
+    }
     _launchFromSystemBrowser = value;
     notifyListeners();
   }
 
-  final fontScaleRange = <double>[0.6, 1.4];
+  final List<double> fontScaleRange = <double>[0.6, 1.4];
   double _fontScale = 1.0;
   double get fontScale => _fontScale;
   set fontScale(double value) {
@@ -99,7 +101,7 @@ class SettingsProvider extends ChangeNotifier {
   void reset() {
     _fontScale = 1.0;
     _homeSplashIndex = 0;
-    _homeStartUpIndex = [0, 0, 0];
+    _homeStartUpIndex = <int>[0, 0, 0];
     _newAppCenterIcon = false;
     _hideShieldPost = true;
     _launchFromSystemBrowser = false;