🚀 Launch 2.3.2+71

.github/workflows/nightly.yml

@@ -55,6 +55,7 @@ jobs:
           sudo apt-get install libmpv-dev mpv
           sudo apt-get install libayatana-appindicator3-dev
           sudo apt-get install keybinder-3.0
+          sudo apt-get install libnotify-dev
       - run: flutter pub get
       - run: flutter build linux
       - name: Archive production artifacts

assets/translations/en-US.json

@@ -717,5 +717,6 @@
   "fieldStickerAttachment": "Attachment",
   "stickersNew": "New Sticker",
   "stickersNewDescription": "Create a new sticker belongs to this pack.",
-  "stickersPackNew": "New Sticker Pack"
+  "stickersPackNew": "New Sticker Pack",
+  "trayMenuShow": "Show"
 }

assets/translations/zh-CN.json

@@ -715,5 +715,6 @@
   "fieldStickerAttachment": "附件",
   "stickersNew": "新建贴图",
   "stickersNewDescription": "创建一个新的贴图。",
-  "stickersPackNew": "新建贴图包"
+  "stickersPackNew": "新建贴图包",
+  "trayMenuShow": "显示"
 }

lib/main.dart

@@ -48,6 +48,7 @@ import 'package:workmanager/workmanager.dart';
 import 'package:in_app_review/in_app_review.dart';
 import 'package:image_picker_android/image_picker_android.dart';
 import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
+import 'package:local_notifier/local_notifier.dart';
 
 @pragma('vm:entry-point')
 void appBackgroundDispatcher() {
@@ -350,6 +351,10 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
           disabled: true,
         ),
         MenuItem.separator(),
+        MenuItem(
+          key: 'window_show',
+          label: 'trayMenuShow'.tr(),
+        ),
         MenuItem(
           key: 'exit',
           label: 'trayMenuExit'.tr(),
@@ -359,6 +364,15 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
     await trayManager.setContextMenu(menu);
   }
 
+  Future<void> _notifyInitialization() async {
+    if (kIsWeb || Platform.isAndroid || Platform.isIOS) return;
+
+    await localNotifier.setup(
+      appName: 'solian',
+      shortcutPolicy: ShortcutPolicy.requireCreate,
+    );
+  }
+
   AppLifecycleListener? _appLifecycleListener;
 
   @override
@@ -373,6 +387,7 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
 
     _trayInitialization();
     _hotkeyInitialization();
+    _notifyInitialization();
     _initialize().then((_) {
       _postInitialization();
       _tryRequestRating();
@@ -408,6 +423,9 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
   @override
   void onTrayMenuItemClick(MenuItem menuItem) {
     switch (menuItem.key) {
+      case 'window_show':
+        appWindow.show();
+        break;
       case 'exit':
         _appLifecycleListener?.dispose();
         SystemChannels.platform.invokeMethod('SystemNavigator.pop');

lib/providers/notification.dart

@@ -1,11 +1,13 @@
 import 'dart:developer';
 import 'dart:io';
 
+import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_udid/flutter_udid.dart';
+import 'package:local_notifier/local_notifier.dart';
 import 'package:provider/provider.dart';
 import 'package:surface/providers/config.dart';
 import 'package:surface/providers/sn_network.dart';
@@ -92,6 +94,20 @@ class NotificationProvider extends ChangeNotifier {
         updateTray();
         final doHaptic = _cfg.prefs.getBool(kAppNotifyWithHaptic) ?? true;
         if (doHaptic) HapticFeedback.mediumImpact();
+
+        if (!kIsWeb) {
+          if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
+            LocalNotification notify = LocalNotification(
+              title: notification.title,
+              subtitle: notification.subtitle,
+              body: notification.body,
+            );
+            notify.onClick = () {
+              appWindow.show();
+            };
+            notify.show();
+          }
+        }
       }
     });
   }

linux/flutter/generated_plugin_registrant.cc

@@ -12,6 +12,7 @@
 #include <flutter_udid/flutter_udid_plugin.h>
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
 #include <hotkey_manager_linux/hotkey_manager_linux_plugin.h>
+#include <local_notifier/local_notifier_plugin.h>
 #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>
@@ -38,6 +39,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) hotkey_manager_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "HotkeyManagerLinuxPlugin");
   hotkey_manager_linux_plugin_register_with_registrar(hotkey_manager_linux_registrar);
