fix save subtitle on win

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

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.35.7"
+}

.github/ISSUE_TEMPLATE/bug-反馈.yml

@@ -9,12 +9,24 @@ body:
     attributes:
       label: 检查清单
       options:
-        - label: 之前没有人提交过类似或相同的 bug report。
-          required: true
-        - label: 无视上一条 => block
+        - label: 搜索了 [历史 issue](https://github.com/bggRGjQaUbCoE/PiliPlus/issues?q=is%3Aissue) ，并未发现相同问题
           required: true
         - label: 正在使用最新版本。
           required: true
+        - label: 已排除网络问题
+          required: true
+        - label: 已排除账号问题
+          required: true
+        - label: 已排除设置问题
+          required: true
+  
+  - type: checkboxes
+    id: assign
+    attributes:
+      label: Assign
+      options:
+        - label: self-assign
+          required: false
 
   - type: textarea
     id: version
@@ -23,14 +35,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: bug
-    attributes:
-      label: 问题描述
-      description: 请提供一个清晰而简明的问题描述。
-    validations:
-      required: true
-
   - type: textarea
     id: steps
     attributes:
@@ -47,6 +51,14 @@ body:
     validations:
       required: true
 
+  - type: textarea
+    id: actual
+    attributes:
+      label: 实际行为
+      description: 请描述实际的行为或结果。
+    validations:
+      required: true
+
   - type: textarea
     id: log
     attributes:

.github/ISSUE_TEMPLATE/功能请求.yml

@@ -9,12 +9,20 @@ body:
     attributes:
       label: 检查清单
       options:
-        - label: 之前没有人提交过类似或相同的功能请求。
-          required: true
-        - label: 无视上一条 => block
+        - label: 搜索了 [历史 issue](https://github.com/bggRGjQaUbCoE/PiliPlus/issues?q=is%3Aissue) ，并未发现相同功能请求
           required: true
         - label: 正在使用最新版本。
           required: true
+        - label: 设置中未搜索到该功能
+          required: true
+
+  - type: checkboxes
+    id: assign
+    attributes:
+      label: Assign
+      options:
+        - label: self-assign
+          required: false
 
   - type: textarea
     id: desc
@@ -24,14 +32,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: propose
-    attributes:
-      label: 目标
-      description: 请描述你希望通过这个功能实现的目标。
-    validations:
-      required: true
-
   - type: textarea
     id: solution
     attributes:

.github/workflows/android.yml

@@ -1,79 +0,0 @@
-name: Android Release
-
-on:
-  workflow_dispatch:
-
-jobs:
-  android:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: 代码迁出
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: 构建Java环境
-        uses: actions/setup-java@v4
-        with:
-          distribution: "zulu"
-          java-version: "17"
-
-      - name: 检查缓存
-        uses: actions/cache@v4
-        id: cache-flutter
-        with:
-          path: /root/flutter-sdk # Flutter SDK 的路径
-          key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
-
-      - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          flutter-version-file: pubspec.yaml
-
-      - 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
-            echo "${{ secrets.SIGN_KEYSTORE_BASE64 }}" | base64 --decode > android/app/key.jks
-            echo storeFile='key.jks' >> android/key.properties
-            echo storePassword='${{ secrets.KEYSTORE_PASSWORD }}' >> android/key.properties
-            echo keyAlias='${{ secrets.KEY_ALIAS }}' >> android/key.properties
-            echo keyPassword='${{ secrets.KEY_PASSWORD }}' >> android/key.properties
-          fi
-
-      - name: flutter build 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
-        with:
-          name: app-arm64-v8a
-          path: |
-            build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
-
-      - name: 上传
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-armeabi-v7a
-          path: |
-            build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
-
-      - name: 上传
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-x86_64
-          path: |
-            build/app/outputs/flutter-apk/app-x86_64-release.apk

.github/workflows/build.yml

@@ -0,0 +1,168 @@
+name: Build
+
+on:
+    pull_request:
+        types:
+            - opened
+            - synchronize
+            - reopened
+            - ready_for_review
+        paths-ignore:
+            - "**.md"
+    workflow_dispatch:
+        inputs:
+            build_android:
+                description: "Build Android"
+                required: false
+                default: true
+                type: boolean
+
+            build_ios:
+                description: "Build iOS"
+                required: false
+                default: true
+                type: boolean
+
+            build_mac:
+                description: "Build Mac"
+                required: false
+                default: true
+                type: boolean
+
+            build_win_x64:
+                description: "Build Win-x64"
+                required: false
+                default: true
+                type: boolean
+
+            build_linux_x64:
+                description: "Build Linux-x64"
+                required: false
+                default: true
+                type: boolean
+
+            tag:
+                description: "tag"
+                required: false
+                default: ""
+                type: string
+
+jobs:
+    android:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_android == 'true' }}
+        name: Release Android
+        runs-on: ubuntu-latest
+        permissions: write-all
+
+        steps:
+            - name: 代码迁出
+              uses: actions/checkout@v5
+              with:
+                  fetch-depth: 0
+
+            - name: 构建Java环境
+              uses: actions/setup-java@v5
+              with:
+                  distribution: "zulu"
+                  java-version: "17"
+                  cache: "gradle"
+                  cache-dependency-path: |
+                      android/*.gradle*
+                      android/**/gradle-wrapper.properties
+
+            - name: 安装Flutter
+              uses: subosito/flutter-action@v2
+              id: flutter-action
+              with:
+                  channel: stable
+                  flutter-version-file: pubspec.yaml
+                  cache: true
+
+            - name: apply bottom sheet patch
+              working-directory: ${{ env.FLUTTER_ROOT }}
+              run: git apply $GITHUB_WORKSPACE/lib/scripts/bottom_sheet_patch.diff
+              continue-on-error: true
+
+            - name: Write key
+              if: github.event_name == 'workflow_dispatch'
+              run: |
+                  if [ ! -z "${{ secrets.SIGN_KEYSTORE_BASE64 }}" ]; then
+                    echo "${{ secrets.SIGN_KEYSTORE_BASE64 }}" | base64 --decode > android/app/key.jks
+                    echo storeFile='key.jks' >> android/key.properties
+                    echo storePassword='${{ secrets.KEYSTORE_PASSWORD }}' >> android/key.properties
+                    echo keyAlias='${{ secrets.KEY_ALIAS }}' >> android/key.properties
+                    echo keyPassword='${{ secrets.KEY_PASSWORD }}' >> android/key.properties
+                  fi
+
+            - name: Set and Extract version
+              shell: pwsh
+              run: lib/scripts/build.ps1 android
+
+            - name: flutter build apk
+              run: flutter build apk --release --split-per-abi --dart-define-from-file=pili_release.json --pub
+
+            - name: rename
+              run: |
+                  for file in build/app/outputs/flutter-apk/app-*-release.apk; do
+                    abi=$(echo "$file" | sed -E 's|.*app-(.*)-release\.apk|\1|')
+                    mv "$file" "PiliPlus_android_${{ env.version }}_${abi}.apk"
+                  done
+              shell: bash
+
+            - name: Release
+              if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag != '' }}
+              uses: softprops/action-gh-release@v2
+              with:
+                  tag_name: ${{ github.event.inputs.tag }}
+                  name: ${{ github.event.inputs.tag }}
+                  files: |
+                      PiliPlus_android_*.apk
+
+            - name: 上传
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Android_arm64-v8a
+                  path: |
+                      PiliPlus_android_*_arm64-v8a.apk
+
+            - name: 上传
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Android_armeabi-v7a
+                  path: |
+                      PiliPlus_android_*_armeabi-v7a.apk
+
+            - name: 上传
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Android_x86_64
+                  path: |
+                      PiliPlus_android_*_x86_64.apk
+
+    ios:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_ios == 'true' }}
+        uses: ./.github/workflows/ios.yml
+        permissions: write-all
+        with:
+            tag: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || '' }}
+
+    mac:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_mac == 'true' }}
+        uses: ./.github/workflows/mac.yml
+        permissions: write-all
+        with:
+            tag: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || '' }}
+
+    win_x64:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_win_x64 == 'true' }}
+        uses: ./.github/workflows/win_x64.yml
+        permissions: write-all
+        with:
+            tag: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || '' }}
+
+    linux_x64:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_linux_x64 == 'true' }}
+        uses: ./.github/workflows/linux_x64.yml
+        permissions: write-all
+        with:
+            tag: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || '' }}

.github/workflows/ios.yml

@@ -1,11 +1,14 @@
 name: Build for iOS
 
 on:
-  workflow_dispatch:
+  workflow_call:
     inputs:
-      branch:
+      tag:
+        description: "tag"
         required: false
-        default: 'main'
+        default: ""
+        type: string
+  workflow_dispatch:
 
 jobs:
   build-macos-app:
@@ -13,9 +16,8 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
-          ref: ${{ github.event.inputs.branch }}
           fetch-depth: 0
 
       - name: Setup flutter
@@ -24,21 +26,27 @@ jobs:
           channel: stable
           flutter-version-file: pubspec.yaml
 
-      - 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: Set and Extract version
+        shell: pwsh
+        run: lib/scripts/build.ps1
 
       - name: Build iOS
         run: |
-          chmod +x lib/scripts/build.sh
-          lib/scripts/build.sh
-          flutter build ios --release --no-codesign 
+          flutter build ios --release --no-codesign --dart-define-from-file=pili_release.json
           ln -sf ./build/ios/iphoneos Payload
