chore: code tune

abc873693 · Aug 20, 2024 · 6ee0deb · 6ee0deb
1 parent 38e9a7f
commit 6ee0deb
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/example/lib/pages/home_page.dart b/example/lib/pages/home_page.dart
@@ -232,7 +232,7 @@ class HomePageState extends State<HomePage> {
                 isLogin = false;
                 userInfo = null;
                 content = null;
-                if (!mounted) return;
+                if (!context.mounted) return;
                 if (!isTablet) Navigator.of(context).pop();
                 checkLogin();
               },
@@ -399,7 +399,7 @@ class HomePageState extends State<HomePage> {
       _homeKey.currentState!.hideSnackBar();
     } else {
       //ignore: use_build_context_synchronously
-      if (!context.mounted) return;
+      if (!mounted) return;
       _homeKey.currentState!
           .showSnackBar(
             text: ApLocalizations.of(context).notLogin,

diff --git a/lib/models/announcement_data.dart b/lib/models/announcement_data.dart
@@ -90,7 +90,7 @@ class Announcement {
   String? reviewDescription;
   @JsonKey(name: 'tag')
   List<String>? tags;
-  @JsonKey(ignore: true)
+  @JsonKey(includeToJson: false, includeFromJson: false)
   late int randomWeight;
 
   Map<String, dynamic> toJson() => _$AnnouncementToJson(this);

diff --git a/lib/models/user_info.dart b/lib/models/user_info.dart
@@ -54,7 +54,7 @@ class UserInfo {
   final String? pictureUrl;
   final String? email;
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeToJson: false, includeFromJson: false)
   Uint8List? pictureBytes;
 
   Map<String, dynamic> toJson() => _$UserInfoToJson(this);

diff --git a/lib/pages/about_us_page.dart b/lib/pages/about_us_page.dart
@@ -182,6 +182,7 @@ class AboutUsPageState extends State<AboutUsPage> {
                                     ApUtils.launchUrl(widget.fbFanPageUrl)
                                         .catchError(
                                       (dynamic onError) {
+                                        if (!context.mounted) return;
                                         ApUtils.showToast(
                                           context,
                                           app.platformError,
@@ -213,6 +214,7 @@ class AboutUsPageState extends State<AboutUsPage> {
                                     ApUtils.launchUrl(widget.githubUrl)
                                         .catchError(
                                       (dynamic onError) {
+                                        if (!context.mounted) return;
                                         ApUtils.showToast(
                                           context,
                                           app.platformError,
@@ -231,6 +233,7 @@ class AboutUsPageState extends State<AboutUsPage> {
                                   ApUtils.launchUrl('mailto:${widget.email}')
                                       .catchError(
                                     (dynamic onError) {
+                                      if (!context.mounted) return;
                                       ApUtils.showToast(
                                         context,
                                         app.platformError,

diff --git a/lib/pages/announcement/edit_page.dart b/lib/pages/announcement/edit_page.dart
@@ -674,7 +674,7 @@ class _AnnouncementEditPageState extends State<AnnouncementEditPage> {
                     reviewDescription: announcements.reviewDescription,
                     callback: GeneralCallback<Response<dynamic>>.simple(
                       context,
-                      (_) => _,
+                      (_) {},
                     ),
                   );
                 } else {
@@ -683,7 +683,7 @@ class _AnnouncementEditPageState extends State<AnnouncementEditPage> {
                     reviewDescription: announcements.reviewDescription,
                     callback: GeneralCallback<Response<dynamic>>.simple(
                       context,
-                      (_) => _,
+                      (_) => <dynamic>{},
                     ),
                   );
                 }
@@ -695,7 +695,7 @@ class _AnnouncementEditPageState extends State<AnnouncementEditPage> {
                   //ignore: use_build_context_synchronously
                   callback: GeneralCallback<Response<dynamic>>.simple(
                     context,
-                    (_) => _,
+                    (_) => <dynamic>{},
                   ),
                 );
               }

diff --git a/lib/resources/ap_theme.dart b/lib/resources/ap_theme.dart
@@ -315,7 +315,7 @@ class ApTheme extends InheritedWidget {
         visualDensity: VisualDensity.adaptivePlatformDensity,
         colorScheme: ColorScheme.fromSwatch(
           accentColor: ApColors.blue500,
-        ).copyWith(background: Colors.black12),
+        ).copyWith(surface: Colors.black12),
       );
 
   static ThemeData get dark => ThemeData(
@@ -342,7 +342,7 @@ class ApTheme extends InheritedWidget {
         colorScheme: ColorScheme.fromSwatch(
           brightness: Brightness.dark,
           accentColor: ApColors.blue300,
-        ).copyWith(background: Colors.black12),
+        ).copyWith(surface: Colors.black12),
       );
 }
 

diff --git a/lib/scaffold/score_scaffold.dart b/lib/scaffold/score_scaffold.dart
@@ -237,8 +237,8 @@ class _ScoreContentState extends State<ScoreContent> {
         border: Border.all(color: Colors.grey, width: 1.5),
       );
 
-  TableBorder get _tableBorder => TableBorder.symmetric(
-        inside: const BorderSide(
+  TableBorder get _tableBorder => const TableBorder.symmetric(
+        inside: BorderSide(
           color: Colors.grey,
           width: 0.5,
         ),

diff --git a/lib/utils/ap_utils.dart b/lib/utils/ap_utils.dart
@@ -100,10 +100,13 @@ class ApUtils {
       );
     } else {
       ApUtils.launchUrl(fansPageUrl).catchError(
-        (dynamic onError) => ApUtils.showToast(
-          context,
-          ApLocalizations.of(context).platformError,
-        ),
+        (dynamic onError) {
+          if (!context.mounted) return;
+          ApUtils.showToast(
+            context,
+            ApLocalizations.of(context).platformError,
+          );
+        },
       );
     }
   }