fix #1035

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

.github/ISSUE_TEMPLATE/bug-反馈.md

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

.github/ISSUE_TEMPLATE/bug-反馈.yml

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

.github/ISSUE_TEMPLATE/功能请求.md

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

.github/ISSUE_TEMPLATE/功能请求.yml

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

.github/workflows/android.yml

@@ -1,6 +1,14 @@
 name: Android Release
 
 on:
+  pull_request:
+        types:
+          - opened
+          - synchronize
+          - reopened
+          - ready_for_review
+        paths-ignore:
+          - '**.md'
   workflow_dispatch:
 
 jobs:
@@ -33,19 +41,6 @@ jobs:
           channel: stable
           flutter-version-file: pubspec.yaml
 
-      - name: 修复3.24的stable显示中文不正确问题 // from orz12
-        run: |
-            version=$(grep -m 1 'flutter:' pubspec.yaml | awk '{print $2}')
-            if [ "$(echo "$version < 3.27.0" | awk '{print ($1 < $2)}')" -eq 1 ]; then
-              cd $FLUTTER_ROOT
-              git config --global user.name "orz12"
-              git config --global user.email "orz12@test.com"
-              git cherry-pick d4124bd --strategy-option theirs
-              # flutter precache
-              flutter --version
-              cd -
-            fi
-
       - name: 下载项目依赖
         run: flutter pub get
 
@@ -55,6 +50,7 @@ jobs:
           sed -i "s/version: .*/version: $version_name-$(git rev-parse --short HEAD)+$(git rev-list --count HEAD)/g" pubspec.yaml
 
       - name: Write key
+        if: github.event_name != 'pull_request'
         run: |
           if [ ! -z "${{ secrets.SIGN_KEYSTORE_BASE64 }}" ]; then
             echo "${{ secrets.SIGN_KEYSTORE_BASE64 }}" | base64 --decode > android/app/key.jks
@@ -89,4 +85,4 @@ jobs:
         with:
           name: app-x86_64
           path: |
-            build/app/outputs/flutter-apk/app-x86_64-release.apk
+            build/app/outputs/flutter-apk/app-x86_64-release.apk

.github/workflows/ios.yml

@@ -1,6 +1,14 @@
 name: Build for iOS
 
 on:
+  pull_request:
+        types:
+          - opened
+          - synchronize
+          - reopened
+          - ready_for_review
+        paths-ignore:
+          - '**.md'
   workflow_dispatch:
     inputs:
       branch:

.gitignore

@@ -135,4 +135,6 @@ app.*.symbols
 !/dev/ci/**/Gemfile.lock
 !.vscode/settings.json
 
-/lib/build_config.dart
+/lib/build_config.dart
+
+devtools_options.yaml

.vscode/settings.json

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

README.md

@@ -47,6 +47,39 @@
 
 ## feat
 
+- [x] 播放课堂视频
+- [x] 发起投票
+- [x] 发布动态/评论支持`富文本编辑`/`表情显示`/`@用户`
+- [x] 修改消息设置
+- [x] 修改聊天设置
+- [x] 展示折叠消息
+- [x] 查看用户图文
+- [x] 动态话题
+- [x] 直播分区
+- [x] 分享`视频`/`番剧`/`动态`/`专栏`/`直播`至消息
+- [x] 创建/修改/删除关注分组
+- [x] 移除粉丝
+- [x] 直播弹幕发送表情
+- [x] 收藏夹排序
+- [x] 稍后再看 ~~`未看`~~ / `未看完` / ~~`已看完`~~ 分类
+- [x] WebDAV 备份/恢复设置
+- [x] 保存评论/动态
+- [x] 高级弹幕 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] 取消/置顶评论
+- [x] 记笔记
+- [x] 多账号支持 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] 屏蔽带货动态/评论
+- [x] 互动视频
+- [x] 发评/动态反诈
+- [x] 高能进度条
+- [x] 滑动跳转预览视频缩略图
+- [x] Live Photo
+- [x] 复制/移动/排序收藏夹/稍后再看视频
+- [x] 超分辨率
+- [x] 合并弹幕
+- [x] 会员彩色弹幕
+- [x] 播放全部/继续播放/倒序播放
+- [x] Cookie登录
 - [x] 显示视频分段信息
 - [x] 调节字幕大小
 - [x] 调节全屏弹幕大小
@@ -59,7 +92,6 @@
 - [x] 评论楼中楼定位点击查看的评论
 - [x] 评论楼中楼按热度/时间排序
 - [x] 评论点踩
-- [x] 显示ops专栏
 - [x] 私信发图
 - [x] 投币动画
 - [x] 取消/追番，更新追番状态
@@ -73,9 +105,9 @@
 - [x] 筛选搜索
 - [x] 转发动态
 - [x] 合集图片
-- [x] 删除/置顶私信
-- [x] 举报用户/评论/视频
-- [x] 删除/发布文本/图片动态
+- [x] 删除/置顶/撤回私信
+- [x] 举报用户/评论/视频/动态
+- [x] 删除/发布/置顶文本/图片动态
 - [x] 其他
 
 ## opt
@@ -144,7 +176,6 @@
   - [x] 音质选择（视视频而定）
   - [x] 解码格式选择（视视频而定）
   - [x] 弹幕
-  - [ ] 直播弹幕
   - [x] 字幕
   - [x] 记忆播放
   - [x] 视频比例：高度/宽度适应、填充、包含等

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

android/app/.gitignore

@@ -0,0 +1,2 @@
+/.cxx
+/build

android/app/build.gradle

@@ -1,106 +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_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    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
-        }
-        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,81 @@
+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

@@ -0,0 +1 @@
+-keep class com.yalantis.ucrop.util.RectUtils { *; }

