black screen and running issue on Windows | shared_preferences conflict between portable and exe on Windows | AppImage running on arch etc… | linux build in ci | add .AppImage release next to the tar | replace ir shir flag | add background for dmg format

.github/workflows/build.yml

@@ -20,6 +20,7 @@ env:
   UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}"
   TAG_NAME: "${{ inputs.tag-name }}"
   TARGET_NAME_gz: "Hiddify-Linux-x64-AppImage.tar"
+  TARGET_NAME_AppImage: "Hiddify-Linux-x64-AppImage"
   TARGET_NAME_deb: "Hiddify-Debian-x64"
   # TARGET_NAME_rpm: "Hiddify-rpm-x64"
   TARGET_NAME_apk: "Hiddify-Android"
@@ -64,18 +65,23 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - platform: android-apk
-          #   os: ubuntu-latest
-          #   targets: apk
+          - platform: android-apk
+            os: ubuntu-latest
+            targets: apk
 
           - platform: android-aab
             os: ubuntu-latest
             targets: aab
 
-          # - platform: windows
-          #   os: windows-latest
-          #   aarch: amd64
-          #   targets: exe,msix,zip
+          - platform: windows
+            os: windows-latest
+            aarch: amd64
+            targets: exe,msix,zip
+
+          - platform: linux
+            os: ubuntu-22.04
+            aarch: amd64
+            targets: deb,gz,AppImage
 
           # - platform: linux-amd64
           #   os: ubuntu-22.04
@@ -97,10 +103,10 @@ jobs:
           #   aarch: arm64
           #   targets: deb,gz
 
-          # - platform: macos
-          #   os: macos-15
-          #   aarch: universal
-          #   targets: dmg,pkg
+          - platform: macos
+            os: macos-15
+            aarch: universal
+            targets: dmg,pkg
 
           # - platform: ios
           #   os: macos-15
@@ -133,21 +139,21 @@ jobs:
 
 
 
-      - name: Setup Flutter for arm64
-        if: ${{ startsWith(matrix.platform,'linux-arm64') }}
-        uses: hurelhuyag/flutter-arm64-action@HEAD
-        with:
-          channel: 'stable'
-          flutter-version: ${{ env.FLUTTER_VERSION }}
+      # - name: Setup Flutter for arm64
+      #   if: ${{ startsWith(matrix.platform,'linux-arm64') }}
+      #   uses: hurelhuyag/flutter-arm64-action@HEAD
+      #   with:
+      #     channel: 'stable'
+      #     flutter-version: ${{ env.FLUTTER_VERSION }}
 
       - name: Setup Flutter
-        if: ${{ !startsWith(matrix.platform, 'linux-arm64') }}
         uses: subosito/flutter-action@v2.21.0 #issue with 2.13
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           # flutter-version-file: pubspec.yaml
           channel: 'stable'
           cache: true
+
       - name: Clean up disk space
         if: startsWith(matrix.platform,'android')
         run: |

Makefile

@@ -92,7 +92,7 @@ ios-prepare: common-prepare ios-libs
 	cd ios; pod repo update; pod install;echo "done ios prepare"
 
 macos-prepare: common-prepare macos-libs
-linux-prepare: common-prepare linux-libs
+linux-prepare: common-prepare linux-amd64-libs
 
 
 linux-amd64-prepare: common-prepare linux-amd64-libs
@@ -388,6 +388,8 @@ linux-appimage-release:
 	sed -i '/^\[Desktop Entry\]/a StartupWMClass=app.hiddify.com' "squashfs-root/hiddify.desktop"; \
 	$(BLUE)Removing old AppImage$(DONE); \
 	rm *.AppImage; \
+	$(BLUE)Deleting bundled libstdc++ to fix Arch Linux compatibility...$(DONE); \
+	find squashfs-root/usr/lib -name "libstdc++.so.6" -delete; \
 	$(BLUE)Rebuilding AppImage$(DONE); \
 	ARCH=x86_64 appimagetool --no-appstream squashfs-root Hiddify.AppImage > /dev/null; \
 	$(BLUE)Cleaning up squashfs$(DONE); \