-          zip -r9 ios-release-no-sign.ipa Payload/runner.app
+          zip -r9 PiliPlus_ios_${{env.version}}.ipa Payload/runner.app
+
+      - name: Release
+        if: ${{ github.event.inputs.tag != '' }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          name: ${{ github.event.inputs.tag }}
+          files: |
+            PiliPlus_ios_*.ipa
 
       - name: Upload ios release
         uses: actions/upload-artifact@v4
         with:
-          name: ios-release
-          path: ios-release-no-sign.ipa
+          name: iOS-release
+          path: PiliPlus_ios_*.ipa

.github/workflows/linux_x64.yml

@@ -0,0 +1,260 @@
+name: Build for Linux x64
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        description: "tag"
+        required: false
+        default: ""
+        type: string
+  workflow_dispatch:
+
+jobs:
+  build-linux-app:
+    name: Release Linux x64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang cmake libgtk-3-dev ninja-build libayatana-appindicator3-dev unzip webkit2gtk-4.1 libasound2-dev rpm patchelf
+          sudo apt-get install -y gcc g++ autoconf automake debhelper glslang-dev ladspa-sdk xutils-dev libasound2-dev \
+              libarchive-dev libbluray-dev libbs2b-dev libcaca-dev libcdio-paranoia-dev libdrm-dev \
+              libdav1d-dev libdvdnav-dev libegl1-mesa-dev libepoxy-dev libfontconfig-dev libfreetype6-dev \
+              libfribidi-dev libgl1-mesa-dev libgbm-dev libgme-dev libgsm1-dev libharfbuzz-dev libjpeg-dev \
+              libbrotli-dev liblcms2-dev libmodplug-dev libmp3lame-dev libopenal-dev \
+              libopus-dev libopencore-amrnb-dev libopencore-amrwb-dev libpulse-dev librtmp-dev \
+              libsdl2-dev libsixel-dev libssh-dev libsoxr-dev libspeex-dev libtool \
+              libv4l-dev libva-dev libvdpau-dev libvorbis-dev libvo-amrwbenc-dev \
+              libunwind-dev libvpx-dev libwayland-dev libx11-dev libxext-dev \
+              libxkbcommon-dev libxrandr-dev libxss-dev libxv-dev libxvidcore-dev \
+              linux-libc-dev nasm ninja-build pkg-config python3 python3-docutils wayland-protocols \
+              x11proto-core-dev zlib1g-dev libfdk-aac-dev libtheora-dev libwebp-dev \
+              unixodbc-dev libpq-dev libxxhash-dev libaom-dev \
+              libgtk-3-0 libblkid1 liblzma5 libmpv-dev
+        shell: bash
+
+      - name: Setup flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version-file: pubspec.yaml
+          cache: true
+
+      - name: Set and Extract version
+        shell: pwsh
+        run: lib/scripts/build.ps1
+
+        #TODO: deb and rpm packages need to be build
+      - name: Build Linux
+        run: flutter build linux --release -v --pub --dart-define-from-file=pili_release.json
+
+      - name: Package .tar.gz
+        run: tar -zcvf PiliPlus_linux_${{ env.version }}_amd64.tar.gz -C build/linux/x64/release/bundle .
+
+      - name: Packege deb
+        run: |
+          printf "建立构建目录...\n"
+          mkdir "PiliPlus_linux_${{ env.version }}_amd64"
+          pushd "PiliPlus_linux_${{ env.version }}_amd64"
+          mkdir -p opt/PiliPlus
+          mkdir -p usr/share/applications
+          mkdir -p usr/share/icons/hicolor/512x512/apps
+
+          printf "复制文件...\n"
+          cp -r ../build/linux/x64/release/bundle/* opt/PiliPlus
+          cp -r ../assets/linux/DEBIAN .
+          cp ../assets/linux/piliplus.desktop usr/share/applications
+          cp ../assets/images/logo/logo.png usr/share/icons/hicolor/512x512/apps/piliplus.png
+
+          printf "修改控制文件...\n"
+          # 替换版本号
+          sed -i  "2s/version_need_change/${{ env.version }}/g" DEBIAN/control
+          # 计算安装大小并替换
+          SIZE_KB=$(du -s -b --apparent-size . | awk '{print int($1)}')
+          SIZE_KB=$(($SIZE_KB - $(du -s -b --apparent-size DEBIAN | awk '{print int($1)}')))
+          SIZE_KB=$(echo $SIZE_KB | awk '{print int($1/1024 + 0.999)}')
+          printf "\t安装大小: %s KB\n" "$SIZE_KB"
+          sed -i "9s/size_need_change/${SIZE_KB}/g" DEBIAN/control
+
+          printf "生成并写入 md5sums ...\n"
+          md5sum opt/PiliPlus/piliplus >> DEBIAN/md5sums
+          md5sum opt/PiliPlus/lib/* >> DEBIAN/md5sums
+          md5sum opt/PiliPlus/data/icudtl.dat >> DEBIAN/md5sums
+
+          printf "设置权限...\n"
+          chmod 0644 DEBIAN/control
+          chmod 0644 DEBIAN/md5sums
+          chmod 0755 DEBIAN/postinst
+          chmod 0755 DEBIAN/postrm
+          chmod 0755 DEBIAN/prerm
+
+          printf "打包 deb 文件...\n"
+          popd
+          dpkg-deb --build --verbose --root-owner-group "PiliPlus_linux_${{ env.version }}_amd64"
+          printf "完成: PiliPlus_linux_%s_amd64.deb\n" "${{ env.version }}"
+        shell: bash
+
+      - name: Packege rpm
+        run: |
+          printf "建立 RPM 构建目录...\n"
+          RPM_BUILD_ROOT="$PWD/rpm_build"
+          mkdir -p "$RPM_BUILD_ROOT/BUILD" "$RPM_BUILD_ROOT/RPMS" "$RPM_BUILD_ROOT/SOURCES" "$RPM_BUILD_ROOT/SPECS" "$RPM_BUILD_ROOT/SRPMS"
+
+          printf "准备源码归档（仅包含运行时与元数据）...\n"
+          DATE="$(date '+%a %b %d %Y')"
+          SRC_DIR="$PWD/piliplus-${{ env.version }}"
+          mkdir -p "$SRC_DIR/bundle" "$SRC_DIR/assets"
+          cp -r build/linux/x64/release/bundle/* "$SRC_DIR/bundle/"
+          cp assets/linux/piliplus.desktop "$SRC_DIR/assets/piliplus.desktop"
+          cp assets/images/logo/logo.png "$SRC_DIR/assets/piliplus.png"
+          tar -zcvf "$RPM_BUILD_ROOT/SOURCES/piliplus-${{ env.version }}.tar.gz" -C "$PWD" "piliplus-${{ env.version }}"
+
+          printf "生成 spec 文件...\n"
+          cat > "$RPM_BUILD_ROOT/SPECS/piliplus.spec" <<EOF
+          Name:           piliplus
+          Version:        ${{ env.version }}
+          Release:        1%{?dist}
+          Summary:        PiliPlus Linux Version
+          License:        GPL-3.0
+          Source0:        piliplus-${{ env.version }}.tar.gz
+          Requires:       desktop-file-utils, hicolor-icon-theme
+
+          %description
+          使用 Flutter 开发的 BiliBili 第三方客户端
+
+          %prep
+          %setup -q -n piliplus-${{ env.version }}
+
+          %build
+
+          %install
+          mkdir -p %{buildroot}/opt/PiliPlus
+          cp -r bundle/* %{buildroot}/opt/PiliPlus/
+
+          # 二进制权限与命令行入口
+          chmod 755 %{buildroot}/opt/PiliPlus/piliplus
+          mkdir -p %{buildroot}/usr/bin
+          ln -sf /opt/PiliPlus/piliplus %{buildroot}/usr/bin/piliplus
+
+          # 桌面集成
+          mkdir -p %{buildroot}/usr/share/applications
+          install -m 644 assets/piliplus.desktop %{buildroot}/usr/share/applications/piliplus.desktop
+
+          mkdir -p %{buildroot}/usr/share/icons/hicolor/512x512/apps
+          install -m 644 assets/piliplus.png %{buildroot}/usr/share/icons/hicolor/512x512/apps/piliplus.png
+
+          %post
+          update-desktop-database -q || true
+          gtk-update-icon-cache -q -t -f %{_datadir}/icons/hicolor || true
+
+          %postun
+          update-desktop-database -q || true
+          gtk-update-icon-cache -q -t -f %{_datadir}/icons/hicolor || true
+
+          %files
+          /opt/PiliPlus
+          /usr/bin/piliplus
+          /usr/share/applications/piliplus.desktop
+          /usr/share/icons/hicolor/512x512/apps/piliplus.png
+
+          %changelog
+          * DATE - ${{ env.version }}-1
+          - Initial RPM release
+          EOF
+
+          sed -i "s/DATE/${DATE}/g" "$RPM_BUILD_ROOT/SPECS/piliplus.spec"
+
+          printf "构建 RPM 包...\n"
+          rpmbuild --define "_topdir $RPM_BUILD_ROOT" -bb "$RPM_BUILD_ROOT/SPECS/piliplus.spec"
+
+          printf "移动生成的 RPM...\n"
+          find "$RPM_BUILD_ROOT/RPMS" -name "*.rpm" -exec mv {} "PiliPlus_linux_${{ env.version }}_amd64.rpm" \;
+
+          printf "完成: PiliPlus_linux_%s_amd64.rpm\n" "${{ env.version }}"
+        shell: bash
+      
+      - name: Package AppImage
+        run: |
+          printf "下载 appimagetool...\n"
+          wget -q https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
+          chmod +x appimagetool-x86_64.AppImage
+
+          printf "建立 AppDir 目录结构...\n"
+          APPDIR="PiliPlus.AppDir"
+          mkdir -p "$APPDIR/usr/bin"
+          mkdir -p "$APPDIR/usr/lib"
+          mkdir -p "$APPDIR/usr/share/applications"
+          mkdir -p "$APPDIR/usr/share/icons/hicolor/512x512/apps"
+
+          printf "复制应用文件...\n"
+          cp -r build/linux/x64/release/bundle/* "$APPDIR/usr/bin/"
+          
+          printf "复制桌面文件和图标...\n"
+          cp assets/linux/piliplus.desktop "$APPDIR/piliplus.desktop"
+          cp assets/linux/piliplus.desktop "$APPDIR/usr/share/applications/piliplus.desktop"
+          cp assets/images/logo/logo.png "$APPDIR/piliplus.png"
+          cp assets/images/logo/logo.png "$APPDIR/usr/share/icons/hicolor/512x512/apps/piliplus.png"
+          
+          printf "创建 AppRun 启动脚本...\n"
+          cat > "$APPDIR/AppRun" <<'APPRUN_EOF'
+          #!/bin/bash
+          SELF=$(readlink -f "$0")
+          HERE=${SELF%/*}
+          export PATH="${HERE}/usr/bin:${PATH}"
+          export LD_LIBRARY_PATH="${HERE}/usr/lib:${LD_LIBRARY_PATH}"
+          exec "${HERE}/usr/bin/piliplus" "$@"
+          APPRUN_EOF
+          chmod +x "$APPDIR/AppRun"
+
+          printf "修改桌面文件中的 Exec 路径...\n"
+          sed -i 's|Exec=piliplus|Exec=piliplus|g' "$APPDIR/piliplus.desktop"
+          sed -i 's|Icon=piliplus|Icon=piliplus|g' "$APPDIR/piliplus.desktop"
+
+          printf "打包 AppImage...\n"
+          ARCH=x86_64 ./appimagetool-x86_64.AppImage "$APPDIR" "PiliPlus_linux_${{ env.version }}_amd64.AppImage"
+          
+          printf "完成: PiliPlus_linux_%s_amd64.AppImage\n" "${{ env.version }}"
+        shell: bash
+
+      - name: Release
+        if: ${{ github.event.inputs.tag != '' }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          name: ${{ github.event.inputs.tag }}
+          files: |
+            PiliPlus_linux_*.tar.gz
+            PiliPlus_linux_*.deb
+            PiliPlus_linux_*.rpm
+            PiliPlus_linux_*.AppImage
+
+      - name: Upload linux targz package
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux_targz_amd64_packege
+          path: PiliPlus_linux_*.tar.gz
+
+      - name: Upload linux deb package
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux_deb_amd64_package
+          path: PiliPlus_linux_*.deb
+
+      - name: Upload linux rpm package
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux_rpm_amd64_package
+          path: PiliPlus_linux_*.rpm
+      
+      - name: Upload linux AppImage package
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux_AppImage_amd64_package
+          path: PiliPlus_linux_*.AppImage

.github/workflows/mac.yml

@@ -0,0 +1,58 @@
+name: Build for Mac
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        description: "tag"
+        required: false
+        default: ""
+        type: string
+  workflow_dispatch:
+
+jobs:
+  build-mac-app:
+    name: Release Mac
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Setup flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version-file: pubspec.yaml
+
+      - name: Set and Extract version
+        shell: pwsh
+        run: lib/scripts/build.ps1
+
+      - name: Build Mac
+        run: flutter build macos --release --dart-define-from-file=pili_release.json
+
+      - name: Prepare Upload
+        run: |
+          npm install --global create-dmg
+          create-dmg build/macos/Build/Products/Release/PiliPlus.app
+        continue-on-error: true
+
+      - name: Rename DMG
+        run: mv PiliPlus*.dmg PiliPlus_macos_${{ env.version }}.dmg
+
+      - name: Release
+        if: ${{ github.event.inputs.tag != '' }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          name: ${{ github.event.inputs.tag }}
+          files: |
+            PiliPlus_macos_*.dmg
+
+      - name: Upload macos release
+        uses: actions/upload-artifact@v4
+        with:
+          name: macOS-release
+          path: PiliPlus_macos_*.dmg

.github/workflows/win_x64.yml

@@ -0,0 +1,80 @@
+name: Build for Windows x64
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        description: "tag"
+        required: false
+        default: ""
+        type: string
+  workflow_dispatch:
+
+jobs:
+  build-windows-app:
+    name: Release Windows x64
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Setup flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version-file: pubspec.yaml
+
+      - name: Add fastforge and Inno Setup
+        run: |
+          dart pub global activate fastforge
+          choco install innosetup
+
+      - name: Add Chinese language file for Inno Setup
+        run: |
+          Copy-Item "windows/packaging/exe/ChineseSimplified.isl" "C:\Program Files (x86)\Inno Setup 6\Languages\ChineseSimplified.isl"
+        shell: pwsh
+
+      - name: Set and Extract version
+        shell: pwsh
+        run: lib/scripts/build.ps1
+
+      - name: Build Windows
+        run: |
+          fastforge package --platform windows --targets exe --flutter-build-args="dart-define-from-file=pili_release.json"
+
+      - name: Prepare Upload
+        run: |
+          mkdir -p Release/PiliPlus-Win
+          mkdir -p PiliPlus-Win-Setup
+          mv build/windows/x64/runner/Release/* Release/PiliPlus-Win/
+          mv dist/**/*.exe PiliPlus-Win-Setup/PiliPlus_windows_${{env.version}}_x64_setup.exe
+
+      - name: Compress
+        if: ${{ github.event.inputs.tag != '' }}
+        run: |
+          Compress-Archive -Path "Release/PiliPlus-Win" -DestinationPath "PiliPlus_windows_${{env.version}}_x64.zip"
+        shell: pwsh
+
+      - name: Release
+        if: ${{ github.event.inputs.tag != '' }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          name: ${{ github.event.inputs.tag }}
+          files: |
+            PiliPlus_windows_*.zip
+            PiliPlus-Win-Setup/PiliPlus_windows_*.exe
+
+      - name: Upload windows file release
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows-file-x64-release
+          path: Release
+
+      - name: Upload windows setup release
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows-setup-x64-release
+          path: PiliPlus-Win-Setup

.gitignore

@@ -19,7 +19,7 @@ migrate_working_dir/
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter repo-specific
 /bin/cache/
@@ -134,5 +134,16 @@ app.*.symbols
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
 !.vscode/settings.json
+!.vscode/launch.json
+!.vscode/tasks.json
 
-/lib/build_config.dart
+devtools_options.yaml
+
+# FVM Version Cache
+.fvm/
+
+pili_release.json
+
+dist
+
+test.dart

.vscode/launch.json

@@ -1,22 +1,22 @@
 {
-    // 使用 IntelliSense 了解相关属性。 
+    // 使用 IntelliSense 了解相关属性。
     // 悬停以查看现有属性的描述。
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "piliplus",
+            "name": "PiliPlus",
             "request": "launch",
             "type": "dart"
         },
         {
-            "name": "piliplus (profile mode)",
+            "name": "PiliPlus (profile mode)",
             "request": "launch",
             "type": "dart",
             "flutterMode": "profile"
         },
         {
-            "name": "piliplus (release mode)",
+            "name": "PiliPlus (release mode)",
             "request": "launch",
             "type": "dart",
             "flutterMode": "release"

README.md

@@ -22,22 +22,18 @@
 <br/>
 </div>
 
-## 开发环境
-
-```bash
-[✓] Flutter (Channel stable, 3.24.0, on Microsoft Windows [版本 10.0.19045.4046], locale zh-CN)
-[✓] Android toolchain - develop for Android devices (Android SDK version 34.0.0)
-[✓] Xcode - develop for iOS and macOS (Xcode 15.1)
-[✓] Chrome - develop for the web
-[✓] Android Studio (version 2022.3)
-[✓] VS Code (version 1.85.1)
-[✓] Connected device (3 available)
-[✓] Network resources
-
-```
 
 <br/>
 
+## 适配平台
+
+- [x] Android
+- [x] iOS
+- [x] Pad
+- [x] Windows
+- [x] Linux
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/piliplus.svg)](https://repology.org/project/piliplus/versions)
 
 ## refactor
 
@@ -47,6 +43,18 @@
 
 ## feat
 
+- [x] 离线缓存/播放
+- [x] 移动端支持点击弹幕悬停，点赞、复制、举报 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] 播放音频
+- [x] 跳过番剧片头/片尾
+- [x] 安卓端 `loudnorm` 适配 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] Win/Mac 支持极验、短信登录 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] 视频截取动图 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] AI 原声翻译
+- [x] SuperChat
+- [x] 播放课堂视频
+- [x] 发起投票
+- [x] 发布动态/评论支持`富文本编辑`/`表情显示`/`@用户`
 - [x] 修改消息设置
 - [x] 修改聊天设置
 - [x] 展示折叠消息
