From af0011a607677487d1fa8b1745bf0f67ef1bc3fa Mon Sep 17 00:00:00 2001 From: sillydillydiddy Date: Tue, 27 Aug 2024 21:09:41 -0400 Subject: [PATCH 01/11] =?UTF-8?q?chore:=20update=20translations=20with=20F?= =?UTF-8?q?ink=20=F0=9F=90=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/translations/strings_ru.i18n.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assets/translations/strings_ru.i18n.json b/assets/translations/strings_ru.i18n.json index b9c0cf70..a5ae83c7 100644 --- a/assets/translations/strings_ru.i18n.json +++ b/assets/translations/strings_ru.i18n.json @@ -420,5 +420,10 @@ "warpNoiseSize": "Размер шума", "warpNoiseMode": "Шумовой режим", "warpNoiseDelay": "Задержка шума" + }, + "window": { + "hide": "Скрыть", + "close": "Закрыть", + "alertMessage": "Скрыть или выйти из приложения?" } } From 21096144a337d5a1dd08526c9ec05994e608142b Mon Sep 17 00:00:00 2001 From: tension Date: Wed, 28 Aug 2024 10:10:07 +0800 Subject: [PATCH 02/11] fix: Black screenn when press back button --- lib/features/common/nested_app_bar.dart | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/features/common/nested_app_bar.dart b/lib/features/common/nested_app_bar.dart index 6848d181..194ba541 100644 --- a/lib/features/common/nested_app_bar.dart +++ b/lib/features/common/nested_app_bar.dart @@ -40,13 +40,7 @@ class NestedAppBar extends StatelessWidget { RootScaffold.stateKey.currentState?.openDrawer(); }, ) - : IconButton( - icon: Icon(context.isRtl ? Icons.arrow_forward : Icons.arrow_back), - padding: EdgeInsets.only(right: context.isRtl ? 50 : 0), - onPressed: () { - Navigator.of(context).pop(); // Pops the current route off the navigator stack - }, - ), + : null, title: title, actions: actions, pinned: pinned, From 8a3f73209981eabc4de8b62b6e3d2a50f1337bbc Mon Sep 17 00:00:00 2001 From: Vedant <83997633+vedantmgoyal9@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:11:03 +0530 Subject: [PATCH 03/11] Update winget-releaser to latest --- .github/workflows/winget.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index e34f4691..e4274caf 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -10,8 +10,8 @@ jobs: publish: runs-on: windows-latest steps: - - uses: vedantmgoyal2009/winget-releaser@v1 + - uses: vedantmgoyal9/winget-releaser@main with: identifier: ${{ env.IDENTIFIER }} version: ${{ github.event.release.tag_name }} - token: ${{ secrets.WINGET_TOKEN }} \ No newline at end of file + token: ${{ secrets.WINGET_TOKEN }} From f691afdcf31168a9d3cba05b09bde6ace3bd2db8 Mon Sep 17 00:00:00 2001 From: Vedant <83997633+vedantmgoyal9@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:20:52 +0530 Subject: [PATCH 04/11] Update winget.yml --- .github/workflows/winget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index e4274caf..02d2c28f 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -8,7 +8,7 @@ env: jobs: publish: - runs-on: windows-latest + runs-on: ubuntu-latest steps: - uses: vedantmgoyal9/winget-releaser@main with: From 273c91b9ae34ff29c1402252b02ec35854b3fac5 Mon Sep 17 00:00:00 2001 From: lymanjre <125398461+lymanjre@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:14:23 +0330 Subject: [PATCH 05/11] Update warp --- test.configs/warp | 1 + 1 file changed, 1 insertion(+) diff --git a/test.configs/warp b/test.configs/warp index 116d22b2..a225366d 100644 --- a/test.configs/warp +++ b/test.configs/warp @@ -5,6 +5,7 @@ //profile-web-page-url: https://hiddify.com warp://p1@188.114.97.170:894?ifp=40-80&ifps=40-100&ifpd=4-8&ifpm=m4#m4&&detour=warp://p2@188.114.97.170:894#warp in warp +warp://auto?ifp=40-80&ifps=40-100&ifpd=4-8&ifpm=m4&&detour=warp://188.114.97.170#warp in warp 2 warp://p1@auto?ifpm=m4#LocalIP&&detour=warp://p2@auto#WarpInWarp✅ #warp://p1@ip1?ifp=1-3#WarpInWarp✅&&detour=warp://p2@ip2ifp=1-3#Warp 🇮🇷 IP From 7a5a1acf9160e4842c8bb039f47a0aac16116a68 Mon Sep 17 00:00:00 2001 From: lymanjre <125398461+lymanjre@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:18:20 +0330 Subject: [PATCH 06/11] Update warp --- test.configs/warp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.configs/warp b/test.configs/warp index a225366d..a09b32ae 100644 --- a/test.configs/warp +++ b/test.configs/warp @@ -5,7 +5,7 @@ //profile-web-page-url: https://hiddify.com warp://p1@188.114.97.170:894?ifp=40-80&ifps=40-100&ifpd=4-8&ifpm=m4#m4&&detour=warp://p2@188.114.97.170:894#warp in warp -warp://auto?ifp=40-80&ifps=40-100&ifpd=4-8&ifpm=m4&&detour=warp://188.114.97.170#warp in warp 2 +warp://auto?ifp=40-80&ifps=40-100&ifpd=4-8&ifpm=m4&&detour=warp://188.114.97.170#WoW2 warp://p1@auto?ifpm=m4#LocalIP&&detour=warp://p2@auto#WarpInWarp✅ #warp://p1@ip1?ifp=1-3#WarpInWarp✅&&detour=warp://p2@ip2ifp=1-3#Warp 🇮🇷 IP From 5aa55b50a4187810d258c29f84b65510758fcad6 Mon Sep 17 00:00:00 2001 From: tension Date: Sat, 31 Aug 2024 11:57:39 +0800 Subject: [PATCH 07/11] revert: Keep button, add judgment --- lib/features/common/nested_app_bar.dart | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/features/common/nested_app_bar.dart b/lib/features/common/nested_app_bar.dart index 194ba541..6bf377f5 100644 --- a/lib/features/common/nested_app_bar.dart +++ b/lib/features/common/nested_app_bar.dart @@ -40,7 +40,15 @@ class NestedAppBar extends StatelessWidget { RootScaffold.stateKey.currentState?.openDrawer(); }, ) - : null, + : IconButton( + icon: Icon(context.isRtl ? Icons.arrow_forward : Icons.arrow_back), + padding: EdgeInsets.only(right: context.isRtl ? 50 : 0), + onPressed: () { + if (Navigator.of(context).canPop()){ + Navigator.of(context).pop(); // Pops the current route off the navigator stack + } + }, + ), title: title, actions: actions, pinned: pinned, From eac586bcb9510a96b2ccc29d4791059e0a335673 Mon Sep 17 00:00:00 2001 From: Hiddify <114227601+hiddify-com@users.noreply.github.com> Date: Sun, 1 Sep 2024 20:28:00 +0200 Subject: [PATCH 08/11] Update winget.yml --- .github/workflows/winget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index 02d2c28f..103b439e 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -10,7 +10,7 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: vedantmgoyal9/winget-releaser@main + - uses: vedantmgoyal9/winget-releaser@2 with: identifier: ${{ env.IDENTIFIER }} version: ${{ github.event.release.tag_name }} From 4bef9628126d61c2c96fd1985778c9c32f966538 Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Mon, 2 Sep 2024 04:44:35 +0200 Subject: [PATCH 09/11] new: add brazil region --- assets/translations/strings_en.i18n.json | 1 + lib/core/model/region.dart | 2 ++ 2 files changed, 3 insertions(+) diff --git a/assets/translations/strings_en.i18n.json b/assets/translations/strings_en.i18n.json index f4ff1fcb..01a02cbf 100644 --- a/assets/translations/strings_en.i18n.json +++ b/assets/translations/strings_en.i18n.json @@ -180,6 +180,7 @@ "af": "Afghanistan (af) 🇦🇫", "id": "Indonesia (id) 🇮🇩", "tr": "Türkiye (tr) 🇹🇷", + "br": "Brazil (br) 🇧🇷", "other": "Other" }, "themeMode": "Theme Mode", diff --git a/lib/core/model/region.dart b/lib/core/model/region.dart index cf8dabd9..cee54e9f 100644 --- a/lib/core/model/region.dart +++ b/lib/core/model/region.dart @@ -7,6 +7,7 @@ enum Region { af, id, tr, + br, other; String present(TranslationsEn t) => switch (this) { @@ -16,6 +17,7 @@ enum Region { tr => t.settings.general.regions.tr, af => t.settings.general.regions.af, id => t.settings.general.regions.id, + br => t.settings.general.regions.br, other => t.settings.general.regions.other, }; } From 567208283f49ea7e48d360101b047b70166e013d Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Mon, 2 Sep 2024 05:40:51 +0200 Subject: [PATCH 10/11] hide back icon when no back --- dependencies.properties | 2 +- lib/features/common/nested_app_bar.dart | 18 +++++++++--------- libcore | 2 +- pubspec.lock | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index c589c35f..30ef6715 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -1 +1 @@ -core.version=2.1.5 \ No newline at end of file +core.version=2.3.0 \ No newline at end of file diff --git a/lib/features/common/nested_app_bar.dart b/lib/features/common/nested_app_bar.dart index 6bf377f5..4566ad15 100644 --- a/lib/features/common/nested_app_bar.dart +++ b/lib/features/common/nested_app_bar.dart @@ -40,15 +40,15 @@ class NestedAppBar extends StatelessWidget { RootScaffold.stateKey.currentState?.openDrawer(); }, ) - : IconButton( - icon: Icon(context.isRtl ? Icons.arrow_forward : Icons.arrow_back), - padding: EdgeInsets.only(right: context.isRtl ? 50 : 0), - onPressed: () { - if (Navigator.of(context).canPop()){ - Navigator.of(context).pop(); // Pops the current route off the navigator stack - } - }, - ), + : (Navigator.of(context).canPop() + ? IconButton( + icon: Icon(context.isRtl ? Icons.arrow_forward : Icons.arrow_back), + padding: EdgeInsets.only(right: context.isRtl ? 50 : 0), + onPressed: () { + Navigator.of(context).pop(); // Pops the current route off the navigator stack + }, + ) + : null), title: title, actions: actions, pinned: pinned, diff --git a/libcore b/libcore index 3874832c..a4caf23e 160000 --- a/libcore +++ b/libcore @@ -1 +1 @@ -Subproject commit 3874832ccf0bf312f9310829a2b4043febf17f27 +Subproject commit a4caf23ee6d7d60a0ecd983f2268109b353cefc7 diff --git a/pubspec.lock b/pubspec.lock index bd665d1a..87f24145 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1933,10 +1933,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.4" + version: "14.2.5" watcher: dependency: "direct main" description: From 8f932b56fe045e990f3b48da5477ab6070ca9cd9 Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Mon, 2 Sep 2024 05:42:55 +0200 Subject: [PATCH 11/11] release: version 2.3.0 --- HISTORY.md | 45 ++++++++++++++++++++++++- ios/Runner.xcodeproj/project.pbxproj | 12 +++---- pubspec.yaml | 2 +- windows/packaging/msix/make_config.yaml | 2 +- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index d20362df..ca4053bc 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,7 +1,48 @@ # Changelog -## 2.2.0 (2024-08-21) +## 2.3.0 (2024-09-02) + +#### New + +* Add brazil region. + +#### Fix + +* Black screenn when press back button. + +#### Other + +* Hide back icon when no back. + +* Merge pull request #1277 from sillydillydiddy/main. + _Update translations_ + +* Chore: update translations with Fink 🐦 + +* Merge pull request #1282 from vedantmgoyal9/patch-1. + _Update winget-releaser to latest_ + +* Update winget.yml. + +* Update winget.yml. + +* Update winget-releaser to latest. + +* Merge pull request #1278 from tensionc/main. + _fix: Black screenn when press back button_ + +* Merge remote-tracking branch 'origin/main' + +* Update warp. + +* Update warp. + +* Revert: Keep button, add judgment. + + + +## v2.2.0 (2024-08-21) #### New @@ -15,6 +56,8 @@ #### Fix +* Bug. + * Some hard coded items. * Apple bug. diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d5080a19..7bd4d9b0 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -772,7 +772,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = SingBoxPacketTunnel/SingBoxPacketTunnel.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 20200; + CURRENT_PROJECT_VERSION = 20300; ENABLE_USER_SCRIPT_SANDBOXING = YES; EXCLUDED_ARCHS = armv7; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -791,7 +791,7 @@ "@executable_path/libcore/", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 2.2.0; + MARKETING_VERSION = 2.3.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_LDFLAGS = "-lresolv"; @@ -822,7 +822,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = SingBoxPacketTunnel/SingBoxPacketTunnel.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 20200; + CURRENT_PROJECT_VERSION = 20300; ENABLE_USER_SCRIPT_SANDBOXING = YES; EXCLUDED_ARCHS = armv7; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -841,7 +841,7 @@ "@executable_path/libcore/", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 2.2.0; + MARKETING_VERSION = 2.3.0; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-lresolv"; @@ -870,7 +870,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = SingBoxPacketTunnel/SingBoxPacketTunnel.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 20200; + CURRENT_PROJECT_VERSION = 20300; ENABLE_USER_SCRIPT_SANDBOXING = YES; EXCLUDED_ARCHS = armv7; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -889,7 +889,7 @@ "@executable_path/libcore/", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 2.2.0; + MARKETING_VERSION = 2.3.0; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-lresolv"; diff --git a/pubspec.yaml b/pubspec.yaml index 14b3c071..820a27f2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: hiddify description: Cross Platform Multi Protocol Proxy Frontend. publish_to: "none" -version: 2.2.0+20200 +version: 2.3.0+20300 environment: sdk: ">=3.3.0 <4.0.0" diff --git a/windows/packaging/msix/make_config.yaml b/windows/packaging/msix/make_config.yaml index 0f946dda..05a9719d 100644 --- a/windows/packaging/msix/make_config.yaml +++ b/windows/packaging/msix/make_config.yaml @@ -1,7 +1,7 @@ display_name: Hiddify publisher_display_name: Hiddify identity_name: Hiddify.HiddifyNext -msix_version: 2.2.0.0 +msix_version: 2.3.0.0 logo_path: windows\runner\resources\app_icon.ico capabilities: internetClient, internetClientServer, privateNetworkClientServer languages: en-us, zh-cn, zh-tw, tr-tr,fa-ir,ru-ru,pt-br,es-es