android/app/src/debug/AndroidManifest.xml

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

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="512dp"
-    android:width="512dp"
-    android:viewportWidth="512.0"
-    android:viewportHeight="512.0">
-    <path
-        android:fillColor="#FF5CB67B"
-        android:pathData="M456.65,256C456.65,366.81 366.81,456.65 256,456.65 145.19,456.65 55.35,366.81 55.35,256 55.35,145.18 145.19,55.35 256,55.35 366.81,55.35 456.65,145.18 456.65,256Z"
-        android:strokeWidth="0.783784"
-        android:fillType="evenOdd" />
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M270.04,256L156.1,256l15.61,-76.8h98.32c21.21,0 38.4,17.19 38.4,38.4 0,21.21 -17.19,38.4 -38.4,38.4zM270.04,128L202.46,128l-50.1,256h52.76l15.18,-76.8h49.73c49.49,0 89.6,-40.12 89.6,-89.6 0,-49.49 -40.11,-89.6 -89.6,-89.6z"
-        android:fillType="evenOdd" />
-</vector>

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

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

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,14 +36,17 @@
     </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">
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableImpeller"
+            android:value="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -55,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
@@ -105,9 +111,10 @@
                     android:pathPattern="/readlist" />
                 <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="/.*" />
@@ -139,7 +146,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" />
@@ -154,7 +160,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>
@@ -172,7 +177,7 @@
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+            android:theme="@style/Ucrop.CropTheme"/>
 
         <receiver 
             android:name="com.ryanheise.audioservice.MediaButtonReceiver"

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

@@ -4,10 +4,13 @@ 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
 
@@ -21,6 +24,55 @@ class MainActivity : AudioServiceActivity() {
         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()
             }

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

@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="512dp"
-    android:width="512dp"
-    android:viewportWidth="512.0"
-    android:viewportHeight="512.0">
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportWidth="108.0"
+    android:viewportHeight="108.0">
     <path
-        android:fillColor="#FF5CB67B"
-        android:pathData="M456.65,256C456.65,366.81 366.81,456.65 256,456.65 145.19,456.65 55.35,366.81 55.35,256 55.35,145.18 145.19,55.35 256,55.35 366.81,55.35 456.65,145.18 456.65,256Z"
-        android:strokeWidth="0.783784"
+        android:fillColor="@color/ic_launcher_foreground"
+        android:pathData="M56,54L39.78,54l2.22,-10.94h14c3.02,0 5.47,2.45 5.47,5.47 0,3.02 -2.45,5.47 -5.47,5.47zM56,35.77h-9.62l-7.13,36.45h7.51L48.92,61.29h7.08c7.05,0 12.76,-5.71 12.76,-12.76 0,-7.05 -5.71,-12.76 -12.76,-12.76z"
         android:fillType="evenOdd" />
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M270.04,256L156.1,256l15.61,-76.8h98.32c21.21,0 38.4,17.19 38.4,38.4 0,21.21 -17.19,38.4 -38.4,38.4zM270.04,128L202.46,128l-50.1,256h52.76l15.18,-76.8h49.73c49.49,0 89.6,-40.12 89.6,-89.6 0,-49.49 -40.11,-89.6 -89.6,-89.6z"
-        android:fillType="evenOdd" />
-</vector>
+</vector>

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="512dp"
-    android:width="512dp"
-    android:viewportWidth="512.0"
-    android:viewportHeight="512.0">
-    <path
-        android:fillColor="#FF5CB67B"
-        android:pathData="M456.65,256C456.65,366.81 366.81,456.65 256,456.65 145.19,456.65 55.35,366.81 55.35,256 55.35,145.18 145.19,55.35 256,55.35 366.81,55.35 456.65,145.18 456.65,256Z"
-        android:strokeWidth="0.783784"
-        android:fillType="evenOdd" />
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M270.04,256L156.1,256l15.61,-76.8h98.32c21.21,0 38.4,17.19 38.4,38.4 0,21.21 -17.19,38.4 -38.4,38.4zM270.04,128L202.46,128l-50.1,256h52.76l15.18,-76.8h49.73c49.49,0 89.6,-40.12 89.6,-89.6 0,-49.49 -40.11,-89.6 -89.6,-89.6z"
-        android:fillType="evenOdd" />
-</vector>

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

@@ -2,15 +2,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
-    android:viewportWidth="512.0"
-    android:viewportHeight="512.0">
+    android:viewportWidth="108.0"
+    android:viewportHeight="108.0">
     <path
         android:fillColor="#FF5CB67B"
-        android:pathData="M456.65,256C456.65,366.81 366.81,456.65 256,456.65 145.19,456.65 55.35,366.81 55.35,256 55.35,145.18 145.19,55.35 256,55.35 366.81,55.35 456.65,145.18 456.65,256Z"
-        android:strokeWidth="0.783784"
-        android:fillType="evenOdd" />
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M270.04,256L156.1,256l15.61,-76.8h98.32c21.21,0 38.4,17.19 38.4,38.4 0,21.21 -17.19,38.4 -38.4,38.4zM270.04,128L202.46,128l-50.1,256h52.76l15.18,-76.8h49.73c49.49,0 89.6,-40.12 89.6,-89.6 0,-49.49 -40.11,-89.6 -89.6,-89.6z"
+        android:pathData="M57.54,54L28.82,54l3.93,-19.36h24.78c5.35,0 9.68,4.33 9.68,9.68 0,5.35 -4.33,9.68 -9.68,9.68zM57.54,21.73L40.5,21.73L27.88,86.27h13.3l3.83,-19.36h12.54c12.48,0 22.59,-10.11 22.59,-22.59 0,-12.48 -10.11,-22.59 -22.59,-22.59z"
+        android:strokeWidth="0.252073"
         android:fillType="evenOdd" />
 </vector>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -21,4 +21,6 @@
         <item name="android:windowBackground">?android:colorBackground</item>
         <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1">shortEdges</item>
     </style>
+
+    <style name="Ucrop.CropTheme" parent="Theme.AppCompat.Light.NoActionBar"/>
 </resources>

android/build.gradle

