api/Passport/Developer Notify One User.bru

@@ -1,26 +0,0 @@
-meta {
-  name: Developer Notify One User
-  type: http
-  seq: 2
-}
-
-post {
-  url: {{endpoint}}/cgi/id/dev/notify/1
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "client_id": "{{third_client_id}}",
-    "client_secret":"{{third_client_tk}}",
-    "type": "general",
-    "subject": "测试",
-    "subtitle": "Alphabot です",
-    "content": "全新通知动画",
-    "metadata": {
-      "image": "D2EDbcrsTugs3xk5"
-    },
-    "priority": 10
-  }
-}

lib/providers/notification.dart

@@ -71,29 +71,22 @@ class NotificationProvider extends ChangeNotifier {
     );
   }
 
-  int showingCount = 0;
   List<SnNotification> notifications = List.empty(growable: true);
 
   void listen() {
     _ws.stream.stream.listen((event) {
       if (event.method == 'notifications.new') {
         final notification = SnNotification.fromJson(event.payload!);
-        if (showingCount < 0) showingCount = 0;
-        showingCount++;
         notifications.add(notification);
-        Future.delayed(const Duration(seconds: 3), () {
-          if (showingCount >= 0) showingCount--;
-          notifyListeners();
-        });
         notifyListeners();
         final doHaptic = _cfg.prefs.getBool(kAppNotifyWithHaptic) ?? true;
-        if (doHaptic) HapticFeedback.mediumImpact();
+        if (doHaptic) HapticFeedback.lightImpact();
       }
     });
   }
 
   void clear() {
-    showingCount = 0;
+    notifications.clear();
     notifyListeners();
   }
 }

lib/screens/account.dart

