fix: vote

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

.github/ISSUE_TEMPLATE/bug-反馈.md

@@ -1,27 +0,0 @@
----
-name: Bug 反馈
-about: 描述你所遇到的bug
-title: "[Bug] "
-labels: bug
-assignees: ''
-
----
-
-### 问题描述
-请提供一个清晰而简明的问题描述。
-
-### 复现步骤
-请提供复现该问题所需的具体步骤。
-
-### 预期行为
-请描述你期望的正确行为或结果。
-
-### 错误日志
-请提供设置->关于->错误日志中的内容，粘贴在下方代码框中。如果没有，请提供您的app版本号、系统版本、设备型号等相关信息。
-
-```
-
-```
-
-### 相关信息
-请补充截图、录屏、BV号等其他有助于解决问题的信息。

.github/ISSUE_TEMPLATE/bug-反馈.yml

@@ -0,0 +1,60 @@
+name: Bug 反馈
+description: 描述你所遇到的bug
+labels: [ "bug" ]
+title: "[Bug] "
+body:
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: 检查清单
+      options:
+        - label: 之前没有人提交过类似或相同的 bug report。
+          required: true
+        - label: 无视上一条 => block
+          required: true
+        - label: 正在使用最新版本。
+          required: true
+
+  - type: textarea
+    id: version
+    attributes:
+      label: 版本号
+    validations:
+      required: true
+
+  - type: textarea
+    id: bug
+    attributes:
+      label: 问题描述
+      description: 请提供一个清晰而简明的问题描述。
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: 复现步骤
+      description: 请提供复现该问题所需的具体步骤。
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: 预期行为
+      description: 请描述你期望的正确行为或结果。
+    validations:
+      required: true
+
+  - type: textarea
+    id: log
+    attributes:
+      label: 错误日志
+      description: 请提供设置->关于->错误日志中的内容，粘贴在下方代码框中。如果没有，请提供您的app版本号、系统版本、设备型号等相关信息。
+
+  - type: textarea
+    id: info
+    attributes:
+      label: 相关信息
+      description: 请补充截图、录屏、BV号等其他有助于解决问题的信息。

.github/ISSUE_TEMPLATE/功能请求.md

@@ -1,20 +0,0 @@
----
-name: 功能请求
-about: 对于功能的一些建议
-title: "[FR] "
-labels: enhancement
-assignees: ''
-
----
-
-### 功能描述
-请提供对所请求功能的清晰描述。
-
-### 目标
-请描述你希望通过这个功能实现的目标。
-
-### 解决方案
-如果你有任何关于如何实现这个功能的想法或建议，请在这里提供。
-
-### 其他
-请提供已实现该功能或类似功能的应用

.github/ISSUE_TEMPLATE/功能请求.yml

@@ -0,0 +1,45 @@
+name: 功能请求
+description: 对于功能的一些建议
+labels: [ "enhancement" ]
+title: "[FR] "
+body:
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: 检查清单
+      options:
+        - label: 之前没有人提交过类似或相同的功能请求。
+          required: true
+        - label: 无视上一条 => block
+          required: true
+        - label: 正在使用最新版本。
+          required: true
+
+  - type: textarea
+    id: desc
+    attributes:
+      label: 功能描述
+      description: 请提供对所请求功能的清晰描述。
+    validations:
+      required: true
+
+  - type: textarea
+    id: propose
+    attributes:
+      label: 目标
+      description: 请描述你希望通过这个功能实现的目标。
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: 解决方案
+      description: 如果你有任何关于如何实现这个功能的想法或建议，请在这里提供。
+
+  - type: textarea
+    id: addition
+    attributes:
+      label: 其他
+      description: 请提供已实现该功能或类似功能的应用

.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
@@ -28,12 +30,30 @@ jobs:
         if: steps.cache-flutter.outputs.cache-hit != 'true'
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.24.0
-          channel: any
+          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,17 +65,10 @@ jobs:
           fi
 
       - name: flutter build apk
