merge: 开屏后直接展示首页骨架

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <!-- Author: fruit.com.cn -->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission
+        android:name="android.permission.INTERNET"/>
     <application
         android:label="FruitShorts"
         android:name="${applicationName}"
@@ -23,9 +23,8 @@
                  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"
-              />
+                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"/>
@@ -35,7 +34,7 @@
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
             android:name="flutterEmbedding"
-            android:value="2" />
+            android:value="2"/>
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
@@ -44,8 +43,10 @@
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
         <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
+            <action
+                android:name="android.intent.action.PROCESS_TEXT"/>
+            <data
+                android:mimeType="text/plain"/>
         </intent>
     </queries>
 </manifest>

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

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

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

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: fruit.com.cn -->
-
 <resources>
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:windowSplashScreenBackground">@color/splash_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#000000</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
     </style>
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">

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

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: fruit.com.cn -->
-
 <resources>
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:windowSplashScreenBackground">@color/splash_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#000000</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
     </style>
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">

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

@@ -2,5 +2,6 @@
 <!-- Author: fruit.com.cn -->
 
 <resources>
-    <color name="splash_background">#1F1B16</color>
-</resources>
+	<color name="splash_background">#000000</color>
+	<color name="ic_launcher_background">#FF6B2C</color>
+</resources>

docs/plans/2026-10-22-dark-theme-client.md

@@ -0,0 +1,28 @@
+# ReelShort 客户端深色视觉改造
+
+## 目标
+
+- 深色设为默认且唯一主题，页面、卡片、浮层、播放器和底部导航保持一致。
+- 色板收敛到 `AppColors`，主题组件配置收敛到 `AppTheme`。
+- 保持现有布局、信息结构、路由、业务逻辑和文案不变。
+
+## 结果
+
+- 背景 `#0B1020`、卡片 `#151B2E`、浮层 `#1C2436`、分割线白色 6%。
+- 主文字白色 92%、次文字 64%、禁用 38%。
+- 主色 `#FF6B2C`，辅助链接色 `#22D3EE`。
+- 卡片 12、按钮/输入框 10、标签 6，阴影关闭，组件使用分割线分层。
+- 页面级透明、遮罩、阴影、媒体底、玻璃面和渐变全部映射到 AppColors 语义 token。
+- 系统栏统一浅色图标，AppBar 与底部导航使用深色表面。
+
+## 验证
+
+- 主题 token、对比度、系统栏、圆角与关键页 smoke 测试。
+- `dart analyze lib test`
+- `flutter test --no-pub`
+- `flutter build apk --debug`
+
+## 约束
+
+- 不提交 `pubspec.lock` 漂移。
+- 不启停服务、不操作真机。

docs/plans/PROGRESS.md

@@ -730,3 +730,592 @@ $ flutter test --no-pub
 解读：有简介时文本最多 2 行并省略，空简介不渲染且卡片高度与正常卡片一致；
 全量静态分析零告警，631 项通过、1 项运行中旧后端能力探测跳过。
 `pubspec.lock` 既有改动未提交。