+  g_autoptr(FlPluginRegistrar) local_notifier_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "LocalNotifierPlugin");
+  local_notifier_plugin_register_with_registrar(local_notifier_registrar);
   g_autoptr(FlPluginRegistrar) media_kit_libs_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitLibsLinuxPlugin");
   media_kit_libs_linux_plugin_register_with_registrar(media_kit_libs_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_udid
   flutter_webrtc
   hotkey_manager_linux
+  local_notifier
   media_kit_libs_linux
   media_kit_video
   pasteboard

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -21,6 +21,7 @@ import gal
 import hotkey_manager_macos
 import in_app_review
 import livekit_client
+import local_notifier
 import media_kit_libs_macos_video
 import media_kit_video
 import package_info_plus
@@ -53,6 +54,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   HotkeyManagerMacosPlugin.register(with: registry.registrar(forPlugin: "HotkeyManagerMacosPlugin"))
   InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin"))
   LiveKitPlugin.register(with: registry.registrar(forPlugin: "LiveKitPlugin"))
+  LocalNotifierPlugin.register(with: registry.registrar(forPlugin: "LocalNotifierPlugin"))
   MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))
   MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))

pubspec.lock

@@ -357,10 +357,10 @@ packages:
     dependency: "direct main"
     description:
       name: dart_webrtc
-      sha256: "03df5b41b23bc185ebcf4b0ffc92d002e295bf56287fb5f9d2c321ddaf7760cc"
+      sha256: b34e90bc82f33c1023cf98661369c37bccd648c8a4cf882a875d9f5d8bbef694
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.1"
+    version: "1.5.2+hotfix.1"
   dbus:
     dependency: transitive
     description:
@@ -865,10 +865,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_webrtc
-      sha256: "9c4ca34ced1d1b780baf3776557f9edd0af18ce030969346f752e8df455faaab"
+      sha256: "6ea3a86d95b61cfe42d5715426d355b3cece6c88d0119de428d56f6c653811ce"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
   freezed:
     dependency: "direct dev"
     description:
@@ -1201,10 +1201,18 @@ packages:
     dependency: "direct main"
     description:
       name: livekit_client
-      sha256: "0cfb2f48eff7a93ea8927696dc6f218aebd2fcd1fcc1b1a7b2f53ff3597fdb52"
+      sha256: "753bbf484c6b70f10f3dc1dc808dfe3755f472d80eb9682323cff07ad8e2609d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.6"
+    version: "2.4.0"
+  local_notifier:
+    dependency: "direct main"
+    description:
+      name: local_notifier
+      sha256: f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   logging:
     dependency: transitive
     description:
@@ -1549,14 +1557,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.6"
-  platform_detect:
-    dependency: transitive
-    description:
-      name: platform_detect
-      sha256: "7394dc1d884e652785a37c3ff25c54e503c6d9fa2f35b55d5efc0a133dec122c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -2286,10 +2286,10 @@ packages:
     dependency: transitive
     description:
       name: webrtc_interface
-      sha256: "10fc6dc0ac16f909f5e434c18902415211d759313c87261f1e4ec5b4f6a04c26"
+      sha256: e05f00091c9c70a15bab4ccb1b6c46d9a16a6075002f02cfac3641eccb05e25d
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.1+hotfix.1"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.3.2+70
+version: 2.3.2+71
 
 environment:
   sdk: ^3.5.4
@@ -123,6 +123,7 @@ dependencies:
   image_picker_platform_interface: ^2.10.1
   drift: ^2.25.1
   drift_flutter: ^0.2.4
+  local_notifier: ^0.1.6
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -17,6 +17,7 @@
 #include <gal/gal_plugin_c_api.h>
 #include <hotkey_manager_windows/hotkey_manager_windows_plugin_c_api.h>
 #include <livekit_client/live_kit_plugin.h>
+#include <local_notifier/local_notifier_plugin.h>
 #include <media_kit_libs_windows_video/media_kit_libs_windows_video_plugin_c_api.h>
 #include <media_kit_video/media_kit_video_plugin_c_api.h>
 #include <pasteboard/pasteboard_plugin.h>
@@ -50,6 +51,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("HotkeyManagerWindowsPluginCApi"));
   LiveKitPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("LiveKitPlugin"));
+  LocalNotifierPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("LocalNotifierPlugin"));
   MediaKitLibsWindowsVideoPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("MediaKitLibsWindowsVideoPluginCApi"));
   MediaKitVideoPluginCApiRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -14,6 +14,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   gal
   hotkey_manager_windows
   livekit_client
+  local_notifier
   media_kit_libs_windows_video
   media_kit_video
   pasteboard