@@ -1,46 +0,0 @@
-allprojects {
-    repositories {
-        maven { url "https://maven.aliyun.com/repository/google" }
-        maven { url "https://maven.aliyun.com/repository/central" }
-        maven { url "https://maven.aliyun.com/repository/jcenter" }
-        maven { url "https://maven.aliyun.com/repository/public" }
-        maven { url "http://download.flutter.io"
-            allowInsecureProtocol = true
-        }
-        google()
-        mavenCentral()
-        maven { url 'https://jitpack.io' }
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    afterEvaluate { project ->
-        if (project.extensions.findByName("android") != null) {
-            Integer pluginCompileSdk = project.android.compileSdk
-            if (pluginCompileSdk != null && pluginCompileSdk < 31) {
-                project.logger.error(
-                    "Warning: Overriding compileSdk version in Flutter plugin: "
-                        + project.name
-                        + " from "
-                        + pluginCompileSdk
-                        + " to 31 (to work around https://issuetracker.google.com/issues/199180389)."
-                        + "\nIf there is not a new version of " + project.name + ", consider filing an issue against "
-                        + project.name
-                        + " to increase their compileSdk to the latest (otherwise try updating to the latest version)."
-                )
-                project.android {
-                    compileSdk 31
-                }
-            }
-        }
-    }
-    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 {
+                kotlinOptions {
+                    jvmTarget = "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

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

android/settings.gradle

@@ -1,32 +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 {
-        maven { url "https://maven.aliyun.com/repository/google" }
-        maven { url "https://maven.aliyun.com/repository/central" }
-        maven { url "https://maven.aliyun.com/repository/jcenter" }
-        maven { url "https://maven.aliyun.com/repository/public" }
-        maven { url "http://download.flutter.io"
-            allowInsecureProtocol = true
-        }
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.2.0" 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.9.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+}
+
+include(":app")

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/common/constants.dart

@@ -1,11 +1,16 @@
+import 'package:PiliPlus/http/constants.dart';
 import 'package:flutter/material.dart';
 
 class StyleString {
   static const double cardSpace = 8;
   static const double safeSpace = 12;
-  static BorderRadius mdRadius = BorderRadius.circular(10);
+  static const BorderRadius mdRadius = BorderRadius.all(imgRadius);
   static const Radius imgRadius = Radius.circular(10);
   static const double aspectRatio = 16 / 10;
+  static const bottomSheetRadius = BorderRadius.only(
+    topLeft: Radius.circular(18),
+    topRight: Radius.circular(18),
+  );
 }
 
 class Constants {
@@ -21,34 +26,56 @@ 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 =
-      '%7B%22appId%22%3A5%2C%22platform%22%3A3%2C%22version%22%3A%221.46.2%22%2C%22abtest%22%3A%22%22%7D';
-  //Uri.encodeComponent('{"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/master innerVer/8430300 osVer/15 network/2';
+
+  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";
+
+  // 超分辨率滤镜
   static const List<String> mpvAnime4KShaders = [
     'Anime4K_Clamp_Highlights.glsl',
     'Anime4K_Restore_CNN_VL.glsl',
     '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',
   ];
 
   // 超分辨率滤镜 (轻量)
-  static const List<String> mpvAnime4KShadersLite = [
+  static const mpvAnime4KShadersLite = [
     'Anime4K_Clamp_Highlights.glsl',
     'Anime4K_Restore_CNN_M.glsl',
     'Anime4K_Restore_CNN_S.glsl',
     '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 const List<Map<String, dynamic>> internationalDialingPrefix = [
+  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"},
@@ -263,6 +290,6 @@ class Constants {
     {"id": 84, "cname": "海地", "country_id": "509"},
     {"id": 83, "cname": "关岛", "country_id": "1671"},
     {"id": 82, "cname": "瓜德罗普岛", "country_id": "590"},
-    {"id": 69, "cname": "菲律宾", "country_id": "63"}
+    {"id": 69, "cname": "菲律宾", "country_id": "63"},
   ];
 }

lib/common/skeleton/dynamic_card.dart

@@ -1,11 +1,14 @@
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
+import 'package:PiliPlus/utils/global_data.dart';
 import 'package:flutter/material.dart';
-import 'skeleton.dart';
 
 class DynamicCardSkeleton extends StatelessWidget {
   const DynamicCardSkeleton({super.key});
 
   @override
   Widget build(BuildContext context) {
+    final ThemeData theme = Theme.of(context);
+    final color = theme.colorScheme.onInverseSurface;
     return Skeleton(
       child: Container(
         padding: const EdgeInsets.only(left: 12, right: 12, top: 12),
@@ -13,7 +16,7 @@ class DynamicCardSkeleton extends StatelessWidget {
           border: Border(
             bottom: BorderSide(
               width: 8,
-              color: Theme.of(context).dividerColor.withOpacity(0.05),
+              color: theme.dividerColor.withValues(alpha: 0.05),
             ),
           ),
         ),
@@ -25,8 +28,8 @@ class DynamicCardSkeleton extends StatelessWidget {
                   width: 40,
                   height: 40,
                   decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.onInverseSurface,
-                    borderRadius: BorderRadius.circular(20),
+                    color: color,
+                    borderRadius: const BorderRadius.all(Radius.circular(20)),
                   ),
                 ),
                 const SizedBox(width: 10),
@@ -34,18 +37,18 @@ class DynamicCardSkeleton extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Container(
-                      color: Theme.of(context).colorScheme.onInverseSurface,
+                      color: color,
                       width: 100,
                       height: 13,
                       margin: const EdgeInsets.only(bottom: 5),
                     ),
                     Container(
-                      color: Theme.of(context).colorScheme.onInverseSurface,
+                      color: color,
                       width: 50,
                       height: 11,
                     ),
                   ],
-                )
+                ),
               ],
             ),
             Container(
@@ -55,31 +58,31 @@ class DynamicCardSkeleton extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Container(
-                    color: Theme.of(context).colorScheme.onInverseSurface,
+                    color: color,
                     width: double.infinity,
                     height: 13,
                     margin: const EdgeInsets.only(bottom: 7),
                   ),
                   Container(
-                    color: Theme.of(context).colorScheme.onInverseSurface,
+                    color: color,
                     width: double.infinity,
                     height: 13,
                     margin: const EdgeInsets.only(bottom: 7),
                   ),
                   Container(
-                    color: Theme.of(context).colorScheme.onInverseSurface,
+                    color: color,
                     width: 300,
                     height: 13,
                     margin: const EdgeInsets.only(bottom: 7),
                   ),
                   Container(
-                    color: Theme.of(context).colorScheme.onInverseSurface,
+                    color: color,
                     width: 250,
                     height: 13,
                     margin: const EdgeInsets.only(bottom: 7),
                   ),
                   Container(
-                    color: Theme.of(context).colorScheme.onInverseSurface,
+                    color: color,
                     width: 100,
                     height: 13,
                     margin: const EdgeInsets.only(bottom: 7),
@@ -87,6 +90,7 @@ class DynamicCardSkeleton extends StatelessWidget {
                 ],
               ),
             ),
+            if (GlobalData().dynamicsWaterfallFlow) const Spacer(),
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceAround,
               children: [
@@ -99,21 +103,20 @@ class DynamicCardSkeleton extends StatelessWidget {
                     ),
                     style: TextButton.styleFrom(
                       padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
-                      foregroundColor: Theme.of(context)
-                          .colorScheme
-                          .outline
-                          .withOpacity(0.2),
+                      foregroundColor: theme.colorScheme.outline.withValues(
+                        alpha: 0.2,
+                      ),
                     ),
                     label: Text(
                       i == 0
                           ? '转发'
                           : i == 1
-                              ? '评论'
-                              : '点赞',
+                          ? '评论'
+                          : '点赞',
                     ),
-                  )
+                  ),
               ],
-            )
+            ),
           ],
         ),
       ),