+
+## 2026-10-22 ReelShort 客户端深色视觉改造
+
+- 分支：`feature/dark-theme-client`
+- 基线：开发前已有约 43 个未提交视觉文件，本次在原改动上继续收敛，未推倒重来。
+- 计划：`docs/plans/2026-10-22-dark-theme-client.md`
+
+### 颜色与主题
+
+- `AppTheme.dark()` 成为默认且唯一主题，系统状态栏/导航栏图标统一浅色。
+- 色板统一为背景 `#0B1020`、卡片 `#151B2E`、浮层 `#1C2436`、
+  divider `#0FFFFFFF`、主色 `#FF6B2C`、辅助链接色 `#22D3EE`。
+- 主/次/禁用文字分别使用白色 92% / 64% / 38%。
+- 卡片/按钮/输入框/标签圆角统一为 12/10/10/6，卡片阴影关闭。
+- 页面和组件内的 `Colors.*`、`Color(0x...)` 已全部映射到 `AppColors`
+  语义 token；剩余原始色值只在 `app_colors.dart` 中定义。
+- 导航、玻璃面板、播放器遮罩、加载轨道、渐变、边框和阴影均改为深色语义。
+- 修正全局输入装饰 padding 导致账户性别下拉溢出，保持原布局宽度。
+
+### 验证命令与原始结果
+
+```text
+$ git checkout -- pubspec.lock
+$ git status --short --branch
+## feature/dark-theme-client
+
+$ rg -n -P "Color\(0x|(?<!App)Colors\." lib | rg -v '^lib/core/theme/'
+(no output)
+
+$ rg -n "SystemUiOverlayStyle\.dark" lib
+(no output)
+```
+
+解读：pubspec.lock 漂移已还原；页面/组件层不再直接写颜色，所有状态栏均使用浅色图标。
+
+```text
+$ dart analyze lib test
+Analyzing lib, test...
+No issues found!
+```
+
+```text
+$ flutter test --no-pub
+00:51 +644: All tests passed!
+```
+
+```text
+$ flutter build apk --debug
+Running Gradle task 'assembleDebug'...
+    2,058ms
+✓ Built build/app/outputs/flutter-apk/app-debug.apk
+```
+
+解读：静态分析零告警，644 项测试全部通过，debug APK 构建成功；测试与构建后再次确认
+`pubspec.lock` 无改动，未启停服务、未操作真机。
+
+## 2026-10-22 客户端底部导航改为首页/推荐/追剧/我的
+
+- 分支：`feature/client-bottom-nav-4tabs`
+- 基线：`develop` / `origin/develop` = `ec3cb8f`
+- 计划：`docs/plans/2026-10-22-client-bottom-nav-4tabs.md`
+- 实现提交：`91e869d feat(nav): 底部导航改为首页推荐追剧我的`
+
+### 问题
+
+根导航仍为首页/剧场/创作/我的，底栏选中态使用品牌橙。追剧若通过新路由打开，
+会叠加第二层底栏并产生返回栈，不符合参考图和单根导航交互。
+
+### 改动
+
+- 新增 `AppRootTab` 统一四个 tab 的顺序、key、图标和 l10n 标签。
+- `AppBottomNav` 改为纯黑底、白色选中、`#8A8A8E` 未选中，图标 24、文字 11，
+  保留 SafeArea 与轻震动。
+- 首页 `IndexedStack` 第三槽直接使用 `FavoritesContent`，不再 push 收藏路由。
+  追剧保留顶部标题区、隐藏返回按钮，只有一个根底栏，不创建嵌套 Scaffold。
+- `FavoritesPage` 保留独立 Scaffold 和返回行为，继续供“我的”入口使用。
+- 推荐、追剧、我的三个根页面统一调用 `HomeLogic.select` 切换，不进入返回栈。
+- 创作页保留，`mine-creator-center` 入口保留；创作不再出现在根底栏。
+- 中文使用“追剧”，英文使用 `Home / Recommend / Following / My`，
+  印尼语使用 `Beranda / Rekomendasi / Daftar Tonton / Saya`。
+- `FavoritesContent` 内置顶部 SafeArea，避免嵌入首页后被状态栏遮挡。
+
+### 门禁命令与原始输出
+
+```text
+$ dart analyze lib test
+Analyzing lib, test...
+No issues found!
+```
+
+```text
+$ flutter test --no-pub
+04:38 +644: All tests passed!
+```
+
+导航测试覆盖：四个 tab 数量与顺序、纯白/灰色状态、点击追剧进入
+`FavoritesContent`、仅一个 `AppBottomNav`、追剧内部无嵌套 Scaffold、
+`Navigator.canPop == false`、创作不再出现在底栏且我的入口保留。
+
+解读：静态分析零告警，644 项测试全部通过；追剧与首页/推荐/我的均在同一根页面
+内切换，无叠加导航或返回栈。`pubspec.lock` 未提交，未启动或停止服务，未操作真机。
+
+## 2026-10-22 根导航布局规格对齐
+
+- 分支：`feature/client-bottom-nav-layout`
+- 基线：`develop` / `origin/develop` = `667fdc5`
+- 实现提交：`81787dc style(nav): 对齐四 Tab 底栏布局规格`
+
+### 改动
+
+- 新增 `AppRootBottomNav` 作为首页、推荐、追剧、我的唯一根导航入口，
+  三个 Shell 页面不再各自拼装 item。
+- 四列使用 `Expanded` 等分，图标在上、文字在下，间距 4。
+- 内容高度 56，另由 `SafeArea` 增加底部安全区；图标 26、文字 11、
+  `letterSpacing = 0`，选中 `w600`、未选中 `w400`。
+- 背景纯黑，取消顶部边框；选中 `#FFFFFF`，未选中 `#8E8E93`。
+- 首页、推荐、书签、人像继续使用各自的选中实心/未选中描边图标。
+
+### 门禁命令与原始输出
+
+```text
+$ flutter analyze
+Analyzing reelshort-bottom-nav...
+No issues found! (ran in 5.2s)
+```
+
+```text
+$ flutter test
+04:43 +645: All tests passed!
+```
+
+解读：四等分、56 内容高度、安全区、26 图标、4 间距、精确色值和无分割线
+均有测试覆盖；645 项测试全部通过。`pubspec.lock` 未提交，未操作真机。
+
+## 2026-10-22 首页改为三列探索网格
+
+- 分支：`feature/home-grid-layout`
+- 基线：`develop` / `origin/develop` = `6dea9d4`
+- 实现提交：`dd96792 feat(home): 首页改为三列探索网格`
+
+### 布局与数据
+
+- 首页按参考图改为纯黑探索页：搜索框、皇冠、礼物入口、一级分类、
+  二级标签与三列封面网格。
+- `HomeFeedController` 继续使用 10 条游标分页；支持下拉刷新、触底加载、
+  空态与失败重试，没有全量拉取。
+- 一级固定项为精选/新剧/分类/榜单；古装/社群仅在 `/app/categories`
+  名称匹配时显示。新剧/分类/榜单复用现有页面。
+- 二级标签按分类与题材可用性显示，筛选按钮复用 `FilterPage`。
+- 卡片封面 5:6、圆角 8、间距 8；包含真实热剧/新剧/漫剧角标、
+  播放量、最多两行标题与最多两个题材标签。
+- `Drama` 增加 `dramaType` 和可选 `createdAt`；卡片未下发上架时间时
+  从 Snowflake id 解析，不使用假数据。
+- 原 `PlayerPage(homeMode: true)` 保留并迁至推荐 tab，播放器文件与测试未删除。
+- 首页顶部中性色、卡片与描边 token 已沉淀到 `AppColors/AppDimens`，
+  后续 P14 复用。
+
+### 门禁命令与原始输出
+
+```text
+$ flutter analyze
+Analyzing reelshort-bottom-nav...
+No issues found! (ran in 2.7s)
+```
+
+```text
+$ flutter test
+02:32 +651: All tests passed!
+```
+
+解读：三列网格、分类顺序、动态入口隐藏、角标、卡片信息、分页大小、
+下一页追加和卡片进入播放器均有测试覆盖。`home_view.dart` 为 478 行，
+其余新增组件均低于 500 行。`pubspec.lock` 未提交，未操作真机。
+
+## 2026-10-22 「我的」页视觉风格统一
+
+- 分支：`feature/mine-visual-style`
+- 基线：`develop` / `origin/develop` = `47bf645`
+- 实现提交：`83129ac feat(mine): 统一我的页深色视觉风格`
+
+### Token 与改动
+
+- 复用 P11 的 `appBackground/contentCard/contentSurface/contentBorder`，
+  新增 `textPrimary/mineCardRadius/mineRowHeight/minePageTitle/mineSectionTitle`。
+- 页面底色改为纯黑，移除「我的」页的旧深蓝渐变；页头白色标题 21/w700。
+- 头像、三宫格、金币卡、会员卡、菜单统一为深灰 16 圆角、1px 极淡描边，
+  无阴影、无渐变、无发光。
+- 主文字/昵称/金额使用 `#FFFFFF`，次级说明和 chevron 使用 `#8E8E93`。
+- 三宫格等宽，入口图标 24 线性；菜单行高 52、标题 15，分割线只存在行间。
+- 橙色仅保留在充值、加入 VIP 等主操作；头像与菜单图标不再使用粉色/橙色装饰。
+- 区块顺序、全部入口、跳转与交互逻辑保持不变。
+
+### 门禁命令与原始输出
+
+```text
+$ flutter analyze
+Analyzing reelshort-bottom-nav...
+No issues found!
+```
+
+```text
+$ flutter test
+00:56 +651: All tests passed!
+```
+
+解读：背景、卡片 token、圆角/描边、无渐变阴影、三宫格等宽、菜单 52 行高、
+入口保留和收藏页跳转均有测试覆盖。`pubspec.lock` 未提交，未操作真机。
+
+## 2026-10-22 推荐页沉浸流 / 剧单 / 全部短剧
+
+- 分支：`feature/recommend-section-feed`、`feature/recommend-tab-feed-correction`
+- 修正基线：`develop` / `origin/develop` = `af6b9bb`
+
+固定顶部三 tab 为推荐 / 剧单 / 全部短剧，右侧保留搜索。推荐 tab 直接内嵌
+`PlayerPage(homeMode: true, embedded: true)`，支持一屏一剧、上下滑切换、
+收藏/点赞/选集/简介/进度条等现有播放器能力；播放器内部频道标题条关闭，
+只保留视频与浮层。剧单 tab 包含本週爆款推薦、本週精選新劇、古裝神劇大賞
+三条横滑卡片，数据分别本地按播放量、上架时间和古装分类/题材排序过滤。
+全部短剧提供四行可用筛选 chips、三列首页同款卡片和 20 条触底分页；
+无后端字段的本地/地区/字幕/配音筛选项不展示。根底栏始终保留四个入口。
+
+```text
+$ flutter analyze
+Analyzing reelshort-recommend-correction...
+No issues found! (ran in 3.2s)
+
+$ flutter test
+01:03 +644: All tests passed!
+```
+
+解读：沉浸式推荐播放器、剧单三分区横滑、四行筛选、三列网格、tab 状态保留、
+搜索、卡片播放、播放器路由覆盖/恢复均有测试覆盖；所有生效文件低于 500 行。
+`pubspec.lock` 未提交，未操作真机。
+
+## 2026-10-22 追剧页三 tab 与双列网格
+
+- 分支：`feature/following-tabs-grid`
+- 基线：`develop` / `origin/develop` = `73380ee`
+
+### 页面与数据
+
+- 根导航追剧槽位改为内嵌 `FollowingPage`，不再 push 收藏路由，也不叠加
+  第二层底部导航。
+- 页面提供追剧 / 播放历史 / 预约三个子 tab，使用 `IndexedStack` 保留各自
+  滚动位置；切换 tab 会退出编辑态。
+- 追剧复用 `FavoriteController`，显示“第 N 集 / 共 M 集”，支持下拉刷新、
+  触底分页、加载/错误/无更多状态。
+- 播放历史复用 `WatchRecordsController`，优先使用分页接口的
+  `dramaTitle/dramaCover/episodeNumber`，仅在标题缺失时补取详情；卡片展示
+  已看集数与可用进度条，同样支持刷新和分页。
+- 双列网格使用共享卡片：3:4 封面、播放量胶囊、两行标题、副信息与编辑态
+  减号。删除前二次确认，最后一条移除后自动退出编辑态。
+- 预约没有独立分页数据源，本轮保留真实空态；未登录沿用 `AuthGatePanel`。
+
+### 门禁命令与原始输出
+
+```text
+$ flutter analyze
+Analyzing reelshort-bottom-nav...
+No issues found! (ran in 1.9s)
+```
+
+```text
+$ flutter test
+01:12 +643: All tests passed!
+```
+
+解读：三 tab、双列网格、后端历史元数据直出、编辑删除确认、最后一条自动
+退出编辑、未登录与空态均有测试覆盖；`following_page.dart` 低于 500 行。
+`pubspec.lock` 未提交，未操作真机。
+
+## 2026-10-22 「我的」页布局重排与迷你播放器
+
+- 分支：`feature/mine-layout-redesign`
+- 基线：`develop` / `origin/develop` = `5aa8170`
+- 实现提交：`cbc6d80 feat(mine): 重排我的页并新增迷你播放器`
+
+### 页面与入口
+
+- 用户区改为 56 圆形头像、20/w700 昵称与 13 灰色 UID；UID 支持复制，
+  未登录显示 Visitor 与登录按钮，已登录显示编辑按钮。
+- VIP 改为金色渐变通栏卡，品牌文案走 l10n，右侧开通按钮复用现有 VIP 页。
+- 删除收藏/历史/下载三宫格；单列菜单固定为钱包、离线缓存、播放历史、
+  观看偏好、联系客服、语言、设置，行高 56、图标 22、仅行间显示分割线。
+- 收藏由底部追剧 tab 承载；历史、下载、钱包、偏好、客服、语言、设置均
+  复用现有页面。我的作品、创作者中心与通知保留在登录后的编辑操作面板，
+  设置页中的通知入口继续可用。
+- 我的页 token 收敛到 `AppColors/AppDimens`：背景纯黑、卡片 `#16161A`、
+  16 圆角、极淡描边、金色渐变仅用于 VIP。
+- 左下角迷你播放器为 96x132，直接使用观看历史首条数据，展示封面、剧名和
+  集号；无记录或关闭后不占位，点击按记录集号进入全屏播放器。
+- 删除三宫格对应的 `localViewer/watchlist` 废弃 l10n key 与旧组件代码。
+
+### 门禁命令与原始输出
+
+```text
+$ flutter analyze
+Analyzing reelshort-mine-redesign...
+No issues found! (ran in 2.1s)
+```
+
+```text
+$ flutter test
+01:01 +647: All tests passed!
+```
+
+解读：用户区、UID、登录/编辑、VIP、7 项菜单顺序与跳转、旧入口可达性、
+迷你播放器显隐/关闭/开播及无数据不渲染均有测试覆盖。`mine_view.dart`
+与新增子组件均低于 500 行；`pubspec.lock` 未提交，未操作真机。
+
+## 2026-10-22 全局移除两侧悬浮元素
+
+- 分支：`feature/remove-floating-overlays`
+- 基线：`develop` / `origin/develop` = `5cead7c`
+
+### 改动
+
+- 保留首页顶部礼物入口的 `home-wallet-badge` 红色余额角标。
+- 删除「我的」页 `MineMiniPlayer` 文件、渲染分支及最近观看开播逻辑。
+- 删除仅为迷你播放器新增的 `mineMini*` 尺寸 token；没有新增专属 l10n key。
+- 首页、推荐、剧单、全部短剧和追剧页均不渲染两侧游戏/活动悬浮球、
+  悬浮关闭按钮或迷你播放器。
+- 卡片角标、播放量、标题、标签和顶部钱包红标保持不变。
+
+### 门禁命令与原始输出
+
+```text
+$ flutter analyze
+Analyzing reelshort-home-floating...
+No issues found! (ran in 2.5s)
+```
+
+```text
+$ flutter test
+01:32 +647: All tests passed!
+```
+
+解读：登录且钱包快照存在时钱包红标仍显示；首页四个 tab、推荐三个子 tab、
+追剧页和我的页均断言不存在两侧悬浮组件。`pubspec.lock` 未提交，
+未操作真机。
+
+## 2026-10-22 首页与短剧列表视觉字号对齐
+
+- 分支：`feature/visual-type-scale`
+- 基线：`develop` / `origin/develop` = `d03dcf1`
+
+### Token 与组件
+
+- 新增 `textTertiary = #9E9E9E`，以及搜索、页签、筛选 chip、分区标题、
+  卡片标题/播放量/标签/角标、封面比例和网格间距的公共 token。
+- 搜索框统一为高 40、圆角 8、placeholder 13；一级分类 16，选中
+  白字 w700，未选中 `#9E9E9E` w400；二级标签 13 并采用参考图选中/未选中
+  底色。
+- 三列首页网格与全部短剧网格统一左右边距 14、列间距 6、行间距 18；
+  封面 5:6、圆角 6。
+- 首页、剧单横滑、追剧双列卡片统一标题 15/w500/1.3、播放量 11 白字、
+  标签 11/高 18/左右 6，封面到标题 8、标题到标签 6。
+- 剧单分区标题 17/w700，副标题 11 `#8E8E93`，更多 12 `#8E8E93`；
+  分区间距保持 24。
+- 全部短剧筛选 chip 统一高 30、圆角 15、字号 13；我的页标题 17，
+  追剧顶部页签 16。
+
+### 门禁命令与原始输出
+
+```text
+$ flutter analyze
+Analyzing reelshort-visual-type...
+No issues found! (ran in 1.8s)
+```
+
+```text
+$ flutter test
+00:57 +648: All tests passed!
+```
+
+解读：首页搜索/页签/二级标签、三类卡片字体与标签、5:6 封面、网格间距、
+筛选 chip、我的标题和追剧双列 320 宽度适配均有测试覆盖。目标组件均低于
+500 行；`pubspec.lock` 未提交，未操作真机。
+
+## 2026-10-22 首页布局对齐修正
+
+- 一级分类未选 18/w400、选中 20/w700；二级 chips 间距 10、左右 8、15/w600，并以稳定 AnimatedContainer 切换。
+- 首页内容区改为横向 PageView：点击与滑动共用 PageController，各 tab 保留纵向滚动位置。
+- PageController 与各 tab ScrollController 改为字段直接初始化，修复热重载后的 LateInitializationError。
+- 四类卡片去底板/描边，封面统一 3:4、8 圆角、行距 10、封底标题间距 6；状态角标为右上角紧凑异形丝带。
+- 标题下方恢复左对齐题材文字，使用 `|` 分隔、灰色小字，与封面状态角标保持独立。
+- 首页搜索栏到一级、一级到二级、二级到网格间距为 8/8/10；非精选 tab 直接以 10 衔接网格。
+- 搜索框右侧皇冠与礼物使用 28 图片图标，缺图时回退原彩色 Icon；透明热区、间距和角标不变。
+- 皇冠/礼物 144×144 透明 PNG 已归档到 `assets/icon/`，组件路径与资源注册一致。
+- 两张图标已按统一 104/144 内容高重新归一化，28×28 渲染时视觉高度一致。
+- 第二轮素材按 100/144 内容高更新，入口改为 30×30、间距 6，礼物角标继续对齐右上角。
+- 播放量贴封面右下角（底 2、右 6），火焰图标 11 + 12/w400 纯文字，间距 4，并保留极淡底部渐变。
+- 修复二级 chip 运行时颜色误用 `const TextStyle` 的编译错误，并校正相关测试 Finder 类型。
+- 全部短剧的地区、字幕、配音筛选 UI 已占位；以下接口待补：地区、字幕/配音筛选数据。
+
+## 2026-10-22 短剧列表刷新体验优化
+
+- 公共下拉刷新统一为白指示器、40 displacement、Bouncing + AlwaysScrollable，并在下拉期间屏蔽内容点击与滚动条。
+- 首页移除父级 feed 监听，网格、剧单和全部短剧改为局部监听，刷新时保留旧数据及原滚动位置。
+- 剧单、全部短剧、追剧沿用相同刷新策略；首帧加载与刷新指示器分离。
+- 按当前流程未执行 analyze/test。
+
+## 2026-10-22 ChangeNotifier 监听生命周期排查
+
+- 全仓核对手动 add/remove；首页、推荐和追剧改为内容区单实例 ListenableBuilder，避免重复订阅。
+- 播放器进度监听改为具名回调，在切换、重建会话和 dispose 时解绑；评论输入弹窗补 controller 更换迁移。
+- `_onFeedChanged` 已无源码调用链，报错来源为热重载前注册的旧 tear-off；需完全关闭 App 后冷启动。
+- 按当前流程未执行 analyze/test。
+
+## 2026-10-22 二级标签筛选按钮右对齐
+
+- 三横线热区由 44 宽改为 26×26，消除 44 宽居中盒造成的视觉右边距偏移。
+- 标签滚动区与按钮间距改为 6，按钮右边缘固定对齐页面 14 边距。
+- 补充按钮尺寸与屏幕右边距断言；按当前流程未执行 analyze/test。
+
+## 2026-10-22 首页导航图标调整
+
+- `AppRootTab.home` 未选中改为 `theaters_outlined`，选中改为 `theaters`。
+- 其余三个根导航图标、26 尺寸及白/灰颜色规则保持不变；测试断言同步。
+- 按当前流程未执行 analyze/test。
+
+## 2026-10-22 首页圆形胶片盘图标
+
+- `AppRootTab` 新增可选 `assetPath`，首页使用 `assets/icon/film_reel.png`。
+- 共享导航通过 `ColorFiltered + Image.asset` 按选中态着色，尺寸保持 26，缺图回退胶片 Material 图标。
+- 推荐、追剧、我的图标不变；素材与测试断言同步，按当前流程未执行 analyze/test。
+
+## 2026-10-22 首页选中态实心摄影机
+
+- `AppRootTab` 新增 `selectedAssetPath`，首页选中使用 `film_reel_filled.png`，未选中使用描边版。
+- 共享导航保持 `ColorFiltered(srcIn)` 与 26×26，缺图按选中态回退实心/描边胶片图标。
+- 推荐、追剧、我的不变；测试断言同步，按当前流程未执行 analyze/test。
+
+## 2026-10-22 底部导航图标与文字加大
+
+- 公共 token 调整为图标 30、文字 13、图标文字间距 5、内容高度 62。
+- 图片首页图标同步使用 30×30；SafeArea 仍在内容区外独立追加，四等分布局不变。
+- 尺寸测试断言同步，按当前流程未执行 analyze/test。
+
+## 2026-10-22 推荐页沉浸式布局对齐
+
+- 推荐/剧单/全部短剧顶部改为视频内居中浮层，17 字号、无下划线，搜索固定右侧 14。
+- 右侧保留收藏/点赞/选集，白色 32 图标、28 间距；评论、分享入口已从该浮层移除。
+- 底部信息重构为标题、真实热度、剧名、题材/集数、可展开简介与渐变观看全集按钮。
+- 新增三语“观看全集”文案；按当前流程未执行 analyze/test。
+- 榜单行支持可选排名：有名次显示 `TOPn·热播榜`，无名次回退“热播榜”；热度值改用 `w` 格式。
+- 题材改为空格分隔，集数固定右侧单行；右侧操作栏改为距屏幕边缘 8，底部位置不变。
+
+## 2026-10-22 推荐页底部信息二次修正
+
+- 按最新反馈移除整行榜单与热度胶囊，信息顺序收敛为标题、剧名、标签、简介、观看全集。
+- 剧名 19/w600，箭头 20 白色并紧邻剧名；标签行改为 13/w600 亮灰内联布局。
+- 简介「展开/收起」沿用现有三语文案；进度条热区恢复 24 并接入拖动自动清屏与预览卡片。
+- 拖动仅控制视频浮层内容，顶部导航与根底栏保持常驻。
+- 进度条固定中心并动画到 6 高，命中高度 32，时间气泡限制在左右 12；end/cancel/pointer 兜底均恢复拖动前状态。
+- 修复 `scrubCancelRequest` 误置于 `initState` 的编译错误，并清理推荐页未使用变量；`flutter analyze` 无问题。
+- 观看全集按钮相对进度条上移 8，间距调整为 20；按钮改为屏幕宽度 70% 左对齐，`flutter analyze` 无问题。
+
+## 2026-10-22 进度条按下与拖动彻底修复
+
+- Slider 不再在 `onChangeStart` 清屏；首次真实移动后才进入 scrub，轨道 2/6、thumb 6/8。
+- 推荐流拖动使用独立 opaque 手势与 pointer 兜底，end/cancel 同时恢复浮层和轨道。
+- 推荐浮层改为 AnimatedOpacity + IgnorePointer，进度条节点始终留在树中；scrub setState 均加 mounted 守卫。
+- `flutter test test/player/seek_scrub_visibility_test.dart`：6 项测试全部通过。
+
+## 2026-10-22 推荐页播放跳转修正
+
+- 标题、剧名行和观看全集统一通过 `playDramaFromCatalog` 打开非 `homeMode` 逐集播放页。
+- 仅含集数的剧集标题不再显示在标题上方，集数只保留下方进度文案。
+- `flutter analyze`：No issues found。
+
+## 2026-10-22 推荐页横向切换
+
+- 推荐、剧单、全部短剧改为共享 PageController 的横向 PageView，点击与滑动均驱动同一选中态。
+- 三页使用 AutomaticKeepAliveClientMixin 保留视频、滚动位置和筛选状态；顶部导航固定在外层。
+- `flutter analyze`：No issues found。
+
+## 2026-10-22 全部短剧布局重排
+
+- 四行筛选统一 28 高、8 行距、24 项目间距；选中 chip 改为 `#4A1E1E`、白字 13/w600、圆角 14。
+- 最热/最新改为纯文字选中态，三横线筛选固定在右端；网格改为左右 12、列距 6、行距 12。
+- 第三行筛选完整展示，卡片继续复用首页组件；`flutter analyze`：No issues found。
+- 筛选项字号提升到 15、圆角 15；筛选区移出滚动容器并固定吸顶，下拉刷新仅作用于网格。
+- 四行首项文字统一到同一 x；行高 30、行距 6、项目距 12，第 4 行保持弹性空白后固定筛选图标。
+- 按最新截图改为 16sp、32 高、10 行距、16 项距；选中态为 `#21090E` 底配 `#FF4D6A` 粉字。
+- 第 4 行复用选中胶囊样式，右侧改为 44×44 圆形深灰按钮和 22 三横线图标；`flutter analyze` 无问题。
+- 筛选行距收紧到 6、项距 10，chip 左右 padding 12；四行均可横向回弹滑动。
+- 第 4 行仅最热/最新在滚动区内，44 圆形筛选按钮固定在滚动区外；`flutter analyze` 无问题。
+- 四行统一复用 `_filterRow` 构建，筛选区仅保留一层左右 12 padding。
+- 新增量化测试断言四行首项 x 均为 12、相邻 chip 间距均为 10；`flutter analyze` 无问题。
+- 修复横向 viewport 对短内容居中：滚动内容最小宽度撑满视口后由 Row.start 排列。
+- `flutter test test/recommend/all_dramas_filter_alignment_test.dart`：1 项测试通过。
+
+## 2026-10-22 首页二级标签移除筛选按钮
+
+- 首页二级标签行改为纯横向滑动，右侧三横线按钮不渲染也不占位。
+- 删除不再使用的筛选回调、尺寸 token、颜色和 CustomPainter；全部短剧页筛选按钮保持不变。
+- `flutter analyze`：No issues found。
+- 按后续更正恢复首页透明三横线按钮（26、无背景、`#7A7A7E`），删除全部短剧第 4 行圆形按钮及回调链路。
+
+## 2026-10-22 追剧页三列改造
+
+- 追剧页移除预约 tab，改为追剧/播放历史双页横向切换，并保留各自滚动位置。
+- 追剧与历史统一三列卡片，新增固定加号卡片，历史进度与编辑删除能力保留。
+- 按最新口径调整列距 6、行距 12、封面圆角 6；`flutter analyze`：No issues found。
+
+## 2026-10-22 播放历史单列列表
+
+- 追剧保持三列网格，播放历史改为左封面右信息的单列列表，行距 16。
+- 历史卡片补充 96×128 封面、观看进度、已看百分比、继续观看和编辑删除。
+- 追剧加号卡片移到全部追剧卡片之后，空列表时仍在左上角。
+- 加号改为 `#8E8E93`、28 尺寸、1.5 描边，卡片底色与圆角不变。
+- 刷新、分页与各页独立滚动位置保持；`flutter analyze`：No issues found。
+
+## 2026-10-22 追剧页切换与编辑按钮修正
+
+- 追剧与历史页增加 keep-alive，tab 与编辑态改用局部 ValueNotifier 更新，切换不再重建整个页面。
+- 编辑图标调整为 20、`#B0B0B0`，热区 40×40，保持右侧 14 边距和垂直居中。
+- 列表刷新期间保留已有数据与各页滚动位置；`flutter analyze`：No issues found。
+
+## 2026-10-22 播放历史继续观看按钮微调
+
+- 继续观看改为无边框、无底色的纯文字按钮，默认 `#B0B0B0`、12/w500，按压态使用品牌色。
+- 保持 28 高点击热区和右侧零间距；未执行测试或 analyze。
+
+## 2026-10-22 我的页渐变与图标网格
+
+- 页面背景改为暖黑三段纵向渐变，用户区与 VIP 卡布局保持不变。
+- 行式入口替换为 4 列图标网格，7 个原入口按顺序保留，第 8 格为空占位。
+- 网格使用 14 边距、半透明深灰底、圆角 12 和仅内部 1px 分隔线；`flutter analyze`：No issues found。
+- 渐变增强为 `#3A1B0E`/`#1A0C07`/黑色并叠加顶部品牌橙径向光晕，同时移除页面级「我的」标题栏。
+- 7 个宫格图标分别使用金币金、天蓝、薄荷绿、粉红、紫色、青色和冷灰；`flutter analyze`：No issues found。
+
+## 2026-10-22 我的页补充内容
+
+- VIP 与宫格之间新增继续观看横向列表、追剧/观看记录/金币统计面板，继续观看最多 10 条。
+- 宫格后新增常见问题与关于我们入口；关于页版本暂用与 pubspec 同步的常量占位。
+- 继续观看全部入口可切到追剧页播放历史 tab；`flutter analyze`：No issues found。
+- 用户区昵称与 UID 收紧为 4 间距，昵称列相对头像垂直居中；UID 12、复制图标 14。
+- UID 行改用 GestureDetector 并锁定 16 高，昵称与 UID 间距 2、昵称行高 1.15，避免 Material 热区撑高；`flutter analyze`：No issues found。
+
+## 2026-10-22 推荐剧单渐变背景
+
+- 仅为推荐页「剧单」子页增加暖黑三段渐变和品牌橙径向光晕，推荐视频与全部短剧背景不变。
+- 渐变复用「我的」页色值，光晕使用 `#26FF6B2C`；分区与卡片样式保持原样；`flutter analyze`：No issues found。
+
+## 2026-10-22 全站深色视觉统一
+
+- 全局 token 改为纯黑页面、`#16161A` 卡片、`#1C1C1E` 描边/分割线与 B0/8E 文本层级，旧深蓝页面渐变替换为暖黑渐变。
+- 普通二级页标题栏改为透明、白色标题与返回图标；统一卡片 12 圆角、1px 描边和无阴影策略。
+- 覆盖新剧、筛选、榜单、预约、收藏、观看历史、下载、设置、钱包、VIP、通知、详情、登录、关于；播放器沉浸区保持纯黑。
+- `flutter analyze`：No issues found。
+
+## 2026-10-22 统一下拉与加载指示器
+
+- 下拉刷新统一为 40×40、60% 黑底圆角指示器内嵌 20 白色加载圈，不再显示任何状态文字。
+- 网络分页与本地分页 footer 统一仅显示白色加载圈，无更多状态完全隐藏；通知页补触底自动加载。
+- 移除不再使用的刷新提示与无更多文案；`flutter analyze`：No issues found。
+
+## 2026-10-22 首页热播榜重做
+
+- 首页榜单 tab 改为独立领奖台 + 单列排行布局，不再复用三列网格。
+- 前三名按 2/1/3 排列，冠军放大并上移；第 4 名起使用大号描边名次与横向信息行。
+- 榜单沿用现有播放热度排序、分页和播放逻辑；`flutter analyze`：No issues found。
+
+## 2026-10-22 播放器双击点赞与飘心
+
+- 沉浸式播放器改用 onTapUp + 280ms Timer 判定双击，双击取消单击，长按左右倍速与中间更多保持不变。
+- 双击和右侧心形共用点赞方法，成功后控制器通知并点亮红色实心心形，失败由 controller 回滚并使用 Toast。
+- 飘心层使用独立 IgnorePointer Stack，动画完成后自动移除；`flutter analyze`：No issues found。
+- `flutter test test/player/double_tap_like_test.dart`：2 项测试全部通过。
+- 移除视频表面点击识别器，双击后增加 300ms 暂停防护；飘心收敛为 3~4 颗、20~26、±18、90~120dp、600~700ms。
+- 双击窗口延长至 320ms，单击 Timer 使用点击序号校验，双击后保留 350ms 播放切换保护。
+- `double_tap_like_test.dart` 覆盖 120/250/300ms 双击与 500ms 单击恢复：2 项测试全部通过。
+
+## 2026-10-22 统一二级搜索页
+
+- 首页与推荐/剧单/全部短剧搜索入口统一 push SearchPage，不再切换推荐 tab 聚焦。
+- 搜索页提供返回、自动聚焦输入框与取消，复用 `/app/search` 逻辑和首页三列卡片。
+- 清理旧的 searchRequest/focusSearch/syncSearch 参数；`flutter analyze`：No issues found。
+- 搜索页结果改为独立两列卡片，左右 14、列距 12、行距 16，并移除 HomeFeedCard 复用。
+- 搜索结果支持下拉刷新：保留旧结果按当前关键词重取第一页，空关键词直接回弹且不改变焦点。
+
+## 2026-10-22 App 图标与开屏更新
+
+- Launcher/Android 12 启动背景统一纯黑，自适应图标背景改为品牌橙。
+- Android/iOS 图标与启动资源已重新生成；应用内开屏固定 splash_logo，宽 200 等比居中。
+- `flutter analyze`：No issues found。
+- 移除 Flutter 内 `_startupSplash` 与 `startup-splash`，只保留系统原生开屏；最新斜体字标素材已重新生成。

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -38,7 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="1152" height="1152"/>
+        <image name="LaunchImage" width="1400" height="1400"/>
         <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>

ios/Runner/Info.plist

@@ -1,109 +1,111 @@
 <?xml version="1.0" encoding="UTF-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>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>FruitShorts</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>FruitShorts</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
 	<dict>
-		<key>NSAllowsArbitraryLoads</key>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
 		<true/>
-		<key>NSAllowsLocalNetworking</key>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>FruitShorts</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>FruitShorts</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
 		<true/>
-		<key>NSExceptionDomains</key>
+		<key>NSAppTransportSecurity</key>
 		<dict>
-			<key>127.0.0.1</key>
+			<key>NSAllowsArbitraryLoads</key>
+			<true/>
+			<key>NSAllowsLocalNetworking</key>
+			<true/>
+			<key>NSExceptionDomains</key>
 			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>192.168.31.187</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>39.162.50.99</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
-	<key>NSLocalNetworkUsageDescription</key>
-	<string>开发阶段需要访问同一局域网内的短剧内容服务。</string>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
+				<key>127.0.0.1</key>
 				<dict>
-					<key>UISceneClassName</key>
-					<string>UIWindowScene</string>
-					<key>UISceneConfigurationName</key>
-					<string>flutter</string>
-					<key>UISceneDelegateClassName</key>
-					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+					<key>NSIncludesSubdomains</key>
+					<true/>
 				</dict>
-			</array>
+				<key>localhost</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+					<key>NSIncludesSubdomains</key>
+					<true/>
+				</dict>
+				<key>192.168.31.187</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+					<key>NSIncludesSubdomains</key>
+					<true/>
+				</dict>
+				<key>39.162.50.99</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+					<key>NSIncludesSubdomains</key>
+					<true/>
+				</dict>
+			</dict>
 		</dict>