-        run: flutter build apk --release --target-platform=android-arm64
-
-      - name: flutter build apk
-        run: flutter build apk --release --split-per-abi
-
-      - name: 上传
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-release
-          path: |
-            build/app/outputs/flutter-apk/app-release.apk
+        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,17 +16,23 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.branch }}
+          fetch-depth: 0
 
       - name: Setup flutter
         uses: subosito/flutter-action@v2
         with:
           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"

.vscode/settings.json

@@ -2,5 +2,9 @@
     "editor.formatOnSave": true,
     "[dart]": {
         "editor.formatOnType": true
+    },
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": "explicit",
+        // "source.fixAll": "explicit",
     }
 }

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/orz12/pilipala) 
-![GitHub Repo stars](https://img.shields.io/github/stars/orz12/pilipala) 
-![GitHub all releases](https://img.shields.io/github/downloads/orz12/pilipala/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>
 
@@ -47,6 +47,36 @@
 
 ## feat
 
+- [x] 直播分区
+- [x] 分享`视频`/`番剧`/`动态`/`专栏`/`直播`至消息
+- [x] 创建/修改/删除关注分组
+- [x] 移除粉丝
+- [x] 直播弹幕发送表情
+- [x] 收藏夹排序
+- [x] 稍后再看`未看`/`未看完`/`已看完`分类
+- [x] WebDAV 备份/恢复设置
+- [x] 保存评论/动态
+- [x] 高级弹幕 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] 取消/置顶评论
+- [x] 记笔记
+- [x] 多账号支持 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] 屏蔽带货动态/评论
+- [x] 互动视频
+- [x] 发评/动态反诈
+- [x] 高能进度条
+- [x] 滑动跳转预览视频缩略图
+- [x] Live Photo
+- [x] 复制/移动/排序收藏夹/稍后再看视频
+- [x] 超分辨率
+- [x] 合并弹幕
+- [x] 会员彩色弹幕
+- [x] 播放全部/继续播放/倒序播放
+- [x] Cookie登录
+- [x] 显示视频分段信息
+- [x] 调节字幕大小
+- [x] 调节全屏弹幕大小
+- [x] 收藏夹/稍后再看多选删除
+- [x] 搜索用户动态
 - [x] 直播弹幕
 - [x] 修改头像/用户名/签名/性别/生日
 - [x] 创建/编辑/删除收藏夹
@@ -54,7 +84,6 @@
 - [x] 评论楼中楼定位点击查看的评论
 - [x] 评论楼中楼按热度/时间排序
 - [x] 评论点踩
-- [x] 显示ops专栏
 - [x] 私信发图
 - [x] 投币动画
 - [x] 取消/追番，更新追番状态
@@ -68,9 +97,9 @@
 - [x] 筛选搜索
 - [x] 转发动态
 - [x] 合集图片
-- [x] 删除/置顶私信
-- [x] 举报用户/评论/视频
-- [x] 删除/发布文本/图片动态
+- [x] 删除/置顶/撤回私信
+- [x] 举报用户/评论/视频/动态
+- [x] 删除/发布/置顶文本/图片动态
 - [x] 其他
 
 ## opt
@@ -139,7 +168,6 @@
   - [x] 音质选择（视视频而定）
   - [x] 解码格式选择（视视频而定）
   - [x] 弹幕
-  - [ ] 直播弹幕
   - [x] 字幕
   - [x] 记忆播放
   - [x] 视频比例：高度/宽度适应、填充、包含等
@@ -181,9 +209,10 @@
 
 ## 声明
 
