♻️ Refactor tray with manager

assets/translations/en-US.json

@@ -609,5 +609,6 @@
     "other": "{} Source Points"
   },
   "aiThinkingProcess": "AI Thinking Process",
-  "accountSettingsApplied": "Account settings have been applied."
+  "accountSettingsApplied": "Account settings have been applied.",
+  "trayMenuExit": "Exit"
 }

assets/translations/zh-CN.json

@@ -607,5 +607,6 @@
     "other": "{} 源点"
   },
   "aiThinkingProcess": "AI 思考过程",
-  "accountSettingsApplied": "帐号设置已应用。"
+  "accountSettingsApplied": "帐号设置已应用。",
+  "trayMenuExit": "退出"
 }

lib/main.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
+import 'dart:ui';
 
 import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:croppy/croppy.dart';
@@ -10,6 +11,7 @@ import 'package:easy_localization_loader/easy_localization_loader.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -40,6 +42,7 @@ import 'package:surface/types/chat.dart';
 import 'package:surface/types/realm.dart';
 import 'package:flutter_web_plugins/url_strategy.dart' show usePathUrlStrategy;
 import 'package:surface/widgets/dialog.dart';
+import 'package:tray_manager/tray_manager.dart';
 import 'package:version/version.dart';
 import 'package:workmanager/workmanager.dart';
 import 'package:in_app_review/in_app_review.dart';
@@ -206,7 +209,7 @@ class _AppSplashScreen extends StatefulWidget {
   State<_AppSplashScreen> createState() => _AppSplashScreenState();
 }
 
-class _AppSplashScreenState extends State<_AppSplashScreen> {
+class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
   void _tryRequestRating() async {
     final prefs = await SharedPreferences.getInstance();
     if (prefs.containsKey('first_boot_time')) {
@@ -294,9 +297,45 @@ class _AppSplashScreenState extends State<_AppSplashScreen> {
     await widgetUpdateRandomPost();
   }
 
+  Future<void> _trayInitialization() async {
+    if (kIsWeb || Platform.isAndroid || Platform.isIOS) return;
+
+    final icon = Platform.isWindows ? 'assets/icon/tray-icon.ico' : 'assets/icon/tray-icon.png';
+    final appVersion = await PackageInfo.fromPlatform();
+
+    trayManager.addListener(this);
+    await trayManager.setIcon(icon);
+
+    Menu menu = Menu(
+      items: [
+        MenuItem(
+          key: 'version_label',
+          label: 'Solian ${appVersion.version}+${appVersion.buildNumber}',
+          disabled: true,
+        ),
+        MenuItem.separator(),
+        MenuItem(
+          key: 'exit',
+          label: 'trayMenuExit'.tr(),
+        ),
+      ],
+    );
+    await trayManager.setContextMenu(menu);
+  }
+
+  AppLifecycleListener? _appLifecycleListener;
+
   @override
   void initState() {
     super.initState();
+
+    if (!kIsWeb && !(Platform.isIOS || Platform.isAndroid)) {
+      _appLifecycleListener = AppLifecycleListener(
+        onExitRequested: _onExitRequested,
+      );
+    }
+
+    _trayInitialization();
     _initialize().then((_) {
       _postInitialization();
       _tryRequestRating();
@@ -304,6 +343,45 @@ class _AppSplashScreenState extends State<_AppSplashScreen> {
     });
   }
 
+  Future<AppExitResponse> _onExitRequested() async {
+    appWindow.hide();
+    return AppExitResponse.cancel;
+  }
+
+  @override
+  void onTrayIconMouseDown() {
+    if (Platform.isWindows) {
+      appWindow.show();
+    } else {
+      trayManager.popUpContextMenu();
+    }
+  }
+
+  @override
+  void onTrayIconRightMouseDown() {
+    if (Platform.isWindows) {
+      trayManager.popUpContextMenu();
+    } else {
+      appWindow.show();
+    }
+  }
+
+  @override
+  void onTrayMenuItemClick(MenuItem menuItem) {
+    switch (menuItem.key) {
+      case 'exit':
+        _appLifecycleListener?.dispose();
+        SystemChannels.platform.invokeMethod('SystemNavigator.pop');
+        break;
+    }
+  }
+
+  @override
+  void dispose() {
+    if (!kIsWeb && !(Platform.isAndroid || Platform.isIOS)) trayManager.removeListener(this);
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     final cfg = context.read<ConfigProvider>();

lib/providers/notification.dart

@@ -12,6 +12,7 @@ import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/providers/websocket.dart';
 import 'package:surface/types/notification.dart';
+import 'package:tray_manager/tray_manager.dart';
 
 class NotificationProvider extends ChangeNotifier {
   late final SnNetworkProvider _sn;
@@ -86,14 +87,26 @@ class NotificationProvider extends ChangeNotifier {
           notifyListeners();
         });
         notifyListeners();
+        updateTray();
         final doHaptic = _cfg.prefs.getBool(kAppNotifyWithHaptic) ?? true;
         if (doHaptic) HapticFeedback.mediumImpact();
       }
     });
   }
 
+  void updateTray() {
+    if (kIsWeb || Platform.isAndroid || Platform.isIOS) return;
+    if (notifications.isEmpty) {
+      trayManager.setTitle('');
+    } else {
+      trayManager.setTitle(' ${notifications.length.toString()}');
+    }
+  }
+
   void clear() {
     showingCount = 0;
+    notifications.clear();
+    updateTray();
     notifyListeners();
   }
 }

