Skip to content

Commit 8d8098e

Browse files
Merge branch 'release'
2 parents 33becb9 + 5d92b4e commit 8d8098e

103 files changed

Lines changed: 1766 additions & 770 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.

.env.exmaple

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ LINK_APP_STORE=https://apps.apple.com/us/app/your-app/idXXXXXXXXXX
3131
LINK_TEST_FLIGHT=https://testflight.apple.com/join/XXXXXXXX
3232
LINK_GITHUB=https://github.com/your-org/your-repo
3333
LINK_GOOGLE_PLAY=https://play.google.com/store/apps/details?id=com.example.yourapp
34+
LINK_MICROSOFT_STORE=
3435

3536
# App Settings
3637
UPDATE_FLOWLINE_PERIOD=100

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
11
### Change Description
2+
Briefly describe what this PR does and why. Keep it short and clear.
23

3-
What does this change add to or fix in the project?
4+
---
45

5-
### Checklist
6+
### Related Platforms
7+
> Which platforms are affected by your changes? Check only the ones you actually tested.
68
7-
- Code has been built and tested:
8-
- **iOS**
9-
- [ ] Real device
10-
- [ ] Simulator
11-
- **iPad**
12-
- [ ] Real device
13-
- [ ] Simulator
14-
- **Android**
15-
- [ ] Real device
16-
- [ ] Emulator
9+
- [ ] Android
10+
- [ ] iOS
11+
- [ ] iPad
12+
- [ ] Windows
13+
- [ ] Linux
14+
- [ ] Android TV
15+
- [ ] OpenWrt
1716

18-
- [ ] App output has been tested on real devices and VPN functionality works correctly.
19-
- [ ] Unit and E2E tests have been written for critical parts of the code.
20-
- [ ] Relevant documentation (Documentation or README references) has been updated.
21-
- [ ] Compatibility and regression checks across different OS versions have been performed.
22-
- [ ] Verified there are no security, connection, or error-handling issues.
23-
- [ ] Confirmed there are no crashes or freezes on real devices.
17+
---
2418

25-
### Related Links
19+
### Verification Checklist
20+
> Make sure the things you checked actually work. It's okay if you didn't test everything.
21+
22+
- [ ] Project builds successfully
23+
- [ ] App runs without crashes on tested platforms
24+
- [ ] VPN connection works correctly
25+
- [ ] No obvious regressions observed
26+
- [ ] Documentation updated (if needed)
27+
28+
---
2629

27-
- Link to any related issue or feature in the repository. Example: Closes #123
30+
### Optional (for bigger changes)
31+
- [ ] Added or updated unit / E2E tests
32+
- [ ] Checked security and edge cases
33+
34+
---
35+
36+
### Related Links
37+
Closes #ID.

.github/release_message.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,18 @@
5555
</tr>
5656
<tr>
5757
<td>
58-
<img src="https://img.shields.io/badge/Windows-Upcoming-0C88D8.svg?logo=gitforwindows">
58+
<a href="https://apps.microsoft.com/detail/9n0qtbzz4kx4?hl=en-US&gl=US" target="_blank">
59+
<img src="https://img.shields.io/badge/Windows-Microsoft Store-08559e.svg?logo=gitforwindows">
60+
</a>
61+
<br />
62+
<img src="https://img.shields.io/badge/Windows-Setup (Upcoming)-0C88D8.svg?logo=github" />
63+
<br />
64+
<a href="https://github.com/UnboundTechCo/defyxVPN/releases/download/RELEASE_TAG/windows-release.zip">
65+
<img src="https://img.shields.io/badge/Windows-Portable-0C88D8.svg?logo=github" />
66+
</a>
5967
</td>
6068
<td valign="top">
61-
-
69+
10 or later
6270
</td>
6371
</tr>
6472
<tr>

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
chmod +x scripts/build_release.sh
101101
bash scripts/build_release.sh <<EOF
102102
2
103-
4
103+
3
104104
4
105105
EOF
106106

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ jobs:
3535
- name: Prepare Release Message
3636
if: steps.create_tag.outputs.created == 'true'
3737
run: |
38-
sed "s|RELEASE_TAG|${{ github.ref_name }}|g" .github/release_message.md >> release.md
38+
sed "s|RELEASE_TAG|v${{ steps.get_version.outputs.version }}|g" \
39+
.github/release_message.md >> release.md
3940
4041
- name: Download Android artifacts
4142
uses: actions/download-artifact@v4

.github/workflows/windows.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,14 @@ jobs:
6161
run: flutter config --enable-windows-desktop
6262

6363
- name: Build Windows Release
64-
run: flutter build windows --release
64+
shell: bash
65+
run: |
66+
chmod +x scripts/build_release.sh
67+
bash scripts/build_release.sh <<EOF
68+
2
69+
6
70+
4
71+
EOF
6572
6673
- name: Zip Windows Release Output
6774
shell: pwsh

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,7 @@ app.*.map.json
5151
# Firebase
5252
# android/app/google-services.json
5353
# ios/Runner/GoogleService-Info.plist
54+
55+
# Windows
56+
defyx_complete.ps1
57+
defyxvpn_cert.pfx

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ A modern, relatively smart, secure, and open-source VPN application built with F
2020
<a href="https://play.google.com/store/apps/details?id=de.unboundtech.defyxvpn" target="_blank">
2121
<img height="60" src=".github/images/download/google-play.png" alt="download" />
2222
</a>
23+
<a href="https://apps.microsoft.com/detail/9n0qtbzz4kx4?hl=en-us">
24+
<img height="60" src=".github/images/download/microsoft.png" alt="download" />
25+
</a>
2326
<a href="https://github.com/UnboundTechCo/defyxVPN/releases">
2427
<img height="60" src=".github/images/download/github.png" alt="download" />
2528
</a>

android/app/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ dependencies {
7373
implementation("com.google.firebase:firebase-analytics")
7474
implementation("com.google.android.ump:user-messaging-platform:3.1.0")
7575

76+
// Android TV support
77+
implementation("androidx.leanback:leanback:1.0.0")
78+
7679
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
7780
implementation(files("libs/DXcore.aar"))
7881

android/app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
1010
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
1111

12+
<!-- Android TV features -->
13+
<uses-feature
14+
android:name="android.software.leanback"
15+
android:required="false" />
16+
<uses-feature
17+
android:name="android.hardware.touchscreen"
18+
android:required="false" />
19+
1220

1321
<!-- Samsung-specific permissions for better compatibility -->
1422
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
@@ -18,6 +26,7 @@
1826
<application
1927
android:label="DefyxVPN"
2028
android:icon="@mipmap/ic_launcher"
29+
android:banner="@drawable/tv_banner"
2130
tools:ignore="ForegroundServicePermission">
2231

2332
<receiver
@@ -59,6 +68,7 @@
5968
<intent-filter>
6069
<action android:name="android.intent.action.MAIN"/>
6170
<category android:name="android.intent.category.LAUNCHER"/>
71+
<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
6272
</intent-filter>
6373
</activity>
6474
<meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="ca-app-pub-0000000000000000~0000000000"/>

0 commit comments

Comments
 (0)