Skip to content

Commit b335c36

Browse files
LessicaLessica
committed
feat: fps display
Signed-off-by: Lessica <82flex@gmail.com>
1 parent 2744f8f commit b335c36

23 files changed

Lines changed: 306 additions & 112 deletions

‎.github/workflows/analyse-commands.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ jobs:
2727
HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install dpkg make libplist openssl@3 ldid-procursus
2828
echo "/usr/local/opt/make/libexec/gnubin" >> $GITHUB_PATH
2929
30-
- name: Checkout XXTouchNG/theos
30+
- name: Checkout roothide/theos
3131
uses: actions/checkout@v4
3232
with:
33-
repository: XXTouchNG/theos
34-
ref: 954dfd17fd05544a3bb26b2a25e1930cd228f4ef
33+
repository: roothide/theos
3534
path: theos
3635
submodules: recursive
3736

@@ -67,6 +66,6 @@ jobs:
6766
run: |
6867
cd $GITHUB_WORKSPACE/TrollSpeed
6968
./gen-control.sh ${{ env.GIT_TAG }}
70-
THEOS_PACKAGE_SCHEME=rootless make commands
71-
make clean
72-
make commands
69+
THEOS_PACKAGE_SCHEME=rootless gmake commands
70+
gmake clean
71+
gmake commands

‎.github/workflows/build-analyse.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ on:
66
pull_request:
77
branches: [ "main" ]
88

9+
env:
10+
XCODE_VERSION: '15.4'
11+
912
jobs:
1013
build:
1114
name: Build and analyse using xcodebuild command
12-
runs-on: macos-13
15+
runs-on: macos-14
1316

1417
steps:
1518
- name: Setup Xcode version
1619
uses: maxim-lobanov/setup-xcode@v1
1720
with:
18-
xcode-version: 14.3.1
21+
xcode-version: ${{ env.XCODE_VERSION }}
1922

2023
- name: Checkout
2124
uses: actions/checkout@v4

‎.github/workflows/build-release.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
name: Build Release
22

33
on:
4+
workflow_dispatch:
45
push:
56
tags:
7+
- "v*.*"
68
- "v*.*.*"
79

810
env:
911
THEOS: ''
10-
GIT_TAG: ''
12+
PKG_VERSION: ''
1113
XCODE_VERSION: '15.4'
1214

1315
jobs:
@@ -26,11 +28,10 @@ jobs:
2628
HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install dpkg make libplist openssl@3 ldid-procursus
2729
echo "/usr/local/opt/make/libexec/gnubin" >> $GITHUB_PATH
2830
29-
- name: Checkout XXTouchNG/theos
31+
- name: Checkout roothide/theos
3032
uses: actions/checkout@v4
3133
with:
32-
repository: XXTouchNG/theos
33-
ref: 954dfd17fd05544a3bb26b2a25e1930cd228f4ef
34+
repository: roothide/theos
3435
path: theos
3536
submodules: recursive
3637