@@ -58,7 +66,7 @@
 - [x] 移除粉丝
 - [x] 直播弹幕发送表情
 - [x] 收藏夹排序
-- [x] 稍后再看`未看`/`未看完`/`已看完`分类
+- [x] 稍后再看 ~~`未看`~~ / `未看完` / ~~`已看完`~~ 分类
 - [x] WebDAV 备份/恢复设置
 - [x] 保存评论/动态
 - [x] 高级弹幕 by [@My-Responsitories](https://github.com/My-Responsitories)
@@ -132,11 +140,6 @@
 
 ## 功能
 
-目前着重移动端(Android、iOS)和Pad端，暂时没有适配桌面端、手表端等
-
-<br/>
-
-
 - [x] 推荐视频列表(app端)
 - [x] 最热视频列表
 - [x] 热门直播
@@ -236,3 +239,13 @@
 <br/>
 <br/>
 <br/>
+
+## Star History
+
+<a href="https://www.star-history.com/#bggRGjQaUbCoE/PiliPlus&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=bggRGjQaUbCoE/PiliPlus&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=bggRGjQaUbCoE/PiliPlus&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=bggRGjQaUbCoE/PiliPlus&type=Date" />
+ </picture>
+</a>

analysis_options.yaml

@@ -9,6 +9,14 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
+analyzer:
+  exclude:
+    - lib/grpc/bilibili/**
+    - lib/grpc/google/**
+
+formatter:
+  trailing_commas: preserve
+
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`
@@ -27,7 +35,6 @@ linter:
     # 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
@@ -53,5 +60,8 @@ linter:
     - use_colored_box
     - use_decorated_box
     - use_named_constants
+    - use_null_aware_elements
+    - unnecessary_lambdas
+    - use_is_even_rather_than_modulo
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

android/.gitignore

@@ -11,3 +11,6 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+
+/build
+/.kotlin

android/app/build.gradle

@@ -1,110 +0,0 @@
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-def keystorePropertiesFile = rootProject.file('key.properties')
-def keystoreProperties = new Properties()
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
-def _filePath = System.getenv("KEYSTORE") ?: keystoreProperties["storeFile"]
-def _storeFile = _filePath != null ? file(_filePath) : null
-def _storePassword = System.getenv("KEYSTORE_PASSWORD") ?: keystoreProperties["storePassword"]
-def _keyAlias = System.getenv("KEY_ALIAS") ?: keystoreProperties["keyAlias"]
-def _keyPassword = System.getenv("KEY_PASSWORD") ?: keystoreProperties["keyPassword"]
-
-android {
-    compileSdkVersion flutter.compileSdkVersion
-
-    namespace 'com.example.piliplus'
-    ndkVersion flutter.ndkVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
-    defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        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 flutter.minSdkVersion
-        multiDexEnabled true
-    }
-
-    signingConfigs {
-        // 添加签名配置
-        if(_storeFile != null) {
-            release {
-                // 配置密钥库文件的位置、别名、密码等信息
-                storeFile _storeFile
-                storePassword _storePassword
-                keyAlias _keyAlias
-                keyPassword _keyPassword
-                v1SigningEnabled true
-                v2SigningEnabled true
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig _storeFile != null ? signingConfigs.release : signingConfigs.debug
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-        debug {
-            applicationIdSuffix ".debug"
-        }
-    }
-
-    project.android.applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            output.versionCodeOverride = variant.versionCode
-        }
-    }
-}
-
-flutter {
-    source '../..'
-}
-
-dependencies {
-}

android/app/build.gradle.kts

@@ -0,0 +1,77 @@
+import com.android.build.gradle.internal.api.ApkVariantOutputImpl
+import org.jetbrains.kotlin.konan.properties.Properties
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.example.piliplus"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    defaultConfig {
+        applicationId = "com.example.piliplus"
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    packagingOptions.jniLibs.useLegacyPackaging = true
+
+    val keyProperties = Properties().also {
+        val properties = rootProject.file("key.properties")
+        if (properties.exists())
+            it.load(properties.inputStream())
+    }
+
+    val config = keyProperties.getProperty("storeFile")?.let {
+        signingConfigs.create("release") {
+            storeFile = file(it)
+            storePassword = keyProperties.getProperty("storePassword")
+            keyAlias = keyProperties.getProperty("keyAlias")
+            keyPassword = keyProperties.getProperty("keyPassword")
+            enableV1Signing = true
+            enableV2Signing = true
+        }
+    }
+
+    buildTypes {
+        all {
+            signingConfig = config ?: signingConfigs["debug"]
+        }
+        release {
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+        debug {
+            applicationIdSuffix = ".debug"
+        }
+    }
+
+    applicationVariants.all {
+        val variant = this
+        variant.outputs.forEach { output ->
+            (output as ApkVariantOutputImpl).versionCodeOverride = flutter.versionCode
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}

android/app/proguard-rules.pro

@@ -1 +1,3 @@
--keep class com.yalantis.ucrop.util.RectUtils { *; }
+-dontwarn javax.annotation.Nullable
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.OpenSSLProvider

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

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">PiliPlus debug</string>
+</resources>

android/app/src/main/AndroidManifest.xml

@@ -36,11 +36,11 @@
     </queries>
 
     <application
-        android:label="PiliPlus"
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         xmlns:tools="http://schemas.android.com/tools"
-        android:enableOnBackInvokedCallback="true"
+        android:enableOnBackInvokedCallback="false"
         android:allowBackup="false"
         android:fullBackupContent="false"
         tools:replace="android:allowBackup">
@@ -58,6 +58,9 @@
             android:supportsPictureInPicture="true"
             android:resizeableActivity="true"
             >
+
+            <meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
+
             <!-- 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
@@ -106,11 +109,13 @@
                 <data android:host="uper" />
                 <data android:host="article"
                     android:pathPattern="/readlist" />
+                <data android:host="opus" />
                 <data android:host="advertise" android:path="/home" />
                 <data android:host="clip" />
-                <data android:host="search" />
+                <data android:host="search" android:pathPattern=".*" />
                 <data android:host="stardust-search" />
                 <data android:host="music" />
+                <data android:host="cheese" />
                 <data android:host="bangumi"
                     android:pathPattern="/season.*" />
                 <data android:host="bangumi" android:pathPattern="/.*" />
@@ -142,7 +147,6 @@
                 <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" />
@@ -157,7 +161,6 @@
                 <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>
@@ -174,7 +177,6 @@
 
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Ucrop.CropTheme"/>
 
         <receiver 
@@ -208,4 +210,5 @@
       -->
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 </manifest>

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

@@ -1,116 +0,0 @@
-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/example/piliplus/MainActivity.kt

@@ -0,0 +1,179 @@
+package com.example.piliplus
+
+import android.app.PictureInPictureParams
+import android.app.SearchManager
+import android.content.ComponentName
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.os.Build
+import android.os.Bundle
+import android.provider.MediaStore
+import android.provider.Settings
+import android.view.WindowManager.LayoutParams
+import androidx.core.net.toUri
+import com.ryanheise.audioservice.AudioServiceActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+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 ->
+            when (call.method) {
+                "back" -> back();
+                "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 (_: Exception) {
+                    }
+                }
+
+                "linkVerifySettings" -> {
+                    val uri = ("package:" + context.packageName).toUri()
+                    try {
+                        val intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                            Intent(Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS, uri)
+                        } else {
+                            Intent("android.intent.action.MAIN", uri).setClassName(
+                                "com.android.settings",
+                                "com.android.settings.applications.InstalledAppOpenByDefaultActivity"
+                            )
+                        }
+                        context.startActivity(intent)
+                    } catch (_: Throwable) {
+                        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, uri)
+                        context.startActivity(intent)
+                    }
+                }
+
+                "music" -> {
+                    val title = call.argument<String>("title")
+                    val intent = Intent(MediaStore.INTENT_ACTION_MEDIA_SEARCH).apply {
+                        putExtra(SearchManager.QUERY, title)
+                        putExtra(MediaStore.EXTRA_MEDIA_TITLE, title)
+                        call.argument<String?>("artist")
+                            ?.let { putExtra(MediaStore.EXTRA_MEDIA_ARTIST, it) }
+                        call.argument<String?>("album")
+                            ?.let { putExtra(MediaStore.EXTRA_MEDIA_ALBUM, it) }
+
+                        addCategory(Intent.CATEGORY_DEFAULT)
+                    }
+                    try {
+                        if (packageManager.resolveActivity(
+                                intent,
+                                PackageManager.MATCH_DEFAULT_ONLY
+                            ) != null
+                        ) {
+                            startActivity(intent)
+                            result.success(true)
+                            return@setMethodCallHandler
+                        }
+                    } catch (_: Throwable) {
+                    }
+                    try {
+                        intent.action = MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH
+                        if (packageManager.resolveActivity(
+                                intent,
+                                PackageManager.MATCH_DEFAULT_ONLY
+                            ) != null
+                        ) {
+                            startActivity(intent)
+                            result.success(true)
+                            return@setMethodCallHandler
+                        }
+                    } catch (_: Throwable) {
+                    }
+                    result.success(false)
+                }
+
+                "setPipAutoEnterEnabled" -> {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                        val params = PictureInPictureParams.Builder()
+                            .setAutoEnterEnabled(call.argument<Boolean>("autoEnable") ?: false)
+                            .build()
+                        setPictureInPictureParams(params)
+                    }
+                }
+
+                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() {
+        stopService(Intent(this, com.ryanheise.audioservice.AudioService::class.java))
+        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!!.dartExecutor.binaryMessenger,
+            "floating"
+        ).invokeMethod("onPipChanged", isInPictureInPictureMode)
+    }
+}

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <style name="Ucrop.CropTheme" parent="Theme.AppCompat.Light.NoActionBar">
-      <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
-  </style>
-</resources>

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

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">PiliPlus</string>
+</resources>

android/build.gradle

@@ -1,59 +0,0 @@
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    afterEvaluate { project ->
-         if (project.hasProperty('android')) {
-            project.android {
-                if (namespace == null) {
-                    namespace project.group
-                }
-            }
-
-            android {
-                compileOptions {
-                    sourceCompatibility JavaVersion.VERSION_17
-                    targetCompatibility JavaVersion.VERSION_17
-                }
-
-                tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-                    kotlinOptions {
-                        jvmTarget = '17'
-                    }
-                }
-            }
-
-            Integer pluginCompileSdk = project.android.compileSdk
-            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
-                    }
-                }
-            }
-        }
-    }
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(':app')
-}
-
-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
-}

android/build.gradle.kts

@@ -0,0 +1,67 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+
+subprojects {
+    afterEvaluate {
+        if (project.extensions.findByName("android") != null) {
+            val androidExtension =
+                project.extensions.getByName("android") as com.android.build.gradle.BaseExtension
+
+            if (androidExtension.namespace == null) {
+                androidExtension.namespace = project.group.toString()
+            }
+
+            androidExtension.compileOptions {
+                sourceCompatibility = JavaVersion.VERSION_17
+                targetCompatibility = JavaVersion.VERSION_17
+            }
+
+            project.tasks.withType<KotlinCompile>().configureEach {
+                compilerOptions {
+                    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+                }
+            }
+
+            val pluginCompileSdkStr = androidExtension.compileSdkVersion
+            val pluginCompileSdk = pluginCompileSdkStr
+                ?.removePrefix("android-")
+                ?.toIntOrNull()
+            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).\n" +
+                            "If 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)."
+                )
+                androidExtension.setCompileSdkVersion(31)
+            }
+        }
+
+        project.buildDir = File(rootProject.buildDir, project.name)
+    }
+}
+
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://downloads.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/settings.gradle

@@ -1,25 +0,0 @@
-pluginManagement {
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }()
-
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
-
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.4.1' apply false
-    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
-}
-
-include ":app"

android/settings.gradle.kts

@@ -0,0 +1,26 @@
+pluginManagement {
+    val flutterSdkPath =
+        run {
+            val properties = java.util.Properties()
+            file("local.properties").inputStream().use { properties.load(it) }
+            val flutterSdkPath = properties.getProperty("flutter.sdk")
+            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+            flutterSdkPath
+        }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.12.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
+}
+
+include(":app")

assets/linux/DEBIAN/control

@@ -0,0 +1,16 @@
+Package: PiliPlus
+Version: version_need_change
+Maintainer: gh-MzA4Nzk <githubaccount2333@proton.me>
+Original-Maintainer: bggRGjQaUbCoE <githubaccount56556@proton.me>
+Section: x11
+Priority: optional
+Architecture: amd64
+Essential: no
+Installed-Size: size_need_change
+Description: third-party Bilibili client developed in Flutter
+Homepage: https://github.com/bggRGjQaUbCoE/PiliPlus
+Depends: libgtk-3-0t64,
+         libmpv2,
+         gir1.2-ayatanaappindicator3-0.1,
+         libayatana-appindicator3-1
+

assets/linux/DEBIAN/postinst

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+ln -sf /opt/PiliPlus/piliplus /usr/bin/piliplus
+chmod +x /usr/bin/piliplus
+
+if [ $1 == "config" ] && [ -x /usr/binupdate-mime-database ]; then
+    echo "updating mime database..."
+    update-mime-database  /usr/share/mime || true
+fi
+
+if [ $1 == "config" ] && [ -x /usr/bin/gtk-update-icon-cache ]; then
+    echo "updating icon cache..."
+    gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor || true
+fi
+
+if [ $1 == "config" ] && [ -x /usr/bin/update-desktop-database ]; then
+    echo "updating desktop database..."
+    update-desktop-database -q /usr/share/applications || true
+fi
+
+exit 0

assets/linux/DEBIAN/postrm

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+rm /usr/bin/piliplus
+if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
+    if [ -x /usr/bin/update-desktop-database ]; then
+        echo "updating desktop database..."
+        update-desktop-database -q /usr/share/applications || true
+    fi
+
+    if [ -x /usr/bin/gtk-update-icon-cache ]; then
+        echo "updating icon cache..."
+        gtk-update-icon-cache -q -t /usr/share/icons/hicolor || true
+    fi
+
+    if [ -x /usr/bin/update-mime-database ]; then
+        echo "updating mime database..."
+        update-mime-database /usr/share/mime || true
+    fi
+fi
+
+if [ $1 = "purge" ]; then
+    echo "Removing user data..."
+    rm -rf /home/*/.local/share/com.example.PiliPlus || true
+    rm -rf /root/.local/share/com.example.PiliPlus || true
+fi
+
+exit 0

assets/linux/DEBIAN/prerm

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+    echo "Stopping PiliPlus if running..."
+    pkill -x piliplus || true
+fi
+
+exit 0

assets/linux/piliplus.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=PiliPlus
+Comment=A third-party Bilibili Client developed in Flutter
+Comment[zh_CN]=使用 Flutter 开发的 BiliBili 第三方客户端
+Exec=piliplus
+Icon=piliplus
+Terminal=false
+Categories=Video;AudioVideo;Player;

change_log/1.0.0.0817.md

@@ -1,11 +0,0 @@
-## 1.0.0
-
-### 初始版本
-+ 直播、推荐、动态功能
-+ 投稿、番剧播放功能
-+ 播放器手势支持
-+ 画质、音质、解码格式支持
-+ 点赞、投币、收藏功能
-+ 关注/取关、用户主页功能
-+ 评论功能
-+ 历史记录、稍后再看功能

change_log/1.0.1.0817.md

@@ -1,7 +0,0 @@
-## 1.0.1
-
-### 修复
-+ 升级播放器依赖
-+ android平台 AV1格式视频支持
-+ 视频全屏功能
-

change_log/1.0.10.1016.md

@@ -1,4 +0,0 @@
-## 1.0.10
-
-### 修复
-+ 长按倍速抬起后未恢复默认倍速

change_log/1.0.11.1112.md

@@ -1,26 +0,0 @@
-## 1.0.11
-
-### 新功能
-+ 适配了原生媒体通知栏 @Daydreamer-riri
-+ 视频主题图标 @Daydreamer-riri
-+ 关闭软件后自动画中画播放
-+ UP主分组管理
-+ md2样式底栏
-+ 
-
- 
-### 修复
-+ 历史记录记忆播放
-+ 部分类型视频连播
-+ 播放速度选择框不支持返回手势
-+ 播放速度选择框不支持返回手势
-+ 视频播放速度总是显示1.0X
-+ 评论页面计数错误
-+ 退出视频还有声音
-
-  
-### 优化
-+ 视频加载速度
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.12.1114.md

@@ -1,11 +0,0 @@
-## 1.0.12
-
- 
-### 修复
-+ iOS端视频播放时没有声音
-+ 超过6分钟弹幕不显示
-+ 视频详情页网络异常
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.13.1217.md

@@ -1,22 +0,0 @@
-## 1.0.13
-
-
-### 新功能
-+ 视频详情页稍后再看
-+ 发送弹幕 感谢@orz12
-+ 消息展示
-+ up主页显示获赞数
-+ up主页显示合集
-+ 视频详情页「ai总结」增加开关
-  
-### 修复
-+ 首页推荐问题（需要重新登录）
-+ 长按倍速逻辑
-+ 视频详情页网络异常
-
-### 优化
-+ 设置面板样式 感谢@GuMengYu @KoolShow
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.14.1225.md

@@ -1,28 +0,0 @@
-## 1.0.14
-
-圣诞节快乐～ 🎉
-
-大部分内容由@orz12提供，感谢👏
-
-### 修复
-+ 全屏弹幕消失
-+ iOS全屏/退出全屏视频暂停
-+ 个人主页关注状态
-+ 视频合集向下滑动UI问题
-+ 媒体库滑动底栏不隐藏
-+ 个人主页动态加载问题 * 2
-+ 未登录状态访问个人主页异常
-+ 视频搜索标题特殊字符转义
-+ iOS闪退
-+ 消息页面夜间模式异常
-+ 消息页面含有撤回消息时异常
-+ 弹幕速度
-
-### 优化
-+ 全屏播放方案优化
-+ 弹幕加载逻辑优化
-+ 点赞、投币逻辑优化
-+ 进度条及播放时间渲染优化
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.15.0101.md

@@ -1,22 +0,0 @@
-## 1.0.15
-
-元旦快乐～ 🎉
-
-### 功能
-+ 转发动态评论展示
-+ 推荐、最热、收藏视频增肌日期显示
-
-### 修复
-+ 全屏播放相关问题
-+ 评论区@用户展示问题
-+ 登录状态闪退问题
-+ pip意外触发问题
-+ 动态页tab切换样式问题
-
-### 优化
-+ 首页默认使用web端推荐
-+ 取消iOS路由切换效果
-+ 视频分享中添加Up主
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.16.0102.md

@@ -1,15 +0,0 @@
-## 1.0.16
-
-
-### 功能
-+ toast 背景支持透明度调节
-
-### 修复
-+ web端推荐未展示【已关注】
-+ up主动态页异常
-+ 未打开自动播放时，视频详情页异常
-+ 视频暂停状态取消自动ip
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.17.0125.md

@@ -1,39 +0,0 @@
-## 1.0.17
-
-
-### 功能
-+ 视频全屏时隐藏进度条
-+ 动态内容增加投稿跳转
-+ 未开启自动播放时点击封面播放
-+ 弹幕发送标识
-+ 定时关闭
-+ 推荐视频卡片拉黑up功能
-+ 首页tabbar编辑排序
-
-### 修复
-+ 连续跳转搜索页未刷新
-+ 搜索结果为空时页面异常
-+ 评论区链接解析
-+ 视频全屏状态栏背景色
-+ 私信对话气泡位置
-+ 设置up关注分组样式
-+ 每次推荐请求数据相同
-+ iOS代理网络异常
-+ 双击切换播放状态无声
-+ 设置自定义倍速白屏
-+ 免登录查看1080p
-
-### 优化
-+ 首页web端推荐观看数展示
-+ 首页web端推荐接口更新
-+ 首页样式
-+ 搜索页跳转
-+ 弹幕资源优化
-+ 图片渲染占用内存优化（部分）
-+ 两次返回退出应用
-+ schame 补充
-  
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.18.0130.md

@@ -1,16 +0,0 @@
-## 1.0.18
-
-
-### 功能
-
-
-### 修复
-
-
-### 优化
-
-  
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.19.0131.md

@@ -1,15 +0,0 @@
-## 1.0.19
-
-
-### 修复
-+ 视频404、评论加载错误
-+ bvav转换
-
-### 优化
-+ 视频详情页内存占用
-
-  
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.2.0819.md

@@ -1,19 +0,0 @@
-## 1.0.2
-
-### 新功能
-+ 自动检查更新
-+ 封面图片保存
-+ 动态跳转番剧
-+ 历史记录番剧记忆播放
-+ 一键清空稍后再看
-  
-### 修复
-+ 切换分P cid未切换
-+ cookie存储问题
-+ 登录/退出登录问题
-  
-### 优化
-+ 页面空/异常状态样式
-+ 退出登录提示
-+ 请求节流
-+ 全屏播放

change_log/1.0.3.0821.md

@@ -1,19 +0,0 @@
-## 1.0.3
-
-建议卸载1.0.2版本，重新安装
-### 新功能
-+ 底部播放进度条设置
-+ 复制图片链接
-
-  
-### 修复
-+ 用户数据格式修改
-+ video Fit
-+ 没有audio 资源的视频异常
-+ 评论区域图片无法点击
-+ 视频进度条拖动问题
-  
-### 优化
-+ 页面空/异常状态样式
-+ 部分页面样式
-+ 图片预览页面样式

change_log/1.0.4.0822.md

@@ -1,21 +0,0 @@
-## 1.0.4
-
-### 新功能
-+ 热搜刷新
-+ 视频搜索排序、筛选
-+ app字体大小自定义
-+ app主题色自定义
-+ 「课堂」类动态渲染
-
-  
-### 修复
-+ 搜索词联想richText渲染异常
-+ 部分动态点赞异常
-+ 默认视频解码格式
-+ 搜索页面返回搜索词未清空
-+ 动态详情评论加载异常
-+ 动态页面下拉刷新数据异常
-  
-### 优化
-+ 一些样式修改
-+ 取消热搜词缓存

change_log/1.0.5.0826.md

@@ -1,30 +0,0 @@
-## 1.0.5
-
-主要是bug修复跟一部分小功能，弹幕功能需要下一版。
-问题反馈请前往QQ频道或提交issues。
-感谢🙏酷友「无力感*」「斤斤计较呀」「Pseudopamine」
-
-### 新功能
-+ 高帧率支持
-+ 默认评论排序设置
-+ 默认动态类别设置
-+ 动态合集查看
-+ 同时观看人数
-+ iOS路由切换效果
-
-  
-### 修复
-+ 收藏夹翻页
-+ 首页搜索框频繁点击消失
-+ 评论排序切换空白
-+ 快速返回首页
-+ 重复进入个人中心页面数据未刷新
-+ 动态goods数据异常
-+ 大会员切换番剧
-+ 高画质codes匹配
-
-  
-### 优化
-+ 倍速选择
-+ 播放器亮度记忆
-+ 下载对应版本apk

change_log/1.0.6.0902.md

@@ -1,34 +0,0 @@
-## 1.0.6
-
-问题反馈、功能建议请查看「关于」页面。
-
-### 新功能
-+ 首页单列布局
-+ 首页推荐展示播放量、弹幕数
-+ 简单弹幕功能实现（持续开发中...）
-+ 评论区搜索关键词开关 issues#46
-+ 热搜榜隐藏功能 issues#35
-+ 自动全屏 issues#37
-+ 快速收藏功能
-+ 双击快进/快退开关
-+ 评论链接跳转视频
-+ 支持移除单个稍后再看
-+ app scheme外链跳转
-
-  
-### 修复
-+ 杜比、无损音频切换
-+ 收藏夹展示 issues#42
-+ 搜索建议次 issues#47
-
-  
-### 优化
-+ 倍速选择优化
-+ 导航条沉浸
-+ 取消Hero动画
-+ 视频锁定逻辑
-+ 登录逻辑优化
-+ 图片预览样式
-+ +评论区用户点击范围
-+ 关注、粉丝页面优化
-+ 关闭自动播放时播放器初始化逻辑

change_log/1.0.7.0908.md

@@ -1,22 +0,0 @@
-## 1.0.7
-
-默认倍速、直播弹幕、专栏等功能开发中
-
-### 新功能
-+ 弹幕设置、屏蔽功能
-+ 不是很完美的后台播放功能
-+ 不是很完美的画中画(pip)功能（Android端）
- 
-### 修复
-+ 动态页面加载异常
-+ 网络异常时页面空白
-+ 竖屏全屏状态栏问题
-+ iOS端代理请求异常
-  
-### 优化
-+ 图片预览
-+ 全屏播放时自动旋转
-+ 转发内容增加视频标题
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.8.0917.md

@@ -1,24 +0,0 @@
-## 1.0.8
-
-直播弹幕、循环播放等功能开发中
-
-### 新功能
-+ 用户拉黑功能
-+ gif图片保存
-+ 删除已看历史记录
- 
-### 修复
-+ 弹幕数量较少
-+ 弹幕屏蔽设置自动记忆
-+ 动态页面渲染
-+ 用户主页数据错乱
-+ 大家都在搜空白
-+ 默认自动全屏，顶部操作栏丢失
-  
-  
-### 优化
-+ 全屏状态栏区域显示优化
-+ 图片保存至PiliPala文件夹
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.9.1015.md

@@ -1,28 +0,0 @@
-## 1.0.9
-
-
-### 新功能
-+ 自定义倍速、默认倍速
-+ 历史记录搜索
-+ 收藏夹搜索
-+ 历史记录多选删除
-+ 视频循环播放
-+ 免登录看1080P
-+ 评论区视频链接跳转
-+ up主分组
-+ up主投稿搜索
- 
-### 修复
-+ 搜索视频标题乱码
-+ 屏幕帧率
-+ 动态页面渲染
-
-  
-  
-### 优化
-+ 快进手势
-+ 视频简介链接匹配
-+ 视频全屏时安全区域
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

distribute_options.yaml

@@ -0,0 +1 @@
+output: dist/

fastlane/metadata/android/en-US/full_description.txt

@@ -1,10 +0,0 @@
-PiliPlus is a third-party Bilibili client developed in Flutter, 
-fork from PiliPalaX (https://github.com/orz12/PiliPalaX).
-
-Top Features:
-
-* List of recommended videos
-* List of hottest videos
-* Popular live streams
-* List of bangumis
-* Block videos from blacklisted users

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +0,0 @@
-A third-party Bilibili client developed in Flutter

fastlane/metadata/android/en-US/title.txt

@@ -1 +0,0 @@
-PiliPlus

fastlane/metadata/android/zh-CN/full_description.txt

@@ -1,10 +0,0 @@
-PiliPlus 是使用 Flutter 开发的 BiliBili 第三方客户端，
-是由PiliPalaX仓库fork并进行了差异化开发的版本
-
-主要功能：
-
-* 推荐视频列表
-* 最热视频列表
-* 热门直播
-* 番剧列表
-* 屏蔽黑名单内用户视频

fastlane/metadata/android/zh-CN/short_description.txt

@@ -1 +0,0 @@
-使用 Flutter 开发的 BiliBili 第三方客户端

fastlane/metadata/android/zh-CN/title.txt

@@ -1 +0,0 @@
-PiliPlus

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>13.0</string>
 </dict>
 </plist>

ios/Flutter/Debug.xcconfig

@@ -1,2 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1,2 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,7 +4,4 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>

ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
-import UIKit
 import Flutter
+import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

ios/Runner/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 	<dict>
+		<key>FlutterDeepLinkingEnabled</key>
+		<false/>
 		<key>CFBundleDevelopmentRegion</key>
 		<string>$(DEVELOPMENT_LANGUAGE)</string>
 		<key>CFBundleDisplayName</key>

lib/build_config.dart

@@ -0,0 +1,16 @@
+class BuildConfig {
+  static const int versionCode = int.fromEnvironment(
+    'pili.code',
+    defaultValue: 1,
+  );
+  static const String versionName = String.fromEnvironment(
+    'pili.name',
+    defaultValue: 'SNAPSHOT',
+  );
+
+  static const int buildTime = int.fromEnvironment('pili.time');
+  static const String commitHash = String.fromEnvironment(
+    'pili.hash',
+    defaultValue: 'N/A',
+  );
+}

lib/common/constants.dart

@@ -6,9 +6,15 @@ class StyleString {
   static const BorderRadius mdRadius = BorderRadius.all(imgRadius);
   static const Radius imgRadius = Radius.circular(10);
   static const double aspectRatio = 16 / 10;
+  static const bottomSheetRadius = BorderRadius.vertical(
+    top: Radius.circular(18),
+  );
 }
 
 class Constants {
+  static const appName = 'PiliPlus';
+  static const sourceCodeUrl = 'https://github.com/bggRGjQaUbCoE/PiliPlus';
+
   // 27eb53fc9058f8c3  移动端 Android
   // 4409e2ce8ffd12b8  HD版
   static const String appKey = 'dfca71928277209b';
@@ -21,19 +27,30 @@ class Constants {
   static const String traceId =
       '11111111111111111111111111111111:1111111111111111:0:0';
   static const String userAgent =
-      'Mozilla/5.0 BiliDroid/1.46.2 (bbcallen@gmail.com) os/android model/vivo mobi_app/android_hd build/2001100 channel/yingyongbao innerVer/2001100 osVer/14 network/2';
+      'Mozilla/5.0 BiliDroid/2.0.1 (bbcallen@gmail.com) os/android model/android_hd mobi_app/android_hd build/2001100 channel/master innerVer/2001100 osVer/15 network/2';
   static const String statistics =
-      '{"appId":5,"platform":3,"version":"1.46.2","abtest":""}';
+      '{"appId":5,"platform":3,"version":"2.0.1","abtest":""}';
   // 请求时会自动encodeComponent
 
   // app
   static const String userAgentApp =
-      'Mozilla/5.0 BiliDroid/8.43.0 (bbcallen@gmail.com) os/android model/android mobi_app/android build/8430300 channel/bili innerVer/8430300 osVer/15 network/2';
-  static const String statisticsApp =
-      '{"appId":5,"platform":3,"version":"8.43.0","abtest":""}';
+      'Mozilla/5.0 BiliDroid/8.43.0 (bbcallen@gmail.com) os/android model/android mobi_app/android build/8430300 channel/master innerVer/8430300 osVer/15 network/2';
 
-  static const urlPattern =
-      r'https?://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]';
+  static const String statisticsApp =
+      '{"appId":1,"platform":3,"version":"8.43.0","abtest":""}';
+
+  static const baseHeaders = {
+    'connection': 'keep-alive',
+    'accept-encoding': 'br,gzip',
+    // 'referer': HttpString.baseUrl,
+    'env': 'prod',
+    'app-key': 'android64',
+    'x-bili-aurora-zone': 'sh001',
+  };
+
+  static final urlRegex = RegExp(
+    r'https?://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]',
+  );
 
   static const goodsUrlPrefix = "https://gaoneng.bilibili.com/tetris";
 
@@ -44,7 +61,7 @@ class Constants {
     'Anime4K_Upscale_CNN_x2_VL.glsl',
     'Anime4K_AutoDownscalePre_x2.glsl',
     'Anime4K_AutoDownscalePre_x4.glsl',
-    'Anime4K_Upscale_CNN_x2_M.glsl'
+    'Anime4K_Upscale_CNN_x2_M.glsl',
   ];
 
   // 超分辨率滤镜 (轻量)
@@ -55,225 +72,225 @@ class Constants {
     'Anime4K_Upscale_CNN_x2_M.glsl',
     'Anime4K_AutoDownscalePre_x2.glsl',
     'Anime4K_AutoDownscalePre_x4.glsl',
-    'Anime4K_Upscale_CNN_x2_S.glsl'
+    'Anime4K_Upscale_CNN_x2_S.glsl',
   ];
 
   //内容来自 https://passport.bilibili.com/web/generic/country/list
-  static List<Map<String, dynamic>> get internationalDialingPrefix => [
-        {"id": 1, "cname": "中国大陆", "country_id": "86"},
-        {"id": 5, "cname": "中国香港特别行政区", "country_id": "852"},
-        {"id": 2, "cname": "中国澳门特别行政区", "country_id": "853"},
-        {"id": 3, "cname": "中国台湾", "country_id": "886"},
-        {"id": 4, "cname": "美国", "country_id": "1"},
-        {"id": 6, "cname": "比利时", "country_id": "32"},
-        {"id": 7, "cname": "澳大利亚", "country_id": "61"},
-        {"id": 8, "cname": "法国", "country_id": "33"},
-        {"id": 9, "cname": "加拿大", "country_id": "1"},
-        {"id": 10, "cname": "日本", "country_id": "81"},
-        {"id": 11, "cname": "新加坡", "country_id": "65"},
-        {"id": 12, "cname": "韩国", "country_id": "82"},
-        {"id": 13, "cname": "马来西亚", "country_id": "60"},
-        {"id": 14, "cname": "英国", "country_id": "44"},
-        {"id": 15, "cname": "意大利", "country_id": "39"},
-        {"id": 16, "cname": "德国", "country_id": "49"},
-        {"id": 18, "cname": "俄罗斯", "country_id": "7"},
-        {"id": 19, "cname": "新西兰", "country_id": "64"}, //common:1-19
-        {"id": 153, "cname": "瓦利斯群岛和富图纳群岛", "country_id": "1681"},
-        {"id": 152, "cname": "葡萄牙", "country_id": "351"},
-        {"id": 151, "cname": "帕劳", "country_id": "680"},
-        {"id": 150, "cname": "诺福克岛", "country_id": "672"},
-        {"id": 149, "cname": "挪威", "country_id": "47"},
-        {"id": 148, "cname": "纽埃岛", "country_id": "683"},
-        {"id": 147, "cname": "尼日利亚", "country_id": "234"},
-        {"id": 146, "cname": "尼日尔", "country_id": "227"},
-        {"id": 145, "cname": "尼加拉瓜", "country_id": "505"},
-        {"id": 144, "cname": "尼泊尔", "country_id": "977"},
-        {"id": 143, "cname": "瑙鲁", "country_id": "674"},
-        {"id": 154, "cname": "格鲁吉亚", "country_id": "995"},
-        {"id": 155, "cname": "瑞典", "country_id": "46"},
-        {"id": 165, "cname": "沙特阿拉伯", "country_id": "966"},
-        {"id": 164, "cname": "桑给巴尔岛", "country_id": "259"},
-        {"id": 163, "cname": "塞舌尔共和国", "country_id": "248"},
-        {"id": 162, "cname": "塞浦路斯", "country_id": "357"},
-        {"id": 161, "cname": "塞内加尔", "country_id": "221"},
-        {"id": 160, "cname": "塞拉利昂", "country_id": "232"},
-        {"id": 159, "cname": "萨摩亚，东部", "country_id": "684"},
-        {"id": 158, "cname": "萨摩亚，西部", "country_id": "685"},
-        {"id": 157, "cname": "萨尔瓦多", "country_id": "503"},
-        {"id": 156, "cname": "瑞士", "country_id": "41"},
-        {"id": 166, "cname": "圣多美和普林西比", "country_id": "239"},
-        {"id": 142, "cname": "塞尔维亚", "country_id": "381"},
-        {"id": 141, "cname": "南非", "country_id": "27"},
-        {"id": 128, "cname": "毛里塔尼亚", "country_id": "222"},
-        {"id": 127, "cname": "毛里求斯", "country_id": "230"},
-        {"id": 126, "cname": "马歇尔岛", "country_id": "692"},
-        {"id": 125, "cname": "马提尼克岛", "country_id": "596"},
-        {"id": 124, "cname": "马其顿", "country_id": "389"},
-        {"id": 123, "cname": "马里亚纳岛", "country_id": "1670"},
-        {"id": 122, "cname": "马里", "country_id": "223"},
-        {"id": 121, "cname": "马拉维", "country_id": "265"},
-        {"id": 120, "cname": "马耳他", "country_id": "356"},
-        {"id": 119, "cname": "马尔代夫", "country_id": "960"},
-        {"id": 129, "cname": "蒙古", "country_id": "976"},
-        {"id": 130, "cname": "蒙特塞拉特岛", "country_id": "1664"},
-        {"id": 140, "cname": "纳米比亚", "country_id": "264"},
-        {"id": 139, "cname": "墨西哥", "country_id": "52"},
-        {"id": 138, "cname": "莫桑比克", "country_id": "258"},
-        {"id": 137, "cname": "摩纳哥", "country_id": "377"},
-        {"id": 136, "cname": "摩洛哥", "country_id": "212"},
-        {"id": 135, "cname": "摩尔多瓦", "country_id": "373"},
-        {"id": 134, "cname": "缅甸", "country_id": "95"},
-        {"id": 133, "cname": "密克罗尼西亚", "country_id": "691"},
-        {"id": 132, "cname": "秘鲁", "country_id": "51"},
-        {"id": 131, "cname": "孟加拉国", "country_id": "880"},
-        {"id": 118, "cname": "马达加斯加", "country_id": "261"},
-        {"id": 167, "cname": "圣卢西亚", "country_id": "1784"},
-        {"id": 216, "cname": "智利", "country_id": "56"},
-        {"id": 203, "cname": "牙买加", "country_id": "1876"},
-        {"id": 202, "cname": "叙利亚", "country_id": "963"},
-        {"id": 201, "cname": "匈牙利", "country_id": "36"},
-        {"id": 200, "cname": "科特迪瓦", "country_id": "225"},
-        {"id": 199, "cname": "希腊", "country_id": "30"},
-        {"id": 198, "cname": "西班牙", "country_id": "34"},
-        {"id": 197, "cname": "乌兹别克斯坦", "country_id": "998"},
-        {"id": 196, "cname": "乌拉圭", "country_id": "598"},
-        {"id": 195, "cname": "乌克兰", "country_id": "380"},
-        {"id": 194, "cname": "乌干达", "country_id": "256"},
-        {"id": 204, "cname": "亚美尼亚", "country_id": "374"},
-        {"id": 205, "cname": "也门", "country_id": "967"},
-        {"id": 215, "cname": "直布罗陀", "country_id": "350"},
-        {"id": 214, "cname": "乍得", "country_id": "235"},
-        {"id": 213, "cname": "赞比亚", "country_id": "260"},
-        {"id": 212, "cname": "越南", "country_id": "84"},
-        {"id": 211, "cname": "约旦", "country_id": "962"},
-        {"id": 210, "cname": "印尼", "country_id": "62"},
-        {"id": 209, "cname": "印度", "country_id": "91"},
-        {"id": 208, "cname": "以色列", "country_id": "972"},
-        {"id": 207, "cname": "伊朗", "country_id": "98"},
-        {"id": 206, "cname": "伊拉克", "country_id": "964"},
-        {"id": 193, "cname": "文莱", "country_id": "673"},
-        {"id": 192, "cname": "委内瑞拉", "country_id": "58"},
-        {"id": 191, "cname": "维珍群岛(英属)", "country_id": "1284"},
-        {"id": 178, "cname": "泰国", "country_id": "66"},
-        {"id": 177, "cname": "索马里", "country_id": "252"},
-        {"id": 176, "cname": "所罗门群岛", "country_id": "677"},
-        {"id": 175, "cname": "苏里南", "country_id": "597"},
-        {"id": 174, "cname": "苏丹", "country_id": "249"},
-        {"id": 173, "cname": "斯威士兰", "country_id": "268"},
-        {"id": 172, "cname": "斯洛文尼亚", "country_id": "386"},
-        {"id": 171, "cname": "斯洛伐克", "country_id": "421"},
-        {"id": 170, "cname": "斯里兰卡", "country_id": "94"},
-        {"id": 169, "cname": "圣皮埃尔和密克隆群岛", "country_id": "508"},
-        {"id": 179, "cname": "坦桑尼亚", "country_id": "255"},
-        {"id": 180, "cname": "汤加", "country_id": "676"},
-        {"id": 190, "cname": "维珍群岛(美属)", "country_id": "1340"},
-        {"id": 189, "cname": "瓦努阿图", "country_id": "678"},
-        {"id": 188, "cname": "托克劳岛", "country_id": "690"},
-        {"id": 187, "cname": "土库曼斯坦", "country_id": "993"},
-        {"id": 186, "cname": "土耳其", "country_id": "90"},
-        {"id": 185, "cname": "图瓦卢", "country_id": "688"},
-        {"id": 184, "cname": "突尼斯", "country_id": "216"},
-        {"id": 183, "cname": "阿森松岛", "country_id": "247"},
-        {"id": 182, "cname": "特立尼达和多巴哥", "country_id": "1868"},
-        {"id": 181, "cname": "特克斯和凯科斯", "country_id": "1649"},
-        {"id": 168, "cname": "圣马力诺", "country_id": "378"},
-        {"id": 67, "cname": "法属圭亚那", "country_id": "594"},
-        {"id": 54, "cname": "不丹", "country_id": "975"},
-        {"id": 53, "cname": "博茨瓦纳", "country_id": "267"},
-        {"id": 52, "cname": "伯利兹", "country_id": "501"},
-        {"id": 51, "cname": "玻利维亚", "country_id": "591"},
-        {"id": 50, "cname": "波兰", "country_id": "48"},
-        {"id": 49, "cname": "波黑", "country_id": "387"},
-        {"id": 48, "cname": "波多黎各", "country_id": "1787"},
-        {"id": 47, "cname": "冰岛", "country_id": "354"},
-        {"id": 46, "cname": "贝宁", "country_id": "229"},
-        {"id": 45, "cname": "保加利亚", "country_id": "359"},
-        {"id": 55, "cname": "布基纳法索", "country_id": "226"},
-        {"id": 56, "cname": "布隆迪", "country_id": "257"},
-        {"id": 66, "cname": "法属波利尼西亚", "country_id": "689"},
-        {"id": 65, "cname": "法罗岛", "country_id": "298"},
-        {"id": 64, "cname": "厄立特里亚", "country_id": "291"},
-        {"id": 63, "cname": "厄瓜多尔", "country_id": "593"},
-        {"id": 62, "cname": "多米尼加代表", "country_id": "1809"},
-        {"id": 61, "cname": "多米尼加", "country_id": "1767"},
-        {"id": 60, "cname": "多哥", "country_id": "228"},
-        {"id": 59, "cname": "迪戈加西亚岛", "country_id": "246"},
-        {"id": 58, "cname": "丹麦", "country_id": "45"},
-        {"id": 57, "cname": "赤道几内亚", "country_id": "240"},
-        {"id": 44, "cname": "百慕大群岛", "country_id": "1441"},
-        {"id": 43, "cname": "白俄罗斯", "country_id": "375"},
-        {"id": 42, "cname": "巴西", "country_id": "55"},
-        {"id": 29, "cname": "爱尔兰", "country_id": "353"},
-        {"id": 28, "cname": "埃塞俄比亚", "country_id": "251"},
-        {"id": 27, "cname": "埃及", "country_id": "20"},
-        {"id": 26, "cname": "阿塞拜疆", "country_id": "994"},
-        {"id": 25, "cname": "阿曼", "country_id": "968"},
-        {"id": 24, "cname": "阿联酋", "country_id": "971"},
-        {"id": 23, "cname": "阿根廷", "country_id": "54"},
-        {"id": 22, "cname": "阿富汗", "country_id": "93"},
-        {"id": 21, "cname": "阿尔及利亚", "country_id": "213"},
-        {"id": 20, "cname": "阿尔巴尼亚", "country_id": "355"},
-        {"id": 30, "cname": "爱沙尼亚", "country_id": "372"},
-        {"id": 31, "cname": "安道尔", "country_id": "376"},
-        {"id": 41, "cname": "巴拿马", "country_id": "507"},
-        {"id": 40, "cname": "巴林", "country_id": "973"},
-        {"id": 39, "cname": "巴拉圭", "country_id": "595"},
-        {"id": 38, "cname": "巴基斯坦", "country_id": "92"},
-        {"id": 37, "cname": "巴哈马群岛", "country_id": "1242"},
-        {"id": 36, "cname": "巴布亚新几内亚", "country_id": "675"},
-        {"id": 35, "cname": "巴巴多斯", "country_id": "1246"},
-        {"id": 34, "cname": "奥地利", "country_id": "43"},
-        {"id": 33, "cname": "安提瓜岛和巴布达", "country_id": "1268"},
-        {"id": 32, "cname": "安哥拉", "country_id": "244"},
-        {"id": 68, "cname": "非洲中部", "country_id": "236"},
-        {"id": 117, "cname": "罗马尼亚", "country_id": "40"},
-        {"id": 104, "cname": "科威特", "country_id": "965"},
-        {"id": 103, "cname": "科摩罗", "country_id": "269"},
-        {"id": 102, "cname": "开曼群岛", "country_id": "1345"},
-        {"id": 101, "cname": "卡塔尔", "country_id": "974"},
-        {"id": 100, "cname": "喀麦隆", "country_id": "237"},
-        {"id": 99, "cname": "聚会岛", "country_id": "262"},
-        {"id": 98, "cname": "津巴布韦", "country_id": "263"},
-        {"id": 97, "cname": "捷克", "country_id": "420"},
-        {"id": 96, "cname": "柬埔寨", "country_id": "855"},
-        {"id": 95, "cname": "加蓬", "country_id": "241"},
-        {"id": 105, "cname": "克罗地亚", "country_id": "385"},
-        {"id": 106, "cname": "肯尼亚", "country_id": "254"},
-        {"id": 116, "cname": "卢旺达", "country_id": "250"},
-        {"id": 115, "cname": "卢森堡", "country_id": "352"},
-        {"id": 114, "cname": "利比亚", "country_id": "218"},
-        {"id": 113, "cname": "利比里亚", "country_id": "231"},
-        {"id": 112, "cname": "立陶宛", "country_id": "370"},
-        {"id": 111, "cname": "黎巴嫩", "country_id": "961"},
-        {"id": 110, "cname": "老挝", "country_id": "856"},
-        {"id": 109, "cname": "莱索托", "country_id": "266"},
-        {"id": 108, "cname": "拉脱维亚", "country_id": "371"},
-        {"id": 107, "cname": "库克岛", "country_id": "682"},
-        {"id": 94, "cname": "加纳", "country_id": "233"},
-        {"id": 93, "cname": "几内亚比绍", "country_id": "245"},
-        {"id": 92, "cname": "几内亚", "country_id": "224"},
-        {"id": 79, "cname": "格林纳达", "country_id": "1473"},
-        {"id": 78, "cname": "哥斯达黎加", "country_id": "506"},
-        {"id": 77, "cname": "哥伦比亚", "country_id": "57"},
-        {"id": 76, "cname": "刚果(金)", "country_id": "243"},
-        {"id": 75, "cname": "刚果", "country_id": "242"},
-        {"id": 74, "cname": "冈比亚", "country_id": "220"},
-        {"id": 73, "cname": "福克兰岛", "country_id": "500"},
-        {"id": 72, "cname": "佛得角", "country_id": "238"},
-        {"id": 71, "cname": "芬兰", "country_id": "358"},
-        {"id": 70, "cname": "斐济", "country_id": "679"},
-        {"id": 80, "cname": "格陵兰岛", "country_id": "299"},
-        {"id": 81, "cname": "古巴", "country_id": "53"},
-        {"id": 91, "cname": "吉尔吉斯斯坦", "country_id": "996"},
-        {"id": 90, "cname": "吉布提", "country_id": "253"},
-        {"id": 89, "cname": "基里巴斯", "country_id": "686"},
-        {"id": 88, "cname": "维克岛", "country_id": "1808"},
-        {"id": 87, "cname": "洪都拉斯", "country_id": "504"},
-        {"id": 86, "cname": "荷兰", "country_id": "31"},
-        {"id": 85, "cname": "朝鲜", "country_id": "850"},
-        {"id": 84, "cname": "海地", "country_id": "509"},
-        {"id": 83, "cname": "关岛", "country_id": "1671"},
-        {"id": 82, "cname": "瓜德罗普岛", "country_id": "590"},
-        {"id": 69, "cname": "菲律宾", "country_id": "63"}
-      ];
+  static const internationalDialingPrefix = [
+    (id: 1, cname: "中国大陆", countryId: 86),
+    (id: 5, cname: "中国香港特别行政区", countryId: 852),
+    (id: 2, cname: "中国澳门特别行政区", countryId: 853),
+    (id: 3, cname: "中国台湾", countryId: 886),
+    (id: 4, cname: "美国", countryId: 1),
+    (id: 6, cname: "比利时", countryId: 32),
+    (id: 7, cname: "澳大利亚", countryId: 61),
+    (id: 8, cname: "法国", countryId: 33),
+    (id: 9, cname: "加拿大", countryId: 1),
+    (id: 10, cname: "日本", countryId: 81),
+    (id: 11, cname: "新加坡", countryId: 65),
+    (id: 12, cname: "韩国", countryId: 82),
+    (id: 13, cname: "马来西亚", countryId: 60),
+    (id: 14, cname: "英国", countryId: 44),
+    (id: 15, cname: "意大利", countryId: 39),
+    (id: 16, cname: "德国", countryId: 49),
+    (id: 18, cname: "俄罗斯", countryId: 7),
+    (id: 19, cname: "新西兰", countryId: 64),
+    (id: 153, cname: "瓦利斯群岛和富图纳群岛", countryId: 1681),
+    (id: 152, cname: "葡萄牙", countryId: 351),
+    (id: 151, cname: "帕劳", countryId: 680),
+    (id: 150, cname: "诺福克岛", countryId: 672),
+    (id: 149, cname: "挪威", countryId: 47),
+    (id: 148, cname: "纽埃岛", countryId: 683),
+    (id: 147, cname: "尼日利亚", countryId: 234),
+    (id: 146, cname: "尼日尔", countryId: 227),
+    (id: 145, cname: "尼加拉瓜", countryId: 505),
+    (id: 144, cname: "尼泊尔", countryId: 977),
+    (id: 143, cname: "瑙鲁", countryId: 674),
+    (id: 154, cname: "格鲁吉亚", countryId: 995),
+    (id: 155, cname: "瑞典", countryId: 46),
+    (id: 165, cname: "沙特阿拉伯", countryId: 966),
+    (id: 164, cname: "桑给巴尔岛", countryId: 259),
+    (id: 163, cname: "塞舌尔共和国", countryId: 248),
+    (id: 162, cname: "塞浦路斯", countryId: 357),
+    (id: 161, cname: "塞内加尔", countryId: 221),
+    (id: 160, cname: "塞拉利昂", countryId: 232),
+    (id: 159, cname: "萨摩亚，东部", countryId: 684),
+    (id: 158, cname: "萨摩亚，西部", countryId: 685),
+    (id: 157, cname: "萨尔瓦多", countryId: 503),
+    (id: 156, cname: "瑞士", countryId: 41),
+    (id: 166, cname: "圣多美和普林西比", countryId: 239),
+    (id: 142, cname: "塞尔维亚", countryId: 381),
+    (id: 141, cname: "南非", countryId: 27),
+    (id: 128, cname: "毛里塔尼亚", countryId: 222),
+    (id: 127, cname: "毛里求斯", countryId: 230),
+    (id: 126, cname: "马歇尔岛", countryId: 692),
+    (id: 125, cname: "马提尼克岛", countryId: 596),
+    (id: 124, cname: "马其顿", countryId: 389),
+    (id: 123, cname: "马里亚纳岛", countryId: 1670),
+    (id: 122, cname: "马里", countryId: 223),
+    (id: 121, cname: "马拉维", countryId: 265),
+    (id: 120, cname: "马耳他", countryId: 356),
+    (id: 119, cname: "马尔代夫", countryId: 960),
+    (id: 129, cname: "蒙古", countryId: 976),
+    (id: 130, cname: "蒙特塞拉特岛", countryId: 1664),
+    (id: 140, cname: "纳米比亚", countryId: 264),
+    (id: 139, cname: "墨西哥", countryId: 52),
+    (id: 138, cname: "莫桑比克", countryId: 258),
+    (id: 137, cname: "摩纳哥", countryId: 377),
+    (id: 136, cname: "摩洛哥", countryId: 212),
+    (id: 135, cname: "摩尔多瓦", countryId: 373),
+    (id: 134, cname: "缅甸", countryId: 95),
+    (id: 133, cname: "密克罗尼西亚", countryId: 691),
+    (id: 132, cname: "秘鲁", countryId: 51),
+    (id: 131, cname: "孟加拉国", countryId: 880),
+    (id: 118, cname: "马达加斯加", countryId: 261),
+    (id: 167, cname: "圣卢西亚", countryId: 1784),
+    (id: 216, cname: "智利", countryId: 56),
+    (id: 203, cname: "牙买加", countryId: 1876),
+    (id: 202, cname: "叙利亚", countryId: 963),
+    (id: 201, cname: "匈牙利", countryId: 36),
+    (id: 200, cname: "科特迪瓦", countryId: 225),
+    (id: 199, cname: "希腊", countryId: 30),
+    (id: 198, cname: "西班牙", countryId: 34),
+    (id: 197, cname: "乌兹别克斯坦", countryId: 998),
+    (id: 196, cname: "乌拉圭", countryId: 598),
+    (id: 195, cname: "乌克兰", countryId: 380),
+    (id: 194, cname: "乌干达", countryId: 256),
+    (id: 204, cname: "亚美尼亚", countryId: 374),
+    (id: 205, cname: "也门", countryId: 967),
+    (id: 215, cname: "直布罗陀", countryId: 350),
+    (id: 214, cname: "乍得", countryId: 235),
+    (id: 213, cname: "赞比亚", countryId: 260),
+    (id: 212, cname: "越南", countryId: 84),
+    (id: 211, cname: "约旦", countryId: 962),
+    (id: 210, cname: "印尼", countryId: 62),
+    (id: 209, cname: "印度", countryId: 91),
+    (id: 208, cname: "以色列", countryId: 972),
+    (id: 207, cname: "伊朗", countryId: 98),
+    (id: 206, cname: "伊拉克", countryId: 964),
+    (id: 193, cname: "文莱", countryId: 673),
+    (id: 192, cname: "委内瑞拉", countryId: 58),
+    (id: 191, cname: "维珍群岛(英属)", countryId: 1284),
+    (id: 178, cname: "泰国", countryId: 66),
+    (id: 177, cname: "索马里", countryId: 252),
+    (id: 176, cname: "所罗门群岛", countryId: 677),
+    (id: 175, cname: "苏里南", countryId: 597),
+    (id: 174, cname: "苏丹", countryId: 249),
+    (id: 173, cname: "斯威士兰", countryId: 268),
+    (id: 172, cname: "斯洛文尼亚", countryId: 386),
+    (id: 171, cname: "斯洛伐克", countryId: 421),
+    (id: 170, cname: "斯里兰卡", countryId: 94),
+    (id: 169, cname: "圣皮埃尔和密克隆群岛", countryId: 508),
+    (id: 179, cname: "坦桑尼亚", countryId: 255),
+    (id: 180, cname: "汤加", countryId: 676),
+    (id: 190, cname: "维珍群岛(美属)", countryId: 1340),
+    (id: 189, cname: "瓦努阿图", countryId: 678),
+    (id: 188, cname: "托克劳岛", countryId: 690),
+    (id: 187, cname: "土库曼斯坦", countryId: 993),
+    (id: 186, cname: "土耳其", countryId: 90),
+    (id: 185, cname: "图瓦卢", countryId: 688),
+    (id: 184, cname: "突尼斯", countryId: 216),
+    (id: 183, cname: "阿森松岛", countryId: 247),
+    (id: 182, cname: "特立尼达和多巴哥", countryId: 1868),
+    (id: 181, cname: "特克斯和凯科斯", countryId: 1649),
+    (id: 168, cname: "圣马力诺", countryId: 378),
+    (id: 67, cname: "法属圭亚那", countryId: 594),
+    (id: 54, cname: "不丹", countryId: 975),
+    (id: 53, cname: "博茨瓦纳", countryId: 267),
+    (id: 52, cname: "伯利兹", countryId: 501),
+    (id: 51, cname: "玻利维亚", countryId: 591),
+    (id: 50, cname: "波兰", countryId: 48),
+    (id: 49, cname: "波黑", countryId: 387),
+    (id: 48, cname: "波多黎各", countryId: 1787),
+    (id: 47, cname: "冰岛", countryId: 354),
+    (id: 46, cname: "贝宁", countryId: 229),
+    (id: 45, cname: "保加利亚", countryId: 359),
+    (id: 55, cname: "布基纳法索", countryId: 226),
+    (id: 56, cname: "布隆迪", countryId: 257),
+    (id: 66, cname: "法属波利尼西亚", countryId: 689),
+    (id: 65, cname: "法罗岛", countryId: 298),
+    (id: 64, cname: "厄立特里亚", countryId: 291),
+    (id: 63, cname: "厄瓜多尔", countryId: 593),
+    (id: 62, cname: "多米尼加代表", countryId: 1809),
+    (id: 61, cname: "多米尼加", countryId: 1767),
+    (id: 60, cname: "多哥", countryId: 228),
+    (id: 59, cname: "迪戈加西亚岛", countryId: 246),
+    (id: 58, cname: "丹麦", countryId: 45),
+    (id: 57, cname: "赤道几内亚", countryId: 240),
+    (id: 44, cname: "百慕大群岛", countryId: 1441),
+    (id: 43, cname: "白俄罗斯", countryId: 375),
+    (id: 42, cname: "巴西", countryId: 55),
+    (id: 29, cname: "爱尔兰", countryId: 353),
+    (id: 28, cname: "埃塞俄比亚", countryId: 251),
+    (id: 27, cname: "埃及", countryId: 20),
+    (id: 26, cname: "阿塞拜疆", countryId: 994),
+    (id: 25, cname: "阿曼", countryId: 968),
+    (id: 24, cname: "阿联酋", countryId: 971),
+    (id: 23, cname: "阿根廷", countryId: 54),
+    (id: 22, cname: "阿富汗", countryId: 93),
+    (id: 21, cname: "阿尔及利亚", countryId: 213),
+    (id: 20, cname: "阿尔巴尼亚", countryId: 355),
+    (id: 30, cname: "爱沙尼亚", countryId: 372),
+    (id: 31, cname: "安道尔", countryId: 376),
+    (id: 41, cname: "巴拿马", countryId: 507),
+    (id: 40, cname: "巴林", countryId: 973),
+    (id: 39, cname: "巴拉圭", countryId: 595),
+    (id: 38, cname: "巴基斯坦", countryId: 92),
+    (id: 37, cname: "巴哈马群岛", countryId: 1242),
+    (id: 36, cname: "巴布亚新几内亚", countryId: 675),
+    (id: 35, cname: "巴巴多斯", countryId: 1246),
+    (id: 34, cname: "奥地利", countryId: 43),
+    (id: 33, cname: "安提瓜岛和巴布达", countryId: 1268),
+    (id: 32, cname: "安哥拉", countryId: 244),
+    (id: 68, cname: "非洲中部", countryId: 236),
+    (id: 117, cname: "罗马尼亚", countryId: 40),
+    (id: 104, cname: "科威特", countryId: 965),
+    (id: 103, cname: "科摩罗", countryId: 269),
+    (id: 102, cname: "开曼群岛", countryId: 1345),
+    (id: 101, cname: "卡塔尔", countryId: 974),
+    (id: 100, cname: "喀麦隆", countryId: 237),
+    (id: 99, cname: "聚会岛", countryId: 262),
+    (id: 98, cname: "津巴布韦", countryId: 263),
+    (id: 97, cname: "捷克", countryId: 420),
+    (id: 96, cname: "柬埔寨", countryId: 855),
+    (id: 95, cname: "加蓬", countryId: 241),
+    (id: 105, cname: "克罗地亚", countryId: 385),
+    (id: 106, cname: "肯尼亚", countryId: 254),
+    (id: 116, cname: "卢旺达", countryId: 250),
+    (id: 115, cname: "卢森堡", countryId: 352),
+    (id: 114, cname: "利比亚", countryId: 218),
+    (id: 113, cname: "利比里亚", countryId: 231),
+    (id: 112, cname: "立陶宛", countryId: 370),
+    (id: 111, cname: "黎巴嫩", countryId: 961),
+    (id: 110, cname: "老挝", countryId: 856),
+    (id: 109, cname: "莱索托", countryId: 266),
+    (id: 108, cname: "拉脱维亚", countryId: 371),
+    (id: 107, cname: "库克岛", countryId: 682),
+    (id: 94, cname: "加纳", countryId: 233),
+    (id: 93, cname: "几内亚比绍", countryId: 245),
+    (id: 92, cname: "几内亚", countryId: 224),
+    (id: 79, cname: "格林纳达", countryId: 1473),
+    (id: 78, cname: "哥斯达黎加", countryId: 506),
+    (id: 77, cname: "哥伦比亚", countryId: 57),
+    (id: 76, cname: "刚果(金)", countryId: 243),
+    (id: 75, cname: "刚果", countryId: 242),
+    (id: 74, cname: "冈比亚", countryId: 220),
+    (id: 73, cname: "福克兰岛", countryId: 500),
+    (id: 72, cname: "佛得角", countryId: 238),
+    (id: 71, cname: "芬兰", countryId: 358),
+    (id: 70, cname: "斐济", countryId: 679),
+    (id: 80, cname: "格陵兰岛", countryId: 299),
+    (id: 81, cname: "古巴", countryId: 53),
+    (id: 91, cname: "吉尔吉斯斯坦", countryId: 996),
+    (id: 90, cname: "吉布提", countryId: 253),
+    (id: 89, cname: "基里巴斯", countryId: 686),
+    (id: 88, cname: "维克岛", countryId: 1808),
+    (id: 87, cname: "洪都拉斯", countryId: 504),
+    (id: 86, cname: "荷兰", countryId: 31),
+    (id: 85, cname: "朝鲜", countryId: 850),
+    (id: 84, cname: "海地", countryId: 509),
+    (id: 83, cname: "关岛", countryId: 1671),
+    (id: 82, cname: "瓜德罗普岛", countryId: 590),
+    (id: 69, cname: "菲律宾", countryId: 63),
+  ];
 }

lib/common/skeleton/dynamic_card.dart

@@ -1,4 +1,5 @@
 import 'package:PiliPlus/common/skeleton/skeleton.dart';
+import 'package:PiliPlus/utils/global_data.dart';
 import 'package:flutter/material.dart';
 
 class DynamicCardSkeleton extends StatelessWidget {
@@ -20,6 +21,7 @@ class DynamicCardSkeleton extends StatelessWidget {
           ),
         ),
         child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
               children: [
@@ -47,49 +49,41 @@ class DynamicCardSkeleton extends StatelessWidget {
                       height: 11,
                     ),
                   ],
-                )
+                ),
               ],
             ),
