From 0e3ca912a7ab475cf128d75e196ef000c1942cca Mon Sep 17 00:00:00 2001
From: liwei <liwei-8466@qq.com>
Date: Thu, 8 Jun 2023 14:10:55 +0800
Subject: [PATCH] fix: add mac tray template icon

---
 ui/flutter/assets/tray_icon/icon_mac.png      | Bin 0 -> 1699 bytes
 .../app/controllers/app_controller.dart       |  28 +++++++++++-------
 ui/flutter/lib/main.dart                      |   4 ---
 3 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 ui/flutter/assets/tray_icon/icon_mac.png

diff --git a/ui/flutter/assets/tray_icon/icon_mac.png b/ui/flutter/assets/tray_icon/icon_mac.png
new file mode 100644
index 0000000000000000000000000000000000000000..83980e19de0ee6aa8081a843bc057ea7cc81fd79
GIT binary patch
literal 1699
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

literal 0
HcmV?d00001

diff --git a/ui/flutter/lib/app/modules/app/controllers/app_controller.dart b/ui/flutter/lib/app/modules/app/controllers/app_controller.dart
index aef9cdfe..fded8bfd 100644
--- a/ui/flutter/lib/app/modules/app/controllers/app_controller.dart
+++ b/ui/flutter/lib/app/modules/app/controllers/app_controller.dart
@@ -9,6 +9,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:tray_manager/tray_manager.dart';
 import 'package:uri_to_file/uri_to_file.dart';
+import 'package:url_launcher/url_launcher.dart';
 import 'package:window_manager/window_manager.dart';
 
 import '../../../../api/api.dart';
@@ -81,9 +82,9 @@ class AppController extends GetxController with WindowListener, TrayListener {
       logger.w("initDeepLinks error", e);
     }
     try {
-      _initWinodws();
+      _initWindows();
     } catch (e) {
-      logger.w("_initWinodws error", e);
+      logger.w("initWindows error", e);
     }
     try {
       _initTray();
@@ -131,7 +132,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
     }
   }
 
-  Future<void> _initWinodws() async {
+  Future<void> _initWindows() async {
     if (!Util.isDesktop()) {
       return;
     }
@@ -142,11 +143,14 @@ class AppController extends GetxController with WindowListener, TrayListener {
     if (!Util.isDesktop()) {
       return;
     }
-    await trayManager.setIcon(
-      Util.isWindows()
-          ? 'assets/tray_icon/icon.ico'
-          : 'assets/tray_icon/icon.png',
-    );
+    if (Util.isWindows()) {
+      await trayManager.setIcon('assets/tray_icon/icon.ico');
+    } else if (Util.isMacos()) {
+      await trayManager.setIcon('assets/tray_icon/icon_mac.png',
+          isTemplate: true);
+    } else {
+      await trayManager.setIcon('assets/tray_icon/icon.png');
+    }
     final menu = Menu(items: [
       MenuItem(
         label: "create".tr,
@@ -165,11 +169,15 @@ class AppController extends GetxController with WindowListener, TrayListener {
       MenuItem.separator(),
       MenuItem(
         label: 'donate'.tr,
-        onClick: (menuItem) => {windowManager.destroy()},
+        onClick: (menuItem) => {
+          launchUrl(
+              Uri.parse(
+                  "https://github.com/GopeedLab/gopeed/blob/main/.donate/index.md#donate"),
+              mode: LaunchMode.externalApplication)
+        },
       ),
       MenuItem(
         label: '${"version".tr}（${packageInfo.version}）',
-        onClick: (menuItem) => {windowManager.destroy()},
       ),
       MenuItem.separator(),
       MenuItem(
diff --git a/ui/flutter/lib/main.dart b/ui/flutter/lib/main.dart
index 0499b9c4..35ae7b5b 100644
--- a/ui/flutter/lib/main.dart
+++ b/ui/flutter/lib/main.dart
@@ -28,13 +28,9 @@ Future<void> init() async {
     const windowOptions = WindowOptions(
       size: Size(1024, 768),
       center: true,
-      backgroundColor: Colors.transparent,
       skipTaskbar: false,
     );
     windowManager.waitUntilReadyToShow(windowOptions, () async {
-      await windowManager.setBrightness(
-        Brightness.light,
-      );
       await windowManager.show();
       await windowManager.focus();
       await windowManager.setPreventClose(true);