ui: improve error readablity

simon-ding · Nov 5, 2024 · f1c4e30 · f1c4e30
1 parent 949b6e5
commit f1c4e30
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 26 deletions.
diff --git a/ui/lib/activity.dart b/ui/lib/activity.dart
@@ -148,7 +148,7 @@ class _ActivityPageState extends ConsumerState<ActivityPage>
                   },
                 ));
               },
-              error: (err, trace) => Text("$err"),
+              error: (err, trace) => PoError(msg: "网络错误", err: err),
               loading: () => const MyProgressIndicator());
         })
       ],

diff --git a/ui/lib/settings/auth.dart b/ui/lib/settings/auth.dart
@@ -94,7 +94,7 @@ class _AuthState extends ConsumerState<AuthSettings> {
                 ],
               ));
         },
-        error: (err, trace) => Text("$err"),
+        error: (err, trace) => PoError(msg: "网络错误", err: err),
         loading: () => const MyProgressIndicator());
   }
 }
diff --git a/ui/lib/settings/downloader.dart b/ui/lib/settings/downloader.dart
@@ -35,7 +35,7 @@ class _DownloaderState extends ConsumerState<DownloaderSettings> {
                   onTap: () => showDownloadClientDetails(DownloadClient()),
                   child: const Icon(Icons.add));
             })),
-        error: (err, trace) => Text("$err"),
+        error: (err, trace) => PoError(msg: "网络错误", err: err),
         loading: () => const MyProgressIndicator());
   }
 

diff --git a/ui/lib/settings/general.dart b/ui/lib/settings/general.dart
@@ -170,7 +170,7 @@ class _GeneralState extends ConsumerState<GeneralSettings> {
             ),
           );
         },
-        error: (err, trace) => Text("$err"),
+        error: (err, trace) => PoError(msg: "网络错误", err: err),
         loading: () => const MyProgressIndicator());
   }
 }
diff --git a/ui/lib/settings/importlist.dart b/ui/lib/settings/importlist.dart
@@ -35,7 +35,7 @@ class _ImportlistState extends ConsumerState<Importlist> {
                     child: const Icon(Icons.add));
               }),
             ),
-        error: (err, trace) => Text("$err"),
+        error: (err, trace) => PoError(msg: "网络错误", err: err),
         loading: () => const MyProgressIndicator());
   }
 

diff --git a/ui/lib/settings/indexer.dart b/ui/lib/settings/indexer.dart
@@ -33,7 +33,7 @@ class _IndexerState extends ConsumerState<IndexerSettings> {
                     child: const Icon(Icons.add));
               }),
             ),
-        error: (err, trace) => Text("$err"),
+        error: (err, trace) => PoError(msg: "网络错误", err: err),
         loading: () => const MyProgressIndicator());
   }
 

diff --git a/ui/lib/settings/notifier.dart b/ui/lib/settings/notifier.dart
@@ -48,7 +48,7 @@ class _NotifierState extends ConsumerState<NotifierSettings> {
                     child: const Icon(Icons.add));
               }),
             ),
-        error: (err, trace) => Text("$err"),
+        error: (err, trace) => PoError(msg: "网络错误", err: err),
         loading: () => const MyProgressIndicator());
   }
 

diff --git a/ui/lib/settings/prowlarr.dart b/ui/lib/settings/prowlarr.dart
@@ -79,7 +79,7 @@ class ProwlarrSettingState extends ConsumerState<ProwlarrSettingPage> {
                 ],
               ),
             ),
-        error: (err, trace) => Text("$err"),
+        error: (err, trace) => PoError(msg: "网络错误", err: err),
         loading: () => const MyProgressIndicator());
   }
 }
diff --git a/ui/lib/settings/storage.dart b/ui/lib/settings/storage.dart
@@ -35,7 +35,7 @@ class _StorageState extends ConsumerState<StorageSettings> {
                     child: const Icon(Icons.add));
               }),
             ),