-此项目（PiliPalaX）是个人为了兴趣而开发, 仅用于学习和测试，请于下载后24小时内删除。
+此项目（PiliPlus）是个人为了兴趣而开发, 仅用于学习和测试，请于下载后24小时内删除。
 所用API皆从官方网站收集, 不提供任何破解内容。
 在此致敬原作者：[guozhigq/pilipala](https://github.com/guozhigq/pilipala)
+在此致敬上游作者：[orz12/PiliPalaX](https://github.com/orz12/PiliPalaX)
 本仓库做了更激进的修改，感谢原作者的开源精神。
 
 感谢使用

analysis_options.yaml

@@ -21,9 +21,37 @@ linter:
   # or a specific dart file by using the `// ignore: name_of_lint` and
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
+  # https://dart.dev/tools/linter-rules
   rules:
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
+    # - always_specify_types
+    # - avoid_positional_boolean_parameters
+    # - use_null_aware_elements
+    - always_declare_return_types
+    - always_use_package_imports
+    - avoid_empty_else
+    - avoid_field_initializers_in_const_classes
+    - avoid_print
+    - avoid_relative_lib_imports
+    - avoid_shadowing_type_parameters
+    - avoid_single_cascade_in_expression_statements
+    - avoid_slow_async_io
+    - avoid_type_to_string
+    - avoid_types_as_parameter_names
+    - avoid_unnecessary_containers
+    - avoid_void_async
+    - await_only_futures
+    - camel_case_extensions
+    - camel_case_types
+    - cancel_subscriptions
+    - cascade_invocations
+    - prefer_const_constructors
+    - prefer_const_declarations
+    - sized_box_for_whitespace
+    - unnecessary_late
+    - use_colored_box
+    - use_decorated_box
+    - use_named_constants
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

android/app/build.gradle

@@ -35,9 +35,9 @@ def _keyAlias = System.getenv("KEY_ALIAS") ?: keystoreProperties["keyAlias"]
 def _keyPassword = System.getenv("KEY_PASSWORD") ?: keystoreProperties["keyPassword"]
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion flutter.compileSdkVersion
 
-    namespace 'com.example.pilipalax'
+    namespace 'com.example.piliplus'
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -55,13 +55,13 @@ 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
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        minSdkVersion 21
+        minSdkVersion flutter.minSdkVersion
         multiDexEnabled true
     }
 

android/app/src/debug/AndroidManifest.xml

@@ -1,132 +0,0 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.pilipalax">
-    <!-- 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.
-    -->
-    <uses-permission
-        android:name="android.permission.INTERNET"
-        />
-
-    <application
-        android:label="PiliPalaX Debug"
-        tools:replace="android:label">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize"
-            android:supportsPictureInPicture="true"
-            android:resizeableActivity="true"
-            >
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
-            <meta-data
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme"
-                />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-            <intent-filter android:label="PiliPalaX Debug">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http"/>
-                <data android:scheme="https"/>
-                <data android:host="*.bilibili.com"/>
-                <data android:host="*.bilibili.cn"/>
-                <data android:host="*.bilibili.tv"/>
-                <data android:host="bilibili.com"/>
-                <data android:host="bilibili.cn"/>
-                <data android:host="bilibili.tv"/>
-                <data android:host="b23.tv" />
-                <!--<data android:host="live.bilibili.com"/>-->
-                <!--<data android:host="www.bilibili.com"/>-->
-                <!--<data android:host="www.bilibili.tv"/>-->
-                <!--<data android:host="www.bilibili.cn"/>-->
-                <!--<data android:host="m.bilibili.cn"/>-->
-                <!--<data android:host="m.bilibili.com"/>-->
-                <!--<data android:host="bilibili.cn"/>-->
-                <!--<data android:host="bilibili.com"/>-->
-                <!--<data android:host="bangumi.bilibili.com"/>-->
-                <!--<data android:host="space.bilibili.com"/>-->
-            </intent-filter>
-            <intent-filter android:label="PiliPalaX Debug">
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.SEARCH" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="bilibili"/>
-                <data android:host="forward" />
-                <data android:host="comment"
-                    android:pathPattern="/detail/.*/.*/.*" />
-                <data android:host="uper" />
-                <data android:host="article"
-                    android:pathPattern="/readlist" />
-                <data android:host="advertise" android:path="/home" />
-                <data android:host="clip" />
-                <data android:host="search" />
-                <data android:host="stardust-search" />
-                <data android:host="music" />
-                <data android:host="bangumi"
-                    android:pathPattern="/season.*" />
-                <data android:host="bangumi" android:pathPattern="/.*" />
-                <data android:host="pictureshow"
-                    android:pathPrefix="/creative_center" />
-                <data android:host="cliparea" />
-                <data android:host="im" />
-                <data android:host="im" android:path="/notifications" />
-                <data android:host="following" />
-                <data android:host="following"
-                    android:pathPattern="/detail/.*" />
-                <data android:host="following"
-                    android:path="/publishInfo/" />
-                <data android:host="laser" android:pathPattern="/.*" />
-                <data android:host="livearea" />
-                <data android:host="live" />
-                <data android:host="catalog" />
-                <data android:host="browser" />
-                <data android:host="user_center" />
-                <data android:host="login" />
-                <data android:host="space" />
-                <data android:host="author" />
-                <data android:host="tag" />
-                <data android:host="rank" />
-                <data android:host="external" />
-                <data android:host="blank" />
-                <data android:host="home" />
-                <data android:host="root" />
-                <data android:host="video" />
-                <data android:host="story" />
-                <data android:host="podcast" />
-                <data android:host="search" />
-                <data android:host="main" android:path="/favorite" />
-                <data android:host="pgc" android:path="/theater/match" />
-                <data android:host="pgc" android:path="/theater/square" />
-                <data android:host="m.bilibili.com"
-                    android:path="/topic-detail" />
-                <data android:host="article" />
-                <data android:host="pegasus"
-                    android:pathPattern="/channel/v2/.*" />
-                <data android:host="feed" android:pathPattern="/channel" />
-                <data android:host="vip" />
-                <data android:host="user_center" android:path="/vip" />
-                <data android:host="history" />
-                <data android:host="charge" android:path="/rank" />
-                <data android:host="assistant" />
-                <data android:host="assistant" />
-                <data android:host="feedback" />
-                <data android:host="auth" android:path="/launch" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

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

@@ -1,71 +0,0 @@
-<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">
-    <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"/>
-    <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>
-</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 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#FFFFFF</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"
@@ -67,7 +67,7 @@
                 <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" />
@@ -91,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

@@ -0,0 +1,116 @@
+package com.example.piliplus
+
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+import com.ryanheise.audioservice.AudioServiceActivity
+import android.content.ComponentName
+import android.content.Intent
+import android.content.res.Configuration
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.view.WindowManager.LayoutParams
+import kotlin.system.exitProcess
+
+class MainActivity : AudioServiceActivity() {
+    private lateinit var methodChannel: MethodChannel
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+
+        methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "PiliPlus")
+        methodChannel.setMethodCallHandler { call, result ->
+            if (call.method == "back") {
+                back()
+            } else if (call.method == "biliSendCommAntifraud") {
+                try {
+                    val action = call.argument<Int>("action") ?: 0
+                    val oid = call.argument<Number>("oid") ?: 0L
+                    val type = call.argument<Int>("type") ?: 0
+                    val rpid = call.argument<Number>("rpid") ?: 0L
+                    val root = call.argument<Number>("root") ?: 0L
+                    val parent = call.argument<Number>("parent") ?: 0L
+                    val ctime = call.argument<Number>("ctime") ?: 0L
+                    val commentText = call.argument<String>("comment_text") ?: ""
+                    val pictures = call.argument<String?>("pictures")
+                    val sourceId = call.argument<String>("source_id") ?: ""
+                    val uid = call.argument<Number>("uid") ?: 0L
+                    val cookies = call.argument<List<String>>("cookies") ?: emptyList<String>()
+
+                    val intent = Intent().apply {
+                        component = ComponentName("icu.freedomIntrovert.biliSendCommAntifraud", "icu.freedomIntrovert.biliSendCommAntifraud.ByXposedLaunchedActivity")
+                        putExtra("action", action)
+                        putExtra("oid", oid.toLong())
+                        putExtra("type", type)
+                        putExtra("rpid", rpid.toLong())
+                        putExtra("root", root.toLong())
+                        putExtra("parent", parent.toLong())
+                        putExtra("ctime", ctime.toLong())
+                        putExtra("comment_text", commentText)
+                        if(pictures != null)
+                            putExtra("pictures", pictures)
+                        putExtra("source_id", sourceId)
+                        putExtra("uid", uid.toLong())
+                        putStringArrayListExtra("cookies", ArrayList(cookies))
+                    }
+                    startActivity(intent)
+                } catch (e: Exception) {}
+            } else if (call.method == "linkVerifySettings") {
+                try {
+                    val intent = Intent(android.provider.Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS,
+                        Uri.parse("package:" + context.packageName))
+                    context.startActivity(intent)
+                } catch (t: Throwable) {
+                    try {
+                        val intent = Intent("android.intent.action.MAIN", Uri.parse("package:" + context.packageName))
+                        intent.setClassName("com.android.settings", "com.android.settings.applications.InstalledAppOpenByDefaultActivity")
+                        context.startActivity(intent)
+                    } catch (t2: Throwable) {
+                        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+                            Uri.parse("package:" + context.packageName))
+                        context.startActivity(intent)
+                    }
+                }
+            } else {
+                result.notImplemented()
+            }
+        }
+    }
+
+    private fun back() {
+        val intent = Intent(Intent.ACTION_MAIN).apply {
+            addCategory(Intent.CATEGORY_HOME)
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        }
+        startActivity(intent)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            window.attributes.layoutInDisplayCutoutMode =
+                LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        android.os.Process.killProcess(android.os.Process.myPid())
+        exitProcess(0)
+    }
+
+    override fun onUserLeaveHint() {
+        super.onUserLeaveHint()
+        methodChannel.invokeMethod("onUserLeaveHint", null)
+    }
+
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration?) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+        MethodChannel(
+            flutterEngine!!.getDartExecutor()!!.getBinaryMessenger(),
+            "floating"
+        ).invokeMethod("onPipChanged", isInPictureInPictureMode)
+    }
+}