@@ -28,19 +28,7 @@ class AccountScreen extends StatelessWidget {
     return AppScaffold(
       appBar: AppBar(
         leading: AutoAppBarLeading(),
-        title: Text(
+        title: Text("screenAccount").tr(),
-          "screenAccount",
-          style: TextStyle(
-            color: Colors.white,
-            shadows: [
-              Shadow(
-                offset: Offset(1, 1),
-                blurRadius: 5.0,
-                color: Color.fromARGB(255, 0, 0, 0),
-              ),
-            ],
-          ),
-        ).tr(),
         flexibleSpace: ua.user != null && ua.user!.banner.isNotEmpty
             ? Stack(
                 fit: StackFit.expand,

lib/screens/home.dart

@@ -288,7 +288,6 @@ class _HomeDashTodayNewsState extends State<_HomeDashTodayNews> {
               child: InkWell(
                 borderRadius: BorderRadius.all(Radius.circular(8)),
                 child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
                   spacing: 4,
                   children: [
                     Text(

lib/screens/notification.dart

@@ -21,16 +21,6 @@ import 'package:very_good_infinite_list/very_good_infinite_list.dart';
 import '../providers/userinfo.dart';
 import '../widgets/unauthorized_hint.dart';
 
-const Map<String, IconData> kNotificationTopicIcons = {
-  'general': Symbols.notifications,
-  'passport.security.alert': Symbols.gpp_maybe,
-  'passport.security.otp': Symbols.password,
-  'interactive.subscription': Symbols.subscriptions,
-  'interactive.feedback': Symbols.add_reaction,
-  'messaging.callStart': Symbols.call_received,
-  'wallet.transaction.new': Symbols.receipt,
-};
-
 class NotificationScreen extends StatefulWidget {
   const NotificationScreen({super.key});
 
@@ -46,6 +36,15 @@ class _NotificationScreenState extends State<NotificationScreen> {
   final List<SnNotification> _notifications = List.empty(growable: true);
   int? _totalCount;
 
+  static const Map<String, IconData> kNotificationTopicIcons = {
+    'passport.security.alert': Symbols.gpp_maybe,
+    'passport.security.otp': Symbols.password,
+    'interactive.subscription': Symbols.subscriptions,
+    'interactive.feedback': Symbols.add_reaction,
+    'messaging.callStart': Symbols.call_received,
+    'wallet.transaction.new': Symbols.receipt,
+  };
+
   Future<void> _fetchNotifications() async {
     final ua = context.read<UserProvider>();
     if (!ua.isAuthorized) return;

lib/widgets/connection_indicator.dart

@@ -4,7 +4,6 @@ import 'package:gap/gap.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:surface/providers/config.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/providers/websocket.dart';
 
@@ -14,9 +13,6 @@ class ConnectionIndicator extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final ws = context.watch<WebSocketProvider>();
-    final cfg = context.watch<ConfigProvider>();
-
-    final marginLeft = cfg.drawerIsCollapsed ? 0.0 : cfg.drawerIsExpanded ? 304.0 : 80.0;
 
     return ListenableBuilder(
       listenable: ws,
@@ -26,50 +22,45 @@ class ConnectionIndicator extends StatelessWidget {
 
         return IgnorePointer(
           ignoring: !show,
-          child: Center(
+          child: GestureDetector(
-            child: GestureDetector(
+            child: Material(
-              child: Material(
+              elevation: 2,
-                elevation: 2,
+              shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(16))),
-                shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(16))),
+              color: Theme.of(context).colorScheme.secondaryContainer,
-                color: Theme.of(context).colorScheme.secondaryContainer,
+              child: ua.isAuthorized
-                child: ua.isAuthorized
+                  ? Row(
-                    ? Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
-                        mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.center,
-                        mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
-                        crossAxisAlignment: CrossAxisAlignment.center,
+                        if (ws.isBusy)
-                        children: [
+                          Text('serverConnecting').tr().textColor(Theme.of(context).colorScheme.onSecondaryContainer)
-                          if (ws.isBusy)
+                        else if (!ws.isConnected)
-                            Text('serverConnecting').tr().textColor(Theme.of(context).colorScheme.onSecondaryContainer)
+                          Text('serverDisconnected').tr().textColor(Theme.of(context).colorScheme.onSecondaryContainer)
-                          else if (!ws.isConnected)
+                        else
-                            Text('serverDisconnected')
+                          Text('serverConnected').tr().textColor(Theme.of(context).colorScheme.onSecondaryContainer),
-                                .tr()
+                        const Gap(8),
-                                .textColor(Theme.of(context).colorScheme.onSecondaryContainer)
+                        if (ws.isBusy)
-                          else
+                          const CircularProgressIndicator(strokeWidth: 2.5)
-                            Text('serverConnected').tr().textColor(Theme.of(context).colorScheme.onSecondaryContainer),
+                              .width(12)
-                          const Gap(8),
+                              .height(12)
-                          if (ws.isBusy)
+                              .padding(horizontal: 4, right: 4)
-                            const CircularProgressIndicator(strokeWidth: 2.5)
+                        else if (!ws.isConnected)
-                                .width(12)
+                          const Icon(Symbols.power_off, size: 18)
-                                .height(12)
+                        else
-                                .padding(horizontal: 4, right: 4)
+                          const Icon(Symbols.power, size: 18),
-                          else if (!ws.isConnected)
+                      ],
-                            const Icon(Symbols.power_off, size: 18)
+                    ).padding(horizontal: 8, vertical: 4)
-                          else
+                  : const SizedBox.shrink(),
-                            const Icon(Symbols.power, size: 18),
+            ).opacity(show ? 1 : 0, animate: true).animate(
-                        ],
+                  const Duration(milliseconds: 300),
-                      ).padding(horizontal: 8, vertical: 4)
+                  Curves.easeInOut,
-                    : const SizedBox.shrink(),
+                ),
-              ).opacity(show ? 1 : 0, animate: true).animate(
+            onTap: () {
-                    const Duration(milliseconds: 300),
+              if (!ws.isConnected && !ws.isBusy) {
-                    Curves.easeInOut,
+                ws.connect();
-                  ),
+              }
-              onTap: () {
+            },
-                if (!ws.isConnected && !ws.isBusy) {
+          ),
-                  ws.connect();
-                }
-              },
-            ),
-          ).padding(left: marginLeft),
         );
       },
     );

lib/widgets/context_menu.dart

@@ -28,7 +28,7 @@ class ContextMenuArea extends StatelessWidget {
           // Leave padding for side navigation
           mousePosition = cfg.drawerIsExpanded
               ? mousePosition.copyWith(dx: mousePosition.dx - 304 * 2)
-              : mousePosition.copyWith(dx: mousePosition.dx - 80 * 2);
+              : mousePosition.copyWith(dx: mousePosition.dx - 72 * 2);
         }
       },
       child: GestureDetector(

lib/widgets/markdown_content.dart

@@ -20,7 +20,6 @@ class MarkdownTextContent extends StatelessWidget {
   final bool isAutoWarp;
   final bool isEnlargeSticker;
   final TextScaler? textScaler;
-  final Color? textColor;
   final List<SnAttachment?>? attachments;
 
   const MarkdownTextContent({
@@ -29,7 +28,6 @@ class MarkdownTextContent extends StatelessWidget {
     this.isAutoWarp = false,
     this.isEnlargeSticker = false,
     this.textScaler,
-    this.textColor,
     this.attachments,
   });
 
@@ -44,7 +42,6 @@ class MarkdownTextContent extends StatelessWidget {
         Theme.of(context),
       ).copyWith(
         textScaler: textScaler,
-        p: textColor != null ? Theme.of(context).textTheme.bodyMedium!.copyWith(color: textColor) : null,
         blockquote: TextStyle(
           color: Theme.of(context).colorScheme.onSurfaceVariant,
         ),

lib/widgets/navigation/app_rail_navigation.dart

@@ -31,37 +31,34 @@ class _AppRailNavigationState extends State<AppRailNavigation> {
       builder: (context, _) {
         final destinations = nav.destinations.where((ele) => ele.isPinned).toList();
 
-        return SizedBox(
+        return NavigationRail(
-          width: 80,
+          selectedIndex:
-          child: NavigationRail(
+              nav.currentIndex != null && nav.currentIndex! < nav.pinnedDestinationCount ? nav.currentIndex : null,
-            selectedIndex:
+          destinations: [
-                nav.currentIndex != null && nav.currentIndex! < nav.pinnedDestinationCount ? nav.currentIndex : null,
+            ...destinations.where((ele) => ele.isPinned).map((ele) {
-            destinations: [
+              return NavigationRailDestination(
-              ...destinations.where((ele) => ele.isPinned).map((ele) {
+                icon: ele.icon,
-                return NavigationRailDestination(
+                label: Text(ele.label).tr(),
-                  icon: ele.icon,
+              );
-                  label: Text(ele.label).tr(),
+            }),
-                );
+          ],
-              }),
+          trailing: Expanded(
-            ],
+            child: Align(
-            trailing: Expanded(
+              alignment: Alignment.bottomCenter,
-              child: Align(
+              child: StyledWidget(
-                alignment: Alignment.bottomCenter,
+                IconButton(
-                child: StyledWidget(
+                  icon: const Icon(Symbols.menu),
-                  IconButton(
+                  onPressed: () {
-                    icon: const Icon(Symbols.menu),
+                    Scaffold.of(context).openDrawer();
-                    onPressed: () {
+                  },
-                      Scaffold.of(context).openDrawer();
+                ),
-                    },
+              ).padding(bottom: 16),
-                  ),
-                ).padding(bottom: 16),
-              ),
             ),
-            onDestinationSelected: (idx) {
-              nav.setIndex(idx);
-              GoRouter.of(context).goNamed(destinations[idx].screen);
-            },
           ),
+          onDestinationSelected: (idx) {
+            nav.setIndex(idx);
+            GoRouter.of(context).goNamed(destinations[idx].screen);
+          },
         );
       },
     );

lib/widgets/navigation/app_scaffold.dart

@@ -140,7 +140,6 @@ class AppRootScaffold extends StatelessWidget {
     );
 
     final safeTop = MediaQuery.of(context).padding.top;
-    final safeBottom = MediaQuery.of(context).padding.bottom;
 
     return Scaffold(
       key: globalRootScaffoldKey,
@@ -192,10 +191,7 @@ class AppRootScaffold extends StatelessWidget {
             ],
           ),
           Positioned(top: safeTop > 0 ? safeTop : 16, right: 8, child: NotifyIndicator()),
-          if (ResponsiveBreakpoints.of(context).smallerOrEqualTo(MOBILE))
+          Positioned(top: safeTop > 0 ? safeTop : 16, left: 8, child: ConnectionIndicator()),
-            Positioned(bottom: safeBottom > 0 ? safeBottom : 16, left: 0, right: 0, child: ConnectionIndicator())
-          else
-            Positioned(top: safeTop > 0 ? safeTop : 16, left: 0, right: 0, child: ConnectionIndicator()),
         ],
       ),
       drawer: !isExpandedDrawer ? AppNavigationDrawer() : null,

lib/widgets/notify_indicator.dart

@@ -1,184 +1,60 @@
-import 'dart:math' show min;
-
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_animate/flutter_animate.dart';
 import 'package:gap/gap.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
-import 'package:responsive_framework/responsive_framework.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:surface/providers/config.dart';
 import 'package:surface/providers/notification.dart';
-import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/userinfo.dart';
-import 'package:surface/screens/notification.dart';
-import 'package:surface/types/notification.dart';
-import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/universal_image.dart';
 
-import 'markdown_content.dart';
+class NotifyIndicator extends StatelessWidget {
-
-class NotifyIndicator extends StatefulWidget {
   const NotifyIndicator({super.key});
 
-  @override
-  State<NotifyIndicator> createState() => _NotifyIndicatorState();
-}
-
-class _NotifyIndicatorState extends State<NotifyIndicator> with SingleTickerProviderStateMixin {
-  late final AnimationController _animationController = AnimationController(
-    vsync: this,
-    duration: const Duration(milliseconds: 300),
-  );
-
-  void _markOneAsRead(SnNotification notification) async {
-    final ua = context.read<UserProvider>();
-    if (!ua.isAuthorized) return;
-
-    if (notification.id == 0) return;
-    if (notification.readAt != null) return;
-
-    try {
-      final sn = context.read<SnNetworkProvider>();
-      await sn.client.put('/cgi/id/notifications/read/${notification.id}');
-
-      if (!mounted) return;
-      context.showSnackbar(
-        'notificationMarkOneReadPrompt'.tr(args: ['#${notification.id}']),
-      );
-    } catch (err) {
-      if (!mounted) return;
-      context.showErrorDialog(err);
-    }
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
-    final sn = context.read<SnNetworkProvider>();
     final ua = context.read<UserProvider>();
     final nty = context.watch<NotificationProvider>();
 
-    final isMobile = ResponsiveBreakpoints.of(context).smallerOrEqualTo(MOBILE);
+    final show = nty.notifications.isNotEmpty && ua.isAuthorized;
-
-    final show = nty.showingCount > 0 && ua.isAuthorized;
-
-    if (show) {
-      _animationController.animateTo(1);
-    } else {
-      _animationController.animateTo(0);
-    }
 
     return ListenableBuilder(
         listenable: nty,
         builder: (context, _) {
-          final current = nty.notifications.lastOrNull;
-
           return IgnorePointer(
             ignoring: !show,
             child: GestureDetector(
-              child: Animate(
+              child: Material(
-                autoPlay: false,
+                elevation: 2,
-                controller: _animationController,
+                shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(16))),
-                effects: [
+                color: Theme.of(context).colorScheme.secondaryContainer,
-                  SlideEffect(
+                child: ua.isAuthorized
-                    begin: isMobile ? Offset(0, -1) : Offset(1, 0),
+                    ? Row(
-                    end: Offset(0, 0),
+                        mainAxisAlignment: MainAxisAlignment.center,
-                    duration: Duration(milliseconds: 300),
+                        crossAxisAlignment: CrossAxisAlignment.center,
-                    curve: Curves.fastEaseInToSlowEaseOut,
+                        children: [
-                  ),
+                          Text(
-                  FadeEffect(
+                            nty.notifications.lastOrNull?.title ??
-                    begin: 0.0,
+                                'notificationUnreadCount'.plural(nty.notifications.length),
-                    end: 1.0,
+                            maxLines: 1,
-                    duration: Duration(milliseconds: 300),
+                            overflow: TextOverflow.ellipsis,
-                    curve: Curves.easeInOut,
-                  ),
-                ],
-                child: Container(
-                  padding: const EdgeInsets.symmetric(vertical: 16),
-                  width: double.infinity,
-                  constraints: BoxConstraints(
-                    maxWidth: isMobile ? MediaQuery.of(context).size.width - 16 : 360,
-                  ),
-                  child: Material(
-                    elevation: 2,
-                    borderRadius: BorderRadius.circular(8),
-                    color: Theme.of(context).colorScheme.surfaceContainer,
-                    child: Row(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        if (current?.metadata['avatar'] != null)
-                          CircleAvatar(
-                            radius: 14,
-                            backgroundImage: UniversalImage.provider(
-                              sn.getAttachmentUrl(current!.metadata['avatar']),
-                            ),
-                          )
-                        else
-                          Icon(kNotificationTopicIcons[current?.topic] ?? Symbols.notifications),
-                        const Gap(16),
-                        Expanded(
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Text(
-                                current?.title ?? 'Notification',
-                                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                      fontWeight: FontWeight.bold,
-                                    ),
-                              ),
-                              if (current?.subtitle?.isNotEmpty ?? false)
-                                Text(
-                                  current!.subtitle!,
-                                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                ),
-                              MarkdownTextContent(
-                                content: current?.body ?? '',
-                                isAutoWarp: true,
-                              ),
-                            ],
                           ),
-                        ),
+                          if (nty.notifications.lastOrNull?.body != null)
-                        const Gap(16),
+                            Text(
-                        Column(
+                              nty.notifications.lastOrNull!.body,
-                          crossAxisAlignment: CrossAxisAlignment.end,
+                              maxLines: 1,
-                          children: [
+                              overflow: TextOverflow.ellipsis,
-                            Text(DateFormat('HH:mm').format(current?.createdAt.toLocal() ?? DateTime.now()))
+                            ).padding(left: 4),
-                                .fontSize(12)
+                          const Gap(8),
-                                .padding(right: 2),
+                          const Icon(Symbols.notifications_unread, size: 18),
-                            const Gap(6),
+                        ],
-                            if (current?.metadata['image'] != null)
+                      ).padding(horizontal: 8, vertical: 4)
-                              SizedBox(
+                    : const SizedBox.shrink(),
-                                width: 40,
+              ).opacity(show ? 1 : 0, animate: true).animate(
-                                height: 40,
+                    const Duration(milliseconds: 300),
-                                child: ClipRRect(
+                    Curves.easeInOut,
-                                  borderRadius: const BorderRadius.all(Radius.circular(8)),
-                                  child: AutoResizeUniversalImage(
-                                    sn.getAttachmentUrl(current?.metadata['image']),
-                                    fit: BoxFit.cover,
-                                  ),
-                                ),
-                              ),
-                          ],
-                        ),
-                      ],
-                    ).padding(horizontal: 16, vertical: 12),
                   ),
-                ),
-              ),
               onTap: () {
                 nty.clear();
-                if (current != null) {
-                  _markOneAsRead(current);
-                }
               },
             ),
           );

lib/widgets/post/post_item.dart

@@ -1,3 +1,4 @@
+import 'dart:developer';
 import 'dart:io';
 import 'dart:math' as math;
 

lib/widgets/post/post_reaction.dart

@@ -61,7 +61,7 @@ class _PostReactionPopupState extends State<PostReactionPopup> {
           );
         }
       }
-      HapticFeedback.heavyImpact();
+      HapticFeedback.mediumImpact();
     } catch (err) {
       // ignore: use_build_context_synchronously
       if (context.mounted) context.showErrorDialog(err);