lib/common/skeleton/fav_pgc_item.dart

@@ -0,0 +1,66 @@
+import 'package:PiliPlus/common/constants.dart';
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
+import 'package:flutter/material.dart';
+
+class FavPgcItemSkeleton extends StatelessWidget {
+  const FavPgcItemSkeleton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final color = Theme.of(context).colorScheme.onInverseSurface;
+    return Skeleton(
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: StyleString.safeSpace,
+          vertical: 5,
+        ),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            AspectRatio(
+              aspectRatio: 3 / 4,
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  return Container(
+                    decoration: BoxDecoration(
+                      color: color,
+                      borderRadius: const BorderRadius.all(Radius.circular(4)),
+                    ),
+                    width: boxConstraints.maxWidth,
+                    height: boxConstraints.maxHeight,
+                  );
+                },
+              ),
+            ),
+            const SizedBox(width: 10),
+            Expanded(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Container(
+                    width: 175,
+                    height: 12,
+                    color: color,
+                  ),
+                  const SizedBox(height: 10),
+                  Container(
+                    width: 55,
+                    height: 11,
+                    color: color,
+                  ),
+                  const SizedBox(height: 5),
+                  Container(
+                    width: 35,
+                    height: 11,
+                    color: color,
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/common/skeleton/media_bangumi.dart

@@ -1,31 +1,35 @@
-import 'package:flutter/material.dart';
 import 'package:PiliPlus/common/constants.dart';
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
+import 'package:flutter/material.dart';
 
-import 'skeleton.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(
               width: 111,
               height: 148,
               decoration: BoxDecoration(
-                  borderRadius: const BorderRadius.all(Radius.circular(6)),
-                  color: bgColor),
+                borderRadius: const BorderRadius.all(Radius.circular(6)),
+                color: bgColor,
+              ),
             ),
             const SizedBox(width: 10),
             Expanded(
@@ -35,25 +39,25 @@ class _MediaBangumiSkeletonState extends State<MediaBangumiSkeleton> {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Container(
-                      color: Theme.of(context).colorScheme.onInverseSurface,
+                      color: bgColor,
                       width: 200,
                       height: 20,
                       margin: const EdgeInsets.only(bottom: 15),
                     ),
                     Container(
-                      color: Theme.of(context).colorScheme.onInverseSurface,
+                      color: bgColor,
                       width: 150,
                       height: 13,
                       margin: const EdgeInsets.only(bottom: 5),
                     ),
                     Container(
-                      color: Theme.of(context).colorScheme.onInverseSurface,
+                      color: bgColor,
                       width: 150,
                       height: 13,
                       margin: const EdgeInsets.only(bottom: 5),
                     ),
                     Container(
-                      color: Theme.of(context).colorScheme.onInverseSurface,
+                      color: bgColor,
                       width: 150,
                       height: 13,
                     ),
@@ -62,9 +66,10 @@ class _MediaBangumiSkeletonState extends State<MediaBangumiSkeleton> {
                       width: 90,
                       height: 35,
                       decoration: BoxDecoration(
-                        borderRadius:
-                            const BorderRadius.all(Radius.circular(20)),
-                        color: Theme.of(context).colorScheme.onInverseSurface,
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(20),
+                        ),
+                        color: bgColor,
                       ),
                     ),
                   ],

lib/common/skeleton/msg_feed_sys_msg_.dart