@@ -59,27 +60,26 @@ jobs:
5960
echo "Available SDKs: $(find $THEOS/sdks -name "*.sdk" -maxdepth 1 -print)"
6061
echo "FINALPACKAGE=1" >> $GITHUB_ENV
6162
cd $GITHUB_WORKSPACE/TrollSpeed
62-
git fetch --tags
63-
echo "GIT_TAG=$(git describe --tags --always --abbrev=0)" >> $GITHUB_ENV
63+
echo "PKG_VERSION=$(./get-version.sh)" >> $GITHUB_ENV
6464
6565
- name: Build package
6666
run: |
6767
cd $GITHUB_WORKSPACE/TrollSpeed
68-
./gen-control.sh ${{ env.GIT_TAG }}
69-
./build.sh ${{ env.GIT_TAG }}
70-
THEOS_PACKAGE_SCHEME=roothide FINALPACKAGE=1 make clean package
71-
THEOS_PACKAGE_SCHEME=rootless FINALPACKAGE=1 make clean package
72-
FINALPACKAGE=1 make clean package
68+
./gen-control.sh
69+
./build.sh
70+
THEOS_PACKAGE_SCHEME=roothide FINALPACKAGE=1 gmake clean package
71+
THEOS_PACKAGE_SCHEME=rootless FINALPACKAGE=1 gmake clean package
72+
FINALPACKAGE=1 gmake clean package
7373
7474
- name: Collect symbols
7575
run: |
7676
cd $GITHUB_WORKSPACE/TrollSpeed
77-
find .theos/obj -name "*.dSYM" -print | zip -r packages/TrollSpeed_${{ env.GIT_TAG }}_symbols.zip -@
77+
find .theos/obj -name "*.dSYM" -print | zip -r packages/TrollSpeed_${{ env.PKG_VERSION }}_symbols.zip -@
7878
7979
- name: Upload artifacts
8080
uses: actions/upload-artifact@v4
8181
with:
82-
name: TrollSpeed_${{ env.GIT_TAG }}
82+
name: TrollSpeed_${{ env.PKG_VERSION }}
8383
path: |
8484
TrollSpeed/packages/TrollSpeed_*.tipa
8585
TrollSpeed/packages/TrollSpeed+AppIntents16_*.tipa
@@ -88,14 +88,14 @@ jobs:
8888
- name: Upload symbols
8989
uses: actions/upload-artifact@v4
9090
with:
91-
name: TrollSpeed_${{ env.GIT_TAG }}_symbols
91+
name: TrollSpeed_${{ env.PKG_VERSION }}_symbols
9292
path: |
93-
TrollSpeed/packages/TrollSpeed_${{ env.GIT_TAG }}_symbols.zip
93+
TrollSpeed/packages/TrollSpeed_${{ env.PKG_VERSION }}_symbols.zip
9494
9595
- name: Upload release
9696
uses: softprops/action-gh-release@v1
9797
with:
98-
token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
98+
tag_name: v${{ env.PKG_VERSION }}
9999
body_path: TrollSpeed/CHANGELOG.md
100100
files: |
101101
TrollSpeed/packages/TrollSpeed_*.tipa

‎Resources/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundlePackageType</key>
2222
<string>APPL</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>1.12.1</string>
24+
<string>2.0</string>
2525
<key>CFBundleSignature</key>
2626
<string>????</string>
2727
<key>CFBundleURLTypes</key>

‎Resources/en.lproj/Localizable.strings‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,18 @@
7373
/* No comment provided by engineer. */
7474
"Dismiss" = "Dismiss";
7575

76+
/* No comment provided by engineer. */
77+
"Display Mode" = "Display Mode";
78+
7679
/* No comment provided by engineer. */
7780
"Exit HUD" = "Exit HUD";
7881

7982
/* No comment provided by engineer. */
8083
"Follow" = "Follow";
8184

85+
/* No comment provided by engineer. */
86+
"FPS" = "FPS";
87+
8288
/* No comment provided by engineer. */
8389
"Hide" = "Hide";
8490

@@ -133,6 +139,9 @@
133139
/* No comment provided by engineer. */
134140
"Size" = "Size";
135141

142+
/* No comment provided by engineer. */
143+
"Speed" = "Speed";
144+
136145
/* No comment provided by engineer. */
137146
"Standard" = "Standard";
138147

‎Resources/es.lproj/Localizable.strings‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,18 @@
7373
/* No comment provided by engineer. */
7474
"Dismiss" = "Descartar";
7575

76+
/* No comment provided by engineer. */
77+
"Display Mode" = "Modo de pantalla";
78+
7679
/* No comment provided by engineer. */
7780
"Exit HUD" = "Cerrar HUD";
7881

7982
/* No comment provided by engineer. */
8083
"Follow" = "Habilitado";
8184

85+
/* No comment provided by engineer. */
86+
"FPS" = "FPS";
87+
8288
/* No comment provided by engineer. */
8389
"Hide" = "Oculto";
8490

@@ -133,6 +139,9 @@
133139
/* No comment provided by engineer. */
134140
"Size" = "Tamaño";
135141

142+
/* No comment provided by engineer. */
143+
"Speed" = "Velocidad";
144+
136145
/* No comment provided by engineer. */
137146
"Standard" = "Estándar";
138147

