fix: logout

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

.github/ISSUE_TEMPLATE/bug-反馈.md

@@ -19,9 +19,5 @@ assignees: ''
 ### 错误日志
 请提供设置->关于->错误日志中的内容，粘贴在下方代码框中。如果没有，请提供您的app版本号、系统版本、设备型号等相关信息。
 
-```
-
-```
-
 ### 相关信息
 请补充截图、录屏、BV号等其他有助于解决问题的信息。

.github/workflows/CI.yml

@@ -1,223 +0,0 @@
-name: CI
-
-on:
-  workflow_dispatch:
-  # push:
-  #   branches:
-  #     - 'main'
-  #   paths-ignore:
-  #     - '**.md'
-  #     - '**.txt'
-  #     - '.github/**'
-  #     - '.idea/**'
-  #     - '!.github/workflows/CI.yml'
-
-jobs:
-  update_version:
-    name: Read and update version
-    runs-on: ubuntu-latest
-
-    outputs:
-      # 定义输出变量 version，以便在其他job中引用
-      new_version: ${{ steps.version.outputs.new_version }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      #- name: 获取first parent commit次数
-      #  id: get-first-parent-commit-count
-      #  run: |
-      #    version=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-      #    recent_release_tag=$(git tag -l | grep $version | egrep -v "[-|+]" || true)
-      #    if [[ "x$recent_release_tag" == "x" ]]; then
-      #      echo "当前版本tag不存在，请手动生成tag."
-      #      exit 1
-      #    fi
-      #    git log --oneline HEAD
-      #    first_parent_commit_count=$(git rev-list --first-parent --count $recent_release_tag..HEAD)
-      #    echo "count=$first_parent_commit_count" >> $GITHUB_OUTPUT
-
-      - name: 从tag获取之前的version_code与beta版本号
-        id: get-previous-codes
-        run: |
-          version=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-          last_tag=$(git tag --sort=committerdate | tail -1)
-          if (echo $last_tag | grep -v "+"); then
-            echo "Tag格式不正确"
-            exit 1
-          elif (echo $last_tag | grep -v $version); then
-            echo "当前版本tag不存在，请手动添加tag."
-            exit 1
-          fi
-
-          version_code=$(echo $last_tag | cut -d "+" -f 2)
-          beta_code=$(echo $last_tag | cut -d "+" -f 1 | cut -d "." -f 4)
-          beta_code=${beta_code:-0}
-
-          echo "beta-code=$beta_code" >> $GITHUB_OUTPUT
-          echo "version-code=$version_code" >> $GITHUB_OUTPUT
-
-      - name: 更新版本号
-        id: version
-        run: |
-          # 读取版本号
-          version_name=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-          let beta_code=${{ steps.get-previous-codes.outputs.beta-code }}+1
-          let version_code=${{ steps.get-previous-codes.outputs.version-code }}+1
-          # 构建新版本号
-          NEW_VERSION=${version_name}-beta.${beta_code}+${version_code}
-    
-          # 输出新版本号
-          echo "New version: $NEW_VERSION"
-    
-          # 设置新版本号为输出变量
-          echo "new_version=$NEW_VERSION" >>$GITHUB_OUTPUT
-
-  android:
-    name: Build CI (Android)
-    needs: update_version
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: 构建Java环境
-        uses: actions/setup-java@v3
-        with:
-            distribution: "zulu"
-            java-version: "17"
-            token: ${{secrets.GIT_TOKEN}}
-
-      - name: 检查缓存
-        uses: actions/cache@v2
-        id: cache-flutter
-        with:
-            path: /root/flutter-sdk
-            key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
-
-      - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
-        uses: subosito/flutter-action@v2
-        with:
-            flutter-version: 3.24.0
-            channel: any
-
-      - name: 下载项目依赖
-        run: flutter pub get
-
-      - name: 解码生成 jks
-        run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks
-        env:
-            KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
-
-      - name: 更新版本号
-        id: version
-        run: |
-          # 更新pubspec.yaml文件中的版本号
-          sed -i "s/version: .*/version: ${{ needs.update_version.outputs.new_version }}/g" pubspec.yaml
-
-      - name: flutter build apk
-        run: flutter build apk --release --split-per-abi
-        env:
-            KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-            KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-            KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
-
-      - name: flutter build apk
-        run: |
-          sed -i "s/version: .*/version: ${{ needs.update_version.outputs.new_version }}0/g" pubspec.yaml
-          flutter build apk --release
-        env:
-          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
-
-      - name: 重命名应用
-        run: |
-          version_name=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-          for file in build/app/outputs/flutter-apk/app-*.apk; do
-            if [[ $file =~ app-(.?*)release.apk ]]; then
-              new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}${version_name}.apk"
-              mv "$file" "$new_file_name"
-            fi
-          done
-
-      - name: 上传
-        uses: actions/upload-artifact@v3
-        with:
-          name: Pilipala-CI
-          path: |
-            build/app/outputs/flutter-apk/Pili-*.apk
-
-  iOS:
-    name: Build CI (iOS)
-    needs: update_version
-    runs-on: macos-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
-        uses: subosito/flutter-action@v2.10.0
-        with:
-          cache: true
-          flutter-version: 3.24.0
-
-      - name: 更新版本号
-        id: version
-        run: |
-          # 更新pubspec.yaml文件中的版本号
-          sed -i "" "s/version: .*/version: ${{ needs.update_version.outputs.new_version }}/g" pubspec.yaml
-
-      - name: flutter build ipa
-        run: |
-          flutter build ios --release --no-codesign 
-          ln -sf ./build/ios/iphoneos Payload
-          zip -r9 app.ipa Payload/runner.app
-
-      - name: 重命名应用
-        run: |
-          version_name=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-          for file in app.ipa; do
-            new_file_name="build/Pili-${version_name}.ipa"
-            mv "$file" "$new_file_name"
-          done
-
-      - name: 上传
-        uses: actions/upload-artifact@v3
-        with:
-          if-no-files-found: error
-          name: Pilipala-CI
-          path: |
-            build/Pili-*.ipa
-
-  upload:
-    runs-on: ubuntu-latest
-
-    needs:
-      - update_version
-      - android
-      - iOS
-    steps:
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: Pilipala-CI
-          path: ./Pilipala-CI
-          
-      - name: Upload Pre-release
-        uses: ncipollo/release-action@v1
-        with:
-          name: ${{ needs.update_version.outputs.new_version }}
-          token: ${{ secrets.GIT_TOKEN }}
-          commit: main
-          tag: ${{ needs.update_version.outputs.new_version }}
-          prerelease: true
-          allowUpdates: true
-          artifacts: Pilipala-CI/*

.github/workflows/android.yml

@@ -10,6 +10,8 @@ jobs:
     steps:
       - name: 代码迁出
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: 构建Java环境
         uses: actions/setup-java@v4
@@ -31,9 +33,27 @@ jobs:
           channel: stable
           flutter-version-file: pubspec.yaml
 
+      - name: 修复3.24的stable显示中文不正确问题 // from orz12
+        run: |
+            version=$(grep -m 1 'flutter:' pubspec.yaml | awk '{print $2}')
+            if [ "$(echo "$version < 3.27.0" | awk '{print ($1 < $2)}')" -eq 1 ]; then
+              cd $FLUTTER_ROOT
+              git config --global user.name "orz12"
+              git config --global user.email "orz12@test.com"
+              git cherry-pick d4124bd --strategy-option theirs
+              # flutter precache
+              flutter --version
+              cd -
+            fi
+
       - name: 下载项目依赖
         run: flutter pub get
 
+      - name: 更新版本号
+        run: |
+          version_name=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
+          sed -i "s/version: .*/version: $version_name-$(git rev-parse --short HEAD)+$(git rev-list --count HEAD)/g" pubspec.yaml
+
       - name: Write key
         run: |
           if [ ! -z "${{ secrets.SIGN_KEYSTORE_BASE64 }}" ]; then
