Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

refactor: better dialog helper (#792)

Prediditffafe6dee63c
diff --git a/lib/bean/dialog/dialog_helper.dart b/lib/bean/dialog/dialog_helper.dart
index 3be19ec0..dbb28ecc 100644
--- a/lib/bean/dialog/dialog_helper.dart
+++ b/lib/bean/dialog/dialog_helper.dart
@@ -6,31 +6,36 @@ import 'package:flutter/material.dart';
// Use the implementation should be careful, because shared route stack with the whole app, it may cause some unexpected behaviors.
// Don't use it in double PopScope widget.
class KazumiDialog {
- static final KazumiDialogObserver _observer =
- KazumiDialogObserver._internal();
-
- static KazumiDialogObserver get observer => _observer;
+ /// The global observer that tracks contexts across the application
+ static final KazumiDialogObserver observer = KazumiDialogObserver();
KazumiDialog._internal();
- static Future<void> show({
+ static Future<T?> show<T>({
BuildContext? context,
bool? clickMaskDismiss,
VoidCallback? onDismiss,
required WidgetBuilder builder,
}) async {
- context ??= _observer.currentContext;
- if (context != null) {
- await showDialog(
- context: context,
- barrierDismissible: clickMaskDismiss ?? true,
- builder: builder,
- routeSettings: const RouteSettings(name: 'KazumiDialog'),
- );
- onDismiss?.call();
+ final ctx = context ?? observer.currentContext;
+ if (ctx != null && ctx.mounted) {
+ try {
+ final result = await showDialog<T>(
+ context: ctx,
+ barrierDismissible: clickMaskDismiss ?? true,
+ builder: builder,
+ routeSettings: const RouteSettings(name: 'KazumiDialog'),
+ );
+ onDismiss?.call();
+ return result;
+ } catch (e) {
+ debugPrint('Kazumi Dialog Error: Failed to show dialog: $e');
+ return null;
+ }
} else {
debugPrint(
'Kazumi Dialog Error: No context available to show the dialog');
+ return null;
}
}
@@ -40,22 +45,26 @@ class KazumiDialog {
bool showUndoButton = false,
Duration duration = const Duration(seconds: 2),
}) {
- final scaffoldContext = context ?? _observer.currentContext;
- if (scaffoldContext != null) {
- ScaffoldMessenger.of(scaffoldContext)
- ..removeCurrentSnackBar()
- ..showSnackBar(
- SnackBar(
- content: Text(message),
- duration: duration,
- action: showUndoButton
- ? SnackBarAction(
- label: 'Dismiss',
- onPressed: () {},
- )
- : null,
- ),
- );
+ final ctx = context ?? observer.scaffoldContext;
+ if (ctx != null && ctx.mounted) {
+ try {
+ ScaffoldMessenger.of(ctx)
+ ..removeCurrentSnackBar()
+ ..showSnackBar(
+ SnackBar(
+ content: Text(message),
+ duration: duration,
+ action: showUndoButton
+ ? SnackBarAction(
+ label: 'Dismiss',
+ onPressed: () {},
+ )
+ : null,
+ ),
+ );
+ } catch (e) {
+ debugPrint('Kazumi Dialog Error: Failed to show toast: $e');
+ }
} else {
debugPrint(
'Kazumi Dialog Error: No Scaffold context available to show Toast');
@@ -66,36 +75,40 @@ class KazumiDialog {
BuildContext? context,
String? msg,
}) async {
- context ??= _observer.currentContext;
- if (context != null) {
- await showDialog(
- context: context,
- barrierDismissible: false,
- builder: (BuildContext context) {
- return Center(
- child: Card(
- elevation: 8.0,
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(12)),
- child: Padding(
- padding: const EdgeInsets.all(24.0),
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- const CircularProgressIndicator(),
- const SizedBox(height: 16),
- Text(
- msg ?? 'Loading...',
- style: const TextStyle(fontSize: 16),
- ),
- ],
+ final ctx = context ?? observer.currentContext;
+ if (ctx != null && ctx.mounted) {
+ try {
+ await showDialog(
+ context: ctx,
+ barrierDismissible: false,
+ builder: (BuildContext context) {
+ return Center(
+ child: Card(
+ elevation: 8.0,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(12)),
+ child: Padding(
+ padding: const EdgeInsets.all(24.0),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const CircularProgressIndicator(),
+ const SizedBox(height: 16),
+ Text(
+ msg ?? 'Loading...',
+ style: const TextStyle(fontSize: 16),
+ ),
+ ],
+ ),
),
),
- ),
- );
- },
- routeSettings: const RouteSettings(name: 'KazumiDialog'),
- );
+ );
+ },
+ routeSettings: const RouteSettings(name: 'KazumiDialog'),
+ );
+ } catch (e) {
+ debugPrint('Kazumi Dialog Error: Failed to show loading dialog: $e');
+ }
} else {
debugPrint(
'Kazumi Dialog Error: No context available to show the loading dialog');
@@ -103,27 +116,35 @@ class KazumiDialog {
}
static void dismiss() {
- if (_observer.hasKazumiDialog) {
- Navigator.of(_observer.kazumiDialogContext!).pop();
+ if (observer.hasKazumiDialog && observer.kazumiDialogContext != null) {
+ try {
+ Navigator.of(observer.kazumiDialogContext!).pop();
+ } catch (e) {
+ debugPrint('Kazumi Dialog Error: Failed to dismiss dialog: $e');
+ }
} else {
- debugPrint('Kazumi Dialog Error: No KazumiDialog to dismiss');
+ debugPrint('Kazumi Dialog Debug: No active KazumiDialog to dismiss');
}
}
}
+/// Navigator observer to track contexts and dialog routes
class KazumiDialogObserver extends NavigatorObserver {
- static final KazumiDialogObserver observer = KazumiDialogObserver._internal();
+ /// List of active dialog routes
+ final List<Route<dynamic>> _kazumiDialogRoutes = [];
- factory KazumiDialogObserver() {
- return observer;
- }
+ /// The most recent context from any MaterialPageRoute or PopupRoute
+ BuildContext? _currentContext;
- KazumiDialogObserver._internal();
+ /// The most recent context from any route containing a Scaffold
+ BuildContext? _scaffoldContext;
- final List<Route<dynamic>> _kazumiDialogRoutes = [];
- BuildContext? currentContext;
+ BuildContext? get currentContext => _currentContext;
+
+ BuildContext? get scaffoldContext => _scaffoldContext ?? _currentContext;
bool get hasKazumiDialog => _kazumiDialogRoutes.isNotEmpty;
+
BuildContext? get kazumiDialogContext => _kazumiDialogRoutes.isNotEmpty
? _kazumiDialogRoutes.last.navigator?.context
: null;
@@ -138,9 +159,9 @@ class KazumiDialogObserver extends NavigatorObserver {
// _removeCurrentSnackBar(previousRoute);
if (_isKazumiDialogRoute(route)) {
_kazumiDialogRoutes.add(route);
- currentContext = route.navigator?.context;
- } else if (route is MaterialPageRoute || route is PopupRoute) {
- currentContext = route.navigator?.context;
+ }
+ if (route.navigator?.context != null) {
+ _updateContexts(route.navigator!.context, route);
}
}
@@ -151,23 +172,59 @@ class KazumiDialogObserver extends NavigatorObserver {
if (_isKazumiDialogRoute(route)) {
_kazumiDialogRoutes.remove(route);
}
- if (_kazumiDialogRoutes.isNotEmpty) {
- currentContext = _kazumiDialogRoutes.last.navigator?.context;
- } else if (previousRoute is MaterialPageRoute ||
- previousRoute is PopupRoute) {
- currentContext = previousRoute?.navigator?.context;
- } else {
- currentContext = null;
+ if (previousRoute?.navigator?.context != null) {
+ _updateContexts(previousRoute!.navigator!.context, previousRoute);
}
}
+ @override
+ void didReplace({Route<dynamic>? newRoute, Route<dynamic>? oldRoute}) {
+ super.didReplace(newRoute: newRoute, oldRoute: oldRoute);
+ if (_isKazumiDialogRoute(oldRoute!)) {
+ _kazumiDialogRoutes.remove(oldRoute);
+ }
+ if (_isKazumiDialogRoute(newRoute!)) {
+ _kazumiDialogRoutes.add(newRoute);
+ }
+ if (newRoute.navigator?.context != null) {
+ _updateContexts(newRoute.navigator!.context, newRoute);
+ }
+ }
+
+ @override
+ void didRemove(Route<dynamic> route, Route<dynamic>? previousRoute) {
+ super.didRemove(route, previousRoute);
+
+ if (_isKazumiDialogRoute(route)) {
+ _kazumiDialogRoutes.remove(route);
+ }
+
+ if (previousRoute?.navigator?.context != null) {
+ _updateContexts(previousRoute!.navigator!.context, previousRoute);
+ }
+ }
+
+ void _updateContexts(BuildContext context, Route<dynamic> route) {
+ _currentContext = context;
+ if (_hasScaffold(context)) {
+ _scaffoldContext = context;
+ }
+ }
+
+ bool _hasScaffold(BuildContext context) {
+ return Scaffold.maybeOf(context) != null;
+ }
+
bool _isKazumiDialogRoute(Route<dynamic> route) {
return route.settings.name == 'KazumiDialog';
}
void _removeCurrentSnackBar(Route<dynamic>? route) {
if (route?.navigator?.context != null) {
- ScaffoldMessenger.of(route!.navigator!.context).removeCurrentSnackBar();
+ try {
+ ScaffoldMessenger.maybeOf(route!.navigator!.context)
+ ?.removeCurrentSnackBar();
+ } catch (_) {}
}
}
}