lib/providers/widget.dart

@@ -47,6 +47,7 @@ class HomeWidgetProvider {
 }
 
 Future<void> widgetUpdateRandomPost() async {
+  if (kIsWeb || (!Platform.isAndroid && !Platform.isIOS)) return;
   final snc = await SnNetworkProvider.createOffContextClient();
   final resp = await snc.get('/cgi/co/recommendations/shuffle?take=1');
   final post = SnPost.fromJson(resp.data['data'][0]);

lib/screens/notification.dart

@@ -7,6 +7,7 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 import 'package:relative_time/relative_time.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/notification.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/types/notification.dart';
 import 'package:surface/types/post.dart';
@@ -54,6 +55,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
 
     try {
       final sn = context.read<SnNetworkProvider>();
+      final nty = context.read<NotificationProvider>();
       final resp = await sn.client.get('/cgi/id/notifications?take=10');
       _totalCount = resp.data['count'];
       _notifications.addAll(
@@ -62,6 +64,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
                 .cast<SnNotification>() ??
             [],
       );
+      nty.updateTray();
     } catch (err) {
       if (!mounted) return;
       context.showErrorDialog(err);
@@ -88,9 +91,11 @@ class _NotificationScreenState extends State<NotificationScreen> {
 
     try {
       final sn = context.read<SnNetworkProvider>();
+      final nty = context.read<NotificationProvider>();
       final resp = await sn.client.put('/cgi/id/notifications/read/all');
       _notifications.clear();
       _fetchNotifications();
+      nty.clear();
 
       if (!mounted) return;
       context.showSnackbar(

lib/widgets/chat/chat_message_input.dart

@@ -154,7 +154,6 @@ class ChatMessageInputState extends State<ChatMessageInput> {
 
   void _showEmojiPicker(BuildContext context) {
     final overlay = Overlay.of(context);
-    final sticker = context.read<SnStickerProvider>();
     _overlayEntry = OverlayEntry(
       builder: (context) => Positioned(
         bottom: 16 + MediaQuery.of(context).padding.bottom,
@@ -363,7 +362,7 @@ class _StickerPicker extends StatelessWidget {
   final Function? onDismiss;
   final Function(String)? onInsert;
 
-  const _StickerPicker({super.key, this.onDismiss, required this.originalText, this.onInsert});
+  const _StickerPicker({this.onDismiss, required this.originalText, this.onInsert});
 
   @override
   Widget build(BuildContext context) {

linux/flutter/generated_plugin_registrant.cc

@@ -14,6 +14,7 @@
 #include <media_kit_libs_linux/media_kit_libs_linux_plugin.h>
 #include <media_kit_video/media_kit_video_plugin.h>
 #include <pasteboard/pasteboard_plugin.h>
+#include <tray_manager/tray_manager_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
@@ -41,6 +42,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) pasteboard_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin");
   pasteboard_plugin_register_with_registrar(pasteboard_registrar);
+  g_autoptr(FlPluginRegistrar) tray_manager_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "TrayManagerPlugin");
+  tray_manager_plugin_register_with_registrar(tray_manager_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -11,6 +11,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   media_kit_libs_linux
   media_kit_video
   pasteboard
+  tray_manager
   url_launcher_linux
 )
 

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -29,6 +29,7 @@ import screen_brightness_macos
 import share_plus
 import shared_preferences_foundation
 import sqflite_darwin
+import tray_manager
 import url_launcher_macos
 import video_compress
 import wakelock_plus
@@ -58,6 +59,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
+  TrayManagerPlugin.register(with: registry.registrar(forPlugin: "TrayManagerPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   VideoCompressPlugin.register(with: registry.registrar(forPlugin: "VideoCompressPlugin"))
   WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))

macos/Podfile.lock

@@ -174,6 +174,8 @@ PODS:
   - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
+  - tray_manager (0.0.1):
+    - FlutterMacOS
   - url_launcher_macos (0.0.1):
     - FlutterMacOS
   - video_compress (0.3.0):
@@ -210,6 +212,7 @@ DEPENDENCIES:
   - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
   - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite_darwin (from `Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin`)
+  - tray_manager (from `Flutter/ephemeral/.symlinks/plugins/tray_manager/macos`)
   - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
   - video_compress (from `Flutter/ephemeral/.symlinks/plugins/video_compress/macos`)
   - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`)
@@ -286,6 +289,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
   sqflite_darwin:
     :path: Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin
+  tray_manager:
+    :path: Flutter/ephemeral/.symlinks/plugins/tray_manager/macos
   url_launcher_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
   video_compress:
@@ -334,6 +339,7 @@ SPEC CHECKSUMS:
   share_plus: 1fa619de8392a4398bfaf176d441853922614e89
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
   url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
   video_compress: c896234f100791b5fef7f049afa38f6d2ef7b42f
   wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269

pubspec.lock

@@ -764,10 +764,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: e37f4c69a07b07bb92622ef6b131a53c9aae48f64b176340af9e8e5238718487
+      sha256: "46cdcdcd216f15ac04c80e24e814a89ea7143654442c53ba67fec349b4d44565"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.5"
+    version: "0.7.6"
   flutter_native_splash:
     dependency: "direct dev"
     description:
@@ -1282,6 +1282,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.5"
+  menu_base:
+    dependency: transitive
+    description:
+      name: menu_base
+      sha256: "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.1"
   meta:
     dependency: transitive
     description:
@@ -1334,18 +1342,18 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: b15fad91c4d3d1f2b48c053dd41cb82da007c27407dc9ab5f9aa59881d0e39d4
+      sha256: c447a3c3e7be4addf129b8f9ab6a4bd5d166b78918223e223b61fddf4d07e254
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.4"
+    version: "8.2.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b
+      sha256: "205ec83335c2ab9107bbba3f8997f9356d72ca3c715d2f038fc773d0366b4c76"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.0"
   pasteboard:
     dependency: "direct main"
     description:
@@ -1778,6 +1786,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
+  shortid:
+    dependency: transitive
+    description:
+      name: shortid
+      sha256: d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1951,6 +1967,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  tray_manager:
+    dependency: "direct main"
+    description:
+      name: tray_manager
+      sha256: "80be6c508159a6f3c57983de795209ac13453e9832fd574143b06dceee188ed2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.2"
   typed_data:
     dependency: transitive
     description:
@@ -2059,10 +2083,10 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "7ed22c21d7fdcc88dd6ba7860384af438cd220b251ad65dfc142ab722fabef61"
+      sha256: a1870d398158844fe5db12441611ed9a2222ff4340258b539eaf3590c1b4bd7e
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.16"
+    version: "1.1.17"
   vector_graphics_codec:
     dependency: transitive
     description:

pubspec.yaml

@@ -118,6 +118,7 @@ dependencies:
   flutter_inappwebview: ^6.1.5
   html: ^0.15.5
   xml: ^6.5.0
+  tray_manager: ^0.3.2
 
 dev_dependencies:
   flutter_test:
@@ -152,6 +153,8 @@ flutter:
     - assets/icon/icon.png
     - assets/icon/icon-dark.png
     - assets/icon/icon-light-radius.png
+    - assets/icon/tray-icon.ico
+    - assets/icon/tray-icon.png
     - assets/translations/
 
   # An image asset can refer to one or more resolution-specific "variants", see

windows/flutter/generated_plugin_registrant.cc

@@ -22,6 +22,7 @@
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <screen_brightness_windows/screen_brightness_windows_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
+#include <tray_manager/tray_manager_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
@@ -57,6 +58,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("ScreenBrightnessWindowsPlugin"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
+  TrayManagerPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("TrayManagerPlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -19,6 +19,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   permission_handler_windows
   screen_brightness_windows
   share_plus
+  tray_manager
   url_launcher_windows
 )