@@ -45,7 +65,10 @@ jobs:
           fi
 
       - name: flutter build apk
-        run: flutter build apk --release --split-per-abi
+        run: |
+          chmod +x lib/scripts/build.sh
+          lib/scripts/build.sh
+          flutter build apk --release --split-per-abi
 
       - name: 上传
         uses: actions/upload-artifact@v4

.github/workflows/build-ios.yml

@@ -1,130 +0,0 @@
-name: Build iOS
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - 'build-ios'
-    paths-ignore:
-      - '**.md'
-      - '**.txt'
-      - '.github/**'
-      - '.idea/**'
-      - '!.github/workflows/build-ios.yml'
-  
-jobs:
-  update_version:
-    name: Read latest version
-    runs-on: ubuntu-latest
-
-    outputs:
-      # 定义输出变量 version，以便在其他job中引用
-      new_version: ${{ steps.get-last-tag.outputs.tag}}
-      last_commit: ${{ steps.get-last-commit.outputs.last_commit }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: 获取最后一次提交
-        id: get-last-commit
-        run: |
-          last_commit=$(git log -1 --pretty="%h %s" --first-parent)
-          echo "last_commit=$last_commit" >> $GITHUB_OUTPUT
-
-      - name: 获取最后一个tag
-        id: get-last-tag
-        run: |
-          version=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-          last_tag=$(git tag --sort=committerdate | tail -1)
-          if (echo $last_tag | grep -v "+"); then
-            echo "Illegal tag!"
-            exit 1
-          elif (echo $last_tag | grep -v $version); then
-            echo "No tags for current version in the repo, please add one manually."
-            exit 1
-          fi
-
-          echo "tag=$last_tag" >> $GITHUB_OUTPUT
-
-  iOS:
-    name: Build CI (iOS)
-    needs: update_version
-    runs-on: macos-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref_name }}
-
-      - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
-        uses: subosito/flutter-action@v2.10.0
-        with:
-          cache: true
-          flutter-version: 3.24.0
-
-      - name: 更新版本号
-        id: version
-        run: |
-          # 更新pubspec.yaml文件中的版本号
-          sed -i "" "s/version: .*/version: ${{ needs.update_version.outputs.new_version }}/g" pubspec.yaml
-
-      - name: flutter build ipa
-        run: |
-          flutter build ios --release --no-codesign 
-          ln -sf ./build/ios/iphoneos Payload
-          zip -r9 app.ipa Payload/runner.app
-
-      - name: 重命名应用
-        run: |
-          for file in app.ipa; do
-            new_file_name="build/Pili-${{ needs.update_version.outputs.new_version }}.ipa"
-            mv "$file" "$new_file_name"
-          done
-
-      - name: 上传
-        uses: actions/upload-artifact@v3
-        with:
-          if-no-files-found: error
-          name: PiliPalaX-iOS
-          path: |
-            build/Pili-*.ipa
-
-  upload:
-    runs-on: ubuntu-latest
-
-    needs:
-      - update_version
-      - iOS
-    steps:
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: PiliPalaX-iOS
-          path: ./PiliPalaX-iOS
-          
-      # - name: Upload Pre-release
-      #   uses: ncipollo/release-action@v1
-      #   with:
-      #     name: ${{ needs.update_version.outputs.new_version }}
-      #     token: ${{ secrets.GIT_TOKEN }}
-      #     commit: main
-      #     tag: ${{ needs.update_version.outputs.new_version }}
-      #     prerelease: true
-      #     allowUpdates: true
-      #     artifacts: Pilipala-CI/*
-
-      - name: 发送到Telegram频道
-        uses: xireiki/channel-post@v1.0.7
-        with:
-          bot_token: ${{ secrets.BOT_TOKEN }}
-          chat_id: ${{ secrets.CHAT_ID }}
-          large_file: false
-          method: sendFile
-          path: PiliPalaX-iOS/*
-          parse_mode: Markdown
-          context: "*v${{ needs.update_version.outputs.new_version }}*\n${{ needs.update_version.outputs.last_commit }}"

.github/workflows/ios.yml

@@ -16,6 +16,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.branch }}
+          fetch-depth: 0
 
       - name: Setup flutter
         uses: subosito/flutter-action@v2
@@ -23,11 +24,15 @@ jobs:
           channel: stable
           flutter-version-file: pubspec.yaml
 
-      - name: Set up xcode
-        uses: BoundfoxStudios/action-xcode-select@v1
+      - name: 更新版本号
+        run: |
+          version_name=$(yq e '.version' pubspec.yaml | cut -d "+" -f 1)
+          sed -i '' "s/version: .*/version: $version_name+$(git rev-list --count HEAD)/" pubspec.yaml
 
       - name: Build iOS
         run: |
