Skip to content

Commit 375c4e0

Browse files
committed
Support better window position memory
Add windows arm64 and linux arm64 build script Optimize some details
1 parent ece8a48 commit 375c4e0

File tree

26 files changed

+354
-158
lines changed

26 files changed

+354
-158
lines changed

.github/release_template.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@
3131
</td>
3232
</tr>
3333
<tr>
34-
<td>macOS (v10.15+)</td>
34+
<td>macOS</td>
3535
<td>
36-
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-amd64.dmg"><img src="https://img.shields.io/badge/DMG-Universal-ea005e.svg?logo=apple"></a><br>
36+
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-arm64.dmg"><img src="https://img.shields.io/badge/DMG-Apple%20Silicon-%23000000.svg?logo=apple"></a><br>
37+
<a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-amd64.dmg"><img src="https://img.shields.io/badge/DMG-Intel%20X64-%2300A9E0.svg?logo=apple"></a><br>
3738
</td>
3839
</tr>
3940
<tr>

.github/workflows/build.yaml

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,70 @@ jobs:
8484
path: ./dist
8585
overwrite: true
8686

87+
changelog:
88+
runs-on: ubuntu-latest
89+
needs: [ build ]
90+
steps:
91+
- name: Checkout
92+
if: ${{ !contains(github.ref, '+') }}
93+
uses: actions/checkout@v4
94+
with:
95+
fetch-depth: 0
96+
ref: refs/heads/main
97+
98+
- name: Generate
99+
if: ${{ !contains(github.ref, '+') }}
100+
run: |
101+
tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
102+
preTag=$(grep -oP '^## \K.*' CHANGELOG.md | head -n 1)
103+
currentTag=""
104+
for ((i = 0; i <= ${#tags[@]}; i++)); do
105+
if (( i < ${#tags[@]} )); then
106+
tag=${tags[$i]}
107+
else
108+
tag=""
109+
fi
110+
if [ -n "$currentTag" ]; then
111+
if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
112+
break
113+
fi
114+
fi
115+
if [ -n "$currentTag" ]; then
116+
echo "## $currentTag" >> NEW_CHANGELOG.md
117+
echo "" >> NEW_CHANGELOG.md
118+
if [ -n "$tag" ]; then
119+
git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
120+
else
121+
git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
122+
fi
123+
echo "" >> NEW_CHANGELOG.md
124+
fi
125+
currentTag=$tag
126+
done
127+
cat CHANGELOG.md >> NEW_CHANGELOG.md
128+
cat NEW_CHANGELOG.md > CHANGELOG.md
129+
130+
- name: Commit
131+
if: ${{ !contains(github.ref, '+') }}
132+
run: |
133+
git add CHANGELOG.md
134+
if ! git diff --cached --quiet; then
135+
echo "Commit pushing"
136+
git config --local user.email "[email protected]"
137+
git config --local user.name "chen08209"
138+
git commit -m "Update changelog"
139+
git push
140+
if [ $? -eq 0 ]; then
141+
echo "Push succeeded"
142+
else
143+
echo "Push failed"
144+
exit 1
145+
fi
146+
fi
147+
148+
env:
149+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
150+
87151
upload:
88152
permissions: write-all
89153
needs: [ build ]
@@ -177,4 +241,5 @@ jobs:
177241
user-email: 'github-actions[bot]@users.noreply.github.com'
178242
target-branch: action-pr
179243
commit-message: Update from ${{ github.ref_name }}
180-
target-directory: /tmp/
244+
target-directory: /tmp/
245+

.github/workflows/change.yaml

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

CHANGELOG.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
## v0.8.69
2+
3+
- Remake desktop
4+
5+
- Optimize change proxy
6+
7+
- Optimize network check
8+
9+
- Fix fallback issues
10+
11+
- Optimize lots of details
12+
13+
- Update change.yaml
14+
15+
- Fix android tile issues
16+
17+
- Fix windows tray issues
18+
19+
- Support setting bypassDomain
20+
21+
- Update flutter version
22+
23+
- Fix android service issues
24+
25+
- Fix macos dock exit button issues
26+
27+
- Add route address setting
28+
29+
- Optimize provider view
30+
31+
- Update changelog
32+
33+
- Update CHANGELOG.md
34+
135
## v0.8.67
236

337
- Add android shortcuts

README.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,29 @@ on Mobile:
3434

3535
✨ Support subscription link, Dark mode
3636

37+
## Use
38+
39+
### Linux
40+
41+
⚠️ Make sure to install the following dependencies before using them
42+
43+
```bash
44+
sudo apt-get install appindicator3-0.1 libappindicator3-dev
45+
sudo apt-get install keybinder-3.0
46+
```
47+
48+
### Android
49+
50+
Support the following actions
51+
52+
```bash
53+
com.follow.clash.action.START
54+
55+
com.follow.clash.action.STOP
56+
57+
com.follow.clash.action.CHANGE
58+
```
59+
3760
## Download
3861

3962
<a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
@@ -70,7 +93,7 @@ on Mobile:
7093
3. Run build script
7194

7295
```bash
73-
dart .\setup.dart
96+
dart .\setup.dart windows --arch <arm64 | amd64>
7497
```
7598

7699
- linux
@@ -80,7 +103,7 @@ on Mobile:
80103
2. Run build script
81104

82105
```bash
83-
dart .\setup.dart
106+
dart .\setup.dart linux --arch <arm64 | amd64>
84107
```
85108

86109
- macOS
@@ -90,7 +113,7 @@ on Mobile:
90113
2. Run build script
91114

92115
```bash
93-
dart .\setup.dart
116+
dart .\setup.dart macos --arch <arm64 | amd64>
94117
```
95118

96119
## Star

README_zh_CN.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
[![Channel](https://img.shields.io/badge/Telegram-Channel-blue?style=flat-square&logo=telegram)](https://t.me/FlClash)
1212

13-
1413
基于ClashMeta的多平台代理客户端,简单易用,开源无广告。
1514

1615
on Desktop:
@@ -35,6 +34,29 @@ on Mobile:
3534

3635
✨ 支持一键导入订阅, 深色模式
3736

37+
## Use
38+
39+
### Linux
40+
41+
⚠️ 使用前请确保安装以下依赖
42+
43+
```bash
44+
sudo apt-get install appindicator3-0.1 libappindicator3-dev
45+
sudo apt-get install keybinder-3.0
46+
```
47+
48+
### Android
49+
50+
支持下列操作
51+
52+
```bash
53+
com.follow.clash.action.START
54+
55+
com.follow.clash.action.STOP
56+
57+
com.follow.clash.action.CHANGE
58+
```
59+
3860
## Download
3961

4062
<a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
@@ -71,7 +93,7 @@ on Mobile:
7193
3. 运行构建脚本
7294

7395
```bash
74-
dart .\setup.dart
96+
dart .\setup.dart windows --arch <arm64 | amd64>
7597
```
7698

7799
- linux
@@ -81,7 +103,7 @@ on Mobile:
81103
2. 运行构建脚本
82104

83105
```bash
84-
dart .\setup.dart
106+
dart .\setup.dart linux --arch <arm64 | amd64>
85107
```
86108

87109
- macOS
@@ -91,7 +113,7 @@ on Mobile:
91113
2. 运行构建脚本
92114

93115
```bash
94-
dart .\setup.dart
116+
dart .\setup.dart macos --arch <arm64 | amd64>
95117
```
96118

97119
## Star History

android/app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@
7272
android:name=".TempActivity"
7373
android:exported="true"
7474
android:theme="@style/TransparentTheme">
75+
<intent-filter>
76+
<category android:name="android.intent.category.DEFAULT" />
77+
<action android:name="${applicationId}.action.START" />
78+
</intent-filter>
7579
<intent-filter>
7680
<category android:name="android.intent.category.DEFAULT" />
7781
<action android:name="${applicationId}.action.STOP" />
@@ -88,7 +92,8 @@
8892
android:foregroundServiceType="specialUse"
8993
android:icon="@drawable/ic_stat_name"
9094
android:label="FlClash"
91-
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
95+
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
96+
tools:targetApi="n">
9297
<intent-filter>
9398
<action android:name="android.service.quicksettings.action.QS_TILE" />
9499
</intent-filter>

0 commit comments

Comments
 (0)