+            const SizedBox(height: 10),
             Container(
+              color: color,
               width: double.infinity,
-              margin: const EdgeInsets.only(top: 10),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Container(
-                    color: color,
-                    width: double.infinity,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                  Container(
-                    color: color,
-                    width: double.infinity,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                  Container(
-                    color: color,
-                    width: 300,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                  Container(
-                    color: color,
-                    width: 250,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                  Container(
-                    color: color,
-                    width: 100,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                ],
-              ),
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
             ),
-            const Spacer(),
+            Container(
+              color: color,
+              width: double.infinity,
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
+            ),
+            Container(
+              color: color,
+              width: 300,
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
+            ),
+            Container(
+              color: color,
+              width: 250,
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
+            ),
+            Container(
+              color: color,
+              width: 100,
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
+            ),
+            if (GlobalData().dynamicsWaterfallFlow) const Spacer(),
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceAround,
               children: [
@@ -102,19 +96,20 @@ class DynamicCardSkeleton extends StatelessWidget {
                     ),
                     style: TextButton.styleFrom(
                       padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
-                      foregroundColor:
-                          theme.colorScheme.outline.withValues(alpha: 0.2),
+                      foregroundColor: theme.colorScheme.outline.withValues(
+                        alpha: 0.2,
+                      ),
                     ),
                     label: Text(
                       i == 0
                           ? '转发'
                           : i == 1
-                              ? '评论'
-                              : '点赞',
+                          ? '评论'
+                          : '点赞',
                     ),
-                  )
+                  ),
               ],
-            )
+            ),
           ],
         ),
       ),

