PasteFerry (隔空贴): clipboard and file sync across macOS, Windows and Linux. Direct-first, end-to-end encrypted. Optional official access: no server to host. Independent self-hosting remains available.
Dart airdrop-alternativeclipboardclipboard-sharingclipboard-synccopy-pastecross-platformend-to-end-encryptionfile-syncfile-transferfluttergolanglinuxmacosnat-traversalp2pself-hostedtailscaleuniversal-clipboardwebrtcwindows
fix(ui): show toasts above dialogs
baiyuze2e286d99a826
diff --git a/ui/lib/widgets/common.dart b/ui/lib/widgets/common.dartindex d235446..c71af80 100644--- a/ui/lib/widgets/common.dart+++ b/ui/lib/widgets/common.dart@@ -1,3 +1,5 @@+import 'dart:async';+import 'package:flutter/material.dart';import 'package:flutter/services.dart';@@ -596,29 +598,152 @@ String relativeTime(DateTime t, {DateTime? now}) {}/// 底部的提示条。给了 [actionLabel] 时右边多一个按钮,比如取消收藏后的「撤销」。-void showToast(BuildContext context, String message,- {bool error = false, String? actionLabel, VoidCallback? onAction}) {+///+/// 放在根 Overlay 的最上层,不用 ScaffoldMessenger 的 SnackBar:SnackBar 画在页面里,+/// 开着对话框时(比如在「反馈问题」里拷贝报告)会被对话框和它的遮罩盖住。+void showToast(+ BuildContext context,+ String message, {+ bool error = false,+ String? actionLabel,+ VoidCallback? onAction,+}) {+ final overlay = Overlay.maybeOf(context, rootOverlay: true);+ if (overlay == null) return;+ _toast?.remove();final p = context.palette;- ScaffoldMessenger.of(context)- ..hideCurrentSnackBar()- ..showSnackBar(SnackBar(- content: Row(- children: [- Icon(- error ? AppIcons.exclamationmarkCircle : AppIcons.checkmarkCircle,- size: 16,- color: error ? PaletteColors.onDark(p.danger) : PaletteColors.onDark(p.online),+ final hasAction = actionLabel != null && onAction != null;+ late final OverlayEntry entry;+ void dismiss() {+ if (_toast != entry) return;+ _toast = null;+ entry.remove();+ }++ entry = OverlayEntry(+ builder: (_) => _Toast(+ icon: Icon(+ error ? AppIcons.exclamationmarkCircle : AppIcons.checkmarkCircle,+ size: 16,+ color: error+ ? PaletteColors.onDark(p.danger)+ : PaletteColors.onDark(p.online),+ ),+ message: message,+ actionLabel: hasAction ? actionLabel : null,+ onAction: hasAction+ ? () {+ dismiss();+ onAction();+ }+ : null,+ duration: Duration(seconds: hasAction ? 5 : 3),+ onDone: dismiss,+ ),+ );+ _toast = entry;+ overlay.insert(entry);+}++OverlayEntry? _toast;++class _Toast extends StatefulWidget {+ const _Toast({+ required this.icon,+ required this.message,+ required this.actionLabel,+ required this.onAction,+ required this.duration,+ required this.onDone,+ });++ final Widget icon;+ final String message;+ final String? actionLabel;+ final VoidCallback? onAction;+ final Duration duration;+ final VoidCallback onDone;++ @override+ State<_Toast> createState() => _ToastState();+}++class _ToastState extends State<_Toast> with SingleTickerProviderStateMixin {+ late final _fade = AnimationController(+ vsync: this,+ duration: const Duration(milliseconds: 150),+ )..forward();+ Timer? _timer;++ @override+ void initState() {+ super.initState();+ _timer = Timer(widget.duration, () async {+ await _fade.reverse();+ widget.onDone();+ });+ }++ @override+ void dispose() {+ _timer?.cancel();+ _fade.dispose();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ final theme = Theme.of(context).snackBarTheme;+ final style =+ theme.contentTextStyle ??+ const TextStyle(fontSize: 13, color: Colors.white);+ return Positioned(+ left: 0,+ right: 0,+ bottom: 16,+ child: Center(+ child: FadeTransition(+ opacity: _fade,+ child: Material(+ color: theme.backgroundColor,+ elevation: theme.elevation ?? 6,+ shape: theme.shape,+ child: SizedBox(+ width: 360,+ child: Padding(+ padding: EdgeInsets.fromLTRB(+ 16,+ 14,+ widget.actionLabel == null ? 16 : 8,+ 14,+ ),+ child: DefaultTextStyle(+ style: style,+ child: Row(+ children: [+ widget.icon,+ const SizedBox(width: Insets.sm),+ Expanded(child: Text(widget.message)),+ if (widget.actionLabel != null)+ TextButton(+ onPressed: widget.onAction,+ style: TextButton.styleFrom(+ foregroundColor:+ theme.actionTextColor ??+ Theme.of(context).colorScheme.inversePrimary,+ ),+ child: Text(widget.actionLabel!),+ ),+ ],+ ),+ ),+ ),+ ),),- const SizedBox(width: Insets.sm),- Expanded(child: Text(message)),- ],+ ),),- action: actionLabel == null || onAction == null- ? null- : SnackBarAction(label: actionLabel, onPressed: onAction),- duration: Duration(seconds: actionLabel == null ? 3 : 5),- width: 360,- ));+ );+ }}/// 提示条是深色底,浅色模式下的深绿、深红在上面看不清,换成亮色版本。diff --git a/ui/test/feedback_dialog_test.dart b/ui/test/feedback_dialog_test.dartindex 84ac349..e87200d 100644--- a/ui/test/feedback_dialog_test.dart+++ b/ui/test/feedback_dialog_test.dart@@ -64,6 +64,13 @@ void main() {await tester.pumpAndSettle();expect(copied, contains('Background service 1.7.0'));expect(find.text('Report copied'), findsOneWidget);+ // 提示条在对话框上面,没有被对话框和它的遮罩盖住:在它上面点到的就是它自己+ final toast = tester.renderObject(find.text('Report copied'));+ final hit = tester.hitTestOnBinding(tester.getCenter(find.text('Report copied')));+ expect(hit.path.any((e) => e.target == toast), isTrue);+ await tester.pump(const Duration(seconds: 4));+ await tester.pumpAndSettle();+ expect(find.text('Report copied'), findsNothing);});testWidgets('打开详细日志后显示到几点,并重新生成报告;可以提前关掉', (tester) async {