-        error: (err, trace) => Text("$err"),
+        error: (err, trace) => PoError(msg: "网络错误", err: err),
         loading: () => const MyProgressIndicator());
   }
 

diff --git a/ui/lib/system_page.dart b/ui/lib/system_page.dart
@@ -56,7 +56,7 @@ class _SystemPageState extends ConsumerState<SystemPage> {
                           ]);
                         }));
                   },
-                  error: (err, trace) => Text("$err"),
+                  error: (err, trace) => PoError(msg: "网络错误", err: err),
                   loading: () => const MyProgressIndicator())
             ],
           ),
@@ -111,7 +111,7 @@ class _SystemPageState extends ConsumerState<SystemPage> {
                       ]),
                     ]);
                   },
-                  error: (err, trace) => Text("$err"),
+                  error: (err, trace) => PoError(msg: "网络错误", err: err),
                   loading: () => const MyProgressIndicator())
             ],
           ),
@@ -185,7 +185,7 @@ class _SystemPageState extends ConsumerState<SystemPage> {
                       ],
                     );
                   },
-                  error: (err, trace) => Text("$err"),
+                  error: (err, trace) => PoError(msg: "网络错误", err: err),
                   loading: () => const MyProgressIndicator())
             ],
           )

diff --git a/ui/lib/tv_details.dart b/ui/lib/tv_details.dart
@@ -183,9 +183,7 @@ class _TvDetailsPageState extends ConsumerState<TvDetailsPage> {
                 ],
               );
             },
-            error: (err, trace) {
-              return Text("$err");
-            },
+            error: (err, trace) => PoError(msg: "网络错误", err: err),
             loading: () => const MyProgressIndicator()));
   }
 

diff --git a/ui/lib/welcome_page.dart b/ui/lib/welcome_page.dart
@@ -43,17 +43,17 @@ class WelcomePageState extends ConsumerState<WelcomePage> {
         //alignment: Alignment.bottomRight,
         children: [
           () {
-            return switch (data) {
-              AsyncData(:final value) => SingleChildScrollView(
-                  child: Wrap(
-                    alignment: WrapAlignment.start,
-                    spacing: isSmallScreen(context) ? 0 : 10,
-                    runSpacing: isSmallScreen(context) ? 10 : 20,
-                    children: getMediaAll(value),
-                  ),
-                ),
-              _ => const MyProgressIndicator(),
-            };
+            return data.when(
+                data: (value) => SingleChildScrollView(
+                      child: Wrap(
+                        alignment: WrapAlignment.start,
+                        spacing: isSmallScreen(context) ? 0 : 10,
+                        runSpacing: isSmallScreen(context) ? 10 : 20,
+                        children: getMediaAll(value),
+                      ),
+                    ),
+                error: (err, trace) => PoError(msg: "网络错误", err: err),
+                loading: () => const MyProgressIndicator());
           }(),
           getMoreButtonAndActions(uri)
         ],

diff --git a/ui/lib/widgets/widgets.dart b/ui/lib/widgets/widgets.dart
@@ -281,3 +281,23 @@ class _LoadingTextButtonState extends State<LoadingTextButton> {
     );
   }
 }
+
+class PoError extends StatelessWidget {
+  const PoError({super.key, required this.msg, required this.err});
+  final String msg;
+  final dynamic err;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Text("$msg ", style: TextStyle(color:Theme.of(context).colorScheme.error),),
+        Tooltip(
+          message: "$err",
+          child: Icon(Icons.info,color: Theme.of(context).colorScheme.error,),
+        )
+      ],
+    );
+  }
+}
-Original file line number
+Diff line change
@@ Expand Up @@
                       },
                     ));
                   },
-                  error: (err, trace) => Text("$err"),
+                  error: (err, trace) => PoError(msg: "网络错误", err: err),
                   loading: () => const MyProgressIndicator());
             })
           ],
@@ Expand Down @@