lib/common/skeleton/fav_pgc_item.dart

@@ -15,7 +15,6 @@ class FavPgcItemSkeleton extends StatelessWidget {
           vertical: 5,
         ),
         child: Row(
-          mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             AspectRatio(

lib/common/skeleton/media_bangumi.dart

@@ -2,21 +2,25 @@ import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/common/skeleton/skeleton.dart';
 import 'package:flutter/material.dart';
 
-class MediaBangumiSkeleton extends StatefulWidget {
-  const MediaBangumiSkeleton({super.key});
+class MediaPgcSkeleton extends StatefulWidget {
+  const MediaPgcSkeleton({super.key});
 
   @override
-  State<MediaBangumiSkeleton> createState() => _MediaBangumiSkeletonState();
+  State<MediaPgcSkeleton> createState() => _MediaPgcSkeletonState();
 }
 
-class _MediaBangumiSkeletonState extends State<MediaBangumiSkeleton> {
+class _MediaPgcSkeletonState extends State<MediaPgcSkeleton> {
   @override
   Widget build(BuildContext context) {
     Color bgColor = Theme.of(context).colorScheme.onInverseSurface;
     return Skeleton(
       child: Padding(
         padding: const EdgeInsets.fromLTRB(
-            StyleString.safeSpace, 7, StyleString.safeSpace, 7),
+          StyleString.safeSpace,
+          7,
+          StyleString.safeSpace,
+          7,
+        ),
         child: Row(
           children: [
             Container(
@@ -62,8 +66,9 @@ class _MediaBangumiSkeletonState extends State<MediaBangumiSkeleton> {
                       width: 90,
                       height: 35,
                       decoration: BoxDecoration(
-                        borderRadius:
-                            const BorderRadius.all(Radius.circular(20)),
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(20),
+                        ),
                         color: bgColor,
                       ),
                     ),

lib/common/skeleton/skeleton.dart

@@ -74,14 +74,14 @@ class ShimmerState extends State<Shimmer> with SingleTickerProviderStateMixin {
   }
 
   LinearGradient get gradient => LinearGradient(
-        colors: widget.linearGradient.colors,
-        stops: widget.linearGradient.stops,
-        begin: widget.linearGradient.begin,
-        end: widget.linearGradient.end,
-        transform: _SlidingGradientTransform(
-          slidePercent: _shimmerController.value,
-        ),
-      );
+    colors: widget.linearGradient.colors,
+    stops: widget.linearGradient.stops,
+    begin: widget.linearGradient.begin,
+    end: widget.linearGradient.end,
+    transform: _SlidingGradientTransform(
+      slidePercent: _shimmerController.value,
+    ),
+  );
 
   bool get isSized =>
       (context.findRenderObject() as RenderBox?)?.hasSize ?? false;

lib/common/skeleton/space_opus.dart

@@ -11,7 +11,6 @@ class SpaceOpusSkeleton extends StatelessWidget {
     return Skeleton(
       child: Card(
         clipBehavior: Clip.hardEdge,
-        margin: EdgeInsets.zero,
         shape: const RoundedRectangleBorder(
           borderRadius: BorderRadius.all(Radius.circular(6)),
         ),
@@ -21,7 +20,8 @@ class SpaceOpusSkeleton extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Container(
-                  height: (0.68 + 0.82 * Utils.random.nextDouble()) *
+                  height:
+                      (0.68 + 0.82 * Utils.random.nextDouble()) *
                       constraints.maxWidth,
                   color: surface,
                 ),
@@ -34,8 +34,11 @@ class SpaceOpusSkeleton extends StatelessWidget {
                 Container(
                   height: 10,
                   color: surface,
-                  margin:
-                      const EdgeInsets.only(left: 10, right: 10, bottom: 10),
+                  margin: const EdgeInsets.only(
+                    left: 10,
+                    right: 10,
+                    bottom: 10,
+                  ),
                   width: constraints.maxWidth,
                 ),
               ],

lib/common/skeleton/video_card_h.dart

@@ -15,20 +15,15 @@ class VideoCardHSkeleton extends StatelessWidget {
           vertical: 5,
         ),
         child: Row(
-          mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             AspectRatio(
               aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(
-                builder: (context, boxConstraints) {
-                  return DecoratedBox(
-                    decoration: BoxDecoration(
-                      color: color,
-                      borderRadius: StyleString.mdRadius,
-                    ),
-                  );
-                },
+              child: DecoratedBox(
+                decoration: BoxDecoration(
+                  color: color,
+                  borderRadius: StyleString.mdRadius,
+                ),
               ),
             ),
             Expanded(
@@ -69,7 +64,7 @@ class VideoCardHSkeleton extends StatelessWidget {
                           height: 13,
                         ),
                       ],
-                    )
+                    ),
                   ],
                 ),
               ),

lib/common/skeleton/video_card_v.dart

@@ -10,18 +10,15 @@ class VideoCardVSkeleton extends StatelessWidget {
     final color = Theme.of(context).colorScheme.onInverseSurface;
     return Skeleton(
       child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           AspectRatio(
             aspectRatio: StyleString.aspectRatio,
-            child: LayoutBuilder(
-              builder: (context, boxConstraints) {
-                return DecoratedBox(
-                  decoration: BoxDecoration(
-                    color: color,
-                    borderRadius: StyleString.mdRadius,
-                  ),
-                );
-              },
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                color: color,
+                borderRadius: StyleString.mdRadius,
+              ),
             ),
           ),
           Padding(