🎨 Update code format according to analysis options.

openjmu · Feb 18, 2020 · 2db1bc1 · 2db1bc1
1 parent 052ec43
commit 2db1bc1
Show file tree

Hide file tree

Showing 51 changed files with 261 additions and 213 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -0,0 +1,14 @@
+# Defines a default set of lint rules enforced for
+# projects at Google. For details and rationale,
+# see https://github.com/dart-lang/pedantic#enabled-lints.
+include: package:pedantic/analysis_options.yaml
+
+# For lint rules and documentation, see http://dart-lang.github.io/linter/lints.
+# Uncomment to specify additional rules.
+# linter:
+#   rules:
+#     - camel_case_types
+
+analyzer:
+#   exclude:
+#     - path/to/excluded/files/**
diff --git a/lib/api/user_api.dart b/lib/api/user_api.dart
@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:extended_image/extended_image.dart';
@@ -16,12 +15,12 @@ class UserAPI {
 
   static List<Cookie> cookiesForJWGL;
 
-  static Future login(Map<String, dynamic> params) async {
-    return NetUtils.tokenDio.post(API.login, data: params);
+  static Future<Response<T>> login<T>(Map<String, dynamic> params) async {
+    return NetUtils.tokenDio.post<T>(API.login, data: params);
   }
 
-  static void logout(context) async {
-    final confirm = await ConfirmationBottomSheet.show(
+  static Future<void> logout(BuildContext context) async {
+    final bool confirm = await ConfirmationBottomSheet.show(
       context,
       title: '退出登录',
       showConfirm: true,
@@ -32,7 +31,7 @@ class UserAPI {
     }
   }
 
-  static UserTag createUserTag(tagData) => UserTag(
+  static UserTag createUserTag(Map<String, dynamic> tagData) => UserTag(
         id: tagData['id'],
         name: tagData['tagname'],
       );
@@ -74,13 +73,13 @@ class UserAPI {
     avatarLastModified = DateTime.now().millisecondsSinceEpoch;
   }
 
-  static Future getUserInfo({int uid}) async {
+  static Future<dynamic> getUserInfo<T>({int uid}) async {
     if (uid == null) {
       return currentUser;
     } else {
       return NetUtils.getWithCookieAndHeaderSet(
         API.userInfo,
-        data: {'uid': uid},
+        data: <String, dynamic>{'uid': uid},
       );
     }
   }
@@ -124,27 +123,22 @@ class UserAPI {
   static Future getNotifications() async => NetUtils.getWithCookieAndHeaderSet(API.postUnread);
 
   static Future follow(int uid) async {
-    NetUtils.postWithCookieAndHeaderSet('${API.userRequestFollow}$uid').then((response) {
-      return NetUtils.postWithCookieAndHeaderSet(
-        API.userFollowAdd,
-        data: {'fid': uid, 'tagid': 0},
-      );
-    }).catchError((e) {
-      debugPrint(e.toString());
-      showCenterErrorToast('关注失败，${jsonDecode(e.response.data)['msg']}');
-    });
+    try {
+      await NetUtils.postWithCookieAndHeaderSet('${API.userRequestFollow}$uid');
+      await NetUtils.postWithCookieAndHeaderSet(API.userFollowAdd, data: {'fid': uid, 'tagid': 0});
+    } catch (e) {
+      debugPrint('Failed when folloe: $e');
+    }
   }
 
   static Future unFollow(int uid, {bool fromBlacklist = false}) async {
-    NetUtils.deleteWithCookieAndHeaderSet('${API.userRequestFollow}$uid').then((response) {
-      return NetUtils.postWithCookieAndHeaderSet(
-        API.userFollowDel,
-        data: {'fid': uid},
-      );
-    }).catchError((e) {
+    try {
+      await NetUtils.deleteWithCookieAndHeaderSet('${API.userRequestFollow}$uid');
+      await NetUtils.postWithCookieAndHeaderSet(API.userFollowAdd, data: {'fid': uid});
+    } catch (e) {
       debugPrint('Failed when unfollow $uid: $e');
-      if (!fromBlacklist) showCenterErrorToast('取消关注失败，${e.response.data['msg']}');
-    });
+      if (!fromBlacklist) showCenterErrorToast('取消关注失败');
+    }
   }
 
   static Future setSignature(content) async {

diff --git a/lib/constants/constants.dart b/lib/constants/constants.dart
@@ -8,8 +8,10 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 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:oktoast/oktoast.dart' hide showToast;
+export 'package:pedantic/pedantic.dart';
 export 'package:url_launcher/url_launcher.dart';
 
 export 'package:openjmu/api/api.dart';

diff --git a/lib/constants/hive_boxes.dart b/lib/constants/hive_boxes.dart
@@ -49,7 +49,7 @@ class HiveBoxes {
     changelogBox = await Hive.openBox<ChangeLog>('openjmu_changelog');
   }
 
-  static void clearBoxes({context}) async {
+  static Future<void> clearBoxes({context}) async {
     bool confirm = true;
     if (context != null) {
       confirm = await ConfirmationBottomSheet.show(
@@ -72,7 +72,7 @@ class HiveBoxes {
       await settingsBox?.clear();
       await startWeekBox?.clear();
       debugPrint('Boxes cleared');
-      if (kReleaseMode) SystemNavigator.pop();
+      if (kReleaseMode) unawaited(SystemNavigator.pop());
     }
   }
 }

diff --git a/lib/controller/comment_controller.dart b/lib/controller/comment_controller.dart
@@ -317,7 +317,7 @@ class CommentListInPostState extends State<CommentListInPost> with AutomaticKeep
         Routes.OPENJMU_ADD_COMMENT,
         arguments: {
           'post': widget.post,
-          'comment': _comments?.elementAt(index) ?? null,
+          'comment': _comments?.elementAt(index),
         },
       );
     }

diff --git a/lib/model/special_text.dart b/lib/model/special_text.dart
@@ -110,7 +110,9 @@ class MentionText extends SpecialText {
   int getUidFromContent(content) {
     Iterable<Match> matches = mTagStartReg.allMatches(content);
     String result;
-    for (Match m in matches) result = m.group(0);
+    for (Match m in matches) {
+      result = m.group(0);
+    }
     return int.parse(result.substring(3, result.length - 1));
   }
 
@@ -286,8 +288,8 @@ class StackSpecialTextSpanBuilder extends SpecialTextSpanBuilder {
   final List<InlineSpan> suffixSpans;
 
   StackSpecialTextSpanBuilder({
-    this.builderType: BuilderType.extendedText,
-    this.widgetType: WidgetType.post,
+    this.builderType = BuilderType.extendedText,
+    this.widgetType = WidgetType.post,
     this.prefixSpans,
     this.suffixSpans,
   });
@@ -333,7 +335,7 @@ class StackSpecialTextSpanBuilder extends SpecialTextSpanBuilder {
           if (specialText != null) {
             if (textStack.length - specialText.startFlag.length >= 0) {
               textStack = textStack.substring(0, textStack.length - specialText.startFlag.length);
-              if (textStack.length > 0) {
+              if (textStack.isNotEmpty) {
                 inlineList.add(TextSpan(text: textStack, style: textStyle));
               }
             }
@@ -346,7 +348,7 @@ class StackSpecialTextSpanBuilder extends SpecialTextSpanBuilder {
           text: specialText.startFlag + specialText.getContent(),
           style: textStyle,
         ));
-      } else if (textStack.length > 0) {
+      } else if (textStack.isNotEmpty) {
         inlineList.add(TextSpan(text: textStack, style: textStyle));
       }
     } else {

diff --git a/lib/model/user.dart b/lib/model/user.dart
@@ -34,7 +34,7 @@ class User {
       nickname: json['nickname'] ?? json['username'] ?? json['name'] ?? json['uid'].toString(),
       gender: json['gender'] ?? 0,
       topics: json['topics'] ?? 0,
-      latestTid: json['latest_tid'] ?? null,
+      latestTid: json['latest_tid'],
       fans: json['fans'] ?? 0,
       idols: json['idols'] ?? 0,
       isFollowing: json['is_following'] == 1,

diff --git a/lib/pages/chat/chat_app_message_page.dart b/lib/pages/chat/chat_app_message_page.dart
@@ -223,7 +223,9 @@ class _ChatAppMessagePageState extends State<ChatAppMessagePage> {
       final content = jsonDecode(message.content);
       message.content = content['content'];
       if (mounted) setState(() {});
-    } catch (e) {}
+    } catch (e) {
+      return;
+    }
   }
 
   @override

diff --git a/lib/pages/chat/chat_person_page.dart b/lib/pages/chat/chat_person_page.dart
@@ -291,8 +291,8 @@ class _ChatPersonPageState extends State<ChatPersonPage> {
     } else {
       if (MediaQuery.of(context).viewInsets.bottom != 0.0) {
         SystemChannels.textInput.invokeMethod('TextInput.hide').whenComplete(
-          () async {
-            Future.delayed(const Duration(milliseconds: 300), () {}).whenComplete(change);
+          () {
+            Future.delayed(300.milliseconds, () {}).whenComplete(change);
           },
         );
       } else {

diff --git a/lib/pages/home/add_button_page.dart b/lib/pages/home/add_button_page.dart
@@ -17,10 +17,10 @@ class _AddingButtonPageState extends State<AddingButtonPage> with TickerProvider
   final List<String> itemTitles = ['广场', '集市'];
   final List<Color> itemColors = [Colors.orange, Colors.indigoAccent];
   final List<Function> itemOnTap = [
-    (context) async {
+    (context) {
       navigatorState.pushNamed(Routes.OPENJMU_PUBLISH_POST);
     },
-    (context) async {
+    (context) {
       navigatorState.pushNamed(Routes.OPENJMU_PUBLISH_TEAM_POST);
     },
   ];

diff --git a/lib/pages/home/app_center_page.dart b/lib/pages/home/app_center_page.dart
@@ -56,7 +56,9 @@ class AppCenterPage extends StatelessWidget {
           content: '是否使用浏览器打开该应用?',
           showConfirm: true,
         );
-        if (confirm) launch(webApp.replacedUrl, forceSafariVC: false);
+        if (confirm) {
+          unawaited(launch(webApp.replacedUrl, forceSafariVC: false));
+        }
       },
     );
   }

diff --git a/lib/pages/home/course_schedule_page.dart b/lib/pages/home/course_schedule_page.dart
@@ -80,12 +80,13 @@ class CourseSchedulePageState extends State<CourseSchedulePage> with AutomaticKe
   void scrollToWeek(int week) {
     currentWeek = week;
     if (mounted) setState(() {});
-    if (weekScrollController?.hasClients ?? false)
+    if (weekScrollController?.hasClients ?? false) {
       weekScrollController.animateTo(
         math.max(0, (week - 0.5) * suSetWidth(weekSize) - Screens.width / 2),
         duration: const Duration(milliseconds: 300),
         curve: Curves.ease,
       );
+    }
   }
 
   void showRemarkDetail(context) {

diff --git a/lib/pages/home/post_square_list_page.dart b/lib/pages/home/post_square_list_page.dart
@@ -114,7 +114,7 @@ class PostSquareListPageState extends State<PostSquareListPage>
             [PermissionGroup.camera],
           );
           if (permissions[PermissionGroup.camera] == PermissionStatus.granted) {
-            navigatorState.pushNamed(Routes.OPENJMU_SCAN_QRCODE);
+            unawaited(navigatorState.pushNamed(Routes.OPENJMU_SCAN_QRCODE));
           }
         },
       );

diff --git a/lib/pages/home/scan_qrcode_page.dart b/lib/pages/home/scan_qrcode_page.dart
@@ -17,15 +17,14 @@ class _ScanQrCodePageState extends State<ScanQrCodePage> {
   Future<void> onScan(context, String data) async {
     if (data == null) {
       showCenterErrorToast('没有识别到二维码~换一张试试');
-      return;
     }
     if (API.urlReg.stringMatch(data) != null) {
-      API.launchWeb(url: '$data');
+      unawaited(API.launchWeb(url: '$data'));
     } else if (API.schemeUserPage.stringMatch(data) != null) {
-      Navigator.of(context).pushReplacementNamed(
+      unawaited(Navigator.of(context).pushReplacementNamed(
         Routes.OPENJMU_USER,
         arguments: {'uid': int.parse(data.substring(API.schemeUserPage.pattern.length - 2))},
-      );
+      ));
     } else {
       final needCopy = await ConfirmationDialog.show(
         context,
@@ -35,7 +34,9 @@ class _ScanQrCodePageState extends State<ScanQrCodePage> {
         confirmLabel: '复制',
         cancelLabel: '返回',
       );
-      if (needCopy) Clipboard.setData(ClipboardData(text: '$data'));
+      if (needCopy) {
+        unawaited(Clipboard.setData(ClipboardData(text: '$data')));
+      }
       _key.currentState.startScan();
     }
   }

diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart
@@ -63,11 +63,11 @@ class LoginPageState extends State<LoginPage> with SingleTickerProviderStateMixi
   void usernameListener() {
     _username = _usernameController.text;
     if (this.mounted) {
-      if (_usernameController.text.length > 0 && !_usernameCanClear) {
+      if (_usernameController.text.isNotEmpty && !_usernameCanClear) {
         setState(() {
           _usernameCanClear = true;
         });
-      } else if (_usernameController.text.length == 0 && _usernameCanClear) {
+      } else if (_usernameController.text.isEmpty && _usernameCanClear) {
         setState(() {
           _usernameCanClear = false;
         });
@@ -476,11 +476,11 @@ class LoginPageState extends State<LoginPage> with SingleTickerProviderStateMixi
       showConfirm: true,
     );
     if (confirm) {
-      API.launchWeb(
+      unawaited(API.launchWeb(
         url: 'https://net.jmu.edu.cn/info/1309/2476.htm',
         title: '网页链接',
         withCookie: false,
-      );
+      ));
     }
   }
 

diff --git a/lib/pages/main_page.dart b/lib/pages/main_page.dart
@@ -83,7 +83,7 @@ class MainPageState extends State<MainPage> with AutomaticKeepAliveClientMixin {
     super.dispose();
   }
 
-  void initPushService() async {
+  void initPushService() {
     try {
       final data = <String, dynamic>{
         'token': DeviceUtils.devicePushToken,

diff --git a/lib/pages/notification/notification_entry_page.dart b/lib/pages/notification/notification_entry_page.dart
@@ -28,7 +28,7 @@ class _NotificationEntryPageState extends State<NotificationEntryPage>
         currentContext,
         listen: false,
       ).notifications,
-      'onTap': (context) async {
+      'onTap': (context) {
         navigatorState.pushNamed(Routes.OPENJMU_NOTIFICATIONS);
       },
     },
@@ -39,7 +39,7 @@ class _NotificationEntryPageState extends State<NotificationEntryPage>
         currentContext,
         listen: false,
       ).teamNotifications,
-      'onTap': (context) async {
+      'onTap': (context) {
         navigatorState.pushNamed(Routes.OPENJMU_TEAM_NOTIFICATIONS);
       },
     },

diff --git a/lib/pages/post/post_detail_page.dart b/lib/pages/post/post_detail_page.dart
@@ -190,7 +190,7 @@ class PostDetailPageState extends State<PostDetailPage> {
         onPressed: () => postExtraActions(context),
       );
 
-  void confirmDelete(context) async {
+  Future<void> confirmDelete(context) async {
     final confirm = await ConfirmationDialog.show(
       context,
       title: '删除动态',
@@ -205,14 +205,15 @@ class PostDetailPageState extends State<PostDetailPage> {
         text: '正在删除动态',
         isGlobal: false,
       );
-      PostAPI.deletePost(widget.post.id).then((response) {
+      try {
+        await PostAPI.deletePost(widget.post.id);
         _loadingDialogController.changeState('success', '动态删除成功');
         Instances.eventBus.fire(PostDeletedEvent(widget.post.id, widget.fromPage, widget.index));
-      }).catchError((e) {
+      } catch (e) {
         debugPrint(e.toString());
         debugPrint(e.response?.toString());
         _loadingDialogController.changeState('failed', '动态删除失败');
-      });
+      }
     }
   }
 
@@ -254,7 +255,7 @@ class PostDetailPageState extends State<PostDetailPage> {
       final provider = Provider.of<ReportRecordsProvider>(context, listen: false);
       final canReport = await provider.addRecord(widget.post.id);
       if (canReport) {
-        PostAPI.reportPost(widget.post);
+        unawaited(PostAPI.reportPost(widget.post));
         showToast('举报成功');
         navigatorState.pop();
       }