android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt

@@ -1,67 +0,0 @@
-package com.example.pilipalax
-
-import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.MethodChannel
-import com.ryanheise.audioservice.AudioServiceActivity
-import android.content.Intent
-import android.content.res.Configuration
-import android.os.Build
-import android.os.Bundle
-import android.view.WindowManager.LayoutParams
-import kotlin.system.exitProcess
-
-class MainActivity : AudioServiceActivity() {
-    private lateinit var methodChannel: MethodChannel
-
-    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
-        super.configureFlutterEngine(flutterEngine)
-        methodChannel = MethodChannel(flutterEngine!!.getDartExecutor()!!.getBinaryMessenger(), CHANNEL)
-        methodChannel.setMethodCallHandler { call, result ->
-            if (call.method == "back") {
-                back()
-            } else {
-                result.notImplemented()
-            }
-        }
-    }
-
-    private fun back() {
-        val intent = Intent(Intent.ACTION_MAIN).apply {
-            addCategory(Intent.CATEGORY_HOME)
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        }
-        startActivity(intent)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            window.attributes.layoutInDisplayCutoutMode =
-                LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        android.os.Process.killProcess(android.os.Process.myPid())
-        exitProcess(0)
-    }
-
-    override fun onUserLeaveHint() {
-        super.onUserLeaveHint()
-        methodChannel.invokeMethod("onUserLeaveHint", null)
-    }
-
-    companion object {
-        private const val CHANNEL = "onUserLeaveHint"
-    }
-
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration?) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
-        MethodChannel(
-            flutterEngine!!.getDartExecutor()!!.getBinaryMessenger(),
-            "floating"
-        ).invokeMethod("onPipChanged", isInPictureInPictureMode)
-    }
-}

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,11 @@
+<?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>
-</vector>
+    android:width="108dp"
+    android:viewportWidth="108.0"
+    android:viewportHeight="108.0">
+    <path
+        android:fillColor="@color/ic_launcher_foreground"
+        android:pathData="M56,54L39.78,54l2.22,-10.94h14c3.02,0 5.47,2.45 5.47,5.47 0,3.02 -2.45,5.47 -5.47,5.47zM56,35.77h-9.62l-7.13,36.45h7.51L48.92,61.29h7.08c7.05,0 12.76,-5.71 12.76,-12.76 0,-7.05 -5.71,-12.76 -12.76,-12.76z"
+        android:fillType="evenOdd" />
+</vector>

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

