vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of https://github.com/hiddify/hiddify-next

Browse Source
This commit is contained in:
Hiddify
2024-09-03 22:53:46 +02:00
parent d388c1995e 8f932b56fe
commit 3825267945
12 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/winget.yml vendored
View File

@@ -8,10 +8,10 @@ env:
jobs:
publish:
runs-on: windows-latest
runs-on: ubuntu-latest
steps:
- uses: vedantmgoyal2009/winget-releaser@v1
- uses: vedantmgoyal9/winget-releaser@2
with:
identifier: ${{ env.IDENTIFIER }}
version: ${{ github.event.release.tag_name }}
token: ${{ secrets.WINGET_TOKEN }}
token: ${{ secrets.WINGET_TOKEN }}

45
HISTORY.md
View File

@@ -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.

1
assets/translations/strings_en.i18n.json
View File

@@ -180,6 +180,7 @@
"af": "Afghanistan (af) 🇦🇫",
"id": "Indonesia (id) 🇮🇩",
"tr": "Türkiye (tr) 🇹🇷",
"br": "Brazil (br) 🇧🇷",
"other": "Other"
},
"themeMode": "Theme Mode",

5
assets/translations/strings_ru.i18n.json
View File

@@ -420,5 +420,10 @@
"warpNoiseSize": "Размер шума",
"warpNoiseMode": "Шумовой режим",
"warpNoiseDelay": "Задержка шума"
},
"window": {
"hide": "Скрыть",
"close": "Закрыть",
"alertMessage": "Скрыть или выйти из приложения?"
}
}

2
dependencies.properties
View File

@@ -1 +1 @@
core.version=2.1.5
core.version=2.3.0

12
ios/Runner.xcodeproj/project.pbxproj
View File

@@ -759,7 +759,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = HiddifyPacketTunnel/HiddifyPacketTunnel.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;
@@ -778,7 +778,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";
@@ -809,7 +809,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = HiddifyPacketTunnel/HiddifyPacketTunnel.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;
@@ -828,7 +828,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";
@@ -857,7 +857,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = HiddifyPacketTunnel/HiddifyPacketTunnel.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;
@@ -876,7 +876,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";

2
lib/core/model/region.dart
View File

@@ -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,
};
}

16
lib/features/common/nested_app_bar.dart
View File

@@ -40,13 +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: () {
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,

2
libcore

Submodule libcore updated: 3874832ccf...a4caf23ee6

4
pubspec.lock
View File

@@ -1934,10 +1934,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:

2
pubspec.yaml
View File

@@ -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"

2
windows/packaging/msix/make_config.yaml
View File

@@ -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