The viewer's top/bottom bars still used the pre-rework FrostedGlassContainer verbatim: a floating inset pill with a Material colorScheme tint, an outline border and a drop shadow (violating the design system's no-shadow rule), and theme-derived icon colors that went near-invisible against the new dark panel in light mode. The video transport controls were a second, separate floating pill above the action bar instead of one continuous panel. - FrostedGlassContainer: drop the shadow/border/ColorScheme tint for a fixed dark translucent fill matching the approved design canvas: no shadow anywhere in this screen now. - file_viewer_screen.dart: top/bottom bars sit flush edge-to-edge (no floating-pill inset) with a gradient scrim behind each, and use fixed white (not theme-derived) text/icon color, since this chrome always sits over a black media stage regardless of app theme. - ViewerIconButton: same fix - fixed white by default instead of colors.fg1. - MediaActionBar: takes an optional transportControls slot so video's transport row renders inside the same panel as the action row, above a thin divider, instead of as a separate floating pill. - MediaVideoPreview: renders only the video surface now; reports its controller up via onController (only when active, so a neighboring PageView page can't steal the transport row) instead of owning a floating panel. VideoTransportControls is the extracted, chrome-less transport row content, rendered by the parent via MediaActionBar's new slot. Verified live on device: photo and video viewing, favorite/delete coloring, and the merged transport+action panel all match the approved canvas (https://claude.ai/artifact/3AGPqqMdkLSC2ypCh2CQs4). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
113 lines
4.2 KiB
Dart
113 lines
4.2 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:lucide_icons_flutter/lucide_icons.dart';
|
|
import '../../theme/design_tokens.dart';
|
|
import '../frosted_glass_container.dart';
|
|
import 'viewer_icon_button.dart';
|
|
|
|
/// The bottom panel overlaid on the media viewer: an optional transport row
|
|
/// ([transportControls], video only) above the action row
|
|
/// (share/favorite/open/download/delete/details) - one continuous flush,
|
|
/// full-width `FrostedGlassContainer` panel, not two separate floating
|
|
/// pills. Kept on that blurred chrome as a deliberate exception to the
|
|
/// design system's flat product UI (see `file_viewer_screen.dart`'s
|
|
/// build() comment for why), unlike the now-flat bottom nav bar
|
|
/// (`bottom_nav_bar.dart`) this screen sits above.
|
|
class MediaActionBar extends StatelessWidget {
|
|
final bool isFavorite;
|
|
final bool isBusy;
|
|
final bool showServerActions;
|
|
final Widget? transportControls;
|
|
final VoidCallback onShare;
|
|
final VoidCallback onFavorite;
|
|
final VoidCallback onDelete;
|
|
final VoidCallback onOpenExternally;
|
|
final VoidCallback onDownload;
|
|
final VoidCallback onDetails;
|
|
|
|
const MediaActionBar({
|
|
super.key,
|
|
required this.isFavorite,
|
|
required this.isBusy,
|
|
required this.showServerActions,
|
|
this.transportControls,
|
|
required this.onShare,
|
|
required this.onFavorite,
|
|
required this.onDelete,
|
|
required this.onOpenExternally,
|
|
required this.onDownload,
|
|
required this.onDetails,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
// This panel always sits on a black media stage regardless of the
|
|
// app's own light/dark theme (see FrostedGlassContainer's doc
|
|
// comment) - fixed dark-palette values, not `context.nooColors`, so
|
|
// favorite/delete stay legible even when the ambient theme is light.
|
|
const dark = NooColors.dark;
|
|
|
|
return SafeArea(
|
|
top: false,
|
|
child: FrostedGlassContainer(
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
if (transportControls != null) ...[
|
|
transportControls!,
|
|
Divider(height: 1, color: Colors.white.withValues(alpha: 0.14)),
|
|
],
|
|
Padding(
|
|
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 6),
|
|
child: Row(
|
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
|
children: [
|
|
ViewerIconButton(
|
|
icon: LucideIcons.share2,
|
|
tooltip: 'Share',
|
|
onTap: isBusy ? null : onShare,
|
|
),
|
|
if (showServerActions)
|
|
ViewerIconButton(
|
|
// Matches the star/star-off convention Files' own
|
|
// selection toolbar uses for favorite/unfavorite
|
|
// (see `files_view.dart`) rather than a filled heart.
|
|
icon: isFavorite ? LucideIcons.starOff : LucideIcons.star,
|
|
tooltip: isFavorite
|
|
? 'Remove from favorites'
|
|
: 'Favorite',
|
|
color: isFavorite ? dark.accentText : null,
|
|
onTap: onFavorite,
|
|
),
|
|
ViewerIconButton(
|
|
icon: LucideIcons.externalLink,
|
|
tooltip: 'Open externally',
|
|
onTap: isBusy ? null : onOpenExternally,
|
|
),
|
|
if (showServerActions)
|
|
ViewerIconButton(
|
|
icon: LucideIcons.download,
|
|
tooltip: 'Download',
|
|
onTap: isBusy ? null : onDownload,
|
|
),
|
|
if (showServerActions)
|
|
ViewerIconButton(
|
|
icon: LucideIcons.trash2,
|
|
tooltip: 'Delete',
|
|
color: dark.danger,
|
|
onTap: isBusy ? null : onDelete,
|
|
),
|
|
ViewerIconButton(
|
|
icon: LucideIcons.info,
|
|
tooltip: 'Details',
|
|
onTap: onDetails,
|
|
),
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|