Update icons

assets/images/logo.svg

@@ -1,7 +1,6 @@
-
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
-<svg width="400" height="400" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M377.263 104.127C377.263 99.3979 379.745 95.0149 383.803 92.5815L491.593 27.9401C500.574 22.5545 512 29.0192 512 39.486V150.354C512 157.791 505.966 163.819 498.526 163.819H390.737C383.297 163.819 377.263 157.791 377.263 150.354V104.127Z" fill="#DB9A52"/>
-<path d="M14 3.28347C14 3.10785 14.0921 2.9451 14.2427 2.85474L18.2427 0.454423C18.576 0.25444 19 0.494494 19 0.883154V5C19 5.27614 18.7761 5.5 18.5 5.5H14.5C14.2239 5.5 14 5.27614 14 5V3.28347Z" fill="#455FE9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M188.632 211.854C188.632 207.124 191.114 202.742 195.172 200.308L302.961 135.667C311.943 130.281 323.368 136.746 323.368 147.212V473.535C323.368 480.97 317.335 487 309.895 487H202.105C194.664 487 188.632 480.97 188.632 473.535V211.854ZM6.54085 321.494C2.4829 323.929 0 328.31 0 333.042V473.535C0 480.97 6.03238 487 13.4737 487H121.263C128.704 487 134.737 480.97 134.737 473.535V268.399C134.737 257.932 123.311 251.468 114.33 256.853L6.54085 321.494Z" fill="#DB9A52"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7.28365C7 7.10803 7.09214 6.94529 7.24273 6.85492L11.2427 4.45461C11.576 4.25463 12 4.49468 12 4.88334V12.0006V12.5006V17.0006C12 17.2767 11.7761 17.5006 11.5 17.5006H7.5C7.22386 17.5006 7 17.2767 7 17.0006V12.5006V12.0006V7.28365ZM0.242727 11.3549C0.0921388 11.4453 0 11.608 0 11.7837V17.0006C0 17.2767 0.223858 17.5006 0.5 17.5006H4.5C4.77614 17.5006 5 17.2767 5 17.0006V9.38334C5 8.99468 4.57599 8.75463 4.24273 8.95461L0.242727 11.3549Z" fill="#455FE9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M134.737 352.345H53.8947V460.067H134.737V433.137C134.737 425.698 140.769 419.671 148.211 419.671H175.158C182.599 419.671 188.632 425.698 188.632 433.137V460.067H296.421V352.345H188.632V379.262C188.632 386.698 182.599 392.728 175.158 392.728H148.211C140.769 392.728 134.737 386.698 134.737 379.262V352.345Z" fill="#DB9A52"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5 12.5005H2V16.5005H5V15.5005C5 15.2243 5.22386 15.0005 5.5 15.0005H6.5C6.77614 15.0005 7 15.2243 7 15.5005V16.5005H11V12.5005H7V13.5C7 13.7761 6.77614 14 6.5 14H5.5C5.22386 14 5 13.7761 5 13.5V12.5005Z" fill="#455FE9"/>
+<path d="M377.263 204.228V473.532C377.263 480.969 383.296 486.997 390.737 486.997H498.526C505.968 486.997 512 480.969 512 473.532V204.228C512 196.792 505.968 190.763 498.526 190.763H390.737C383.296 190.763 377.263 196.792 377.263 204.228Z" fill="#DB9A52"/>
-<rect x="14" y="17.5005" width="11" height="5" rx="0.5" transform="rotate(-90 14 17.5005)" fill="#455FE9"/>
 </svg>

lib/core/app/app_view.dart

@@ -5,6 +5,7 @@ import 'package:hiddify/core/locale/locale.dart';
 import 'package:hiddify/core/router/router.dart';
 import 'package:hiddify/core/theme/theme.dart';
 import 'package:hiddify/features/common/common_controllers.dart';
+import 'package:hiddify/gen/fonts.gen.dart';
 import 'package:hiddify/utils/utils.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
