Skip to content

Commit d741d0a

Browse files
committed
Merge development into adfastltda/main: resolve conflicts by keeping latest changes from both branches
2 parents f598a93 + 5cc4845 commit d741d0a

70 files changed

Lines changed: 1996 additions & 915 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.
Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build
1+
name: Build and Release
22

33
on:
44
workflow_dispatch:
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/upload-artifact@v4
5454
with:
5555
name: macos-app
56-
path: build/macos/Build/Products/Release
56+
path: build/macos/Build/Products/Release/VPN\ Client.app
5757
build-windows:
5858
name: Build Windows
5959
runs-on: windows-latest
@@ -86,3 +86,22 @@ jobs:
8686
with:
8787
name: linux-app
8888
path: build/linux/x64/release/bundle
89+
release:
90+
name: Create Release
91+
if: ${{ github.ref == 'refs/heads/main' && startsWith(github.ref, 'refs/tags/v') }}
92+
needs: [build-android, build-ios, build-macos, build-windows, build-linux]
93+
runs-on: ubuntu-latest
94+
steps:
95+
- uses: actions/download-artifact@v4
96+
with:
97+
path: artifacts
98+
- uses: softprops/action-gh-release@v2
99+
with:
100+
files: |
101+
artifacts/android-apk/app-release.apk
102+
artifacts/ios-app/Runner.app
103+
artifacts/macos-app/VPNclient.app
104+
artifacts/windows-app/VPNclient.exe
105+
artifacts/linux-app/bundle/
106+
env:
107+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

.github/workflows/release.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.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

0 commit comments

Comments
 (0)