@@ -0,0 +1,53 @@
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
+import 'package:flutter/material.dart';
+
+class MsgFeedSysMsgSkeleton extends StatelessWidget {
+  const MsgFeedSysMsgSkeleton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final color = Theme.of(context).colorScheme.onInverseSurface;
+    return Skeleton(
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Container(
+              width: 125,
+              height: 16,
+              color: color,
+            ),
+            const SizedBox(height: 6),
+            Container(
+              width: double.infinity,
+              height: 12,
+              color: color,
+            ),
+            const SizedBox(height: 4),
+            Container(
+              width: double.infinity,
+              height: 12,
+              color: color,
+            ),
+            const SizedBox(height: 4),
+            Container(
+              width: 100,
+              height: 12,
+              color: color,
+            ),
+            const SizedBox(height: 4),
+            Align(
+              alignment: Alignment.centerRight,
+              child: Container(
+                width: 100,
+                height: 10,
+                color: color,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/common/skeleton/msg_feed_top.dart

@@ -0,0 +1,36 @@
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
+import 'package:flutter/material.dart';
+
+class MsgFeedTopSkeleton extends StatelessWidget {
+  const MsgFeedTopSkeleton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final color = Theme.of(context).colorScheme.onInverseSurface;
+    return Skeleton(
+      child: ListTile(
+        leading: Container(
+          width: 45,
+          height: 45,
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            color: color,
+          ),
+        ),
+        title: UnconstrainedBox(
+          alignment: Alignment.centerLeft,
+          child: Container(
+            width: 100,
+            height: 11,
+            color: color,
+          ),
+        ),
+        subtitle: Container(
+          color: color,
+          width: 125,
+          height: 11,
+        ),
+      ),
+    );
+  }
+}

lib/common/skeleton/skeleton.dart

@@ -10,11 +10,12 @@ class Skeleton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final color = Theme.of(context).colorScheme.surface.withAlpha(10);
     var shimmerGradient = LinearGradient(
       colors: [
         Colors.transparent,
-        Theme.of(context).colorScheme.surface.withAlpha(10),
-        Theme.of(context).colorScheme.surface.withAlpha(10),
+        color,
+        color,
         Colors.transparent,
       ],
       stops: const [
@@ -73,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;
@@ -99,7 +100,7 @@ class ShimmerState extends State<Shimmer> with SingleTickerProviderStateMixin {
 
   @override
   Widget build(BuildContext context) {
-    return widget.child ?? const SizedBox();
+    return widget.child ?? const SizedBox.shrink();
   }
 }
 
@@ -165,7 +166,7 @@ class _ShimmerLoadingState extends State<ShimmerLoading> {
 
     final shimmer = Shimmer.of(context)!;
     if (!shimmer.isSized) {
-      return const SizedBox();
+      return const SizedBox.shrink();
     }
     final shimmerSize = shimmer.size;
     final gradient = shimmer.gradient;

lib/common/skeleton/space_opus.dart

@@ -0,0 +1,51 @@
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
+import 'package:PiliPlus/utils/utils.dart';
+import 'package:flutter/material.dart';
+
+class SpaceOpusSkeleton extends StatelessWidget {
+  const SpaceOpusSkeleton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final surface = Theme.of(context).colorScheme.onInverseSurface;
+    return Skeleton(
+      child: Card(
+        clipBehavior: Clip.hardEdge,
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(6)),
+        ),
+        child: LayoutBuilder(
+          builder: (context, constraints) {
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Container(
+                  height:
+                      (0.68 + 0.82 * Utils.random.nextDouble()) *
+                      constraints.maxWidth,
+                  color: surface,
+                ),
+                Container(
+                  height: 10,
+                  color: surface,
+                  margin: const EdgeInsets.all(10),
+                  width: constraints.maxWidth * 0.7,
+                ),
+                Container(
+                  height: 10,
+                  color: surface,
+                  margin: const EdgeInsets.only(
+                    left: 10,
+                    right: 10,
+                    bottom: 10,
+                  ),
+                  width: constraints.maxWidth,
+                ),
+              ],
+            );
+          },
+        ),
+      ),
+    );
+  }
+}

lib/common/skeleton/video_card_h.dart

@@ -1,93 +1,79 @@
 import 'package:PiliPlus/common/constants.dart';
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
 import 'package:flutter/material.dart';
-import 'skeleton.dart';
 
 class VideoCardHSkeleton extends StatelessWidget {
   const VideoCardHSkeleton({super.key});
 
   @override
   Widget build(BuildContext context) {
+    final color = Theme.of(context).colorScheme.onInverseSurface;
     return Skeleton(
       child: Padding(
         padding: const EdgeInsets.symmetric(
           horizontal: StyleString.safeSpace,
           vertical: 5,
         ),
-        child: LayoutBuilder(
-          builder: (context, boxConstraints) {
-            double width =
-                (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2;
-            return SizedBox(
-              height: width / StyleString.aspectRatio,
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  AspectRatio(
-                    aspectRatio: StyleString.aspectRatio,
-                    child: LayoutBuilder(
-                      builder: (context, boxConstraints) {
-                        return Container(
-                          decoration: BoxDecoration(
-                            color:
-                                Theme.of(context).colorScheme.onInverseSurface,
-                            borderRadius: StyleString.mdRadius,
-                          ),
-                        );
-                      },
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            AspectRatio(
+              aspectRatio: StyleString.aspectRatio,
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  return DecoratedBox(
+                    decoration: BoxDecoration(
+                      color: color,
+                      borderRadius: StyleString.mdRadius,
                     ),
-                  ),
-                  // VideoContent(videoItem: videoItem)
-                  Expanded(
-                      child: Padding(
-                    padding: const EdgeInsets.fromLTRB(10, 4, 6, 4),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                  );
+                },
+              ),
+            ),
+            Expanded(
+              child: Padding(
+                padding: const EdgeInsets.fromLTRB(10, 4, 6, 4),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Container(
+                      color: color,
+                      width: 200,
+                      height: 11,
+                      margin: const EdgeInsets.only(bottom: 5),
+                    ),
+                    Container(
+                      color: color,
+                      width: 150,
+                      height: 13,
+                    ),
+                    const Spacer(),
+                    Container(
+                      color: color,
+                      width: 100,
+                      height: 13,
+                      margin: const EdgeInsets.only(bottom: 5),
+                    ),
+                    Row(
                       children: [
                         Container(
-                          color: Theme.of(context).colorScheme.onInverseSurface,
-                          width: 200,
-                          height: 11,
-                          margin: const EdgeInsets.only(bottom: 5),
+                          color: color,
+                          width: 40,
+                          height: 13,
+                          margin: const EdgeInsets.only(right: 8),
                         ),
                         Container(
-                          color: Theme.of(context).colorScheme.onInverseSurface,
-                          width: 150,
+                          color: color,
+                          width: 40,
                           height: 13,
                         ),
-                        const Spacer(),
-                        Container(
-                          color: Theme.of(context).colorScheme.onInverseSurface,
-                          width: 100,
-                          height: 13,
-                          margin: const EdgeInsets.only(bottom: 5),
-                        ),
-                        Row(
-                          children: [
-                            Container(
-                              color: Theme.of(context)
-                                  .colorScheme
-                                  .onInverseSurface,
-                              width: 40,
-                              height: 13,
-                              margin: const EdgeInsets.only(right: 8),
-                            ),
-                            Container(
-                              color: Theme.of(context)
-                                  .colorScheme
-                                  .onInverseSurface,
-                              width: 40,
-                              height: 13,
-                            ),
-                          ],
-                        )
                       ],
                     ),
-                  )),
-                ],
+                  ],
+                ),
               ),
-            );
-          },
+            ),
+          ],
         ),
       ),
     );

lib/common/skeleton/video_card_v.dart

@@ -1,12 +1,13 @@
 import 'package:PiliPlus/common/constants.dart';
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
 import 'package:flutter/material.dart';
