From f63b1bc9a5e3d98e9752c6c2feb8fe8a6a8a9472 Mon Sep 17 00:00:00 2001
From: problematicconsumer <problematicconsumer@protonmail.com>
Date: Sat, 2 Sep 2023 22:42:01 +0330
Subject: [PATCH] Change system tray icon

---
 assets/images/tray_icon.png                      | Bin 0 -> 1131 bytes
 .../controller/system_tray_controller.dart       |  12 +++++++++++-
 pubspec.yaml                                     |   2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 assets/images/tray_icon.png

diff --git a/assets/images/tray_icon.png b/assets/images/tray_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b317c991900ea05b9a5db417fab0030bf1e12da
GIT binary patch
literal 1131
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U{UpSaSW-L
z^Y*T7p0J|~>j!fVsg{=AB@dK$EI2NDL2w7dl>ilU1@i)~Uj>X)mMrVg%n&Ya66j>=
zRI+63PrBYU^~TMc{WEXQ{r|g^W3ud~^Z9RX>N~g~flW_?_#JjR7qL8u{dqk3`JMGs
z9#8D>s8gyunLS-)`O4#}jT7fgvUy$wWU4n#keO_AXT#&^|CY)vXW6jqohSph)~h(i
z6I0XgYBN|ast1vYe|Lp56dib0x}JeY_V(4iOa>uufGQgnCT<4_aqeFK+l_ID{9}9V
z>k%>wEEx>^Y{eLMOs`^?Hen8<g`<C&-Ga}Ii!|^5RNrX+dd}|8zU$aJmQO$aOqAiV
z2s+|daaZAwklA3VxN~lmj}Yg{xxCrmw(h$=`40D<cl-UGZe%b$z^21@aUSChc7v$T
zlfF-E7ir;RyL;f#r&W@x$_w(ZeZC#QyhdRs^8=a0dw07T>^Gk}&vIL4Uh3WJbK;-#
zZrl8#tZRM9&%~==L>&I_dVgxmoogbm?ZZn_86TXm47XmAR`7Xwb$sNXqO+z9-Rtv>
z875yze#vai=n?R}IpI+>!{NGJ@>|wOJCw%jo@Q9_?r*9&>xy@;PcCEh@C%rezkb(x
z#cqZv*8g?BTC{0Q*Gw?~%1|?*#_^N;?5(l>^&WL<KX+vLM4B+L6{Pe%5oU;IwCUQg
zQ<p(LaL+;eJ6{jQNF{LGQ#yAp{_C<=tXvK@{K7fKtAVVBLNv5Df<tS1(R`*I1?QGp
zR9{=Og!jNFvrLU^ANv{RY~0b`=Q2r$LB)RIjgRL3vG;VP9hExlSTDRc%e?JTtk`OK
zQ7U2SyXw-}Ca)KnI7EKm%~5UGVj^I|Ft1dflXWIj$oIn+E16fkYhSt<=*9MxUqu$|
zlHV4_3ncfsF$UayzW5qY<a~cQP|fEMNrp+u4DA<G!y`Y<Wcs#n?tI<(414(OxIEpK
zw@5B$kid$rUuURTZ?|cO=9AA2$tR=YnGF;zwaeeRJ#Acd!~e-SFMU0}y9we)Q<JzE
z!n6O?@ywlkA!<JJh9$}q8NZftP4K`-IH08TYmdMe*`t~-UxzVHKgRGa;7*dC)QfBe
zJ%$|X=kIR)Wawfya_;ZWT(ds-fcX5m{0vWfRlm;o()LTLVb`8RO52|bF=To$8u%fh
zbLtGo54soL4t#LEeBnE@;5DIhw*BK&QCC^-WdEk@XkD{mpNF1OU*Wkf<7wtSpQDc$
zPI|I>m7(SRc!LJbL-Q6?vL@VnHqlTgFW&rZo=5iCxy7HC{h#r~o8dfz&5Jyb?SEJc
m-pu(eTOh531TK~TXH@*uCUmg8!~j@&FnGH9xvX<aXaWGS4DG4_

literal 0
HcmV?d00001

diff --git a/lib/features/system_tray/controller/system_tray_controller.dart b/lib/features/system_tray/controller/system_tray_controller.dart
index 284d2e66..da194952 100644
--- a/lib/features/system_tray/controller/system_tray_controller.dart
+++ b/lib/features/system_tray/controller/system_tray_controller.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:hiddify/core/core_providers.dart';
 import 'package:hiddify/domain/connectivity/connectivity.dart';
 import 'package:hiddify/features/common/connectivity/connectivity_controller.dart';
@@ -16,7 +18,10 @@ class SystemTrayController extends _$SystemTrayController
   Future<void> build() async {
     if (!_initialized) {
       loggy.debug('initializing');
-      await trayManager.setIcon(Assets.images.trayIcon);
+      await trayManager.setIcon(
+        _trayIconPath,
+        isTemplate: Platform.isMacOS,
+      );
       trayManager.addListener(this);
       _initialized = true;
     }
@@ -29,6 +34,11 @@ class SystemTrayController extends _$SystemTrayController
 
   bool _initialized = false;
 
+  String get _trayIconPath {
+    if (Platform.isWindows) return Assets.images.trayIconIco;
+    return Assets.images.trayIconPng.path;
+  }
+
   Future<void> _updateTray(ConnectionStatus connection) async {
     final t = ref.watch(translationsProvider);
     final trayMenu = Menu(
diff --git a/pubspec.yaml b/pubspec.yaml
index 013433f2..829e9b6b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -105,6 +105,8 @@ flutter:
     - assets/core/geosite.db
     - assets/images/logo.svg
     - assets/images/tray_icon.ico
+    - assets/images/tray_icon.png
+    - assets/images/tray_icon_black.png
     - assets/images/tray_icon_connected.ico
     - assets/images/tray_icon_disconnected.ico