+          chmod +x lib/scripts/build.sh
+          lib/scripts/build.sh
           flutter build ios --release --no-codesign 
           ln -sf ./build/ios/iphoneos Payload
           zip -r9 ios-release-no-sign.ipa Payload/runner.app

.gitignore

@@ -133,4 +133,6 @@ app.*.symbols
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
-!.vscode/settings.json
+!.vscode/settings.json
+
+/lib/build_config.dart

.vscode/launch.json

@@ -5,18 +5,18 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "pilipala",
+            "name": "piliplus",
             "request": "launch",
             "type": "dart"
         },
         {
-            "name": "pilipala (profile mode)",
+            "name": "piliplus (profile mode)",
             "request": "launch",
             "type": "dart",
             "flutterMode": "profile"
         },
         {
-            "name": "pilipala (release mode)",
+            "name": "piliplus (release mode)",
             "request": "launch",
             "type": "dart",
             "flutterMode": "release"

README.md

@@ -1,24 +1,24 @@
 <div align="center">
-    <img width="200" height="200" src="https://github.com/orz12/pilipala/blob/main/assets/images/logo/logo_android.png">
+    <img width="200" height="200" src="assets/images/logo/logo.png">
 </div>
 
 
 
 <div align="center">
-    <h1>PiliPalaX</h1>
+    <h1>PiliPlus</h1>
 <div align="center">
     
-![GitHub repo size](https://img.shields.io/github/repo-size/bggRGjQaUbCoE/PiliPalaX) 
-![GitHub Repo stars](https://img.shields.io/github/stars/bggRGjQaUbCoE/PiliPalaX) 
-![GitHub all releases](https://img.shields.io/github/downloads/bggRGjQaUbCoE/PiliPalaX/total) 
+![GitHub repo size](https://img.shields.io/github/repo-size/bggRGjQaUbCoE/PiliPlus) 
+![GitHub Repo stars](https://img.shields.io/github/stars/bggRGjQaUbCoE/PiliPlus) 
+![GitHub all releases](https://img.shields.io/github/downloads/bggRGjQaUbCoE/PiliPlus/total) 
 </div>
     <p>使用Flutter开发的BiliBili第三方客户端</p>
     
-<img src="https://github.com/orz12/pilipala/blob/main/assets/screenshots/510shots_so.png" width="32%" alt="home" />
-<img src="https://github.com/orz12/pilipala/blob/main/assets/screenshots/174shots_so.png" width="32%" alt="home" />
-<img src="https://github.com/orz12/pilipala/blob/main/assets/screenshots/850shots_so.png" width="32%" alt="home" />
+<img src="assets/screenshots/510shots_so.png" width="32%" alt="home" />
+<img src="assets/screenshots/174shots_so.png" width="32%" alt="home" />
+<img src="assets/screenshots/850shots_so.png" width="32%" alt="home" />
 <br/>
-<img src="https://github.com/orz12/pilipala/blob/main/assets/screenshots/main_screen.png" width="96%" alt="home" />
+<img src="assets/screenshots/main_screen.png" width="96%" alt="home" />
 <br/>
 </div>
 
@@ -186,9 +186,10 @@
 
 ## 声明
 
-此项目（PiliPalaX）是个人为了兴趣而开发, 仅用于学习和测试，请于下载后24小时内删除。
+此项目（PiliPlus）是个人为了兴趣而开发, 仅用于学习和测试，请于下载后24小时内删除。
 所用API皆从官方网站收集, 不提供任何破解内容。
 在此致敬原作者：[guozhigq/pilipala](https://github.com/guozhigq/pilipala)
+在此致敬上游作者：[orz12/PiliPalaX](https://github.com/orz12/PiliPalaX)
 本仓库做了更激进的修改，感谢原作者的开源精神。
 
 感谢使用

android/app/build.gradle

@@ -37,8 +37,8 @@ def _keyPassword = System.getenv("KEY_PASSWORD") ?: keystoreProperties["keyPassw
 android {
     compileSdkVersion flutter.compileSdkVersion
 
-    namespace 'com.example.pilipalax'
-    ndkVersion "27.0.12077973"
+    namespace 'com.example.piliplus'
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -55,7 +55,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.pilipalax"
+        applicationId "com.example.piliplus"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         targetSdkVersion flutter.targetSdkVersion

android/app/src/debug/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.pilipalax">
+    package="com.example.piliplus">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
@@ -11,7 +11,7 @@
         />
 
     <application
-        android:label="PiliPalaX Debug"
+        android:label="PiliPlus Debug"
         tools:replace="android:label">
         <activity
             android:name=".MainActivity"
@@ -36,7 +36,7 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <intent-filter android:label="PiliPalaX Debug">
+            <intent-filter android:label="PiliPlus Debug">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -60,7 +60,7 @@
                 <!--<data android:host="bangumi.bilibili.com"/>-->
                 <!--<data android:host="space.bilibili.com"/>-->
             </intent-filter>
-            <intent-filter android:label="PiliPalaX Debug">
+            <intent-filter android:label="PiliPlus Debug">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />

android/app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -1,71 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="131.64"
-    android:viewportHeight="117.89">
-  <group android:scaleX="0.95"
-      android:scaleY="0.95"
-      android:translateX="3.291"
-      android:translateY="2.94725">
-    <group android:scaleX="1.2"
-        android:scaleY="1.2"
-        android:translateX="-13.164"
-        android:translateY="-11.789">
-      <group android:scaleX="1.2"
-          android:scaleY="1.2"
-          android:translateX="-13.164"
-          android:translateY="-11.789">
-        <group android:scaleX="1.1"
-            android:scaleY="1.1"
-            android:translateX="-6.582"
-            android:translateY="-5.8945">
-          <group android:scaleX="0.9"
-              android:scaleY="0.9"
-              android:translateX="6.582"
-              android:translateY="5.8945">
-            <group android:scaleX="0.85"
-                android:scaleY="0.92"
-                android:translateX="10.282"
-                android:translateY="4.8945">
-              <group android:scaleX="0.36"
-                  android:scaleY="0.3239744"
-                  android:translateX="42.1248"
-                  android:translateY="39.941284">
-                <path
-                    android:pathData="M35.32,117.89 L56.11,0H20.79L0,117.89Z"
-                    android:strokeAlpha="0.8"
-                    android:fillColor="#ffc001"
-                    android:fillAlpha="0.8"/>
-                <path
-                    android:pathData="M47.57,88.34H95.28L124.92,63.28 131.63,25.22 127.7,20.4Z"
-                    android:strokeAlpha="0.8"
-                    android:fillColor="#26ddfd"
-                    android:fillAlpha="0.8"/>
-                <path
-                    android:pathData="M124.92,63.28 L131.63,25.22 111.02,0H63.37l55.87,68.08z"
-                    android:strokeAlpha="0.8"
-                    android:fillColor="#85a9ff"
-                    android:fillAlpha="0.8"/>
-                <path
-                    android:pathData="M131.63,25.22 L111.02,0H20.79l-5.25,29.75h115.3z"
-                    android:strokeAlpha="0.8"
-                    android:fillColor="#b2ef28"
-                    android:fillAlpha="0.8"/>
-              </group>
-            </group>
-          </group>
-        </group>
-      </group>
-    </group>
-  </group>
-  <group android:scaleX="0.5" android:scaleY="0.44" android:translateX="26" android:translateY="26">
+    android:height="512dp"
+    android:width="512dp"
+    android:viewportWidth="512.0"
+    android:viewportHeight="512.0">
     <path
-        android:pathData="M-4.76,257.17l266.8,-269.85l15.1,15.27l-266.8,269.85z"
-        android:strokeWidth="1.21889"
-        android:fillColor="#cc0000"/>
+        android:fillColor="#FF5CB67B"
+        android:pathData="M456.65,256C456.65,366.81 366.81,456.65 256,456.65 145.19,456.65 55.35,366.81 55.35,256 55.35,145.18 145.19,55.35 256,55.35 366.81,55.35 456.65,145.18 456.65,256Z"
+        android:strokeWidth="0.783784"
+        android:fillType="evenOdd" />
     <path
-        android:pathData="m120.24,154.75 l2.37,-2.4c2.8,-2.83 2.59,-6.13 -0.35,-9.1 -2.97,-3 -6.14,-3.13 -8.99,-0.24l-2.32,2.35zM120.44,152.6 L113.06,145.13 114.12,144.07c2.19,-2.22 4.58,-1.99 6.93,0.4 2.35,2.37 2.64,4.85 0.44,7.07zM128.96,145.93 L134.45,140.38 133.45,139.36 129.13,143.74 125.74,140.31 129.27,136.75 128.26,135.74 124.74,139.3 121.82,136.35 126.01,132.12 125.02,131.12 119.67,136.53zM136.43,138.38 L139.38,135.39c2.08,-2.1 2.62,-4.48 0.8,-6.32 -1.27,-1.28 -2.79,-1.23 -4.11,-0.33l-0.06,-0.06c0.6,-1.17 0.27,-2.47 -0.66,-3.41 -1.64,-1.65 -3.59,-0.96 -5.46,0.94l-2.75,2.78zM132.24,131.79 L129.23,128.73 130.66,127.28c1.46,-1.47 2.6,-1.81 3.69,-0.71 0.95,0.96 0.87,2.19 -0.72,3.81zM136.66,136.25 L133.16,132.71 134.78,131.07c1.64,-1.65 3.06,-2.04 4.21,-0.87 1.26,1.27 0.89,2.8 -0.71,4.41zM148.22,126.78c1.89,-1.91 2.32,-4.4 -0.66,-7.41l-5.46,-5.53 -1.13,1.14 5.49,5.55c2.23,2.26 1.97,3.96 0.74,5.21 -1.22,1.23 -2.88,1.47 -5.11,-0.78l-5.49,-5.55 -1.17,1.18 5.46,5.53c2.98,3.01 5.43,2.59 7.33,0.67zM157.71,117.18c1.24,-1.26 1.81,-2.76 1.79,-3.99l-3.9,-3.95 -3.06,3.09 0.98,0.99 1.98,-2 2.43,2.46c-0.03,0.72 -0.47,1.58 -1.13,2.24 -1.99,2.01 -4.58,1.65 -6.92,-0.72 -2.32,-2.35 -2.54,-5.03 -0.66,-6.92 0.93,-0.94 1.93,-1.15 2.88,-1.14l-0.13,-1.41c-1.09,-0.03 -2.52,0.24 -3.82,1.55 -2.46,2.49 -2.45,6.14 0.56,9.18 3.02,3.05 6.55,3.09 9,0.62z"
-        android:strokeWidth="1.21889"
-        android:fillColor="#ffffff"/>
-  </group>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M270.04,256L156.1,256l15.61,-76.8h98.32c21.21,0 38.4,17.19 38.4,38.4 0,21.21 -17.19,38.4 -38.4,38.4zM270.04,128L202.46,128l-50.1,256h52.76l15.18,-76.8h49.73c49.49,0 89.6,-40.12 89.6,-89.6 0,-49.49 -40.11,-89.6 -89.6,-89.6z"
+        android:fillType="evenOdd" />
 </vector>

android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

android/app/src/debug/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
+    <color name="ic_launcher_background">#FF5CB67B</color>
 </resources>

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.pilipalax">
+    package="com.example.piliplus">
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />
@@ -36,7 +36,7 @@
     </queries>
 
     <application
-        android:label="PiliPalaX"
+        android:label="PiliPlus"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         xmlns:tools="http://schemas.android.com/tools"
@@ -63,15 +63,11 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <meta-data
-              android:name="io.flutter.embedding.android.EnableImpeller"
-              android:value="false"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <intent-filter android:label="PiliPalaX+">
+            <intent-filter android:label="PiliPlus">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -95,7 +91,7 @@
                 <!--<data android:host="bangumi.bilibili.com"/>-->
                 <!--<data android:host="space.bilibili.com"/>-->
             </intent-filter>
-            <intent-filter android:label="PiliPalaX+">
+            <intent-filter android:label="PiliPlus">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />

android/app/src/main/kotlin/com/example/PiliPlus/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.pilipalax
+package com.example.piliplus
 
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
@@ -16,7 +16,8 @@ class MainActivity : AudioServiceActivity() {
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
-        methodChannel = MethodChannel(flutterEngine!!.getDartExecutor()!!.getBinaryMessenger(), CHANNEL)
+
+        methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "PiliPlus")
         methodChannel.setMethodCallHandler { call, result ->
             if (call.method == "back") {
                 back()
@@ -53,10 +54,6 @@ class MainActivity : AudioServiceActivity() {
         methodChannel.invokeMethod("onUserLeaveHint", null)
     }
 
-    companion object {
-        private const val CHANNEL = "onUserLeaveHint"
-    }
-
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration?) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         MethodChannel(

android/app/src/main/res/drawable-anydpi-v24/ic_notification_icon.xml

@@ -1,32 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="131.64"
-    android:viewportHeight="117.89"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.84249085"
-      android:scaleY="0.7544914"
-      android:translateX="10.367252"
-      android:translateY="14.471505">
-    <path
-        android:pathData="M35.32,117.89L56.11,0H20.79L0,117.89h35.32z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#ffa816"
-        android:fillAlpha="0.8"/>
-    <path
-        android:pathData="M47.57,88.34h47.71l29.64,-25.06 6.71,-38.06 -3.93,-4.82 -80.13,67.94z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#00b8ce"
-        android:fillAlpha="0.8"/>
-    <path
-        android:pathData="M124.92,63.28l6.71,-38.06L111.02,0H63.37l55.87,68.08 5.68,-4.8z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#8a6bbc"
-        android:fillAlpha="0.8"/>
-    <path
-        android:pathData="M131.63,25.22L111.02,0H20.79l-5.25,29.75h115.3l0.79,-4.53z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#9fd931"
-        android:fillAlpha="0.8"/>
-  </group>
-</vector>

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,50 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="131.64"
-    android:viewportHeight="117.89"
-    android:alpha="0.9">
-  <group android:scaleX="0.95"
-      android:scaleY="0.95"
-      android:translateX="3.291"
-      android:translateY="2.94725">
-    <group android:scaleX="1.2"
-        android:scaleY="1.2"
-        android:translateX="-13.164"
-        android:translateY="-11.789">
-      <group android:scaleX="1.2"
-          android:scaleY="1.2"
-          android:translateX="-13.164"
-          android:translateY="-11.789">
-        <group android:scaleX="1.1"
-            android:scaleY="1.1"
-            android:translateX="-6.582"
-            android:translateY="-5.8945">
-            <group android:scaleX="0.9"
-                android:scaleY="0.9"
-                android:translateX="6.582"
-                android:translateY="5.8945">
-                <group android:scaleX="0.85"
-                    android:scaleY="0.92"
-                    android:translateX="10.282"
-                    android:translateY="4.8945">
-                    <group android:scaleX="0.36"
-                        android:scaleY="0.3239744"
-                        android:translateX="42.1248"
-                        android:translateY="39.941284">
-                        <path android:fillAlpha="0.8" android:fillColor="#FFC001"
-                            android:pathData="M35.32,117.89L56.11,0H20.79L0,117.89h35.32z" android:strokeAlpha="0.8"/>
-                        <path android:fillAlpha="0.8" android:fillColor="#26DDFD"
-                            android:pathData="M47.57,88.34h47.71l29.64,-25.06 6.71,-38.06 -3.93,-4.82 -80.13,67.94z" android:strokeAlpha="0.8"/>
-                        <path android:fillAlpha="0.8" android:fillColor="#85A9FF"
-                            android:pathData="M124.92,63.28l6.71,-38.06L111.02,0H63.37l55.87,68.08 5.68,-4.8z" android:strokeAlpha="0.8"/>
-                        <path android:fillAlpha="0.8" android:fillColor="#B2EF28"
-                            android:pathData="M131.63,25.22L111.02,0H20.79l-5.25,29.75h115.3l0.79,-4.53z" android:strokeAlpha="0.8"/>
-                    </group>
-                </group>
-            </group>
-        </group>
-      </group>
-    </group>
-  </group>
+    android:height="512dp"
+    android:width="512dp"
+    android:viewportWidth="512.0"
+    android:viewportHeight="512.0">
+    <path
+        android:fillColor="#FF5CB67B"
+        android:pathData="M456.65,256C456.65,366.81 366.81,456.65 256,456.65 145.19,456.65 55.35,366.81 55.35,256 55.35,145.18 145.19,55.35 256,55.35 366.81,55.35 456.65,145.18 456.65,256Z"
+        android:strokeWidth="0.783784"
+        android:fillType="evenOdd" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M270.04,256L156.1,256l15.61,-76.8h98.32c21.21,0 38.4,17.19 38.4,38.4 0,21.21 -17.19,38.4 -38.4,38.4zM270.04,128L202.46,128l-50.1,256h52.76l15.18,-76.8h49.73c49.49,0 89.6,-40.12 89.6,-89.6 0,-49.49 -40.11,-89.6 -89.6,-89.6z"
+        android:fillType="evenOdd" />
 </vector>

android/app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -1,50 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="131.64"
-    android:viewportHeight="117.89"
-    android:alpha="0.9">
-  <group android:scaleX="0.95"
-      android:scaleY="0.95"
-      android:translateX="3.291"
-      android:translateY="2.94725">
-    <group android:scaleX="1.2"
-        android:scaleY="1.2"
-        android:translateX="-13.164"
-        android:translateY="-11.789">
-      <group android:scaleX="1.2"
-          android:scaleY="1.2"
-          android:translateX="-13.164"
-          android:translateY="-11.789">
-        <group android:scaleX="1.1"
-            android:scaleY="1.1"
-            android:translateX="-6.582"
-            android:translateY="-5.8945">
-            <group android:scaleX="0.9"
-                android:scaleY="0.9"
-                android:translateX="6.582"
-                android:translateY="5.8945">
-                <group android:scaleX="0.85"
-                    android:scaleY="0.92"
-                    android:translateX="10.282"
-                    android:translateY="4.8945">
-                    <group android:scaleX="0.36"
-                        android:scaleY="0.3239744"
-                        android:translateX="42.1248"
-                        android:translateY="39.941284">
-                        <path android:fillAlpha="0.8" android:fillColor="#FFFFFF"
-                            android:pathData="M35.32,117.89L56.11,0H20.79L0,117.89h35.32z" android:strokeAlpha="0.8"/>
-                        <path android:fillAlpha="0.8" android:fillColor="#FFFFFF"
-                            android:pathData="M47.57,88.34h47.71l29.64,-25.06 6.71,-38.06 -3.93,-4.82 -80.13,67.94z" android:strokeAlpha="0.8"/>
-                        <path android:fillAlpha="0.8" android:fillColor="#FFFFFF"
-                            android:pathData="M124.92,63.28l6.71,-38.06L111.02,0H63.37l55.87,68.08 5.68,-4.8z" android:strokeAlpha="0.8"/>
-                        <path android:fillAlpha="0.8" android:fillColor="#FFFFFF"
-                            android:pathData="M131.63,25.22L111.02,0H20.79l-5.25,29.75h115.3l0.79,-4.53z" android:strokeAlpha="0.8"/>
-                    </group>
-                </group>
-            </group>
-        </group>
-      </group>
-    </group>
-  </group>
+    android:height="512dp"
+    android:width="512dp"
+    android:viewportWidth="512.0"
+    android:viewportHeight="512.0">
+    <path
+        android:fillColor="#FF5CB67B"
+        android:pathData="M456.65,256C456.65,366.81 366.81,456.65 256,456.65 145.19,456.65 55.35,366.81 55.35,256 55.35,145.18 145.19,55.35 256,55.35 366.81,55.35 456.65,145.18 456.65,256Z"
+        android:strokeWidth="0.783784"
+        android:fillType="evenOdd" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M270.04,256L156.1,256l15.61,-76.8h98.32c21.21,0 38.4,17.19 38.4,38.4 0,21.21 -17.19,38.4 -38.4,38.4zM270.04,128L202.46,128l-50.1,256h52.76l15.18,-76.8h49.73c49.49,0 89.6,-40.12 89.6,-89.6 0,-49.49 -40.11,-89.6 -89.6,-89.6z"
+        android:fillType="evenOdd" />
 </vector>

android/app/src/main/res/drawable/ic_notification_icon.xml

@@ -1,32 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="131.64"
-    android:viewportHeight="117.89"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.84249085"
-      android:scaleY="0.7544914"
-      android:translateX="10.367252"
-      android:translateY="14.471505">
+    android:width="24dp"
+    android:viewportWidth="512.0"
+    android:viewportHeight="512.0">
     <path
-        android:pathData="M35.32,117.89L56.11,0H20.79L0,117.89h35.32z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#ffa816"
-        android:fillAlpha="0.8"/>
+        android:fillColor="#FF5CB67B"
+        android:pathData="M456.65,256C456.65,366.81 366.81,456.65 256,456.65 145.19,456.65 55.35,366.81 55.35,256 55.35,145.18 145.19,55.35 256,55.35 366.81,55.35 456.65,145.18 456.65,256Z"
+        android:strokeWidth="0.783784"
+        android:fillType="evenOdd" />
     <path
-        android:pathData="M47.57,88.34h47.71l29.64,-25.06 6.71,-38.06 -3.93,-4.82 -80.13,67.94z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#00b8ce"
-        android:fillAlpha="0.8"/>
-    <path
-        android:pathData="M124.92,63.28l6.71,-38.06L111.02,0H63.37l55.87,68.08 5.68,-4.8z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#8a6bbc"
-        android:fillAlpha="0.8"/>
-    <path
-        android:pathData="M131.63,25.22L111.02,0H20.79l-5.25,29.75h115.3l0.79,-4.53z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#9fd931"
-        android:fillAlpha="0.8"/>
-  </group>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M270.04,256L156.1,256l15.61,-76.8h98.32c21.21,0 38.4,17.19 38.4,38.4 0,21.21 -17.19,38.4 -38.4,38.4zM270.04,128L202.46,128l-50.1,256h52.76l15.18,-76.8h49.73c49.49,0 89.6,-40.12 89.6,-89.6 0,-49.49 -40.11,-89.6 -89.6,-89.6z"
+        android:fillType="evenOdd" />
 </vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
+  <monochrome>
+      <inset
+          android:drawable="@drawable/ic_launcher_monochrome"
+          android:inset="16%" />
+  </monochrome>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>

android/app/src/main/res/raw/keep.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools"
-  tools:keep="@drawable/*" />

android/app/src/main/res/values-night-v31/styles.xml

@@ -2,6 +2,7 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:defaultFocusHighlightEnabled">false</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>

android/app/src/main/res/values-night/styles.xml

@@ -5,6 +5,7 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:defaultFocusHighlightEnabled">false</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>

android/app/src/main/res/values-v31/styles.xml

@@ -2,6 +2,7 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:defaultFocusHighlightEnabled">false</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>

android/app/src/main/res/values/colors.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#ffffff</color>
+    <color name="ic_launcher_background">#FF5CB67B</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -5,6 +5,7 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:defaultFocusHighlightEnabled">false</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.pilipalax">
+    package="com.example.piliplus">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

android/build.gradle

@@ -16,14 +16,6 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     afterEvaluate { project ->
-    if (project.hasProperty('android')) {
-        project.android {
-            if (namespace == null) {
-                namespace project.group
-            }
-        }
-    }
-
         if (project.extensions.findByName("android") != null) {
             Integer pluginCompileSdk = project.android.compileSdk
             if (pluginCompileSdk != null && pluginCompileSdk < 31) {

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

android/settings.gradle

@@ -25,8 +25,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.7.2" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.21" apply false
+    id "com.android.application" version "7.2.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
 }
 
 include ":app"