-import 'skeleton.dart';
 
 class VideoCardVSkeleton extends StatelessWidget {
   const VideoCardVSkeleton({super.key});
 
   @override
   Widget build(BuildContext context) {
+    final color = Theme.of(context).colorScheme.onInverseSurface;
     return Skeleton(
       child: Column(
         children: [
@@ -14,9 +15,9 @@ class VideoCardVSkeleton extends StatelessWidget {
             aspectRatio: StyleString.aspectRatio,
             child: LayoutBuilder(
               builder: (context, boxConstraints) {
-                return Container(
+                return DecoratedBox(
                   decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.onInverseSurface,
+                    color: color,
                     borderRadius: StyleString.mdRadius,
                   ),
                 );
@@ -37,24 +38,24 @@ class VideoCardVSkeleton extends StatelessWidget {
                   width: 200,
                   height: 13,
                   margin: const EdgeInsets.only(bottom: 5),
-                  color: Theme.of(context).colorScheme.onInverseSurface,
+                  color: color,
                 ),
                 Container(
                   width: 150,
                   height: 13,
                   margin: const EdgeInsets.only(bottom: 12),
-                  color: Theme.of(context).colorScheme.onInverseSurface,
+                  color: color,
                 ),
                 Container(
                   width: 110,
                   height: 13,
                   margin: const EdgeInsets.only(bottom: 5),
-                  color: Theme.of(context).colorScheme.onInverseSurface,
+                  color: color,
                 ),
                 Container(
                   width: 75,
                   height: 13,
-                  color: Theme.of(context).colorScheme.onInverseSurface,
+                  color: color,
                 ),
               ],
             ),

lib/common/skeleton/video_reply.dart

@@ -1,5 +1,5 @@
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
 import 'package:flutter/material.dart';
-import 'skeleton.dart';
 
 class VideoReplySkeleton extends StatelessWidget {
   const VideoReplySkeleton({super.key});
@@ -26,17 +26,20 @@ class VideoReplySkeleton extends StatelessWidget {
                   width: 80,
                   height: 13,
                   color: bgColor,
-                )
+                ),
               ],
             ),
           ),
           Container(
             width: double.infinity,
-            margin:
-                const EdgeInsets.only(top: 4, left: 57, right: 6, bottom: 6),
+            margin: const EdgeInsets.only(
+              top: 4,
+              left: 57,
+              right: 6,
+              bottom: 6,
+            ),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisAlignment: MainAxisAlignment.start,
               children: [
                 Container(
                   width: 300,
@@ -72,9 +75,9 @@ class VideoReplySkeleton extends StatelessWidget {
                       margin: const EdgeInsets.only(bottom: 4),
                       color: bgColor,
                     ),
-                    const SizedBox(width: 8)
+                    const SizedBox(width: 8),
                   ],
-                )
+                ),
               ],
             ),
           ),

lib/common/skeleton/whisper_item.dart

@@ -0,0 +1,41 @@
+import 'package:PiliPlus/common/skeleton/skeleton.dart';
+import 'package:flutter/material.dart';
+
+class WhisperItemSkeleton extends StatelessWidget {
+  const WhisperItemSkeleton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final color = Theme.of(context).colorScheme.onInverseSurface;
+    return Skeleton(
+      child: ListTile(
+        leading: Container(
+          width: 45,
+          height: 45,
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            color: color,
+          ),
+        ),
+        title: UnconstrainedBox(
+          alignment: Alignment.centerLeft,
+          child: Container(
+            width: 100,
+            height: 11,
+            color: color,
+          ),
+        ),
+        subtitle: Container(
+          color: color,
+          width: 125,
+          height: 11,
+        ),
+        trailing: Container(
+          color: color,
+          width: 50,
+          height: 11,
+        ),
+      ),
+    );
+  }
+}

lib/common/widgets/animated_dialog.dart