+		<key>NSLocalNetworkUsageDescription</key>
+		<string>开发阶段需要访问同一局域网内的短剧内容服务。</string>
+		<key>UIApplicationSceneManifest</key>
+		<dict>
+			<key>UIApplicationSupportsMultipleScenes</key>
+			<false/>
+			<key>UISceneConfigurations</key>
+			<dict>
+				<key>UIWindowSceneSessionRoleApplication</key>
+				<array>
+					<dict>
+						<key>UISceneClassName</key>
+						<string>UIWindowScene</string>
+						<key>UISceneConfigurationName</key>
+						<string>flutter</string>
+						<key>UISceneDelegateClassName</key>
+						<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
+						<key>UISceneStoryboardFile</key>
+						<string>Main</string>
+					</dict>
+				</array>
+			</dict>
+		</dict>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UIStatusBarHidden</key>
+		<false/>
 	</dict>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
 </plist>

lib/app.dart

@@ -53,13 +53,15 @@ import 'core/theme/app_colors.dart';
 import 'l10n/app_localizations.dart';
 import 'pages/home/home_view.dart';
 
-/// 全局系统栏样式：浅暖导航栏、关闭 Android 对比遮罩。
-final SystemUiOverlayStyle appSystemOverlayStyle = SystemUiOverlayStyle.dark
+/// 全局系统栏样式：深色底 + 浅色图标，关闭 Android 对比遮罩。
+final SystemUiOverlayStyle appSystemOverlayStyle = SystemUiOverlayStyle.light
     .copyWith(
-      statusBarColor: Colors.transparent,
+      statusBarColor: AppColors.transparent,
+      statusBarIconBrightness: Brightness.light,
+      statusBarBrightness: Brightness.dark,
       systemNavigationBarColor: AppColors.ink,
-      systemNavigationBarDividerColor: Colors.transparent,
-      systemNavigationBarIconBrightness: Brightness.dark,
+      systemNavigationBarDividerColor: AppColors.transparent,
+      systemNavigationBarIconBrightness: Brightness.light,
       systemNavigationBarContrastEnforced: false,
     );
 
@@ -280,9 +282,9 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
           localeResolutionCallback: (deviceLocale, _) =>
               resolveAppLocale(deviceLocale),
           debugShowCheckedModeBanner: false,
-          themeMode: ThemeMode.light,
-          theme: AppTheme.light(),
-          darkTheme: AppTheme.light(),
+          themeMode: ThemeMode.dark,
+          theme: AppTheme.dark(),
+          darkTheme: AppTheme.dark(),
           builder: (context, child) => AnnotatedRegion<SystemUiOverlayStyle>(
             value: appSystemOverlayStyle,
             child: child ?? const SizedBox.shrink(),

lib/core/data/models/drama.dart

@@ -86,6 +86,8 @@ class Drama {
     this.favoriteCount,
     this.commentCount,
     this.language = '',
+    this.dramaType = '',
+    this.createdAt,
     this.detailLoaded = false,
   });
 
@@ -109,6 +111,12 @@ class Drama {
   /// 卡片语种（如 zh-CN / id），用于剧场语言筛选。
   final String language;
 
+  /// 内容类型：ANIME 漫剧，LIVE 真人剧。
+  final String dramaType;
+
+  /// 上架时间；卡片接口未直接下发时可由 Snowflake id 估算。
+  final DateTime? createdAt;
+
   /// 详情接口是否已经取过完整剧集列表。
   /// 列表卡片只带一集可播预览，需要完整剧集时再进详情。
   final bool detailLoaded;
@@ -137,6 +145,8 @@ class Drama {
       favoriteCount: _optionalInt(json['favoriteCount']),
       commentCount: _optionalInt(json['commentCount']),
       language: json['language'] as String? ?? '',
+      dramaType: json['dramaType'] as String? ?? '',
+      createdAt: DateTime.tryParse(json['createdAt']?.toString() ?? ''),
     );
   }
 