‎Resources/zh-Hans.lproj/Localizable.strings‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,18 @@
7373
/* No comment provided by engineer. */
7474
"Dismiss" = "关闭";
7575

76+
/* No comment provided by engineer. */
77+
"Display Mode" = "显示模式";
78+
7679
/* No comment provided by engineer. */
7780
"Exit HUD" = "关闭悬浮窗";
7881

7982
/* No comment provided by engineer. */
8083
"Follow" = "跟随";
8184

85+
/* No comment provided by engineer. */
86+
"FPS" = "FPS";
87+
8288
/* No comment provided by engineer. */
8389
"Hide" = "隐藏";
8490

@@ -133,6 +139,9 @@
133139
/* No comment provided by engineer. */
134140
"Size" = "尺寸";
135141

142+
/* No comment provided by engineer. */
143+
"Speed" = "网速";
144+
136145
/* No comment provided by engineer. */
137146
"Standard" = "标准";
138147

‎TrollSpeed.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@
642642
CODE_SIGN_ENTITLEMENTS = supports/entitlements.plist;
643643
CODE_SIGN_IDENTITY = "-";
644644
CODE_SIGN_STYLE = Manual;
645+
CURRENT_PROJECT_VERSION = 13;
645646
DEVELOPMENT_TEAM = "-";
646647
GCC_PRECOMPILE_PREFIX_HEADER = YES;
647648
GCC_PREFIX_HEADER = "supports/hudapp-prefix.pch";
@@ -663,7 +664,7 @@
663664
"$(inherited)",
664665
"$(PROJECT_DIR)/libraries",
665666
);
666-
MARKETING_VERSION = 1.12.1;
667+
MARKETING_VERSION = 2.0;
667668
PRODUCT_BUNDLE_IDENTIFIER = ch.xxtou.hudapp;
668669
PRODUCT_NAME = TrollSpeed;
669670
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -686,6 +687,7 @@
686687
CODE_SIGN_ENTITLEMENTS = supports/entitlements.plist;
687688
CODE_SIGN_IDENTITY = "-";
688689
CODE_SIGN_STYLE = Manual;
690+
CURRENT_PROJECT_VERSION = 13;
689691
DEVELOPMENT_TEAM = "-";
690692
GCC_PRECOMPILE_PREFIX_HEADER = YES;
691693
GCC_PREFIX_HEADER = "supports/hudapp-prefix.pch";
@@ -707,7 +709,7 @@
707709
"$(inherited)",
708710
"$(PROJECT_DIR)/libraries",
709711
);
710-
MARKETING_VERSION = 1.12.1;
712+
MARKETING_VERSION = 2.0;
711713
PRODUCT_BUNDLE_IDENTIFIER = ch.xxtou.hudapp;
712714
PRODUCT_NAME = TrollSpeed;
713715
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -779,7 +781,7 @@
779781
HEADER_SEARCH_PATHS = $THEOS/vendor/include;
780782
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
781783
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
782-
MARKETING_VERSION = 1.12.1;
784+
MARKETING_VERSION = 2.0;
783785
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
784786
MTL_FAST_MATH = YES;
785787
ONLY_ACTIVE_ARCH = YES;
@@ -841,7 +843,7 @@
841843
HEADER_SEARCH_PATHS = $THEOS/vendor/include;
842844
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
843845
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
844-
MARKETING_VERSION = 1.12.1;
846+
MARKETING_VERSION = 2.0;
845847
MTL_ENABLE_DEBUG_INFO = NO;
846848
MTL_FAST_MATH = YES;
847849
PRODUCT_MODULE_NAME = TrollSpeed;
@@ -862,6 +864,7 @@
862864
CODE_SIGN_ENTITLEMENTS = supports/entitlements.plist;
863865
CODE_SIGN_IDENTITY = "-";
864866
CODE_SIGN_STYLE = Manual;
867+
CURRENT_PROJECT_VERSION = 13;
865868
DEVELOPMENT_TEAM = "-";
866869
GCC_PRECOMPILE_PREFIX_HEADER = YES;
867870
GCC_PREFIX_HEADER = "supports/hudapp-prefix.pch";
@@ -883,7 +886,7 @@
883886
"$(inherited)",
884887
"$(PROJECT_DIR)/libraries",
885888
);
886-
MARKETING_VERSION = 1.12.1;
889+
MARKETING_VERSION = 2.0;
887890
PRODUCT_BUNDLE_IDENTIFIER = ch.xxtou.hudapp;
888891
PRODUCT_NAME = TrollSpeed;
889892
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -907,6 +910,7 @@
907910
CODE_SIGN_ENTITLEMENTS = supports/entitlements.plist;
908911
CODE_SIGN_IDENTITY = "-";
909912
CODE_SIGN_STYLE = Manual;
913+
CURRENT_PROJECT_VERSION = 13;
910914
DEVELOPMENT_TEAM = "-";
911915
GCC_PRECOMPILE_PREFIX_HEADER = YES;
912916
GCC_PREFIX_HEADER = "supports/hudapp-prefix.pch";
@@ -928,7 +932,7 @@
928932
"$(inherited)",
929933
"$(PROJECT_DIR)/libraries",
930934
);
931-
MARKETING_VERSION = 1.12.1;
935+
MARKETING_VERSION = 2.0;
932936
PRODUCT_BUNDLE_IDENTIFIER = ch.xxtou.hudapp;
933937
PRODUCT_NAME = TrollSpeed;
934938
PROVISIONING_PROFILE_SPECIFIER = "";

