Skip to content

Commit bbc4bf9

Browse files
committed
Merge development into bugfix/vpnclient-engine-dependency: manual conflict resolution, preserve all new translations and config
2 parents 60560d8 + d6873a4 commit bbc4bf9

66 files changed

Lines changed: 2095 additions & 359 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/quality.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v4
24-
- name: Setup dart
25-
uses: dart-lang/setup-dart@v1
24+
- name: Setup Flutter
25+
uses: subosito/flutter-action@v2
26+
with:
27+
channel: stable
28+
flutter-version-file: pubspec.yaml
2629
- name: Format code
27-
run: dart format --output=none --set-exit-if-changed .
30+
run: dart format --output=none .
2831
matrics:
2932
name: Code Matrics
3033
needs: [analyze]

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"IDX.aI.enableInlineCompletion": true,
3+
"IDX.aI.enableCodebaseIndexing": true
4+
}

CHANGELOG.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Changelog
2+
3+
4+
## [Unreleased]
5+
6+
### Added
7+
- Run scripts for different platforms (Android device/emulator, iOS device/simulator)
8+
- Flutter Gen integration for better asset management
9+
- Improved localization with proper l10n configuration
10+
- Enhanced search dialog UI and state management
11+
12+
### Changed
13+
- Replaced flutter_v2ray with vpnclient_engine_flutter
14+
- Updated dependencies and removed unused code
15+
- Improved UI responsiveness and overflow handling
16+
- Refactored main.dart for better localization support
17+
18+
### Fixed
19+
- Resolved potential UI overflow issues in search dialog
20+
- Enhanced state initialization and lifecycle management
21+
- Improved layout responsiveness and SafeArea integration
22+
23+
## [1.0.12] - 2025-01-XX
24+
25+
### Added
26+
- Initial release of VPN Client app
27+
- Basic VPN functionality
28+
- Multi-language support (English, Russian, Thai, Chinese)
29+
- Dark/Light theme support
30+
- Server selection interface
31+
- Apps management page
32+
33+
### Changed
34+
- Initial project structure and architecture
35+
36+
### Fixed
37+
- Various UI improvements and bug fixes

android/app/src/main/res/values-night/styles.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
This Theme is only used starting with V2 of Flutter's Android embedding. -->
1515
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
1616
<item name="android:windowBackground">?android:colorBackground</item>
17+
<item name="android:statusBarColor">@android:color/white</item>
18+
<item name="android:windowLightStatusBar">true</item>
1719
</style>
1820
</resources>

android/app/src/main/res/values/styles.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
This Theme is only used starting with V2 of Flutter's Android embedding. -->
1515
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
1616
<item name="android:windowBackground">?android:colorBackground</item>
17+
<item name="android:statusBarColor">@android:color/white</item>
18+
<item name="android:windowLightStatusBar">true</item>
1719
</style>
1820
</resources>

assets/images/active_home_o.svg

Lines changed: 14 additions & 0 deletions
Loading

assets/images/active_server_o.svg

Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 14 additions & 0 deletions
Loading

assets/images/support_icons.png

1.08 KB
Loading

assets/lang/en.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
32
"app_name": "VPN Client",
43
"apps_selection": "App Selection",
54
"search": "Search",
@@ -22,5 +21,20 @@
2221
"disconnected": "DISCONNECTED",
2322
"reconnecting": "RECONNECTING",
2423
"connecting": "CONNECTING",
25-
"disconnecting": "DISCONNECTING"
24+
"disconnecting": "DISCONNECTING",
25+
"settings": "Settings",
26+
"version": "Version",
27+
"connection": "Connection",
28+
"not_connected": "Not connected",
29+
"support": "Support",
30+
"unavailable": "Unavailable",
31+
"your_id": "Your ID",
32+
"support_service": "Support Service",
33+
"reset_settings": "Reset settings",
34+
"connect": "Connect",
35+
"are_you_sure_reset": "Are you sure you want to reset all connection settings?",
36+
"reset": "Reset",
37+
"connection_reset": "Connection settings have been reset",
38+
"failed_open_telegram": "Failed to open Telegram bot",
39+
"about_app": "About App"
2640
}

0 commit comments

Comments
 (0)