💄 Optimize the notification overlay styling

This commit is contained in:
2026-01-16 00:56:57 +08:00
parent bcd6753ed2
commit d1ee2e5160
2 changed files with 118 additions and 115 deletions

View File

@@ -8,12 +8,12 @@ import 'package:material_symbols_icons/material_symbols_icons.dart';
import 'package:styled_widget/styled_widget.dart'; import 'package:styled_widget/styled_widget.dart';
import 'package:url_launcher/url_launcher_string.dart'; import 'package:url_launcher/url_launcher_string.dart';
const double kNotificationBorderRadius = 8;
class NotificationItemWidget extends HookConsumerWidget { class NotificationItemWidget extends HookConsumerWidget {
final NotificationItem item; final NotificationItem item;
final VoidCallback onDismiss; final VoidCallback onDismiss;
final bool isDesktop; final bool isDesktop;
final int index;
final int totalNotifications;
final Animation<double> progress; final Animation<double> progress;
const NotificationItemWidget({ const NotificationItemWidget({
@@ -21,8 +21,6 @@ class NotificationItemWidget extends HookConsumerWidget {
required this.item, required this.item,
required this.onDismiss, required this.onDismiss,
required this.isDesktop, required this.isDesktop,
required this.index,
required this.totalNotifications,
required this.progress, required this.progress,
}); });
@@ -56,14 +54,18 @@ class NotificationItemWidget extends HookConsumerWidget {
} }
} }
: null, : null,
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: double.infinity),
child: Stack( child: Stack(
children: [ children: [
Card( Card(
elevation: (index == 0 && !isDesktop && totalNotifications > 1) ? 8 : 4, elevation: 4,
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
color: Theme.of(context).colorScheme.surfaceContainerHigh, color: Theme.of(context).colorScheme.surfaceContainerHigh,
shape: const RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(8)), borderRadius: const BorderRadius.all(
Radius.circular(kNotificationBorderRadius),
),
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@@ -124,7 +126,7 @@ class NotificationItemWidget extends HookConsumerWidget {
), ),
), ),
], ],
).clipRRect(all: 8), ),
), ),
Positioned( Positioned(
top: 4, top: 4,
@@ -141,6 +143,7 @@ class NotificationItemWidget extends HookConsumerWidget {
), ),
), ),
], ],
).clipRRect(all: kNotificationBorderRadius),
), ),
); );
} }

View File

@@ -38,18 +38,17 @@ class NotificationOverlay extends HookConsumerWidget {
child: Material( child: Material(
color: Colors.transparent, color: Colors.transparent,
child: Column( child: Column(
spacing: 8,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: notifications.asMap().entries.map((entry) { children: notifications.asMap().entries.map((entry) {
final index = entry.key;
final item = entry.value; final item = entry.value;
return AnimatedNotificationItem( return AnimatedNotificationItem(
key: Key(item.id), key: Key(item.id),
item: item, item: item,
isDesktop: true, isDesktop: true,
index: index, margin: EdgeInsets.symmetric(horizontal: 16),
totalNotifications: notifications.length,
onDismiss: () { onDismiss: () {
ref.read(notificationStateProvider.notifier).dismiss(item.id); ref.read(notificationStateProvider.notifier).dismiss(item.id);
}, },
@@ -60,10 +59,7 @@ class NotificationOverlay extends HookConsumerWidget {
); );
} else { } else {
// Non-desktop: use Stack with overlapping // Non-desktop: use Stack with overlapping
const double notificationHeight = 80.0;
const double overlap = 20.0; const double overlap = 20.0;
final stackHeight =
notificationHeight + (notifications.length - 1) * overlap;
return Positioned( return Positioned(
top: topOffset, top: topOffset,
@@ -72,7 +68,7 @@ class NotificationOverlay extends HookConsumerWidget {
child: Material( child: Material(
color: Colors.transparent, color: Colors.transparent,
child: SizedBox( child: SizedBox(
height: stackHeight, height: MediaQuery.sizeOf(context).height,
child: Stack( child: Stack(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
children: notifications.asMap().entries.map((entry) { children: notifications.asMap().entries.map((entry) {
@@ -82,18 +78,23 @@ class NotificationOverlay extends HookConsumerWidget {
top: index * overlap, top: index * overlap,
left: 16, left: 16,
right: 16, right: 16,
child: Container(
decoration: BoxDecoration(
boxShadow: [
BoxShadow(color: Colors.black54, blurRadius: 4.0 + index * 2.0),
],
),
child: AnimatedNotificationItem( child: AnimatedNotificationItem(
key: Key(item.id), key: Key(item.id),
item: item, item: item,
isDesktop: false, isDesktop: false,
index: index,
totalNotifications: notifications.length,
onDismiss: () { onDismiss: () {
ref ref
.read(notificationStateProvider.notifier) .read(notificationStateProvider.notifier)
.dismiss(item.id); .dismiss(item.id);
}, },
).clipRRect(all: 8), ),
),
); );
}).toList(), }).toList(),
), ),
@@ -108,16 +109,14 @@ class AnimatedNotificationItem extends HookConsumerWidget {
final NotificationItem item; final NotificationItem item;
final VoidCallback onDismiss; final VoidCallback onDismiss;
final bool isDesktop; final bool isDesktop;
final int index; final EdgeInsets? margin;
final int totalNotifications;
const AnimatedNotificationItem({ const AnimatedNotificationItem({
super.key, super.key,
required this.item, required this.item,
required this.onDismiss, required this.onDismiss,
required this.isDesktop, required this.isDesktop,
required this.index, this.margin,
required this.totalNotifications,
}); });
@override @override
@@ -163,15 +162,16 @@ class AnimatedNotificationItem extends HookConsumerWidget {
child: SizeTransition( child: SizeTransition(
sizeFactor: curvedAnimation, sizeFactor: curvedAnimation,
axis: Axis.vertical, axis: Axis.vertical,
child: Padding(
padding: margin ?? EdgeInsets.zero,
child: NotificationItemWidget( child: NotificationItemWidget(
item: item, item: item,
isDesktop: isDesktop, isDesktop: isDesktop,
index: index,
totalNotifications: totalNotifications,
onDismiss: onDismiss, onDismiss: onDismiss,
progress: progressAnimation, progress: progressAnimation,
), ),
), ),
),
); );
} }
} }