‎build.sh‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
#!/bin/sh
22

33
# This script is used to build the TrollSpeed app and create a tipa file with Xcode.
4-
if [ $# -ne 1 ]; then
5-
echo "Usage: $0 <version>"
6-
exit 1
7-
fi
84

9-
VERSION=$1
5+
# Read the version from the existing control file
6+
VERSION=$(./get-version.sh) || exit 1
7+
8+
echo "Using version: $VERSION"
109

11-
# Strip leading "v" from version if present
12-
VERSION=${VERSION#v}
10+
# Set GITHUB_WORKSPACE to home directory if not set
11+
if [ -z "$GITHUB_WORKSPACE" ]; then
12+
GITHUB_WORKSPACE="$HOME"
13+
fi
1314

1415
# Build using Xcode
1516
xcodebuild clean build archive \
1617
-scheme TrollSpeed \
1718
-project TrollSpeed.xcodeproj \
19+
-configuration Release \
1820
-sdk iphoneos \
1921
-destination 'generic/platform=iOS' \
2022
-archivePath TrollSpeed \
21-
CODE_SIGNING_ALLOWED=NO | xcpretty
23+
CODE_SIGNING_ALLOWED=NO \
24+
THEOS="$GITHUB_WORKSPACE/theos" | xcpretty
2225

2326
chmod 0644 Resources/Info.plist
2427
cp supports/entitlements.plist TrollSpeed.xcarchive/Products
25-
cd TrollSpeed.xcarchive/Products/Applications
28+
cd TrollSpeed.xcarchive/Products/Applications || exit
2629
codesign --remove-signature TrollSpeed.app
27-
cd -
28-
cd TrollSpeed.xcarchive/Products
30+
cd - || exit
31+
cd TrollSpeed.xcarchive/Products || exit
2932
mv Applications Payload
3033
ldid -Sentitlements.plist Payload/TrollSpeed.app
3134
chmod 0644 Payload/TrollSpeed.app/Info.plist
3235
zip -qr TrollSpeed.tipa Payload
33-
cd -
36+
cd - || exit
3437
mkdir -p packages
3538
mv TrollSpeed.xcarchive/Products/TrollSpeed.tipa packages/TrollSpeed+AppIntents16_$VERSION.tipa

‎devkit/env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
export THEOS=$HOME/theos
3+
export THEOS="$HOME/theos"
44
export THEOS_PACKAGE_SCHEME=
55
export THEOS_DEVICE_IP=127.0.0.1
66
export THEOS_DEVICE_PORT=58422

0 commit comments

Comments
 (0)