@@ -1,50 +0,0 @@
-<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>
-</vector>

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

@@ -1,32 +1,12 @@
+<?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="108.0"
+    android:viewportHeight="108.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"/>
-    <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="#FF5CB67B"
+        android:pathData="M57.54,54L28.82,54l3.93,-19.36h24.78c5.35,0 9.68,4.33 9.68,9.68 0,5.35 -4.33,9.68 -9.68,9.68zM57.54,21.73L40.5,21.73L27.88,86.27h13.3l3.83,-19.36h12.54c12.48,0 22.59,-10.11 22.59,-22.59 0,-12.48 -10.11,-22.59 -22.59,-22.59z"
+        android:strokeWidth="0.252073"
+        android:fillType="evenOdd" />
 </vector>

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

@@ -1,6 +1,6 @@
 <?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"/>
-</adaptive-icon>
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</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/values-night-v31/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_foreground">@android:color/system_accent1_100</color>
+    <color name="ic_launcher_background">@android:color/system_neutral1_800</color>
+</resources>

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/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_foreground">@android:color/system_neutral2_700</color>
+    <color name="ic_launcher_background">@android:color/system_accent1_100</color>
+</resources>

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,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#ffffff</color>
+    <color name="ic_launcher_foreground">#FF5CB67B</color>
+    <color name="ic_launcher_background">#FFFFFFFF</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

