tweaks (#1444)

* opt: proxy

* opt: calcWindowPosition

* fix: height depend on svg

* bump

* fix

* ci: cache linux

* string systemProxyPort

---------

Co-authored-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

.github/workflows/android.yml

@@ -17,41 +17,35 @@ jobs:
 
     steps:
       - name: 代码迁出
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: 构建Java环境
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "zulu"
           java-version: "17"
-
-      - name: 检查缓存
-        uses: actions/cache@v4
-        id: cache-flutter
-        with:
-          path: /root/flutter-sdk # Flutter SDK 的路径
-          key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
+          cache: 'gradle'
+          cache-dependency-path: |
+            android/*.gradle*
+            android/**/gradle-wrapper.properties
 
       - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
         uses: subosito/flutter-action@v2
+        id: flutter-action
         with:
           channel: stable
           flutter-version-file: pubspec.yaml
+          cache: true
 
       - name: apply bottom sheet patch
+        if: steps.flutter-action.outputs.CACHE-HIT != 'true'
         working-directory: ${{ env.FLUTTER_ROOT }}
-        run: |
-          git apply $GITHUB_WORKSPACE/lib/scripts/bottom_sheet_patch.diff
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add .
-          git commit -m "bottom sheet patch"
+        run: git apply $GITHUB_WORKSPACE/lib/scripts/bottom_sheet_patch.diff
 
-      - name: 下载项目依赖
-        run: flutter pub get
+      # - name: 下载项目依赖
+      #   run: flutter pub get
 
       - name: Write key
         if: github.event_name != 'pull_request'
@@ -66,9 +60,8 @@ jobs:
 
       - name: flutter build apk
         run: |
-          chmod +x lib/scripts/build.dart
           dart lib/scripts/build.dart "android"
-          flutter build apk --release --split-per-abi
+          flutter build apk --release --split-per-abi --pub
 
       - name: 上传
         uses: actions/upload-artifact@v4

.github/workflows/linux.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.inputs.branch }}
           fetch-depth: 0
@@ -51,10 +51,7 @@ jobs:
         with:
           channel: stable
           flutter-version-file: pubspec.yaml
-
-      - name: Get Flutter dependencies
-        run: flutter pub get
-        shell: bash
+          cache: true
 
       - name: Set and Extract version
         run: |
@@ -65,7 +62,7 @@ jobs:
 
         #TODO: deb and rpm packages need to be build
       - name: Build Linux
-        run: flutter build linux --release -v
+        run: flutter build linux --release -v --pub
 
       - name: Package .tar.gz
         run: tar -zcvf PiliPlus_linux_${{ env.version }}_amd64.tar.gz -C build/linux/x64/release/bundle .
@@ -124,4 +121,4 @@ jobs:
         with:
           name: Linux_deb_package
           path: PiliPlus_linux_*.deb
-          
+