@@ -1,74 +0,0 @@
-import 'package:PiliPlus/common/widgets/no_splash_factory.dart';
-import 'package:PiliPlus/common/widgets/overlay_pop.dart';
-import 'package:flutter/material.dart';
-
-class AnimatedDialog extends StatefulWidget {
-  const AnimatedDialog({
-    super.key,
-    required this.videoItem,
-    required this.closeFn,
-  });
-
-  final dynamic videoItem;
-  final Function closeFn;
-
-  @override
-  State<StatefulWidget> createState() => AnimatedDialogState();
-}
-
-class AnimatedDialogState extends State<AnimatedDialog>
-    with SingleTickerProviderStateMixin {
-  late AnimationController controller;
-  late Animation<double> opacityAnimation;
-  late Animation<double> scaleAnimation;
-
-  @override
-  void initState() {
-    super.initState();
-
-    controller = AnimationController(
-        vsync: this, duration: const Duration(milliseconds: 255));
-    opacityAnimation = Tween<double>(begin: 0.0, end: 0.6)
-        .animate(CurvedAnimation(parent: controller, curve: Curves.linear));
-    scaleAnimation = CurvedAnimation(parent: controller, curve: Curves.linear);
-    controller.addListener(() => setState(() {}));
-    controller.forward();
-  }
-
-  @override
-  void dispose() {
-    controller.removeListener(() {});
-    controller.dispose();
-    super.dispose();
-  }
-
-  void closeFn() async {
-    await controller.reverse();
-    widget.closeFn();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Material(
-      color: Colors.black.withOpacity(opacityAnimation.value),
-      child: InkWell(
-        highlightColor: Colors.transparent,
-        splashColor: Colors.transparent,
-        splashFactory: NoSplashFactory(),
-        onTap: closeFn,
-        child: Center(
-          child: FadeTransition(
-            opacity: scaleAnimation,
-            child: ScaleTransition(
-              scale: scaleAnimation,
-              child: OverlayPop(
-                videoItem: widget.videoItem,
-                closeFn: closeFn,
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/common/widgets/app_expansion_panel_list.dart

@@ -1,351 +0,0 @@
-import 'package:flutter/material.dart';
-
-const double _kPanelHeaderCollapsedHeight = kMinInteractiveDimension;
-
-class _SaltedKey<S, V> extends LocalKey {
-  const _SaltedKey(this.salt, this.value);
-
-  final S salt;
-  final V value;
-
-  @override
-  bool operator ==(Object other) {
-    if (other.runtimeType != runtimeType) return false;
-    return other is _SaltedKey<S, V> &&
-        other.salt == salt &&
-        other.value == value;
-  }
-
-  @override
-  int get hashCode => Object.hash(runtimeType, salt, value);
-
-  @override
-  String toString() {
-    final String saltString = S == String ? "<'$salt'>" : '<$salt>';
-    final String valueString = V == String ? "<'$value'>" : '<$value>';
-    return '[$saltString $valueString]';
-  }
-}
-
-class AppExpansionPanelList extends StatefulWidget {
-  /// Creates an expansion panel list widget. The [expansionCallback] is
-  /// triggered when an expansion panel expand/collapse button is pushed.
-  ///
-  /// The [children] and [animationDuration] arguments must not be null.
-  const AppExpansionPanelList({
-    super.key,
-    required this.children,
-    this.expansionCallback,
-    this.animationDuration = kThemeAnimationDuration,
-    this.expandedHeaderPadding = EdgeInsets.zero,
-    this.dividerColor,
-    this.elevation = 2,
-  })  : _allowOnlyOnePanelOpen = false,
-        initialOpenPanelValue = null;
-
-  /// The children of the expansion panel list. They are laid out in a similar
-  /// fashion to [ListBody].
-  final List<AppExpansionPanel> children;
-
-  /// The callback that gets called whenever one of the expand/collapse buttons
-  /// is pressed. The arguments passed to the callback are the index of the
-  /// pressed panel and whether the panel is currently expanded or not.
-  ///
-  /// If AppExpansionPanelList.radio is used, the callback may be called a
-  /// second time if a different panel was previously open. The arguments
-  /// passed to the second callback are the index of the panel that will close
-  /// and false, marking that it will be closed.
-  ///
-  /// For AppExpansionPanelList, the callback needs to setState when it's notified
-  /// about the closing/opening panel. On the other hand, the callback for
-  /// AppExpansionPanelList.radio is simply meant to inform the parent widget of
-  /// changes, as the radio panels' open/close states are managed internally.
-  ///
-  /// This callback is useful in order to keep track of the expanded/collapsed
-  /// panels in a parent widget that may need to react to these changes.
-  final ExpansionPanelCallback? expansionCallback;
-
-  /// The duration of the expansion animation.
-  final Duration animationDuration;
-
-  // Whether multiple panels can be open simultaneously
-  final bool _allowOnlyOnePanelOpen;
-
-  /// The value of the panel that initially begins open. (This value is
-  /// only used when initializing with the [AppExpansionPanelList.radio]
-  /// constructor.)
-  final Object? initialOpenPanelValue;
-
-  /// The padding that surrounds the panel header when expanded.
-  ///
-  /// By default, 16px of space is added to the header vertically (above and below)
-  /// during expansion.
-  final EdgeInsets expandedHeaderPadding;
-
-  /// Defines color for the divider when [AppExpansionPanel.isExpanded] is false.
-  ///
-  /// If `dividerColor` is null, then [DividerThemeData.color] is used. If that
-  /// is null, then [ThemeData.dividerColor] is used.
-  final Color? dividerColor;
-
-  /// Defines elevation for the [AppExpansionPanel] while it's expanded.
-  ///
-  /// By default, the value of elevation is 2.
-  final double elevation;
-
-  @override
-  State<AppExpansionPanelList> createState() => _AppExpansionPanelListState();
-}
-
-class _AppExpansionPanelListState extends State<AppExpansionPanelList> {
-  ExpansionPanelRadio? _currentOpenPanel;
-
-  @override
-  void initState() {
-    super.initState();
-    if (widget._allowOnlyOnePanelOpen) {
-      assert(_allIdentifiersUnique(),
-          'All ExpansionPanelRadio identifier values must be unique.');
-      if (widget.initialOpenPanelValue != null) {
-        _currentOpenPanel = searchPanelByValue(
-            widget.children.cast<ExpansionPanelRadio>(),
-            widget.initialOpenPanelValue);
-      }
-    }
-  }
-
-  @override
-  void didUpdateWidget(AppExpansionPanelList oldWidget) {
-    super.didUpdateWidget(oldWidget);
-
-    if (widget._allowOnlyOnePanelOpen) {
-      assert(_allIdentifiersUnique(),
-          'All ExpansionPanelRadio identifier values must be unique.');
-      // If the previous widget was non-radio AppExpansionPanelList, initialize the
-      // open panel to widget.initialOpenPanelValue
-      if (!oldWidget._allowOnlyOnePanelOpen) {
-        _currentOpenPanel = searchPanelByValue(
-            widget.children.cast<ExpansionPanelRadio>(),
-            widget.initialOpenPanelValue);
-      }
-    } else {
-      _currentOpenPanel = null;
-    }
-  }
-
-  bool _allIdentifiersUnique() {
-    final Map<Object, bool> identifierMap = <Object, bool>{};
-    for (final ExpansionPanelRadio child
-        in widget.children.cast<ExpansionPanelRadio>()) {
-      identifierMap[child.value] = true;
-    }
-    return identifierMap.length == widget.children.length;
-  }
-
-  bool _isChildExpanded(int index) {
-    if (widget._allowOnlyOnePanelOpen) {
-      final ExpansionPanelRadio radioWidget =
-          widget.children[index] as ExpansionPanelRadio;
-      return _currentOpenPanel?.value == radioWidget.value;
-    }
-    return widget.children[index].isExpanded;
-  }
-
-  void _handlePressed(bool isExpanded, int index) {
-    widget.expansionCallback?.call(index, isExpanded);
-
-    if (widget._allowOnlyOnePanelOpen) {
-      final ExpansionPanelRadio pressedChild =
-          widget.children[index] as ExpansionPanelRadio;
-
-      // If another ExpansionPanelRadio was already open, apply its
-      // expansionCallback (if any) to false, because it's closing.
-      for (int childIndex = 0;
-          childIndex < widget.children.length;
-          childIndex += 1) {
-        final ExpansionPanelRadio child =
-            widget.children[childIndex] as ExpansionPanelRadio;
-        if (widget.expansionCallback != null &&
-            childIndex != index &&
-            child.value == _currentOpenPanel?.value) {
-          widget.expansionCallback?.call(childIndex, false);
-        }
-      }
-
-      setState(() {
-        _currentOpenPanel = isExpanded ? null : pressedChild;
-      });
-    }
-  }
-
-  ExpansionPanelRadio? searchPanelByValue(
-      List<ExpansionPanelRadio> panels, Object? value) {
-    for (final ExpansionPanelRadio panel in panels) {
-      if (panel.value == value) return panel;
-    }
-    return null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    assert(
-      kElevationToShadow.containsKey(widget.elevation),
-      'Invalid value for elevation. See the kElevationToShadow constant for'
-      ' possible elevation values.',
-    );
-
-    final List<MergeableMaterialItem> items = <MergeableMaterialItem>[];
-
-    for (int index = 0; index < widget.children.length; index += 1) {
-      //todo: Uncomment to add gap between selected panels
-      /*if (_isChildExpanded(index) && index != 0 && !_isChildExpanded(index - 1))
-        items.add(MaterialGap(key: _SaltedKey<BuildContext, int>(context, index * 2 - 1)));*/
-
-      final AppExpansionPanel child = widget.children[index];
-      final Widget headerWidget = child.headerBuilder(
-        context,
-        _isChildExpanded(index),
-      );
-
-      Widget? expandIconContainer = ExpandIcon(
-        isExpanded: _isChildExpanded(index),
-        onPressed: !child.canTapOnHeader
-            ? (bool isExpanded) => _handlePressed(isExpanded, index)
-            : null,
-      );
-      if (!child.canTapOnHeader) {
-        final MaterialLocalizations localizations =
-            MaterialLocalizations.of(context);
-        expandIconContainer = Semantics(
-          label: _isChildExpanded(index)
-              ? localizations.expandedIconTapHint
-              : localizations.collapsedIconTapHint,
-          container: true,
-          child: expandIconContainer,
-        );
-      }
-
-      final iconContainer = child.iconBuilder;
-      if (iconContainer != null) {
-        expandIconContainer = iconContainer(
-          expandIconContainer,
-          _isChildExpanded(index),
-        );
-      }
-
-      Widget header = Row(
-        children: <Widget>[
-          Expanded(
-            child: AnimatedContainer(
-              duration: widget.animationDuration,
-              curve: Curves.fastOutSlowIn,
-              margin: _isChildExpanded(index)
-                  ? widget.expandedHeaderPadding
-                  : EdgeInsets.zero,
-              child: ConstrainedBox(
-                constraints: const BoxConstraints(
-                    minHeight: _kPanelHeaderCollapsedHeight),
-                child: headerWidget,
-              ),
-            ),
-          ),
-          if (expandIconContainer != null) expandIconContainer,
-        ],
-      );
-      if (child.canTapOnHeader) {
-        header = MergeSemantics(
-          child: InkWell(
-            onTap: () => _handlePressed(_isChildExpanded(index), index),
-            child: header,
-          ),
-        );
-      }
-      items.add(
-        MaterialSlice(
-          key: _SaltedKey<BuildContext, int>(context, index * 2),
-          color: child.backgroundColor,
-          child: Column(
-            children: <Widget>[
-              header,
-              AnimatedCrossFade(
-                firstChild: Container(height: 0.0),
-                secondChild: child.body,
-                firstCurve:
-                    const Interval(0.0, 0.6, curve: Curves.fastOutSlowIn),
-                secondCurve:
-                    const Interval(0.4, 1.0, curve: Curves.fastOutSlowIn),
-                sizeCurve: Curves.fastOutSlowIn,
-                crossFadeState: _isChildExpanded(index)
-                    ? CrossFadeState.showSecond
-                    : CrossFadeState.showFirst,
-                duration: widget.animationDuration,
-              ),
-            ],
-          ),
-        ),
-      );
-
-      if (_isChildExpanded(index) && index != widget.children.length - 1) {
-        items.add(MaterialGap(
-            key: _SaltedKey<BuildContext, int>(context, index * 2 + 1)));
-      }
-    }
-
-    return MergeableMaterial(
-      hasDividers: true,
-      dividerColor: widget.dividerColor,
-      elevation: widget.elevation,
-      children: items,
-    );
-  }
-}
-
-typedef ExpansionPanelIconBuilder = Widget? Function(
-  Widget child,
-  bool isExpanded,
-);
-
-class AppExpansionPanel {
-  /// Creates an expansion panel to be used as a child for [ExpansionPanelList].
-  /// See [ExpansionPanelList] for an example on how to use this widget.
-  ///
-  /// The [headerBuilder], [body], and [isExpanded] arguments must not be null.
-  AppExpansionPanel({
-    required this.headerBuilder,
-    required this.body,
-    this.iconBuilder,
-    this.isExpanded = false,
-    this.canTapOnHeader = false,
-    this.backgroundColor,
-  });
-
-  /// The widget builder that builds the expansion panels' header.
-  final ExpansionPanelHeaderBuilder headerBuilder;
-
-  /// The widget builder that builds the expansion panels' icon.
-  ///
-  /// If not pass any function, then default icon will be displayed.
-  ///
-  /// If builder function return null, then icon will not displayed.
-  final ExpansionPanelIconBuilder? iconBuilder;
-
-  /// The body of the expansion panel that's displayed below the header.
-  ///
-  /// This widget is visible only when the panel is expanded.
-  final Widget body;
-
-  /// Whether the panel is expanded.
-  ///
-  /// Defaults to false.
-  final bool isExpanded;
-
-  /// Whether tapping on the panel's header will expand/collapse it.
-  ///
-  /// Defaults to false.
-  final bool canTapOnHeader;
-
-  /// Defines the background color of the panel.
-  ///
-  /// Defaults to [ThemeData.cardColor].
-  final Color? backgroundColor;
-}

lib/common/widgets/appbar.dart

@@ -1,32 +0,0 @@
-import 'package:flutter/material.dart';
-
-class AppBarWidget extends StatelessWidget implements PreferredSizeWidget {
-  const AppBarWidget({
-    required this.child,
-    required this.controller,
-    required this.visible,
-    super.key,
-  });
-
-  final PreferredSizeWidget child;
-  final AnimationController controller;
-  final bool visible;
-
-  @override
-  Size get preferredSize => child.preferredSize;
-
-  @override
-  Widget build(BuildContext context) {
-    visible ? controller.reverse() : controller.forward();
-    return SlideTransition(
-      position: Tween<Offset>(
-        begin: Offset.zero,
-        end: const Offset(0, -1),
-      ).animate(CurvedAnimation(
-        parent: controller,
-        curve: Curves.easeInOutBack,
-      )),
-      child: child,
-    );
-  }
-}