@@ -18,19 +18,33 @@ subprojects {
     afterEvaluate { project ->
         if (project.extensions.findByName("android") != null) {
             Integer pluginCompileSdk = project.android.compileSdk
-            if (pluginCompileSdk != null && pluginCompileSdk < 31) {
-                project.logger.error(
-                    "Warning: Overriding compileSdk version in Flutter plugin: "
-                        + project.name
-                        + " from "
-                        + pluginCompileSdk
-                        + " to 31 (to work around https://issuetracker.google.com/issues/199180389)."
-                        + "\nIf there is not a new version of " + project.name + ", consider filing an issue against "
-                        + project.name
-                        + " to increase their compileSdk to the latest (otherwise try updating to the latest version)."
-                )
-                project.android {
-                    compileSdk 31
+            if (pluginCompileSdk != null) {
+                if (pluginCompileSdk < 31) {
+                    project.logger.error(
+                        "Warning: Overriding compileSdk version in Flutter plugin: "
+                            + project.name
+                            + " from "
+                            + pluginCompileSdk
+                            + " to 31 (to work around https://issuetracker.google.com/issues/199180389)."
+                            + "\nIf there is not a new version of " + project.name + ", consider filing an issue against "
+                            + project.name
+                            + " to increase their compileSdk to the latest (otherwise try updating to the latest version)."
+                    )
+                    project.android {
+                        compileSdk 31
+                    }
+                }
+                if (pluginCompileSdk > 34) {
+                    project.logger.error(
+                        "Warning: Overriding compileSdk version in Flutter plugin: "
+                            + project.name
+                            + " from "
+                            + pluginCompileSdk
+                            + " to 34"
+                    )
+                    project.android {
+                        compileSdk 34
+                    }
                 }
             }
         }

android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true