@@ -396,8 +398,8 @@ linux-appimage-release:
 	PKG_DIR_NAME="hiddify-linux-appimage"; \
 	$(BLUE)Creating dir: $$PKG_DIR_NAME$(DONE); \
 	mkdir -p "$$PKG_DIR_NAME"; \
-	$(BLUE)Moving and Renaming to Hiddify.AppImage$(DONE); \
-	mv "Hiddify.AppImage" "$$PKG_DIR_NAME/Hiddify.AppImage"; \
+	$(BLUE)Moving Hiddify.AppImage$(DONE); \
+	cp -p "Hiddify.AppImage" "$$PKG_DIR_NAME/Hiddify.AppImage"; \
 	$(BLUE)Creating Portable Home directory$(DONE); \
 	mkdir -p "$$PKG_DIR_NAME/Hiddify.AppImage.home"; \
 	$(BLUE)Compressing to .tar.gz$(DONE); \

assets/translations/ar.i18n.json

@@ -279,13 +279,13 @@
         },
         "region": "المنطقة",
         "regions": {
-          "ir": "إيران (ir) 🇮🇷",
-          "cn": "الصين (cn) 🇨🇳",
-          "ru": "روسيا (ru) 🇷🇺",
-          "af": "أفغانستان (af) 🇦🇫",
-          "id": "إندونيسيا (id) 🇮🇩",
-          "tr": "تركيا (tr) 🇹🇷",
-          "br": "البرازيل (br) 🇧🇷",
+          "ir": "إيران (ir)",
+          "cn": "الصين (cn)",
+          "ru": "روسيا (ru)",
+          "af": "أفغانستان (af)",
+          "id": "إندونيسيا (id)",
+          "tr": "تركيا (tr)",
+          "br": "البرازيل (br)",
           "other": "أخرى"
         },
         "balancerStrategy": {

assets/translations/en.i18n.json

@@ -274,13 +274,13 @@
         },
         "region": "Region",
         "regions": {
-          "ir": "Iran (ir) 🇮🇷",
-          "cn": "China (cn) 🇨🇳",
-          "ru": "Russia (ru) 🇷🇺",
-          "af": "Afghanistan (af) 🇦🇫",
-          "id": "Indonesia (id) 🇮🇩",
-          "tr": "Türkiye (tr) 🇹🇷",
-          "br": "Brazil (br) 🇧🇷",
+          "ir": "Iran (ir)",
+          "cn": "China (cn)",
+          "ru": "Russia (ru)",
+          "af": "Afghanistan (af)",
+          "id": "Indonesia (id)",
+          "tr": "Türkiye (tr)",
+          "br": "Brazil (br)",
           "other": "Other"
         },
         "balancerStrategy": {

assets/translations/es.i18n.json

@@ -273,13 +273,13 @@
         },
         "region": "Región",
         "regions": {
-          "ir": "Irán (ir) 🇮🇷",
-          "cn": "China (cn) 🇨🇳",
-          "ru": "Rusia (ru) 🇷🇺",
-          "af": "Afganistán (af) 🇦🇫",
-          "id": "Indonesia (id) 🇮🇩",
-          "tr": "Turquía (tr) 🇹🇷",
-          "br": "Brasil (br) 🇧🇷",
+          "ir": "Irán (ir)",
+          "cn": "China (cn)",
+          "ru": "Rusia (ru)",
+          "af": "Afganistán (af)",
+          "id": "Indonesia (id)",
+          "tr": "Turquía (tr)",
+          "br": "Brasil (br)",
           "other": "Otro"
         },
         "balancerStrategy": {

assets/translations/fa.i18n.json

@@ -273,13 +273,13 @@
         },
         "region": "منطقه",
         "regions": {
-          "ir": "ایران (ir) 🇮🇷",
-          "cn": "چین (cn) 🇨🇳",
-          "ru": "روسیه (ru) 🇷🇺",
-          "af": "افغانستان (af) 🇦🇫",
-          "id": "اندونزی (id) 🇮🇩",
-          "tr": "ترکیه (tr) 🇹🇷",
-          "br": "برزیل (br) 🇧🇷",
+          "ir": "ایران (ir)",
+          "cn": "چین (cn)",
+          "ru": "روسیه (ru)",
+          "af": "افغانستان (af)",
+          "id": "اندونزی (id)",
+          "tr": "ترکیه (tr)",
+          "br": "برزیل (br)",
           "other": "سایر"
         },
         "balancerStrategy": {

assets/translations/fr.i18n.json

@@ -273,13 +273,13 @@
         },
         "region": "Région",
         "regions": {
-          "ir": "Iran (ir) 🇮🇷",
-          "cn": "Chine (cn) 🇨🇳",
-          "ru": "Russie (ru) 🇷🇺",
-          "af": "Afghanistan (af) 🇦🇫",
-          "id": "Indonésie (id) 🇮🇩",
-          "tr": "Turquie (tr) 🇹🇷",
-          "br": "Brésil (br) 🇧🇷",
+          "ir": "Iran (ir)",
+          "cn": "Chine (cn)",
+          "ru": "Russie (ru)",
+          "af": "Afghanistan (af)",
+          "id": "Indonésie (id)",
+          "tr": "Turquie (tr)",
+          "br": "Brésil (br)",
           "other": "Autre"
         },
         "balancerStrategy": {

assets/translations/id.i18n.json

@@ -273,13 +273,13 @@
         },
         "region": "Wilayah",
         "regions": {
-          "ir": "Iran (ir) 🇮🇷",
-          "cn": "Tiongkok (cn) 🇨🇳",
-          "ru": "Rusia (ru) 🇷🇺",
-          "af": "Afghanistan (af) 🇦🇫",
-          "id": "Indonesia (id) 🇮🇩",
-          "tr": "Turki (tr) 🇹🇷",
-          "br": "Brasil (br) 🇧🇷",
+          "ir": "Iran (ir)",
+          "cn": "Tiongkok (cn)",
+          "ru": "Rusia (ru)",
+          "af": "Afghanistan (af)",
+          "id": "Indonesia (id)",
+          "tr": "Turki (tr)",
+          "br": "Brasil (br)",
           "other": "Lainnya"
         },
         "balancerStrategy": {

assets/translations/pt-BR.i18n.json

@@ -273,13 +273,13 @@
         },
         "region": "Região",
         "regions": {
-          "ir": "Irã (ir) 🇮🇷",
-          "cn": "China (cn) 🇨🇳",
-          "ru": "Rússia (ru) 🇷🇺",
-          "af": "Afeganistão (af) 🇦🇫",
-          "id": "Indonésia (id) 🇮🇩",
-          "tr": "Turquia (tr) 🇹🇷",
-          "br": "Brasil (br) 🇧🇷",
+          "ir": "Irã (ir)",
+          "cn": "China (cn)",
+          "ru": "Rússia (ru)",
+          "af": "Afeganistão (af)",
+          "id": "Indonésia (id)",
+          "tr": "Turquia (tr)",
+          "br": "Brasil (br)",
           "other": "Outro"
         },
         "balancerStrategy": {

assets/translations/ru.i18n.json

@@ -277,13 +277,13 @@
         },
         "region": "Регион",
         "regions": {
-          "ir": "Иран (ir) 🇮🇷",
-          "cn": "Китай (cn) 🇨🇳",
-          "ru": "Россия (ru) 🇷🇺",
-          "af": "Афганистан (af) 🇦🇫",
-          "id": "Индонезия (id) 🇮🇩",
-          "tr": "Турция (tr) 🇹🇷",
-          "br": "Бразилия (br) 🇧🇷",
+          "ir": "Иран (ir)",
+          "cn": "Китай (cn)",
+          "ru": "Россия (ru)",
+          "af": "Афганистан (af)",
+          "id": "Индонезия (id)",
+          "tr": "Турция (tr)",
+          "br": "Бразилия (br)",
           "other": "Другой"
         },
         "balancerStrategy": {

assets/translations/tr.i18n.json

@@ -273,13 +273,13 @@
         },
         "region": "Bölge",
         "regions": {
-          "ir": "İran (ir) 🇮🇷",
-          "cn": "Çin (cn) 🇨🇳",
-          "ru": "Rusya (ru) 🇷🇺",
-          "af": "Afganistan (af) 🇦🇫",
-          "id": "Endonezya (id) 🇮🇩",
-          "tr": "Türkiye (tr) 🇹🇷",
-          "br": "Brezilya (br) 🇧🇷",
+          "ir": "İran (ir)",
+          "cn": "Çin (cn)",
+          "ru": "Rusya (ru)",
+          "af": "Afganistan (af)",
+          "id": "Endonezya (id)",
+          "tr": "Türkiye (tr)",
+          "br": "Brezilya (br)",
           "other": "Diğer"
         },
         "balancerStrategy": {

assets/translations/zh-CN.i18n.json

@@ -273,13 +273,13 @@
         },
         "region": "地区",
         "regions": {
-          "ir": "伊朗 (ir) 🇮🇷",
-          "cn": "中国 (cn) 🇨🇳",
-          "ru": "俄罗斯 (ru) 🇷🇺",
-          "af": "阿富汗 (af) 🇦🇫",
-          "id": "印度尼西亚 (id) 🇮🇩",
-          "tr": "土耳其 (tr) 🇹🇷",
-          "br": "巴西 (br) 🇧🇷",
+          "ir": "伊朗 (ir)",
+          "cn": "中国 (cn)",
+          "ru": "俄罗斯 (ru)",
+          "af": "阿富汗 (af)",
+          "id": "印度尼西亚 (id)",
+          "tr": "土耳其 (tr)",
+          "br": "巴西 (br)",
           "other": "其他"
         },
         "balancerStrategy": {

assets/translations/zh-TW.i18n.json

@@ -273,13 +273,13 @@
         },
         "region": "地區",
         "regions": {
-          "ir": "伊朗 (ir) 🇮🇷",
-          "cn": "中國 (cn) 🇨🇳",
-          "ru": "俄羅斯 (ru) 🇷🇺",
-          "af": "阿富汗 (af) 🇦🇫",
-          "id": "印尼 (id) 🇮🇩",
-          "tr": "土耳其 (tr) 🇹🇷",
-          "br": "巴西 (br) 🇧🇷",
+          "ir": "伊朗 (ir)",
+          "cn": "中國 (cn)",
+          "ru": "俄羅斯 (ru)",
+          "af": "阿富汗 (af)",
+          "id": "印尼 (id)",
+          "tr": "土耳其 (tr)",
+          "br": "巴西 (br)",
           "other": "其他"
         },
         "balancerStrategy": {

lib/core/preferences/preferences_provider.dart

@@ -1,5 +1,7 @@
 import 'dart:io';
 
+import 'package:hiddify/core/model/environment.dart';
+import 'package:hiddify/utils/platform_utils.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:loggy/loggy.dart';
 import 'package:path/path.dart' as p;
@@ -16,6 +18,7 @@ Future<SharedPreferences> sharedPreferences(Ref ref) async {
 
   logger.debug("initializing preferences");
   try {
+    if (PlatformUtils.isWindows && Environment.isPortable) SharedPreferences.setPrefix('portable.');
     sharedPreferences = await SharedPreferences.getInstance();
   } catch (e) {
     logger.error("error initializing preferences", e);