@@ -20,7 +21,7 @@ class AppView extends HookConsumerWidget with PresLogger {
     ref.watch(commonControllersProvider);
 
     // HACK temporary solution
-    final fontFamily = locale.languageCode == "fa" ? "Shabnam" : "";
+    final fontFamily = locale.languageCode == "fa" ? FontFamily.shabnam : "";
 
     return MaterialApp.router(
       routerConfig: router,

lib/features/system_tray/controller/system_tray_controller.dart

@@ -20,8 +20,7 @@ class SystemTrayController extends _$SystemTrayController
   Future<void> build() async {
     if (!_initialized) {
       loggy.debug('initializing');
-      // await trayManager.setIcon(Assets.images.logoRound);
+      await trayManager.setIcon(Assets.images.icon);
-      await trayManager.setIcon(Assets.images.windows);
       trayManager.addListener(this);
       _initialized = true;
     }

linux/packaging/appimage/make_config.yaml

@@ -1,6 +1,6 @@
 display_name: Hiddify Next
 
-icon: ./assets/images/macos-icon.png
+icon: ./assets/images/source/ic_launcher_corner.png
 
 keywords:
   - Hiddify

pubspec.lock

@@ -454,14 +454,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.20.0"
-  flutter_launcher_icons:
-    dependency: "direct main"
-    description:
-      name: flutter_launcher_icons
-      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.13.1"
   flutter_local_notifications:
     dependency: "direct main"
     description:
@@ -678,7 +670,7 @@ packages:
     source: hosted
     version: "4.0.2"
   icons_launcher:
-    dependency: "direct main"
+    dependency: "direct dev"
     description:
       name: icons_launcher
       sha256: af05397792f6d82b93375a8a0253b8db0d3f816ef1dd1bf5c35cbab55321d327

pubspec.yaml

@@ -49,7 +49,6 @@ dependencies:
   mobile_scanner: ^3.4.1
   protocol_handler: ^0.1.5
   flutter_native_splash: ^2.3.2
-  icons_launcher: ^2.1.3
   file_picker: ^5.3.3
   share_plus: ^7.1.0
   window_manager: ^0.3.5
@@ -79,7 +78,6 @@ dependencies:
   sliver_tools: ^0.2.12
   flutter_adaptive_scaffold: ^0.1.6
   fl_chart: ^0.63.0
-  flutter_launcher_icons: ^0.13.1
 
 dev_dependencies:
   flutter_test:
@@ -96,6 +94,7 @@ dev_dependencies:
   go_router_builder: ^2.3.0
   custom_lint: ^0.5.2
   riverpod_lint: ^2.0.1
+  icons_launcher: ^2.1.3
 
 dependency_overrides:
   analyzer: '5.12.0'
@@ -103,8 +102,10 @@ dependency_overrides:
 flutter:
   uses-material-design: true
   assets:
-    - assets/core/
+    - assets/core/geoip.db
-    - assets/images/
+    - assets/core/geosite.db
+    - assets/images/logo.svg
+    - assets/images/icon.ico
   
   fonts:
     - family: Shabnam
@@ -117,59 +118,34 @@ flutter_gen:
     flutter_svg: true
 
 icons_launcher:
-  image_path: "assets/images/ic_launcher.png"
+  image_path: "assets/images/source/ic_launcher_corner.png"
   platforms:
-    ios:
-      enable: true
-      image_path: "assets/images/macos-icon.png"
-    macos:
-      enable: true
-      image_path: "assets/images/macos-icon.png"
-    linux:
-      enable: true
-      image_path: "assets/images/macos-icon.png"
     android:
       enable: true
       adaptive_background_color: "#ffffff"
-      #adaptive_background_image: "assets/images/ic_launcher_background.png"
+      image_path: "assets/images/source/ic_launcher_corner.png"
-      adaptive_foreground_image: "assets/images/ic_launcher_foreground.png"
+      adaptive_foreground_image: "assets/images/source/ic_launcher_foreground.png"
-      adaptive_round_image: "assets/images/ic_launcher_round.png"
+      adaptive_round_image: "assets/images/source/ic_launcher_round.png"
-      adaptive_monochrome_image: "assets/images/ic_launcher_monochrome.png"
+      adaptive_monochrome_image: "assets/images/source/ic_launcher_monochrome.png"
+    ios:
+      enable: true
+      image_path: "assets/images/source/ic_launcher_rectangle.png"
+    macos:
+      enable: true
+      image_path: "assets/images/source/ic_launcher_corner.png"
+    linux:
+      enable: true
+      image_path: "assets/images/source/ic_launcher_corner.png"
     windows:
       enable: true
-      image_path: "assets/images/linux.png"
+      image_path: "assets/images/source/ic_launcher_corner.png"
-
-# flutter_launcher_icons:
-#   image_path: "assets/images/linux.png"
-#   image_path_android: "assets/images/icon-710x599-android.png"
-#   image_path_ios: "assets/images/icon-1024x1024.png"
-#   android: true # can specify file name here e.g. "ic_launcher"
-#   ios: true # can specify file name here e.g. "My-Launcher-Icon"
-#   #adaptive_icon_background: "assets/images/christmas-background.png" # only available for Android 8.0 devices and above
-#   adaptive_icon_background: "#ffffff" # only available for Android 8.0 devices and above
-#   adaptive_icon_foreground: "assets/images/icon-foreground-432x432.png" # only available for Android 8.0 devices and above
-#   min_sdk_android: 21 # android min sdk min:16, default 21
-#   remove_alpha_ios: true
-#   background_color_ios: "#ffffff"
-#   web:
-#     generate: true
-#     image_path: "assets/images/icon-1024x1024.png"
-#     background_color: "#ffffff"
-#     theme_color: "#e29942"
-#   windows:
-#     generate: true
-#     image_path: "assets/images/linux.png"
-#     icon_size: 256 # min:48, max:256, default: 48
-#   macos:
-#     generate: true
-#     image_path: "assets/images/linux.png"
 
 flutter_native_splash:
   color: "#ffffff"
-  image: assets/images/ic_launcher.png
+  image: assets/images/source/ic_launcher_corner.png
   android_12:
-    image: assets/images/ic_launcher_foreground.png
     color: "#ffffff"
+    image: assets/images/source/ic_launcher_foreground.png
 
 ffigen:
   name: 'SingboxNativeLibrary'