@@ -157,6 +167,8 @@ class Drama {
       favoriteCount: _optionalInt(json['favoriteCount']),
       commentCount: _optionalInt(json['commentCount']),
       language: json['language'] as String? ?? '',
+      dramaType: json['dramaType'] as String? ?? '',
+      createdAt: DateTime.tryParse(json['createdAt']?.toString() ?? ''),
       detailLoaded: true,
       episodes: (json['episodes'] as List? ?? const [])
           .whereType<Map<String, dynamic>>()

lib/core/data/remote/watch_api.dart

@@ -40,7 +40,7 @@ class WatchApi {
     return data is Map<String, dynamic> ? WatchProgress.fromJson(data) : null;
   }
 
-  /// 最近观看分页（服务端已按更新时间倒序）。
+  /// 最近观看分页：`pageIndex`/`pageSize`，解包 `PageResult`。
   Future<PageResult<WatchProgress>> recent({
     int pageIndex = 1,
     int pageSize = 20,
@@ -49,8 +49,13 @@ class WatchApi {
       '/app/watch/recent',
       query: {'pageIndex': '$pageIndex', 'pageSize': '$pageSize'},
     );
-    // 线上可能仍返回 List；分页壳与纯数组都要能渲染。
-    return PageResult.parse(data, WatchProgress.fromJson);
+    if (data is! Map) {
+      return const PageResult();
+    }
+    return PageResult.fromJson(
+      Map<String, dynamic>.from(data),
+      WatchProgress.fromJson,
+    );
   }
 
   /// 删除某部剧的观看记录（记录页清单条用）。

lib/core/data/services/home_feed_controller.dart

@@ -18,7 +18,7 @@ class HomeFeedController extends ChangeNotifier {
            channel: _ChannelFeedState(),
        };
 
-  static const int pageSize = 10;
+  static const int pageSize = 20;
   static const Duration defaultRequestTimeout = Duration(seconds: 10);
 
   final CatalogRepository _repository;

lib/core/formatting/count_format.dart

@@ -7,3 +7,11 @@ String formatInteractionCount(int count) {
   if (count < 10000) return '$count';
   return '${(count / 10000).toStringAsFixed(1)}万';
 }
+
+/// 播放量展示：以 w 为单位，整数不保留小数，非整数保留一位。
+String formatPlayCount(int count) {
+  if (count < 10000) return '$count';
+  final value = count / 10000;
+  if (value == value.roundToDouble()) return '${value.toInt()}w';
+  return '${value.toStringAsFixed(1)}w';
+}

lib/core/theme/app_colors.dart

@@ -2,106 +2,209 @@
 
 import 'package:flutter/material.dart';
 
-/// K28-S 浅色暖橙主题色板。
+/// 深色视觉色板。
 ///
 /// 保留既有语义名，避免页面大范围改名；实际颜色统一由本文件控制。
 abstract final class AppColors {
-  /// 主操作、选中态、播放进度。
-  static const blue = Color(0xFFFF7A1A);
+  /// 透明与媒体黑底。
+  static const transparent = Colors.transparent;
+  static const mediaBlack = Color(0xFF000000);
+
+  /// 阴影与遮罩层级。
+  static const shadowSubtle = Color(0x14000000);
+  static const shadowSoft = Color(0x33000000);
+  static const shadow = Color(0x8A000000);
+  static const shadowStrong = Color(0xE6000000);
+  static const scrim = Color(0xD1000000);
+  static const controlScrim = Color(0x80000000);
+  static const controlSoftScrim = Color(0x42000000);
+  static const timeBubbleScrim = Color(0xB3000000);
+  static const scrubPreviewScrim = Color(0xDE000000);
+  static const overlaySoft = Color(0x66000000);
+  static const overlayBar = Color(0x4D000000);
+  static const overlayMedium = Color(0x99000000);
+  static const headerScrim = Color(0x59000000);
+  static const overlaySecondary = Color(0xFFC7C7CC);
+  static const overlayLabel = Color(0xFFE6E6EB);
+
+  /// 主操作、选中态、播放进度（品牌橙）。
+  static const blue = Color(0xFFFF6B2C);
   static const primary = blue;
+  static const actionRed = Color(0xFFFF3B30);
 
   /// 主操作按下态。
-  static const bluePressed = Color(0xFFFF6A00);
+  static const bluePressed = Color(0xFFE55A1F);
 
-  /// 粉色辅助强调色。
-  static const blueSoft = Color(0xFFFF6A8A);
+  /// 链接与次要高亮：统一改用中性浅灰，避免旧青色残留。
+  static const blueSoft = Color(0xFFB0B0B0);
   static const secondary = blueSoft;
   static const lavender = blueSoft;
 
   /// 金币与奖励。
   static const gold = Color(0xFFF3B34C);
+  static const goldDeep = Color(0xFFD9A23A);
+  static const homeCrownGold = Color(0xFFF5C451);
+  static const homeGiftPink = Color(0xFFFF4D8D);
+  static const vipGoldStart = Color(0xFFF5D9A0);
+  static const vipGoldEnd = Color(0xFFE8B65A);
+  static const vipBadgeSurface = Color(0x1F3D2408);
+  static const bronze = Color(0xFFCD7F32);
+  static const bronzeDeep = Color(0xFFA9713A);
+  static const rankSilver = Color(0xFFC0C0C0);
 
   /// 成功状态。
   static const success = Color(0xFF2FA873);
 
-  /// 收藏和喜欢使用粉色强调。
-  static const favorite = secondary;
+  /// 错误与危险操作。
+  static const error = Color(0xFFFF6B6B);
+
+  /// 收藏与喜欢（非主色铺色，独立强调）。
+  static const favorite = Color(0xFFFF6A8A);
+  static const doubleTapHeartRed = Color(0xFFFF4D6D);
+  static const doubleTapHeartPink = Color(0xFFFF7A9A);
 
   /// 金币底色上的文字。
-  static const onGold = Color(0xFF5A3511);
+  static const onGold = Color(0xFF3D2408);
 
   /// 主色上的文字与图标。
   static const onPrimary = Color(0xFFFFFFFF);
 
   /// 页面背景。
-  static const ink = Color(0xFFFFF8F0);
+  static const ink = Color(0xFF000000);
+
+  /// 首页/追剧/我的统一的纯黑内容背景。
+  static const appBackground = Color(0xFF000000);
+
+  /// 中性深灰卡片与控件表面。
+  static const contentCard = Color(0xFF16161A);
+  static const contentSurface = Color(0xFF1C1C1E);
+  static const skeletonSurface = Color(0xFF141414);
+  static const contentChip = Color(0xFF2C2C2E);
+  static const contentBorder = Color(0x1AFFFFFF);
+  static const filterChipSelected = Color(0xFF21090E);
+  static const filterChipTextSelected = Color(0xFFFF4D6A);
+  static const filterChipTextInactive = Color(0xFF8A8A8A);
+
+  /// 「我的」页卡片与描边。
+  static const mineCard = Color(0xFF16161A);
+  static const mineOutline = Color(0xFF4A4A4A);
+  static const mineGradientTop = Color(0xFF3A1B0E);
+  static const mineGradientMiddle = Color(0xFF1A0C07);
+  static const mineGradientBottom = Color(0xFF000000);
+  static const mineGradientGlow = Color(0x33FF6B2C);
+  static const mineGridSurface = Color(0x99101010);
+  static const minePanelSurface = Color(0xFF101010);
+  static const mineMoreDivider = Color(0xFF1C1C1E);
+  static const mineGridDivider = Color(0xFF2A2A2A);
+  static const mineGridIconSurface = Color(0xFF1C1C1E);
+  static const mineGridLabel = Color(0xFFE6E6EB);
+  static const mineIconWallet = Color(0xFFF5C451);
+  static const mineIconDownloads = Color(0xFF4DA3FF);
+  static const mineIconHistory = Color(0xFF4ADE80);
+  static const mineIconPreferences = Color(0xFFFF6B9A);
+  static const mineIconSupport = Color(0xFFA78BFA);
+  static const mineIconLanguage = Color(0xFF22D3EE);
+  static const mineIconSettings = Color(0xFFA1A1AA);
+  static const recommendPlaylistGlow = Color(0x26FF6B2C);
+
+  /// 次级文字与列表 chevron。
+  static const textPrimary = Color(0xFFFFFFFF);
+  static const textSecondary = Color(0xFFB0B0B0);
+  static const textTertiary = Color(0xFF8E8E93);
+  static const textTabInactive = Color(0xFFB0B0B0);
+  static const textFilterIcon = Color(0xFF7A7A7E);
+  static const searchResultMeta = Color(0xFF9E9E9E);
 
   /// 原生开屏与冷启动过渡底色。
-  static const splashInk = Color(0xFF1F1B16);
+  static const splashInk = ink;
 
-  /// 页面顶部暖色渐变起点。
-  static const surfaceTop = Color(0xFFFFE9D6);
+  /// 页面顶部暖黑色，渐变底部仍收口到纯黑。
+  static const surfaceTop = mineGradientTop;
 
   /// 底部导航底色。
-  static const bar = Color(0xFFFFFDFB);
+  static const bar = ink;
 
-  /// 卡片轻阴影。
-  static const cardShadow = Color(0x14FF8A3D);
+  /// 底部导航专用：纯黑背景、选中白与未选中灰。
+  static const navBackground = Color(0xFF000000);
+  static const navSelected = Color(0xFFFFFFFF);
 
-  /// 卡片与弹层。
-  static const card = Color(0xFFFFFFFF);
+  /// 卡片阴影（深色几乎不用阴影）。
+  static const cardShadow = Color(0x00000000);
+
+  /// 卡片与列表容器。
+  static const card = Color(0xFF16161A);
 
   /// 次要卡片表面。
-  static const cardAlt = Color(0xFFFFF4E9);
+  static const cardAlt = Color(0xFF101010);
 
-  /// 浮层、输入框和嵌套区域。
-  static const raised = Color(0xFFFFF1E5);
-  static const quick = Color(0xFFFFF0E1);
-  static const input = Color(0xFFFFF4EA);
+  /// 浮层、弹窗、输入与嵌套区域。
+  static const raised = Color(0xFF1C1C1E);
+  static const quick = raised;
+  static const input = raised;
 
   /// 评论输入框底色。
-  static const commentInput = Color(0xFFF5EFE8);
-  static const goldCard = Color(0xFFFFF4DF);
+  static const commentInput = raised;
+  static const goldCard = Color(0xFF2A2418);
 
-  /// 正文颜色。
-  static const cream = Color(0xFF1F1B16);
+  /// 正文颜色（与主文字同级）。
+  static const cream = Color(0xEBFFFFFF);
 
-  /// 主文字。
-  static const onSurface = Color(0xFF1F1B16);
+  /// 主文字 rgba(255,255,255,0.92)。
+  static const onSurface = Color(0xEBFFFFFF);
 
-  /// 次要文字。
-  static const muted = Color(0xFF8C837B);
+  /// 次要文字 rgba(255,255,255,0.64)。
+  static const muted = Color(0xA3FFFFFF);
 
-  /// 弱提示与时间。
-  static const subtle = Color(0xFFB3AAA1);
+  /// 弱提示与禁用 rgba(255,255,255,0.38)。
+  static const subtle = Color(0x61FFFFFF);
 
   /// 橙色强调文案。
   static const accent = blue;
 
-  /// 卡片描边。
-  static const border = Color(0xFFF0E4D6);
+  /// 统一卡片描边、分割线与输入框边框。
+  static const border = Color(0xFF1C1C1E);
 
   /// 玻璃面板描边。
-  static const glassBorder = Color(0x66FFFFFF);
+  static const glassBorder = Color(0x33FFFFFF);
+  static const glassSurfaceStart = Color(0xEB16161A);
+  static const glassSurfaceEnd = Color(0xD1101010);
 
-  /// 粉色角标。
-  static const badgePink = Color(0xFFFFE3EC);
-  static const badgePinkText = Color(0xFFFF6A8A);
+  /// 角标底与文字。
+  static const badgePink = Color(0x33FF6A8A);
+  static const badgePinkText = favorite;
 
   /// 封面锁定数量与视频遮罩。
-  static const overlayDark = Color(0x33000000);
+  static const overlayDark = Color(0x66000000);
 
   /// 封面集数胶囊。
-  static const badgeBeige = Color(0xFFFFF0DF);
+  static const badgeBeige = raised;
 
   /// 导航未选中。
-  static const navUnselected = muted;
+  static const navUnselected = textSecondary;
+
+  /// 首页内容角标。
+  static const badgeHot = Color(0xFFE5484D);
+  static const badgeNew = Color(0xFF3B82F6);
+  static const badgeAnime = Color(0xFF8B5CF6);
 
   /// 播放器次要文字。
-  static const playerMuted = Color(0xFFBBBBBB);
+  static const playerMuted = Color(0xA3FFFFFF);
 
   /// 播放器控件胶囊与圆形底色。
   static const playerOverlayPill = Color(0xB3000000);
+  static const refreshIndicatorSurface = Color(0x99000000);
+  static const cardBottomScrimStart = Color(0x00000000);
+  static const cardBottomScrimEnd = Color(0x40000000);
+
+  /// 进度条未激活轨道。
+  static const inactiveTrack = Color(0x24FFFFFF);
+
+  /// 横幅/封面底部渐变。
+  static const bannerScrimMid = Color(0x8A1A0C07);
+  static const bannerScrimEnd = Color(0xE6000000);
+
+  /// 票券虚线等主色描边。
+  static const primaryBorder = Color(0x66FF6B2C);
 
   static const outlineDark = border;
   static const outlineVariantDark = border;

lib/core/theme/app_dimens.dart

@@ -9,18 +9,20 @@ abstract final class AppDimens {
   static const double spaceXl = 24;
 
   static const double pageHorizontal = 16;
-  static const double cardRadius = 16;
-  static const double authCardRadius = 20;
+  static const double cardRadius = 12;
+  static const double authCardRadius = 12;
   static const double cardPadding = 16;
-  static const double innerRadius = 12;
+  static const double innerRadius = 10;
   static const double innerPadding = 12;
   static const double pillRadius = 999;
-  static const double glassSmallRadius = 16;
-  static const double glassRadius = 20;
-  static const double glassCardRadius = 20;
-  static const double buttonRadius = 999;
-  static const double coverRadius = 16;
-  static const double sheetRadius = 20;
+  static const double glassSmallRadius = 12;
+  static const double glassRadius = 12;
+  static const double glassCardRadius = 12;
+  static const double buttonRadius = 10;
+  static const double inputRadius = 10;
+  static const double chipRadius = 6;
+  static const double coverRadius = 12;
+  static const double sheetRadius = 12;
 
   static const double caption = 12;
   static const double emptyStateSubtitle = 12.5;
@@ -34,7 +36,8 @@ abstract final class AppDimens {
   static const double previewCardTitle = 13;
   static const double previewSectionTitle = 14;
   static const double chipFont = 10;
-  static const double navLabel = 12;
+  static const double navLabel = 13;
+  static const double navLabelGap = 5;
 
   static const double buttonHeight = 48;
   static const double primaryButtonHeight = 52;
@@ -45,13 +48,26 @@ abstract final class AppDimens {
   static const double tapTarget = 44;
   static const double contentHeaderHeight = 46;
 
-  static const double navHeight = 68;
-  static const double navIcon = 24;
+  static const double navHeight = 62;
+  static const double navIcon = 30;
   static const double progressHeight = 3;
   static const double progressRadius = 2;
   static const double progressLineHeight = 3;
+  static const double refreshIndicatorSize = 40;
+  static const double refreshIndicatorRadius = 20;
+  static const double refreshSpinnerSize = 20;
+  static const double refreshSpinnerStroke = 2;
+  static const double loadMoreIndicatorHeight = 40;
 
-  static const double searchHeight = 44;
+  static const double searchHeight = 40;
+  static const double searchRadius = 8;
+  static const double searchPlaceholderFont = 13;
+  static const double searchResultGap = 12;
+  static const double searchResultRowGap = 16;
+  static const double searchResultTitleGap = 8;
+  static const double searchResultMetaGap = 6;
+  static const double searchResultMetaFont = 12;
+  static const double searchResultTextExtent = 68;
   static const double navDot = 3;
   static const double glassBlur = 24;
 
@@ -61,13 +77,164 @@ abstract final class AppDimens {
 
   static const double watchPlaceholderHeight = 114;
   static const double heroBannerHeight = 240;
-  static const double heroBannerRadius = 20;
+  static const double heroBannerRadius = 12;
   static const double heroTitle = 28;
   static const double heroSubtitle = 14;
 
   static const double cardMeta = 12;
   static const double cardViews = 11;
   static const double cardTitle = 15;
-  static const double cardShadowBlur = 18;
-  static const double cardShadowY = 6;
+  static const double cardShadowBlur = 0;
+  static const double cardShadowY = 0;
+
+  /// 首页探索网格。
+  static const double feedPageHorizontal = 14;
+  static const double homeGridGap = 6;
+  static const double homeGridRowGap = 10;
+  static const double homeCardRadius = 6;
+  static const double cardCoverRadius = 8;
+  static const double homeCardPadding = 8;
+  static const double cardTitleFont = 15;
+  static const double cardTitleLineHeight = 1.3;
+  static const double cardViewsFont = 11;
+  static const double cardViewsIcon = 11;
+  static const double cardPlayCountFont = 12;
+  static const double cardPlayCountGap = 4;
+  static const double cardPlayCountBottom = 2;
+  static const double cardPlayCountRight = 6;
+  static const double cardPlayCountScrimHeight = 32;
+  static const double cardGenreRibbonHeight = 16;
+  static const double cardGenreRibbonLeftInset = 4;
+  static const double coverBadgeRibbonHorizontalPadding = 4;
+  static const double cardTagFont = 11;
+  static const double cardBadgeFont = 9;
+  static const double cardCoverTitleGap = 6;
+  static const double cardTitleTagGap = 6;
+  static const double skeletonBarHeight = 10;
+  static const double skeletonBarRadius = 4;
+  static const double skeletonBarGap = 4;
+  static const double skeletonTitleBarGap = 3;
+  static const double skeletonBodyExtent = 34;
+  static const double cardCoverAspectRatio = 3 / 4;
+  static const double homeCardBodyExtent = 84;
+  static const double homePrimaryTabFont = 18;
+  static const double homePrimaryTabSelectedFont = 20;
+  static const double homePrimaryRowHeight = 30;
+  static const Duration homePrimaryTabAnimationDuration = Duration(
+    milliseconds: 180,
+  );
+  static const double homeSecondaryTagFont = 15;
+  static const double homeSecondaryTagHeight = 26;
+  static const double homeSecondaryTagHorizontalPadding = 8;
+  static const double homeSecondaryTagRadius = 13;
+  static const Duration homeSecondaryTagAnimationDuration = Duration(
+    milliseconds: 150,
+  );
+  static const double homeSecondaryFilterGap = 6;
+  static const double homeSecondaryFilterVisualSize = 26;
+  static const double homeSecondaryFilterIcon = 16;
+  static const double homeSecondaryFilterStroke = 1.7;
+  static const double homePrimaryCategoryGap = 24;
+  static const double homeSecondaryTagGap = 10;
+  static const double homeSearchTopGap = 0;
+  static const double homeSearchPrimaryGap = 8;
+  static const double homePrimarySecondaryGap = 8;
+  static const double homeSecondaryGridGap = 10;
+  static const double homeHeaderIcon = 22;
+  static const double homeActionSlot = 40;
+  static const double homeActionIcon = 30;
+  static const double homeActionGap = 6;
+
+  /// 推荐分区。
+  static const double recommendSectionTitle = 17;
+  static const double recommendSectionSubtitle = 11;
+  static const double recommendSectionMore = 12;
+  static const double recommendRowHeight = 252;
+  static const double recommendCardWidth = 122;
+
+  /// 首页热播榜。
+  static const double rankingHeroTitle = 22;
+  static const double rankingHeroSubtitle = 11;
+  static const double rankingPodiumChampionWidth = 110;
+  static const double rankingPodiumChampionHeight = 146;
+  static const double rankingPodiumWidth = 92;
+  static const double rankingPodiumHeight = 122;
+  static const double rankingPodiumRadius = 10;
+  static const double rankingRowHeight = 96;
+  static const double rankingNumberWidth = 56;
+  static const double rankingNumberFont = 48;
+  static const double rankingCoverWidth = 60;
+  static const double rankingCoverHeight = 80;
+  static const double rankingCoverRadius = 6;
+
+  /// 全部短剧筛选与追剧双列。
+  static const double filterChipFont = 16;
+  static const double filterChipHeight = 32;
+  static const double filterChipRadius = 16;
+  static const double filterChipHorizontalPadding = 12;
+  static const double filterRowGap = 6;
+  static const double filterItemGap = 10;
+  static const double allDramasHorizontal = 12;
+  static const double allDramasGridGap = 6;
+  static const double allDramasGridRowGap = 12;
+  static const double allDramasFilterToGridGap = 12;
+  static const double followingHeaderHeight = 52;
+  static const double followingTabFont = 18;
+  static const double followingTabGap = 24;
+  static const double followingEditIconSize = 20;
+  static const double followingEditHitSize = 40;
+  static const double followingAddIconSize = 28;
+  static const double followingAddIconStroke = 1.5;
+  static const double followingGridGap = 6;
+  static const double followingGridRowGap = 12;
+  static const double followingCardTextExtent = 66;
+  static const double followingSubtitleFont = 12;
+  static const double followingSubtitleGap = 4;
+  static const double followingProgressHeight = 2;
+  static const double followingHistoryCoverWidth = 96;
+  static const double followingHistoryCoverHeight = 128;
+  static const double followingHistoryCoverRadius = 6;
+  static const double followingHistoryContentGap = 12;
+  static const double followingHistoryRowGap = 16;
+  static const double followingHistoryProgressHeight = 3;
+  static const double followingHistoryProgressRadius = 2;
+  static const double followingHistoryProgressGap = 8;
+  static const double followingHistoryLabelGap = 4;
+  static const double followingHistoryActionHeight = 28;
+  static const Duration followingTabAnimationDuration = Duration(
+    milliseconds: 180,
+  );
+  static const Duration followingPageAnimationDuration = Duration(
+    milliseconds: 220,
+  );
+
+  /// 「我的」页中性视觉。
+  static const double mineCardRadius = 16;
+  static const double mineSectionTitle = 15;
+  static const double mineAvatar = 56;
+  static const double mineUserName = 20;
+  static const double mineUserNameLineHeight = 1.15;
+  static const double mineUserNameUidGap = 2;
+  static const double mineUid = 12;
+  static const double mineUidRowHeight = 16;
+  static const double mineCopyIcon = 14;
+  static const double mineGridHorizontal = 14;
+  static const double mineGridRadius = 12;
+  static const double mineGridCellHeight = 96;
+  static const double mineGridIconSurface = 44;
+  static const double mineGridIcon = 22;
+  static const double mineGridLabel = 12;
+  static const double mineGridDividerWidth = 1;
+  static const double mineSectionTitleFont = 16;
+  static const double mineSectionLinkFont = 12;
+  static const double mineSectionGap = 20;
+  static const double mineContinueCardWidth = 96;
+  static const double mineContinueRowHeight = 168;
+  static const double mineContinueTitleFont = 13;
+  static const double mineContinueMetaFont = 11;
+  static const double mineStatsValueFont = 18;
+  static const double mineStatsLabelFont = 11;
+  static const double minePanelPadding = 12;
+  static const double mineMoreRowHeight = 52;
+  static const double mineMoreFont = 15;
 }

lib/core/theme/app_theme.dart

@@ -6,46 +6,64 @@ import 'package:flutter/services.dart';
 import 'app_colors.dart';
 import 'app_dimens.dart';
 
-/// K28-S 浅色暖橙主题。
+/// 深色视觉主题（默认且唯一）。
 abstract final class AppTheme {
-  /// 页面顶部暖色到米白背景的渐变。
+  /// 页面背景：顶部暖黑、底部纯黑，避免旧深蓝渐变。
   static const LinearGradient pageGradient = LinearGradient(
     begin: Alignment.topCenter,
     end: Alignment.bottomCenter,
-    colors: [AppColors.surfaceTop, AppColors.ink],
-    stops: [0, 0.24],
+    colors: [
+      AppColors.mineGradientTop,
+      AppColors.mineGradientMiddle,
+      AppColors.mineGradientBottom,
+    ],
+    stops: [0, 0.4, 0.75],
   );
 
-  /// 卡片轻阴影。
+  /// 卡片阴影关闭，改用底色与分割线。
   static const BoxShadow cardShadow = BoxShadow(
     color: AppColors.cardShadow,
     blurRadius: AppDimens.cardShadowBlur,
     offset: Offset(0, AppDimens.cardShadowY),
   );
 
-  /// 全局浅色暖橙主题。
-  static ThemeData light() {
-    const scheme = ColorScheme.light(
+  static final BorderRadius _buttonRadius = BorderRadius.circular(
+    AppDimens.buttonRadius,
+  );
+  static final BorderRadius _cardRadius = BorderRadius.circular(
+    AppDimens.cardRadius,
+  );
+  static final BorderRadius _inputRadius = BorderRadius.circular(
+    AppDimens.inputRadius,
+  );
+
+  /// 全局深色主题。
+  static ThemeData dark() {
+    const scheme = ColorScheme.dark(
       primary: AppColors.blue,
       onPrimary: AppColors.onPrimary,
       secondary: AppColors.secondary,
-      onSecondary: AppColors.onPrimary,
-      primaryContainer: AppColors.surfaceTop,
+      onSecondary: AppColors.ink,
+      primaryContainer: AppColors.raised,
       onPrimaryContainer: AppColors.onSurface,
       secondaryContainer: AppColors.badgePink,
       onSecondaryContainer: AppColors.badgePinkText,
       surface: AppColors.ink,
       onSurface: AppColors.onSurface,
+      surfaceContainerHighest: AppColors.raised,
       outline: AppColors.border,
       outlineVariant: AppColors.border,
-      surfaceTint: AppColors.blue,
+      surfaceTint: AppColors.transparent,
       inversePrimary: AppColors.bluePressed,
+      error: AppColors.error,
+      onError: AppColors.onPrimary,
     );
     final base = ThemeData(
       useMaterial3: true,
-      brightness: Brightness.light,
+      brightness: Brightness.dark,
       colorScheme: scheme,
       scaffoldBackgroundColor: AppColors.ink,
+      canvasColor: AppColors.ink,
       fontFamily: 'PlusJakartaSans',
       progressIndicatorTheme: const ProgressIndicatorThemeData(
         color: AppColors.blue,
@@ -61,7 +79,23 @@ abstract final class AppTheme {
         unselectedLabelColor: AppColors.muted,
       ),
       textButtonTheme: TextButtonThemeData(
-        style: TextButton.styleFrom(foregroundColor: AppColors.blue),
+        style: TextButton.styleFrom(
+          foregroundColor: AppColors.primary,
+          shape: RoundedRectangleBorder(borderRadius: _buttonRadius),
+        ),
+      ),
+      elevatedButtonTheme: ElevatedButtonThemeData(
+        style: ButtonStyle(
+          backgroundColor: WidgetStateProperty.resolveWith(_buttonColor),
+          foregroundColor: const WidgetStatePropertyAll(AppColors.onPrimary),
+          elevation: const WidgetStatePropertyAll(0),
+          minimumSize: const WidgetStatePropertyAll(
+            Size(0, AppDimens.buttonHeight),
+          ),
+          shape: WidgetStatePropertyAll(
+            RoundedRectangleBorder(borderRadius: _buttonRadius),
+          ),
+        ),
       ),
       filledButtonTheme: FilledButtonThemeData(
         style: ButtonStyle(
@@ -70,47 +104,109 @@ abstract final class AppTheme {
           minimumSize: const WidgetStatePropertyAll(
             Size(0, AppDimens.buttonHeight),
           ),
-          shape: const WidgetStatePropertyAll(StadiumBorder()),
+          shape: WidgetStatePropertyAll(
+            RoundedRectangleBorder(borderRadius: _buttonRadius),
+          ),
         ),
       ),
       outlinedButtonTheme: OutlinedButtonThemeData(
         style: ButtonStyle(
-          foregroundColor: const WidgetStatePropertyAll(AppColors.blue),
+          foregroundColor: const WidgetStatePropertyAll(AppColors.textPrimary),
           minimumSize: const WidgetStatePropertyAll(
             Size(0, AppDimens.buttonHeight),
           ),
           side: const WidgetStatePropertyAll(
-            BorderSide(color: AppColors.border),
+            BorderSide(color: AppColors.mineOutline),
           ),
-          shape: const WidgetStatePropertyAll(StadiumBorder()),
+          shape: WidgetStatePropertyAll(
+            RoundedRectangleBorder(borderRadius: _buttonRadius),
+          ),
+        ),
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        filled: true,
+        fillColor: AppColors.input,
+        hintStyle: const TextStyle(color: AppColors.subtle),
+        labelStyle: const TextStyle(color: AppColors.muted),
+        border: OutlineInputBorder(
+          borderRadius: _inputRadius,
+          borderSide: const BorderSide(color: AppColors.border),
+        ),
+        enabledBorder: OutlineInputBorder(
+          borderRadius: _inputRadius,
+          borderSide: const BorderSide(color: AppColors.border),
+        ),
+        focusedBorder: OutlineInputBorder(
+          borderRadius: _inputRadius,
+          borderSide: const BorderSide(color: AppColors.blue),
+        ),
+      ),
+      chipTheme: ChipThemeData(
+        backgroundColor: AppColors.raised,
+        selectedColor: AppColors.blue.withValues(alpha: 0.22),
+        labelStyle: const TextStyle(color: AppColors.onSurface),
+        secondaryLabelStyle: const TextStyle(color: AppColors.muted),
+        side: const BorderSide(color: AppColors.border),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(AppDimens.chipRadius),
         ),
       ),
       appBarTheme: const AppBarTheme(
-        backgroundColor: AppColors.ink,
-        foregroundColor: AppColors.onSurface,
+        backgroundColor: AppColors.transparent,
+        foregroundColor: AppColors.textPrimary,
         elevation: 0,
-        systemOverlayStyle: SystemUiOverlayStyle.dark,
+        scrolledUnderElevation: 0,
+        surfaceTintColor: AppColors.transparent,
+        systemOverlayStyle: SystemUiOverlayStyle.light,
         titleTextStyle: TextStyle(
-          color: AppColors.onSurface,
+          color: AppColors.textPrimary,
           fontFamily: 'Outfit',
           fontSize: AppDimens.pageTitle,
           fontWeight: FontWeight.w800,
         ),
       ),
-      iconTheme: const IconThemeData(color: AppColors.onSurface),
-      dividerTheme: const DividerThemeData(color: AppColors.border),
-      cardTheme: const CardThemeData(
+      iconTheme: const IconThemeData(color: AppColors.textPrimary),
+      dividerTheme: const DividerThemeData(
+        color: AppColors.border,
+        thickness: 1,
+        space: 1,
+      ),
+      cardTheme: CardThemeData(
         color: AppColors.card,
         elevation: 0,
+        shadowColor: AppColors.transparent,
+        surfaceTintColor: AppColors.transparent,
         shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(AppDimens.cardRadius)),
-          side: BorderSide(color: AppColors.border),
+          borderRadius: _cardRadius,
+          side: const BorderSide(color: AppColors.border),
         ),
       ),
+      dialogTheme: DialogThemeData(
+        backgroundColor: AppColors.raised,
+        surfaceTintColor: AppColors.transparent,
+        shape: RoundedRectangleBorder(borderRadius: _cardRadius),
+        titleTextStyle: const TextStyle(
+          color: AppColors.onSurface,
+          fontFamily: 'Outfit',
+          fontSize: AppDimens.sectionTitle,
+          fontWeight: FontWeight.w700,
+        ),
+        contentTextStyle: const TextStyle(
+          color: AppColors.muted,
+          fontSize: AppDimens.body,
+        ),
+      ),
+      bottomNavigationBarTheme: const BottomNavigationBarThemeData(
+        backgroundColor: AppColors.navBackground,
+        selectedItemColor: AppColors.navSelected,
+        unselectedItemColor: AppColors.navUnselected,
+        elevation: 0,
+        type: BottomNavigationBarType.fixed,
+      ),
       bottomSheetTheme: const BottomSheetThemeData(
-        backgroundColor: Colors.transparent,
-        modalBackgroundColor: Colors.transparent,
-        surfaceTintColor: Colors.transparent,
+        backgroundColor: AppColors.transparent,
+        modalBackgroundColor: AppColors.transparent,
+        surfaceTintColor: AppColors.transparent,
       ),
       switchTheme: SwitchThemeData(
         thumbColor: WidgetStateProperty.resolveWith(
@@ -124,8 +220,13 @@ abstract final class AppTheme {
         ),
       ),
       snackBarTheme: const SnackBarThemeData(
-        backgroundColor: AppColors.onSurface,
-        contentTextStyle: TextStyle(color: AppColors.onPrimary),
+        backgroundColor: AppColors.raised,
+        contentTextStyle: TextStyle(color: AppColors.onSurface),
+        actionTextColor: AppColors.secondary,
+      ),
+      listTileTheme: const ListTileThemeData(
+        iconColor: AppColors.onSurface,
+        textColor: AppColors.onSurface,
       ),
     );
     final textTheme = base.textTheme
@@ -142,10 +243,29 @@ abstract final class AppTheme {
           headlineMedium: _display(base.textTheme.headlineMedium),
           headlineSmall: _display(base.textTheme.headlineSmall),
           titleLarge: _display(base.textTheme.titleLarge),
+          bodyLarge: base.textTheme.bodyLarge?.copyWith(
+            color: AppColors.onSurface,
+          ),
+          bodyMedium: base.textTheme.bodyMedium?.copyWith(
+            color: AppColors.onSurface,
+          ),
+          bodySmall: base.textTheme.bodySmall?.copyWith(color: AppColors.muted),
+          labelLarge: base.textTheme.labelLarge?.copyWith(
+            color: AppColors.onSurface,
+          ),
+          labelMedium: base.textTheme.labelMedium?.copyWith(
+            color: AppColors.muted,
+          ),
+          labelSmall: base.textTheme.labelSmall?.copyWith(
+            color: AppColors.subtle,
+          ),
         );
     return base.copyWith(textTheme: textTheme);
   }
 
+  /// 兼容旧调用点，统一落到深色主题。
+  static ThemeData light() => dark();
+
   static TextStyle? _display(TextStyle? style) =>
       style?.copyWith(fontFamily: 'Outfit', color: AppColors.onSurface);
 

lib/core/widgets/app_bottom_nav.dart

@@ -1,7 +1,5 @@
 // Author: fruit.com.cn
 
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 
 import '../theme/app_colors.dart';
@@ -16,63 +14,46 @@ class AppBottomNavItem {
     required this.label,
     required this.onTap,
     this.selected = false,
+    this.assetPath,
+    this.selectedAssetPath,
   });
 
   final Key tabKey;
   final IconData icon;
   final IconData selectedIcon;
+  final String? assetPath;
+  final String? selectedAssetPath;
   final String label;
   final VoidCallback onTap;
   final bool selected;
 }
 
-/// 四槽底部导航：首页 feed 用深色样式，其它页面保持浅色暖橙风格。
+/// 四槽底部导航：纯黑背景，白色选中态，灰色未选中态。
 class AppBottomNav extends StatelessWidget {
-  const AppBottomNav({
-    super.key,
-    required this.items,
-    this.backgroundColor = AppColors.bar,
-    this.barKey,
-    this.dark = false,
-  });
+  const AppBottomNav({super.key, required this.items, this.barKey});
 
   final List<AppBottomNavItem> items;
-  final Color backgroundColor;
   final Key? barKey;
-  final bool dark;
 
   @override
   Widget build(BuildContext context) {
     final bar = Container(
       key: barKey,
       height: AppDimens.navHeight,
-      decoration: BoxDecoration(
-        color: dark ? Colors.black : backgroundColor.withValues(alpha: 0.95),
-        border: Border(
-          top: BorderSide(color: dark ? Colors.white12 : AppColors.border),
-        ),
-      ),
+      color: AppColors.navBackground,
       child: Row(
         children: [
           for (final item in items)
             _NavDestination(
               item: item,
-              unselectedColor: dark ? Colors.white70 : AppColors.navUnselected,
+              unselectedColor: AppColors.navUnselected,
             ),
         ],
       ),
     );
-    if (dark) {
-      return ColoredBox(
-        color: Colors.black,
-        child: SafeArea(top: false, child: bar),
-      );
-    }
-    return ClipRect(
-      child: BackdropFilter(
-        filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
-        child: SafeArea(top: false, child: bar),
-      ),
+    return ColoredBox(
+      color: AppColors.navBackground,
+      child: SafeArea(top: false, child: bar),
     );
   }
 }
@@ -84,45 +65,69 @@ class _NavDestination extends StatelessWidget {
   final Color unselectedColor;
 
   @override
-  Widget build(BuildContext context) => Expanded(
-    child: Semantics(
-      button: true,
-      selected: item.selected,
-      label: item.label,
-      child: InkWell(
-        key: item.tabKey,
-        onTap: item.onTap,
-        child: ConstrainedBox(
-          constraints: const BoxConstraints(minHeight: AppDimens.navHeight),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              AnimatedScale(
-                duration: const Duration(milliseconds: 160),
-                curve: Curves.easeOut,
-                scale: item.selected ? 1 : 0.96,
-                child: Icon(
-                  item.selected ? item.selectedIcon : item.icon,
-                  size: AppDimens.navIcon,
-                  color: item.selected ? AppColors.blue : unselectedColor,
+  Widget build(BuildContext context) {
+    final color = item.selected ? AppColors.navSelected : unselectedColor;
+    final fallbackIcon = item.selected ? item.selectedIcon : item.icon;
+    final assetPath = item.selected
+        ? item.selectedAssetPath ?? item.assetPath
+        : item.assetPath;
+    return Expanded(
+      child: Semantics(
+        button: true,
+        selected: item.selected,
+        label: item.label,
+        child: InkWell(
+          key: item.tabKey,
+          onTap: item.onTap,
+          child: ConstrainedBox(
+            constraints: const BoxConstraints(minHeight: AppDimens.navHeight),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                AnimatedScale(
+                  duration: const Duration(milliseconds: 160),
+                  curve: Curves.easeOut,
+                  scale: item.selected ? 1 : 0.96,
+                  child: assetPath == null
+                      ? Icon(
+                          fallbackIcon,
+                          size: AppDimens.navIcon,
+                          color: color,
+                        )
+                      : ColorFiltered(
+                          colorFilter: ColorFilter.mode(color, BlendMode.srcIn),
+                          child: Image.asset(
+                            assetPath,
+                            width: AppDimens.navIcon,
+                            height: AppDimens.navIcon,
+                            fit: BoxFit.contain,
+                            errorBuilder: (_, _, _) => Icon(
+                              fallbackIcon,
+                              size: AppDimens.navIcon,
+                              color: color,
+                            ),
+                          ),
+                        ),
                 ),
-              ),
-              const SizedBox(height: 3),
-              Text(
-                item.label,
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                style: TextStyle(
-                  fontSize: AppDimens.navLabel,
-                  fontWeight: item.selected ? FontWeight.w700 : FontWeight.w500,
-                  color: item.selected ? AppColors.blue : unselectedColor,
-                  letterSpacing: 0,
+                const SizedBox(height: AppDimens.navLabelGap),
+                Text(
+                  item.label,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: TextStyle(
+                    fontSize: AppDimens.navLabel,
+                    fontWeight: item.selected
+                        ? FontWeight.w600
+                        : FontWeight.w400,
+                    color: color,
+                    letterSpacing: 0,
+                  ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ),
       ),
-    ),
-  );
+    );
+  }
 }

lib/core/widgets/app_pull_to_refresh.dart

@@ -4,19 +4,18 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 
-import '../../l10n/app_localizations.dart';
 import '../theme/app_colors.dart';
+import '../theme/app_dimens.dart';
 
 const double _maxPullDistance = 96;
 const double _refreshThreshold = 56;
 const double _indicatorHeight = 56;
-const double _indicatorMaxOffset = 10;
-const Duration _arrowTurnDuration = Duration(milliseconds: 160);
+const double _indicatorDisplacement = 40;
 const Duration _settleDuration = Duration(milliseconds: 200);
 
 enum _PullState { idle, pull, armed, refreshing }
 
-/// 带文字状态提示的下拉刷新容器，指示区悬浮在内容上方。
+/// 下拉刷新容器，指示区只显示统一的白色加载圈。
 class AppPullToRefresh extends StatefulWidget {
   const AppPullToRefresh({
     super.key,
@@ -26,7 +25,7 @@ class AppPullToRefresh extends StatefulWidget {
   });
 
   static const AlwaysScrollableScrollPhysics physics =
-      AlwaysScrollableScrollPhysics(parent: ClampingScrollPhysics());
+      AlwaysScrollableScrollPhysics(parent: BouncingScrollPhysics());
 
   final Widget child;
   final Future<void> Function() onRefresh;
@@ -146,10 +145,13 @@ class _AppPullToRefreshState extends State<AppPullToRefresh>
       onNotification: _onScroll,
       child: AnimatedBuilder(
         animation: _offsetController,
-        child: Listener(
-          onPointerUp: (_) => _release(),
-          onPointerCancel: (_) => _release(),
-          child: widget.child,
+        child: ScrollConfiguration(
+          behavior: const _NoScrollbarScrollBehavior(),
+          child: Listener(
+            onPointerUp: (_) => _release(),
+            onPointerCancel: (_) => _release(),
+            child: widget.child,
+          ),
         ),
         builder: (context, child) {
           final offset = _offsetController.value;
@@ -160,7 +162,7 @@ class _AppPullToRefreshState extends State<AppPullToRefresh>
                 key: const Key('pull-refresh-content'),
                 offset: Offset(0, offset),
                 child: IgnorePointer(
-                  ignoring: _refreshing || _retracting,
+                  ignoring: offset > 0 || _refreshing || _retracting,
                   child: child,
                 ),
               ),
@@ -169,7 +171,7 @@ class _AppPullToRefreshState extends State<AppPullToRefresh>
                   top: widget.edgeOffset,
                   left: 0,
                   right: 0,
-                  child: IgnorePointer(child: _indicatorLayer(context, offset)),
+                  child: IgnorePointer(child: _indicatorLayer(offset)),
                 ),
             ],
           );
@@ -178,19 +180,19 @@ class _AppPullToRefreshState extends State<AppPullToRefresh>
     );
   }
 
-  Widget _indicatorLayer(BuildContext context, double offset) {
+  Widget _indicatorLayer(double offset) {
     final progress = (offset / _refreshThreshold).clamp(0.0, 1.0);
     return SizedBox(
       height: _indicatorHeight,
       child: Opacity(
         opacity: progress,
         child: Transform.translate(
-          offset: Offset(0, _indicatorMaxOffset * progress),
+          offset: Offset(0, _indicatorDisplacement * progress),
           child: Align(
             alignment: Alignment.topCenter,
             child: Padding(
               padding: const EdgeInsets.only(top: 8),
-              child: _indicator(context),
+              child: _indicator(),
             ),
           ),
         ),
@@ -198,50 +200,36 @@ class _AppPullToRefreshState extends State<AppPullToRefresh>
     );
   }
 
-  Widget _indicator(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
-    if (_state == _PullState.refreshing) {
-      return _label(
-        const SizedBox.square(
-          dimension: 18,
-          child: CircularProgressIndicator(
-            strokeWidth: 2,
-            color: AppColors.blue,
-          ),
-        ),
-        l10n.refreshingLabel,
-      );
-    }
-    final armed = _state == _PullState.armed;
-    return _label(
-      AnimatedRotation(
-        turns: armed ? 0.5 : 0,
-        duration: _arrowTurnDuration,
-        child: Icon(
-          Icons.arrow_downward_rounded,
-          size: 18,
-          color: AppColors.blue,
+  Widget _indicator() {
+    return Container(
+      key: const Key('pull-refresh-indicator'),
+      width: AppDimens.refreshIndicatorSize,
+      height: AppDimens.refreshIndicatorSize,
+      padding: const EdgeInsets.all(
+        (AppDimens.refreshIndicatorSize - AppDimens.refreshSpinnerSize) / 2,
+      ),
+      decoration: BoxDecoration(
+        color: AppColors.refreshIndicatorSurface,
+        borderRadius: BorderRadius.circular(AppDimens.refreshIndicatorRadius),
+      ),
+      child: const SizedBox.square(
+        dimension: AppDimens.refreshSpinnerSize,
+        child: CircularProgressIndicator(
+          strokeWidth: AppDimens.refreshSpinnerStroke,
+          color: AppColors.textPrimary,
         ),
       ),
-      armed ? l10n.releaseToRefresh : l10n.pullToRefresh,
-    );
-  }
-
-  Widget _label(Widget icon, String text) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        icon,
-        const SizedBox(width: 6),
-        Text(
-          text,
-          style: const TextStyle(
-            color: AppColors.blue,
-            fontSize: 13,
-            fontWeight: FontWeight.w600,
-          ),
-        ),
-      ],
     );
   }
 }
+
+class _NoScrollbarScrollBehavior extends MaterialScrollBehavior {
+  const _NoScrollbarScrollBehavior();
+
+  @override
+  Widget buildScrollbar(
+    BuildContext context,
+    Widget child,
+    ScrollableDetails details,
+  ) => child;
+}

lib/core/widgets/app_root_tab.dart

@@ -0,0 +1,87 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../l10n/app_localizations.dart';
+import 'app_bottom_nav.dart';
+
+/// 客户端根导航的固定顺序。
+enum AppRootTab {
+  home(
+    assetPath: 'assets/icon/film_reel.png',
+    selectedAssetPath: 'assets/icon/film_reel_filled.png',
+  ),
+  recommend(),
+  following(),
+  mine();
+
+  const AppRootTab({this.assetPath, this.selectedAssetPath});
+
+  final String? assetPath;
+  final String? selectedAssetPath;
+}
+
+extension AppRootTabUi on AppRootTab {
+  Key get tabKey => switch (this) {
+    AppRootTab.home => const Key('tab-home'),
+    AppRootTab.recommend => const Key('tab-recommend'),
+    AppRootTab.following => const Key('tab-follow'),
+    AppRootTab.mine => const Key('tab-mine'),
+  };
+
+  IconData get icon => switch (this) {
+    AppRootTab.home => Icons.theaters_outlined,
+    AppRootTab.recommend => Icons.smart_display_outlined,
+    AppRootTab.following => Icons.bookmark_border_rounded,
+    AppRootTab.mine => Icons.person_outline_rounded,
+  };
+
+  IconData get selectedIcon => switch (this) {
+    AppRootTab.home => Icons.theaters,
+    AppRootTab.recommend => Icons.smart_display_rounded,
+    AppRootTab.following => Icons.bookmark_rounded,
+    AppRootTab.mine => Icons.person_rounded,
+  };
+
+  String label(AppLocalizations l10n) => switch (this) {
+    AppRootTab.home => l10n.homeTab,
+    AppRootTab.recommend => l10n.recommendedTab,
+    AppRootTab.following => l10n.followingTab,
+    AppRootTab.mine => l10n.myTab,
+  };
+}
+
+/// 根导航唯一入口，确保四个主页面使用完全一致的底栏配置。
+class AppRootBottomNav extends StatelessWidget {
+  const AppRootBottomNav({
+    super.key,
+    required this.selected,
+    required this.onSelected,
+    this.barKey,
+  });
+
+  final AppRootTab selected;
+  final ValueChanged<AppRootTab> onSelected;
+  final Key? barKey;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return AppBottomNav(
+      barKey: barKey,
+      items: [
+        for (final tab in AppRootTab.values)
+          AppBottomNavItem(
+            tabKey: tab.tabKey,
+            icon: tab.icon,
+            selectedIcon: tab.selectedIcon,
+            assetPath: tab.assetPath,
+            selectedAssetPath: tab.selectedAssetPath,
+            label: tab.label(l10n),
+            selected: tab == selected,
+            onTap: () => onSelected(tab),
+          ),
+      ],
+    );
+  }
+}

lib/core/widgets/auth_gate.dart

@@ -37,7 +37,7 @@ Future<bool> ensureSignedIn(BuildContext context) async {
             Text(
               l10n.authGateTitle,
               style: const TextStyle(
-                color: Colors.white,
+                color: AppColors.onSurface,
                 fontSize: 16,
                 fontWeight: FontWeight.w800,
               ),
@@ -98,7 +98,7 @@ class AuthGatePanel extends StatelessWidget {
               l10n.authGateTitle,
               textAlign: TextAlign.center,
               style: const TextStyle(
-                color: Colors.white,
+                color: AppColors.onSurface,
                 fontSize: 18,
                 fontWeight: FontWeight.w800,
               ),

lib/core/widgets/catalog_endpoint_editor.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 
 import '../config/app_config.dart';
 import '../config/server_endpoint.dart';
+import '../theme/app_colors.dart';
 
 const String _title = '设置服务地址';
 const String _save = '保存';
@@ -94,7 +95,7 @@ class _CatalogEndpointDialogState extends State<_CatalogEndpointDialog> {
             const Text(
               _localNetworkHint,
               key: Key('catalog-debug-endpoint-hint'),
-              style: TextStyle(fontSize: 12, color: Colors.grey),
+              style: TextStyle(fontSize: 12, color: AppColors.muted),
             ),
             if (_error != null) ...[
               const SizedBox(height: 8),

lib/core/widgets/centered_toast.dart

@@ -4,6 +4,8 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 
+import '../theme/app_colors.dart';
+
 const Key _toastKey = Key('centered-toast');
 const Duration _fadeDuration = Duration(milliseconds: 200);
 const Duration _visibleDuration = Duration(seconds: 2);
@@ -11,9 +13,8 @@ const double _toastRadius = 12;
 const double _toastMaxWidth = 320;
 const double _toastHorizontalInset = 20;
 const double _toastVerticalInset = 12;
-const double _toastBackgroundOpacity = 0.78;
 const TextStyle _toastTextStyle = TextStyle(
-  color: Colors.white,
+  color: AppColors.onSurface,
   fontSize: 14,
   height: 1.4,
   fontWeight: FontWeight.w500,
@@ -108,10 +109,9 @@ class _CenteredToastState extends State<_CenteredToast>
                 constraints: const BoxConstraints(maxWidth: _toastMaxWidth),
                 padding: _toastPadding,
                 decoration: BoxDecoration(
-                  color: Colors.black.withValues(
-                    alpha: _toastBackgroundOpacity,
-                  ),
+                  color: AppColors.raised,
                   borderRadius: BorderRadius.circular(_toastRadius),
+                  border: Border.all(color: AppColors.border),
                 ),
                 child: Text(
                   widget.message,

lib/core/widgets/cover_play_count.dart

@@ -0,0 +1,60 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../formatting/count_format.dart';
+import '../theme/app_colors.dart';
+import '../theme/app_dimens.dart';
+
+class CoverPlayCount extends StatelessWidget {
+  const CoverPlayCount({super.key, required this.count});
+
+  final int count;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        const Icon(
+          Icons.local_fire_department_rounded,
+          color: AppColors.textPrimary,
+          size: AppDimens.cardViewsIcon,
+        ),
+        const SizedBox(width: AppDimens.cardPlayCountGap),
+        Text(
+          formatPlayCount(count),
+          style: const TextStyle(
+            color: AppColors.textPrimary,
+            fontSize: AppDimens.cardPlayCountFont,
+            fontWeight: FontWeight.w400,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class CoverBottomScrim extends StatelessWidget {
+  const CoverBottomScrim({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const SizedBox(
+      height: AppDimens.cardPlayCountScrimHeight,
+      child: DecoratedBox(
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+            colors: [
+              AppColors.cardBottomScrimStart,
+              AppColors.cardBottomScrimEnd,
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/core/widgets/drama_cover_badge_ribbon.dart

@@ -0,0 +1,66 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../theme/app_colors.dart';
+import '../theme/app_dimens.dart';
+
+/// 封面右上角的斜边状态角标。
+class DramaCoverBadgeRibbon extends StatelessWidget {
+  const DramaCoverBadgeRibbon({
+    super.key,
+    required this.label,
+    required this.color,
+    required this.keyPrefix,
+  });
+
+  final String label;
+  final Color color;
+  final String keyPrefix;
+
+  @override
+  Widget build(BuildContext context) {
+    return ClipPath(
+      key: Key('drama-cover-badge-ribbon-$keyPrefix'),
+      clipper: const _SlantedRibbonClipper(),
+      child: Container(
+        height: AppDimens.cardGenreRibbonHeight,
+        padding: const EdgeInsets.only(
+          left:
+              AppDimens.coverBadgeRibbonHorizontalPadding +
+              AppDimens.cardGenreRibbonLeftInset,
+          right: AppDimens.coverBadgeRibbonHorizontalPadding,
+        ),
+        alignment: Alignment.center,
+        color: color,
+        child: Text(
+          label,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: const TextStyle(
+            color: AppColors.textPrimary,
+            fontSize: AppDimens.cardBadgeFont,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _SlantedRibbonClipper extends CustomClipper<Path> {
+  const _SlantedRibbonClipper();
+
+  @override
+  Path getClip(Size size) {
+    return Path()
+      ..moveTo(AppDimens.cardGenreRibbonLeftInset, 0)
+      ..lineTo(size.width, 0)
+      ..lineTo(size.width, size.height)
+      ..lineTo(0, size.height)
+      ..close();
+  }
+
+  @override
+  bool shouldReclip(_SlantedRibbonClipper oldClipper) => false;
+}

lib/core/widgets/drama_grid_skeleton.dart

@@ -0,0 +1,96 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../theme/app_colors.dart';
+import '../theme/app_dimens.dart';
+
+class DramaGridSkeleton extends StatelessWidget {
+  const DramaGridSkeleton({
+    super.key,
+    required this.columns,
+    required this.horizontalPadding,
+    required this.crossAxisSpacing,
+    required this.mainAxisSpacing,
+    this.itemCount = 9,
+    this.physics = const NeverScrollableScrollPhysics(),
+  });
+
+  final int columns;
+  final double horizontalPadding;
+  final double crossAxisSpacing;
+  final double mainAxisSpacing;
+  final int itemCount;
+  final ScrollPhysics physics;
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final itemWidth =
+            (constraints.maxWidth -
+                horizontalPadding * 2 -
+                crossAxisSpacing * (columns - 1)) /
+            columns;
+        final itemExtent =
+            itemWidth / AppDimens.cardCoverAspectRatio +
+            AppDimens.skeletonBodyExtent;
+        return GridView.builder(
+          physics: physics,
+          padding: EdgeInsets.fromLTRB(
+            horizontalPadding,
+            AppDimens.spaceMd,
+            horizontalPadding,
+            AppDimens.spaceXl,
+          ),
+          gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+            crossAxisCount: columns,
+            crossAxisSpacing: crossAxisSpacing,
+            mainAxisSpacing: mainAxisSpacing,
+            mainAxisExtent: itemExtent,
+          ),
+          itemCount: itemCount,
+          itemBuilder: (context, index) => Column(
+            key: Key('drama-grid-skeleton-$index'),
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              AspectRatio(
+                aspectRatio: AppDimens.cardCoverAspectRatio,
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: AppColors.skeletonSurface,
+                    borderRadius: BorderRadius.circular(
+                      AppDimens.homeCardRadius,
+                    ),
+                  ),
+                ),
+              ),
+              const SizedBox(height: AppDimens.cardCoverTitleGap),
+              const _SkeletonBar(),
+              const SizedBox(height: AppDimens.skeletonTitleBarGap),
+              const FractionallySizedBox(
+                widthFactor: 0.62,
+                child: _SkeletonBar(),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _SkeletonBar extends StatelessWidget {
+  const _SkeletonBar();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: AppDimens.skeletonBarHeight,
+      decoration: BoxDecoration(
+        color: AppColors.skeletonSurface,
+        borderRadius: BorderRadius.circular(AppDimens.skeletonBarRadius),
+      ),
+    );
+  }
+}

lib/core/widgets/empty_state.dart

@@ -87,12 +87,11 @@ class _EmptyMark extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final dark = Theme.of(context).brightness == Brightness.dark;
     return Icon(
       icon,
       key: const Key('empty-state-icon'),
       size: compact ? _compactIconSize : _regularIconSize,
-      color: dark ? AppColors.gold : AppColors.blue,
+      color: AppColors.blueSoft,
     );
   }
 }

lib/core/widgets/glass_panel.dart

@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import '../theme/app_colors.dart';
 import '../theme/app_dimens.dart';
 
-/// 首页信息卡与浮层控件使用的浅色玻璃面板。
+/// 首页信息卡与浮层控件使用的深色玻璃面板。
 class GlassPanel extends StatelessWidget {
   const GlassPanel({
     super.key,
@@ -38,7 +38,7 @@ class GlassPanel extends StatelessWidget {
             const LinearGradient(
               begin: Alignment.topLeft,
               end: Alignment.bottomRight,
-              colors: [Color(0xE6FFFFFF), Color(0xB3FFFDFB)],
+              colors: [AppColors.glassSurfaceStart, AppColors.glassSurfaceEnd],
             ),
       ),
       child: Padding(padding: padding ?? EdgeInsets.zero, child: child),

lib/core/widgets/paged_list_footer.dart

@@ -5,22 +5,19 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 
 import '../theme/app_colors.dart';
+import '../theme/app_dimens.dart';
 import '../../l10n/app_localizations.dart';
 
-/// 网络分页列表底部状态：加载、重试、手动加载与无更多。
+/// 网络分页列表底部状态：仅保留加载圈与错误重试。
 class PagedListFooter extends StatelessWidget {
   const PagedListFooter({
     super.key,
     required this.loading,
-    required this.hasMore,
-    required this.hasItems,
     required this.onRetry,
     this.errorMessage,
   });
 
   final bool loading;
-  final bool hasMore;
-  final bool hasItems;
   final String? errorMessage;
   final Future<void> Function() onRetry;
 
@@ -49,38 +46,18 @@ class PagedListFooter extends StatelessWidget {
     if (loading) {
       return const SizedBox(
         key: Key('paged-list-loading'),
-        height: 56,
+        height: AppDimens.loadMoreIndicatorHeight,
         child: Center(
           child: SizedBox.square(
-            dimension: 20,
+            dimension: AppDimens.refreshSpinnerSize,
             child: CircularProgressIndicator(
-              strokeWidth: 2,
-              color: AppColors.blue,
+              strokeWidth: AppDimens.refreshSpinnerStroke,
+              color: AppColors.textPrimary,
             ),
           ),
         ),
       );
     }
-    if (hasMore) {
-      return Center(
-        child: TextButton(
-          key: const Key('paged-list-load-more'),
-          onPressed: () => unawaited(onRetry()),
-          child: Text(l10n.loadMore),
-        ),
-      );
-    }
-    if (hasItems) {
-      return Padding(
-        key: const Key('paged-list-no-more'),
-        padding: const EdgeInsets.symmetric(vertical: 14),
-        child: Text(
-          l10n.noMore,
-          textAlign: TextAlign.center,
-          style: const TextStyle(color: AppColors.muted, fontSize: 12),
-        ),
-      );
-    }
-    return const SizedBox(height: 16);
+    return const SizedBox.shrink();
   }
 }

lib/core/widgets/paged_local_list.dart

@@ -3,6 +3,7 @@
 import 'package:flutter/material.dart';
 
 import '../theme/app_colors.dart';
+import '../theme/app_dimens.dart';
 
 const int _defaultPageSize = 20;
 const Duration _defaultLoadDelay = Duration(milliseconds: 300);
@@ -64,53 +65,34 @@ class PagedLocalListController<T> extends ChangeNotifier {
   }
 }
 
-/// 分页列表底部加载态与到底提示。
+/// 分页列表底部加载态。
 class PagedLoadFooter extends StatelessWidget {
   const PagedLoadFooter({
     super.key,
     required this.loading,
-    required this.hasMore,
-    required this.hasItems,
     required this.loadMoreKey,
-    required this.noMoreKey,
-    required this.noMoreLabel,
   });
 
   final bool loading;
-  final bool hasMore;
-  final bool hasItems;
   final Key loadMoreKey;
-  final Key noMoreKey;
-  final String noMoreLabel;
 
   @override
   Widget build(BuildContext context) {
     if (loading) {
       return SizedBox(
         key: loadMoreKey,
-        height: 56,
+        height: AppDimens.loadMoreIndicatorHeight,
         child: const Center(
           child: SizedBox.square(
-            dimension: 20,
+            dimension: AppDimens.refreshSpinnerSize,
             child: CircularProgressIndicator(
-              strokeWidth: 2,
-              color: AppColors.blue,
+              strokeWidth: AppDimens.refreshSpinnerStroke,
+              color: AppColors.textPrimary,
             ),
           ),
         ),
       );
     }
-    if (hasItems && !hasMore) {
-      return Padding(
-        key: noMoreKey,
-        padding: const EdgeInsets.symmetric(vertical: 14),
-        child: Text(
-          noMoreLabel,
-          textAlign: TextAlign.center,
-          style: const TextStyle(color: AppColors.muted, fontSize: 12),
-        ),
-      );
-    }
-    return const SizedBox(height: 16);
+    return const SizedBox.shrink();
   }
 }

lib/core/widgets/plain_page_scaffold.dart

@@ -3,6 +3,7 @@
 import 'package:flutter/material.dart';
 
 import '../theme/app_colors.dart';
+import '../theme/app_theme.dart';
 import 'subpage_header.dart';
 
 /// 二级页面通用骨架：返回栏 + 标题/副标题 + 可滚动内容，无底部导航。
@@ -27,17 +28,20 @@ class PlainPageScaffold extends StatelessWidget {
     return Scaffold(
       key: pageKey,
       backgroundColor: AppColors.ink,
-      body: SafeArea(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            AppSubpageHeader(
-              title: title,
-              subtitle: subtitle,
-              backKey: backKey,
-            ),
-            Expanded(child: child),
-          ],
+      body: DecoratedBox(
+        decoration: const BoxDecoration(gradient: AppTheme.pageGradient),
+        child: SafeArea(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              AppSubpageHeader(
+                title: title,
+                subtitle: subtitle,
+                backKey: backKey,
+              ),
+              Expanded(child: child),
+            ],
+          ),
         ),
       ),
     );

lib/core/widgets/remote_image.dart

@@ -16,7 +16,7 @@ class RemoteImage extends StatelessWidget {
     this.showFallbackIcon = false,
     this.fallbackIconKey,
     this.fallbackAspectRatio,
-    this.fallbackColor = AppColors.bar,
+    this.fallbackColor = AppColors.raised,
   });
 
   final String path;

lib/core/widgets/subpage_header.dart

@@ -14,12 +14,7 @@ const double _subtitleFontSize = 12;
 const double _actionGap = 8;
 const double _iconSize = 22;
 const double _iconWeight = 600;
-const double _borderWidth = 1;
 const double _shadowBlur = 8;
-const Color _lightShadowColor = Color(0x14000000);
-const Color _darkBackground = Color(0x59000000);
-const Color _darkShadowColor = Color(0x33000000);
-const Offset _lightShadowOffset = Offset(0, 2);
 
 /// 二级页面统一圆形操作按钮，返回、分享和更多共用同一尺寸与表面样式。
 class AppSubpageCircleButton extends StatelessWidget {
@@ -50,24 +45,18 @@ class AppSubpageCircleButton extends StatelessWidget {
           key: const Key('subpage-back-shadow'),
           decoration: BoxDecoration(
             shape: BoxShape.circle,
-            boxShadow: [
-              BoxShadow(
-                color: dark ? _darkShadowColor : _lightShadowColor,
-                blurRadius: _shadowBlur,
-                offset: dark ? Offset.zero : _lightShadowOffset,
-              ),
-            ],
+            boxShadow: dark
+                ? const [
+                    BoxShadow(
+                      color: AppColors.shadowSoft,
+                      blurRadius: _shadowBlur,
+                    ),
+                  ]
+                : const [],
           ),
           child: Material(
-            color: dark ? _darkBackground : AppColors.card,
-            shape: CircleBorder(
-              side: dark
-                  ? BorderSide.none
-                  : const BorderSide(
-                      color: AppColors.border,
-                      width: _borderWidth,
-                    ),
-            ),
+            color: dark ? AppColors.headerScrim : AppColors.transparent,
+            shape: const CircleBorder(),
             clipBehavior: Clip.antiAlias,
             child: InkWell(
               customBorder: const CircleBorder(),
@@ -75,7 +64,7 @@ class AppSubpageCircleButton extends StatelessWidget {
               child: Center(
                 child: Icon(
                   icon,
-                  color: dark ? Colors.white : AppColors.onSurface,
+                  color: dark ? AppColors.onSurface : AppColors.textPrimary,
                   size: _iconSize,
                   weight: _iconWeight,
                 ),
@@ -88,7 +77,7 @@ class AppSubpageCircleButton extends StatelessWidget {
   }
 }
 
-/// 二级页面统一返回按钮，浅色页使用白底描边，深色页使用半透明黑底。
+/// 二级页面统一返回按钮，普通页透明，沉浸页使用半透明黑底。
 class AppSubpageBackButton extends StatelessWidget {
   const AppSubpageBackButton({
     super.key,
@@ -123,6 +112,7 @@ class AppSubpageHeader extends StatelessWidget {
     this.actions,
     this.onBack,
     this.dark = false,
+    this.showBack = true,
   });
 
   final String title;
@@ -131,11 +121,12 @@ class AppSubpageHeader extends StatelessWidget {
   final Widget? actions;
   final VoidCallback? onBack;
   final bool dark;
+  final bool showBack;
 
   @override
   Widget build(BuildContext context) {
-    final foreground = dark ? Colors.white : AppColors.onSurface;
-    final secondary = dark ? Colors.white70 : AppColors.muted;
+    final foreground = AppColors.textPrimary;
+    final secondary = AppColors.textSecondary;
     return SizedBox(
       key: const Key('subpage-header'),
       height: subtitle == null ? _height : _heightWithSubtitle,
@@ -143,8 +134,14 @@ class AppSubpageHeader extends StatelessWidget {
         padding: const EdgeInsets.symmetric(horizontal: _horizontal),
         child: Row(
           children: [
-            AppSubpageBackButton(backKey: backKey, dark: dark, onBack: onBack),
-            const SizedBox(width: _backGap),
+            if (showBack) ...[
+              AppSubpageBackButton(
+                backKey: backKey,
+                dark: dark,
+                onBack: onBack,
+              ),
+              const SizedBox(width: _backGap),
+            ],
             Expanded(
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,

lib/l10n/app_en.arb

@@ -16,6 +16,7 @@
   "currentSeries": "Current series",
   "discoverTab": "Theater",
   "searchDiscover": "Search dramas, actors, genres...",
+  "searchCancel": "Cancel",
   "featured": "Featured",
   "recommended": "Recommended",
   "fruitShortsBrand": "FruitShorts",
@@ -64,7 +65,7 @@
       "count": {"type": "String"}
     }
   },
-  "topCharts": "Top Charts",
+  "topCharts": "Hot Ranking",
   "newReleases": "New Releases",
   "newDramas": "New",
   "trendingMicroDramas": "Trending Micro-Dramas",
@@ -115,7 +116,6 @@
   "emptyHint": "New content will appear here.",
   "demoCatalogNotice": "Three demo dramas share the same local video.",
   "myTab": "My",
-  "localViewer": "Local Viewer",
   "localDemoProfile": "Local demo profile",
   "continueWatching": "Continue Watching",
   "episodeRemaining": "Episode {episode} · {minutes} min left",
@@ -153,7 +153,6 @@
   },
   "resume": "Resume",
   "history": "History",
-  "watchlist": "Favorites",
   "likedTab": "Liked",
   "all": "All",
   "inProgress": "In Progress",
@@ -162,7 +161,7 @@
   "preferences": "Preferences",
   "followingTab": "Following",
   "animatedTab": "Animated",
-  "recommendedTab": "Recommended",
+  "recommendedTab": "Recommend",
   "noCategoryDramas": "No dramas in this category yet.",
   "allDramas": "All Dramas",
   "allLanguages": "All languages",
@@ -346,10 +345,6 @@
     }
   },
   "retry": "Retry",
-  "pullToRefresh": "Pull to refresh",
-  "releaseToRefresh": "Release to refresh",
-  "refreshingLabel": "Refreshing…",
-  "noMore": "No more",
   "backToSeries": "Back to series",
   "nextEpisode": "Next episode",
   "pause": "Pause",
@@ -639,7 +634,7 @@
   "ledgerAdjustment": "Adjustment",
   "rankingTab": "Charts",
   "rankingTitle": "Top Charts",
-  "rankingSubtitle": "Ranked from today's live catalog feed.",
+  "rankingSubtitle": "Ranked live by play heat",
   "rankingHot": "Trending",
   "rankingNew": "New releases",
   "newReleasesAll": "All new releases",
@@ -697,5 +692,71 @@
   "danmakuSettings": "Danmaku settings",
   "offlineCache": "Offline cache",
   "screenCast": "Cast",
-  "sleepTimer": "Sleep timer"
+  "sleepTimer": "Sleep timer",
+  "homeSearchHint": "Search dramas, actors, genres...",
+  "homeSectionFeatured": "Featured",
+  "homeSectionNew": "New",
+  "homeSectionCategories": "Categories",
+  "homeSectionRanking": "Charts",
+  "homeSectionCostume": "Costume",
+  "homeSectionCommunity": "Community",
+  "homeTagHot": "Hot",
+  "homeTagUplifting": "Thrilling",
+  "homeTagSweet": "Sweet",
+  "homeTagFaceSlap": "Revenge",
+  "homeTagAngst": "Angst",
+  "homeBadgeHot": "Hot",
+  "homeBadgeNew": "New",
+  "homeBadgeAnime": "Anime",
+  "homeGridFilterEmpty": "No dramas match these filters",
+  "homeGridClearFilter": "Clear filters",
+  "recommendTopTab": "Recommend",
+  "playlistTopTab": "Playlists",
+  "allDramasTopTab": "All Dramas",
+  "weeklyHitsTitle": "This Week's Hits",
+  "weeklyHitsSubtitle": "Binge the hottest stories of the week!",
+  "weeklyNewTitle": "New This Week",
+  "weeklyNewSubtitle": "Fresh releases to start your next binge",
+  "costumeAwardsTitle": "Costume Drama Awards",
+  "costumeAwardsSubtitle": "Top-rated picks every costume fan needs",
+  "localFilter": "Local",
+  "asiaFilter": "Asia",
+  "westernFilter": "Western",
+  "subtitlesOnlyFilter": "Subtitles",
+  "dubbedFilter": "Dubbed",
+  "reversalFilter": "Comeback",
+  "modernFilter": "Modern",
+  "edit": "Edit",
+  "done": "Done",
+  "visitor": "Visitor",
+  "copyUid": "Copy UID",
+  "uidCopied": "UID copied",
+  "offlineDownloads": "Offline downloads",
+  "watchPreferences": "Watch preferences",
+  "contactSupport": "Contact support",
+  "vipBrandName": "Netshort VIP",
+  "mineVipSubtitle": "Enjoy exclusive benefits",
+  "favoriteEpisodeProgress": "Episode {episode} / {total} total",
+  "@favoriteEpisodeProgress": {
+    "placeholders": {
+      "episode": { "type": "int" },
+      "total": { "type": "int" }
+    }
+  },
+  "watchedToEpisode": "Watched to Episode {episode}",
+  "@watchedToEpisode": { "placeholders": { "episode": { "type": "int" } } },
+  "homeWatchAll": "Watch all",
+  "confirmRemove": "Remove this item?",
+  "followingCountLabel": "Following",
+  "watchRecordsCountLabel": "Watch records",
+  "dataUnavailable": "—",
+  "commonQuestions": "Common questions",
+  "aboutUs": "About us",
+  "aboutDescription": "A focused, immersive place to watch short dramas.",
+  "versionLabel": "Version {version}",
+  "@versionLabel": {
+    "placeholders": {
+      "version": { "type": "String" }
+    }
+  }
 }

lib/l10n/app_id.arb

@@ -16,6 +16,7 @@
   "currentSeries": "Serial saat ini",
   "discoverTab": "Teater",
   "searchDiscover": "Cari drama, aktor, genre...",
+  "searchCancel": "Batal",
   "featured": "Unggulan",
   "recommended": "Rekomendasi",
   "fruitShortsBrand": "FruitShorts",
@@ -48,7 +49,7 @@
   "authorNoteLabel": "Catatan penulis",
   "reserve": "Reservasi",
   "heatLabel": "{count} panas",
-  "topCharts": "Peringkat Teratas",
+  "topCharts": "Peringkat Populer",
   "newReleases": "Rilisan Baru",
   "newDramas": "Baru",
   "trendingMicroDramas": "Drama Mini Populer",
@@ -94,7 +95,6 @@
   "emptyHint": "Konten baru akan muncul di sini.",
   "demoCatalogNotice": "Tiga drama demo memakai video lokal yang sama.",
   "myTab": "Saya",
-  "localViewer": "Penonton Lokal",
   "localDemoProfile": "Profil demo lokal",
   "continueWatching": "Lanjut Tonton",
   "episodeRemaining": "Episode {episode} · {minutes} menit tersisa",
@@ -132,14 +132,13 @@
   },
   "resume": "Lanjutkan",
   "history": "Riwayat",
-  "watchlist": "Daftar Tonton",
   "likedTab": "Disukai",
   "all": "Semua",
   "inProgress": "Sedang Berjalan",
   "completed": "Selesai",
   "noSavedShows": "Belum ada tontonan di sini.",
   "preferences": "Preferensi",
-  "followingTab": "Mengikuti",
+  "followingTab": "Daftar Tonton",
   "animatedTab": "Animasi",
   "recommendedTab": "Rekomendasi",
   "noCategoryDramas": "Belum ada drama di kategori ini.",
@@ -320,10 +319,6 @@
     }
   },
   "retry": "Coba lagi",
-  "pullToRefresh": "Tarik untuk menyegarkan",
-  "releaseToRefresh": "Lepaskan untuk menyegarkan",
-  "refreshingLabel": "Menyegarkan…",
-  "noMore": "Tidak ada lagi",
   "backToSeries": "Kembali ke serial",
   "nextEpisode": "Episode berikutnya",
   "pause": "Jeda",
@@ -601,7 +596,7 @@
   "ledgerAdjustment": "Penyesuaian",
   "rankingTab": "Peringkat",
   "rankingTitle": "Peringkat Teratas",
-  "rankingSubtitle": "Diurutkan dari feed katalog terkini.",
+  "rankingSubtitle": "Diurutkan langsung berdasarkan jumlah tayangan",
   "rankingHot": "Populer",
   "rankingNew": "Rilis baru",
   "newReleasesAll": "Semua rilis baru",
@@ -654,5 +649,71 @@
   "danmakuSettings": "Pengaturan komentar layar",
   "offlineCache": "Cache offline",
   "screenCast": "Cast",
-  "sleepTimer": "Timer tidur"
+  "sleepTimer": "Timer tidur",
+  "homeSearchHint": "Cari drama, aktor, genre...",
+  "homeSectionFeatured": "Unggulan",
+  "homeSectionNew": "Baru",
+  "homeSectionCategories": "Kategori",
+  "homeSectionRanking": "Peringkat",
+  "homeSectionCostume": "Kostum",
+  "homeSectionCommunity": "Komunitas",
+  "homeTagHot": "Populer",
+  "homeTagUplifting": "Membara",
+  "homeTagSweet": "Manis",
+  "homeTagFaceSlap": "Balas Dendam",
+  "homeTagAngst": "Cinta Penuh Luka",
+  "homeBadgeHot": "Populer",
+  "homeBadgeNew": "Baru",
+  "homeBadgeAnime": "Anime",
+  "homeGridFilterEmpty": "Tidak ada drama yang cocok dengan filter",
+  "homeGridClearFilter": "Hapus filter",
+  "recommendTopTab": "Rekomendasi",
+  "playlistTopTab": "Daftar Putar",
+  "allDramasTopTab": "Semua Drama",
+  "weeklyHitsTitle": "Hits Minggu Ini",
+  "weeklyHitsSubtitle": "Drama terpopuler minggu ini, tonton sekaligus!",
+  "weeklyNewTitle": "Drama Baru Minggu Ini",
+  "weeklyNewSubtitle": "Rilisan baru untuk memulai maraton berikutnya",
+  "costumeAwardsTitle": "Drama Kostum Terbaik",
+  "costumeAwardsSubtitle": "Pilihan terbaik yang wajib ditonton",
+  "localFilter": "Lokal",
+  "asiaFilter": "Asia",
+  "westernFilter": "Barat",
+  "subtitlesOnlyFilter": "Subtitle",
+  "dubbedFilter": "Dubbing",
+  "reversalFilter": "Balas Dendam",
+  "modernFilter": "Modern",
+  "edit": "Edit",
+  "done": "Selesai",
+  "visitor": "Pengunjung",
+  "copyUid": "Salin UID",
+  "uidCopied": "UID disalin",
+  "offlineDownloads": "Unduhan offline",
+  "watchPreferences": "Preferensi tontonan",
+  "contactSupport": "Hubungi dukungan",
+  "vipBrandName": "Netshort VIP",
+  "mineVipSubtitle": "Nikmati manfaat eksklusif",
+  "favoriteEpisodeProgress": "Episode {episode} / total {total}",
+  "@favoriteEpisodeProgress": {
+    "placeholders": {
+      "episode": { "type": "int" },
+      "total": { "type": "int" }
+    }
+  },
+  "watchedToEpisode": "Ditonton hingga Episode {episode}",
+  "@watchedToEpisode": { "placeholders": { "episode": { "type": "int" } } },
+  "homeWatchAll": "Tonton semua",
+  "confirmRemove": "Hapus item ini?",
+  "followingCountLabel": "Mengikuti",
+  "watchRecordsCountLabel": "Riwayat tontonan",
+  "dataUnavailable": "—",
+  "commonQuestions": "Pertanyaan umum",
+  "aboutUs": "Tentang kami",
+  "aboutDescription": "Tempat fokus dan imersif untuk menonton drama pendek.",
+  "versionLabel": "Versi {version}",
+  "@versionLabel": {
+    "placeholders": {
+      "version": { "type": "String" }
+    }
+  }
 }

lib/l10n/app_localizations.dart

@@ -196,6 +196,12 @@ abstract class AppLocalizations {
   /// **'Search dramas, actors, genres...'**
   String get searchDiscover;
 
+  /// No description provided for @searchCancel.
+  ///
+  /// In en, this message translates to:
+  /// **'Cancel'**
+  String get searchCancel;
+
   /// No description provided for @featured.
   ///
   /// In en, this message translates to:
@@ -391,7 +397,7 @@ abstract class AppLocalizations {
   /// No description provided for @topCharts.
   ///
   /// In en, this message translates to:
-  /// **'Top Charts'**
+  /// **'Hot Ranking'**
   String get topCharts;
 
   /// No description provided for @newReleases.
@@ -568,12 +574,6 @@ abstract class AppLocalizations {
   /// **'My'**
   String get myTab;
 
-  /// No description provided for @localViewer.
-  ///
-  /// In en, this message translates to:
-  /// **'Local Viewer'**
-  String get localViewer;
-
   /// No description provided for @localDemoProfile.
   ///
   /// In en, this message translates to:
@@ -628,12 +628,6 @@ abstract class AppLocalizations {
   /// **'History'**
   String get history;
 
-  /// No description provided for @watchlist.
-  ///
-  /// In en, this message translates to:
-  /// **'Favorites'**
-  String get watchlist;
-
   /// No description provided for @likedTab.
   ///
   /// In en, this message translates to:
@@ -685,7 +679,7 @@ abstract class AppLocalizations {
   /// No description provided for @recommendedTab.
   ///
   /// In en, this message translates to:
-  /// **'Recommended'**
+  /// **'Recommend'**
   String get recommendedTab;
 
   /// No description provided for @noCategoryDramas.
@@ -1354,30 +1348,6 @@ abstract class AppLocalizations {
   /// **'Retry'**
   String get retry;
 
-  /// No description provided for @pullToRefresh.
-  ///
-  /// In en, this message translates to:
-  /// **'Pull to refresh'**
-  String get pullToRefresh;
-
-  /// No description provided for @releaseToRefresh.
-  ///
-  /// In en, this message translates to:
-  /// **'Release to refresh'**
-  String get releaseToRefresh;
-
-  /// No description provided for @refreshingLabel.
-  ///
-  /// In en, this message translates to:
-  /// **'Refreshing…'**
-  String get refreshingLabel;
-
-  /// No description provided for @noMore.
-  ///
-  /// In en, this message translates to:
-  /// **'No more'**
-  String get noMore;
-
   /// No description provided for @backToSeries.
   ///
   /// In en, this message translates to:
@@ -2713,7 +2683,7 @@ abstract class AppLocalizations {
   /// No description provided for @rankingSubtitle.
   ///
   /// In en, this message translates to:
-  /// **'Ranked from today\'s live catalog feed.'**
+  /// **'Ranked live by play heat'**
   String get rankingSubtitle;
 
   /// No description provided for @rankingHot.
@@ -2997,6 +2967,330 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Sleep timer'**
   String get sleepTimer;
+
+  /// No description provided for @homeSearchHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Search dramas, actors, genres...'**
+  String get homeSearchHint;
+
+  /// No description provided for @homeSectionFeatured.
+  ///
+  /// In en, this message translates to:
+  /// **'Featured'**
+  String get homeSectionFeatured;
+
+  /// No description provided for @homeSectionNew.
+  ///
+  /// In en, this message translates to:
+  /// **'New'**
+  String get homeSectionNew;
+
+  /// No description provided for @homeSectionCategories.
+  ///
+  /// In en, this message translates to:
+  /// **'Categories'**
+  String get homeSectionCategories;
+
+  /// No description provided for @homeSectionRanking.
+  ///
+  /// In en, this message translates to:
+  /// **'Charts'**
+  String get homeSectionRanking;
+
+  /// No description provided for @homeSectionCostume.
+  ///
+  /// In en, this message translates to:
+  /// **'Costume'**
+  String get homeSectionCostume;
+
+  /// No description provided for @homeSectionCommunity.
+  ///
+  /// In en, this message translates to:
+  /// **'Community'**
+  String get homeSectionCommunity;
+
+  /// No description provided for @homeTagHot.
+  ///
+  /// In en, this message translates to:
+  /// **'Hot'**
+  String get homeTagHot;
+
+  /// No description provided for @homeTagUplifting.
+  ///
+  /// In en, this message translates to:
+  /// **'Thrilling'**
+  String get homeTagUplifting;
+
+  /// No description provided for @homeTagSweet.
+  ///
+  /// In en, this message translates to:
+  /// **'Sweet'**
+  String get homeTagSweet;
+
+  /// No description provided for @homeTagFaceSlap.
+  ///
+  /// In en, this message translates to:
+  /// **'Revenge'**
+  String get homeTagFaceSlap;
+
+  /// No description provided for @homeTagAngst.
+  ///
+  /// In en, this message translates to:
+  /// **'Angst'**
+  String get homeTagAngst;
+
+  /// No description provided for @homeBadgeHot.
+  ///
+  /// In en, this message translates to:
+  /// **'Hot'**
+  String get homeBadgeHot;
+
+  /// No description provided for @homeBadgeNew.
+  ///
+  /// In en, this message translates to:
+  /// **'New'**
+  String get homeBadgeNew;
+
+  /// No description provided for @homeBadgeAnime.
+  ///
+  /// In en, this message translates to:
+  /// **'Anime'**
+  String get homeBadgeAnime;
+
+  /// No description provided for @homeGridFilterEmpty.
+  ///
+  /// In en, this message translates to:
+  /// **'No dramas match these filters'**
+  String get homeGridFilterEmpty;
+
+  /// No description provided for @homeGridClearFilter.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear filters'**
+  String get homeGridClearFilter;
+
+  /// No description provided for @recommendTopTab.
+  ///
+  /// In en, this message translates to:
+  /// **'Recommend'**
+  String get recommendTopTab;
+
+  /// No description provided for @playlistTopTab.
+  ///
+  /// In en, this message translates to:
+  /// **'Playlists'**
+  String get playlistTopTab;
+
+  /// No description provided for @allDramasTopTab.
+  ///
+  /// In en, this message translates to:
+  /// **'All Dramas'**
+  String get allDramasTopTab;
+
+  /// No description provided for @weeklyHitsTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'This Week\'s Hits'**
+  String get weeklyHitsTitle;
+
+  /// No description provided for @weeklyHitsSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Binge the hottest stories of the week!'**
+  String get weeklyHitsSubtitle;
+
+  /// No description provided for @weeklyNewTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'New This Week'**
+  String get weeklyNewTitle;
+
+  /// No description provided for @weeklyNewSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Fresh releases to start your next binge'**
+  String get weeklyNewSubtitle;
+
+  /// No description provided for @costumeAwardsTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Costume Drama Awards'**
+  String get costumeAwardsTitle;
+
+  /// No description provided for @costumeAwardsSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Top-rated picks every costume fan needs'**
+  String get costumeAwardsSubtitle;
+
+  /// No description provided for @localFilter.
+  ///
+  /// In en, this message translates to:
+  /// **'Local'**
+  String get localFilter;
+
+  /// No description provided for @asiaFilter.
+  ///
+  /// In en, this message translates to:
+  /// **'Asia'**
+  String get asiaFilter;
+
+  /// No description provided for @westernFilter.
+  ///
+  /// In en, this message translates to:
+  /// **'Western'**
+  String get westernFilter;
+
+  /// No description provided for @subtitlesOnlyFilter.
+  ///
+  /// In en, this message translates to:
+  /// **'Subtitles'**
+  String get subtitlesOnlyFilter;
+
+  /// No description provided for @dubbedFilter.
+  ///
+  /// In en, this message translates to:
+  /// **'Dubbed'**
+  String get dubbedFilter;
+
+  /// No description provided for @reversalFilter.
+  ///
+  /// In en, this message translates to:
+  /// **'Comeback'**
+  String get reversalFilter;
+
+  /// No description provided for @modernFilter.
+  ///
+  /// In en, this message translates to:
+  /// **'Modern'**
+  String get modernFilter;
+
+  /// No description provided for @edit.
+  ///
+  /// In en, this message translates to:
+  /// **'Edit'**
+  String get edit;
+
+  /// No description provided for @done.
+  ///
+  /// In en, this message translates to:
+  /// **'Done'**
+  String get done;
+
+  /// No description provided for @visitor.
+  ///
+  /// In en, this message translates to:
+  /// **'Visitor'**
+  String get visitor;
+
+  /// No description provided for @copyUid.
+  ///
+  /// In en, this message translates to:
+  /// **'Copy UID'**
+  String get copyUid;
+
+  /// No description provided for @uidCopied.
+  ///
+  /// In en, this message translates to:
+  /// **'UID copied'**
+  String get uidCopied;
+
+  /// No description provided for @offlineDownloads.
+  ///
+  /// In en, this message translates to:
+  /// **'Offline downloads'**
+  String get offlineDownloads;
+
+  /// No description provided for @watchPreferences.
+  ///
+  /// In en, this message translates to:
+  /// **'Watch preferences'**
+  String get watchPreferences;
+
+  /// No description provided for @contactSupport.
+  ///
+  /// In en, this message translates to:
+  /// **'Contact support'**
+  String get contactSupport;
+
+  /// No description provided for @vipBrandName.
+  ///
+  /// In en, this message translates to:
+  /// **'Netshort VIP'**
+  String get vipBrandName;
+
+  /// No description provided for @mineVipSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Enjoy exclusive benefits'**
+  String get mineVipSubtitle;
+
+  /// No description provided for @favoriteEpisodeProgress.
+  ///
+  /// In en, this message translates to:
+  /// **'Episode {episode} / {total} total'**
+  String favoriteEpisodeProgress(int episode, int total);
+
+  /// No description provided for @watchedToEpisode.
+  ///
+  /// In en, this message translates to:
+  /// **'Watched to Episode {episode}'**
+  String watchedToEpisode(int episode);
+
+  /// No description provided for @homeWatchAll.
+  ///
+  /// In en, this message translates to:
+  /// **'Watch all'**
+  String get homeWatchAll;
+
+  /// No description provided for @confirmRemove.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove this item?'**
+  String get confirmRemove;
+
+  /// No description provided for @followingCountLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'Following'**
+  String get followingCountLabel;
+
+  /// No description provided for @watchRecordsCountLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'Watch records'**
+  String get watchRecordsCountLabel;
+
+  /// No description provided for @dataUnavailable.
+  ///
+  /// In en, this message translates to:
+  /// **'—'**
+  String get dataUnavailable;
+
+  /// No description provided for @commonQuestions.
+  ///
+  /// In en, this message translates to:
+  /// **'Common questions'**
+  String get commonQuestions;
+
+  /// No description provided for @aboutUs.
+  ///
+  /// In en, this message translates to:
+  /// **'About us'**
+  String get aboutUs;
+
+  /// No description provided for @aboutDescription.
+  ///
+  /// In en, this message translates to:
+  /// **'A focused, immersive place to watch short dramas.'**
+  String get aboutDescription;
+
+  /// No description provided for @versionLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'Version {version}'**
+  String versionLabel(String version);
 }
 
 class _AppLocalizationsDelegate

lib/l10n/app_localizations_en.dart

@@ -57,6 +57,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get searchDiscover => 'Search dramas, actors, genres...';
 
+  @override
+  String get searchCancel => 'Cancel';
+
   @override
   String get featured => 'Featured';
 
@@ -162,7 +165,7 @@ class AppLocalizationsEn extends AppLocalizations {
   }
 
   @override
-  String get topCharts => 'Top Charts';
+  String get topCharts => 'Hot Ranking';
 
   @override
   String get newReleases => 'New Releases';
@@ -261,9 +264,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get myTab => 'My';
 
-  @override
-  String get localViewer => 'Local Viewer';
-
   @override
   String get localDemoProfile => 'Local demo profile';
 
@@ -301,9 +301,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get history => 'History';
 
-  @override
-  String get watchlist => 'Favorites';
-
   @override
   String get likedTab => 'Liked';
 
@@ -329,7 +326,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get animatedTab => 'Animated';
 
   @override
-  String get recommendedTab => 'Recommended';
+  String get recommendedTab => 'Recommend';
 
   @override
   String get noCategoryDramas => 'No dramas in this category yet.';
@@ -687,18 +684,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get retry => 'Retry';
 
-  @override
-  String get pullToRefresh => 'Pull to refresh';
-
-  @override
-  String get releaseToRefresh => 'Release to refresh';
-
-  @override
-  String get refreshingLabel => 'Refreshing…';
-
-  @override
-  String get noMore => 'No more';
-
   @override
   String get backToSeries => 'Back to series';
 
@@ -1407,7 +1392,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get rankingTitle => 'Top Charts';
 
   @override
-  String get rankingSubtitle => 'Ranked from today\'s live catalog feed.';
+  String get rankingSubtitle => 'Ranked live by play heat';
 
   @override
   String get rankingHot => 'Trending';
@@ -1565,4 +1550,173 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get sleepTimer => 'Sleep timer';
+
+  @override
+  String get homeSearchHint => 'Search dramas, actors, genres...';
+
+  @override
+  String get homeSectionFeatured => 'Featured';
+
+  @override
+  String get homeSectionNew => 'New';
+
+  @override
+  String get homeSectionCategories => 'Categories';
+
+  @override
+  String get homeSectionRanking => 'Charts';
+
+  @override
+  String get homeSectionCostume => 'Costume';
+
+  @override
+  String get homeSectionCommunity => 'Community';
+
+  @override
+  String get homeTagHot => 'Hot';
+
+  @override
+  String get homeTagUplifting => 'Thrilling';
+
+  @override
+  String get homeTagSweet => 'Sweet';
+
+  @override
+  String get homeTagFaceSlap => 'Revenge';
+
+  @override
+  String get homeTagAngst => 'Angst';
+
+  @override
+  String get homeBadgeHot => 'Hot';
+
+  @override
+  String get homeBadgeNew => 'New';
+
+  @override
+  String get homeBadgeAnime => 'Anime';
+
+  @override
+  String get homeGridFilterEmpty => 'No dramas match these filters';
+
+  @override
+  String get homeGridClearFilter => 'Clear filters';
+
+  @override
+  String get recommendTopTab => 'Recommend';
+
+  @override
+  String get playlistTopTab => 'Playlists';
+
+  @override
+  String get allDramasTopTab => 'All Dramas';
+
+  @override
+  String get weeklyHitsTitle => 'This Week\'s Hits';
+
+  @override
+  String get weeklyHitsSubtitle => 'Binge the hottest stories of the week!';
+
+  @override
+  String get weeklyNewTitle => 'New This Week';
+
+  @override
+  String get weeklyNewSubtitle => 'Fresh releases to start your next binge';
+
+  @override
+  String get costumeAwardsTitle => 'Costume Drama Awards';
+
+  @override
+  String get costumeAwardsSubtitle => 'Top-rated picks every costume fan needs';
+
+  @override
+  String get localFilter => 'Local';
+
+  @override
+  String get asiaFilter => 'Asia';
+
+  @override
+  String get westernFilter => 'Western';
+
+  @override
+  String get subtitlesOnlyFilter => 'Subtitles';
+
+  @override
+  String get dubbedFilter => 'Dubbed';
+
+  @override
+  String get reversalFilter => 'Comeback';
+
+  @override
+  String get modernFilter => 'Modern';
+
+  @override
+  String get edit => 'Edit';
+
+  @override
+  String get done => 'Done';
+
+  @override
+  String get visitor => 'Visitor';
+
+  @override
+  String get copyUid => 'Copy UID';
+
+  @override
+  String get uidCopied => 'UID copied';
+
+  @override
+  String get offlineDownloads => 'Offline downloads';
+
+  @override
+  String get watchPreferences => 'Watch preferences';
+
+  @override
+  String get contactSupport => 'Contact support';
+
+  @override
+  String get vipBrandName => 'Netshort VIP';
+
+  @override
+  String get mineVipSubtitle => 'Enjoy exclusive benefits';
+
+  @override
+  String favoriteEpisodeProgress(int episode, int total) {
+    return 'Episode $episode / $total total';
+  }
+
+  @override
+  String watchedToEpisode(int episode) {
+    return 'Watched to Episode $episode';
+  }
+
+  @override
+  String get homeWatchAll => 'Watch all';
+
+  @override
+  String get confirmRemove => 'Remove this item?';
+
+  @override
+  String get followingCountLabel => 'Following';
+
+  @override
+  String get watchRecordsCountLabel => 'Watch records';
+
+  @override
+  String get dataUnavailable => '—';
+
+  @override
+  String get commonQuestions => 'Common questions';
+
+  @override
+  String get aboutUs => 'About us';
+
+  @override
+  String get aboutDescription =>
+      'A focused, immersive place to watch short dramas.';
+
+  @override
+  String versionLabel(String version) {
+    return 'Version $version';
+  }
 }

lib/l10n/app_localizations_id.dart

@@ -57,6 +57,9 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get searchDiscover => 'Cari drama, aktor, genre...';
 
+  @override
+  String get searchCancel => 'Batal';
+
   @override
   String get featured => 'Unggulan';
 
@@ -162,7 +165,7 @@ class AppLocalizationsId extends AppLocalizations {
   }
 
   @override
-  String get topCharts => 'Peringkat Teratas';
+  String get topCharts => 'Peringkat Populer';
 
   @override
   String get newReleases => 'Rilisan Baru';
@@ -261,9 +264,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get myTab => 'Saya';
 
-  @override
-  String get localViewer => 'Penonton Lokal';
-
   @override
   String get localDemoProfile => 'Profil demo lokal';
 
@@ -301,9 +301,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get history => 'Riwayat';
 
-  @override
-  String get watchlist => 'Daftar Tonton';
-
   @override
   String get likedTab => 'Disukai';
 
@@ -323,7 +320,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get preferences => 'Preferensi';
 
   @override
-  String get followingTab => 'Mengikuti';
+  String get followingTab => 'Daftar Tonton';
 
   @override
   String get animatedTab => 'Animasi';
@@ -690,18 +687,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get retry => 'Coba lagi';
 
-  @override
-  String get pullToRefresh => 'Tarik untuk menyegarkan';
-
-  @override
-  String get releaseToRefresh => 'Lepaskan untuk menyegarkan';
-
-  @override
-  String get refreshingLabel => 'Menyegarkan…';
-
-  @override
-  String get noMore => 'Tidak ada lagi';
-
   @override
   String get backToSeries => 'Kembali ke serial';
 
@@ -1407,7 +1392,8 @@ class AppLocalizationsId extends AppLocalizations {
   String get rankingTitle => 'Peringkat Teratas';
 
   @override
-  String get rankingSubtitle => 'Diurutkan dari feed katalog terkini.';
+  String get rankingSubtitle =>
+      'Diurutkan langsung berdasarkan jumlah tayangan';
 
   @override
   String get rankingHot => 'Populer';
@@ -1565,4 +1551,175 @@ class AppLocalizationsId extends AppLocalizations {
 
   @override
   String get sleepTimer => 'Timer tidur';
+
+  @override
+  String get homeSearchHint => 'Cari drama, aktor, genre...';
+
+  @override
+  String get homeSectionFeatured => 'Unggulan';
+
+  @override
+  String get homeSectionNew => 'Baru';
+
+  @override
+  String get homeSectionCategories => 'Kategori';
+
+  @override
+  String get homeSectionRanking => 'Peringkat';
+
+  @override
+  String get homeSectionCostume => 'Kostum';
+
+  @override
+  String get homeSectionCommunity => 'Komunitas';
+
+  @override
+  String get homeTagHot => 'Populer';
+
+  @override
+  String get homeTagUplifting => 'Membara';
+
+  @override
+  String get homeTagSweet => 'Manis';
+
+  @override
+  String get homeTagFaceSlap => 'Balas Dendam';
+
+  @override
+  String get homeTagAngst => 'Cinta Penuh Luka';
+
+  @override
+  String get homeBadgeHot => 'Populer';
+
+  @override
+  String get homeBadgeNew => 'Baru';
+
+  @override
+  String get homeBadgeAnime => 'Anime';
+
+  @override
+  String get homeGridFilterEmpty => 'Tidak ada drama yang cocok dengan filter';
+
+  @override
+  String get homeGridClearFilter => 'Hapus filter';
+
+  @override
+  String get recommendTopTab => 'Rekomendasi';
+
+  @override
+  String get playlistTopTab => 'Daftar Putar';
+
+  @override
+  String get allDramasTopTab => 'Semua Drama';
+
+  @override
+  String get weeklyHitsTitle => 'Hits Minggu Ini';
+
+  @override
+  String get weeklyHitsSubtitle =>
+      'Drama terpopuler minggu ini, tonton sekaligus!';
+
+  @override
+  String get weeklyNewTitle => 'Drama Baru Minggu Ini';
+
+  @override
+  String get weeklyNewSubtitle =>
+      'Rilisan baru untuk memulai maraton berikutnya';
+
+  @override
+  String get costumeAwardsTitle => 'Drama Kostum Terbaik';
+
+  @override
+  String get costumeAwardsSubtitle => 'Pilihan terbaik yang wajib ditonton';
+
+  @override
+  String get localFilter => 'Lokal';
+
+  @override
+  String get asiaFilter => 'Asia';
+
+  @override
+  String get westernFilter => 'Barat';
+
+  @override
+  String get subtitlesOnlyFilter => 'Subtitle';
+
+  @override
+  String get dubbedFilter => 'Dubbing';
+
+  @override
+  String get reversalFilter => 'Balas Dendam';
+
+  @override
+  String get modernFilter => 'Modern';
+
+  @override
+  String get edit => 'Edit';
+
+  @override
+  String get done => 'Selesai';
+
+  @override
+  String get visitor => 'Pengunjung';
+
+  @override
+  String get copyUid => 'Salin UID';
+
+  @override
+  String get uidCopied => 'UID disalin';
+
+  @override
+  String get offlineDownloads => 'Unduhan offline';
+
+  @override
+  String get watchPreferences => 'Preferensi tontonan';
+
+  @override
+  String get contactSupport => 'Hubungi dukungan';
+
+  @override
+  String get vipBrandName => 'Netshort VIP';
+
+  @override
+  String get mineVipSubtitle => 'Nikmati manfaat eksklusif';
+
+  @override
+  String favoriteEpisodeProgress(int episode, int total) {
+    return 'Episode $episode / total $total';
+  }
+
+  @override
+  String watchedToEpisode(int episode) {
+    return 'Ditonton hingga Episode $episode';
+  }
+
+  @override
+  String get homeWatchAll => 'Tonton semua';
+
+  @override
+  String get confirmRemove => 'Hapus item ini?';
+
+  @override
+  String get followingCountLabel => 'Mengikuti';
+
+  @override
+  String get watchRecordsCountLabel => 'Riwayat tontonan';
+
+  @override
+  String get dataUnavailable => '—';
+
+  @override
+  String get commonQuestions => 'Pertanyaan umum';
+
+  @override
+  String get aboutUs => 'Tentang kami';
+
+  @override
+  String get aboutDescription =>
+      'Tempat fokus dan imersif untuk menonton drama pendek.';
+
+  @override
+  String versionLabel(String version) {
+    return 'Versi $version';
+  }
 }

lib/l10n/app_localizations_zh.dart

@@ -56,6 +56,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get searchDiscover => '搜索短剧、演员、类型…';
 
+  @override
+  String get searchCancel => '取消';
+
   @override
   String get featured => '精选';
 
@@ -159,7 +162,7 @@ class AppLocalizationsZh extends AppLocalizations {
   }
 
   @override
-  String get topCharts => '排行榜';
+  String get topCharts => '热播榜';
 
   @override
   String get newReleases => '新剧';
@@ -256,9 +259,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get myTab => '我的';
 
-  @override
-  String get localViewer => '本地观众';
-
   @override
   String get localDemoProfile => '本地演示档案';
 
@@ -287,7 +287,7 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String watchedPercent(int percent) {
-    return '已观看 $percent%';
+    return '已看 $percent%';
   }
 
   @override
@@ -296,9 +296,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get history => '历史';
 
-  @override
-  String get watchlist => '收藏';
-
   @override
   String get likedTab => '喜欢';
 
@@ -318,7 +315,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get preferences => '偏好设置';
 
   @override
-  String get followingTab => '关注';
+  String get followingTab => '追剧';
 
   @override
   String get animatedTab => '漫剧';
@@ -679,18 +676,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get retry => '重试';
 
-  @override
-  String get pullToRefresh => '下拉刷新';
-
-  @override
-  String get releaseToRefresh => '松手刷新';
-
-  @override
-  String get refreshingLabel => '正在刷新…';
-
-  @override
-  String get noMore => '没有更多了';
-
   @override
   String get backToSeries => '返回剧集详情';
 
@@ -857,7 +842,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get freeBonus => '领免费奖励';
 
   @override
-  String get watchHistory => '观看历史';
+  String get watchHistory => '播放历史';
 
   @override
   String get settings => '设置';
@@ -1385,7 +1370,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get rankingTitle => '热门榜单';
 
   @override
-  String get rankingSubtitle => '依据目录实时分区排序。';
+  String get rankingSubtitle => '按播放热度实时排序';
 
   @override
   String get rankingHot => '热播';
@@ -1541,4 +1526,172 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String get sleepTimer => '定时关闭';
+
+  @override
+  String get homeSearchHint => '搜索短剧、演员、类型…';
+
+  @override
+  String get homeSectionFeatured => '精选';
+
+  @override
+  String get homeSectionNew => '新剧';
+
+  @override
+  String get homeSectionCategories => '分类';
+
+  @override
+  String get homeSectionRanking => '榜单';
+
+  @override
+  String get homeSectionCostume => '古装';
+
+  @override
+  String get homeSectionCommunity => '社群';
+
+  @override
+  String get homeTagHot => '热门';
+
+  @override
+  String get homeTagUplifting => '爽剧';
+
+  @override
+  String get homeTagSweet => '甜宠';
+
+  @override
+  String get homeTagFaceSlap => '打脸虐渣';
+
+  @override
+  String get homeTagAngst => '虐恋';
+
+  @override
+  String get homeBadgeHot => '热剧';
+
+  @override
+  String get homeBadgeNew => '新剧';
+
+  @override
+  String get homeBadgeAnime => '漫剧';
+
+  @override
+  String get homeGridFilterEmpty => '没有符合筛选条件的短剧';
+
+  @override
+  String get homeGridClearFilter => '清除筛选';
+
+  @override
+  String get recommendTopTab => '推荐';
+
+  @override
+  String get playlistTopTab => '剧单';
+
+  @override
+  String get allDramasTopTab => '全部短剧';
+
+  @override
+  String get weeklyHitsTitle => '本週爆款推薦';
+
+  @override
+  String get weeklyHitsSubtitle => '本週話題熱劇，一次追完!';
+
+  @override
+  String get weeklyNewTitle => '本週精選新劇';
+
+  @override
+  String get weeklyNewSubtitle => '新劇來襲！追劇節奏啟動';
+
+  @override
+  String get costumeAwardsTitle => '古裝神劇大賞';
+
+  @override
+  String get costumeAwardsSubtitle => '口碑爆棚！古裝控必收片單';
+
+  @override
+  String get localFilter => '本地';
+
+  @override
+  String get asiaFilter => '亚洲';
+
+  @override
+  String get westernFilter => '欧美';
+
+  @override
+  String get subtitlesOnlyFilter => '仅字幕';
+
+  @override
+  String get dubbedFilter => '配音';
+
+  @override
+  String get reversalFilter => '逆袭';
+
+  @override
+  String get modernFilter => '现代';
+
+  @override
+  String get edit => '编辑';
+
+  @override
+  String get done => '完成';
+
+  @override
+  String get visitor => '访客';
+
+  @override
+  String get copyUid => '复制 UID';
+
+  @override
+  String get uidCopied => 'UID 已复制';
+
+  @override
+  String get offlineDownloads => '离线缓存';
+
+  @override
+  String get watchPreferences => '观看偏好';
+
+  @override
+  String get contactSupport => '联系客服';
+
+  @override
+  String get vipBrandName => 'Netshort VIP';
+
+  @override
+  String get mineVipSubtitle => '享受专属权益';
+
+  @override
+  String favoriteEpisodeProgress(int episode, int total) {
+    return '第 $episode 集 / 共 $total 集';
+  }
+
+  @override
+  String watchedToEpisode(int episode) {
+    return '已看至 第 $episode 集';
+  }
+
+  @override
+  String get homeWatchAll => '观看全集';
+
+  @override
+  String get confirmRemove => '确定移除这条内容吗？';
+
+  @override
+  String get followingCountLabel => '追剧数';
+
+  @override
+  String get watchRecordsCountLabel => '观看记录';
+
+  @override
+  String get dataUnavailable => '—';
+
+  @override
+  String get commonQuestions => '常见问题';
+
+  @override
+  String get aboutUs => '关于我们';
+
+  @override
+  String get aboutDescription => '专注于短剧观看与沉浸式追剧体验。';
+
+  @override
+  String versionLabel(String version) {
+    return '版本 $version';
+  }
 }

lib/l10n/app_zh.arb

@@ -16,6 +16,7 @@
   "currentSeries": "当前短剧",
   "discoverTab": "剧场",
   "searchDiscover": "搜索短剧、演员、类型…",
+  "searchCancel": "取消",
   "featured": "精选",
   "recommended": "推荐",
   "fruitShortsBrand": "水果短剧",
@@ -48,7 +49,7 @@
   "authorNoteLabel": "作者声明",
   "reserve": "预约",
   "heatLabel": "{count}热度",
-  "topCharts": "排行榜",
+  "topCharts": "热播榜",
   "newReleases": "新剧",
   "newDramas": "新剧",
   "trendingMicroDramas": "热门短剧",
@@ -94,7 +95,6 @@
   "emptyHint": "有新内容时会显示在这里。",
   "demoCatalogNotice": "三部演示短剧共用同一条本地视频。",
   "myTab": "我的",
-  "localViewer": "本地观众",
   "localDemoProfile": "本地演示档案",
   "continueWatching": "继续观看",
   "episodeRemaining": "第 {episode} 集 · 还剩 {minutes} 分钟",
@@ -122,7 +122,7 @@
       "count": {"type": "int"}
     }
   },
-  "watchedPercent": "已观看 {percent}%",
+  "watchedPercent": "已看 {percent}%",
   "@watchedPercent": {
     "placeholders": {
       "percent": {
@@ -132,14 +132,13 @@
   },
   "resume": "继续播放",
   "history": "历史",
-  "watchlist": "收藏",
   "likedTab": "喜欢",
   "all": "全部",
   "inProgress": "未看完",
   "completed": "已看完",
   "noSavedShows": "这里还没有剧集。",
   "preferences": "偏好设置",
-  "followingTab": "关注",
+  "followingTab": "追剧",
   "animatedTab": "漫剧",
   "recommendedTab": "推荐",
   "noCategoryDramas": "这个分类暂时没有剧集。",
@@ -282,10 +281,6 @@
     }
   },
   "retry": "重试",
-  "pullToRefresh": "下拉刷新",
-  "releaseToRefresh": "松手刷新",
-  "refreshingLabel": "正在刷新…",
-  "noMore": "没有更多了",
   "backToSeries": "返回剧集详情",
   "nextEpisode": "下一集",
   "pause": "暂停",
@@ -341,7 +336,7 @@
   "joinVip": "开通会员",
   "earnRewards": "赚奖励",
   "freeBonus": "领免费奖励",
-  "watchHistory": "观看历史",
+  "watchHistory": "播放历史",
   "settings": "设置",
   "serverAddress": "服务器地址",
   "serverSettings": "服务器设置",
@@ -563,7 +558,7 @@
   "ledgerAdjustment": "余额调整",
   "rankingTab": "榜单",
   "rankingTitle": "热门榜单",
-  "rankingSubtitle": "依据目录实时分区排序。",
+  "rankingSubtitle": "按播放热度实时排序",
   "rankingHot": "热播",
   "rankingNew": "新剧",
   "newReleasesAll": "全部新剧",
@@ -616,5 +611,71 @@
   "danmakuSettings": "弹幕设置",
   "offlineCache": "离线缓存",
   "screenCast": "投屏",
-  "sleepTimer": "定时关闭"
+  "sleepTimer": "定时关闭",
+  "homeSearchHint": "搜索短剧、演员、类型…",
+  "homeSectionFeatured": "精选",
+  "homeSectionNew": "新剧",
+  "homeSectionCategories": "分类",
+  "homeSectionRanking": "榜单",
+  "homeSectionCostume": "古装",
+  "homeSectionCommunity": "社群",
+  "homeTagHot": "热门",
+  "homeTagUplifting": "爽剧",
+  "homeTagSweet": "甜宠",
+  "homeTagFaceSlap": "打脸虐渣",
+  "homeTagAngst": "虐恋",
+  "homeBadgeHot": "热剧",
+  "homeBadgeNew": "新剧",
+  "homeBadgeAnime": "漫剧",
+  "homeGridFilterEmpty": "没有符合筛选条件的短剧",
+  "homeGridClearFilter": "清除筛选",
+  "recommendTopTab": "推荐",
+  "playlistTopTab": "剧单",
+  "allDramasTopTab": "全部短剧",
+  "weeklyHitsTitle": "本週爆款推薦",
+  "weeklyHitsSubtitle": "本週話題熱劇，一次追完!",
+  "weeklyNewTitle": "本週精選新劇",
+  "weeklyNewSubtitle": "新劇來襲！追劇節奏啟動",
+  "costumeAwardsTitle": "古裝神劇大賞",
+  "costumeAwardsSubtitle": "口碑爆棚！古裝控必收片單",
+  "localFilter": "本地",
+  "asiaFilter": "亚洲",
+  "westernFilter": "欧美",
+  "subtitlesOnlyFilter": "仅字幕",
+  "dubbedFilter": "配音",
+  "reversalFilter": "逆袭",
+  "modernFilter": "现代",
+  "edit": "编辑",
+  "done": "完成",
+  "visitor": "访客",
+  "copyUid": "复制 UID",
+  "uidCopied": "UID 已复制",
+  "offlineDownloads": "离线缓存",
+  "watchPreferences": "观看偏好",
+  "contactSupport": "联系客服",
+  "vipBrandName": "Netshort VIP",
+  "mineVipSubtitle": "享受专属权益",
+  "favoriteEpisodeProgress": "第 {episode} 集 / 共 {total} 集",
+  "@favoriteEpisodeProgress": {
+    "placeholders": {
+      "episode": { "type": "int" },
+      "total": { "type": "int" }
+    }
+  },
+  "watchedToEpisode": "已看至 第 {episode} 集",
+  "@watchedToEpisode": { "placeholders": { "episode": { "type": "int" } } },
+  "homeWatchAll": "观看全集",
+  "confirmRemove": "确定移除这条内容吗？",
+  "followingCountLabel": "追剧数",
+  "watchRecordsCountLabel": "观看记录",
+  "dataUnavailable": "—",
+  "commonQuestions": "常见问题",
+  "aboutUs": "关于我们",
+  "aboutDescription": "专注于短剧观看与沉浸式追剧体验。",
+  "versionLabel": "版本 {version}",
+  "@versionLabel": {
+    "placeholders": {
+      "version": { "type": "String" }
+    }
+  }
 }

lib/pages/account/account_deactivate_page.dart

@@ -51,7 +51,7 @@ class _AccountDeactivatePageState extends State<AccountDeactivatePage> {
     final signedIn = context.watch<AuthController>().isSignedIn;
     final canShow = signedIn || _logic.scheduledAt != null;
     return Theme(
-      data: AppTheme.light(),
+      data: AppTheme.dark(),
       child: PlainPageScaffold(
         pageKey: const Key('account-deactivate-page'),
         backKey: const Key('account-deactivate-back'),