diff --git a/android/app/src/main/res/drawable-hdpi/android12splash.png b/android/app/src/main/res/drawable-hdpi/android12splash.png
index ed4d185..b83ff04 100644
Binary files a/android/app/src/main/res/drawable-hdpi/android12splash.png and b/android/app/src/main/res/drawable-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
index a88dd38..958fa59 100644
Binary files a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
new file mode 100644
index 0000000..f7ad471
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash_icon.png b/android/app/src/main/res/drawable-hdpi/splash_icon.png
deleted file mode 100644
index f236785..0000000
Binary files a/android/app/src/main/res/drawable-hdpi/splash_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-mdpi/android12splash.png b/android/app/src/main/res/drawable-mdpi/android12splash.png
index 251a44b..fdcfb53 100644
Binary files a/android/app/src/main/res/drawable-mdpi/android12splash.png and b/android/app/src/main/res/drawable-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
index 5254b8b..e67ebad 100644
Binary files a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
new file mode 100644
index 0000000..b2ebfd8
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash_icon.png b/android/app/src/main/res/drawable-mdpi/splash_icon.png
deleted file mode 100644
index 99fb840..0000000
Binary files a/android/app/src/main/res/drawable-mdpi/splash_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/android/app/src/main/res/drawable-night-hdpi/android12splash.png
new file mode 100644
index 0000000..b83ff04
Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/android/app/src/main/res/drawable-night-mdpi/android12splash.png
new file mode 100644
index 0000000..fdcfb53
Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-v21/launch_background.xml b/android/app/src/main/res/drawable-night-v21/launch_background.xml
new file mode 100644
index 0000000..d933a92
--- /dev/null
+++ b/android/app/src/main/res/drawable-night-v21/launch_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/splash_background" />
+</layer-list>
diff --git a/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
new file mode 100644
index 0000000..902356d
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
new file mode 100644
index 0000000..b111cdb
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
new file mode 100644
index 0000000..54c03f6
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night/launch_background.xml b/android/app/src/main/res/drawable-night/launch_background.xml
new file mode 100644
index 0000000..d933a92
--- /dev/null
+++ b/android/app/src/main/res/drawable-night/launch_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/splash_background" />
+</layer-list>
diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
new file mode 100644
index 0000000..3f0a992
Binary files /dev/null and b/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
index 30b67dd..3cc4948 100644
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Author: fruit.com.cn -->
-
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/splash_background" />
     <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@drawable/splash_icon" />
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
 </layer-list>
diff --git a/android/app/src/main/res/drawable-v31/launch_background.xml b/android/app/src/main/res/drawable-v31/launch_background.xml
index 7c342d1..515a7fb 100644
--- a/android/app/src/main/res/drawable-v31/launch_background.xml
+++ b/android/app/src/main/res/drawable-v31/launch_background.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: fruit.com.cn -->
-<!-- Android 12 already shows the icon in the system splash. This layer stays
-     the same color so the icon is not drawn a second time. -->
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/splash_background" />
diff --git a/android/app/src/main/res/drawable-xhdpi/android12splash.png b/android/app/src/main/res/drawable-xhdpi/android12splash.png
index 9794446..902356d 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/android12splash.png and b/android/app/src/main/res/drawable-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
index 83b9072..e36966c 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
new file mode 100644
index 0000000..b01e86c
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash_icon.png b/android/app/src/main/res/drawable-xhdpi/splash_icon.png
deleted file mode 100644
index 2828004..0000000
Binary files a/android/app/src/main/res/drawable-xhdpi/splash_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxhdpi/android12splash.png
index c3418c0..b111cdb 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/android12splash.png and b/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
index 871b143..5b61cb8 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
new file mode 100644
index 0000000..5143af8
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash_icon.png b/android/app/src/main/res/drawable-xxhdpi/splash_icon.png
deleted file mode 100644
index eb60578..0000000
Binary files a/android/app/src/main/res/drawable-xxhdpi/splash_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
index ac5df74..54c03f6 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png and b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
index 98f3b9b..7943abd 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
new file mode 100644
index 0000000..d255ff4
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash_icon.png b/android/app/src/main/res/drawable-xxxhdpi/splash_icon.png
deleted file mode 100644
index ab8ca49..0000000
Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
new file mode 100644
index 0000000..3f0a992
Binary files /dev/null and b/android/app/src/main/res/drawable/background.png differ
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 30b67dd..3cc4948 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Author: fruit.com.cn -->
-
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/splash_background" />
     <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@drawable/splash_icon" />
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
 </layer-list>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index c79c58a..18d2d58 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/ic_launcher_background"/>
-  <foreground>
-      <inset
-          android:drawable="@drawable/ic_launcher_foreground"
-          android:inset="16%" />
-  </foreground>
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 0d3f7bc..045ed69 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000..f89c177
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index ed7e106..36c8583 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000..8728daa
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index d751115..dacd5ff 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..7b6cf49
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index bf85ac7..66a7a49 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..978d6fb
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 7dd208f..ad7574a 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..342ea18
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
index 9ac2550..e4f4e80 100644
--- a/android/app/src/main/res/values-night-v31/styles.xml
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -6,6 +6,8 @@
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:windowSplashScreenBackground">@color/splash_background</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
-        <item name="android:windowSplashScreenIconBackgroundColor">@color/splash_background</item>
+    </style>
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">@color/splash_background</item>
     </style>
 </resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index d360f53..cad431d 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: fruit.com.cn -->
-
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
index 35944bd..a7d85a0 100644
--- a/android/app/src/main/res/values-v31/styles.xml
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -6,6 +6,8 @@
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:windowSplashScreenBackground">@color/splash_background</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
-        <item name="android:windowSplashScreenIconBackgroundColor">@color/splash_background</item>
+    </style>
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">@color/splash_background</item>
     </style>
 </resources>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 3462ee2..7ae7661 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -2,6 +2,5 @@
 <!-- Author: fruit.com.cn -->
 
 <resources>
-    <color name="splash_background">#FF100C0A</color>
-    <color name="ic_launcher_background">#C4322A</color>
-</resources>
\ No newline at end of file
+    <color name="splash_background">#1F1B16</color>
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 5d7602e..60d81cb 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: fruit.com.cn -->
-
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/assets/icon/fruitshorts.png b/assets/icon/fruitshorts.png
index bed17d0..81a691d 100644
Binary files a/assets/icon/fruitshorts.png and b/assets/icon/fruitshorts.png differ
diff --git a/assets/icon/splash_logo.png b/assets/icon/splash_logo.png
new file mode 100644
index 0000000..d8dbc36
Binary files /dev/null and b/assets/icon/splash_logo.png differ
diff --git a/assets/icon/splash_logo_android12.png b/assets/icon/splash_logo_android12.png
new file mode 100644
index 0000000..c3a14e3
Binary files /dev/null and b/assets/icon/splash_logo_android12.png differ
diff --git a/assets/icon/splash_mark.png b/assets/icon/splash_mark.png
deleted file mode 100644
index d6f5dc1..0000000
Binary files a/assets/icon/splash_mark.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index 3858b43..81a691d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 16d0383..5da074f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 457ec61..89cfe2a 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index 5822c54..ac5eea4 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 9404627..a666b0c 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index 329c73a..9d3fc09 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 3749006..cd81ebf 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 457ec61..89cfe2a 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 3072448..031ef02 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index cce1cf8..ce668c9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
index d441803..e760346 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
index 31ceca6..b36c904 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
index 9a88887..659655f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
index 4d4596f..527c293 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index cce1cf8..ce668c9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 7ff6212..c045d99 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
index 618814d..290ea44 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
index 1612bc9..9006a76 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index a9ce647..f91d348 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 7430443..d518bef 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index d407932..6628d81 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
new file mode 100644
index 0000000..9f447e1
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
new file mode 100644
index 0000000..3f0a992
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 0bedcf2..00cabce 100644
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 99fb840..b2ebfd8 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index 2828004..b01e86c 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index eb60578..5143af8 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
deleted file mode 100644
index 89c2725..0000000
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
\ No newline at end of file
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index d963036..5a37630 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -9,16 +9,26 @@
         <scene sceneID="EHf-IW-A2E">
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
+                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
+                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
-                        <color key="backgroundColor" red="0.06274509803921569" green="0.047058823529411764" blue="0.0392156862745098" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="cx-launch"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="cy-launch"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -28,6 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="84" height="84"/>
+        <image name="LaunchImage" width="1152" height="1152"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index bbee514..2c7c7c4 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -28,8 +28,41 @@
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
 		<key>NSAllowsLocalNetworking</key>
 		<true/>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>127.0.0.1</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>
diff --git a/lib/app.dart b/lib/app.dart
index ba3c8c7..3f353e5 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -6,13 +6,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
-import 'core/config/locale_controller.dart';
+import 'core/config/app_locale.dart';
 import 'core/data/remote/account_api.dart';
 import 'core/data/remote/api_client.dart';
 import 'core/data/remote/auth_api.dart';
 import 'core/data/remote/catalog_api.dart';
 import 'core/data/remote/category_api.dart';
 import 'core/data/remote/comment_api.dart';
+import 'core/data/remote/commerce_api.dart';
 import 'core/data/remote/download_api.dart';
 import 'core/data/remote/interaction_api.dart';
 import 'core/data/remote/library_api.dart';
@@ -23,11 +24,14 @@ import 'core/data/repositories/catalog_repository.dart';
 import 'core/data/repositories/account_repository.dart';
 import 'core/data/repositories/category_repository.dart';
 import 'core/data/repositories/comment_repository.dart';
+import 'core/data/repositories/commerce_repository.dart';
 import 'core/data/repositories/download_repository.dart';
 import 'core/data/repositories/favorite_repository.dart';
 import 'core/data/repositories/interaction_repository.dart';
 import 'core/data/repositories/notice_repository.dart';
 import 'core/data/repositories/playback_repository.dart';
+import 'core/data/repositories/search_repository.dart';
+import 'core/data/repositories/store_repository.dart';
 import 'core/data/repositories/watch_history_repository.dart';
 import 'core/data/services/auth_controller.dart';
 import 'core/data/services/auth_session_store.dart';
@@ -36,14 +40,27 @@ import 'core/data/services/category_controller.dart';
 import 'core/data/services/download_controller.dart';
 import 'core/data/services/favorite_controller.dart';
 import 'core/data/services/interaction_controller.dart';
+import 'core/data/services/locale_controller.dart';
 import 'core/data/services/playback_session.dart';
 import 'core/data/services/video_player_port.dart';
+import 'core/data/services/wallet_controller.dart';
+import 'core/navigation/app_route_observer.dart';
 import 'core/platform/haptics.dart';
 import 'core/theme/app_theme.dart';
 import 'core/theme/app_colors.dart';
 import 'l10n/app_localizations.dart';
 import 'pages/home/home_view.dart';
 
+/// 全局系统栏样式：浅暖导航栏、关闭 Android 对比遮罩。
+final SystemUiOverlayStyle appSystemOverlayStyle = SystemUiOverlayStyle.dark
+    .copyWith(
+      statusBarColor: Colors.transparent,
+      systemNavigationBarColor: AppColors.ink,
+      systemNavigationBarDividerColor: Colors.transparent,
+      systemNavigationBarIconBrightness: Brightness.dark,
+      systemNavigationBarContrastEnforced: false,
+    );
+
 class LumaDramaApp extends StatefulWidget {
   const LumaDramaApp({
     super.key,
@@ -58,6 +75,9 @@ class LumaDramaApp extends StatefulWidget {
     this.interactionRepository,
     this.noticeRepository,
     this.accountRepository,
+    this.commerceRepository,
+    this.storeRepository,
+    this.searchRepository,
     this.haptics = const FlutterHaptics(),
   });
 
@@ -74,6 +94,9 @@ class LumaDramaApp extends StatefulWidget {
   final InteractionRepository? interactionRepository;
   final NoticeRepository? noticeRepository;
   final AccountRepository? accountRepository;
+  final CommerceRepository? commerceRepository;
+  final StoreRepository? storeRepository;
+  final SearchRepository? searchRepository;
   final Haptics haptics;
 
   @override
@@ -134,6 +157,20 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
     _downloadRepository,
   );
 
+  late final CommerceRepository _commerceRepository =
+      widget.commerceRepository ??
+      HttpCommerceRepository(CommerceApi(_apiClient));
+
+  late final WalletController _walletController = WalletController(
+    _commerceRepository,
+  );
+
+  late final SearchRepository _searchRepository =
+      widget.searchRepository ?? HttpSearchRepository(CatalogApi(_apiClient));
+
+  late final StoreRepository _storeRepository =
+      widget.storeRepository ?? HttpStoreRepository(CommerceApi(_apiClient));
+
   late final CommentRepository _commentRepository =
       widget.commentRepository ?? HttpCommentRepository(CommentApi(_apiClient));
 
@@ -150,14 +187,19 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
   late final InteractionController _interactionController =
       InteractionController(_interactionRepository);
 
+  late final LocaleController _localeController = LocaleController();
+
   @override
   void initState() {
     super.initState();
     // 恢复本地令牌与设备号；未登录也能正常浏览，不阻塞首屏
     _auth.load();
+    unawaited(_localeController.load());
     // 登录/登出时同步收藏状态：收藏属于账号，不能跨账号串联
     _auth.addListener(_onAuthChanged);
     if (_auth.isSignedIn) unawaited(_favoriteController.load());
+    if (_auth.isSignedIn) unawaited(_walletController.load());
+    unawaited(_downloadController.restore());
   }
 
   bool _wasSignedIn = false;
@@ -168,9 +210,11 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
     _interactionController.clear();
     if (_auth.isSignedIn) {
       unawaited(_favoriteController.load());
+      unawaited(_walletController.load());
     } else {
       _favoriteController.clear();
       _downloadController.reset();
+      _walletController.reset();
     }
   }
 
@@ -179,7 +223,9 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
     _auth.removeListener(_onAuthChanged);
     _favoriteController.dispose();
     _downloadController.dispose();
+    _walletController.dispose();
     _interactionController.dispose();
+    _localeController.dispose();
     _apiClient.close();
     super.dispose();
   }
@@ -198,6 +244,9 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
         Provider<InteractionRepository>.value(value: _interactionRepository),
         Provider<NoticeRepository>.value(value: _noticeRepository),
         Provider<AccountRepository>.value(value: _accountRepository),
+        Provider<CommerceRepository>.value(value: _commerceRepository),
+        Provider<StoreRepository>.value(value: _storeRepository),
+        Provider<SearchRepository>.value(value: _searchRepository),
         Provider<Haptics>.value(value: widget.haptics),
         ChangeNotifierProvider(
           create: (_) => CatalogController(_catalogRepository)..load(),
@@ -205,30 +254,28 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
         ChangeNotifierProvider(
           create: (_) => CategoryController(_categoryRepository)..load(),
         ),
-        ChangeNotifierProvider(create: (_) => LocaleController()..load()),
         ChangeNotifierProvider.value(value: _favoriteController),
         ChangeNotifierProvider.value(value: _downloadController),
+        ChangeNotifierProvider.value(value: _walletController),
         ChangeNotifierProvider.value(value: _interactionController),
+        ChangeNotifierProvider.value(value: _localeController),
         ChangeNotifierProvider.value(value: _auth),
       ],
       child: Consumer<LocaleController>(
-        builder: (context, locale, _) => MaterialApp(
+        builder: (context, localeController, _) => MaterialApp(
+          locale: localeController.locale,
           onGenerateTitle: (context) => AppLocalizations.of(context)!.appName,
-          locale: locale.locale,
           supportedLocales: AppLocalizations.supportedLocales,
           localizationsDelegates: AppLocalizations.localizationsDelegates,
+          navigatorObservers: [appRouteObserver],
           localeResolutionCallback: (deviceLocale, _) =>
-              resolveAppLocale(locale.locale, deviceLocale),
+              resolveAppLocale(deviceLocale),
           debugShowCheckedModeBanner: false,
-          themeMode: ThemeMode.dark,
+          themeMode: ThemeMode.light,
           theme: AppTheme.light(),
-          darkTheme: AppTheme.dark(),
+          darkTheme: AppTheme.light(),
           builder: (context, child) => AnnotatedRegion<SystemUiOverlayStyle>(
-            value: SystemUiOverlayStyle.light.copyWith(
-              statusBarColor: Colors.transparent,
-              systemNavigationBarColor: AppColors.bar,
-              systemNavigationBarIconBrightness: Brightness.light,
-            ),
+            value: appSystemOverlayStyle,
             child: child ?? const SizedBox.shrink(),
           ),
           home: const HomePage(),
diff --git a/lib/core/config/app_config.dart b/lib/core/config/app_config.dart
index de06a15..a75bc96 100644
--- a/lib/core/config/app_config.dart
+++ b/lib/core/config/app_config.dart
@@ -1,3 +1,5 @@
+// Author: fruit.com.cn
+
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
@@ -9,20 +11,36 @@ import 'package:flutter/foundation.dart';
 class AppConfig {
   const AppConfig._();
 
-  /// 真机默认使用的服务地址。
+  /// 真机默认使用的开发机局域网地址。
   ///
-  /// 当前指向公网服务；换地址时改这一行。
-  static const String devHostBaseUrl = 'http://39.162.50.99:8081';
+  /// 这个地址跟着电脑所在的网络走，换网络后要用
+  /// `ipconfig getifaddr en0` 重新确认。默认值只改这一行。
+  static const String devHostBaseUrl = 'http://192.168.31.187:8081';
 
-  /// 双网络探测的首选地址，当前与默认地址一致（公网服务）。
-  static const String lanBaseUrl = 'http://39.162.50.99:8081';
+  /// 本机后端地址：通过 `adb reverse tcp:8081 tcp:8081` 映射到开发机，
+  /// 探测可达时 App 直连本机服务；不可达时回落到公网地址。
+  static const String lanBaseUrl = 'http://127.0.0.1:8081';
 
-  static const String _loopbackBaseUrl = 'http://127.0.0.1:8081';
+  /// 公网地址（远程/移动网络访问时使用）。
+  static const String publicBaseUrl = 'http://39.162.50.99:8081';
 
   static const String _overrideBaseUrl = String.fromEnvironment('API_BASE_URL');
 
   static String _runtimeBaseUrl = '';
 
+  static Future<void>? _ready;
+
+  /// 启动地址探测完成信号；默认已完成，避免影响既有测试与调用方。
+  static Future<void> get ready => _ready ?? Future<void>.value();
+  static set ready(Future<void> value) => _ready = value;
+
+  static const Duration _probeTimeout = Duration(seconds: 2);
+  static const List<String> _probeCandidates = [
+    lanBaseUrl,
+    devHostBaseUrl,
+    publicBaseUrl,
+  ];
+
   /// Build-time server URL supplied through `--dart-define=API_BASE_URL`.
   static String get compiledBaseUrl => _overrideBaseUrl;
 
@@ -35,7 +53,7 @@ class AppConfig {
       : (compiledBaseUrl.isNotEmpty ? compiledBaseUrl : defaultBaseUrl);
 
   static final String _defaultBaseUrl = _runsOnDevMachine
-      ? _loopbackBaseUrl
+      ? lanBaseUrl
       : devHostBaseUrl;
 
   /// 模拟器、桌面端与开发机同机，环回地址可用；iOS 真机不满足。
@@ -61,28 +79,85 @@ class AppConfig {
 
   static const Duration requestTimeout = Duration(seconds: 8);
 
-  /// 探测内网地址是否可达，可达则切换为内网直连，否则回落到公网地址。
+  /// 按环回、开发机、公网顺序探测，写入首个返回 200 的地址。
   ///
-  /// Wi-Fi 下内网直连更快；移动数据下内网不可达，自动回落到公网端口映射。
-  static Future<void> probeAndApplyBaseUrl() async {
-    try {
-      final client = HttpClient()
-        ..connectionTimeout = const Duration(seconds: 2);
-      final request = await client.getUrl(
-        Uri.parse('$lanBaseUrl/app/categories'),
-      );
-      final response = await request.close().timeout(const Duration(seconds: 2));
-      await response.drain<void>();
-      client.close(force: true);
-      if (response.statusCode == 200) {
-        applyRuntimeBaseUrl(lanBaseUrl);
+  /// 全部不可达时使用平台默认地址，真机保留开发机地址，避免退回公网。
+  static Future<void> probeAndApplyBaseUrl({
+    Future<bool> Function(String baseUrl)? probe,
+    String? fallbackBaseUrl,
+
+    /// 编译期地址测试注入；未传时读取 `API_BASE_URL`。
+    String? compiledOverride,
+  }) async {
+    final compiled = compiledOverride ?? compiledBaseUrl;
+    if (compiled.isNotEmpty) {
+      if (_runtimeBaseUrl.isEmpty) applyRuntimeBaseUrl(compiled);
+      return;
+    }
+    final candidates = <String>[
+      if (_runtimeBaseUrl.isNotEmpty) _runtimeBaseUrl,
+      for (final candidate in _probeCandidates)
+        if (candidate != _runtimeBaseUrl) candidate,
+    ];
+    final results = await Future.wait([
+      for (final candidate in candidates)
+        probe == null
+            ? _probeBaseUrl(candidate)
+            : _runInjectedProbe(candidate, probe),
+    ]);
+    for (var index = 0; index < candidates.length; index++) {
+      final candidate = candidates[index];
+      final result = results[index];
+      if (kDebugMode) {
+        final status = result.ok
+            ? 'ok'
+            : 'fail(${result.reason ?? 'request failed'})';
+        debugPrint('[probe] $candidate -> $status');
+      }
+      if (result.ok) {
+        applyRuntimeBaseUrl(candidate);
         return;
       }
-    } catch (_) {
-      // 内网不可达，回落到公网。
     }
-    applyRuntimeBaseUrl(
-      compiledBaseUrl.isNotEmpty ? compiledBaseUrl : defaultBaseUrl,
+    applyRuntimeBaseUrl(fallbackBaseUrl ?? defaultBaseUrl);
+  }
+
+  static Future<_ProbeResult> _runInjectedProbe(
+    String baseUrl,
+    Future<bool> Function(String baseUrl) probe,
+  ) async {
+    try {
+      return _ProbeResult(ok: await probe(baseUrl));
+    } catch (error) {
+      return _ProbeResult(ok: false, reason: error.toString());
+    }
+  }
+
+  static Future<_ProbeResult> _probeBaseUrl(String baseUrl) async {
+    final client = HttpClient()..connectionTimeout = _probeTimeout;
+    try {
+      return await _requestCategories(
+        client,
+        Uri.parse('$baseUrl/app/categories'),
+      ).timeout(_probeTimeout);
+    } catch (error) {
+      return _ProbeResult(ok: false, reason: error.toString());
+    } finally {
+      client.close(force: true);
+    }
+  }
+
+  static Future<_ProbeResult> _requestCategories(
+    HttpClient client,
+    Uri uri,
+  ) async {
+    final request = await client.getUrl(uri);
+    final response = await request.close();
+    await response.drain<void>();
+    final ok = response.statusCode == 200;
+    return _ProbeResult(
+      ok: ok,
+      reason: ok ? null : 'HTTP ${response.statusCode}',
     );
   }
 
@@ -93,3 +168,10 @@ class AppConfig {
     return '$apiBaseUrl$path';
   }
 }
+
+class _ProbeResult {
+  const _ProbeResult({required this.ok, this.reason});
+
+  final bool ok;
+  final String? reason;
+}
diff --git a/lib/core/config/app_locale.dart b/lib/core/config/app_locale.dart
new file mode 100644
index 0000000..5e5b725
--- /dev/null
+++ b/lib/core/config/app_locale.dart
@@ -0,0 +1,12 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/widgets.dart';
+
+/// 将系统语言解析为受支持的语言；不支持时回退印尼语。
+Locale resolveAppLocale(Locale? deviceLocale) {
+  return switch (deviceLocale?.languageCode) {
+    'zh' => const Locale('zh'),
+    'en' => const Locale('en'),
+    _ => const Locale('id'),
+  };
+}
diff --git a/lib/core/config/locale_controller.dart b/lib/core/config/locale_controller.dart
deleted file mode 100644
index 9404b4c..0000000
--- a/lib/core/config/locale_controller.dart
+++ /dev/null
@@ -1,56 +0,0 @@
-// Author: fruit.com.cn
-
-import 'package:flutter/widgets.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-/// Resolves the selected or system language to one of the supported app locales.
-///
-/// Indonesian is the launch-market fallback when a device uses an unsupported
-/// language. The legacy `in` code is treated as Indonesian as well.
-Locale resolveAppLocale(Locale? selected, Locale? deviceLocale) {
-  final code = (selected ?? deviceLocale)?.languageCode;
-  return switch (code) {
-    'zh' => const Locale('zh'),
-    'en' => const Locale('en'),
-    _ => const Locale('id'),
-  };
-}
-
-class LocaleController extends ChangeNotifier {
-  LocaleController({SharedPreferencesAsync? preferences})
-    : _preferences = preferences ?? SharedPreferencesAsync();
-
-  final SharedPreferencesAsync _preferences;
-  Locale? _locale;
-  Locale? get locale => _locale;
-
-  Future<void> load() async {
-    try {
-      final code = await _preferences.getString('ui.locale');
-      _locale = switch (code) {
-        'en' => const Locale('en'),
-        'zh' => const Locale('zh'),
-        'id' => const Locale('id'),
-        _ => null,
-      };
-      notifyListeners();
-    } catch (_) {
-      // The system locale remains usable if preferences are unavailable.
-    }
-  }
-
-  Future<void> select(String code) async {
-    _locale = switch (code) {
-      'en' => const Locale('en'),
-      'zh' => const Locale('zh'),
-      'id' => const Locale('id'),
-      _ => null,
-    };
-    notifyListeners();
-    try {
-      await _preferences.setString('ui.locale', code);
-    } catch (_) {
-      // Preference persistence is best effort for this prototype.
-    }
-  }
-}
diff --git a/lib/core/config/server_endpoint.dart b/lib/core/config/server_endpoint.dart
index 332eb6b..b5c6b5f 100644
--- a/lib/core/config/server_endpoint.dart
+++ b/lib/core/config/server_endpoint.dart
@@ -69,6 +69,7 @@ abstract final class ServerEndpoint {
         preferenceKey,
         normalized,
       );
+      AppConfig.applyRuntimeBaseUrl(normalized);
       return true;
     } catch (_) {
       return false;
diff --git a/lib/core/data/models/drama.dart b/lib/core/data/models/drama.dart
index fed6cfa..adf6f75 100644
--- a/lib/core/data/models/drama.dart
+++ b/lib/core/data/models/drama.dart
@@ -65,6 +65,10 @@ class Drama {
     this.freeEpisodes = 0,
     this.isHot = false,
     this.viewCount = 0,
+    this.likeCount,
+    this.favoriteCount,
+    this.commentCount,
+    this.language = '',
     this.detailLoaded = false,
   });
 
@@ -80,6 +84,14 @@ class Drama {
   final bool isHot;
   final int viewCount;
 
+  /// 详情下发的互动数量；卡片或旧接口没有这些字段时为 null（客户端不显示数字）。
+  final int? likeCount;
+  final int? favoriteCount;
+  final int? commentCount;
+
+  /// 卡片语种（如 zh-CN / id），用于剧场语言筛选。
+  final String language;
+
   /// 详情接口是否已经取过完整剧集列表。
   /// 列表卡片只带一集可播预览，需要完整剧集时再进详情。
   final bool detailLoaded;
@@ -104,6 +116,10 @@ class Drama {
       isHot: json['isHot'] == true,
       // viewCount 后端是 Long，按字符串下发（见 json_numbers.dart）
       viewCount: jsonToInt(json['viewCount']),
+      likeCount: _optionalInt(json['likeCount']),
+      favoriteCount: _optionalInt(json['favoriteCount']),
+      commentCount: _optionalInt(json['commentCount']),
+      language: json['language'] as String? ?? '',
     );
   }
 
@@ -120,6 +136,10 @@ class Drama {
       freeEpisodes: (json['freeEpisodes'] as num?)?.toInt() ?? 0,
       isHot: json['isHot'] == true,
       viewCount: jsonToInt(json['viewCount']),
+      likeCount: _optionalInt(json['likeCount']),
+      favoriteCount: _optionalInt(json['favoriteCount']),
+      commentCount: _optionalInt(json['commentCount']),
+      language: json['language'] as String? ?? '',
       detailLoaded: true,
       episodes: (json['episodes'] as List? ?? const [])
           .whereType<Map<String, dynamic>>()
@@ -128,3 +148,5 @@ class Drama {
     );
   }
 }
+
+int? _optionalInt(dynamic value) => value == null ? null : jsonToInt(value);
diff --git a/lib/core/data/models/order.dart b/lib/core/data/models/order.dart
new file mode 100644
index 0000000..39a9dcf
--- /dev/null
+++ b/lib/core/data/models/order.dart
@@ -0,0 +1,49 @@
+// Author: fruit.com.cn
+
+import 'json_numbers.dart';
+
+/// 充值订单：`POST /app/orders` 创建的 `CREATED` 订单，等待支付。
+class AppOrder {
+  const AppOrder({
+    required this.id,
+    required this.orderNo,
+    required this.productName,
+    required this.coinAmount,
+    required this.status,
+    this.productId = '',
+    this.type = '',
+    this.amount = '',
+    this.currency = '',
+    this.createdAt,
+  });
+
+  static const String created = 'CREATED';
+
+  final String id;
+  final String orderNo;
+  final String productId;
+  final String productName;
+  final String type;
+  final int coinAmount;
+  final String amount;
+  final String currency;
+  final String status;
+  final DateTime? createdAt;
+
+  bool get isCreated => status == created;
+
+  factory AppOrder.fromJson(Map<String, dynamic> json) {
+    return AppOrder(
+      id: (json['id'] ?? '').toString(),
+      orderNo: json['orderNo'] as String? ?? '',
+      productId: (json['productId'] ?? '').toString(),
+      productName: json['productName'] as String? ?? '',
+      type: json['type'] as String? ?? '',
+      coinAmount: jsonToInt(json['coinAmount']),
+      amount: (json['amount'] ?? '').toString(),
+      currency: json['currency'] as String? ?? '',
+      status: json['status'] as String? ?? '',
+      createdAt: DateTime.tryParse(json['createdAt'] as String? ?? ''),
+    );
+  }
+}
diff --git a/lib/core/data/models/play_ticket.dart b/lib/core/data/models/play_ticket.dart
index bb4a899..a585079 100644
--- a/lib/core/data/models/play_ticket.dart
+++ b/lib/core/data/models/play_ticket.dart
@@ -13,6 +13,7 @@ class PlayTicket {
     this.durationSec = 0,
     this.unlockCoin = 0,
     this.previewSeconds = 0,
+    this.qualities = const [],
   });
 
   static const String free = 'FREE';
@@ -35,6 +36,9 @@ class PlayTicket {
   /// 试看秒数：仅 `COIN_REQUIRED` 时有意义（付费解锁在 B2 做）。
   final int previewSeconds;
 
+  /// 后端下发的清晰度档位（如 AUTO / 720P / 1080P），HLS 由播放器自动切换。
+  final List<String> qualities;
+
   bool get needsUnlock =>
       accessType == coinRequired || accessType == vipRequired;
 
@@ -50,6 +54,10 @@ class PlayTicket {
       durationSec: jsonToInt(json['durationSec']),
       unlockCoin: jsonToInt(json['unlockCoin']),
       previewSeconds: jsonToInt(json['previewSeconds']),
+      qualities: (json['qualities'] as List? ?? const [])
+          .whereType<String>()
+          .where((quality) => quality.isNotEmpty)
+          .toList(),
     );
   }
 }
diff --git a/lib/core/data/models/product.dart b/lib/core/data/models/product.dart
new file mode 100644
index 0000000..5f277e6
--- /dev/null
+++ b/lib/core/data/models/product.dart
@@ -0,0 +1,54 @@
+// Author: fruit.com.cn
+
+import 'json_numbers.dart';
+
+/// 充值商品：`GET /app/products` 的 `COIN_PACK` / `VIP` 条目。
+class AppProduct {
+  const AppProduct({
+    required this.id,
+    required this.code,
+    required this.name,
+    required this.type,
+    this.coinAmount = 0,
+    this.bonusCoin = 0,
+    this.totalCoin = 0,
+    this.displayPrice = '',
+    this.currency = '',
+    this.vipDays = 0,
+  });
+
+  static const String coinPackType = 'COIN_PACK';
+  static const String vipType = 'VIP';
+
+  final String id;
+  final String code;
+  final String name;
+  final String type;
+  final int coinAmount;
+  final int bonusCoin;
+  final int totalCoin;
+  final String displayPrice;
+  final String currency;
+  final int vipDays;
+
+  bool get isVip => type == vipType;
+
+  factory AppProduct.fromJson(Map<String, dynamic> json) {
+    final coinAmount = jsonToInt(json['coinAmount']);
+    final bonusCoin = jsonToInt(json['bonusCoin']);
+    return AppProduct(
+      id: (json['id'] ?? '').toString(),
+      code: json['code'] as String? ?? '',
+      name: json['name'] as String? ?? '',
+      type: json['type'] as String? ?? '',
+      coinAmount: coinAmount,
+      bonusCoin: bonusCoin,
+      totalCoin: json['totalCoin'] == null
+          ? coinAmount + bonusCoin
+          : jsonToInt(json['totalCoin']),
+      displayPrice: json['displayPrice'] as String? ?? '',
+      currency: json['currency'] as String? ?? '',
+      vipDays: jsonToInt(json['vipDays']),
+    );
+  }
+}
diff --git a/lib/core/data/models/search_result.dart b/lib/core/data/models/search_result.dart
new file mode 100644
index 0000000..9e7b852
--- /dev/null
+++ b/lib/core/data/models/search_result.dart
@@ -0,0 +1,22 @@
+// Author: fruit.com.cn
+
+import 'drama.dart';
+import 'json_numbers.dart';
+
+/// 搜索分页结果：`GET /app/search` 的 `{total, list}`。
+class SearchResult {
+  const SearchResult({this.total = 0, this.list = const []});
+
+  final int total;
+  final List<Drama> list;
+
+  factory SearchResult.fromJson(Map<String, dynamic> json) {
+    return SearchResult(
+      total: jsonToInt(json['total']),
+      list: (json['list'] as List? ?? const [])
+          .whereType<Map<String, dynamic>>()
+          .map(Drama.fromCardJson)
+          .toList(),
+    );
+  }
+}
diff --git a/lib/core/data/models/wallet.dart b/lib/core/data/models/wallet.dart
new file mode 100644
index 0000000..1819391
--- /dev/null
+++ b/lib/core/data/models/wallet.dart
@@ -0,0 +1,107 @@
+// Author: fruit.com.cn
+
+import 'json_numbers.dart';
+
+/// 金币钱包与流水：对应 `GET /app/wallet` 的 `wallet` / `ledger`。
+class CoinWallet {
+  const CoinWallet({
+    required this.coinBalance,
+    required this.totalRechargedCoin,
+    required this.totalConsumedCoin,
+    required this.totalRefundedCoin,
+  });
+
+  final int coinBalance;
+  final int totalRechargedCoin;
+  final int totalConsumedCoin;
+  final int totalRefundedCoin;
+
+  factory CoinWallet.fromJson(Map<String, dynamic> json) {
+    return CoinWallet(
+      coinBalance: jsonToInt(json['coinBalance']),
+      totalRechargedCoin: jsonToInt(json['totalRechargedCoin']),
+      totalConsumedCoin: jsonToInt(json['totalConsumedCoin']),
+      totalRefundedCoin: jsonToInt(json['totalRefundedCoin']),
+    );
+  }
+}
+
+/// 一笔金币变动；[changeAmount] 正数入账、负数出账。
+class CoinLedgerEntry {
+  const CoinLedgerEntry({
+    required this.id,
+    required this.changeAmount,
+    required this.balanceAfter,
+    required this.bizType,
+    required this.remark,
+    required this.createdAt,
+  });
+
+  final String id;
+  final int changeAmount;
+  final int balanceAfter;
+  final String bizType;
+  final String remark;
+  final DateTime? createdAt;
+
+  factory CoinLedgerEntry.fromJson(Map<String, dynamic> json) {
+    return CoinLedgerEntry(
+      id: (json['id'] ?? '').toString(),
+      changeAmount: jsonToInt(json['changeAmount']),
+      balanceAfter: jsonToInt(json['balanceAfter']),
+      bizType: json['bizType'] as String? ?? '',
+      remark: json['remark'] as String? ?? '',
+      createdAt: DateTime.tryParse(json['createdAt'] as String? ?? ''),
+    );
+  }
+}
+
+/// 钱包页一次渲染所需的余额与最近流水。
+class WalletSnapshot {
+  const WalletSnapshot({required this.wallet, this.ledger = const []});
+
+  final CoinWallet wallet;
+  final List<CoinLedgerEntry> ledger;
+
+  factory WalletSnapshot.fromJson(Map<String, dynamic> json) {
+    final wallet = json['wallet'];
+    return WalletSnapshot(
+      wallet: wallet is Map<String, dynamic>
+          ? CoinWallet.fromJson(wallet)
+          : const CoinWallet(
+              coinBalance: 0,
+              totalRechargedCoin: 0,
+              totalConsumedCoin: 0,
+              totalRefundedCoin: 0,
+            ),
+      ledger: (json['ledger'] as List? ?? const [])
+          .whereType<Map<String, dynamic>>()
+          .map(CoinLedgerEntry.fromJson)
+          .toList(),
+    );
+  }
+}
+
+/// 金币解锁结果：`POST /app/episodes/{id}/unlock`。
+class UnlockResult {
+  const UnlockResult({
+    required this.unlocked,
+    required this.accessType,
+    required this.coinCost,
+    required this.coinBalance,
+  });
+
+  final bool unlocked;
+  final String accessType;
+  final int coinCost;
+  final int coinBalance;
+
+  factory UnlockResult.fromJson(Map<String, dynamic> json) {
+    return UnlockResult(
+      unlocked: json['unlocked'] == true,
+      accessType: json['accessType'] as String? ?? '',
+      coinCost: jsonToInt(json['coinCost']),
+      coinBalance: jsonToInt(json['coinBalance']),
+    );
+  }
+}
diff --git a/lib/core/data/remote/api_client.dart b/lib/core/data/remote/api_client.dart
index 906a66d..6f934f1 100644
--- a/lib/core/data/remote/api_client.dart
+++ b/lib/core/data/remote/api_client.dart
@@ -21,7 +21,7 @@ class ApiClient {
     this.tokenRefresher,
     this.onUnauthorized,
     this.deviceIdReader,
-  }) : baseUrl = baseUrl ?? AppConfig.apiBaseUrl {
+  }) : _fixedBaseUrl = baseUrl {
     _dio = Dio(
       BaseOptions(
         baseUrl: this.baseUrl,
@@ -45,9 +45,12 @@ class ApiClient {
     }
   }
 
-  final String baseUrl;
+  final String? _fixedBaseUrl;
   late final Dio _dio;
 
+  /// 当前请求使用的服务地址；未显式指定时跟随启动探测结果。
+  String get baseUrl => _fixedBaseUrl ?? AppConfig.apiBaseUrl;
+
   /// 取当前 access token（未登录返回 null）
   final String? Function()? accessTokenReader;
 
@@ -110,6 +113,7 @@ class ApiClient {
     bool retried = false,
     bool skipAuthRetry = false,
   }) async {
+    _syncBaseUrl();
     final disableAuthRetry = skipAuthRetry || tokenRefresher == null;
     try {
       final response = await _dio.request<Object?>(
@@ -150,5 +154,10 @@ class ApiClient {
     }
   }
 
+  void _syncBaseUrl() {
+    if (_fixedBaseUrl != null) return;
+    _dio.options.baseUrl = AppConfig.apiBaseUrl;
+  }
+
   void close() => _dio.close(force: true);
 }
diff --git a/lib/core/data/remote/auth_api.dart b/lib/core/data/remote/auth_api.dart
index 175f753..b54855d 100644
--- a/lib/core/data/remote/auth_api.dart
+++ b/lib/core/data/remote/auth_api.dart
@@ -10,6 +10,67 @@ class AuthApi {
 
   final ApiClient _client;
 
+  /// 发送短信验证码；[scene] 为 REGISTER / LOGIN / RESET_PWD / BIND。
+  Future<void> sendOtp({
+    required String target,
+    required String scene,
+    required String deviceId,
+  }) async {
+    await _client.post(
+      '/app/auth/otp',
+      body: {
+        'scene': scene,
+        'targetType': 'PHONE',
+        'target': target,
+        'deviceId': deviceId,
+      },
+    );
+  }
+
+  /// 手机号 + 验证码登录。
+  Future<AuthSession> loginWithPhone({
+    required String target,
+    required String code,
+    required String deviceId,
+    String platform = '',
+    String appVersion = '',
+  }) async {
+    final data = await _client.post(
+      '/app/auth/login',
+      body: {
+        'targetType': 'PHONE',
+        'target': target,
+        'code': code,
+        'deviceId': deviceId,
+        'platform': platform,
+        'appVersion': appVersion,
+      },
+    );
+    return AuthSession.fromJson((data as Map).cast<String, dynamic>());
+  }
+
+  /// 手机号 + 验证码注册。
+  Future<AuthSession> registerWithPhone({
+    required String target,
+    required String code,
+    required String deviceId,
+    String platform = '',
+    String appVersion = '',
+  }) async {
+    final data = await _client.post(
+      '/app/auth/register',
+      body: {
+        'targetType': 'PHONE',
+        'target': target,
+        'code': code,
+        'deviceId': deviceId,
+        'platform': platform,
+        'appVersion': appVersion,
+      },
+    );
+    return AuthSession.fromJson((data as Map).cast<String, dynamic>());
+  }
+
   Future<AuthSession> register({
     required String email,
     required String password,
diff --git a/lib/core/data/remote/catalog_api.dart b/lib/core/data/remote/catalog_api.dart
index 4346460..666c56f 100644
--- a/lib/core/data/remote/catalog_api.dart
+++ b/lib/core/data/remote/catalog_api.dart
@@ -1,5 +1,6 @@
 import '../models/drama.dart';
 import '../models/home_feed.dart';
+import '../models/search_result.dart';
 import 'api_client.dart';
 
 /// 客户端目录接口，对应后端 `/app/**`。
@@ -16,6 +17,23 @@ class CatalogApi {
     return HomeFeed.fromJson(_asMap(await _client.get('/app/discover/feed')));
   }
 
+  /// 搜索已上线短剧：按标题/简介模糊匹配，分页返回卡片列表。
+  Future<SearchResult> search(
+    String keyword, {
+    int pageIndex = 1,
+    int pageSize = 20,
+  }) async {
+    final data = await _client.get(
+      '/app/search',
+      query: {
+        'keyword': keyword,
+        'pageIndex': '$pageIndex',
+        'pageSize': '$pageSize',
+      },
+    );
+    return SearchResult.fromJson(_asMap(data));
+  }
+
   Future<Drama> dramaDetail(String dramaId) async {
     return Drama.fromDetailJson(
       _asMap(await _client.get('/app/dramas/$dramaId')),
diff --git a/lib/core/data/remote/commerce_api.dart b/lib/core/data/remote/commerce_api.dart
new file mode 100644
index 0000000..5728a69
--- /dev/null
+++ b/lib/core/data/remote/commerce_api.dart
@@ -0,0 +1,50 @@
+// Author: fruit.com.cn
+
+import '../models/order.dart';
+import '../models/product.dart';
+import '../models/wallet.dart';
+import 'api_client.dart';
+
+/// 金币与解锁接口，对应契约 §1.8。
+class CommerceApi {
+  const CommerceApi(this._client);
+
+  final ApiClient _client;
+
+  Future<WalletSnapshot> wallet() async {
+    final data = await _client.get('/app/wallet');
+    if (data is Map<String, dynamic>) return WalletSnapshot.fromJson(data);
+    throw const ApiException(-1, '返回数据格式异常');
+  }
+
+  /// 上架商品列表；`type` 传 `COIN_PACK` 或 `VIP`。
+  Future<List<AppProduct>> products({String? type}) async {
+    final data = await _client.get(
+      '/app/products',
+      query: type == null ? null : {'type': type},
+    );
+    if (data is List) {
+      return data
+          .whereType<Map<String, dynamic>>()
+          .map(AppProduct.fromJson)
+          .toList();
+    }
+    throw const ApiException(-1, '返回数据格式异常');
+  }
+
+  /// 创建充值订单，返回 `CREATED` 状态订单。
+  Future<AppOrder> createOrder(String productId) async {
+    final data = await _client.post(
+      '/app/orders',
+      body: {'productId': productId},
+    );
+    if (data is Map<String, dynamic>) return AppOrder.fromJson(data);
+    throw const ApiException(-1, '返回数据格式异常');
+  }
+
+  Future<UnlockResult> unlock(String episodeId) async {
+    final data = await _client.post('/app/episodes/$episodeId/unlock');
+    if (data is Map<String, dynamic>) return UnlockResult.fromJson(data);
+    throw const ApiException(-1, '返回数据格式异常');
+  }
+}
diff --git a/lib/core/data/repositories/commerce_repository.dart b/lib/core/data/repositories/commerce_repository.dart
new file mode 100644
index 0000000..93436fc
--- /dev/null
+++ b/lib/core/data/repositories/commerce_repository.dart
@@ -0,0 +1,23 @@
+// Author: fruit.com.cn
+
+import '../models/wallet.dart';
+import '../remote/commerce_api.dart';
+
+/// 钱包与金币解锁的数据来源。
+abstract interface class CommerceRepository {
+  Future<WalletSnapshot> fetchWallet();
+
+  Future<UnlockResult> unlock(String episodeId);
+}
+
+class HttpCommerceRepository implements CommerceRepository {
+  const HttpCommerceRepository(this._api);
+
+  final CommerceApi _api;
+
+  @override
+  Future<WalletSnapshot> fetchWallet() => _api.wallet();
+
+  @override
+  Future<UnlockResult> unlock(String episodeId) => _api.unlock(episodeId);
+}
diff --git a/lib/core/data/repositories/playback_repository.dart b/lib/core/data/repositories/playback_repository.dart
index 24bc443..d68065a 100644
--- a/lib/core/data/repositories/playback_repository.dart
+++ b/lib/core/data/repositories/playback_repository.dart
@@ -59,7 +59,8 @@ class _CachedTicket {
   final PlayTicket ticket;
   final DateTime fetchedAt;
 
-  bool isExpired(DateTime now, Duration ttl) => now.difference(fetchedAt) >= ttl;
+  bool isExpired(DateTime now, Duration ttl) =>
+      now.difference(fetchedAt) >= ttl;
 }
 
 /// 测试与离线场景用：按集返回固定票据，并记录被请求过几次。
@@ -91,6 +92,7 @@ class FakePlaybackRepository implements PlaybackRepository {
           accessible: true,
           accessType: PlayTicket.free,
           playUrl: '/files/episode/fake-$episodeId.mp4?e=1&s=abc',
+          qualities: const ['AUTO', '720P', '1080P'],
         );
   }
 }
diff --git a/lib/core/data/repositories/search_repository.dart b/lib/core/data/repositories/search_repository.dart
new file mode 100644
index 0000000..c59816e
--- /dev/null
+++ b/lib/core/data/repositories/search_repository.dart
@@ -0,0 +1,26 @@
+// Author: fruit.com.cn
+
+import '../models/search_result.dart';
+import '../remote/catalog_api.dart';
+
+/// 搜索数据来源：只调用后端 `/app/search`，不在客户端做本地过滤。
+abstract interface class SearchRepository {
+  Future<SearchResult> search(
+    String keyword, {
+    int pageIndex = 1,
+    int pageSize = 20,
+  });
+}
+
+class HttpSearchRepository implements SearchRepository {
+  const HttpSearchRepository(this._api);
+
+  final CatalogApi _api;
+
+  @override
+  Future<SearchResult> search(
+    String keyword, {
+    int pageIndex = 1,
+    int pageSize = 20,
+  }) => _api.search(keyword, pageIndex: pageIndex, pageSize: pageSize);
+}
diff --git a/lib/core/data/repositories/store_repository.dart b/lib/core/data/repositories/store_repository.dart
new file mode 100644
index 0000000..71cb76b
--- /dev/null
+++ b/lib/core/data/repositories/store_repository.dart
@@ -0,0 +1,25 @@
+// Author: fruit.com.cn
+
+import '../models/order.dart';
+import '../models/product.dart';
+import '../remote/commerce_api.dart';
+
+/// 商品与订单来源：充值页、会员页共用。
+abstract interface class StoreRepository {
+  Future<List<AppProduct>> fetchProducts({String? type});
+
+  Future<AppOrder> createOrder(String productId);
+}
+
+class HttpStoreRepository implements StoreRepository {
+  const HttpStoreRepository(this._api);
+
+  final CommerceApi _api;
+
+  @override
+  Future<List<AppProduct>> fetchProducts({String? type}) =>
+      _api.products(type: type);
+
+  @override
+  Future<AppOrder> createOrder(String productId) => _api.createOrder(productId);
+}
diff --git a/lib/core/data/services/auth_controller.dart b/lib/core/data/services/auth_controller.dart
index 32713ba..2ce72dd 100644
--- a/lib/core/data/services/auth_controller.dart
+++ b/lib/core/data/services/auth_controller.dart
@@ -57,6 +57,43 @@ class AuthController extends ChangeNotifier {
     await _apply(session);
   }
 
+  Future<void> sendOtp({
+    required String target,
+    String scene = 'LOGIN',
+  }) async {
+    await _api.sendOtp(
+      target: target,
+      scene: scene,
+      deviceId: await _store.deviceId(),
+    );
+  }
+
+  Future<void> signInWithPhone({
+    required String target,
+    required String code,
+  }) async {
+    final session = await _api.loginWithPhone(
+      target: target,
+      code: code,
+      deviceId: await _store.deviceId(),
+      platform: _platform,
+    );
+    await _apply(session);
+  }
+
+  Future<void> registerWithPhone({
+    required String target,
+    required String code,
+  }) async {
+    final session = await _api.registerWithPhone(
+      target: target,
+      code: code,
+      deviceId: await _store.deviceId(),
+      platform: _platform,
+    );
+    await _apply(session);
+  }
+
   Future<void> signOut() async {
     final refreshToken = _session?.refreshToken ?? '';
     _session = null;
diff --git a/lib/core/data/services/auth_session_store.dart b/lib/core/data/services/auth_session_store.dart
index 1586759..20afccb 100644
--- a/lib/core/data/services/auth_session_store.dart
+++ b/lib/core/data/services/auth_session_store.dart
@@ -14,6 +14,11 @@ import '../models/auth_session.dart';
 /// 设备号是后端注册风控与后续"下载设备绑定"的依据，所以**首次生成后就固定下来**；
 /// 不引 UUID 库（保持极简依赖），用「时间戳 + 随机数」拼一个够用的 id。
 class AuthSessionStore {
+  AuthSessionStore({SharedPreferencesAsync? preferences})
+    : _preferences = preferences ?? SharedPreferencesAsync();
+
+  final SharedPreferencesAsync _preferences;
+
   static const _kAccessToken = 'auth.accessToken';
   static const _kRefreshToken = 'auth.refreshToken';
   static const _kUser = 'auth.user';
@@ -23,25 +28,23 @@ class AuthSessionStore {
 
   Future<String> deviceId() async {
     if (_cachedDeviceId != null) return _cachedDeviceId!;
-    final prefs = SharedPreferencesAsync();
-    var value = await prefs.getString(_kDeviceId) ?? '';
+    var value = await _preferences.getString(_kDeviceId) ?? '';
     if (value.isEmpty) {
       final random = Random();
       value =
           'd-${DateTime.now().millisecondsSinceEpoch.toRadixString(36)}-'
           '${random.nextInt(1 << 32).toRadixString(36)}';
-      await prefs.setString(_kDeviceId, value);
+      await _preferences.setString(_kDeviceId, value);
     }
     _cachedDeviceId = value;
     return value;
   }
 
   Future<AuthSession?> read() async {
-    final prefs = SharedPreferencesAsync();
-    final accessToken = await prefs.getString(_kAccessToken) ?? '';
-    final refreshToken = await prefs.getString(_kRefreshToken) ?? '';
+    final accessToken = await _preferences.getString(_kAccessToken) ?? '';
+    final refreshToken = await _preferences.getString(_kRefreshToken) ?? '';
     if (accessToken.isEmpty || refreshToken.isEmpty) return null;
-    final rawUser = await prefs.getString(_kUser);
+    final rawUser = await _preferences.getString(_kUser);
     Map<String, dynamic> user = const {};
     if (rawUser != null && rawUser.isNotEmpty) {
       try {
@@ -58,17 +61,15 @@ class AuthSessionStore {
   }
 
   Future<void> save(AuthSession session) async {
-    final prefs = SharedPreferencesAsync();
-    await prefs.setString(_kAccessToken, session.accessToken);
-    await prefs.setString(_kRefreshToken, session.refreshToken);
-    await prefs.setString(_kUser, jsonEncode(session.user.toJson()));
+    await _preferences.setString(_kAccessToken, session.accessToken);
+    await _preferences.setString(_kRefreshToken, session.refreshToken);
+    await _preferences.setString(_kUser, jsonEncode(session.user.toJson()));
   }
 
   Future<void> clear() async {
-    final prefs = SharedPreferencesAsync();
-    await prefs.remove(_kAccessToken);
-    await prefs.remove(_kRefreshToken);
-    await prefs.remove(_kUser);
+    await _preferences.remove(_kAccessToken);
+    await _preferences.remove(_kRefreshToken);
+    await _preferences.remove(_kUser);
     // 设备号不清：它代表"这台设备"，与登录态无关
   }
 }
diff --git a/lib/core/data/services/catalog_controller.dart b/lib/core/data/services/catalog_controller.dart
index 34cccdb..dc742d8 100644
--- a/lib/core/data/services/catalog_controller.dart
+++ b/lib/core/data/services/catalog_controller.dart
@@ -2,6 +2,7 @@
 
 import 'package:flutter/foundation.dart';
 
+import '../../config/app_config.dart';
 import '../models/drama.dart';
 import '../models/home_feed.dart';
 import '../repositories/catalog_repository.dart';
@@ -22,6 +23,7 @@ class CatalogController extends ChangeNotifier {
   /// 第一次首页请求结束后为 true。之后的重试不再回到开屏。
   bool settled = false;
   String? error;
+  String? debugError;
 
   List<Drama> get dramas => feed.dramas;
   List<FeedBanner> get banners => feed.banners;
@@ -30,13 +32,19 @@ class CatalogController extends ChangeNotifier {
   Future<void> load() async {
     loading = true;
     error = null;
+    debugError = null;
     notifyListeners();
     try {
+      await AppConfig.ready;
       feed = await repository.fetchHomeFeed();
     } on ApiException catch (exception) {
       error = exception.message;
-    } catch (_) {
+      debugError = exception.toString();
+      _logFailure(exception);
+    } catch (exception) {
       error = 'catalogError';
+      debugError = exception.toString();
+      _logFailure(exception);
     } finally {
       loading = false;
       settled = true;
@@ -44,6 +52,26 @@ class CatalogController extends ChangeNotifier {
     }
   }
 
+  /// 静默刷新首页聚合：成功替换数据，失败返回 false。
+  ///
+  /// 不触碰 [loading]/[error]，因此页面不会切到全屏 loading 或清空旧数据。
+  Future<bool> refresh() async {
+    try {
+      feed = await repository.fetchHomeFeed();
+      notifyListeners();
+      return true;
+    } catch (exception) {
+      _logFailure(exception);
+      return false;
+    }
+  }
+
+  void _logFailure(Object error) {
+    if (kDebugMode) {
+      debugPrint('[catalog] base=${AppConfig.apiBaseUrl} error=$error');
+    }
+  }
+
   /// 需要完整剧集时补一次详情；已加载过则直接返回，避免重复请求。
   Future<Drama> requireDetail(Drama drama) async {
     if (drama.detailLoaded) return drama;
diff --git a/lib/core/data/services/catalog_retry.dart b/lib/core/data/services/catalog_retry.dart
new file mode 100644
index 0000000..df7b809
--- /dev/null
+++ b/lib/core/data/services/catalog_retry.dart
@@ -0,0 +1,12 @@
+// Author: fruit.com.cn
+
+import '../../config/app_config.dart';
+
+/// 重新探测服务地址后再加载指定目录数据。
+Future<void> retryCatalogLoad({
+  required Future<void> Function() reload,
+  Future<void> Function()? probe,
+}) async {
+  await (probe ?? AppConfig.probeAndApplyBaseUrl)();
+  await reload();
+}
diff --git a/lib/core/data/services/category_controller.dart b/lib/core/data/services/category_controller.dart
index efeada2..d79702b 100644
--- a/lib/core/data/services/category_controller.dart
+++ b/lib/core/data/services/category_controller.dart
@@ -2,49 +2,39 @@
 
 import 'package:flutter/foundation.dart';
 
+import '../../config/app_config.dart';
 import '../models/content_category.dart';
 import '../models/drama.dart';
 import '../models/home_feed.dart';
 import '../repositories/category_repository.dart';
 
-/// 发现页分类状态：服务端分类清单、发现 feed 与当前筛选。
+/// 剧场页数据：服务端分类清单与发现 feed。
 class CategoryController extends ChangeNotifier {
   CategoryController(this._repository);
 
-  static const String allCode = 'all';
-  static const String hotCode = 'hot';
-  static const String newCode = 'new';
-
   final CategoryRepository _repository;
 
   List<ContentCategory> categories = const [];
   HomeFeed feed = const HomeFeed();
-  String selectedCode = allCode;
   bool loading = false;
   String? error;
+  String? debugError;
   bool _disposed = false;
 
-  /// 当前筛选对应的分区 code；全部分类为空字符串语义。
-  bool get selectedSectionMissing =>
-      selectedCode != allCode && _selectedSection == null;
-
-  /// 当前筛选应展示的剧集；全部分类按 feed 顺序去重。
-  List<Drama> get visibleDramas {
-    if (selectedCode == allCode) return feed.dramas;
-    return _selectedSection?.dramas ?? const [];
-  }
-
-  FeedSection? get _selectedSection {
+  /// 分类九宫格点击后读取该分类的剧目；缺失分区返回空列表。
+  List<Drama> dramasOf(String categoryId) {
+    final code = 'category-$categoryId';
     for (final section in feed.sections) {
-      if (section.code == selectedCode) return section;
+      if (section.code == code) return section.dramas;
     }
-    return null;
+    return const [];
   }
 
   /// 加载分类与发现 feed；失败保留可重试错误态。
   Future<void> load() async {
     loading = true;
     error = null;
+    debugError = null;
     _notify();
     try {
       final results = await Future.wait<Object>([
@@ -53,23 +43,18 @@ class CategoryController extends ChangeNotifier {
       ]);
       categories = results[0] as List<ContentCategory>;
       feed = results[1] as HomeFeed;
-    } catch (_) {
+    } catch (exception) {
       error = 'categoriesError';
+      debugError = exception.toString();
+      if (kDebugMode) {
+        debugPrint('[catalog] base=${AppConfig.apiBaseUrl} error=$exception');
+      }
     } finally {
       loading = false;
       _notify();
     }
   }
 
-  /// 选择服务端分类，内容只匹配 `category-{id}`。
-  void selectCategory(String id) => selectCode('category-$id');
-
-  /// 选择内置或分区 code。
-  void selectCode(String code) {
-    selectedCode = code;
-    _notify();
-  }
-
   void _notify() {
     if (!_disposed) notifyListeners();
   }
diff --git a/lib/core/data/services/comment_controller.dart b/lib/core/data/services/comment_controller.dart
index 55f6785..a81b066 100644
--- a/lib/core/data/services/comment_controller.dart
+++ b/lib/core/data/services/comment_controller.dart
@@ -36,12 +36,17 @@ class CommentController extends ChangeNotifier {
   bool loadingMore = false;
   bool submitting = false;
   bool hasMore = false;
+  bool _loaded = false;
   String? nextCursor;
   String? error;
 
   /// 当前已加载的顶层评论。
   List<DramaComment> get comments => List.unmodifiable(_comments);
 
+  /// 全部分页加载完后返回精确的顶层评论数，否则返回 null。
+  int? get exactCount =>
+      _loaded && !loading && !loadingMore && !hasMore ? _comments.length : null;
+
   /// 某一楼层已加载的回复。
   List<DramaComment> repliesFor(String rootId) =>
       List.unmodifiable(_replies[rootId] ?? const []);
@@ -77,6 +82,7 @@ class CommentController extends ChangeNotifier {
         ..addAll(page.comments);
       nextCursor = page.nextCursor;
       hasMore = page.hasMore;
+      _loaded = true;
     } catch (failure) {
       error = _errorMessage(failure) ?? 'commentsLoadFailed';
     } finally {
diff --git a/lib/core/data/services/download_controller.dart b/lib/core/data/services/download_controller.dart
index 1e38ef8..b8108e7 100644
--- a/lib/core/data/services/download_controller.dart
+++ b/lib/core/data/services/download_controller.dart
@@ -1,11 +1,15 @@
 // Author: fruit.com.cn
 
+import 'dart:async';
+
 import 'package:flutter/foundation.dart';
 
 import '../models/download_license.dart';
 import '../models/download_policy.dart';
+import '../../config/app_config.dart';
 import '../remote/api_exception.dart';
 import '../repositories/download_repository.dart';
+import 'download_storage.dart';
 
 /// 一次下载授权申请的结果；后端业务拒绝时保留原始 message。
 class DownloadActionResult {
@@ -18,9 +22,15 @@ class DownloadActionResult {
 
 /// 下载授权与策略状态。
 class DownloadController extends ChangeNotifier {
-  DownloadController(this._repository);
+  DownloadController(this._repository, {DownloadStorage? storage})
+    : _storage = storage ?? FileDownloadStorage();
 
   final DownloadRepository _repository;
+  final DownloadStorage _storage;
+  final Map<String, String> _localPaths = {};
+  final Set<String> _downloading = {};
+  final Map<String, double> _progress = {};
+  final Map<String, DateTime> _lastReport = {};
 
   DownloadPolicy? policy;
   List<DownloadLicense> licenses = const [];
@@ -30,6 +40,18 @@ class DownloadController extends ChangeNotifier {
   String? actionError;
   bool _disposed = false;
 
+  bool isDownloaded(String episodeId) => _localPaths.containsKey(episodeId);
+
+  bool isDownloading(String episodeId) => _downloading.contains(episodeId);
+
+  double progressFor(String episodeId) => _progress[episodeId] ?? 0;
+
+  String? localPathFor(String episodeId) => _localPaths[episodeId];
+
+  /// 播放器使用：只读已同步的本地缓存；下载页加载后会把磁盘文件补进来。
+  Future<String?> findLocalPath(String episodeId) async =>
+      _localPaths[episodeId];
+
   /// 同时拉取策略与当前设备授权列表。
   Future<void> load() async {
     loading = true;
@@ -42,6 +64,7 @@ class DownloadController extends ChangeNotifier {
       ]);
       policy = results[0] as DownloadPolicy;
       licenses = results[1] as List<DownloadLicense>;
+      await _syncLocalFiles();
     } catch (_) {
       error = 'downloadsError';
     } finally {
@@ -50,6 +73,22 @@ class DownloadController extends ChangeNotifier {
     }
   }
 
+  Future<void> _syncLocalFiles() async => restore();
+
+  /// 冷启动时恢复已落盘文件，播放器只依赖这份内存索引。
+  Future<void> restore() async {
+    try {
+      final paths = await _storage.restore();
+      _localPaths.addAll(paths);
+      for (final id in paths.keys) {
+        _progress[id] = 1;
+      }
+      _notify();
+    } catch (_) {
+      // 本地目录不可用时保持未下载状态。
+    }
+  }
+
   /// 申请授权；付费、未解锁、配额满等判定完全以后端 message 为准。
   Future<DownloadActionResult> grant(
     String episodeId, {
@@ -76,6 +115,93 @@ class DownloadController extends ChangeNotifier {
     }
   }
 
+  /// 下载并落盘：授权已在 [grant] 完成，播放地址缺失时向服务端刷新一次。
+  Future<DownloadActionResult> startDownload(
+    String episodeId, {
+    DownloadLicense? license,
+  }) async {
+    if (_downloading.contains(episodeId)) return const DownloadActionResult(ok: true);
+    final source = license ?? _licenseFor(episodeId);
+    if (source == null) return const DownloadActionResult(ok: false);
+    _beginDownload(episodeId);
+    try {
+      final resolved = await _resolvePlayUrl(source);
+      final media = await _storage.download(
+        episodeId: episodeId,
+        url: resolved,
+        onProgress: (received, total) => _onProgress(episodeId, received, total),
+      );
+      _localPaths[episodeId] = media.filePath;
+      _progress[episodeId] = 1;
+      unawaited(_report(episodeId, 'COMPLETED', 100, media.bytes, media.bytes));
+      return DownloadActionResult(ok: true, license: source);
+    } catch (_) {
+      unawaited(_report(episodeId, 'FAILED', 0, null, null, 'downloadFailed'));
+      actionError = 'downloadFailed';
+      return const DownloadActionResult(ok: false);
+    } finally {
+      _downloading.remove(episodeId);
+      _notify();
+    }
+  }
+
+  DownloadLicense? _licenseFor(String episodeId) {
+    for (final item in licenses) {
+      if (item.episodeId == episodeId) return item;
+    }
+    return null;
+  }
+
+  void _beginDownload(String episodeId) {
+    _downloading.add(episodeId);
+    _progress[episodeId] = 0;
+    actionError = null;
+    unawaited(_report(episodeId, 'DOWNLOADING', 0, 0, 0));
+    _notify();
+  }
+
+  Future<String> _resolvePlayUrl(DownloadLicense license) async {
+    final current = license.playUrl.isEmpty
+        ? await _repository.refreshUrl(license.episodeId)
+        : license;
+    return AppConfig.mediaUrl(current.playUrl);
+  }
+
+  void _onProgress(String episodeId, int received, int total) {
+    final fraction = total > 0 ? received / total : 0.0;
+    _progress[episodeId] = fraction.clamp(0.0, 1.0);
+    final now = DateTime.now();
+    final last = _lastReport[episodeId];
+    if (last == null || now.difference(last) >= const Duration(seconds: 2)) {
+      _lastReport[episodeId] = now;
+      final percent = (_progress[episodeId]! * 100).round();
+      unawaited(_report(episodeId, 'DOWNLOADING', percent, received, total));
+    }
+    _notify();
+  }
+
+  Future<void> _report(
+    String episodeId,
+    String status,
+    int percent,
+    int? received,
+    int? total, [
+    String? error,
+  ]) async {
+    try {
+      await _repository.reportProgress(
+        episodeId,
+        status: status,
+        progressPercent: percent,
+        downloadedBytes: received,
+        totalBytes: total,
+        errorMsg: error,
+      );
+    } catch (_) {
+      // 进度上报失败不阻断本地播放，下次打开下载页会重新同步。
+    }
+  }
+
   /// 更新设置，先本地展示，失败恢复服务端旧值。
   Future<bool> updateSettings({bool? wifiOnly, String? maxQuality}) async {
     final previous = policy;
@@ -109,6 +235,9 @@ class DownloadController extends ChangeNotifier {
     _notify();
     try {
       await _repository.remove(episodeId);
+      await _storage.delete(episodeId);
+      _localPaths.remove(episodeId);
+      _progress.remove(episodeId);
       return true;
     } catch (_) {
       final restored = [...licenses];
@@ -134,6 +263,9 @@ class DownloadController extends ChangeNotifier {
     _notify();
     try {
       await _repository.clear();
+      await _storage.clear();
+      _localPaths.clear();
+      _progress.clear();
       return true;
     } catch (_) {
       licenses = previous;
@@ -153,6 +285,10 @@ class DownloadController extends ChangeNotifier {
     clearing = false;
     error = null;
     actionError = null;
+    _localPaths.clear();
+    _downloading.clear();
+    _progress.clear();
+    _lastReport.clear();
     _notify();
   }
 
diff --git a/lib/core/data/services/download_storage.dart b/lib/core/data/services/download_storage.dart
new file mode 100644
index 0000000..05eb4c8
--- /dev/null
+++ b/lib/core/data/services/download_storage.dart
@@ -0,0 +1,182 @@
+// Author: fruit.com.cn
+
+import 'dart:io';
+
+import 'package:path_provider/path_provider.dart';
+
+/// 下载进度回调：[received] 与 [total] 均为字节数，未知总长时 [total] 为 0。
+typedef DownloadProgress = void Function(int received, int total);
+
+/// 已落盘的媒体文件。
+class DownloadedMedia {
+  const DownloadedMedia({
+    required this.episodeId,
+    required this.filePath,
+    required this.bytes,
+  });
+
+  final String episodeId;
+  final String filePath;
+  final int bytes;
+}
+
+/// 本地媒体存储边界；页面与控制器不直接操作文件系统。
+abstract interface class DownloadStorage {
+  Future<Map<String, String>> restore();
+
+  Future<String?> localPathFor(String episodeId);
+
+  Future<DownloadedMedia> download({
+    required String episodeId,
+    required String url,
+    DownloadProgress? onProgress,
+  });
+
+  Future<void> delete(String episodeId);
+
+  Future<void> clear();
+}
+
+/// 将分集落盘到应用文档目录；临时文件完成后原子改名，避免半文件被播放。
+class FileDownloadStorage implements DownloadStorage {
+  FileDownloadStorage({
+    Future<Directory> Function()? directoryProvider,
+    HttpClient Function()? clientFactory,
+  }) : _directoryProvider = directoryProvider ?? getApplicationDocumentsDirectory,
+       _clientFactory = clientFactory ?? HttpClient.new;
+
+  final Future<Directory> Function() _directoryProvider;
+  final HttpClient Function() _clientFactory;
+
+  static const String _folder = 'downloads';
+  static const String _partSuffix = '.part';
+
+  @override
+  Future<Map<String, String>> restore() async {
+    try {
+      final directory = await _downloadDirectory();
+      final files = <String, String>{};
+      await for (final entity in directory.list()) {
+        if (entity is! File) continue;
+        final name = entity.uri.pathSegments.last;
+        if (name.endsWith(_partSuffix)) continue;
+        final dot = name.lastIndexOf('.');
+        final id = dot > 0 ? name.substring(0, dot) : name;
+        files[id] = entity.path;
+      }
+      return files;
+    } catch (_) {
+      return const {};
+    }
+  }
+
+  @override
+  Future<String?> localPathFor(String episodeId) async {
+    try {
+      final file = await _findFile(episodeId, includePartial: false);
+      return file?.path;
+    } catch (_) {
+      // 本地目录不可用时视为未下载；真正下载会单独返回错误。
+      return null;
+    }
+  }
+
+  @override
+  Future<DownloadedMedia> download({
+    required String episodeId,
+    required String url,
+    DownloadProgress? onProgress,
+  }) async {
+    final existing = await _findFile(episodeId, includePartial: false);
+    if (existing != null) {
+      final length = await existing.length();
+      onProgress?.call(length, length);
+      return DownloadedMedia(
+        episodeId: episodeId,
+        filePath: existing.path,
+        bytes: length,
+      );
+    }
+    final directory = await _downloadDirectory();
+    final target = File('${directory.path}/${_safe(episodeId)}${_extension(url)}');
+    final partial = File('${target.path}$_partSuffix');
+    final client = _clientFactory();
+    var received = 0;
+    IOSink? sink;
+    try {
+      final request = await client.getUrl(Uri.parse(url));
+      final response = await request.close();
+      if (response.statusCode != HttpStatus.ok) {
+        throw HttpException('HTTP ${response.statusCode}', uri: Uri.parse(url));
+      }
+      sink = partial.openWrite();
+      await for (final chunk in response) {
+        sink.add(chunk);
+        received += chunk.length;
+        final total = response.contentLength > 0 ? response.contentLength : 0;
+        onProgress?.call(received, total);
+      }
+      await sink.close();
+      sink = null;
+      if (await target.exists()) await target.delete();
+      final file = await partial.rename(target.path);
+      final bytes = await file.length();
+      onProgress?.call(bytes, bytes);
+      return DownloadedMedia(
+        episodeId: episodeId,
+        filePath: file.path,
+        bytes: bytes,
+      );
+    } catch (_) {
+      await sink?.close();
+      if (await partial.exists()) await partial.delete();
+      rethrow;
+    } finally {
+      client.close(force: true);
+    }
+  }
+
+  @override
+  Future<void> delete(String episodeId) async {
+    final file = await _findFile(episodeId, includePartial: true);
+    if (file != null && await file.exists()) await file.delete();
+  }
+
+  @override
+  Future<void> clear() async {
+    final directory = await _downloadDirectory();
+    await for (final entity in directory.list()) {
+      if (entity is File) await entity.delete();
+    }
+  }
+
+  Future<File?> _findFile(
+    String episodeId, {
+    required bool includePartial,
+  }) async {
+    final directory = await _downloadDirectory();
+    final prefix = _safe(episodeId);
+    await for (final entity in directory.list()) {
+      if (entity is! File) continue;
+      final name = entity.uri.pathSegments.last;
+      if (!name.startsWith(prefix)) continue;
+      final isPartial = name.endsWith(_partSuffix);
+      if (includePartial || !isPartial) return entity;
+    }
+    return null;
+  }
+
+  Future<Directory> _downloadDirectory() async {
+    final base = await _directoryProvider();
+    return Directory('${base.path}/$_folder').create(recursive: true);
+  }
+
+  String _safe(String episodeId) =>
+      episodeId.replaceAll(RegExp(r'[^A-Za-z0-9_-]'), '_');
+
+  String _extension(String url) {
+    final path = Uri.tryParse(url)?.path.toLowerCase() ?? '';
+    if (path.endsWith('.m3u8')) return '.m3u8';
+    return '.mp4';
+  }
+}
diff --git a/lib/core/data/services/interaction_controller.dart b/lib/core/data/services/interaction_controller.dart
index 9dd39c9..539ee5d 100644
--- a/lib/core/data/services/interaction_controller.dart
+++ b/lib/core/data/services/interaction_controller.dart
@@ -8,14 +8,15 @@ import '../repositories/interaction_repository.dart';
 
 /// 剧集点赞与举报的会话状态控制器。
 ///
-/// 剧集契约暂未下发初始点赞状态与计数，本批只维护当前会话内的 liked 状态，
-/// 不展示数字，也不伪造初始值。
+/// 剧集契约暂未下发初始点赞状态与计数，因此仅在点赞接口成功返回后展示
+/// 服务端最新计数，不伪造初始值。
 class InteractionController extends ChangeNotifier {
   InteractionController(this._repository);
 
   final InteractionRepository _repository;
   final Set<String> _likedDramaIds = {};
   final Set<String> _busyDramaIds = {};
+  final Map<String, int> _likeCounts = {};
   bool _disposed = false;
 
   /// 当前会话内该剧是否已点赞。
@@ -24,6 +25,9 @@ class InteractionController extends ChangeNotifier {
   /// 点赞请求是否进行中，用于防连点。
   bool isBusy(String dramaId) => _busyDramaIds.contains(dramaId);
 
+  /// 服务端最新点赞数，仅在点赞接口成功返回后可用。
+  int? likeCount(String dramaId) => _likeCounts[dramaId];
+
   /// 乐观切换剧集点赞，失败时回滚并以服务端返回状态校准。
   Future<OperationResult<LikeToggleResult>> toggleDramaLike(
     String dramaId,
@@ -49,6 +53,7 @@ class InteractionController extends ChangeNotifier {
       } else {
         _likedDramaIds.remove(dramaId);
       }
+      _likeCounts[dramaId] = result.count;
       return OperationResult.success(result);
     } catch (failure) {
       if (wasLiked) {
@@ -86,9 +91,14 @@ class InteractionController extends ChangeNotifier {
 
   /// 登录账号变化时清理会话内状态，避免跨账号串联。
   void clear() {
-    if (_likedDramaIds.isEmpty && _busyDramaIds.isEmpty) return;
+    if (_likedDramaIds.isEmpty &&
+        _busyDramaIds.isEmpty &&
+        _likeCounts.isEmpty) {
+      return;
+    }
     _likedDramaIds.clear();
     _busyDramaIds.clear();
+    _likeCounts.clear();
     _notify();
   }
 
diff --git a/lib/core/data/services/locale_controller.dart b/lib/core/data/services/locale_controller.dart
new file mode 100644
index 0000000..0eeab22
--- /dev/null
+++ b/lib/core/data/services/locale_controller.dart
@@ -0,0 +1,53 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/widgets.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// 全局界面语言状态。
+///
+/// `null` 表示没有用户选择，继续跟随系统语言；一旦用户在“我的”里选择，
+/// 选择结果会持久化并在下一次启动时恢复。
+class LocaleController extends ChangeNotifier {
+  /// 创建语言状态控制器。
+  LocaleController({SharedPreferencesAsync? preferences})
+    : _preferences = preferences ?? SharedPreferencesAsync();
+
+  static const String preferenceKey = 'app.locale';
+  static const Set<String> supportedCodes = {'zh', 'en', 'id'};
+
+  final SharedPreferencesAsync _preferences;
+  Locale? _locale;
+  bool _disposed = false;
+
+  /// 用户选择的语言；为空时由 MaterialApp 跟随系统。
+  Locale? get locale => _locale;
+
+  /// 当前语言的展示代码。
+  String get languageCode => _locale?.languageCode ?? 'system';
+
+  /// 读取本地语言选择；未设置时保持跟随系统。
+  Future<void> load() async {
+    final code = await _preferences.getString(preferenceKey);
+    if (code == null || !supportedCodes.contains(code)) return;
+    _locale = Locale(code);
+    _notify();
+  }
+
+  /// 立即切换并持久化语言。
+  Future<void> select(Locale locale) async {
+    if (!supportedCodes.contains(locale.languageCode)) return;
+    _locale = locale;
+    _notify();
+    await _preferences.setString(preferenceKey, locale.languageCode);
+  }
+
+  void _notify() {
+    if (!_disposed) notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+}
diff --git a/lib/core/data/services/store_controller.dart b/lib/core/data/services/store_controller.dart
new file mode 100644
index 0000000..e941c13
--- /dev/null
+++ b/lib/core/data/services/store_controller.dart
@@ -0,0 +1,75 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+
+import '../models/order.dart';
+import '../models/product.dart';
+import '../repositories/store_repository.dart';
+import '../remote/api_exception.dart';
+
+/// 商品货架状态：按类型拉取商品并创建订单。
+class StoreController extends ChangeNotifier {
+  StoreController(this._repository, {required this.type});
+
+  static const String coinPackType = AppProduct.coinPackType;
+  static const String vipType = AppProduct.vipType;
+
+  final StoreRepository _repository;
+  final String type;
+
+  List<AppProduct> products = const [];
+  bool loading = false;
+  String? error;
+  String? purchasingProductId;
+  String? purchaseError;
+  AppOrder? order;
+  bool _disposed = false;
+
+  Future<void> load() async {
+    loading = true;
+    error = null;
+    _notify();
+    try {
+      products = await _repository.fetchProducts(type: type);
+    } on ApiException catch (exception) {
+      error = exception.message;
+    } catch (_) {
+      error = 'productsLoadFailed';
+    } finally {
+      loading = false;
+      _notify();
+    }
+  }
+
+  /// 创建订单；成功后保留 [order] 供页面展示订单号。
+  Future<AppOrder?> buy(AppProduct product) async {
+    if (purchasingProductId != null) return null;
+    purchasingProductId = product.id;
+    purchaseError = null;
+    _notify();
+    try {
+      final created = await _repository.createOrder(product.id);
+      order = created;
+      return created;
+    } on ApiException catch (exception) {
+      purchaseError = exception.message;
+      return null;
+    } catch (_) {
+      purchaseError = 'orderCreateFailed';
+      return null;
+    } finally {
+      purchasingProductId = null;
+      _notify();
+    }
+  }
+
+  void _notify() {
+    if (!_disposed) notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+}
diff --git a/lib/core/data/services/video_player_port.dart b/lib/core/data/services/video_player_port.dart
index a5f573d..d5d4f40 100644
--- a/lib/core/data/services/video_player_port.dart
+++ b/lib/core/data/services/video_player_port.dart
@@ -1,5 +1,7 @@
 // Author: fruit.com.cn
 
+import 'dart:io';
+
 import 'package:video_player/video_player.dart';
 
 import '../../config/app_config.dart';
@@ -21,10 +23,18 @@ class VideoPlayerPort implements PlayerPort {
     Episode episode,
     Future<ClosedCaptionFile>? closedCaptionFile,
   ) {
-    final options = VideoPlayerOptions(mixWithOthers: false);
     // 片源统一由后端下发（详情里的可播放地址 / 播放票据）
+    final uri = resolveUri(episode);
+    final options = VideoPlayerOptions(mixWithOthers: false);
+    if (uri.scheme == 'file') {
+      return VideoPlayerController.file(
+        File.fromUri(uri),
+        closedCaptionFile: closedCaptionFile,
+        videoPlayerOptions: options,
+      );
+    }
     return VideoPlayerController.networkUrl(
-      resolveUri(episode),
+      uri,
       closedCaptionFile: closedCaptionFile,
       videoPlayerOptions: options,
     );
diff --git a/lib/core/data/services/wallet_controller.dart b/lib/core/data/services/wallet_controller.dart
new file mode 100644
index 0000000..31d695d
--- /dev/null
+++ b/lib/core/data/services/wallet_controller.dart
@@ -0,0 +1,96 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+
+import '../models/wallet.dart';
+import '../remote/api_exception.dart';
+import '../repositories/commerce_repository.dart';
+
+/// 钱包状态：余额、最近流水与金币解锁。
+///
+/// 余额是解锁后 UI 的唯一来源；接口失败保留后端 message，页面原样展示。
+class WalletController extends ChangeNotifier {
+  WalletController(this._repository);
+
+  final CommerceRepository _repository;
+
+  WalletSnapshot? snapshot;
+  bool loading = false;
+  bool unlocking = false;
+  String? error;
+  String? unlockError;
+  String? unlockingEpisodeId;
+  bool _disposed = false;
+
+  int get balance => snapshot?.wallet.coinBalance ?? 0;
+  List<CoinLedgerEntry> get ledger => snapshot?.ledger ?? const [];
+
+  Future<void> load() async {
+    loading = true;
+    error = null;
+    _notify();
+    try {
+      snapshot = await _repository.fetchWallet();
+    } on ApiException catch (exception) {
+      error = exception.message;
+    } catch (_) {
+      error = 'walletLoadFailed';
+    } finally {
+      loading = false;
+      _notify();
+    }
+  }
+
+  /// 金币解锁；成功后就地更新余额并返回后端结果。
+  Future<UnlockResult?> unlock(String episodeId) async {
+    if (unlocking) return null;
+    unlocking = true;
+    unlockingEpisodeId = episodeId;
+    unlockError = null;
+    _notify();
+    try {
+      final result = await _repository.unlock(episodeId);
+      final current = snapshot;
+      snapshot = WalletSnapshot(
+        wallet: CoinWallet(
+          coinBalance: result.coinBalance,
+          totalRechargedCoin: current?.wallet.totalRechargedCoin ?? 0,
+          totalConsumedCoin: current?.wallet.totalConsumedCoin ?? 0,
+          totalRefundedCoin: current?.wallet.totalRefundedCoin ?? 0,
+        ),
+        ledger: current?.ledger ?? const [],
+      );
+      return result;
+    } on ApiException catch (exception) {
+      unlockError = exception.message;
+      return null;
+    } catch (_) {
+      unlockError = 'unlockFailed';
+      return null;
+    } finally {
+      unlocking = false;
+      unlockingEpisodeId = null;
+      _notify();
+    }
+  }
+
+  void reset() {
+    snapshot = null;
+    loading = false;
+    unlocking = false;
+    error = null;
+    unlockError = null;
+    unlockingEpisodeId = null;
+    _notify();
+  }
+
+  void _notify() {
+    if (!_disposed) notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+}
diff --git a/lib/core/data/services/watch_records_controller.dart b/lib/core/data/services/watch_records_controller.dart
index f3b819b..9862db3 100644
--- a/lib/core/data/services/watch_records_controller.dart
+++ b/lib/core/data/services/watch_records_controller.dart
@@ -128,11 +128,19 @@ class WatchRecordsController extends ChangeNotifier {
     final seen = <String>{};
     return [
       for (final progress in recent)
-        if (seen.add(progress.dramaId)) WatchRecord(progress: progress),
+        if (seen.add(progress.dramaId))
+          WatchRecord(
+            progress: progress,
+            drama: _detailCache[progress.dramaId],
+            detailLoading: !_detailCache.containsKey(progress.dramaId),
+          ),
     ];
   }
 
   Future<void> _hydrate(List<String> dramaIds) async {
+    for (final id in dramaIds) {
+      if (_detailCache.containsKey(id)) await _loadDetail(id);
+    }
     final queue = [
       for (final id in dramaIds)
         if (!_detailCache.containsKey(id)) id,
diff --git a/lib/core/formatting/count_format.dart b/lib/core/formatting/count_format.dart
new file mode 100644
index 0000000..c360d7e
--- /dev/null
+++ b/lib/core/formatting/count_format.dart
@@ -0,0 +1,9 @@
+// Author: fruit.com.cn
+
+/// 互动数量展示：不足一万显示原数，一万及以上显示一位小数的「万」。
+///
+/// 例：`3200` → `3200`，`12400` → `1.2万`。
+String formatInteractionCount(int count) {
+  if (count < 10000) return '$count';
+  return '${(count / 10000).toStringAsFixed(1)}万';
+}
diff --git a/lib/core/navigation/app_route_observer.dart b/lib/core/navigation/app_route_observer.dart
new file mode 100644
index 0000000..cb5d4e1
--- /dev/null
+++ b/lib/core/navigation/app_route_observer.dart
@@ -0,0 +1,7 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/widgets.dart';
+
+/// 全局页面路由观察者：供播放器在路由被覆盖时暂停。
+final RouteObserver<PageRoute<dynamic>> appRouteObserver =
+    RouteObserver<PageRoute<dynamic>>();
diff --git a/lib/core/theme/app_colors.dart b/lib/core/theme/app_colors.dart
index da46392..e8961a9 100644
--- a/lib/core/theme/app_colors.dart
+++ b/lib/core/theme/app_colors.dart
@@ -2,79 +2,109 @@
 
 import 'package:flutter/material.dart';
 
-/// Obsidian Flare palette from `docs/design/README.md` and screens 01/02.
+/// K28-S 浅色暖橙主题色板。
 ///
-/// Existing semantic names (`blue`, `blueSoft`, `ink`, ...) are kept so page
-/// code does not need a mass rename; their values now follow the design tokens.
+/// 保留既有语义名，避免页面大范围改名；实际颜色统一由本文件控制。
 abstract final class AppColors {
-  /// Primary CTA, selected navigation, playback progress.
-  static const blue = Color(0xFFFF5B3D);
+  /// 主操作、选中态、播放进度。
+  static const blue = Color(0xFFFF7A1A);
   static const primary = blue;
 
-  /// Pressed state for the primary CTA.
-  static const bluePressed = Color(0xFFFF4321);
+  /// 主操作按下态。
+  static const bluePressed = Color(0xFFFF6A00);
 
-  /// Secondary accent for tags, locks, and highlighted icons.
-  static const blueSoft = Color(0xFF9278EA);
+  /// 粉色辅助强调色。
+  static const blueSoft = Color(0xFFFF6A8A);
   static const secondary = blueSoft;
   static const lavender = blueSoft;
 
-  /// Coins and rewards.
-  static const gold = Color(0xFFFBBF24);
+  /// 金币与奖励。
+  static const gold = Color(0xFFF3B34C);
 
-  /// Success and free-state accents.
-  static const success = Color(0xFF34D399);
+  /// 成功状态。
+  static const success = Color(0xFF2FA873);
 
-  /// Liked hearts use the primary accent.
-  static const favorite = blue;
+  /// 收藏和喜欢使用粉色强调。
+  static const favorite = secondary;
 
-  /// Text placed on [gold].
-  static const onGold = Color(0xFF2A1810);
+  /// 金币底色上的文字。
+  static const onGold = Color(0xFF5A3511);
 
-  /// Text and icons placed directly on [blue].
+  /// 主色上的文字与图标。
   static const onPrimary = Color(0xFFFFFFFF);
 
-  /// Page background.
-  static const ink = Color(0xFF0B0C10);
+  /// 页面背景。
+  static const ink = Color(0xFFFFF8F0);
 
-  /// Bottom navigation background (rendered at 95% with blur).
-  static const bar = Color(0xFF0D0D11);
+  /// 原生开屏与冷启动过渡底色。
+  static const splashInk = Color(0xFF1F1B16);
 
-  /// Cards lifted off [ink].
-  static const card = Color(0xFF1B1C21);
+  /// 页面顶部暖色渐变起点。
+  static const surfaceTop = Color(0xFFFFE9D6);
 
-  /// Alternate card surface from the mobile preview.
-  static const cardAlt = Color(0xFF1C1D21);
+  /// 底部导航底色。
+  static const bar = Color(0xFFFFFDFB);
 
-  /// Floating surfaces, inputs, and nested rows.
-  static const raised = Color(0xFF1C1D21);
-  static const quick = Color(0xFF202126);
-  static const input = Color(0xFF25252A);
-  static const goldCard = Color(0xFF201B1E);
+  /// 卡片轻阴影。
+  static const cardShadow = Color(0x14FF8A3D);
 
-  /// Body text on dark surfaces.
-  static const cream = Color(0xFFE6E1E3);
+  /// 卡片与弹层。
+  static const card = Color(0xFFFFFFFF);
 
-  /// Titles and high-emphasis text.
-  static const onSurface = Color(0xFFFFFFFF);
+  /// 次要卡片表面。
+  static const cardAlt = Color(0xFFFFF4E9);
 
-  /// Secondary text.
-  static const muted = Color(0xFFD2CDD0);
+  /// 浮层、输入框和嵌套区域。
+  static const raised = Color(0xFFFFF1E5);
+  static const quick = Color(0xFFFFF0E1);
+  static const input = Color(0xFFFFF4EA);
 
-  /// Weak hints and timestamps.
-  static const subtle = Color(0xFF9A96A3);
+  /// 评论输入框底色。
+  static const commentInput = Color(0xFFF5EFE8);
+  static const goldCard = Color(0xFFFFF4DF);
 
-  /// Soft orange used for continue labels and secondary times.
-  static const accent = Color(0xFFFFA490);
+  /// 正文颜色。
+  static const cream = Color(0xFF1F1B16);
 
-  /// 8% white border used by cards and inputs.
-  static const border = Color(0x14FFFFFF);
+  /// 主文字。
+  static const onSurface = Color(0xFF1F1B16);
 
-  /// 14% white border used by glass controls.
-  static const glassBorder = Color(0x24FFFFFF);
+  /// 次要文字。
+  static const muted = Color(0xFF8C837B);
 
-  static const outlineDark = Color(0xFF2A2C36);
-  static const outlineVariantDark = Color(0xFF242329);
-  static const outlineLight = Color(0xFF8E8E93);
-  static const outlineVariantLight = Color(0xFFE4E4E7);
+  /// 弱提示与时间。
+  static const subtle = Color(0xFFB3AAA1);
+
+  /// 橙色强调文案。
+  static const accent = blue;
+
+  /// 卡片描边。
+  static const border = Color(0xFFF0E4D6);
+
+  /// 玻璃面板描边。
+  static const glassBorder = Color(0x66FFFFFF);
+
+  /// 粉色角标。
+  static const badgePink = Color(0xFFFFE3EC);
+  static const badgePinkText = Color(0xFFFF6A8A);
+
+  /// 封面锁定数量与视频遮罩。
+  static const overlayDark = Color(0x33000000);
+
+  /// 封面集数胶囊。
+  static const badgeBeige = Color(0xFFFFF0DF);
+
+  /// 导航未选中。
+  static const navUnselected = muted;
+
+  /// 播放器次要文字。
+  static const playerMuted = Color(0xFFBBBBBB);
+
+  /// 播放器控件胶囊与圆形底色。
+  static const playerOverlayPill = Color(0xB3000000);
+
+  static const outlineDark = border;
+  static const outlineVariantDark = border;
+  static const outlineLight = muted;
+  static const outlineVariantLight = border;
 }
diff --git a/lib/core/theme/app_dimens.dart b/lib/core/theme/app_dimens.dart
index 9bc0cb6..6808229 100644
--- a/lib/core/theme/app_dimens.dart
+++ b/lib/core/theme/app_dimens.dart
@@ -1,6 +1,6 @@
 // Author: fruit.com.cn
 
-/// Cross-page spacing, type, radius, and control sizes.
+/// 跨页面复用的间距、字号、圆角和控件尺寸。
 abstract final class AppDimens {
   static const double spaceXs = 4;
   static const double spaceSm = 8;
@@ -9,17 +9,18 @@ abstract final class AppDimens {
   static const double spaceXl = 24;
 
   static const double pageHorizontal = 16;
-  static const double cardRadius = 12;
+  static const double cardRadius = 16;
   static const double authCardRadius = 20;
   static const double cardPadding = 16;
-  static const double innerRadius = 10;
+  static const double innerRadius = 12;
   static const double innerPadding = 12;
-  static const double pillRadius = 20;
-  static const double glassSmallRadius = 12;
-  static const double glassRadius = 14;
-  static const double glassCardRadius = 14;
-  static const double buttonRadius = 9;
-  static const double coverRadius = 10;
+  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 caption = 12;
   static const double emptyStateSubtitle = 12.5;
@@ -33,7 +34,7 @@ abstract final class AppDimens {
   static const double previewCardTitle = 13;
   static const double previewSectionTitle = 14;
   static const double chipFont = 10;
-  static const double navLabel = 9;
+  static const double navLabel = 10;
 
   static const double buttonHeight = 48;
   static const double primaryButtonHeight = 52;
@@ -42,9 +43,10 @@ abstract final class AppDimens {
   static const double buttonMedium = 40;
   static const double buttonLarge = 44;
   static const double tapTarget = 44;
+  static const double contentHeaderHeight = 46;
 
-  static const double navHeight = 54;
-  static const double navIcon = 17;
+  static const double navHeight = 64;
+  static const double navIcon = 20;
   static const double progressHeight = 3;
   static const double progressRadius = 2;
   static const double progressLineHeight = 3;
@@ -58,4 +60,14 @@ abstract final class AppDimens {
   static const double accountLabel = 11;
 
   static const double watchPlaceholderHeight = 114;
+  static const double heroBannerHeight = 240;
+  static const double heroBannerRadius = 20;
+  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;
 }
diff --git a/lib/core/theme/app_theme.dart b/lib/core/theme/app_theme.dart
index 324e540..9683d2a 100644
--- a/lib/core/theme/app_theme.dart
+++ b/lib/core/theme/app_theme.dart
@@ -6,79 +6,62 @@ import 'package:flutter/services.dart';
 import 'app_colors.dart';
 import 'app_dimens.dart';
 
-/// Obsidian Flare themes. Dark is the product default; light mirrors the same
-/// orange primary for system-light devices.
+/// K28-S 浅色暖橙主题。
 abstract final class AppTheme {
-  static const _lightBackground = Color(0xFFF7F7F8);
-  static const _darkBackground = AppColors.ink;
-
-  /// Light theme for system light mode.
-  static ThemeData light() => _build(
-    brightness: Brightness.light,
-    surface: _lightBackground,
-    accent: AppColors.blue,
+  /// 页面顶部暖色到米白背景的渐变。
+  static const LinearGradient pageGradient = LinearGradient(
+    begin: Alignment.topCenter,
+    end: Alignment.bottomCenter,
+    colors: [AppColors.surfaceTop, AppColors.ink],
+    stops: [0, 0.24],
   );
 
-  /// Dark theme for system dark mode.
-  static ThemeData dark() => _build(
-    brightness: Brightness.dark,
-    surface: _darkBackground,
-    accent: AppColors.blue,
+  /// 卡片轻阴影。
+  static const BoxShadow cardShadow = BoxShadow(
+    color: AppColors.cardShadow,
+    blurRadius: AppDimens.cardShadowBlur,
+    offset: Offset(0, AppDimens.cardShadowY),
   );
 
-  static ThemeData _build({
-    required Brightness brightness,
-    required Color surface,
-    required Color accent,
-  }) {
-    final dark = brightness == Brightness.dark;
-    final scheme = dark
-        ? const ColorScheme.dark(
-            primary: AppColors.blue,
-            onPrimary: AppColors.onPrimary,
-            secondary: AppColors.secondary,
-            onSecondary: AppColors.onPrimary,
-            primaryContainer: AppColors.bluePressed,
-            onPrimaryContainer: AppColors.onPrimary,
-            secondaryContainer: AppColors.raised,
-            onSecondaryContainer: AppColors.onPrimary,
-            surface: _darkBackground,
-            onSurface: AppColors.onSurface,
-            outline: AppColors.outlineDark,
-            outlineVariant: AppColors.outlineVariantDark,
-            surfaceTint: AppColors.blue,
-            inversePrimary: AppColors.blueSoft,
-          )
-        : ColorScheme.light(
-            primary: AppColors.blue,
-            onPrimary: AppColors.onPrimary,
-            secondary: AppColors.secondary,
-            onSecondary: AppColors.onPrimary,
-            primaryContainer: AppColors.blue.withValues(alpha: 0.14),
-            onPrimaryContainer: AppColors.ink,
-            secondaryContainer: AppColors.blueSoft.withValues(alpha: 0.14),
-            onSecondaryContainer: AppColors.ink,
-            surface: _lightBackground,
-            onSurface: AppColors.ink,
-            outline: AppColors.outlineLight,
-            outlineVariant: AppColors.outlineVariantLight,
-            surfaceTint: AppColors.blue,
-            inversePrimary: AppColors.blueSoft,
-          );
+  /// 全局浅色暖橙主题。
+  static ThemeData light() {
+    const scheme = ColorScheme.light(
+      primary: AppColors.blue,
+      onPrimary: AppColors.onPrimary,
+      secondary: AppColors.secondary,
+      onSecondary: AppColors.onPrimary,
+      primaryContainer: AppColors.surfaceTop,
+      onPrimaryContainer: AppColors.onSurface,
+      secondaryContainer: AppColors.badgePink,
+      onSecondaryContainer: AppColors.badgePinkText,
+      surface: AppColors.ink,
+      onSurface: AppColors.onSurface,
+      outline: AppColors.border,
+      outlineVariant: AppColors.border,
+      surfaceTint: AppColors.blue,
+      inversePrimary: AppColors.bluePressed,
+    );
     final base = ThemeData(
       useMaterial3: true,
-      brightness: brightness,
+      brightness: Brightness.light,
       colorScheme: scheme,
-      scaffoldBackgroundColor: surface,
+      scaffoldBackgroundColor: AppColors.ink,
       fontFamily: 'PlusJakartaSans',
-      progressIndicatorTheme: ProgressIndicatorThemeData(color: accent),
-      sliderTheme: SliderThemeData(
-        activeTrackColor: accent,
+      progressIndicatorTheme: const ProgressIndicatorThemeData(
+        color: AppColors.blue,
+      ),
+      sliderTheme: const SliderThemeData(
+        activeTrackColor: AppColors.blue,
+        inactiveTrackColor: AppColors.border,
         thumbColor: AppColors.onPrimary,
       ),
-      tabBarTheme: TabBarThemeData(labelColor: accent, indicatorColor: accent),
+      tabBarTheme: const TabBarThemeData(
+        labelColor: AppColors.blue,
+        indicatorColor: AppColors.blue,
+        unselectedLabelColor: AppColors.muted,
+      ),
       textButtonTheme: TextButtonThemeData(
-        style: TextButton.styleFrom(foregroundColor: accent),
+        style: TextButton.styleFrom(foregroundColor: AppColors.blue),
       ),
       filledButtonTheme: FilledButtonThemeData(
         style: ButtonStyle(
@@ -87,25 +70,26 @@ abstract final class AppTheme {
           minimumSize: const WidgetStatePropertyAll(
             Size(0, AppDimens.buttonHeight),
           ),
+          shape: const WidgetStatePropertyAll(StadiumBorder()),
         ),
       ),
       outlinedButtonTheme: OutlinedButtonThemeData(
         style: ButtonStyle(
-          foregroundColor: WidgetStatePropertyAll(
-            dark ? AppColors.blueSoft : AppColors.bluePressed,
-          ),
+          foregroundColor: const WidgetStatePropertyAll(AppColors.blue),
           minimumSize: const WidgetStatePropertyAll(
             Size(0, AppDimens.buttonHeight),
           ),
-          side: WidgetStatePropertyAll(
-            BorderSide(
-              color: dark ? AppColors.outlineDark : AppColors.outlineLight,
-            ),
+          side: const WidgetStatePropertyAll(
+            BorderSide(color: AppColors.border),
           ),
+          shape: const WidgetStatePropertyAll(StadiumBorder()),
         ),
       ),
       appBarTheme: const AppBarTheme(
-        systemOverlayStyle: SystemUiOverlayStyle.light,
+        backgroundColor: AppColors.ink,
+        foregroundColor: AppColors.onSurface,
+        elevation: 0,
+        systemOverlayStyle: SystemUiOverlayStyle.dark,
         titleTextStyle: TextStyle(
           color: AppColors.onSurface,
           fontFamily: 'Outfit',
@@ -113,6 +97,21 @@ abstract final class AppTheme {
           fontWeight: FontWeight.w800,
         ),
       ),
+      iconTheme: const IconThemeData(color: AppColors.onSurface),
+      dividerTheme: const DividerThemeData(color: AppColors.border),
+      cardTheme: const CardThemeData(
+        color: AppColors.card,
+        elevation: 0,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(AppDimens.cardRadius)),
+          side: BorderSide(color: AppColors.border),
+        ),
+      ),
+      bottomSheetTheme: const BottomSheetThemeData(
+        backgroundColor: Colors.transparent,
+        modalBackgroundColor: Colors.transparent,
+        surfaceTintColor: Colors.transparent,
+      ),
       switchTheme: SwitchThemeData(
         thumbColor: WidgetStateProperty.resolveWith(
           (states) => states.contains(WidgetState.selected)
@@ -120,36 +119,35 @@ abstract final class AppTheme {
               : null,
         ),
         trackColor: WidgetStateProperty.resolveWith(
-          (states) => states.contains(WidgetState.selected) ? accent : null,
+          (states) =>
+              states.contains(WidgetState.selected) ? AppColors.blue : null,
         ),
       ),
-      snackBarTheme: SnackBarThemeData(
-        backgroundColor: AppColors.bluePressed,
-        contentTextStyle: const TextStyle(color: AppColors.onPrimary),
+      snackBarTheme: const SnackBarThemeData(
+        backgroundColor: AppColors.onSurface,
+        contentTextStyle: TextStyle(color: AppColors.onPrimary),
       ),
     );
     final textTheme = base.textTheme
         .apply(
           fontFamily: 'PlusJakartaSans',
-          bodyColor: dark ? AppColors.cream : AppColors.ink,
-          displayColor: dark ? AppColors.onSurface : AppColors.ink,
+          bodyColor: AppColors.cream,
+          displayColor: AppColors.onSurface,
         )
         .copyWith(
-          displayLarge: _display(base.textTheme.displayLarge, dark),
-          displayMedium: _display(base.textTheme.displayMedium, dark),
-          displaySmall: _display(base.textTheme.displaySmall, dark),
-          headlineLarge: _display(base.textTheme.headlineLarge, dark),
-          headlineMedium: _display(base.textTheme.headlineMedium, dark),
-          headlineSmall: _display(base.textTheme.headlineSmall, dark),
-          titleLarge: _display(base.textTheme.titleLarge, dark),
+          displayLarge: _display(base.textTheme.displayLarge),
+          displayMedium: _display(base.textTheme.displayMedium),
+          displaySmall: _display(base.textTheme.displaySmall),
+          headlineLarge: _display(base.textTheme.headlineLarge),
+          headlineMedium: _display(base.textTheme.headlineMedium),
+          headlineSmall: _display(base.textTheme.headlineSmall),
+          titleLarge: _display(base.textTheme.titleLarge),
         );
     return base.copyWith(textTheme: textTheme);
   }
 
-  static TextStyle? _display(TextStyle? style, bool dark) => style?.copyWith(
-    fontFamily: 'Outfit',
-    color: dark ? AppColors.onSurface : AppColors.ink,
-  );
+  static TextStyle? _display(TextStyle? style) =>
+      style?.copyWith(fontFamily: 'Outfit', color: AppColors.onSurface);
 
   static Color _buttonColor(Set<WidgetState> states) {
     if (states.contains(WidgetState.pressed) ||
diff --git a/lib/core/widgets/app_bottom_nav.dart b/lib/core/widgets/app_bottom_nav.dart
index 898d032..8905618 100644
--- a/lib/core/widgets/app_bottom_nav.dart
+++ b/lib/core/widgets/app_bottom_nav.dart
@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import '../theme/app_colors.dart';
 import '../theme/app_dimens.dart';
 
-/// One destination rendered by [AppBottomNav].
+/// 底部导航普通目的地。
 class AppBottomNavItem {
   const AppBottomNavItem({
     required this.tabKey,
@@ -26,47 +26,64 @@ class AppBottomNavItem {
   final bool selected;
 }
 
-/// Shared 3-tab navigation used by all root tabs and the player fallback.
+/// 四槽底部导航：首页 feed 用深色样式，其它页面保持浅色暖橙风格。
 class AppBottomNav extends StatelessWidget {
   const AppBottomNav({
     super.key,
     required this.items,
     this.backgroundColor = AppColors.bar,
     this.barKey,
+    this.dark = false,
   });
 
   final List<AppBottomNavItem> items;
   final Color backgroundColor;
   final Key? barKey;
+  final bool dark;
 
   @override
-  Widget build(BuildContext context) => ClipRect(
-    child: BackdropFilter(
-      filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
-      child: SafeArea(
-        top: false,
-        child: Container(
-          key: barKey,
-          height: AppDimens.navHeight,
-          decoration: BoxDecoration(
-            color: backgroundColor.withValues(alpha: 0.95),
-            border: const Border(
-              top: BorderSide(color: AppColors.outlineVariantDark),
+  Widget build(BuildContext context) {
+    return ClipRect(
+      child: BackdropFilter(
+        filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
+        child: SafeArea(
+          top: false,
+          child: Container(
+            key: barKey,
+            height: AppDimens.navHeight,
+            decoration: BoxDecoration(
+              color: dark
+                  ? const Color(0xE6000000)
+                  : backgroundColor.withValues(alpha: 0.95),
+              border: Border(
+                top: BorderSide(
+                  color: dark ? Colors.white12 : AppColors.border,
+                ),
+              ),
+            ),
+            child: Row(
+              children: [
+                for (final item in items)
+                  _NavDestination(
+                    item: item,
+                    unselectedColor: dark
+                        ? Colors.white70
+                        : AppColors.navUnselected,
+                  ),
+              ],
             ),
-          ),
-          child: Row(
-            children: [for (final item in items) _NavDestination(item: item)],
           ),
         ),
       ),
-    ),
-  );
+    );
+  }
 }
 
 class _NavDestination extends StatelessWidget {
-  const _NavDestination({required this.item});
+  const _NavDestination({required this.item, required this.unselectedColor});
 
   final AppBottomNavItem item;
+  final Color unselectedColor;
 
   @override
   Widget build(BuildContext context) => Expanded(
@@ -78,7 +95,7 @@ class _NavDestination extends StatelessWidget {
         key: item.tabKey,
         onTap: item.onTap,
         child: ConstrainedBox(
-          constraints: const BoxConstraints(minHeight: 48),
+          constraints: const BoxConstraints(minHeight: AppDimens.navHeight),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
@@ -89,9 +106,7 @@ class _NavDestination extends StatelessWidget {
                 child: Icon(
                   item.selected ? item.selectedIcon : item.icon,
                   size: AppDimens.navIcon,
-                  color: item.selected
-                      ? AppColors.blue
-                      : Colors.white.withValues(alpha: 0.45),
+                  color: item.selected ? AppColors.blue : unselectedColor,
                 ),
               ),
               const SizedBox(height: 2),
@@ -102,9 +117,7 @@ class _NavDestination extends StatelessWidget {
                 style: TextStyle(
                   fontSize: AppDimens.navLabel,
                   fontWeight: item.selected ? FontWeight.w700 : FontWeight.w500,
-                  color: item.selected
-                      ? AppColors.blue
-                      : Colors.white.withValues(alpha: 0.45),
+                  color: item.selected ? AppColors.blue : unselectedColor,
                   letterSpacing: 0,
                 ),
               ),
diff --git a/lib/core/widgets/app_pull_to_refresh.dart b/lib/core/widgets/app_pull_to_refresh.dart
new file mode 100644
index 0000000..b71c335
--- /dev/null
+++ b/lib/core/widgets/app_pull_to_refresh.dart
@@ -0,0 +1,200 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import '../../l10n/app_localizations.dart';
+import '../theme/app_colors.dart';
+
+const double _maxPullDistance = 96;
+const double _refreshThreshold = 56;
+const double _indicatorHeight = 64;
+const double _indicatorMaxOffset = 10;
+const Duration _arrowTurnDuration = Duration(milliseconds: 160);
+const Duration _retractDuration = Duration(milliseconds: 200);
+
+enum _PullState { idle, pull, armed, refreshing }
+
+/// 带文字状态提示的下拉刷新容器，指示区悬浮在内容上方。
+class AppPullToRefresh extends StatefulWidget {
+  const AppPullToRefresh({
+    super.key,
+    required this.child,
+    required this.onRefresh,
+    this.edgeOffset = 0,
+  });
+
+  static const AlwaysScrollableScrollPhysics physics =
+      AlwaysScrollableScrollPhysics(parent: BouncingScrollPhysics());
+
+  final Widget child;
+  final Future<void> Function() onRefresh;
+  final double edgeOffset;
+
+  @override
+  State<AppPullToRefresh> createState() => _AppPullToRefreshState();
+}
+
+class _AppPullToRefreshState extends State<AppPullToRefresh> {
+  _PullState _state = _PullState.idle;
+  double _pullDistance = 0;
+  bool _refreshing = false;
+
+  bool _onScroll(ScrollNotification notification) {
+    if (notification.depth != 0 || _refreshing) return false;
+    if (notification is ScrollStartNotification) {
+      if (notification.dragDetails != null) _setPullDistance(0);
+    } else if (notification is ScrollUpdateNotification) {
+      if (notification.dragDetails != null) {
+        _setPullDistance(
+          notification.metrics.minScrollExtent - notification.metrics.pixels,
+        );
+      }
+    } else if (notification is OverscrollNotification) {
+      if (notification.dragDetails != null) {
+        _setPullDistance(_pullDistance - notification.overscroll);
+      }
+    } else if (notification is ScrollEndNotification) {
+      _release();
+    }
+    return false;
+  }
+
+  void _setPullDistance(double value) {
+    final distance = value.clamp(0.0, _maxPullDistance);
+    final state = distance >= _refreshThreshold
+        ? _PullState.armed
+        : distance > 0
+        ? _PullState.pull
+        : _PullState.idle;
+    if (distance == _pullDistance && state == _state) return;
+    setState(() {
+      _pullDistance = distance;
+      _state = state;
+    });
+  }
+
+  void _release() {
+    if (_state == _PullState.armed) {
+      unawaited(_refresh());
+    } else if (_state == _PullState.pull) {
+      setState(() {
+        _pullDistance = 0;
+        _state = _PullState.idle;
+      });
+    }
+  }
+
+  Future<void> _refresh() async {
+    if (_refreshing) return;
+    _refreshing = true;
+    setState(() => _state = _PullState.refreshing);
+    try {
+      await widget.onRefresh();
+    } finally {
+      await Future<void>.delayed(_retractDuration);
+      if (mounted) {
+        setState(() {
+          _pullDistance = 0;
+          _state = _PullState.idle;
+          _refreshing = false;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return NotificationListener<ScrollNotification>(
+      onNotification: _onScroll,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          Listener(
+            onPointerUp: (_) => _release(),
+            onPointerCancel: (_) => _release(),
+            child: widget.child,
+          ),
+          if (_state != _PullState.idle)
+            Positioned(
+              top: widget.edgeOffset,
+              left: 0,
+              right: 0,
+              child: IgnorePointer(child: _indicatorLayer(context)),
+            ),
+        ],
+      ),
+    );
+  }
+
+  Widget _indicatorLayer(BuildContext context) {
+    final progress = (_pullDistance / _refreshThreshold).clamp(0.0, 1.0);
+    final opacity = _state == _PullState.refreshing
+        ? 1.0
+        : progress.clamp(0.0, 1.0);
+    return SizedBox(
+      height: _indicatorHeight,
+      child: Opacity(
+        opacity: opacity,
+        child: Transform.translate(
+          offset: Offset(0, _indicatorMaxOffset * progress),
+          child: Align(
+            alignment: Alignment.topCenter,
+            child: Padding(
+              padding: const EdgeInsets.only(top: 8),
+              child: _indicator(context),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  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,
+        ),
+      ),
+      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,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/core/widgets/catalog_debug_info.dart b/lib/core/widgets/catalog_debug_info.dart
new file mode 100644
index 0000000..bd074a5
--- /dev/null
+++ b/lib/core/widgets/catalog_debug_info.dart
@@ -0,0 +1,54 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+import '../config/app_config.dart';
+import '../theme/app_colors.dart';
+
+const TextStyle _debugStyle = TextStyle(
+  color: AppColors.subtle,
+  fontSize: 12,
+  height: 1.35,
+);
+
+/// 仅 debug 展示当前服务地址与目录请求的原始错误。
+class CatalogDebugInfo extends StatelessWidget {
+  const CatalogDebugInfo({super.key, required this.error, this.onEditEndpoint});
+
+  final String? error;
+  final VoidCallback? onEditEndpoint;
+
+  @override
+  Widget build(BuildContext context) {
+    if (!kDebugMode) return const SizedBox.shrink();
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Text(
+          '服务地址：${AppConfig.apiBaseUrl}',
+          key: const Key('catalog-debug-endpoint'),
+          maxLines: 2,
+          overflow: TextOverflow.ellipsis,
+          textAlign: TextAlign.center,
+          style: _debugStyle,
+        ),
+        const SizedBox(height: 2),
+        Text(
+          '错误：${error ?? 'unknown'}',
+          key: const Key('catalog-debug-error'),
+          maxLines: 2,
+          overflow: TextOverflow.ellipsis,
+          textAlign: TextAlign.center,
+          style: _debugStyle,
+        ),
+        if (onEditEndpoint != null)
+          TextButton(
+            key: const Key('catalog-debug-endpoint-edit'),
+            onPressed: onEditEndpoint,
+            child: const Text('设置服务地址'),
+          ),
+      ],
+    );
+  }
+}
diff --git a/lib/core/widgets/catalog_endpoint_editor.dart b/lib/core/widgets/catalog_endpoint_editor.dart
new file mode 100644
index 0000000..e5922ba
--- /dev/null
+++ b/lib/core/widgets/catalog_endpoint_editor.dart
@@ -0,0 +1,126 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+import '../config/app_config.dart';
+import '../config/server_endpoint.dart';
+
+const String _title = '设置服务地址';
+const String _save = '保存';
+const String _cancel = '取消';
+const String _invalid = '请输入合法地址，例如 http://192.168.1.10:8081';
+const String _saveFailed = '服务地址保存失败';
+const String _localNetworkHint = '手机需与电脑同一 Wi-Fi，并在 iOS 设置-隐私与安全性-本地网络 中允许本应用';
+
+/// Debug 下编辑服务地址，保存后重新探测并加载目录。
+Future<void> showCatalogEndpointEditor(
+  BuildContext context, {
+  required Future<void> Function() reload,
+  Future<bool> Function(String value)? save,
+  Future<void> Function()? probe,
+}) async {
+  if (!kDebugMode) return;
+  final value = await showDialog<String>(
+    context: context,
+    builder: (_) => _CatalogEndpointDialog(initialValue: AppConfig.apiBaseUrl),
+  );
+  if (value == null) return;
+  final saveEndpoint = save ?? (input) => ServerEndpoint.save(input);
+  if (!await saveEndpoint(value)) {
+    if (context.mounted) {
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(const SnackBar(content: Text(_saveFailed)));
+    }
+    return;
+  }
+  await (probe ?? () => AppConfig.probeAndApplyBaseUrl())();
+  await reload();
+}
+
+class _CatalogEndpointDialog extends StatefulWidget {
+  const _CatalogEndpointDialog({required this.initialValue});
+
+  final String initialValue;
+
+  @override
+  State<_CatalogEndpointDialog> createState() => _CatalogEndpointDialogState();
+}
+
+class _CatalogEndpointDialogState extends State<_CatalogEndpointDialog> {
+  late final TextEditingController _controller = TextEditingController(
+    text: widget.initialValue,
+  );
+  String? _error;
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  void _submit() {
+    final normalized = ServerEndpoint.normalize(_controller.text);
+    if (normalized == null) {
+      setState(() => _error = _invalid);
+      return;
+    }
+    Navigator.of(context).pop(normalized);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: const Text(_title),
+      content: SingleChildScrollView(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            TextField(
+              key: const Key('catalog-debug-endpoint-input'),
+              controller: _controller,
+              keyboardType: TextInputType.url,
+              textInputAction: TextInputAction.done,
+              autocorrect: false,
+              onSubmitted: (_) => _submit(),
+              decoration: const InputDecoration(
+                labelText: '服务地址',
+                hintText: 'http://IP:端口',
+              ),
+            ),
+            const SizedBox(height: 10),
+            const Text(
+              _localNetworkHint,
+              key: Key('catalog-debug-endpoint-hint'),
+              style: TextStyle(fontSize: 12, color: Colors.grey),
+            ),
+            if (_error != null) ...[
+              const SizedBox(height: 8),
+              Text(
+                _error!,
+                key: const Key('catalog-debug-endpoint-error'),
+                style: TextStyle(
+                  fontSize: 12,
+                  color: Theme.of(context).colorScheme.error,
+                ),
+              ),
+            ],
+          ],
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: const Text(_cancel),
+        ),
+        FilledButton(
+          key: const Key('catalog-debug-endpoint-save'),
+          onPressed: _submit,
+          child: const Text(_save),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/core/widgets/download_action.dart b/lib/core/widgets/download_action.dart
index 6da727b..4fd5bab 100644
--- a/lib/core/widgets/download_action.dart
+++ b/lib/core/widgets/download_action.dart
@@ -20,10 +20,16 @@ Future<void> requestEpisodeDownload(
   if (!await ensureSignedIn(context)) return;
   if (!context.mounted) return;
   unawaited(context.read<Haptics>().lightImpact());
-  final result = await context.read<DownloadController>().grant(episodeId);
+  final downloads = context.read<DownloadController>();
+  final result = await downloads.grant(episodeId);
   if (!context.mounted) return;
   final l10n = AppLocalizations.of(context)!;
   final hasBackendMessage = result.message?.trim().isNotEmpty ?? false;
+  if (result.ok) {
+    unawaited(
+      downloads.startDownload(episodeId, license: result.license),
+    );
+  }
   final message = result.ok
       ? l10n.downloadGranted
       : hasBackendMessage
diff --git a/lib/core/widgets/empty_state.dart b/lib/core/widgets/empty_state.dart
index da31b46..75b3ca3 100644
--- a/lib/core/widgets/empty_state.dart
+++ b/lib/core/widgets/empty_state.dart
@@ -25,6 +25,7 @@ class EmptyState extends StatelessWidget {
     this.actionLabel,
     this.actionKey,
     this.onAction,
+    this.footer,
     this.compact = false,
   });
 
@@ -34,6 +35,7 @@ class EmptyState extends StatelessWidget {
   final String? actionLabel;
   final Key? actionKey;
   final VoidCallback? onAction;
+  final Widget? footer;
   final bool compact;
 
   @override
@@ -65,6 +67,7 @@ class EmptyState extends StatelessWidget {
                   actionLabel: hasAction ? actionLabel : null,
                   actionKey: actionKey,
                   onAction: hasAction ? onAction : null,
+                  footer: footer,
                 ),
               ],
             ),
@@ -101,6 +104,7 @@ class _EmptyCopy extends StatelessWidget {
     required this.actionLabel,
     required this.actionKey,
     required this.onAction,
+    required this.footer,
   });
 
   final String title;
@@ -108,6 +112,7 @@ class _EmptyCopy extends StatelessWidget {
   final String? actionLabel;
   final Key? actionKey;
   final VoidCallback? onAction;
+  final Widget? footer;
 
   @override
   Widget build(BuildContext context) {
@@ -162,6 +167,7 @@ class _EmptyCopy extends StatelessWidget {
             ),
           ),
         ],
+        if (footer != null) ...[const SizedBox(height: 12), footer!],
       ],
     );
   }
diff --git a/lib/core/widgets/glass_panel.dart b/lib/core/widgets/glass_panel.dart
index 02d144c..1edd1fb 100644
--- a/lib/core/widgets/glass_panel.dart
+++ b/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';
 
-/// Dark glass surface used by the home info card and floating controls.
+/// 首页信息卡与浮层控件使用的浅色玻璃面板。
 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(0x24FFFFFF), Color(0x0DFFFFFF)],
+              colors: [Color(0xE6FFFFFF), Color(0xB3FFFDFB)],
             ),
       ),
       child: Padding(padding: padding ?? EdgeInsets.zero, child: child),
diff --git a/lib/core/widgets/library_drama_tile.dart b/lib/core/widgets/library_drama_tile.dart
deleted file mode 100644
index 2c715ff..0000000
--- a/lib/core/widgets/library_drama_tile.dart
+++ /dev/null
@@ -1,74 +0,0 @@
-// Author: fruit.com.cn
-
-import 'package:flutter/material.dart';
-
-import '../data/models/drama.dart';
-import '../theme/app_colors.dart';
-import '../theme/app_dimens.dart';
-import 'remote_image.dart';
-
-/// 收藏等账号列表复用的剧集卡片，视觉与"我的"页列表保持一致。
-class LibraryDramaTile extends StatelessWidget {
-  const LibraryDramaTile({
-    super.key,
-    required this.drama,
-    required this.onTap,
-    this.trailing,
-  });
-
-  final Drama drama;
-  final VoidCallback? onTap;
-  final Widget? trailing;
-
-  @override
-  Widget build(BuildContext context) {
-    return Material(
-      color: AppColors.card,
-      borderRadius: BorderRadius.circular(AppDimens.innerRadius),
-      clipBehavior: Clip.antiAlias,
-      child: InkWell(
-        onTap: onTap,
-        child: Padding(
-          padding: const EdgeInsets.all(AppDimens.innerPadding),
-          child: Row(
-            children: [
-              ClipRRect(
-                borderRadius: BorderRadius.circular(AppDimens.innerRadius),
-                child: RemoteImage(drama.posterUrl, width: 74, height: 103),
-              ),
-              const SizedBox(width: 11),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      drama.title,
-                      maxLines: 2,
-                      overflow: TextOverflow.ellipsis,
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: AppDimens.listTitle,
-                        fontWeight: FontWeight.w700,
-                      ),
-                    ),
-                    const SizedBox(height: 7),
-                    Text(
-                      drama.genre.isEmpty ? drama.category : drama.genre,
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                      style: const TextStyle(
-                        color: AppColors.muted,
-                        fontSize: AppDimens.caption,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              ?trailing,
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/core/widgets/paged_local_list.dart b/lib/core/widgets/paged_local_list.dart
new file mode 100644
index 0000000..ce5a80d
--- /dev/null
+++ b/lib/core/widgets/paged_local_list.dart
@@ -0,0 +1,116 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../theme/app_colors.dart';
+
+const int _defaultPageSize = 20;
+const Duration _defaultLoadDelay = Duration(milliseconds: 300);
+
+/// 客户端本地列表分页状态。
+class PagedLocalListController<T> extends ChangeNotifier {
+  PagedLocalListController({
+    List<T> items = const [],
+    this.pageSize = _defaultPageSize,
+    this.minimumLoadDelay = _defaultLoadDelay,
+  }) : _items = List<T>.unmodifiable(items);
+
+  final int pageSize;
+  final Duration minimumLoadDelay;
+
+  List<T> _items;
+  int _pageCount = 1;
+  int _generation = 0;
+  bool _loading = false;
+  bool _disposed = false;
+
+  List<T> get items => _items;
+  bool get loading => _loading;
+  bool get hasMore => visibleItems.length < _items.length;
+
+  List<T> get visibleItems =>
+      _items.take(_pageCount * pageSize).toList(growable: false);
+
+  /// 用最新目录替换本地数据，并回到第一页。
+  void replaceAll(List<T> items) {
+    _generation++;
+    _items = List<T>.unmodifiable(items);
+    _pageCount = 1;
+    _loading = false;
+    _notify();
+  }
+
+  /// 追加下一页；已加载完或正在加载时不重复触发。
+  Future<void> loadMore() async {
+    if (_loading || !hasMore) return;
+    final generation = _generation;
+    _loading = true;
+    _notify();
+    await Future<void>.delayed(minimumLoadDelay);
+    if (_disposed || generation != _generation) return;
+    _pageCount++;
+    _loading = false;
+    _notify();
+  }
+
+  void _notify() {
+    if (!_disposed) notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+}
+
+/// 分页列表底部加载态与到底提示。
+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,
+        child: const Center(
+          child: SizedBox.square(
+            dimension: 20,
+            child: CircularProgressIndicator(
+              strokeWidth: 2,
+              color: AppColors.blue,
+            ),
+          ),
+        ),
+      );
+    }
+    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);
+  }
+}
diff --git a/lib/core/widgets/plain_page_scaffold.dart b/lib/core/widgets/plain_page_scaffold.dart
new file mode 100644
index 0000000..8e5c07f
--- /dev/null
+++ b/lib/core/widgets/plain_page_scaffold.dart
@@ -0,0 +1,45 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../theme/app_colors.dart';
+import 'subpage_header.dart';
+
+/// 二级页面通用骨架：返回栏 + 标题/副标题 + 可滚动内容，无底部导航。
+class PlainPageScaffold extends StatelessWidget {
+  const PlainPageScaffold({
+    super.key,
+    required this.pageKey,
+    required this.backKey,
+    required this.title,
+    required this.child,
+    this.subtitle,
+  });
+
+  final Key pageKey;
+  final Key backKey;
+  final String title;
+  final String? subtitle;
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    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),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/core/widgets/remote_image.dart b/lib/core/widgets/remote_image.dart
index 455a342..60d10be 100644
--- a/lib/core/widgets/remote_image.dart
+++ b/lib/core/widgets/remote_image.dart
@@ -1,3 +1,5 @@
+// Author: fruit.com.cn
+
 import 'package:flutter/material.dart';
 
 import '../config/app_config.dart';
@@ -13,6 +15,8 @@ class RemoteImage extends StatelessWidget {
     this.fit = BoxFit.cover,
     this.showFallbackIcon = false,
     this.fallbackIconKey,
+    this.fallbackAspectRatio,
+    this.fallbackColor = AppColors.bar,
   });
 
   final String path;
@@ -21,6 +25,8 @@ class RemoteImage extends StatelessWidget {
   final BoxFit fit;
   final bool showFallbackIcon;
   final Key? fallbackIconKey;
+  final double? fallbackAspectRatio;
+  final Color fallbackColor;
 
   @override
   Widget build(BuildContext context) {
@@ -40,10 +46,10 @@ class RemoteImage extends StatelessWidget {
   }
 
   Widget _fallback() {
-    return Container(
+    final fallback = Container(
       width: width,
       height: height,
-      color: AppColors.bar,
+      color: fallbackColor,
       alignment: Alignment.center,
       child: showFallbackIcon
           ? Icon(
@@ -54,5 +60,8 @@ class RemoteImage extends StatelessWidget {
             )
           : null,
     );
+    final ratio = fallbackAspectRatio;
+    if (ratio == null) return fallback;
+    return AspectRatio(aspectRatio: ratio, child: fallback);
   }
 }
diff --git a/lib/core/widgets/server_endpoint_dialog.dart b/lib/core/widgets/server_endpoint_dialog.dart
deleted file mode 100644
index 66d6e9d..0000000
--- a/lib/core/widgets/server_endpoint_dialog.dart
+++ /dev/null
@@ -1,128 +0,0 @@
-// Author: fruit.com.cn
-
-import 'package:flutter/material.dart';
-
-import '../../l10n/app_localizations.dart';
-import '../config/app_config.dart';
-import '../config/server_endpoint.dart';
-import '../theme/app_colors.dart';
-
-/// Opens the debug-only runtime server address editor.
-Future<bool> showServerEndpointDialog(
-  BuildContext context,
-  AppLocalizations l10n,
-) async {
-  final changed = await showDialog<bool>(
-    context: context,
-    builder: (_) => _ServerEndpointDialog(l10n: l10n),
-  );
-  if (changed == true && context.mounted) {
-    ScaffoldMessenger.of(
-      context,
-    ).showSnackBar(SnackBar(content: Text(l10n.restartToApply)));
-    return true;
-  }
-  return false;
-}
-
-class _ServerEndpointDialog extends StatefulWidget {
-  const _ServerEndpointDialog({required this.l10n});
-
-  final AppLocalizations l10n;
-
-  @override
-  State<_ServerEndpointDialog> createState() => _ServerEndpointDialogState();
-}
-
-class _ServerEndpointDialogState extends State<_ServerEndpointDialog> {
-  late final TextEditingController _controller = TextEditingController(
-    text: AppConfig.apiBaseUrl,
-  );
-  String? _error;
-  bool _saving = false;
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  Future<void> _save() async {
-    final normalized = ServerEndpoint.normalize(_controller.text);
-    if (normalized == null) {
-      setState(() => _error = widget.l10n.invalidServerAddress);
-      return;
-    }
-    setState(() {
-      _saving = true;
-      _error = null;
-    });
-    final saved = await ServerEndpoint.save(normalized);
-    if (!mounted) return;
-    if (!saved) {
-      setState(() {
-        _saving = false;
-        _error = widget.l10n.invalidServerAddress;
-      });
-      return;
-    }
-    Navigator.pop(context, true);
-  }
-
-  Future<void> _restoreDefault() async {
-    setState(() => _saving = true);
-    await ServerEndpoint.clear();
-    if (mounted) Navigator.pop(context, true);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = widget.l10n;
-    return AlertDialog(
-      title: Text(l10n.serverAddress),
-      content: SingleChildScrollView(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            TextField(
-              key: const Key('server-endpoint-input'),
-              controller: _controller,
-              enabled: !_saving,
-              keyboardType: TextInputType.url,
-              autocorrect: false,
-              decoration: InputDecoration(
-                hintText: l10n.serverAddressHint,
-                errorText: _error,
-                errorMaxLines: 2,
-              ),
-            ),
-            const SizedBox(height: 10),
-            Text(
-              l10n.restartToApply,
-              key: const Key('server-endpoint-restart-hint'),
-              style: const TextStyle(color: AppColors.muted, fontSize: 12),
-            ),
-            const SizedBox(height: 4),
-            TextButton(
-              key: const Key('server-endpoint-restore'),
-              onPressed: _saving ? null : _restoreDefault,
-              child: Text(l10n.restoreDefault),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: _saving ? null : () => Navigator.pop(context, false),
-          child: Text(l10n.cancel),
-        ),
-        FilledButton(
-          key: const Key('server-endpoint-save'),
-          onPressed: _saving ? null : _save,
-          child: Text(l10n.saveAddress),
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/core/widgets/subpage_header.dart b/lib/core/widgets/subpage_header.dart
new file mode 100644
index 0000000..6924433
--- /dev/null
+++ b/lib/core/widgets/subpage_header.dart
@@ -0,0 +1,190 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../theme/app_colors.dart';
+
+const double _height = 52;
+const double _heightWithSubtitle = 64;
+const double _horizontal = 14;
+const double _backSize = 40;
+const double _backGap = 12;
+const double _titleFontSize = 18;
+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 {
+  const AppSubpageCircleButton({
+    super.key,
+    required this.buttonKey,
+    required this.tooltip,
+    required this.icon,
+    required this.onPressed,
+    this.dark = false,
+  });
+
+  final Key buttonKey;
+  final String tooltip;
+  final IconData icon;
+  final VoidCallback onPressed;
+  final bool dark;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      key: buttonKey,
+      width: _backSize,
+      height: _backSize,
+      child: Tooltip(
+        message: tooltip,
+        child: DecoratedBox(
+          key: const Key('subpage-back-shadow'),
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            boxShadow: [
+              BoxShadow(
+                color: dark ? _darkShadowColor : _lightShadowColor,
+                blurRadius: _shadowBlur,
+                offset: dark ? Offset.zero : _lightShadowOffset,
+              ),
+            ],
+          ),
+          child: Material(
+            color: dark ? _darkBackground : AppColors.card,
+            shape: CircleBorder(
+              side: dark
+                  ? BorderSide.none
+                  : const BorderSide(
+                      color: AppColors.border,
+                      width: _borderWidth,
+                    ),
+            ),
+            clipBehavior: Clip.antiAlias,
+            child: InkWell(
+              customBorder: const CircleBorder(),
+              onTap: onPressed,
+              child: Center(
+                child: Icon(
+                  icon,
+                  color: dark ? Colors.white : AppColors.onSurface,
+                  size: _iconSize,
+                  weight: _iconWeight,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+/// 二级页面统一返回按钮，浅色页使用白底描边，深色页使用半透明黑底。
+class AppSubpageBackButton extends StatelessWidget {
+  const AppSubpageBackButton({
+    super.key,
+    required this.backKey,
+    this.dark = false,
+    this.onBack,
+  });
+
+  final Key backKey;
+  final bool dark;
+  final VoidCallback? onBack;
+
+  @override
+  Widget build(BuildContext context) {
+    return AppSubpageCircleButton(
+      buttonKey: backKey,
+      tooltip: MaterialLocalizations.of(context).backButtonTooltip,
+      icon: Icons.chevron_left_rounded,
+      dark: dark,
+      onPressed: onBack ?? () => Navigator.of(context).maybePop(),
+    );
+  }
+}
+
+/// 二级页面统一页头：返回按钮、左对齐标题、可选副标题与右侧操作。
+class AppSubpageHeader extends StatelessWidget {
+  const AppSubpageHeader({
+    super.key,
+    required this.title,
+    required this.backKey,
+    this.subtitle,
+    this.actions,
+    this.onBack,
+    this.dark = false,
+  });
+
+  final String title;
+  final Key backKey;
+  final String? subtitle;
+  final Widget? actions;
+  final VoidCallback? onBack;
+  final bool dark;
+
+  @override
+  Widget build(BuildContext context) {
+    final foreground = dark ? Colors.white : AppColors.onSurface;
+    final secondary = dark ? Colors.white70 : AppColors.muted;
+    return SizedBox(
+      key: const Key('subpage-header'),
+      height: subtitle == null ? _height : _heightWithSubtitle,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: _horizontal),
+        child: Row(
+          children: [
+            AppSubpageBackButton(backKey: backKey, dark: dark, onBack: onBack),
+            const SizedBox(width: _backGap),
+            Expanded(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    title,
+                    key: const Key('subpage-title'),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      color: foreground,
+                      fontSize: _titleFontSize,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                  if (subtitle != null) ...[
+                    const SizedBox(height: 2),
+                    Text(
+                      subtitle!,
+                      key: const Key('subpage-subtitle'),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(
+                        color: secondary,
+                        fontSize: _subtitleFontSize,
+                        fontWeight: FontWeight.w500,
+                      ),
+                    ),
+                  ],
+                ],
+              ),
+            ),
+            if (actions != null) ...[
+              const SizedBox(width: _actionGap),
+              actions!,
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index b710ee7..6affe0c 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -9,10 +9,12 @@
   "demoTitle": "The Signal",
   "demoSynopsis": "A short local video preview. More episodes can be added when media is available.",
   "homeTab": "Home",
+  "theaterTab": "Theater",
+  "createTab": "Create",
   "openQuickMenu": "Open quick menu",
   "quickAccess": "Quick access",
   "currentSeries": "Current series",
-  "discoverTab": "Discover",
+  "discoverTab": "Theater",
   "searchDiscover": "Search dramas, actors, genres...",
   "featured": "Featured",
   "recommended": "Recommended",
@@ -27,8 +29,44 @@
   "romance": "Romance",
   "actionGenre": "Action",
   "filter": "Filter",
+  "filterGroupCategory": "All genres",
+  "filterGroupTheme": "All themes",
+  "filterGroupLanguage": "All languages",
+  "filterGroupSort": "All recommendations",
+  "sortNewest": "Newest",
+  "sortHottest": "Hottest",
+  "expandFilters": "Expand",
+  "collapseFilters": "Collapse",
+  "filterEmpty": "No dramas match these filters",
+  "hotBadge": "Hit",
+  "filterAll": "All",
+  "seriesMeta": "Series · {episodes} eps | {viewers} watching",
+  "@seriesMeta": {
+    "placeholders": {
+      "episodes": {"type": "String"},
+      "viewers": {"type": "String"}
+    }
+  },
+  "watchFullSeries": "Watch full series · {episodes} eps",
+  "@watchFullSeries": {
+    "placeholders": {
+      "episodes": {"type": "String"}
+    }
+  },
+  "feedTabAnime": "Anime",
+  "feedTabReal": "Live-action",
+  "feedTabForYou": "For you",
+  "authorNoteLabel": "Author note",
+  "reserve": "Reserve",
+  "heatLabel": "{count} heat",
+  "@heatLabel": {
+    "placeholders": {
+      "count": {"type": "String"}
+    }
+  },
   "topCharts": "Top Charts",
   "newReleases": "New Releases",
+  "newDramas": "New",
   "trendingMicroDramas": "Trending Micro-Dramas",
   "seeAll": "See All",
   "trendingSubtitle": "Most binge-watched this week",
@@ -38,6 +76,7 @@
   "seasonOneOriginalRelease": "Season 1 • Original Release",
   "startWatching": "Start Watching",
   "showLess": "Less",
+  "expandSynopsis": "More",
   "views": "views",
   "episodeOfTotal": "Episode {current} / {total}",
   "@episodeOfTotal": {
@@ -49,6 +88,12 @@
   "clearScreen": "Clear screen",
   "exitClearScreen": "Exit clear screen",
   "playbackSpeed": "Playback speed",
+  "speedBoosting": "{speed}x speed",
+  "@speedBoosting": {
+    "placeholders": {
+      "speed": {"type": "String"}
+    }
+  },
   "minutesAgo": "{count} min ago",
   "@minutesAgo": {
     "placeholders": {
@@ -66,6 +111,31 @@
   "localViewer": "Local Viewer",
   "localDemoProfile": "Local demo profile",
   "continueWatching": "Continue Watching",
+  "episodeRemaining": "Episode {episode} · {minutes} min left",
+  "@episodeRemaining": {
+    "placeholders": {
+      "episode": {"type": "int"},
+      "minutes": {"type": "int"}
+    }
+  },
+  "viewCountLabel": "{count} views",
+  "@viewCountLabel": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
+  "allEpisodesBadge": "All {count}",
+  "@allEpisodesBadge": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
+  "lockedEpisodeCount": "{count} locked",
+  "@lockedEpisodeCount": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
   "watchedPercent": "Watched {percent}%",
   "@watchedPercent": {
     "placeholders": {
@@ -83,12 +153,43 @@
   "completed": "Completed",
   "noSavedShows": "No shows here yet.",
   "preferences": "Preferences",
-  "appLanguage": "App Language",
   "followingTab": "Following",
   "animatedTab": "Animated",
   "recommendedTab": "Recommended",
   "noCategoryDramas": "No dramas in this category yet.",
   "allDramas": "All Dramas",
+  "allLanguages": "All languages",
+  "bahasaMelayu": "Malay",
+  "createSubtitle": "Stories become short dramas",
+  "createAiTitle": "AI production",
+  "createAiSubtitle": "Start from a story or an idea",
+  "createUploadTitle": "Upload and publish",
+  "createUploadSubtitle": "Publish a finished short drama",
+  "createMottoPrimary": "Your imagination",
+  "createMottoSecondary": "Can be seen by more people",
+  "newReleasesTitle": "New premieres",
+  "newReleasesCount": "{count} new this week",
+  "@newReleasesCount": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
+  "premiereToday": "Today's premiere",
+  "newBadge": "NEW",
+  "reserveTitle": "Schedule booking",
+  "goNewReleases": "Browse new releases",
+  "reserveStepsTitle": "What you get after reserving",
+  "reserveStep1": "One-tap reserve",
+  "reserveStep2": "Premiere reminder",
+  "reserveStep3": "Watch right away",
+  "reserveWeek": "This week",
+  "weekdayMon": "Mon",
+  "weekdayTue": "Tue",
+  "weekdayWed": "Wed",
+  "weekdayThu": "Thu",
+  "weekdayFri": "Fri",
+  "weekdaySat": "Sat",
+  "weekdaySun": "Sun",
   "trendingTab": "Trending",
   "liveActionTab": "Live Action",
   "search": "Search",
@@ -101,6 +202,7 @@
   "share": "Share",
   "noComments": "No comments yet.",
   "writeComment": "Write a comment",
+  "commentLoginHint": "Sign in to comment",
   "postComment": "Post",
   "loadMore": "Load more",
   "commentsLoadFailed": "Comments could not be loaded.",
@@ -175,6 +277,7 @@
     }
   },
   "episodes": "Episodes",
+  "synopsisTitle": "Synopsis",
   "watchEpisodeOne": "Watch episode 1",
   "continueEpisode": "Continue episode {number}",
   "@continueEpisode": {
@@ -235,6 +338,10 @@
     }
   },
   "retry": "Retry",
+  "pullToRefresh": "Pull to refresh",
+  "releaseToRefresh": "Release to refresh",
+  "refreshingLabel": "Refreshing…",
+  "noMore": "No more",
   "backToSeries": "Back to series",
   "nextEpisode": "Next episode",
   "pause": "Pause",
@@ -245,8 +352,6 @@
   "captionsOff": "Captions off",
   "englishCaptions": "English captions",
   "chineseCaptions": "Chinese captions",
-  "language": "Language",
-  "systemLanguage": "System",
   "english": "English",
   "simplifiedChinese": "简体中文",
   "bahasaIndonesia": "Bahasa Indonesia",
@@ -281,6 +386,10 @@
   "newest": "New",
   "favorite": "Favorite",
   "myAccount": "My account",
+  "myWorks": "My works",
+  "creatorCenter": "Creator center",
+  "helpFeedback": "Help & feedback",
+  "vipUnlockMessage": "Unlock more with membership",
   "coins": "Coins",
   "topUpWallet": "Top Up Wallet",
   "vipMembership": "VIP Membership",
@@ -395,6 +504,18 @@
   "recordDeleteFailed": "Could not delete this record. Please retry.",
   "recordClearFailed": "Could not clear watch history. Please retry.",
   "clearAll": "Clear all",
+  "watchRecordsCount": "{count} records",
+  "@watchRecordsCount": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
+  "favoritesCount": "{count} favorites",
+  "@favoritesCount": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
   "clearWatchHistoryTitle": "Clear watch history?",
   "clearWatchHistoryMessage": "This removes the watch history from your account.",
   "confirmClear": "Clear",
@@ -476,5 +597,97 @@
   "accountCancelDeactivation": "Cancel deletion request",
   "accountCancelSucceeded": "Deletion request cancelled.",
   "accountDeactivateFailed": "Could not request account deletion.",
-  "accountCancelFailed": "Could not cancel the deletion request."
+  "accountCancelFailed": "Could not cancel the deletion request.",
+  "authPhoneTitle": "Continue with phone",
+  "authPhoneSignUp": "Create an account with phone",
+  "authPhoneLabel": "Phone number",
+  "authPhoneHint": "0812 3456 7890",
+  "authPhoneInvalid": "Enter a valid phone number",
+  "authCodeLabel": "Verification code",
+  "authCodeHint": "6-digit code",
+  "authCodeRequired": "Enter the verification code",
+  "authSendCode": "Send code",
+  "authResendCode": "Resend in {seconds}s",
+  "@authResendCode": { "placeholders": { "seconds": { "type": "int" } } },
+  "authCodeSent": "Verification code sent.",
+  "authPhoneSignInAction": "Sign in",
+  "authPhoneSignUpAction": "Create account",
+  "unlockWithCoins": "Unlock with coins",
+  "unlockFailed": "Could not unlock this episode.",
+  "wallet": "Wallet",
+  "coinBalance": "Coin balance",
+  "coinLedger": "Coin activity",
+  "noCoinLedger": "No coin activity yet.",
+  "walletLoadFailed": "Could not load your wallet.",
+  "walletBalanceShort": "{coins} coins",
+  "@walletBalanceShort": { "placeholders": { "coins": { "type": "int" } } },
+  "insufficientCoins": "Not enough coins.",
+  "rechargeUnavailable": "Top-up is not available yet.",
+  "totalRecharged": "Total recharged",
+  "totalConsumed": "Total spent",
+  "ledgerUnlock": "Episode unlock",
+  "ledgerRecharge": "Coin top-up",
+  "ledgerRefund": "Refund",
+  "ledgerAdjustment": "Adjustment",
+  "rankingTab": "Charts",
+  "rankingTitle": "Top Charts",
+  "rankingSubtitle": "Ranked from today's live catalog feed.",
+  "rankingHot": "Trending",
+  "rankingNew": "New releases",
+  "newReleasesAll": "All new releases",
+  "newReleasesSubtitle": "Newest arrivals",
+  "reserveSubtitle": "Reserve before launch",
+  "reserveEmptyTitle": "No reservations yet",
+  "reserveEmptyHint": "Reserve new dramas here once announced",
+  "topLabel": "TOP {n}",
+  "@topLabel": {
+    "placeholders": {
+      "n": {"type": "int"}
+    }
+  },
+  "rankingEmptyTitle": "No ranked stories yet",
+  "rankingEmptyBody": "Titles appear here as soon as they are published.",
+  "rankingTopPick": "TOP PICK"
+,  "rechargeTitle": "Top Up Coins",
+  "vipTitle": "VIP Membership",
+  "buy": "Buy",
+  "bonusCoin": "+{bonus} bonus",
+  "@bonusCoin": { "placeholders": { "bonus": { "type": "int" } } },
+  "vipDuration": "{days}-day VIP",
+  "@vipDuration": { "placeholders": { "days": { "type": "int" } } },
+  "noCoinPacks": "No coin packs available right now.",
+  "noVipPlans": "No VIP plans available right now.",
+  "productsLoadFailed": "Could not load products.",
+  "orderCreated": "Order {orderNo} created.",
+  "@orderCreated": { "placeholders": { "orderNo": { "type": "String" } } },
+  "paymentPending": "Waiting for payment.",
+  "orderCreateFailed": "Could not create the order.",
+  "playbackQuality": "Quality",
+  "qualityAuto": "Auto",
+  "qualityAutoHint": "HLS adjusts the bitrate automatically for your connection.",
+  "searchFailed": "Search failed. Please try again.",
+  "searchResultCount": "{count} results",
+  "@searchResultCount": { "placeholders": { "count": { "type": "int" } } },
+  "episodeCountLabel": "{count} episodes",
+  "@episodeCountLabel": { "placeholders": { "count": { "type": "int" } } },
+  "commentsWithCount": "{count} comments",
+  "@commentsWithCount": { "placeholders": { "count": { "type": "int" } } },
+  "textSize": "Text size",
+  "textSizeSmall": "Small",
+  "textSizeStandard": "Standard",
+  "textSizeLarge": "Large",
+  "watchAdToUnlock": "Watch an ad to unlock",
+  "unlockWithVip": "Unlock with VIP",
+  "unlockMethodsVary": "Available unlock methods vary by title.",
+  "unlockEpisode": "Unlock this episode",
+  "language": "Language",
+  "freeWatch": "Free watch",
+  "qualityUnavailable": "Unavailable",
+  "notInterested": "Not interested",
+  "clearPlayback": "Clear-screen playback",
+  "danmakuUnavailable": "Coming soon",
+  "danmakuSettings": "Danmaku settings",
+  "offlineCache": "Offline cache",
+  "screenCast": "Cast",
+  "sleepTimer": "Sleep timer"
 }
diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
index 6071753..68f8893 100644
--- a/lib/l10n/app_id.arb
+++ b/lib/l10n/app_id.arb
@@ -9,10 +9,12 @@
   "demoTitle": "Sinyal",
   "demoSynopsis": "Pratinjau video lokal singkat. Episode lain bisa ditambahkan saat medianya tersedia.",
   "homeTab": "Beranda",
+  "theaterTab": "Teater",
+  "createTab": "Buat",
   "openQuickMenu": "Buka menu cepat",
   "quickAccess": "Akses cepat",
   "currentSeries": "Serial saat ini",
-  "discoverTab": "Temukan",
+  "discoverTab": "Teater",
   "searchDiscover": "Cari drama, aktor, genre...",
   "featured": "Unggulan",
   "recommended": "Rekomendasi",
@@ -27,8 +29,28 @@
   "romance": "Romantis",
   "actionGenre": "Aksi",
   "filter": "Filter",
+  "filterGroupCategory": "Semua genre",
+  "filterGroupTheme": "Semua tema",
+  "filterGroupLanguage": "Semua bahasa",
+  "filterGroupSort": "Semua rekomendasi",
+  "sortNewest": "Terbaru",
+  "sortHottest": "Terpopuler",
+  "expandFilters": "Perluas",
+  "collapseFilters": "Ciutkan",
+  "filterEmpty": "Tidak ada drama yang cocok",
+  "hotBadge": "Hits",
+  "filterAll": "Semua",
+  "seriesMeta": "Serial · {episodes} eps | {viewers} menonton",
+  "watchFullSeries": "Tonton serial lengkap · {episodes} eps",
+  "feedTabAnime": "Anime",
+  "feedTabReal": "Live-action",
+  "feedTabForYou": "Untukmu",
+  "authorNoteLabel": "Catatan penulis",
+  "reserve": "Reservasi",
+  "heatLabel": "{count} panas",
   "topCharts": "Peringkat Teratas",
   "newReleases": "Rilisan Baru",
+  "newDramas": "Baru",
   "trendingMicroDramas": "Drama Mini Populer",
   "seeAll": "Lihat Semua",
   "trendingSubtitle": "Paling banyak ditonton minggu ini",
@@ -38,6 +60,7 @@
   "seasonOneOriginalRelease": "Musim 1 • Rilis Orisinal",
   "startWatching": "Mulai Menonton",
   "showLess": "Lebih sedikit",
+  "expandSynopsis": "Selengkapnya",
   "views": "tayangan",
   "episodeOfTotal": "Episode {current} / {total}",
   "@episodeOfTotal": {
@@ -49,6 +72,7 @@
   "clearScreen": "Bersihkan layar",
   "exitClearScreen": "Keluar dari layar bersih",
   "playbackSpeed": "Kecepatan putar",
+  "speedBoosting": "{speed}x kecepatan",
   "minutesAgo": "{count} mnt lalu",
   "@minutesAgo": {
     "placeholders": {
@@ -66,6 +90,31 @@
   "localViewer": "Penonton Lokal",
   "localDemoProfile": "Profil demo lokal",
   "continueWatching": "Lanjut Tonton",
+  "episodeRemaining": "Episode {episode} · {minutes} menit tersisa",
+  "@episodeRemaining": {
+    "placeholders": {
+      "episode": {"type": "int"},
+      "minutes": {"type": "int"}
+    }
+  },
+  "viewCountLabel": "{count} tayangan",
+  "@viewCountLabel": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
+  "allEpisodesBadge": "Semua {count}",
+  "@allEpisodesBadge": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
+  "lockedEpisodeCount": "{count} terkunci",
+  "@lockedEpisodeCount": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
   "watchedPercent": "Sudah ditonton {percent}%",
   "@watchedPercent": {
     "placeholders": {
@@ -83,12 +132,38 @@
   "completed": "Selesai",
   "noSavedShows": "Belum ada tontonan di sini.",
   "preferences": "Preferensi",
-  "appLanguage": "Bahasa Aplikasi",
   "followingTab": "Mengikuti",
   "animatedTab": "Animasi",
   "recommendedTab": "Rekomendasi",
   "noCategoryDramas": "Belum ada drama di kategori ini.",
   "allDramas": "Semua Drama",
+  "allLanguages": "Semua bahasa",
+  "bahasaMelayu": "Bahasa Melayu",
+  "createSubtitle": "Cerita menjadi drama pendek",
+  "createAiTitle": "Produksi AI",
+  "createAiSubtitle": "Mulai dari cerita atau ide",
+  "createUploadTitle": "Unggah dan terbitkan",
+  "createUploadSubtitle": "Terbitkan drama pendek yang sudah selesai",
+  "createMottoPrimary": "Imajinasimu",
+  "createMottoSecondary": "Bisa dilihat lebih banyak orang",
+  "newReleasesTitle": "Premiere baru",
+  "newReleasesCount": "{count} baru minggu ini",
+  "premiereToday": "Tayang perdana hari ini",
+  "newBadge": "BARU",
+  "reserveTitle": "Jadwal reservasi",
+  "goNewReleases": "Lihat rilis baru",
+  "reserveStepsTitle": "Yang kamu dapat setelah reservasi",
+  "reserveStep1": "Reservasi sekali ketuk",
+  "reserveStep2": "Pengingat tayang",
+  "reserveStep3": "Langsung tonton",
+  "reserveWeek": "Minggu ini",
+  "weekdayMon": "Sen",
+  "weekdayTue": "Sel",
+  "weekdayWed": "Rab",
+  "weekdayThu": "Kam",
+  "weekdayFri": "Jum",
+  "weekdaySat": "Sab",
+  "weekdaySun": "Min",
   "trendingTab": "Sedang Tren",
   "liveActionTab": "Live Action",
   "search": "Cari",
@@ -101,6 +176,7 @@
   "share": "Bagikan",
   "noComments": "Belum ada komentar.",
   "writeComment": "Tulis komentar",
+  "commentLoginHint": "Masuk untuk berkomentar",
   "postComment": "Kirim",
   "loadMore": "Muat lebih banyak",
   "commentsLoadFailed": "Komentar tidak dapat dimuat.",
@@ -175,6 +251,7 @@
     }
   },
   "episodes": "Episode",
+  "synopsisTitle": "Sinopsis",
   "watchEpisodeOne": "Tonton episode 1",
   "continueEpisode": "Lanjut episode {number}",
   "@continueEpisode": {
@@ -235,6 +312,10 @@
     }
   },
   "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",
@@ -245,8 +326,6 @@
   "captionsOff": "Subtitle nonaktif",
   "englishCaptions": "Subtitle bahasa Inggris",
   "chineseCaptions": "Subtitle bahasa Mandarin",
-  "language": "Bahasa",
-  "systemLanguage": "Sistem",
   "english": "English",
   "simplifiedChinese": "简体中文",
   "bahasaIndonesia": "Bahasa Indonesia",
@@ -281,6 +360,10 @@
   "newest": "Terbaru",
   "favorite": "Favorit",
   "myAccount": "Akun saya",
+  "myWorks": "Karya saya",
+  "creatorCenter": "Pusat kreator",
+  "helpFeedback": "Bantuan & masukan",
+  "vipUnlockMessage": "Buka lebih banyak dengan keanggotaan",
   "coins": "Koin",
   "topUpWallet": "Isi Ulang Dompet",
   "vipMembership": "Keanggotaan VIP",
@@ -395,6 +478,8 @@
   "recordDeleteFailed": "Gagal menghapus riwayat ini. Coba lagi.",
   "recordClearFailed": "Gagal menghapus semua riwayat. Coba lagi.",
   "clearAll": "Hapus semua",
+  "watchRecordsCount": "{count} riwayat",
+  "favoritesCount": "{count} favorit",
   "clearWatchHistoryTitle": "Hapus riwayat tontonan?",
   "clearWatchHistoryMessage": "Semua riwayat akan dihapus dari akun kamu.",
   "confirmClear": "Hapus",
@@ -476,5 +561,90 @@
   "accountCancelDeactivation": "Batalkan permintaan penghapusan",
   "accountCancelSucceeded": "Permintaan penghapusan dibatalkan.",
   "accountDeactivateFailed": "Permintaan penghapusan gagal dikirim.",
-  "accountCancelFailed": "Permintaan penghapusan gagal dibatalkan."
+  "accountCancelFailed": "Permintaan penghapusan gagal dibatalkan.",
+  "authPhoneTitle": "Lanjutkan dengan nomor HP",
+  "authPhoneSignUp": "Buat akun dengan nomor HP",
+  "authPhoneLabel": "Nomor HP",
+  "authPhoneHint": "0812 3456 7890",
+  "authPhoneInvalid": "Masukkan nomor HP yang valid",
+  "authCodeLabel": "Kode verifikasi",
+  "authCodeHint": "Kode 6 digit",
+  "authCodeRequired": "Masukkan kode verifikasi",
+  "authSendCode": "Kirim kode",
+  "authResendCode": "Kirim ulang dalam {seconds} detik",
+  "authCodeSent": "Kode verifikasi telah dikirim.",
+  "authPhoneSignInAction": "Masuk",
+  "authPhoneSignUpAction": "Buat akun",
+  "unlockWithCoins": "Buka dengan koin",
+  "unlockFailed": "Gagal membuka episode ini.",
+  "wallet": "Dompet",
+  "coinBalance": "Saldo koin",
+  "coinLedger": "Riwayat koin",
+  "noCoinLedger": "Belum ada aktivitas koin.",
+  "walletLoadFailed": "Gagal memuat dompet.",
+  "walletBalanceShort": "{coins} koin",
+  "insufficientCoins": "Koin tidak cukup.",
+  "rechargeUnavailable": "Isi ulang belum tersedia.",
+  "totalRecharged": "Total isi ulang",
+  "totalConsumed": "Total pemakaian",
+  "ledgerUnlock": "Buka episode",
+  "ledgerRecharge": "Isi ulang koin",
+  "ledgerRefund": "Pengembalian",
+  "ledgerAdjustment": "Penyesuaian",
+  "rankingTab": "Peringkat",
+  "rankingTitle": "Peringkat Teratas",
+  "rankingSubtitle": "Diurutkan dari feed katalog terkini.",
+  "rankingHot": "Populer",
+  "rankingNew": "Rilis baru",
+  "newReleasesAll": "Semua rilis baru",
+  "newReleasesSubtitle": "Rilis terbaru",
+  "reserveSubtitle": "Reservasi sebelum rilis",
+  "reserveEmptyTitle": "Belum ada reservasi",
+  "reserveEmptyHint": "Reservasi drama baru di sini",
+  "topLabel": "TOP {n}",
+  "rankingEmptyTitle": "Belum ada peringkat",
+  "rankingEmptyBody": "Judul muncul di sini setelah diterbitkan.",
+  "rankingTopPick": "PILIHAN UTAMA"
+,  "rechargeTitle": "Isi Ulang Koin",
+  "vipTitle": "Keanggotaan VIP",
+  "buy": "Beli",
+  "bonusCoin": "+{bonus} bonus",
+  "@bonusCoin": { "placeholders": { "bonus": { "type": "int" } } },
+  "vipDuration": "VIP {days} hari",
+  "@vipDuration": { "placeholders": { "days": { "type": "int" } } },
+  "noCoinPacks": "Belum ada paket koin.",
+  "noVipPlans": "Belum ada paket VIP.",
+  "productsLoadFailed": "Gagal memuat produk.",
+  "orderCreated": "Pesanan {orderNo} dibuat.",
+  "@orderCreated": { "placeholders": { "orderNo": { "type": "String" } } },
+  "paymentPending": "Menunggu pembayaran.",
+  "orderCreateFailed": "Gagal membuat pesanan.",
+  "playbackQuality": "Kualitas",
+  "qualityAuto": "Otomatis",
+  "qualityAutoHint": "HLS menyesuaikan bitrate secara otomatis dengan koneksi Anda.",
+  "searchFailed": "Pencarian gagal. Coba lagi.",
+  "searchResultCount": "{count} hasil",
+  "@searchResultCount": { "placeholders": { "count": { "type": "int" } } },
+  "episodeCountLabel": "{count} episode",
+  "@episodeCountLabel": { "placeholders": { "count": { "type": "int" } } },
+  "commentsWithCount": "{count} komentar",
+  "@commentsWithCount": { "placeholders": { "count": { "type": "int" } } },
+  "textSize": "Ukuran teks",
+  "textSizeSmall": "Kecil",
+  "textSizeStandard": "Standar",
+  "textSizeLarge": "Besar",
+  "watchAdToUnlock": "Tonton iklan untuk membuka",
+  "unlockWithVip": "Buka dengan VIP",
+  "unlockMethodsVary": "Metode pembukaan tersedia dapat berbeda per judul.",
+  "unlockEpisode": "Buka episode ini",
+  "language": "Bahasa",
+  "freeWatch": "Tonton gratis",
+  "qualityUnavailable": "Tidak tersedia",
+  "notInterested": "Tidak tertarik",
+  "clearPlayback": "Putar tanpa kontrol",
+  "danmakuUnavailable": "Belum tersedia",
+  "danmakuSettings": "Pengaturan komentar layar",
+  "offlineCache": "Cache offline",
+  "screenCast": "Cast",
+  "sleepTimer": "Timer tidur"
 }
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 63446d1..650b5bb 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -154,6 +154,18 @@ abstract class AppLocalizations {
   /// **'Home'**
   String get homeTab;
 
+  /// No description provided for @theaterTab.
+  ///
+  /// In en, this message translates to:
+  /// **'Theater'**
+  String get theaterTab;
+
+  /// No description provided for @createTab.
+  ///
+  /// In en, this message translates to:
+  /// **'Create'**
+  String get createTab;
+
   /// No description provided for @openQuickMenu.
   ///
   /// In en, this message translates to:
@@ -175,7 +187,7 @@ abstract class AppLocalizations {
   /// No description provided for @discoverTab.
   ///
   /// In en, this message translates to:
-  /// **'Discover'**
+  /// **'Theater'**
   String get discoverTab;
 
   /// No description provided for @searchDiscover.
@@ -262,6 +274,120 @@ abstract class AppLocalizations {
   /// **'Filter'**
   String get filter;
 
+  /// No description provided for @filterGroupCategory.
+  ///
+  /// In en, this message translates to:
+  /// **'All genres'**
+  String get filterGroupCategory;
+
+  /// No description provided for @filterGroupTheme.
+  ///
+  /// In en, this message translates to:
+  /// **'All themes'**
+  String get filterGroupTheme;
+
+  /// No description provided for @filterGroupLanguage.
+  ///
+  /// In en, this message translates to:
+  /// **'All languages'**
+  String get filterGroupLanguage;
+
+  /// No description provided for @filterGroupSort.
+  ///
+  /// In en, this message translates to:
+  /// **'All recommendations'**
+  String get filterGroupSort;
+
+  /// No description provided for @sortNewest.
+  ///
+  /// In en, this message translates to:
+  /// **'Newest'**
+  String get sortNewest;
+
+  /// No description provided for @sortHottest.
+  ///
+  /// In en, this message translates to:
+  /// **'Hottest'**
+  String get sortHottest;
+
+  /// No description provided for @expandFilters.
+  ///
+  /// In en, this message translates to:
+  /// **'Expand'**
+  String get expandFilters;
+
+  /// No description provided for @collapseFilters.
+  ///
+  /// In en, this message translates to:
+  /// **'Collapse'**
+  String get collapseFilters;
+
+  /// No description provided for @filterEmpty.
+  ///
+  /// In en, this message translates to:
+  /// **'No dramas match these filters'**
+  String get filterEmpty;
+
+  /// No description provided for @hotBadge.
+  ///
+  /// In en, this message translates to:
+  /// **'Hit'**
+  String get hotBadge;
+
+  /// No description provided for @filterAll.
+  ///
+  /// In en, this message translates to:
+  /// **'All'**
+  String get filterAll;
+
+  /// No description provided for @seriesMeta.
+  ///
+  /// In en, this message translates to:
+  /// **'Series · {episodes} eps | {viewers} watching'**
+  String seriesMeta(String episodes, String viewers);
+
+  /// No description provided for @watchFullSeries.
+  ///
+  /// In en, this message translates to:
+  /// **'Watch full series · {episodes} eps'**
+  String watchFullSeries(String episodes);
+
+  /// No description provided for @feedTabAnime.
+  ///
+  /// In en, this message translates to:
+  /// **'Anime'**
+  String get feedTabAnime;
+
+  /// No description provided for @feedTabReal.
+  ///
+  /// In en, this message translates to:
+  /// **'Live-action'**
+  String get feedTabReal;
+
+  /// No description provided for @feedTabForYou.
+  ///
+  /// In en, this message translates to:
+  /// **'For you'**
+  String get feedTabForYou;
+
+  /// No description provided for @authorNoteLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'Author note'**
+  String get authorNoteLabel;
+
+  /// No description provided for @reserve.
+  ///
+  /// In en, this message translates to:
+  /// **'Reserve'**
+  String get reserve;
+
+  /// No description provided for @heatLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} heat'**
+  String heatLabel(String count);
+
   /// No description provided for @topCharts.
   ///
   /// In en, this message translates to:
@@ -274,6 +400,12 @@ abstract class AppLocalizations {
   /// **'New Releases'**
   String get newReleases;
 
+  /// No description provided for @newDramas.
+  ///
+  /// In en, this message translates to:
+  /// **'New'**
+  String get newDramas;
+
   /// No description provided for @trendingMicroDramas.
   ///
   /// In en, this message translates to:
@@ -328,6 +460,12 @@ abstract class AppLocalizations {
   /// **'Less'**
   String get showLess;
 
+  /// No description provided for @expandSynopsis.
+  ///
+  /// In en, this message translates to:
+  /// **'More'**
+  String get expandSynopsis;
+
   /// No description provided for @views.
   ///
   /// In en, this message translates to:
@@ -358,6 +496,12 @@ abstract class AppLocalizations {
   /// **'Playback speed'**
   String get playbackSpeed;
 
+  /// No description provided for @speedBoosting.
+  ///
+  /// In en, this message translates to:
+  /// **'{speed}x speed'**
+  String speedBoosting(String speed);
+
   /// No description provided for @minutesAgo.
   ///
   /// In en, this message translates to:
@@ -430,6 +574,30 @@ abstract class AppLocalizations {
   /// **'Continue Watching'**
   String get continueWatching;
 
+  /// No description provided for @episodeRemaining.
+  ///
+  /// In en, this message translates to:
+  /// **'Episode {episode} · {minutes} min left'**
+  String episodeRemaining(int episode, int minutes);
+
+  /// No description provided for @viewCountLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} views'**
+  String viewCountLabel(int count);
+
+  /// No description provided for @allEpisodesBadge.
+  ///
+  /// In en, this message translates to:
+  /// **'All {count}'**
+  String allEpisodesBadge(int count);
+
+  /// No description provided for @lockedEpisodeCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} locked'**
+  String lockedEpisodeCount(int count);
+
   /// No description provided for @watchedPercent.
   ///
   /// In en, this message translates to:
@@ -490,12 +658,6 @@ abstract class AppLocalizations {
   /// **'Preferences'**
   String get preferences;
 
-  /// No description provided for @appLanguage.
-  ///
-  /// In en, this message translates to:
-  /// **'App Language'**
-  String get appLanguage;
-
   /// No description provided for @followingTab.
   ///
   /// In en, this message translates to:
@@ -526,6 +688,168 @@ abstract class AppLocalizations {
   /// **'All Dramas'**
   String get allDramas;
 
+  /// No description provided for @allLanguages.
+  ///
+  /// In en, this message translates to:
+  /// **'All languages'**
+  String get allLanguages;
+
+  /// No description provided for @bahasaMelayu.
+  ///
+  /// In en, this message translates to:
+  /// **'Malay'**
+  String get bahasaMelayu;
+
+  /// No description provided for @createSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Stories become short dramas'**
+  String get createSubtitle;
+
+  /// No description provided for @createAiTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'AI production'**
+  String get createAiTitle;
+
+  /// No description provided for @createAiSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Start from a story or an idea'**
+  String get createAiSubtitle;
+
+  /// No description provided for @createUploadTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Upload and publish'**
+  String get createUploadTitle;
+
+  /// No description provided for @createUploadSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Publish a finished short drama'**
+  String get createUploadSubtitle;
+
+  /// No description provided for @createMottoPrimary.
+  ///
+  /// In en, this message translates to:
+  /// **'Your imagination'**
+  String get createMottoPrimary;
+
+  /// No description provided for @createMottoSecondary.
+  ///
+  /// In en, this message translates to:
+  /// **'Can be seen by more people'**
+  String get createMottoSecondary;
+
+  /// No description provided for @newReleasesTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'New premieres'**
+  String get newReleasesTitle;
+
+  /// No description provided for @newReleasesCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} new this week'**
+  String newReleasesCount(int count);
+
+  /// No description provided for @premiereToday.
+  ///
+  /// In en, this message translates to:
+  /// **'Today\'s premiere'**
+  String get premiereToday;
+
+  /// No description provided for @newBadge.
+  ///
+  /// In en, this message translates to:
+  /// **'NEW'**
+  String get newBadge;
+
+  /// No description provided for @reserveTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Schedule booking'**
+  String get reserveTitle;
+
+  /// No description provided for @goNewReleases.
+  ///
+  /// In en, this message translates to:
+  /// **'Browse new releases'**
+  String get goNewReleases;
+
+  /// No description provided for @reserveStepsTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'What you get after reserving'**
+  String get reserveStepsTitle;
+
+  /// No description provided for @reserveStep1.
+  ///
+  /// In en, this message translates to:
+  /// **'One-tap reserve'**
+  String get reserveStep1;
+
+  /// No description provided for @reserveStep2.
+  ///
+  /// In en, this message translates to:
+  /// **'Premiere reminder'**
+  String get reserveStep2;
+
+  /// No description provided for @reserveStep3.
+  ///
+  /// In en, this message translates to:
+  /// **'Watch right away'**
+  String get reserveStep3;
+
+  /// No description provided for @reserveWeek.
+  ///
+  /// In en, this message translates to:
+  /// **'This week'**
+  String get reserveWeek;
+
+  /// No description provided for @weekdayMon.
+  ///
+  /// In en, this message translates to:
+  /// **'Mon'**
+  String get weekdayMon;
+
+  /// No description provided for @weekdayTue.
+  ///
+  /// In en, this message translates to:
+  /// **'Tue'**
+  String get weekdayTue;
+
+  /// No description provided for @weekdayWed.
+  ///
+  /// In en, this message translates to:
+  /// **'Wed'**
+  String get weekdayWed;
+
+  /// No description provided for @weekdayThu.
+  ///
+  /// In en, this message translates to:
+  /// **'Thu'**
+  String get weekdayThu;
+
+  /// No description provided for @weekdayFri.
+  ///
+  /// In en, this message translates to:
+  /// **'Fri'**
+  String get weekdayFri;
+
+  /// No description provided for @weekdaySat.
+  ///
+  /// In en, this message translates to:
+  /// **'Sat'**
+  String get weekdaySat;
+
+  /// No description provided for @weekdaySun.
+  ///
+  /// In en, this message translates to:
+  /// **'Sun'**
+  String get weekdaySun;
+
   /// No description provided for @trendingTab.
   ///
   /// In en, this message translates to:
@@ -598,6 +922,12 @@ abstract class AppLocalizations {
   /// **'Write a comment'**
   String get writeComment;
 
+  /// No description provided for @commentLoginHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Sign in to comment'**
+  String get commentLoginHint;
+
   /// No description provided for @postComment.
   ///
   /// In en, this message translates to:
@@ -844,6 +1174,12 @@ abstract class AppLocalizations {
   /// **'Episodes'**
   String get episodes;
 
+  /// No description provided for @synopsisTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Synopsis'**
+  String get synopsisTitle;
+
   /// No description provided for @watchEpisodeOne.
   ///
   /// In en, this message translates to:
@@ -1000,6 +1336,30 @@ 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:
@@ -1060,18 +1420,6 @@ abstract class AppLocalizations {
   /// **'Chinese captions'**
   String get chineseCaptions;
 
-  /// No description provided for @language.
-  ///
-  /// In en, this message translates to:
-  /// **'Language'**
-  String get language;
-
-  /// No description provided for @systemLanguage.
-  ///
-  /// In en, this message translates to:
-  /// **'System'**
-  String get systemLanguage;
-
   /// No description provided for @english.
   ///
   /// In en, this message translates to:
@@ -1276,6 +1624,30 @@ abstract class AppLocalizations {
   /// **'My account'**
   String get myAccount;
 
+  /// No description provided for @myWorks.
+  ///
+  /// In en, this message translates to:
+  /// **'My works'**
+  String get myWorks;
+
+  /// No description provided for @creatorCenter.
+  ///
+  /// In en, this message translates to:
+  /// **'Creator center'**
+  String get creatorCenter;
+
+  /// No description provided for @helpFeedback.
+  ///
+  /// In en, this message translates to:
+  /// **'Help & feedback'**
+  String get helpFeedback;
+
+  /// No description provided for @vipUnlockMessage.
+  ///
+  /// In en, this message translates to:
+  /// **'Unlock more with membership'**
+  String get vipUnlockMessage;
+
   /// No description provided for @coins.
   ///
   /// In en, this message translates to:
@@ -1726,6 +2098,18 @@ abstract class AppLocalizations {
   /// **'Clear all'**
   String get clearAll;
 
+  /// No description provided for @watchRecordsCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} records'**
+  String watchRecordsCount(int count);
+
+  /// No description provided for @favoritesCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} favorites'**
+  String favoritesCount(int count);
+
   /// No description provided for @clearWatchHistoryTitle.
   ///
   /// In en, this message translates to:
@@ -2121,6 +2505,480 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Could not cancel the deletion request.'**
   String get accountCancelFailed;
+
+  /// No description provided for @authPhoneTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Continue with phone'**
+  String get authPhoneTitle;
+
+  /// No description provided for @authPhoneSignUp.
+  ///
+  /// In en, this message translates to:
+  /// **'Create an account with phone'**
+  String get authPhoneSignUp;
+
+  /// No description provided for @authPhoneLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'Phone number'**
+  String get authPhoneLabel;
+
+  /// No description provided for @authPhoneHint.
+  ///
+  /// In en, this message translates to:
+  /// **'0812 3456 7890'**
+  String get authPhoneHint;
+
+  /// No description provided for @authPhoneInvalid.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter a valid phone number'**
+  String get authPhoneInvalid;
+
+  /// No description provided for @authCodeLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'Verification code'**
+  String get authCodeLabel;
+
+  /// No description provided for @authCodeHint.
+  ///
+  /// In en, this message translates to:
+  /// **'6-digit code'**
+  String get authCodeHint;
+
+  /// No description provided for @authCodeRequired.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter the verification code'**
+  String get authCodeRequired;
+
+  /// No description provided for @authSendCode.
+  ///
+  /// In en, this message translates to:
+  /// **'Send code'**
+  String get authSendCode;
+
+  /// No description provided for @authResendCode.
+  ///
+  /// In en, this message translates to:
+  /// **'Resend in {seconds}s'**
+  String authResendCode(int seconds);
+
+  /// No description provided for @authCodeSent.
+  ///
+  /// In en, this message translates to:
+  /// **'Verification code sent.'**
+  String get authCodeSent;
+
+  /// No description provided for @authPhoneSignInAction.
+  ///
+  /// In en, this message translates to:
+  /// **'Sign in'**
+  String get authPhoneSignInAction;
+
+  /// No description provided for @authPhoneSignUpAction.
+  ///
+  /// In en, this message translates to:
+  /// **'Create account'**
+  String get authPhoneSignUpAction;
+
+  /// No description provided for @unlockWithCoins.
+  ///
+  /// In en, this message translates to:
+  /// **'Unlock with coins'**
+  String get unlockWithCoins;
+
+  /// No description provided for @unlockFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'Could not unlock this episode.'**
+  String get unlockFailed;
+
+  /// No description provided for @wallet.
+  ///
+  /// In en, this message translates to:
+  /// **'Wallet'**
+  String get wallet;
+
+  /// No description provided for @coinBalance.
+  ///
+  /// In en, this message translates to:
+  /// **'Coin balance'**
+  String get coinBalance;
+
+  /// No description provided for @coinLedger.
+  ///
+  /// In en, this message translates to:
+  /// **'Coin activity'**
+  String get coinLedger;
+
+  /// No description provided for @noCoinLedger.
+  ///
+  /// In en, this message translates to:
+  /// **'No coin activity yet.'**
+  String get noCoinLedger;
+
+  /// No description provided for @walletLoadFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'Could not load your wallet.'**
+  String get walletLoadFailed;
+
+  /// No description provided for @walletBalanceShort.
+  ///
+  /// In en, this message translates to:
+  /// **'{coins} coins'**
+  String walletBalanceShort(int coins);
+
+  /// No description provided for @insufficientCoins.
+  ///
+  /// In en, this message translates to:
+  /// **'Not enough coins.'**
+  String get insufficientCoins;
+
+  /// No description provided for @rechargeUnavailable.
+  ///
+  /// In en, this message translates to:
+  /// **'Top-up is not available yet.'**
+  String get rechargeUnavailable;
+
+  /// No description provided for @totalRecharged.
+  ///
+  /// In en, this message translates to:
+  /// **'Total recharged'**
+  String get totalRecharged;
+
+  /// No description provided for @totalConsumed.
+  ///
+  /// In en, this message translates to:
+  /// **'Total spent'**
+  String get totalConsumed;
+
+  /// No description provided for @ledgerUnlock.
+  ///
+  /// In en, this message translates to:
+  /// **'Episode unlock'**
+  String get ledgerUnlock;
+
+  /// No description provided for @ledgerRecharge.
+  ///
+  /// In en, this message translates to:
+  /// **'Coin top-up'**
+  String get ledgerRecharge;
+
+  /// No description provided for @ledgerRefund.
+  ///
+  /// In en, this message translates to:
+  /// **'Refund'**
+  String get ledgerRefund;
+
+  /// No description provided for @ledgerAdjustment.
+  ///
+  /// In en, this message translates to:
+  /// **'Adjustment'**
+  String get ledgerAdjustment;
+
+  /// No description provided for @rankingTab.
+  ///
+  /// In en, this message translates to:
+  /// **'Charts'**
+  String get rankingTab;
+
+  /// No description provided for @rankingTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Top Charts'**
+  String get rankingTitle;
+
+  /// No description provided for @rankingSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Ranked from today\'s live catalog feed.'**
+  String get rankingSubtitle;
+
+  /// No description provided for @rankingHot.
+  ///
+  /// In en, this message translates to:
+  /// **'Trending'**
+  String get rankingHot;
+
+  /// No description provided for @rankingNew.
+  ///
+  /// In en, this message translates to:
+  /// **'New releases'**
+  String get rankingNew;
+
+  /// No description provided for @newReleasesAll.
+  ///
+  /// In en, this message translates to:
+  /// **'All new releases'**
+  String get newReleasesAll;
+
+  /// No description provided for @newReleasesSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Newest arrivals'**
+  String get newReleasesSubtitle;
+
+  /// No description provided for @reserveSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Reserve before launch'**
+  String get reserveSubtitle;
+
+  /// No description provided for @reserveEmptyTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'No reservations yet'**
+  String get reserveEmptyTitle;
+
+  /// No description provided for @reserveEmptyHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Reserve new dramas here once announced'**
+  String get reserveEmptyHint;
+
+  /// No description provided for @topLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'TOP {n}'**
+  String topLabel(int n);
+
+  /// No description provided for @rankingEmptyTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'No ranked stories yet'**
+  String get rankingEmptyTitle;
+
+  /// No description provided for @rankingEmptyBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Titles appear here as soon as they are published.'**
+  String get rankingEmptyBody;
+
+  /// No description provided for @rankingTopPick.
+  ///
+  /// In en, this message translates to:
+  /// **'TOP PICK'**
+  String get rankingTopPick;
+
+  /// No description provided for @rechargeTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Top Up Coins'**
+  String get rechargeTitle;
+
+  /// No description provided for @vipTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'VIP Membership'**
+  String get vipTitle;
+
+  /// No description provided for @buy.
+  ///
+  /// In en, this message translates to:
+  /// **'Buy'**
+  String get buy;
+
+  /// No description provided for @bonusCoin.
+  ///
+  /// In en, this message translates to:
+  /// **'+{bonus} bonus'**
+  String bonusCoin(int bonus);
+
+  /// No description provided for @vipDuration.
+  ///
+  /// In en, this message translates to:
+  /// **'{days}-day VIP'**
+  String vipDuration(int days);
+
+  /// No description provided for @noCoinPacks.
+  ///
+  /// In en, this message translates to:
+  /// **'No coin packs available right now.'**
+  String get noCoinPacks;
+
+  /// No description provided for @noVipPlans.
+  ///
+  /// In en, this message translates to:
+  /// **'No VIP plans available right now.'**
+  String get noVipPlans;
+
+  /// No description provided for @productsLoadFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'Could not load products.'**
+  String get productsLoadFailed;
+
+  /// No description provided for @orderCreated.
+  ///
+  /// In en, this message translates to:
+  /// **'Order {orderNo} created.'**
+  String orderCreated(String orderNo);
+
+  /// No description provided for @paymentPending.
+  ///
+  /// In en, this message translates to:
+  /// **'Waiting for payment.'**
+  String get paymentPending;
+
+  /// No description provided for @orderCreateFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'Could not create the order.'**
+  String get orderCreateFailed;
+
+  /// No description provided for @playbackQuality.
+  ///
+  /// In en, this message translates to:
+  /// **'Quality'**
+  String get playbackQuality;
+
+  /// No description provided for @qualityAuto.
+  ///
+  /// In en, this message translates to:
+  /// **'Auto'**
+  String get qualityAuto;
+
+  /// No description provided for @qualityAutoHint.
+  ///
+  /// In en, this message translates to:
+  /// **'HLS adjusts the bitrate automatically for your connection.'**
+  String get qualityAutoHint;
+
+  /// No description provided for @searchFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'Search failed. Please try again.'**
+  String get searchFailed;
+
+  /// No description provided for @searchResultCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} results'**
+  String searchResultCount(int count);
+
+  /// No description provided for @episodeCountLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} episodes'**
+  String episodeCountLabel(int count);
+
+  /// No description provided for @commentsWithCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} comments'**
+  String commentsWithCount(int count);
+
+  /// No description provided for @textSize.
+  ///
+  /// In en, this message translates to:
+  /// **'Text size'**
+  String get textSize;
+
+  /// No description provided for @textSizeSmall.
+  ///
+  /// In en, this message translates to:
+  /// **'Small'**
+  String get textSizeSmall;
+
+  /// No description provided for @textSizeStandard.
+  ///
+  /// In en, this message translates to:
+  /// **'Standard'**
+  String get textSizeStandard;
+
+  /// No description provided for @textSizeLarge.
+  ///
+  /// In en, this message translates to:
+  /// **'Large'**
+  String get textSizeLarge;
+
+  /// No description provided for @watchAdToUnlock.
+  ///
+  /// In en, this message translates to:
+  /// **'Watch an ad to unlock'**
+  String get watchAdToUnlock;
+
+  /// No description provided for @unlockWithVip.
+  ///
+  /// In en, this message translates to:
+  /// **'Unlock with VIP'**
+  String get unlockWithVip;
+
+  /// No description provided for @unlockMethodsVary.
+  ///
+  /// In en, this message translates to:
+  /// **'Available unlock methods vary by title.'**
+  String get unlockMethodsVary;
+
+  /// No description provided for @unlockEpisode.
+  ///
+  /// In en, this message translates to:
+  /// **'Unlock this episode'**
+  String get unlockEpisode;
+
+  /// No description provided for @language.
+  ///
+  /// In en, this message translates to:
+  /// **'Language'**
+  String get language;
+
+  /// No description provided for @freeWatch.
+  ///
+  /// In en, this message translates to:
+  /// **'Free watch'**
+  String get freeWatch;
+
+  /// No description provided for @qualityUnavailable.
+  ///
+  /// In en, this message translates to:
+  /// **'Unavailable'**
+  String get qualityUnavailable;
+
+  /// No description provided for @notInterested.
+  ///
+  /// In en, this message translates to:
+  /// **'Not interested'**
+  String get notInterested;
+
+  /// No description provided for @clearPlayback.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear-screen playback'**
+  String get clearPlayback;
+
+  /// No description provided for @danmakuUnavailable.
+  ///
+  /// In en, this message translates to:
+  /// **'Coming soon'**
+  String get danmakuUnavailable;
+
+  /// No description provided for @danmakuSettings.
+  ///
+  /// In en, this message translates to:
+  /// **'Danmaku settings'**
+  String get danmakuSettings;
+
+  /// No description provided for @offlineCache.
+  ///
+  /// In en, this message translates to:
+  /// **'Offline cache'**
+  String get offlineCache;
+
+  /// No description provided for @screenCast.
+  ///
+  /// In en, this message translates to:
+  /// **'Cast'**
+  String get screenCast;
+
+  /// No description provided for @sleepTimer.
+  ///
+  /// In en, this message translates to:
+  /// **'Sleep timer'**
+  String get sleepTimer;
 }
 
 class _AppLocalizationsDelegate
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index f777db2..6437937 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -36,6 +36,12 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get homeTab => 'Home';
 
+  @override
+  String get theaterTab => 'Theater';
+
+  @override
+  String get createTab => 'Create';
+
   @override
   String get openQuickMenu => 'Open quick menu';
 
@@ -46,7 +52,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get currentSeries => 'Current series';
 
   @override
-  String get discoverTab => 'Discover';
+  String get discoverTab => 'Theater';
 
   @override
   String get searchDiscover => 'Search dramas, actors, genres...';
@@ -92,12 +98,78 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get filter => 'Filter';
 
+  @override
+  String get filterGroupCategory => 'All genres';
+
+  @override
+  String get filterGroupTheme => 'All themes';
+
+  @override
+  String get filterGroupLanguage => 'All languages';
+
+  @override
+  String get filterGroupSort => 'All recommendations';
+
+  @override
+  String get sortNewest => 'Newest';
+
+  @override
+  String get sortHottest => 'Hottest';
+
+  @override
+  String get expandFilters => 'Expand';
+
+  @override
+  String get collapseFilters => 'Collapse';
+
+  @override
+  String get filterEmpty => 'No dramas match these filters';
+
+  @override
+  String get hotBadge => 'Hit';
+
+  @override
+  String get filterAll => 'All';
+
+  @override
+  String seriesMeta(String episodes, String viewers) {
+    return 'Series · $episodes eps | $viewers watching';
+  }
+
+  @override
+  String watchFullSeries(String episodes) {
+    return 'Watch full series · $episodes eps';
+  }
+
+  @override
+  String get feedTabAnime => 'Anime';
+
+  @override
+  String get feedTabReal => 'Live-action';
+
+  @override
+  String get feedTabForYou => 'For you';
+
+  @override
+  String get authorNoteLabel => 'Author note';
+
+  @override
+  String get reserve => 'Reserve';
+
+  @override
+  String heatLabel(String count) {
+    return '$count heat';
+  }
+
   @override
   String get topCharts => 'Top Charts';
 
   @override
   String get newReleases => 'New Releases';
 
+  @override
+  String get newDramas => 'New';
+
   @override
   String get trendingMicroDramas => 'Trending Micro-Dramas';
 
@@ -125,6 +197,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get showLess => 'Less';
 
+  @override
+  String get expandSynopsis => 'More';
+
   @override
   String get views => 'views';
 
@@ -142,6 +217,11 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get playbackSpeed => 'Playback speed';
 
+  @override
+  String speedBoosting(String speed) {
+    return '${speed}x speed';
+  }
+
   @override
   String minutesAgo(int count) {
     return '$count min ago';
@@ -182,6 +262,26 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get continueWatching => 'Continue Watching';
 
+  @override
+  String episodeRemaining(int episode, int minutes) {
+    return 'Episode $episode · $minutes min left';
+  }
+
+  @override
+  String viewCountLabel(int count) {
+    return '$count views';
+  }
+
+  @override
+  String allEpisodesBadge(int count) {
+    return 'All $count';
+  }
+
+  @override
+  String lockedEpisodeCount(int count) {
+    return '$count locked';
+  }
+
   @override
   String watchedPercent(int percent) {
     return 'Watched $percent%';
@@ -214,9 +314,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get preferences => 'Preferences';
 
-  @override
-  String get appLanguage => 'App Language';
-
   @override
   String get followingTab => 'Following';
 
@@ -232,6 +329,89 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get allDramas => 'All Dramas';
 
+  @override
+  String get allLanguages => 'All languages';
+
+  @override
+  String get bahasaMelayu => 'Malay';
+
+  @override
+  String get createSubtitle => 'Stories become short dramas';
+
+  @override
+  String get createAiTitle => 'AI production';
+
+  @override
+  String get createAiSubtitle => 'Start from a story or an idea';
+
+  @override
+  String get createUploadTitle => 'Upload and publish';
+
+  @override
+  String get createUploadSubtitle => 'Publish a finished short drama';
+
+  @override
+  String get createMottoPrimary => 'Your imagination';
+
+  @override
+  String get createMottoSecondary => 'Can be seen by more people';
+
+  @override
+  String get newReleasesTitle => 'New premieres';
+
+  @override
+  String newReleasesCount(int count) {
+    return '$count new this week';
+  }
+
+  @override
+  String get premiereToday => 'Today\'s premiere';
+
+  @override
+  String get newBadge => 'NEW';
+
+  @override
+  String get reserveTitle => 'Schedule booking';
+
+  @override
+  String get goNewReleases => 'Browse new releases';
+
+  @override
+  String get reserveStepsTitle => 'What you get after reserving';
+
+  @override
+  String get reserveStep1 => 'One-tap reserve';
+
+  @override
+  String get reserveStep2 => 'Premiere reminder';
+
+  @override
+  String get reserveStep3 => 'Watch right away';
+
+  @override
+  String get reserveWeek => 'This week';
+
+  @override
+  String get weekdayMon => 'Mon';
+
+  @override
+  String get weekdayTue => 'Tue';
+
+  @override
+  String get weekdayWed => 'Wed';
+
+  @override
+  String get weekdayThu => 'Thu';
+
+  @override
+  String get weekdayFri => 'Fri';
+
+  @override
+  String get weekdaySat => 'Sat';
+
+  @override
+  String get weekdaySun => 'Sun';
+
   @override
   String get trendingTab => 'Trending';
 
@@ -268,6 +448,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get writeComment => 'Write a comment';
 
+  @override
+  String get commentLoginHint => 'Sign in to comment';
+
   @override
   String get postComment => 'Post';
 
@@ -403,6 +586,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get episodes => 'Episodes';
 
+  @override
+  String get synopsisTitle => 'Synopsis';
+
   @override
   String get watchEpisodeOne => 'Watch episode 1';
 
@@ -490,6 +676,18 @@ 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';
 
@@ -520,12 +718,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get chineseCaptions => 'Chinese captions';
 
-  @override
-  String get language => 'Language';
-
-  @override
-  String get systemLanguage => 'System';
-
   @override
   String get english => 'English';
 
@@ -631,6 +823,18 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get myAccount => 'My account';
 
+  @override
+  String get myWorks => 'My works';
+
+  @override
+  String get creatorCenter => 'Creator center';
+
+  @override
+  String get helpFeedback => 'Help & feedback';
+
+  @override
+  String get vipUnlockMessage => 'Unlock more with membership';
+
   @override
   String get coins => 'Coins';
 
@@ -876,6 +1080,16 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get clearAll => 'Clear all';
 
+  @override
+  String watchRecordsCount(int count) {
+    return '$count records';
+  }
+
+  @override
+  String favoritesCount(int count) {
+    return '$count favorites';
+  }
+
   @override
   String get clearWatchHistoryTitle => 'Clear watch history?';
 
@@ -1083,4 +1297,261 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get accountCancelFailed => 'Could not cancel the deletion request.';
+
+  @override
+  String get authPhoneTitle => 'Continue with phone';
+
+  @override
+  String get authPhoneSignUp => 'Create an account with phone';
+
+  @override
+  String get authPhoneLabel => 'Phone number';
+
+  @override
+  String get authPhoneHint => '0812 3456 7890';
+
+  @override
+  String get authPhoneInvalid => 'Enter a valid phone number';
+
+  @override
+  String get authCodeLabel => 'Verification code';
+
+  @override
+  String get authCodeHint => '6-digit code';
+
+  @override
+  String get authCodeRequired => 'Enter the verification code';
+
+  @override
+  String get authSendCode => 'Send code';
+
+  @override
+  String authResendCode(int seconds) {
+    return 'Resend in ${seconds}s';
+  }
+
+  @override
+  String get authCodeSent => 'Verification code sent.';
+
+  @override
+  String get authPhoneSignInAction => 'Sign in';
+
+  @override
+  String get authPhoneSignUpAction => 'Create account';
+
+  @override
+  String get unlockWithCoins => 'Unlock with coins';
+
+  @override
+  String get unlockFailed => 'Could not unlock this episode.';
+
+  @override
+  String get wallet => 'Wallet';
+
+  @override
+  String get coinBalance => 'Coin balance';
+
+  @override
+  String get coinLedger => 'Coin activity';
+
+  @override
+  String get noCoinLedger => 'No coin activity yet.';
+
+  @override
+  String get walletLoadFailed => 'Could not load your wallet.';
+
+  @override
+  String walletBalanceShort(int coins) {
+    return '$coins coins';
+  }
+
+  @override
+  String get insufficientCoins => 'Not enough coins.';
+
+  @override
+  String get rechargeUnavailable => 'Top-up is not available yet.';
+
+  @override
+  String get totalRecharged => 'Total recharged';
+
+  @override
+  String get totalConsumed => 'Total spent';
+
+  @override
+  String get ledgerUnlock => 'Episode unlock';
+
+  @override
+  String get ledgerRecharge => 'Coin top-up';
+
+  @override
+  String get ledgerRefund => 'Refund';
+
+  @override
+  String get ledgerAdjustment => 'Adjustment';
+
+  @override
+  String get rankingTab => 'Charts';
+
+  @override
+  String get rankingTitle => 'Top Charts';
+
+  @override
+  String get rankingSubtitle => 'Ranked from today\'s live catalog feed.';
+
+  @override
+  String get rankingHot => 'Trending';
+
+  @override
+  String get rankingNew => 'New releases';
+
+  @override
+  String get newReleasesAll => 'All new releases';
+
+  @override
+  String get newReleasesSubtitle => 'Newest arrivals';
+
+  @override
+  String get reserveSubtitle => 'Reserve before launch';
+
+  @override
+  String get reserveEmptyTitle => 'No reservations yet';
+
+  @override
+  String get reserveEmptyHint => 'Reserve new dramas here once announced';
+
+  @override
+  String topLabel(int n) {
+    return 'TOP $n';
+  }
+
+  @override
+  String get rankingEmptyTitle => 'No ranked stories yet';
+
+  @override
+  String get rankingEmptyBody =>
+      'Titles appear here as soon as they are published.';
+
+  @override
+  String get rankingTopPick => 'TOP PICK';
+
+  @override
+  String get rechargeTitle => 'Top Up Coins';
+
+  @override
+  String get vipTitle => 'VIP Membership';
+
+  @override
+  String get buy => 'Buy';
+
+  @override
+  String bonusCoin(int bonus) {
+    return '+$bonus bonus';
+  }
+
+  @override
+  String vipDuration(int days) {
+    return '$days-day VIP';
+  }
+
+  @override
+  String get noCoinPacks => 'No coin packs available right now.';
+
+  @override
+  String get noVipPlans => 'No VIP plans available right now.';
+
+  @override
+  String get productsLoadFailed => 'Could not load products.';
+
+  @override
+  String orderCreated(String orderNo) {
+    return 'Order $orderNo created.';
+  }
+
+  @override
+  String get paymentPending => 'Waiting for payment.';
+
+  @override
+  String get orderCreateFailed => 'Could not create the order.';
+
+  @override
+  String get playbackQuality => 'Quality';
+
+  @override
+  String get qualityAuto => 'Auto';
+
+  @override
+  String get qualityAutoHint =>
+      'HLS adjusts the bitrate automatically for your connection.';
+
+  @override
+  String get searchFailed => 'Search failed. Please try again.';
+
+  @override
+  String searchResultCount(int count) {
+    return '$count results';
+  }
+
+  @override
+  String episodeCountLabel(int count) {
+    return '$count episodes';
+  }
+
+  @override
+  String commentsWithCount(int count) {
+    return '$count comments';
+  }
+
+  @override
+  String get textSize => 'Text size';
+
+  @override
+  String get textSizeSmall => 'Small';
+
+  @override
+  String get textSizeStandard => 'Standard';
+
+  @override
+  String get textSizeLarge => 'Large';
+
+  @override
+  String get watchAdToUnlock => 'Watch an ad to unlock';
+
+  @override
+  String get unlockWithVip => 'Unlock with VIP';
+
+  @override
+  String get unlockMethodsVary => 'Available unlock methods vary by title.';
+
+  @override
+  String get unlockEpisode => 'Unlock this episode';
+
+  @override
+  String get language => 'Language';
+
+  @override
+  String get freeWatch => 'Free watch';
+
+  @override
+  String get qualityUnavailable => 'Unavailable';
+
+  @override
+  String get notInterested => 'Not interested';
+
+  @override
+  String get clearPlayback => 'Clear-screen playback';
+
+  @override
+  String get danmakuUnavailable => 'Coming soon';
+
+  @override
+  String get danmakuSettings => 'Danmaku settings';
+
+  @override
+  String get offlineCache => 'Offline cache';
+
+  @override
+  String get screenCast => 'Cast';
+
+  @override
+  String get sleepTimer => 'Sleep timer';
 }
diff --git a/lib/l10n/app_localizations_id.dart b/lib/l10n/app_localizations_id.dart
index a417c57..5b3e823 100644
--- a/lib/l10n/app_localizations_id.dart
+++ b/lib/l10n/app_localizations_id.dart
@@ -36,6 +36,12 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get homeTab => 'Beranda';
 
+  @override
+  String get theaterTab => 'Teater';
+
+  @override
+  String get createTab => 'Buat';
+
   @override
   String get openQuickMenu => 'Buka menu cepat';
 
@@ -46,7 +52,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get currentSeries => 'Serial saat ini';
 
   @override
-  String get discoverTab => 'Temukan';
+  String get discoverTab => 'Teater';
 
   @override
   String get searchDiscover => 'Cari drama, aktor, genre...';
@@ -92,12 +98,78 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get filter => 'Filter';
 
+  @override
+  String get filterGroupCategory => 'Semua genre';
+
+  @override
+  String get filterGroupTheme => 'Semua tema';
+
+  @override
+  String get filterGroupLanguage => 'Semua bahasa';
+
+  @override
+  String get filterGroupSort => 'Semua rekomendasi';
+
+  @override
+  String get sortNewest => 'Terbaru';
+
+  @override
+  String get sortHottest => 'Terpopuler';
+
+  @override
+  String get expandFilters => 'Perluas';
+
+  @override
+  String get collapseFilters => 'Ciutkan';
+
+  @override
+  String get filterEmpty => 'Tidak ada drama yang cocok';
+
+  @override
+  String get hotBadge => 'Hits';
+
+  @override
+  String get filterAll => 'Semua';
+
+  @override
+  String seriesMeta(String episodes, String viewers) {
+    return 'Serial · $episodes eps | $viewers menonton';
+  }
+
+  @override
+  String watchFullSeries(String episodes) {
+    return 'Tonton serial lengkap · $episodes eps';
+  }
+
+  @override
+  String get feedTabAnime => 'Anime';
+
+  @override
+  String get feedTabReal => 'Live-action';
+
+  @override
+  String get feedTabForYou => 'Untukmu';
+
+  @override
+  String get authorNoteLabel => 'Catatan penulis';
+
+  @override
+  String get reserve => 'Reservasi';
+
+  @override
+  String heatLabel(String count) {
+    return '$count panas';
+  }
+
   @override
   String get topCharts => 'Peringkat Teratas';
 
   @override
   String get newReleases => 'Rilisan Baru';
 
+  @override
+  String get newDramas => 'Baru';
+
   @override
   String get trendingMicroDramas => 'Drama Mini Populer';
 
@@ -125,6 +197,9 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get showLess => 'Lebih sedikit';
 
+  @override
+  String get expandSynopsis => 'Selengkapnya';
+
   @override
   String get views => 'tayangan';
 
@@ -142,6 +217,11 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get playbackSpeed => 'Kecepatan putar';
 
+  @override
+  String speedBoosting(String speed) {
+    return '${speed}x kecepatan';
+  }
+
   @override
   String minutesAgo(int count) {
     return '$count mnt lalu';
@@ -182,6 +262,26 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get continueWatching => 'Lanjut Tonton';
 
+  @override
+  String episodeRemaining(int episode, int minutes) {
+    return 'Episode $episode · $minutes menit tersisa';
+  }
+
+  @override
+  String viewCountLabel(int count) {
+    return '$count tayangan';
+  }
+
+  @override
+  String allEpisodesBadge(int count) {
+    return 'Semua $count';
+  }
+
+  @override
+  String lockedEpisodeCount(int count) {
+    return '$count terkunci';
+  }
+
   @override
   String watchedPercent(int percent) {
     return 'Sudah ditonton $percent%';
@@ -214,9 +314,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get preferences => 'Preferensi';
 
-  @override
-  String get appLanguage => 'Bahasa Aplikasi';
-
   @override
   String get followingTab => 'Mengikuti';
 
@@ -232,6 +329,90 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get allDramas => 'Semua Drama';
 
+  @override
+  String get allLanguages => 'Semua bahasa';
+
+  @override
+  String get bahasaMelayu => 'Bahasa Melayu';
+
+  @override
+  String get createSubtitle => 'Cerita menjadi drama pendek';
+
+  @override
+  String get createAiTitle => 'Produksi AI';
+
+  @override
+  String get createAiSubtitle => 'Mulai dari cerita atau ide';
+
+  @override
+  String get createUploadTitle => 'Unggah dan terbitkan';
+
+  @override
+  String get createUploadSubtitle =>
+      'Terbitkan drama pendek yang sudah selesai';
+
+  @override
+  String get createMottoPrimary => 'Imajinasimu';
+
+  @override
+  String get createMottoSecondary => 'Bisa dilihat lebih banyak orang';
+
+  @override
+  String get newReleasesTitle => 'Premiere baru';
+
+  @override
+  String newReleasesCount(int count) {
+    return '$count baru minggu ini';
+  }
+
+  @override
+  String get premiereToday => 'Tayang perdana hari ini';
+
+  @override
+  String get newBadge => 'BARU';
+
+  @override
+  String get reserveTitle => 'Jadwal reservasi';
+
+  @override
+  String get goNewReleases => 'Lihat rilis baru';
+
+  @override
+  String get reserveStepsTitle => 'Yang kamu dapat setelah reservasi';
+
+  @override
+  String get reserveStep1 => 'Reservasi sekali ketuk';
+
+  @override
+  String get reserveStep2 => 'Pengingat tayang';
+
+  @override
+  String get reserveStep3 => 'Langsung tonton';
+
+  @override
+  String get reserveWeek => 'Minggu ini';
+
+  @override
+  String get weekdayMon => 'Sen';
+
+  @override
+  String get weekdayTue => 'Sel';
+
+  @override
+  String get weekdayWed => 'Rab';
+
+  @override
+  String get weekdayThu => 'Kam';
+
+  @override
+  String get weekdayFri => 'Jum';
+
+  @override
+  String get weekdaySat => 'Sab';
+
+  @override
+  String get weekdaySun => 'Min';
+
   @override
   String get trendingTab => 'Sedang Tren';
 
@@ -268,6 +449,9 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get writeComment => 'Tulis komentar';
 
+  @override
+  String get commentLoginHint => 'Masuk untuk berkomentar';
+
   @override
   String get postComment => 'Kirim';
 
@@ -403,6 +587,9 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get episodes => 'Episode';
 
+  @override
+  String get synopsisTitle => 'Sinopsis';
+
   @override
   String get watchEpisodeOne => 'Tonton episode 1';
 
@@ -492,6 +679,18 @@ 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';
 
@@ -522,12 +721,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get chineseCaptions => 'Subtitle bahasa Mandarin';
 
-  @override
-  String get language => 'Bahasa';
-
-  @override
-  String get systemLanguage => 'Sistem';
-
   @override
   String get english => 'English';
 
@@ -633,6 +826,18 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get myAccount => 'Akun saya';
 
+  @override
+  String get myWorks => 'Karya saya';
+
+  @override
+  String get creatorCenter => 'Pusat kreator';
+
+  @override
+  String get helpFeedback => 'Bantuan & masukan';
+
+  @override
+  String get vipUnlockMessage => 'Buka lebih banyak dengan keanggotaan';
+
   @override
   String get coins => 'Koin';
 
@@ -875,6 +1080,16 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get clearAll => 'Hapus semua';
 
+  @override
+  String watchRecordsCount(int count) {
+    return '$count riwayat';
+  }
+
+  @override
+  String favoritesCount(int count) {
+    return '$count favorit';
+  }
+
   @override
   String get clearWatchHistoryTitle => 'Hapus riwayat tontonan?';
 
@@ -1082,4 +1297,261 @@ class AppLocalizationsId extends AppLocalizations {
 
   @override
   String get accountCancelFailed => 'Permintaan penghapusan gagal dibatalkan.';
+
+  @override
+  String get authPhoneTitle => 'Lanjutkan dengan nomor HP';
+
+  @override
+  String get authPhoneSignUp => 'Buat akun dengan nomor HP';
+
+  @override
+  String get authPhoneLabel => 'Nomor HP';
+
+  @override
+  String get authPhoneHint => '0812 3456 7890';
+
+  @override
+  String get authPhoneInvalid => 'Masukkan nomor HP yang valid';
+
+  @override
+  String get authCodeLabel => 'Kode verifikasi';
+
+  @override
+  String get authCodeHint => 'Kode 6 digit';
+
+  @override
+  String get authCodeRequired => 'Masukkan kode verifikasi';
+
+  @override
+  String get authSendCode => 'Kirim kode';
+
+  @override
+  String authResendCode(int seconds) {
+    return 'Kirim ulang dalam $seconds detik';
+  }
+
+  @override
+  String get authCodeSent => 'Kode verifikasi telah dikirim.';
+
+  @override
+  String get authPhoneSignInAction => 'Masuk';
+
+  @override
+  String get authPhoneSignUpAction => 'Buat akun';
+
+  @override
+  String get unlockWithCoins => 'Buka dengan koin';
+
+  @override
+  String get unlockFailed => 'Gagal membuka episode ini.';
+
+  @override
+  String get wallet => 'Dompet';
+
+  @override
+  String get coinBalance => 'Saldo koin';
+
+  @override
+  String get coinLedger => 'Riwayat koin';
+
+  @override
+  String get noCoinLedger => 'Belum ada aktivitas koin.';
+
+  @override
+  String get walletLoadFailed => 'Gagal memuat dompet.';
+
+  @override
+  String walletBalanceShort(int coins) {
+    return '$coins koin';
+  }
+
+  @override
+  String get insufficientCoins => 'Koin tidak cukup.';
+
+  @override
+  String get rechargeUnavailable => 'Isi ulang belum tersedia.';
+
+  @override
+  String get totalRecharged => 'Total isi ulang';
+
+  @override
+  String get totalConsumed => 'Total pemakaian';
+
+  @override
+  String get ledgerUnlock => 'Buka episode';
+
+  @override
+  String get ledgerRecharge => 'Isi ulang koin';
+
+  @override
+  String get ledgerRefund => 'Pengembalian';
+
+  @override
+  String get ledgerAdjustment => 'Penyesuaian';
+
+  @override
+  String get rankingTab => 'Peringkat';
+
+  @override
+  String get rankingTitle => 'Peringkat Teratas';
+
+  @override
+  String get rankingSubtitle => 'Diurutkan dari feed katalog terkini.';
+
+  @override
+  String get rankingHot => 'Populer';
+
+  @override
+  String get rankingNew => 'Rilis baru';
+
+  @override
+  String get newReleasesAll => 'Semua rilis baru';
+
+  @override
+  String get newReleasesSubtitle => 'Rilis terbaru';
+
+  @override
+  String get reserveSubtitle => 'Reservasi sebelum rilis';
+
+  @override
+  String get reserveEmptyTitle => 'Belum ada reservasi';
+
+  @override
+  String get reserveEmptyHint => 'Reservasi drama baru di sini';
+
+  @override
+  String topLabel(int n) {
+    return 'TOP $n';
+  }
+
+  @override
+  String get rankingEmptyTitle => 'Belum ada peringkat';
+
+  @override
+  String get rankingEmptyBody => 'Judul muncul di sini setelah diterbitkan.';
+
+  @override
+  String get rankingTopPick => 'PILIHAN UTAMA';
+
+  @override
+  String get rechargeTitle => 'Isi Ulang Koin';
+
+  @override
+  String get vipTitle => 'Keanggotaan VIP';
+
+  @override
+  String get buy => 'Beli';
+
+  @override
+  String bonusCoin(int bonus) {
+    return '+$bonus bonus';
+  }
+
+  @override
+  String vipDuration(int days) {
+    return 'VIP $days hari';
+  }
+
+  @override
+  String get noCoinPacks => 'Belum ada paket koin.';
+
+  @override
+  String get noVipPlans => 'Belum ada paket VIP.';
+
+  @override
+  String get productsLoadFailed => 'Gagal memuat produk.';
+
+  @override
+  String orderCreated(String orderNo) {
+    return 'Pesanan $orderNo dibuat.';
+  }
+
+  @override
+  String get paymentPending => 'Menunggu pembayaran.';
+
+  @override
+  String get orderCreateFailed => 'Gagal membuat pesanan.';
+
+  @override
+  String get playbackQuality => 'Kualitas';
+
+  @override
+  String get qualityAuto => 'Otomatis';
+
+  @override
+  String get qualityAutoHint =>
+      'HLS menyesuaikan bitrate secara otomatis dengan koneksi Anda.';
+
+  @override
+  String get searchFailed => 'Pencarian gagal. Coba lagi.';
+
+  @override
+  String searchResultCount(int count) {
+    return '$count hasil';
+  }
+
+  @override
+  String episodeCountLabel(int count) {
+    return '$count episode';
+  }
+
+  @override
+  String commentsWithCount(int count) {
+    return '$count komentar';
+  }
+
+  @override
+  String get textSize => 'Ukuran teks';
+
+  @override
+  String get textSizeSmall => 'Kecil';
+
+  @override
+  String get textSizeStandard => 'Standar';
+
+  @override
+  String get textSizeLarge => 'Besar';
+
+  @override
+  String get watchAdToUnlock => 'Tonton iklan untuk membuka';
+
+  @override
+  String get unlockWithVip => 'Buka dengan VIP';
+
+  @override
+  String get unlockMethodsVary =>
+      'Metode pembukaan tersedia dapat berbeda per judul.';
+
+  @override
+  String get unlockEpisode => 'Buka episode ini';
+
+  @override
+  String get language => 'Bahasa';
+
+  @override
+  String get freeWatch => 'Tonton gratis';
+
+  @override
+  String get qualityUnavailable => 'Tidak tersedia';
+
+  @override
+  String get notInterested => 'Tidak tertarik';
+
+  @override
+  String get clearPlayback => 'Putar tanpa kontrol';
+
+  @override
+  String get danmakuUnavailable => 'Belum tersedia';
+
+  @override
+  String get danmakuSettings => 'Pengaturan komentar layar';
+
+  @override
+  String get offlineCache => 'Cache offline';
+
+  @override
+  String get screenCast => 'Cast';
+
+  @override
+  String get sleepTimer => 'Timer tidur';
 }
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index ea78f10..30037c8 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -35,6 +35,12 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get homeTab => '首页';
 
+  @override
+  String get theaterTab => '剧场';
+
+  @override
+  String get createTab => '创作';
+
   @override
   String get openQuickMenu => '打开快捷菜单';
 
@@ -45,7 +51,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get currentSeries => '当前短剧';
 
   @override
-  String get discoverTab => '发现';
+  String get discoverTab => '剧场';
 
   @override
   String get searchDiscover => '搜索短剧、演员、类型…';
@@ -63,7 +69,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get authLandingSubtitle => '登录后同步进度、收藏与金币权益';
 
   @override
-  String get comingSoon => '即将开放';
+  String get comingSoon => '即将上线';
 
   @override
   String get authLegal => '继续即代表同意《用户协议》与《隐私政策》';
@@ -89,12 +95,78 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get filter => '筛选';
 
+  @override
+  String get filterGroupCategory => '全部体裁';
+
+  @override
+  String get filterGroupTheme => '全部主题';
+
+  @override
+  String get filterGroupLanguage => '全部语言';
+
+  @override
+  String get filterGroupSort => '全部推荐';
+
+  @override
+  String get sortNewest => '最新上架';
+
+  @override
+  String get sortHottest => '最高热度';
+
+  @override
+  String get expandFilters => '展开';
+
+  @override
+  String get collapseFilters => '收起';
+
+  @override
+  String get filterEmpty => '没有符合条件的短剧';
+
+  @override
+  String get hotBadge => '爆剧';
+
+  @override
+  String get filterAll => '全部';
+
+  @override
+  String seriesMeta(String episodes, String viewers) {
+    return '系列剧 · 共$episodes集 | 共$viewers人在追';
+  }
+
+  @override
+  String watchFullSeries(String episodes) {
+    return '观看完整剧集 · 全$episodes集';
+  }
+
+  @override
+  String get feedTabAnime => '漫剧';
+
+  @override
+  String get feedTabReal => '真人剧';
+
+  @override
+  String get feedTabForYou => '推荐';
+
+  @override
+  String get authorNoteLabel => '作者声明';
+
+  @override
+  String get reserve => '预约';
+
+  @override
+  String heatLabel(String count) {
+    return '$count热度';
+  }
+
   @override
   String get topCharts => '排行榜';
 
   @override
   String get newReleases => '新剧';
 
+  @override
+  String get newDramas => '新剧';
+
   @override
   String get trendingMicroDramas => '热门短剧';
 
@@ -122,6 +194,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get showLess => '收起';
 
+  @override
+  String get expandSynopsis => '展开';
+
   @override
   String get views => '次播放';
 
@@ -139,6 +214,11 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get playbackSpeed => '倍速';
 
+  @override
+  String speedBoosting(String speed) {
+    return '$speed 倍速快进中';
+  }
+
   @override
   String minutesAgo(int count) {
     return '$count 分钟前';
@@ -177,6 +257,26 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get continueWatching => '继续观看';
 
+  @override
+  String episodeRemaining(int episode, int minutes) {
+    return '第 $episode 集 · 还剩 $minutes 分钟';
+  }
+
+  @override
+  String viewCountLabel(int count) {
+    return '$count 次播放';
+  }
+
+  @override
+  String allEpisodesBadge(int count) {
+    return '全 $count 集';
+  }
+
+  @override
+  String lockedEpisodeCount(int count) {
+    return '锁 $count';
+  }
+
   @override
   String watchedPercent(int percent) {
     return '已观看 $percent%';
@@ -209,9 +309,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get preferences => '偏好设置';
 
-  @override
-  String get appLanguage => '应用语言';
-
   @override
   String get followingTab => '关注';
 
@@ -227,6 +324,89 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get allDramas => '全部剧目';
 
+  @override
+  String get allLanguages => '全部语言';
+
+  @override
+  String get bahasaMelayu => '马来语';
+
+  @override
+  String get createSubtitle => '让故事成为漫剧';
+
+  @override
+  String get createAiTitle => 'AI 制作';
+
+  @override
+  String get createAiSubtitle => '从故事或想法开始';
+
+  @override
+  String get createUploadTitle => '上传发布';
+
+  @override
+  String get createUploadSubtitle => '发布已完成的漫剧';
+
+  @override
+  String get createMottoPrimary => '你的想象';
+
+  @override
+  String get createMottoSecondary => '可以被更多人看见';
+
+  @override
+  String get newReleasesTitle => '新剧首映';
+
+  @override
+  String newReleasesCount(int count) {
+    return '本周上新 $count 部';
+  }
+
+  @override
+  String get premiereToday => '今日首映';
+
+  @override
+  String get newBadge => 'NEW';
+
+  @override
+  String get reserveTitle => '档期预约';
+
+  @override
+  String get goNewReleases => '去新剧页看看';
+
+  @override
+  String get reserveStepsTitle => '预约后你会得到';
+
+  @override
+  String get reserveStep1 => '一键预约';
+
+  @override
+  String get reserveStep2 => '开播提醒';
+
+  @override
+  String get reserveStep3 => '立即追剧';
+
+  @override
+  String get reserveWeek => '本周待播';
+
+  @override
+  String get weekdayMon => '周一';
+
+  @override
+  String get weekdayTue => '周二';
+
+  @override
+  String get weekdayWed => '周三';
+
+  @override
+  String get weekdayThu => '周四';
+
+  @override
+  String get weekdayFri => '周五';
+
+  @override
+  String get weekdaySat => '周六';
+
+  @override
+  String get weekdaySun => '周日';
+
   @override
   String get trendingTab => '热门';
 
@@ -249,7 +429,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get like => '喜欢';
 
   @override
-  String get save => '收藏';
+  String get save => '保存';
 
   @override
   String get comments => '评论';
@@ -263,6 +443,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get writeComment => '写评论';
 
+  @override
+  String get commentLoginHint => '登录后参与评论';
+
   @override
   String get postComment => '发布';
 
@@ -396,6 +579,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get episodes => '选集';
 
+  @override
+  String get synopsisTitle => '简介';
+
   @override
   String get watchEpisodeOne => '观看第 1 集';
 
@@ -482,6 +668,18 @@ 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 => '返回剧集详情';
 
@@ -512,12 +710,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get chineseCaptions => '简体中文字幕';
 
-  @override
-  String get language => '界面语言';
-
-  @override
-  String get systemLanguage => '跟随系统';
-
   @override
   String get english => 'English';
 
@@ -620,6 +812,18 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get myAccount => '我的账户';
 
+  @override
+  String get myWorks => '我的作品';
+
+  @override
+  String get creatorCenter => '创作者中心';
+
+  @override
+  String get helpFeedback => '帮助与反馈';
+
+  @override
+  String get vipUnlockMessage => '开通会员，解锁更多精彩内容';
+
   @override
   String get coins => '金币';
 
@@ -857,6 +1061,16 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get clearAll => '清空';
 
+  @override
+  String watchRecordsCount(int count) {
+    return '共 $count 条';
+  }
+
+  @override
+  String favoritesCount(int count) {
+    return '共 $count 部';
+  }
+
   @override
   String get clearWatchHistoryTitle => '清空观看记录？';
 
@@ -1061,4 +1275,259 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String get accountCancelFailed => '注销申请撤销失败。';
+
+  @override
+  String get authPhoneTitle => '使用手机号继续';
+
+  @override
+  String get authPhoneSignUp => '使用手机号注册';
+
+  @override
+  String get authPhoneLabel => '手机号';
+
+  @override
+  String get authPhoneHint => '0812 3456 7890';
+
+  @override
+  String get authPhoneInvalid => '请输入有效手机号';
+
+  @override
+  String get authCodeLabel => '验证码';
+
+  @override
+  String get authCodeHint => '6 位验证码';
+
+  @override
+  String get authCodeRequired => '请输入验证码';
+
+  @override
+  String get authSendCode => '发送验证码';
+
+  @override
+  String authResendCode(int seconds) {
+    return '$seconds 秒后重发';
+  }
+
+  @override
+  String get authCodeSent => '验证码已发送。';
+
+  @override
+  String get authPhoneSignInAction => '登录';
+
+  @override
+  String get authPhoneSignUpAction => '注册';
+
+  @override
+  String get unlockWithCoins => '金币解锁';
+
+  @override
+  String get unlockFailed => '解锁失败，请稍后重试。';
+
+  @override
+  String get wallet => '钱包';
+
+  @override
+  String get coinBalance => '金币余额';
+
+  @override
+  String get coinLedger => '金币流水';
+
+  @override
+  String get noCoinLedger => '暂无金币流水。';
+
+  @override
+  String get walletLoadFailed => '钱包加载失败。';
+
+  @override
+  String walletBalanceShort(int coins) {
+    return '$coins 金币';
+  }
+
+  @override
+  String get insufficientCoins => '金币余额不足。';
+
+  @override
+  String get rechargeUnavailable => '充值暂未开放。';
+
+  @override
+  String get totalRecharged => '累计充值';
+
+  @override
+  String get totalConsumed => '累计消费';
+
+  @override
+  String get ledgerUnlock => '剧集解锁';
+
+  @override
+  String get ledgerRecharge => '金币充值';
+
+  @override
+  String get ledgerRefund => '退款';
+
+  @override
+  String get ledgerAdjustment => '余额调整';
+
+  @override
+  String get rankingTab => '榜单';
+
+  @override
+  String get rankingTitle => '热门榜单';
+
+  @override
+  String get rankingSubtitle => '依据目录实时分区排序。';
+
+  @override
+  String get rankingHot => '热播';
+
+  @override
+  String get rankingNew => '新剧';
+
+  @override
+  String get newReleasesAll => '全部新剧';
+
+  @override
+  String get newReleasesSubtitle => '最新上架短剧';
+
+  @override
+  String get reserveSubtitle => '上线前预约，开播即通知';
+
+  @override
+  String get reserveEmptyTitle => '暂无预约剧集';
+
+  @override
+  String get reserveEmptyHint => '新剧上线后可在这里预约';
+
+  @override
+  String topLabel(int n) {
+    return 'TOP $n';
+  }
+
+  @override
+  String get rankingEmptyTitle => '暂无榜单内容';
+
+  @override
+  String get rankingEmptyBody => '新剧上线后会自动进入榜单。';
+
+  @override
+  String get rankingTopPick => '今日榜首';
+
+  @override
+  String get rechargeTitle => '充值金币';
+
+  @override
+  String get vipTitle => 'VIP 会员';
+
+  @override
+  String get buy => '购买';
+
+  @override
+  String bonusCoin(int bonus) {
+    return '赠 $bonus';
+  }
+
+  @override
+  String vipDuration(int days) {
+    return '$days 天会员';
+  }
+
+  @override
+  String get noCoinPacks => '暂无可购金币包。';
+
+  @override
+  String get noVipPlans => '暂无可开通会员。';
+
+  @override
+  String get productsLoadFailed => '商品加载失败。';
+
+  @override
+  String orderCreated(String orderNo) {
+    return '订单 $orderNo 已创建。';
+  }
+
+  @override
+  String get paymentPending => '等待支付。';
+
+  @override
+  String get orderCreateFailed => '订单创建失败。';
+
+  @override
+  String get playbackQuality => '清晰度';
+
+  @override
+  String get qualityAuto => '自动';
+
+  @override
+  String get qualityAutoHint => 'HLS 会根据当前网络自动切换码率。';
+
+  @override
+  String get searchFailed => '搜索失败，请重试。';
+
+  @override
+  String searchResultCount(int count) {
+    return '$count 个结果';
+  }
+
+  @override
+  String episodeCountLabel(int count) {
+    return '共 $count 集';
+  }
+
+  @override
+  String commentsWithCount(int count) {
+    return '$count 条评论';
+  }
+
+  @override
+  String get textSize => '文字大小';
+
+  @override
+  String get textSizeSmall => '小';
+
+  @override
+  String get textSizeStandard => '标准';
+
+  @override
+  String get textSizeLarge => '大';
+
+  @override
+  String get watchAdToUnlock => '看广告解锁';
+
+  @override
+  String get unlockWithVip => '会员解锁';
+
+  @override
+  String get unlockMethodsVary => '具体解锁方式以作品而定。';
+
+  @override
+  String get unlockEpisode => '解锁本集';
+
+  @override
+  String get language => '语言';
+
+  @override
+  String get freeWatch => '免费观看';
+
+  @override
+  String get qualityUnavailable => '暂不可用';
+
+  @override
+  String get notInterested => '不感兴趣';
+
+  @override
+  String get clearPlayback => '清屏播放';
+
+  @override
+  String get danmakuUnavailable => '暂未开放';
+
+  @override
+  String get danmakuSettings => '弹幕设置';
+
+  @override
+  String get offlineCache => '离线缓存';
+
+  @override
+  String get screenCast => '投屏';
+
+  @override
+  String get sleepTimer => '定时关闭';
 }
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 5267de7..8ceaa1d 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -9,16 +9,18 @@
   "demoTitle": "信号",
   "demoSynopsis": "使用本地视频进行播放预览，后续有素材再增加剧集。",
   "homeTab": "首页",
+  "theaterTab": "剧场",
+  "createTab": "创作",
   "openQuickMenu": "打开快捷菜单",
   "quickAccess": "快捷入口",
   "currentSeries": "当前短剧",
-  "discoverTab": "发现",
+  "discoverTab": "剧场",
   "searchDiscover": "搜索短剧、演员、类型…",
   "featured": "精选",
   "recommended": "推荐",
   "fruitShortsBrand": "水果短剧",
   "authLandingSubtitle": "登录后同步进度、收藏与金币权益",
-  "comingSoon": "即将开放",
+  "comingSoon": "即将上线",
   "authLegal": "继续即代表同意《用户协议》与《隐私政策》",
   "authContinueGoogle": "使用 Google 继续",
   "authPhoneSignIn": "手机号登录",
@@ -27,8 +29,28 @@
   "romance": "都市爱情",
   "actionGenre": "动作",
   "filter": "筛选",
+  "filterGroupCategory": "全部体裁",
+  "filterGroupTheme": "全部主题",
+  "filterGroupLanguage": "全部语言",
+  "filterGroupSort": "全部推荐",
+  "sortNewest": "最新上架",
+  "sortHottest": "最高热度",
+  "expandFilters": "展开",
+  "collapseFilters": "收起",
+  "filterEmpty": "没有符合条件的短剧",
+  "hotBadge": "爆剧",
+  "filterAll": "全部",
+  "seriesMeta": "系列剧 · 共{episodes}集 | 共{viewers}人在追",
+  "watchFullSeries": "观看完整剧集 · 全{episodes}集",
+  "feedTabAnime": "漫剧",
+  "feedTabReal": "真人剧",
+  "feedTabForYou": "推荐",
+  "authorNoteLabel": "作者声明",
+  "reserve": "预约",
+  "heatLabel": "{count}热度",
   "topCharts": "排行榜",
   "newReleases": "新剧",
+  "newDramas": "新剧",
   "trendingMicroDramas": "热门短剧",
   "seeAll": "查看全部",
   "trendingSubtitle": "本周追看最多",
@@ -38,6 +60,7 @@
   "seasonOneOriginalRelease": "第 1 季 · 原创上线",
   "startWatching": "开始观看",
   "showLess": "收起",
+  "expandSynopsis": "展开",
   "views": "次播放",
   "episodeOfTotal": "第 {current} 集 / 共 {total} 集",
   "@episodeOfTotal": {
@@ -49,6 +72,7 @@
   "clearScreen": "清屏",
   "exitClearScreen": "退出清屏",
   "playbackSpeed": "倍速",
+  "speedBoosting": "{speed} 倍速快进中",
   "minutesAgo": "{count} 分钟前",
   "@minutesAgo": {
     "placeholders": {
@@ -66,6 +90,31 @@
   "localViewer": "本地观众",
   "localDemoProfile": "本地演示档案",
   "continueWatching": "继续观看",
+  "episodeRemaining": "第 {episode} 集 · 还剩 {minutes} 分钟",
+  "@episodeRemaining": {
+    "placeholders": {
+      "episode": {"type": "int"},
+      "minutes": {"type": "int"}
+    }
+  },
+  "viewCountLabel": "{count} 次播放",
+  "@viewCountLabel": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
+  "allEpisodesBadge": "全 {count} 集",
+  "@allEpisodesBadge": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
+  "lockedEpisodeCount": "锁 {count}",
+  "@lockedEpisodeCount": {
+    "placeholders": {
+      "count": {"type": "int"}
+    }
+  },
   "watchedPercent": "已观看 {percent}%",
   "@watchedPercent": {
     "placeholders": {
@@ -83,12 +132,38 @@
   "completed": "已看完",
   "noSavedShows": "这里还没有剧集。",
   "preferences": "偏好设置",
-  "appLanguage": "应用语言",
   "followingTab": "关注",
   "animatedTab": "漫剧",
   "recommendedTab": "推荐",
   "noCategoryDramas": "这个分类暂时没有剧集。",
   "allDramas": "全部剧目",
+  "allLanguages": "全部语言",
+  "bahasaMelayu": "马来语",
+  "createSubtitle": "让故事成为漫剧",
+  "createAiTitle": "AI 制作",
+  "createAiSubtitle": "从故事或想法开始",
+  "createUploadTitle": "上传发布",
+  "createUploadSubtitle": "发布已完成的漫剧",
+  "createMottoPrimary": "你的想象",
+  "createMottoSecondary": "可以被更多人看见",
+  "newReleasesTitle": "新剧首映",
+  "newReleasesCount": "本周上新 {count} 部",
+  "premiereToday": "今日首映",
+  "newBadge": "NEW",
+  "reserveTitle": "档期预约",
+  "goNewReleases": "去新剧页看看",
+  "reserveStepsTitle": "预约后你会得到",
+  "reserveStep1": "一键预约",
+  "reserveStep2": "开播提醒",
+  "reserveStep3": "立即追剧",
+  "reserveWeek": "本周待播",
+  "weekdayMon": "周一",
+  "weekdayTue": "周二",
+  "weekdayWed": "周三",
+  "weekdayThu": "周四",
+  "weekdayFri": "周五",
+  "weekdaySat": "周六",
+  "weekdaySun": "周日",
   "trendingTab": "热门",
   "liveActionTab": "真人剧",
   "search": "搜索",
@@ -96,11 +171,12 @@
   "mute": "静音",
   "unmute": "取消静音",
   "like": "喜欢",
-  "save": "收藏",
+  "save": "保存",
   "comments": "评论",
   "share": "分享",
   "noComments": "还没有评论。",
   "writeComment": "写评论",
+  "commentLoginHint": "登录后参与评论",
   "postComment": "发布",
   "loadMore": "加载更多",
   "commentsLoadFailed": "评论加载失败，请重试。",
@@ -161,6 +237,7 @@
   "episodeCount": "{count} 集",
   "technicalDemoCount": "免费试看 · {count} 集",
   "episodes": "选集",
+  "synopsisTitle": "简介",
   "watchEpisodeOne": "观看第 1 集",
   "continueEpisode": "续看第 {number} 集",
   "freeTestMedia": "复用同一演示视频 · 免费",
@@ -197,6 +274,10 @@
     }
   },
   "retry": "重试",
+  "pullToRefresh": "下拉刷新",
+  "releaseToRefresh": "松手刷新",
+  "refreshingLabel": "正在刷新…",
+  "noMore": "没有更多了",
   "backToSeries": "返回剧集详情",
   "nextEpisode": "下一集",
   "pause": "暂停",
@@ -207,8 +288,6 @@
   "captionsOff": "关闭字幕",
   "englishCaptions": "英文字幕",
   "chineseCaptions": "简体中文字幕",
-  "language": "界面语言",
-  "systemLanguage": "跟随系统",
   "english": "English",
   "simplifiedChinese": "简体中文",
   "bahasaIndonesia": "印尼语",
@@ -243,6 +322,10 @@
   "newest": "最新",
   "favorite": "收藏",
   "myAccount": "我的账户",
+  "myWorks": "我的作品",
+  "creatorCenter": "创作者中心",
+  "helpFeedback": "帮助与反馈",
+  "vipUnlockMessage": "开通会员，解锁更多精彩内容",
   "coins": "金币",
   "topUpWallet": "充值",
   "vipMembership": "会员",
@@ -357,6 +440,8 @@
   "recordDeleteFailed": "删除记录失败，请重试。",
   "recordClearFailed": "清空观看记录失败，请重试。",
   "clearAll": "清空",
+  "watchRecordsCount": "共 {count} 条",
+  "favoritesCount": "共 {count} 部",
   "clearWatchHistoryTitle": "清空观看记录？",
   "clearWatchHistoryMessage": "这会从当前账号移除全部观看记录。",
   "confirmClear": "清空",
@@ -438,5 +523,90 @@
   "accountCancelDeactivation": "撤销注销申请",
   "accountCancelSucceeded": "注销申请已撤销。",
   "accountDeactivateFailed": "注销申请提交失败。",
-  "accountCancelFailed": "注销申请撤销失败。"
+  "accountCancelFailed": "注销申请撤销失败。",
+  "authPhoneTitle": "使用手机号继续",
+  "authPhoneSignUp": "使用手机号注册",
+  "authPhoneLabel": "手机号",
+  "authPhoneHint": "0812 3456 7890",
+  "authPhoneInvalid": "请输入有效手机号",
+  "authCodeLabel": "验证码",
+  "authCodeHint": "6 位验证码",
+  "authCodeRequired": "请输入验证码",
+  "authSendCode": "发送验证码",
+  "authResendCode": "{seconds} 秒后重发",
+  "authCodeSent": "验证码已发送。",
+  "authPhoneSignInAction": "登录",
+  "authPhoneSignUpAction": "注册",
+  "unlockWithCoins": "金币解锁",
+  "unlockFailed": "解锁失败，请稍后重试。",
+  "wallet": "钱包",
+  "coinBalance": "金币余额",
+  "coinLedger": "金币流水",
+  "noCoinLedger": "暂无金币流水。",
+  "walletLoadFailed": "钱包加载失败。",
+  "walletBalanceShort": "{coins} 金币",
+  "insufficientCoins": "金币余额不足。",
+  "rechargeUnavailable": "充值暂未开放。",
+  "totalRecharged": "累计充值",
+  "totalConsumed": "累计消费",
+  "ledgerUnlock": "剧集解锁",
+  "ledgerRecharge": "金币充值",
+  "ledgerRefund": "退款",
+  "ledgerAdjustment": "余额调整",
+  "rankingTab": "榜单",
+  "rankingTitle": "热门榜单",
+  "rankingSubtitle": "依据目录实时分区排序。",
+  "rankingHot": "热播",
+  "rankingNew": "新剧",
+  "newReleasesAll": "全部新剧",
+  "newReleasesSubtitle": "最新上架短剧",
+  "reserveSubtitle": "上线前预约，开播即通知",
+  "reserveEmptyTitle": "暂无预约剧集",
+  "reserveEmptyHint": "新剧上线后可在这里预约",
+  "topLabel": "TOP {n}",
+  "rankingEmptyTitle": "暂无榜单内容",
+  "rankingEmptyBody": "新剧上线后会自动进入榜单。",
+  "rankingTopPick": "今日榜首"
+,  "rechargeTitle": "充值金币",
+  "vipTitle": "VIP 会员",
+  "buy": "购买",
+  "bonusCoin": "赠 {bonus}",
+  "@bonusCoin": { "placeholders": { "bonus": { "type": "int" } } },
+  "vipDuration": "{days} 天会员",
+  "@vipDuration": { "placeholders": { "days": { "type": "int" } } },
+  "noCoinPacks": "暂无可购金币包。",
+  "noVipPlans": "暂无可开通会员。",
+  "productsLoadFailed": "商品加载失败。",
+  "orderCreated": "订单 {orderNo} 已创建。",
+  "@orderCreated": { "placeholders": { "orderNo": { "type": "String" } } },
+  "paymentPending": "等待支付。",
+  "orderCreateFailed": "订单创建失败。",
+  "playbackQuality": "清晰度",
+  "qualityAuto": "自动",
+  "qualityAutoHint": "HLS 会根据当前网络自动切换码率。",
+  "searchFailed": "搜索失败，请重试。",
+  "searchResultCount": "{count} 个结果",
+  "@searchResultCount": { "placeholders": { "count": { "type": "int" } } },
+  "episodeCountLabel": "共 {count} 集",
+  "@episodeCountLabel": { "placeholders": { "count": { "type": "int" } } },
+  "commentsWithCount": "{count} 条评论",
+  "@commentsWithCount": { "placeholders": { "count": { "type": "int" } } },
+  "textSize": "文字大小",
+  "textSizeSmall": "小",
+  "textSizeStandard": "标准",
+  "textSizeLarge": "大",
+  "watchAdToUnlock": "看广告解锁",
+  "unlockWithVip": "会员解锁",
+  "unlockMethodsVary": "具体解锁方式以作品而定。",
+  "unlockEpisode": "解锁本集",
+  "language": "语言",
+  "freeWatch": "免费观看",
+  "qualityUnavailable": "暂不可用",
+  "notInterested": "不感兴趣",
+  "clearPlayback": "清屏播放",
+  "danmakuUnavailable": "暂未开放",
+  "danmakuSettings": "弹幕设置",
+  "offlineCache": "离线缓存",
+  "screenCast": "投屏",
+  "sleepTimer": "定时关闭"
 }
diff --git a/lib/main.dart b/lib/main.dart
index bb45154..74bb23a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -13,6 +13,6 @@ Future<void> main() async {
     SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]),
     ServerEndpoint.load(),
   ]);
-  await AppConfig.probeAndApplyBaseUrl();
+  AppConfig.ready = AppConfig.probeAndApplyBaseUrl();
   runApp(const LumaDramaApp());
 }
diff --git a/lib/pages/account/account_deactivate_page.dart b/lib/pages/account/account_deactivate_page.dart
index cf1799f..f5a123b 100644
--- a/lib/pages/account/account_deactivate_page.dart
+++ b/lib/pages/account/account_deactivate_page.dart
@@ -12,6 +12,7 @@ import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/auth_gate.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
 import '../../l10n/app_localizations.dart';
 import 'account_bindings.dart';
 import 'account_deactivate_logic.dart';
@@ -50,24 +51,17 @@ class _AccountDeactivatePageState extends State<AccountDeactivatePage> {
     final signedIn = context.watch<AuthController>().isSignedIn;
     final canShow = signedIn || _logic.scheduledAt != null;
     return Theme(
-      data: AppTheme.dark(),
-      child: Scaffold(
-        key: const Key('account-deactivate-page'),
-        backgroundColor: AppColors.ink,
-        appBar: AppBar(
-          backgroundColor: AppColors.ink,
-          foregroundColor: AppColors.onPrimary,
-          title: Text(l10n.accountDeactivate),
-        ),
-        body: SafeArea(
-          top: false,
-          child: canShow
-              ? ListenableBuilder(
-                  listenable: _logic,
-                  builder: (context, _) => _body(l10n),
-                )
-              : const AuthGatePanel(),
-        ),
+      data: AppTheme.light(),
+      child: PlainPageScaffold(
+        pageKey: const Key('account-deactivate-page'),
+        backKey: const Key('account-deactivate-back'),
+        title: l10n.accountDeactivate,
+        child: canShow
+            ? ListenableBuilder(
+                listenable: _logic,
+                builder: (context, _) => _body(l10n),
+              )
+            : const AuthGatePanel(),
       ),
     );
   }
diff --git a/lib/pages/account/account_devices_page.dart b/lib/pages/account/account_devices_page.dart
index b64be9c..99f3101 100644
--- a/lib/pages/account/account_devices_page.dart
+++ b/lib/pages/account/account_devices_page.dart
@@ -15,6 +15,7 @@ import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/empty_state.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
 import '../../l10n/app_localizations.dart';
 import 'account_bindings.dart';
 import 'account_devices_logic.dart';
@@ -50,24 +51,17 @@ class _AccountDevicesPageState extends State<AccountDevicesPage> {
     final l10n = AppLocalizations.of(context)!;
     final signedIn = context.watch<AuthController>().isSignedIn;
     return Theme(
-      data: AppTheme.dark(),
-      child: Scaffold(
-        key: const Key('account-devices-page'),
-        backgroundColor: AppColors.ink,
-        appBar: AppBar(
-          backgroundColor: AppColors.ink,
-          foregroundColor: AppColors.onPrimary,
-          title: Text(l10n.accountDevices),
-        ),
-        body: SafeArea(
-          top: false,
-          child: signedIn
-              ? ListenableBuilder(
-                  listenable: _logic,
-                  builder: (context, _) => _body(l10n),
-                )
-              : const AuthGatePanel(),
-        ),
+      data: AppTheme.light(),
+      child: PlainPageScaffold(
+        pageKey: const Key('account-devices-page'),
+        backKey: const Key('account-devices-back'),
+        title: l10n.accountDevices,
+        child: signedIn
+            ? ListenableBuilder(
+                listenable: _logic,
+                builder: (context, _) => _body(l10n),
+              )
+            : const AuthGatePanel(),
       ),
     );
   }
diff --git a/lib/pages/account/account_export_page.dart b/lib/pages/account/account_export_page.dart
index d17cde7..f451b27 100644
--- a/lib/pages/account/account_export_page.dart
+++ b/lib/pages/account/account_export_page.dart
@@ -15,6 +15,7 @@ import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/empty_state.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
 import '../../l10n/app_localizations.dart';
 import 'account_bindings.dart';
 import 'account_export_logic.dart';
@@ -51,24 +52,17 @@ class _AccountExportPageState extends State<AccountExportPage> {
     final l10n = AppLocalizations.of(context)!;
     final signedIn = context.watch<AuthController>().isSignedIn;
     return Theme(
-      data: AppTheme.dark(),
-      child: Scaffold(
-        key: const Key('account-export-page'),
-        backgroundColor: AppColors.ink,
-        appBar: AppBar(
-          backgroundColor: AppColors.ink,
-          foregroundColor: AppColors.onPrimary,
-          title: Text(l10n.accountDataExport),
-        ),
-        body: SafeArea(
-          top: false,
-          child: signedIn
-              ? ListenableBuilder(
-                  listenable: _logic,
-                  builder: (context, _) => _body(l10n),
-                )
-              : const AuthGatePanel(),
-        ),
+      data: AppTheme.light(),
+      child: PlainPageScaffold(
+        pageKey: const Key('account-export-page'),
+        backKey: const Key('account-export-back'),
+        title: l10n.accountDataExport,
+        child: signedIn
+            ? ListenableBuilder(
+                listenable: _logic,
+                builder: (context, _) => _body(l10n),
+              )
+            : const AuthGatePanel(),
       ),
     );
   }
diff --git a/lib/pages/account/account_profile_page.dart b/lib/pages/account/account_profile_page.dart
index d3aeac9..46ebb99 100644
--- a/lib/pages/account/account_profile_page.dart
+++ b/lib/pages/account/account_profile_page.dart
@@ -15,6 +15,7 @@ import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/empty_state.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
 import '../../core/widgets/remote_image.dart';
 import '../../l10n/app_localizations.dart';
 import 'account_bindings.dart';
@@ -22,7 +23,6 @@ import 'account_profile_logic.dart';
 
 const _avatarSize = 64.0;
 const _fieldGap = 14.0;
-const _datePadWidth = 2;
 
 /// 个人资料编辑页。
 class AccountProfilePage extends StatefulWidget {
@@ -36,7 +36,6 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
   late final AccountProfileLogic _logic;
   final _nickname = TextEditingController();
   var _gender = 'unknown';
-  String? _birthday;
   bool _formReady = false;
 
   @override
@@ -71,24 +70,17 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
     final l10n = AppLocalizations.of(context)!;
     final signedIn = context.watch<AuthController>().isSignedIn;
     return Theme(
-      data: AppTheme.dark(),
-      child: Scaffold(
-        key: const Key('account-profile-page'),
-        backgroundColor: AppColors.ink,
-        appBar: AppBar(
-          backgroundColor: AppColors.ink,
-          foregroundColor: AppColors.onPrimary,
-          title: Text(l10n.accountProfile),
-        ),
-        body: SafeArea(
-          top: false,
-          child: signedIn
-              ? ListenableBuilder(
-                  listenable: _logic,
-                  builder: (context, _) => _body(l10n),
-                )
-              : const AuthGatePanel(),
-        ),
+      data: AppTheme.light(),
+      child: PlainPageScaffold(
+        pageKey: const Key('account-profile-page'),
+        backKey: const Key('account-profile-back'),
+        title: l10n.accountProfile,
+        child: signedIn
+            ? ListenableBuilder(
+                listenable: _logic,
+                builder: (context, _) => _body(l10n),
+              )
+            : const AuthGatePanel(),
       ),
     );
   }
@@ -169,8 +161,6 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
           _nicknameField(l10n),
           const SizedBox(height: _fieldGap),
           _genderField(l10n),
-          const SizedBox(height: _fieldGap),
-          _birthdayField(l10n),
           if (_logic.error != null) _saveError(l10n),
           const SizedBox(height: 16),
           _saveButton(l10n),
@@ -206,26 +196,6 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
     },
   );
 
-  Widget _birthdayField(AppLocalizations l10n) => Column(
-    crossAxisAlignment: CrossAxisAlignment.start,
-    children: [
-      OutlinedButton.icon(
-        key: const Key('account-birthday'),
-        onPressed: _pickBirthday,
-        icon: const Icon(Icons.cake_outlined),
-        label: Text(_birthday ?? l10n.accountSelectBirthday),
-      ),
-      const SizedBox(height: 6),
-      Text(
-        l10n.accountBirthdayHint,
-        style: const TextStyle(
-          color: AppColors.muted,
-          fontSize: AppDimens.caption,
-        ),
-      ),
-    ],
-  );
-
   Widget _saveError(AppLocalizations l10n) => Padding(
     padding: const EdgeInsets.only(top: 8),
     child: Text(
@@ -313,24 +283,8 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
     ),
   );
 
-  Future<void> _pickBirthday() async {
-    final value = await showDatePicker(
-      context: context,
-      initialDate: DateTime(2000),
-      firstDate: DateTime(1900),
-      lastDate: DateTime.now(),
-    );
-    if (value != null && mounted) {
-      setState(() => _birthday = _formatDate(value));
-    }
-  }
-
   Future<void> _save() async {
-    final ok = await _logic.save(
-      nickname: _nickname.text,
-      gender: _gender,
-      birthday: _birthday,
-    );
+    final ok = await _logic.save(nickname: _nickname.text, gender: _gender);
     if (!ok || !mounted) return;
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(content: Text(AppLocalizations.of(context)!.accountSaved)),
@@ -341,11 +295,6 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
       const {'male', 'female', 'unknown'}.contains(value) ? value : 'unknown';
 }
 
-String _formatDate(DateTime value) =>
-    '${value.year.toString().padLeft(4, '0')}-'
-    '${value.month.toString().padLeft(_datePadWidth, '0')}-'
-    '${value.day.toString().padLeft(_datePadWidth, '0')}';
-
 class _AccountCard extends StatelessWidget {
   const _AccountCard({required this.child});
 
diff --git a/lib/pages/auth/auth_binding.dart b/lib/pages/auth/auth_binding.dart
deleted file mode 100644
index dbc17f7..0000000
--- a/lib/pages/auth/auth_binding.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'auth_logic.dart';
-
-/// 与其它页保持一致的三层写法：binding 负责装配，logic 放状态与逻辑，view 只渲染。
-class AuthBinding {
-  AuthLogic create({bool signUpMode = false}) => AuthLogic(signUpMode: signUpMode);
-}
diff --git a/lib/pages/auth/auth_form_widgets.dart b/lib/pages/auth/auth_form_widgets.dart
index 576da35..81a58a7 100644
--- a/lib/pages/auth/auth_form_widgets.dart
+++ b/lib/pages/auth/auth_form_widgets.dart
@@ -22,11 +22,11 @@ class _AuthFields extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         _fieldLabel(state.l10n.authEmailLabel),
-        const SizedBox(height: 8),
+        const SizedBox(height: 6),
         _emailField(context, hasError: emailError),
-        const SizedBox(height: 16),
+        const SizedBox(height: 14),
         _fieldLabel(state.l10n.authPasswordLabel),
-        const SizedBox(height: 8),
+        const SizedBox(height: 6),
         _passwordField(context, hasError: passwordError),
         if (state.status.signUpMode) ...[
           const SizedBox(height: 8),
@@ -60,7 +60,8 @@ class _AuthFields extends StatelessWidget {
           autofillHints: const [AutofillHints.email],
           onChanged: callbacks.onEmailChanged,
           onSubmitted: (_) => state.fields.passwordFocus.requestFocus(),
-          style: const TextStyle(color: AppColors.onPrimary, fontSize: 15),
+          style: const TextStyle(color: AppColors.onSurface, fontSize: 15),
+          cursorColor: AppColors.blue,
           decoration: _decoration(
             context: context,
             hint: 'name@example.com',
@@ -91,7 +92,8 @@ class _AuthFields extends StatelessWidget {
           autofillHints: const [AutofillHints.password],
           onChanged: callbacks.onPasswordChanged,
           onSubmitted: (_) => callbacks.onSubmit(),
-          style: const TextStyle(color: AppColors.onPrimary, fontSize: 15),
+          style: const TextStyle(color: AppColors.onSurface, fontSize: 15),
+          cursorColor: AppColors.blue,
           decoration: _decoration(
             context: context,
             hint: l10n.authPasswordHint,
@@ -125,8 +127,8 @@ class _AuthFields extends StatelessWidget {
     label,
     style: const TextStyle(
       color: AppColors.muted,
-      fontSize: 13,
-      fontWeight: FontWeight.w600,
+      fontSize: 12,
+      fontWeight: FontWeight.w700,
     ),
   );
 
@@ -140,7 +142,10 @@ class _AuthFields extends StatelessWidget {
   }) {
     final border = OutlineInputBorder(
       borderRadius: BorderRadius.circular(_fieldRadius),
-      borderSide: BorderSide.none,
+      borderSide: const BorderSide(
+        color: AppColors.border,
+        width: _fieldBorderWidth,
+      ),
     );
     final errorColor = Theme.of(context).colorScheme.error;
     final errorBorder = OutlineInputBorder(
@@ -149,11 +154,11 @@ class _AuthFields extends StatelessWidget {
     );
     return InputDecoration(
       hintText: hint,
-      hintStyle: const TextStyle(color: AppColors.muted, fontSize: 14),
+      hintStyle: const TextStyle(color: AppColors.subtle, fontSize: 14),
       prefixIcon: Icon(
         icon,
         size: 21,
-        color: focused ? AppColors.blueSoft : AppColors.muted,
+        color: focused ? AppColors.blue : AppColors.muted,
       ),
       prefixIconConstraints: const BoxConstraints(
         minWidth: _minTapTarget,
@@ -161,7 +166,7 @@ class _AuthFields extends StatelessWidget {
       ),
       suffixIcon: suffix,
       filled: true,
-      fillColor: AppColors.bar,
+      fillColor: AppColors.card,
       isDense: true,
       contentPadding: const EdgeInsets.only(right: 16),
       border: border,
@@ -229,8 +234,8 @@ class _AuthSubmitButton extends StatelessWidget {
             : Text(
                 status.signUpMode ? l10n.signUp : l10n.signIn,
                 style: const TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.w700,
+                  fontSize: 15,
+                  fontWeight: FontWeight.w800,
                 ),
               ),
       ),
@@ -273,7 +278,7 @@ class _ModeSegment extends StatelessWidget {
               child: Text(
                 label,
                 style: TextStyle(
-                  color: selected ? AppColors.onPrimary : AppColors.muted,
+                  color: selected ? AppColors.onPrimary : AppColors.onSurface,
                   fontSize: 14,
                   fontWeight: FontWeight.w700,
                 ),
@@ -327,29 +332,11 @@ class _AuthBrand extends StatelessWidget {
     );
   }
 
-  Widget _brandMark() => Container(
+  Widget _brandMark() => _brandMarkWidget(
     key: const Key('auth-brand-mark'),
-    width: _brandMarkSize,
-    height: _brandMarkSize,
-    decoration: BoxDecoration(
-      borderRadius: BorderRadius.circular(14),
-      boxShadow: [
-        BoxShadow(
-          color: AppColors.blue.withValues(alpha: 0.32),
-          blurRadius: 24,
-          offset: const Offset(0, 10),
-        ),
-      ],
-    ),
-    child: ClipRRect(
-      borderRadius: BorderRadius.circular(14),
-      child: Image.asset(
-        'assets/icon/splash_mark.png',
-        width: _brandMarkSize,
-        height: _brandMarkSize,
-        fit: BoxFit.cover,
-      ),
-    ),
+    size: compact ? _compactBrandMarkSize : _brandMarkSize,
+    radius: compact ? _compactBrandMarkRadius : _brandMarkRadius,
+    iconSize: compact ? _compactBrandIconSize : _brandIconSize,
   );
 
   Widget _brandCopy(BuildContext context, {required bool centered}) => Column(
@@ -361,9 +348,9 @@ class _AuthBrand extends StatelessWidget {
         AppLocalizations.of(context)!.appName,
         textAlign: centered ? TextAlign.center : TextAlign.start,
         style: const TextStyle(
-          color: AppColors.onPrimary,
-          fontSize: 26,
-          fontWeight: FontWeight.w800,
+          color: AppColors.onSurface,
+          fontSize: 24,
+          fontWeight: FontWeight.w900,
           height: 1.1,
         ),
       ),
@@ -372,8 +359,8 @@ class _AuthBrand extends StatelessWidget {
         tagline,
         textAlign: centered ? TextAlign.center : TextAlign.start,
         style: const TextStyle(
-          color: AppColors.blueSoft,
-          fontSize: 14,
+          color: AppColors.muted,
+          fontSize: 13,
           height: 1.35,
         ),
       ),
@@ -406,7 +393,7 @@ class _AuthError extends StatelessWidget {
             child: Text(
               message,
               key: const Key('auth-error'),
-              style: TextStyle(color: color, fontSize: 13, height: 1.35),
+              style: TextStyle(color: color, fontSize: 12, height: 1.35),
             ),
           ),
         ],
diff --git a/lib/pages/auth/auth_view.dart b/lib/pages/auth/auth_view.dart
index 5ddbde0..3fe70d9 100644
--- a/lib/pages/auth/auth_view.dart
+++ b/lib/pages/auth/auth_view.dart
@@ -11,25 +11,30 @@ import '../../core/platform/haptics.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
+import '../../core/widgets/subpage_header.dart';
 import '../../l10n/app_localizations.dart';
 import 'auth_logic.dart';
+import 'phone_auth_sheet.dart';
 
 part 'auth_widgets.dart';
 part 'auth_form_widgets.dart';
 
 const double _minTapTarget = 44;
-const double _brandMarkSize = 48;
+const double _brandMarkSize = 72;
+const double _compactBrandMarkSize = 48;
+const double _brandMarkRadius = 20;
+const double _compactBrandMarkRadius = 14;
+const double _brandIconSize = 36;
+const double _compactBrandIconSize = 26;
 const double _contentMaxWidth = 440;
 // Auth keeps its approved 20px card silhouette.
 const double _cardRadius = AppDimens.authCardRadius;
-const double _cardPadding = AppDimens.cardPadding;
-const double _cardBorderWidth = 1;
+const double _cardPadding = 20;
 const double _fieldHeight = 52;
 const double _fieldRadius = 14;
-const double _fieldBorderWidth = 1.5;
-const double _buttonHeight = 52;
-const double _buttonRadius = 26;
-const double _glowOpacity = 0.18;
+const double _fieldBorderWidth = 1;
+const double _buttonHeight = 50;
+const double _buttonRadius = 25;
 const double _errorOpacity = 0.10;
 const double _errorBorderOpacity = 0.28;
 const double _enterSlideDistance = 16;
@@ -38,11 +43,48 @@ const double _bottomContentPadding = 28;
 const double _compactTopContentPadding = 48;
 const double _compactHeightBreakpoint = 720;
 const double _compactBrandGap = 16;
-const double _warmGlowSize = 260;
-const double _warmGlowOpacity = 0.06;
+const double _glowSize = 280;
+const double _warmGlowOpacity = 0.18;
+const double _entryButtonHeight = 50;
+const double _entryButtonRadius = 25;
+const double _entryButtonFontSize = 15;
+const double _entryIconSize = 20;
 const Duration _enterDuration = Duration(milliseconds: 220);
 const Duration _segmentDuration = Duration(milliseconds: 160);
 
+Widget _brandMarkWidget({
+  Key? key,
+  required double size,
+  required double radius,
+  required double iconSize,
+}) {
+  return Container(
+    key: key,
+    width: size,
+    height: size,
+    decoration: BoxDecoration(
+      borderRadius: BorderRadius.circular(radius),
+      gradient: const LinearGradient(
+        begin: Alignment.topLeft,
+        end: Alignment.bottomRight,
+        colors: [AppColors.blue, AppColors.secondary],
+      ),
+      boxShadow: [
+        BoxShadow(
+          color: AppColors.blue.withValues(alpha: 0.24),
+          blurRadius: 20,
+          offset: const Offset(0, 8),
+        ),
+      ],
+    ),
+    child: Icon(
+      Icons.play_arrow_rounded,
+      color: AppColors.onPrimary,
+      size: iconSize,
+    ),
+  );
+}
+
 /// 登录 / 注册页：邮箱 + 密码。
 class AuthPage extends StatefulWidget {
   const AuthPage({super.key, this.signUpMode = false});
@@ -140,40 +182,45 @@ class _AuthPageState extends State<AuthPage> {
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     return Theme(
-      data: AppTheme.dark(),
+      data: AppTheme.light(),
       child: Scaffold(
         resizeToAvoidBottomInset: true,
         backgroundColor: AppColors.ink,
         body: Stack(
           children: [
+            const Positioned.fill(
+              child: IgnorePointer(
+                child: DecoratedBox(
+                  key: Key('auth-page-background'),
+                  decoration: BoxDecoration(gradient: AppTheme.pageGradient),
+                ),
+              ),
+            ),
             Positioned(
-              top: 0,
-              left: 0,
-              right: 0,
-              height: 420,
+              top: -90,
+              right: -70,
+              width: _glowSize,
+              height: _glowSize,
               child: IgnorePointer(
                 child: Container(
                   key: const Key('auth-background-glow'),
                   decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
+                    shape: BoxShape.circle,
+                    gradient: RadialGradient(
                       colors: [
-                        AppColors.blue.withValues(alpha: _glowOpacity),
-                        AppColors.blue.withValues(alpha: 0.05),
-                        AppColors.ink.withValues(alpha: 0),
+                        AppColors.surfaceTop,
+                        AppColors.surfaceTop.withValues(alpha: 0),
                       ],
-                      stops: const [0, 0.55, 1],
                     ),
                   ),
                 ),
               ),
             ),
             Positioned(
-              top: 72,
-              right: -80,
-              width: _warmGlowSize,
-              height: _warmGlowSize,
+              left: -110,
+              bottom: -90,
+              width: _glowSize,
+              height: _glowSize,
               child: IgnorePointer(
                 child: Container(
                   key: const Key('auth-background-warm-glow'),
@@ -238,23 +285,16 @@ class _AuthPageState extends State<AuthPage> {
                   child: Align(
                     alignment: Alignment.topLeft,
                     child: Padding(
-                      padding: const EdgeInsets.only(left: 4, top: 4),
-                      child: IconButton(
-                        key: const Key('auth-back'),
-                        tooltip: MaterialLocalizations.of(
-                          context,
-                        ).backButtonTooltip,
-                        onPressed: () {
+                      padding: const EdgeInsets.only(left: 14, top: 8),
+                      child: AppSubpageBackButton(
+                        backKey: const Key('auth-back'),
+                        onBack: () {
                           if (_emailEntryOpen) {
                             setState(() => _emailEntryOpen = false);
                           } else {
                             Navigator.of(context).pop();
                           }
                         },
-                        icon: const Icon(
-                          Icons.arrow_back_rounded,
-                          color: AppColors.onPrimary,
-                        ),
                       ),
                     ),
                   ),
@@ -297,67 +337,44 @@ class _AuthPageState extends State<AuthPage> {
     crossAxisAlignment: CrossAxisAlignment.stretch,
     children: [
       Center(
-        child: Container(
+        child: _brandMarkWidget(
           key: const Key('auth-brand-logo'),
-          width: 64,
-          height: 64,
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(18),
-            gradient: const LinearGradient(
-              begin: Alignment.topLeft,
-              end: Alignment.bottomRight,
-              colors: [AppColors.blue, AppColors.secondary],
-            ),
-          ),
-          child: const Icon(
-            Icons.play_arrow_rounded,
-            color: AppColors.onPrimary,
-            size: 32,
-          ),
+          size: _brandMarkSize,
+          radius: _brandMarkRadius,
+          iconSize: _brandIconSize,
         ),
       ),
-      const SizedBox(height: 14),
+      const SizedBox(height: 16),
       Text(
         l10n.fruitShortsBrand,
         textAlign: TextAlign.center,
         style: const TextStyle(
           fontFamily: 'Outfit',
           color: AppColors.onSurface,
-          fontSize: 20,
-          fontWeight: FontWeight.w800,
+          fontSize: 24,
+          fontWeight: FontWeight.w900,
         ),
       ),
       const SizedBox(height: 6),
       Text(
         l10n.authLandingSubtitle,
         textAlign: TextAlign.center,
-        style: const TextStyle(color: Color(0xFF9A96A3), fontSize: 11),
+        style: const TextStyle(color: AppColors.muted, fontSize: 13),
       ),
-      const SizedBox(height: 22),
-      _AuthEntryButton(
-        key: const Key('auth-entry-google'),
-        label: 'G  ${l10n.authContinueGoogle}',
-        background: Colors.white,
-        foreground: const Color(0xFF1A1A1A),
-        leadingColor: const Color(0xFF4285F4),
-        onTap: () => _comingSoon(l10n),
-      ),
-      const SizedBox(height: 11),
+      const SizedBox(height: 28),
       _AuthEntryButton(
         key: const Key('auth-entry-phone'),
         label: l10n.authPhoneSignIn,
         icon: Icons.phone_android_rounded,
-        background: AppColors.input,
-        foreground: AppColors.onSurface,
-        onTap: () => _comingSoon(l10n),
+        primary: true,
+        onTap: _openPhoneSheet,
       ),
-      const SizedBox(height: 11),
+      const SizedBox(height: 12),
       _AuthEntryButton(
         key: const Key('auth-entry-email'),
         label: l10n.authEmailSignIn,
         icon: Icons.mail_outline_rounded,
-        background: AppColors.input,
-        foreground: AppColors.onSurface,
+        primary: false,
         onTap: () => setState(() => _emailEntryOpen = true),
       ),
       const SizedBox(height: 18),
@@ -366,7 +383,7 @@ class _AuthPageState extends State<AuthPage> {
         key: const Key('auth-legal'),
         textAlign: TextAlign.center,
         style: const TextStyle(
-          color: Color(0xFF6B6772),
+          color: AppColors.muted,
           fontSize: 9,
           height: 1.6,
         ),
@@ -374,10 +391,12 @@ class _AuthPageState extends State<AuthPage> {
     ],
   );
 
-  void _comingSoon(AppLocalizations l10n) {
-    ScaffoldMessenger.of(
+  Future<void> _openPhoneSheet() async {
+    final signedIn = await showPhoneAuthSheet(
       context,
-    ).showSnackBar(SnackBar(content: Text(l10n.comingSoon)));
+      signUp: _logic.signUpMode,
+    );
+    if (signedIn == true && mounted) Navigator.of(context).maybePop();
   }
 
   Widget _authCard(AppLocalizations l10n) => _AuthCard(
@@ -423,36 +442,40 @@ class _AuthEntryButton extends StatelessWidget {
   const _AuthEntryButton({
     super.key,
     required this.label,
-    required this.background,
-    required this.foreground,
+    required this.primary,
     required this.onTap,
     this.icon,
-    this.leadingColor,
   });
 
   final String label;
-  final Color background;
-  final Color foreground;
+  final bool primary;
   final VoidCallback onTap;
   final IconData? icon;
-  final Color? leadingColor;
 
   @override
   Widget build(BuildContext context) {
+    final background = primary ? AppColors.blue : AppColors.card;
+    final foreground = primary ? AppColors.onPrimary : AppColors.onSurface;
     return Material(
       color: background,
-      borderRadius: BorderRadius.circular(9),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(_entryButtonRadius),
+        side: primary
+            ? BorderSide.none
+            : const BorderSide(color: AppColors.border),
+      ),
       clipBehavior: Clip.antiAlias,
       child: InkWell(
         onTap: onTap,
+        borderRadius: BorderRadius.circular(_entryButtonRadius),
         child: SizedBox(
-          height: 44,
+          height: _entryButtonHeight,
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               if (icon != null)
-                Icon(icon, size: 16, color: leadingColor ?? foreground),
-              if (icon != null) const SizedBox(width: 7),
+                Icon(icon, size: _entryIconSize, color: foreground),
+              if (icon != null) const SizedBox(width: 8),
               Flexible(
                 child: Text(
                   label,
@@ -460,8 +483,8 @@ class _AuthEntryButton extends StatelessWidget {
                   overflow: TextOverflow.ellipsis,
                   style: TextStyle(
                     color: foreground,
-                    fontSize: 13,
-                    fontWeight: FontWeight.w600,
+                    fontSize: _entryButtonFontSize,
+                    fontWeight: FontWeight.w800,
                   ),
                 ),
               ),
diff --git a/lib/pages/auth/auth_widgets.dart b/lib/pages/auth/auth_widgets.dart
index 3934899..9355158 100644
--- a/lib/pages/auth/auth_widgets.dart
+++ b/lib/pages/auth/auth_widgets.dart
@@ -76,10 +76,7 @@ class _AuthCard extends StatelessWidget {
       decoration: BoxDecoration(
         color: AppColors.card,
         borderRadius: BorderRadius.circular(_cardRadius),
-        border: Border.all(
-          color: AppColors.outlineVariantDark,
-          width: _cardBorderWidth,
-        ),
+        boxShadow: const [AppTheme.cardShadow],
       ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -94,7 +91,7 @@ class _AuthCard extends StatelessWidget {
           Text(
             status.signUpMode ? l10n.authSignUpTitle : l10n.authSignInTitle,
             style: const TextStyle(
-              color: AppColors.onPrimary,
+              color: AppColors.onSurface,
               fontSize: 25,
               fontWeight: FontWeight.w800,
               height: 1.2,
@@ -149,12 +146,11 @@ class _AuthModeSwitch extends StatelessWidget {
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(22)),
       ),
       child: Container(
-        height: _minTapTarget,
-        padding: const EdgeInsets.all(3),
+        height: 36,
+        padding: const EdgeInsets.all(2),
         decoration: BoxDecoration(
-          color: AppColors.bar,
-          borderRadius: BorderRadius.circular(22),
-          border: Border.all(color: AppColors.outlineVariantDark),
+          color: AppColors.raised,
+          borderRadius: BorderRadius.circular(18),
         ),
         child: Row(
           children: [
diff --git a/lib/pages/auth/phone_auth_sheet.dart b/lib/pages/auth/phone_auth_sheet.dart
new file mode 100644
index 0000000..541e830
--- /dev/null
+++ b/lib/pages/auth/phone_auth_sheet.dart
@@ -0,0 +1,358 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/remote/api_client.dart';
+import '../../core/data/services/auth_controller.dart';
+import '../../core/platform/haptics.dart';
+import '../../core/theme/app_colors.dart';
+import '../../l10n/app_localizations.dart';
+
+const double _fieldHeight = 52;
+const double _fieldRadius = 14;
+const double _sheetRadius = 28;
+const double _buttonHeight = 52;
+const int _resendSeconds = 60;
+const int _phoneMinLength = 8;
+const int _codeMinLength = 4;
+
+/// 打开手机号 OTP 登录/注册表单；成功登录后返回 true。
+Future<bool?> showPhoneAuthSheet(BuildContext context, {bool signUp = false}) {
+  return showModalBottomSheet<bool>(
+    context: context,
+    isScrollControlled: true,
+    useSafeArea: true,
+    backgroundColor: Colors.transparent,
+    barrierColor: Colors.black.withValues(alpha: 0.62),
+    builder: (_) => PhoneAuthSheet(initialSignUp: signUp),
+  );
+}
+
+class PhoneAuthSheet extends StatefulWidget {
+  const PhoneAuthSheet({super.key, this.initialSignUp = false});
+
+  final bool initialSignUp;
+
+  @override
+  State<PhoneAuthSheet> createState() => _PhoneAuthSheetState();
+}
+
+class _PhoneAuthSheetState extends State<PhoneAuthSheet> {
+  late final TextEditingController _phone;
+  late final TextEditingController _code;
+  late final FocusNode _phoneFocus;
+  late final FocusNode _codeFocus;
+  Timer? _countdown;
+  bool _signUp = false;
+  bool _sending = false;
+  bool _submitting = false;
+  int _remaining = 0;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    _signUp = widget.initialSignUp;
+    _phone = TextEditingController();
+    _code = TextEditingController();
+    _phoneFocus = FocusNode(debugLabel: 'phone-auth-number');
+    _codeFocus = FocusNode(debugLabel: 'phone-auth-code');
+  }
+
+  @override
+  void dispose() {
+    _countdown?.cancel();
+    _phone.dispose();
+    _code.dispose();
+    _phoneFocus.dispose();
+    _codeFocus.dispose();
+    super.dispose();
+  }
+
+  String get _target => _phone.text.replaceAll(RegExp(r'[\s-]'), '');
+
+  bool get _phoneValid => _target.length >= _phoneMinLength;
+
+  Future<void> _sendCode() async {
+    if (_sending || _remaining > 0) return;
+    final l10n = AppLocalizations.of(context)!;
+    if (!_phoneValid) {
+      setState(() => _error = l10n.authPhoneInvalid);
+      return;
+    }
+    setState(() {
+      _sending = true;
+      _error = null;
+    });
+    final haptics = context.read<Haptics>();
+    final auth = context.read<AuthController>();
+    await haptics.lightImpact();
+    try {
+      await auth.sendOtp(
+        target: _target,
+        scene: _signUp ? 'REGISTER' : 'LOGIN',
+      );
+      if (!mounted) return;
+      _startCountdown();
+      setState(() => _error = null);
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text(l10n.authCodeSent)));
+      _codeFocus.requestFocus();
+    } on ApiException catch (error) {
+      if (mounted) setState(() => _error = error.message);
+    } catch (_) {
+      if (mounted) setState(() => _error = l10n.authNetworkError);
+    } finally {
+      if (mounted) setState(() => _sending = false);
+    }
+  }
+
+  void _startCountdown() {
+    _countdown?.cancel();
+    _remaining = _resendSeconds;
+    _countdown = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (!mounted) return timer.cancel();
+      setState(() => _remaining--);
+      if (_remaining <= 0) timer.cancel();
+    });
+  }
+
+  Future<void> _submit() async {
+    if (_submitting) return;
+    final l10n = AppLocalizations.of(context)!;
+    if (!_phoneValid) {
+      setState(() => _error = l10n.authPhoneInvalid);
+      return;
+    }
+    if (_code.text.trim().length < _codeMinLength) {
+      setState(() => _error = l10n.authCodeRequired);
+      return;
+    }
+    setState(() {
+      _submitting = true;
+      _error = null;
+    });
+    final haptics = context.read<Haptics>();
+    final auth = context.read<AuthController>();
+    await haptics.lightImpact();
+    try {
+      if (_signUp) {
+        await auth.registerWithPhone(target: _target, code: _code.text.trim());
+      } else {
+        await auth.signInWithPhone(target: _target, code: _code.text.trim());
+      }
+      if (mounted) Navigator.of(context).pop(true);
+    } on ApiException catch (error) {
+      if (mounted) setState(() => _error = error.message);
+    } catch (_) {
+      if (mounted) setState(() => _error = l10n.authNetworkError);
+    } finally {
+      if (mounted) setState(() => _submitting = false);
+    }
+  }
+
+  void _switchMode() {
+    setState(() {
+      _signUp = !_signUp;
+      _error = null;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final bottom = MediaQuery.viewInsetsOf(context).bottom;
+    return Padding(
+      padding: EdgeInsets.only(bottom: bottom),
+      child: Container(
+        key: const Key('phone-auth-sheet'),
+        decoration: const BoxDecoration(
+          color: AppColors.card,
+          borderRadius: BorderRadius.vertical(top: Radius.circular(_sheetRadius)),
+        ),
+        child: SingleChildScrollView(
+          padding: const EdgeInsets.fromLTRB(22, 10, 22, 26),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Center(child: _grabber()),
+              const SizedBox(height: 16),
+              Text(
+                _signUp ? l10n.authPhoneSignUp : l10n.authPhoneTitle,
+                style: const TextStyle(
+                  color: AppColors.onSurface,
+                  fontSize: 22,
+                  fontWeight: FontWeight.w800,
+                ),
+              ),
+              const SizedBox(height: 6),
+              Text(
+                l10n.authSubtitle,
+                style: const TextStyle(color: AppColors.subtle, fontSize: 12),
+              ),
+              const SizedBox(height: 20),
+              _phoneField(l10n),
+              const SizedBox(height: 12),
+              _codeField(l10n),
+              if (_error != null) ...[
+                const SizedBox(height: 10),
+                Text(
+                  _error!,
+                  key: const Key('auth-phone-error'),
+                  style: const TextStyle(color: AppColors.accent, fontSize: 12),
+                ),
+              ],
+              const SizedBox(height: 18),
+              _submitButton(l10n),
+              const SizedBox(height: 8),
+              Center(
+                child: TextButton(
+                  key: const Key('auth-phone-switch'),
+                  onPressed: _submitting ? null : _switchMode,
+                  style: TextButton.styleFrom(
+                    foregroundColor: AppColors.blueSoft,
+                    minimumSize: const Size(48, 48),
+                  ),
+                  child: Text(
+                    _signUp ? l10n.authSwitchToSignIn : l10n.authSwitchToSignUp,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _grabber() => Container(
+    width: 40,
+    height: 4,
+    decoration: BoxDecoration(
+      color: AppColors.subtle.withValues(alpha: 0.4),
+      borderRadius: BorderRadius.circular(2),
+    ),
+  );
+
+  Widget _phoneField(AppLocalizations l10n) => SizedBox(
+    height: _fieldHeight,
+    child: TextField(
+      key: const Key('auth-phone-number'),
+      controller: _phone,
+      focusNode: _phoneFocus,
+      enabled: !_submitting,
+      keyboardType: TextInputType.phone,
+      textInputAction: TextInputAction.next,
+      autofillHints: const [AutofillHints.telephoneNumber],
+      inputFormatters: [
+        FilteringTextInputFormatter.allow(RegExp(r'[0-9+\s-]')),
+        LengthLimitingTextInputFormatter(20),
+      ],
+      onSubmitted: (_) => _codeFocus.requestFocus(),
+      onChanged: (_) => setState(() => _error = null),
+      style: const TextStyle(color: AppColors.onSurface, fontSize: 15),
+      decoration: _decoration(l10n.authPhoneLabel, l10n.authPhoneHint),
+    ),
+  );
+
+  Widget _codeField(AppLocalizations l10n) => SizedBox(
+    height: _fieldHeight,
+    child: TextField(
+      key: const Key('auth-phone-code'),
+      controller: _code,
+      focusNode: _codeFocus,
+      enabled: !_submitting,
+      keyboardType: TextInputType.number,
+      textInputAction: TextInputAction.done,
+      autofillHints: const [AutofillHints.oneTimeCode],
+      inputFormatters: [
+        FilteringTextInputFormatter.digitsOnly,
+        LengthLimitingTextInputFormatter(6),
+      ],
+      onSubmitted: (_) => _submit(),
+      onChanged: (_) => setState(() => _error = null),
+      style: const TextStyle(color: AppColors.onSurface, fontSize: 15),
+      decoration: _decoration(l10n.authCodeLabel, l10n.authCodeHint).copyWith(
+        suffixIcon: _sendButton(l10n),
+      ),
+    ),
+  );
+
+  Widget _sendButton(AppLocalizations l10n) => Padding(
+    padding: const EdgeInsets.only(right: 6),
+    child: TextButton(
+      key: const Key('auth-send-code'),
+      onPressed: _sending || _remaining > 0 ? null : _sendCode,
+      style: TextButton.styleFrom(
+        foregroundColor: AppColors.blueSoft,
+        minimumSize: const Size(48, 48),
+        padding: const EdgeInsets.symmetric(horizontal: 10),
+      ),
+      child: _sending
+          ? const SizedBox(
+              width: 16,
+              height: 16,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            )
+          : Text(
+              _remaining > 0
+                  ? l10n.authResendCode(_remaining)
+                  : l10n.authSendCode,
+              style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w700),
+            ),
+    ),
+  );
+
+  Widget _submitButton(AppLocalizations l10n) => SizedBox(
+    width: double.infinity,
+    height: _buttonHeight,
+    child: FilledButton(
+      key: const Key('auth-phone-submit'),
+      onPressed: _submitting ? null : _submit,
+      style: FilledButton.styleFrom(
+        backgroundColor: AppColors.blue,
+        foregroundColor: AppColors.onPrimary,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(_buttonHeight / 2),
+        ),
+      ),
+      child: _submitting
+          ? const SizedBox(
+              width: 20,
+              height: 20,
+              child: CircularProgressIndicator(
+                strokeWidth: 2,
+                color: AppColors.onPrimary,
+              ),
+            )
+          : Text(
+              _signUp ? l10n.authPhoneSignUpAction : l10n.authPhoneSignInAction,
+              style: const TextStyle(fontSize: 15, fontWeight: FontWeight.w800),
+            ),
+    ),
+  );
+
+  InputDecoration _decoration(String label, String hint) => InputDecoration(
+    labelText: label,
+    hintText: hint,
+    labelStyle: const TextStyle(color: AppColors.subtle),
+    hintStyle: const TextStyle(color: AppColors.subtle),
+    filled: true,
+    fillColor: AppColors.input,
+    contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
+    border: OutlineInputBorder(
+      borderRadius: BorderRadius.circular(_fieldRadius),
+      borderSide: BorderSide.none,
+    ),
+    focusedBorder: OutlineInputBorder(
+      borderRadius: BorderRadius.circular(_fieldRadius),
+      borderSide: const BorderSide(color: AppColors.blue, width: 1.5),
+    ),
+  );
+}
diff --git a/lib/pages/create/create_view.dart b/lib/pages/create/create_view.dart
new file mode 100644
index 0000000..bf6e729
--- /dev/null
+++ b/lib/pages/create/create_view.dart
@@ -0,0 +1,374 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../core/theme/app_colors.dart';
+import '../../core/theme/app_theme.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
+import '../../l10n/app_localizations.dart';
+
+const double _cardHeight = 196;
+const double _cardRadius = 20;
+const double _arrowSize = 36;
+const double _illustrationWidth = 156;
+const double _illustrationHeight = 88;
+const double _mottoLineWidth = 96;
+const List<Color> _aiGradientStart = [Color(0xFFFFE3D0), Color(0xFFFFC9AC)];
+const List<Color> _uploadGradient = [Color(0xFFFFEAD9), Color(0xFFFFD3B3)];
+
+/// 创作页：AI 制作与上传发布两张主卡，底部品牌标语。
+class CreatePage extends StatelessWidget {
+  const CreatePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Theme(
+      data: AppTheme.light(),
+      child: SafeArea(
+        bottom: false,
+        child: ListView(
+          key: const Key('create-page'),
+          padding: const EdgeInsets.fromLTRB(16, 28, 16, 24),
+          children: [
+            Text(
+              l10n.createTab,
+              style: const TextStyle(
+                fontFamily: 'Outfit',
+                color: AppColors.onSurface,
+                fontSize: 28,
+                fontWeight: FontWeight.w800,
+              ),
+            ),
+            const SizedBox(height: 6),
+            Text(
+              l10n.createSubtitle,
+              style: const TextStyle(color: AppColors.muted, fontSize: 13),
+            ),
+            const SizedBox(height: 24),
+            _CreateCard(
+              key: const Key('create-ai'),
+              title: l10n.createAiTitle,
+              subtitle: l10n.createAiSubtitle,
+              illustration: const _AiIllustration(),
+              onTap: () => _openPlaceholder(context, l10n.createAiTitle),
+            ),
+            const SizedBox(height: 16),
+            _CreateCard(
+              key: const Key('create-upload'),
+              title: l10n.createUploadTitle,
+              subtitle: l10n.createUploadSubtitle,
+              illustration: const _UploadIllustration(),
+              onTap: () => _openPlaceholder(context, l10n.createUploadTitle),
+            ),
+            const SizedBox(height: 32),
+            Text(
+              l10n.createMottoPrimary,
+              key: const Key('create-motto-primary'),
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                color: AppColors.onSurface,
+                fontSize: 18,
+                fontWeight: FontWeight.w700,
+              ),
+            ),
+            const SizedBox(height: 4),
+            Text(
+              l10n.createMottoSecondary,
+              key: const Key('create-motto-secondary'),
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                color: AppColors.onSurface,
+                fontSize: 18,
+                fontWeight: FontWeight.w700,
+              ),
+            ),
+            const SizedBox(height: 10),
+            Center(
+              child: Container(
+                key: const Key('create-motto-line'),
+                width: _mottoLineWidth,
+                height: 2,
+                decoration: BoxDecoration(
+                  color: AppColors.blue,
+                  borderRadius: BorderRadius.circular(1),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void _openPlaceholder(BuildContext context, String title) {
+    Navigator.of(context).push<void>(
+      MaterialPageRoute(builder: (_) => _CreatePlaceholderPage(title: title)),
+    );
+  }
+}
+
+class _CreateCard extends StatelessWidget {
+  const _CreateCard({
+    super.key,
+    required this.title,
+    required this.subtitle,
+    required this.illustration,
+    required this.onTap,
+  });
+
+  final String title;
+  final String subtitle;
+  final Widget illustration;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(_cardRadius),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(_cardRadius),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          onTap: onTap,
+          child: SizedBox(
+            height: _cardHeight,
+            child: Stack(
+              children: [
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(20, 18, 68, 0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        title,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          color: AppColors.onSurface,
+                          fontSize: 22,
+                          fontWeight: FontWeight.w900,
+                        ),
+                      ),
+                      const SizedBox(height: 6),
+                      Text(
+                        subtitle,
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          color: AppColors.muted,
+                          fontSize: 13,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                Positioned(
+                  top: 16,
+                  right: 16,
+                  child: Container(
+                    width: _arrowSize,
+                    height: _arrowSize,
+                    decoration: const BoxDecoration(
+                      color: AppColors.raised,
+                      shape: BoxShape.circle,
+                    ),
+                    child: const Icon(
+                      Icons.arrow_forward_rounded,
+                      color: AppColors.blue,
+                      size: 18,
+                    ),
+                  ),
+                ),
+                Positioned(right: 14, bottom: 14, child: illustration),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _AiIllustration extends StatelessWidget {
+  const _AiIllustration();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: _illustrationWidth,
+      height: _illustrationHeight,
+      decoration: BoxDecoration(
+        gradient: const LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: _aiGradientStart,
+        ),
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Stack(
+        children: [
+          const Positioned(
+            left: 12,
+            top: 10,
+            child: Icon(
+              Icons.auto_awesome_rounded,
+              color: AppColors.secondary,
+              size: 30,
+            ),
+          ),
+          const Positioned(
+            right: 14,
+            top: 8,
+            child: Icon(
+              Icons.auto_awesome_rounded,
+              color: AppColors.blue,
+              size: 12,
+            ),
+          ),
+          Positioned(
+            right: 32,
+            top: 30,
+            child: Container(
+              width: 5,
+              height: 5,
+              decoration: BoxDecoration(
+                color: AppColors.blue.withValues(alpha: 0.55),
+                shape: BoxShape.circle,
+              ),
+            ),
+          ),
+          const Positioned(
+            left: 12,
+            bottom: 10,
+            child: Text(
+              'Every Story Matters',
+              style: TextStyle(
+                color: AppColors.muted,
+                fontSize: 10,
+                fontWeight: FontWeight.w700,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _UploadIllustration extends StatelessWidget {
+  const _UploadIllustration();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: _illustrationWidth,
+      height: _illustrationHeight,
+      decoration: BoxDecoration(
+        gradient: const LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: _uploadGradient,
+        ),
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Stack(
+        children: [
+          const Positioned(
+            left: 12,
+            top: 8,
+            child: Icon(
+              Icons.cloud_upload_rounded,
+              color: AppColors.secondary,
+              size: 30,
+            ),
+          ),
+          Positioned(
+            right: 16,
+            top: 12,
+            child: Container(
+              width: 30,
+              height: 20,
+              decoration: BoxDecoration(
+                color: Colors.white.withValues(alpha: 0.55),
+                borderRadius: BorderRadius.circular(4),
+              ),
+              child: const Icon(
+                Icons.movie_creation_outlined,
+                color: AppColors.muted,
+                size: 12,
+              ),
+            ),
+          ),
+          Positioned(
+            right: 52,
+            top: 34,
+            child: Container(
+              width: 5,
+              height: 5,
+              decoration: BoxDecoration(
+                color: AppColors.blue.withValues(alpha: 0.55),
+                shape: BoxShape.circle,
+              ),
+            ),
+          ),
+          const Positioned(
+            left: 12,
+            bottom: 10,
+            child: Text(
+              'Ready to publish',
+              style: TextStyle(
+                color: AppColors.muted,
+                fontSize: 10,
+                fontWeight: FontWeight.w700,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _CreatePlaceholderPage extends StatelessWidget {
+  const _CreatePlaceholderPage({required this.title});
+
+  final String title;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return PlainPageScaffold(
+      pageKey: const Key('create-placeholder-page'),
+      backKey: const Key('create-placeholder-back'),
+      title: title,
+      child: Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const Icon(
+              Icons.construction_rounded,
+              color: AppColors.blue,
+              size: 42,
+            ),
+            const SizedBox(height: 12),
+            Text(
+              l10n.comingSoon,
+              style: const TextStyle(
+                color: AppColors.onSurface,
+                fontSize: 16,
+                fontWeight: FontWeight.w700,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/discover/discover_binding.dart b/lib/pages/discover/discover_binding.dart
index 89024ce..ec1e157 100644
--- a/lib/pages/discover/discover_binding.dart
+++ b/lib/pages/discover/discover_binding.dart
@@ -1,12 +1,9 @@
 // Author: fruit.com.cn
 
-import '../../core/data/models/drama.dart';
-import '../../core/data/repositories/watch_history_repository.dart';
+import '../../core/data/repositories/search_repository.dart';
 import 'discover_logic.dart';
 
 class DiscoverBinding {
-  DiscoverLogic create({
-    required Drama drama,
-    required WatchHistoryRepository history,
-  }) => DiscoverLogic(drama: drama, history: history);
+  DiscoverLogic create({SearchRepository? search}) =>
+      DiscoverLogic(searchRepository: search);
 }
diff --git a/lib/pages/discover/discover_logic.dart b/lib/pages/discover/discover_logic.dart
index bff295a..d500ed7 100644
--- a/lib/pages/discover/discover_logic.dart
+++ b/lib/pages/discover/discover_logic.dart
@@ -1,110 +1,135 @@
 // Author: fruit.com.cn
 
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 
 import '../../core/data/models/drama.dart';
-import '../../core/data/models/watch_progress.dart';
-import '../../core/data/repositories/watch_history_repository.dart';
-import '../../l10n/app_localizations.dart';
-
-enum DiscoverPageAction { home, my, watchlist, detail, resume }
+import '../../core/data/remote/api_exception.dart';
+import '../../core/data/repositories/search_repository.dart';
+import 'discover_types.dart';
 
+/// 剧场页搜索状态：服务端检索、防抖与错误态。
 class DiscoverLogic extends ChangeNotifier {
-  DiscoverLogic({required this.history, required this.drama}) {
-    refreshPosition();
-  }
+  DiscoverLogic({this.searchRepository});
 
-  final WatchHistoryRepository history;
-  Drama drama;
-  late Future<Duration?> position;
-  WatchProgress? resumeRecord;
+  final SearchRepository? searchRepository;
   final TextEditingController search = TextEditingController();
   final FocusNode searchFocus = FocusNode();
   final ScrollController scroll = ScrollController();
-  bool searchOpen = false;
+
+  /// 搜索防抖与分页口径：与后端 `/app/search` 一致。
+  Duration searchDebounce = const Duration(milliseconds: 350);
+  static const int searchPageSize = 20;
+  List<Drama> searchResults = const [];
+  bool searchLoading = false;
+  String? searchError;
+  Timer? _searchTimer;
+  String _lastRequestedQuery = '';
+  int _searchRequest = 0;
   bool _disposed = false;
+  String? selectedCategoryId;
+
+  bool get hasSearchQuery => search.text.trim().isNotEmpty;
 
   void notify() {
     if (!_disposed) notifyListeners();
   }
 
-  void refreshPosition() {
-    // 续看位置来自服务端（每剧一条记录）；未登录或没有记录时给 null，UI 显示"从头看"
-    position = history
-        .resumePointFor(drama.id)
-        .then((point) => point?.position)
-        .catchError((Object _) => null);
-    refreshResume();
+  void onSearchChanged() {
+    final query = search.text.trim();
+    if (query.isEmpty) {
+      _resetSearch();
+      notify();
+      return;
+    }
+    notify();
+    _scheduleSearch(query);
   }
 
-  Future<void> refreshResume() async {
+  void openSearch() => searchFocus.requestFocus();
+
+  /// 选择分类；空值表示全部。
+  void selectCategory(String? categoryId) {
+    if (selectedCategoryId == categoryId) return;
+    selectedCategoryId = categoryId;
+    notify();
+  }
+
+  void retrySearch() {
+    final query = search.text.trim();
+    if (query.isNotEmpty) unawaited(_runSearch(query));
+  }
+
+  void _resetSearch() {
+    _searchTimer?.cancel();
+    _searchRequest++;
+    searchResults = const [];
+    searchLoading = false;
+    searchError = null;
+    _lastRequestedQuery = '';
+  }
+
+  void _scheduleSearch(String query) {
+    final alreadyRequested = query == _lastRequestedQuery;
+    if (alreadyRequested &&
+        (searchLoading || searchResults.isNotEmpty || searchError != null)) {
+      return;
+    }
+    _lastRequestedQuery = query;
+    _searchTimer?.cancel();
+    if (searchDebounce == Duration.zero) {
+      unawaited(_runSearch(query));
+      return;
+    }
+    _searchTimer = Timer(searchDebounce, () => unawaited(_runSearch(query)));
+  }
+
+  Future<void> _runSearch(String query) async {
+    final repository = searchRepository;
+    if (repository == null) return;
+    final request = ++_searchRequest;
+    searchLoading = true;
+    searchError = null;
+    notify();
     try {
-      final recent = await history.recent(limit: 1);
-      if (recent.isEmpty || recent.first.finished) {
-        resumeRecord = null;
-      } else {
-        resumeRecord = recent.first;
-      }
+      final result = await repository.search(
+        query,
+        pageIndex: 1,
+        pageSize: searchPageSize,
+      );
+      if (request != _searchRequest) return;
+      searchResults = result.list;
+    } on ApiException catch (exception) {
+      _applySearchError(request, exception.message);
     } catch (_) {
-      resumeRecord = null;
+      _applySearchError(request, 'searchFailed');
+    } finally {
+      if (request == _searchRequest) {
+        searchLoading = false;
+        notify();
+      }
     }
-    notify();
   }
 
-  void onSearchChanged() => notify();
-
-  List<Drama> filtered(List<Drama> dramas) {
-    final query = search.text.trim().toLowerCase();
-    if (query.isEmpty) return dramas;
-    return dramas.where((drama) {
-      final haystack = [
-        drama.title,
-        drama.genre,
-        drama.category,
-        drama.synopsis,
-      ].join(' ').toLowerCase();
-      return haystack.contains(query);
-    }).toList();
+  void _applySearchError(int request, String message) {
+    if (request != _searchRequest) return;
+    searchError = message;
+    searchResults = const [];
   }
 
-  Drama? resumeDrama(List<Drama> dramas) {
-    final record = resumeRecord;
-    if (record == null) return null;
-    for (final drama in dramas) {
-      if (drama.id == record.dramaId) return drama;
-    }
-    return null;
-  }
-
-  bool get showSearch => searchOpen || search.text.isNotEmpty;
-
-  void openSearch() {
-    searchOpen = true;
-    notify();
-    searchFocus.requestFocus();
-  }
-
-  void syncDrama({
+  /// 从播放器发起的搜索请求只在剧场页可见时抢焦点。
+  void syncSearch({
     required bool active,
-    required bool wasActive,
-    required Drama nextDrama,
-    required bool dramaChanged,
-    required int searchRequest,
-    required int previousSearchRequest,
+    required int request,
+    required int previousRequest,
     required bool Function() isActive,
   }) {
-    if (active && (!wasActive || dramaChanged)) {
-      drama = nextDrama;
-      refreshPosition();
-      notify();
-    }
-    if (active && searchRequest != previousSearchRequest) {
-      searchOpen = true;
-      notify();
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (isActive()) searchFocus.requestFocus();
-      });
-    }
+    if (!active || request == previousRequest) return;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (isActive()) searchFocus.requestFocus();
+    });
+    WidgetsBinding.instance.scheduleFrame();
   }
 
   void act(
@@ -120,51 +145,10 @@ class DiscoverLogic extends ChangeNotifier {
     }
   }
 
-  Drama? dramaFor(String? dramaId, List<Drama> dramas) {
-    for (final item in dramas) {
-      if (item.id == dramaId) return item;
-    }
-    return null;
-  }
-
-  void openCard(
-    BuildContext context,
-    Drama? selected, {
-    required bool embedded,
-    ValueChanged<Drama>? onDramaSelected,
-    ValueChanged<DiscoverPageAction>? onAction,
-  }) {
-    if (selected == null) {
-      unavailable(context);
-    } else if (embedded && onDramaSelected != null) {
-      onDramaSelected(selected);
-    } else {
-      act(
-        context,
-        DiscoverPageAction.detail,
-        embedded: embedded,
-        onAction: onAction,
-      );
-    }
-  }
-
-  void unavailable(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
-    ScaffoldMessenger.of(
-      context,
-    ).showSnackBar(SnackBar(content: Text(l10n.artworkOnlyNotice)));
-  }
-
-  void catalogInfo(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
-    ScaffoldMessenger.of(
-      context,
-    ).showSnackBar(SnackBar(content: Text(l10n.demoCatalogNotice)));
-  }
-
   @override
   void dispose() {
     _disposed = true;
+    _searchTimer?.cancel();
     search.dispose();
     searchFocus.dispose();
     scroll.dispose();
diff --git a/lib/pages/discover/discover_types.dart b/lib/pages/discover/discover_types.dart
new file mode 100644
index 0000000..d369cc9
--- /dev/null
+++ b/lib/pages/discover/discover_types.dart
@@ -0,0 +1,23 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+
+import '../../core/data/models/drama.dart';
+
+/// 剧场页与根导航之间的动作。
+enum DiscoverPageAction { home, create, my }
+
+/// 剧场页导航回调；没有 `onAction` 时按独立页面处理。
+class DiscoverPageCallbacks {
+  const DiscoverPageCallbacks({
+    this.onAction,
+    this.onDramaSelected,
+    this.onProfile,
+  });
+
+  final ValueChanged<DiscoverPageAction>? onAction;
+  final ValueChanged<Drama>? onDramaSelected;
+  final VoidCallback? onProfile;
+
+  bool get embedded => onAction != null;
+}
diff --git a/lib/pages/discover/discover_view.dart b/lib/pages/discover/discover_view.dart
index 656adcb..d713627 100644
--- a/lib/pages/discover/discover_view.dart
+++ b/lib/pages/discover/discover_view.dart
@@ -1,59 +1,68 @@
 // Author: fruit.com.cn
 
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
-import '../../core/config/app_config.dart';
 import '../../core/data/models/drama.dart';
-import '../../core/data/models/watch_progress.dart';
-import '../../core/data/repositories/watch_history_repository.dart';
+import '../../core/data/repositories/search_repository.dart';
+import '../../core/data/services/catalog_retry.dart';
 import '../../core/data/services/category_controller.dart';
+import '../../core/formatting/error_text.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/app_bottom_nav.dart';
+import '../../core/widgets/app_pull_to_refresh.dart';
+import '../../core/widgets/catalog_debug_info.dart';
+import '../../core/widgets/catalog_endpoint_editor.dart';
 import '../../core/widgets/empty_state.dart';
-import '../../core/widgets/remote_image.dart';
 import '../../l10n/app_localizations.dart';
+import '../filter/filter_page.dart';
+import '../new_releases/new_releases_page.dart';
+import '../player/open_player.dart';
+import '../ranking/ranking_page.dart';
+import '../reserve/reserve_page.dart';
 import 'discover_binding.dart';
 import 'discover_logic.dart';
+import 'discover_types.dart';
+import 'widgets/discover_header.dart';
+import 'widgets/discover_search_results.dart';
+import 'widgets/drama_grid.dart';
 
-part 'widgets/home_drama_grid.dart';
+const Color _filterIconColor = Color(0xFF7B61FF);
+const Color _newIconColor = Color(0xFF14B8A6);
+const double _toolbarHeight = 36;
+const double _toolbarGap = 10;
+const double _toolbarRadius = 10;
+const double _categoryTabHeight = 44;
+const double _categoryTabGap = 20;
+const double _categorySelectedFontSize = 16;
+const double _categoryFontSize = 15;
+const double _categoryUnderlineWidth = 20;
+const double _categoryUnderlineHeight = 3;
+const double _categoryUnderlineStrokeWidth = 2;
+const double _stickyHeaderHeight = 44;
+const Duration _stickyHeaderTransition = Duration(milliseconds: 160);
+const Duration _categoryScrollDuration = Duration(milliseconds: 200);
 
+/// K28-A2 剧场页：搜索、分类/语言 chips 与双列剧库。
 class DiscoverPage extends StatefulWidget {
   const DiscoverPage({
     super.key,
-    required this.drama,
-    required this.duration,
-    this.focusSearch = false,
-    this.history,
-    this.embedded = false,
     this.active = true,
     this.searchRequest = 0,
-    this.signedIn = false,
-    this.onSignIn,
-    this.onCoins,
-    this.onRewards,
-    this.onAction,
-    this.dramas,
-    this.onDramaSelected,
+    this.focusSearch = false,
+    this.callbacks = const DiscoverPageCallbacks(),
   });
 
-  final Drama drama;
-  final Duration duration;
-  final bool focusSearch;
-  final WatchHistoryRepository? history;
-  final bool embedded;
   final bool active;
   final int searchRequest;
-  final bool signedIn;
-  final VoidCallback? onSignIn;
-  final VoidCallback? onCoins;
-  final VoidCallback? onRewards;
-  final ValueChanged<DiscoverPageAction>? onAction;
-  final List<Drama>? dramas;
-  final ValueChanged<Drama>? onDramaSelected;
+  final bool focusSearch;
+  final DiscoverPageCallbacks callbacks;
 
   @override
   State<DiscoverPage> createState() => _DiscoverPageState();
@@ -61,38 +70,49 @@ class DiscoverPage extends StatefulWidget {
 
 class _DiscoverPageState extends State<DiscoverPage> {
   late final DiscoverLogic logic;
+  final ValueNotifier<bool> _headerPinned = ValueNotifier<bool>(false);
+  final ScrollController _categoryScroll = ScrollController();
+  final Map<String, GlobalKey> _categoryAnchors = {};
+  String? _ensuredCategoryId;
+  bool _categoryRevealScheduled = false;
+
+  bool get embedded => widget.callbacks.embedded;
 
   @override
   void initState() {
     super.initState();
-    logic = DiscoverBinding().create(
-      drama: widget.drama,
-      history: widget.history ?? context.read<WatchHistoryRepository>(),
-    );
-    if (widget.focusSearch) {
-      logic.searchOpen = true;
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (mounted && widget.active) logic.searchFocus.requestFocus();
-      });
-    }
+    logic = DiscoverBinding().create(search: context.read<SearchRepository>());
+    logic.scroll.addListener(_onScroll);
+    if (widget.focusSearch) _focusOnFirstFrame();
+  }
+
+  void _onScroll() {
+    final pinned = logic.scroll.hasClients && logic.scroll.offset > 0;
+    if (pinned != _headerPinned.value) _headerPinned.value = pinned;
+  }
+
+  void _focusOnFirstFrame() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted && widget.active) logic.openSearch();
+    });
   }
 
   @override
   void didUpdateWidget(covariant DiscoverPage oldWidget) {
     super.didUpdateWidget(oldWidget);
-    logic.syncDrama(
+    logic.syncSearch(
       active: widget.active,
-      wasActive: oldWidget.active,
-      nextDrama: widget.drama,
-      dramaChanged: oldWidget.drama.id != widget.drama.id,
-      searchRequest: widget.searchRequest,
-      previousSearchRequest: oldWidget.searchRequest,
+      request: widget.searchRequest,
+      previousRequest: oldWidget.searchRequest,
       isActive: () => mounted && widget.active,
     );
   }
 
   @override
   void dispose() {
+    logic.scroll.removeListener(_onScroll);
+    _categoryScroll.dispose();
+    _headerPinned.dispose();
     logic.dispose();
     super.dispose();
   }
@@ -108,192 +128,250 @@ class _DiscoverPageState extends State<DiscoverPage> {
   Widget _page(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     final categories = context.watch<CategoryController>();
-    final allDramas = [...?widget.dramas, ...categories.visibleDramas];
-    final visible = logic.filtered(categories.visibleDramas);
-    final content = SafeArea(
-      bottom: !widget.embedded,
-      child: Column(
-        children: [
-          _header(l10n),
-          Expanded(child: _feed(l10n, categories, allDramas, visible)),
-          if (!widget.embedded) _bottomNav(l10n),
-        ],
+    final content = ColoredBox(
+      key: const Key('theater-page-surface'),
+      color: AppColors.ink,
+      child: SafeArea(
+        bottom: !embedded,
+        child: Column(
+          children: [
+            DiscoverHeader(
+              controller: logic.search,
+              focusNode: logic.searchFocus,
+              onChanged: (_) => logic.onSearchChanged(),
+              loading: logic.searchLoading,
+            ),
+            Expanded(child: _feed(l10n, categories)),
+            if (!embedded) _bottomNav(l10n),
+          ],
+        ),
       ),
     );
     return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: SystemUiOverlayStyle.light,
+      value: SystemUiOverlayStyle.dark,
       child: Theme(
-        data: AppTheme.dark(),
-        child: widget.embedded
+        data: AppTheme.light(),
+        child: embedded
             ? content
             : Scaffold(backgroundColor: AppColors.ink, body: content),
       ),
     );
   }
 
-  Widget _feed(
+  Widget _feed(AppLocalizations l10n, CategoryController categories) {
+    final showHeader = _showStickyHeader(categories);
+    return GestureDetector(
+      behavior: HitTestBehavior.translucent,
+      onTap: logic.searchFocus.unfocus,
+      child: Stack(
+        children: [
+          Positioned.fill(
+            child: AppPullToRefresh(
+              key: const Key('discover-refresh'),
+              edgeOffset: _stickyHeaderHeight + 8,
+              onRefresh: categories.load,
+              child: ListView(
+                controller: logic.scroll,
+                physics: AppPullToRefresh.physics,
+                padding: EdgeInsets.only(
+                  top: showHeader ? _stickyHeaderHeight : 0,
+                  bottom: AppDimens.spaceXl,
+                ),
+                children: _content(l10n, categories),
+              ),
+            ),
+          ),
+          if (showHeader)
+            Positioned(
+              top: 0,
+              left: 0,
+              right: 0,
+              child: _stickyHeader(l10n, categories),
+            ),
+        ],
+      ),
+    );
+  }
+
+  bool _showStickyHeader(CategoryController categories) {
+    if (logic.hasSearchQuery || categories.error != null) return false;
+    return !(categories.loading && categories.feed.sections.isEmpty);
+  }
+
+  Widget _stickyHeader(AppLocalizations l10n, CategoryController categories) {
+    // 背景常驻 ink，只有分隔线/阴影随吸顶状态过渡，避免透明→实色的闪动。
+    return ValueListenableBuilder<bool>(
+      valueListenable: _headerPinned,
+      builder: (context, pinned, child) => AnimatedContainer(
+        key: const Key('theater-sticky-header'),
+        duration: _stickyHeaderTransition,
+        curve: Curves.easeOut,
+        decoration: BoxDecoration(
+          color: AppColors.ink,
+          border: Border(
+            bottom: BorderSide(
+              color: pinned ? AppColors.border : Colors.transparent,
+            ),
+          ),
+          boxShadow: pinned
+              ? const [
+                  BoxShadow(
+                    color: Color(0x14000000),
+                    blurRadius: 8,
+                    offset: Offset(0, 2),
+                  ),
+                ]
+              : const [],
+        ),
+        child: child,
+      ),
+      child: KeyedSubtree(
+        key: const Key('theater-sticky-content'),
+        child: _categoryTabs(l10n, categories),
+      ),
+    );
+  }
+
+  List<Widget> _content(AppLocalizations l10n, CategoryController categories) {
+    if (logic.hasSearchQuery) {
+      return [
+        DiscoverSearchResults(
+          loading: logic.searchLoading,
+          error: logic.searchError,
+          results: logic.searchResults,
+          onRetry: logic.retrySearch,
+          onOpen: _openDrama,
+        ),
+      ];
+    }
+    if (categories.loading && categories.feed.sections.isEmpty) {
+      return [_block(const CircularProgressIndicator(strokeWidth: 2))];
+    }
+    final error = categories.error;
+    if (error != null) {
+      return [
+        _block(
+          EmptyState(
+            key: const Key('home-categories-error'),
+            icon: Icons.cloud_off_rounded,
+            title: errorText(l10n, error, l10n.categoriesError),
+            subtitle: l10n.emptyHint,
+            actionLabel: l10n.retry,
+            onAction: () => unawaited(_retryCategories(categories)),
+            footer: kDebugMode
+                ? CatalogDebugInfo(
+                    error: categories.debugError ?? error,
+                    onEditEndpoint: () =>
+                        unawaited(_editCategoriesEndpoint(categories)),
+                  )
+                : null,
+          ),
+        ),
+      ];
+    }
+    return _theaterBlocks(l10n, categories);
+  }
+
+  List<Widget> _theaterBlocks(
     AppLocalizations l10n,
     CategoryController categories,
-    List<Drama> allDramas,
-    List<Drama> visible,
-  ) => RefreshIndicator(
-    key: const Key('discover-refresh'),
-    color: AppColors.blue,
-    backgroundColor: AppColors.card,
-    onRefresh: () async {
-      await Future.wait([categories.load(), logic.refreshResume()]);
-    },
-    child: CustomScrollView(
-      controller: logic.scroll,
-      physics: const AlwaysScrollableScrollPhysics(),
-      slivers: [
-        SliverToBoxAdapter(child: _search()),
-        SliverToBoxAdapter(
-          child: Padding(
-            padding: const EdgeInsets.fromLTRB(0, 14, 0, 12),
-            child: _categories(l10n, categories),
+  ) {
+    final dramas = logic.selectedCategoryId == null
+        ? categories.feed.dramas
+        : categories.dramasOf(logic.selectedCategoryId!);
+    return [
+      _toolbar(l10n),
+      if (dramas.isEmpty)
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 40),
+          child: EmptyState(
+            key: const Key('discover-empty'),
+            icon: Icons.movie_filter_outlined,
+            title: l10n.noStories,
+            subtitle: l10n.emptyHint,
           ),
-        ),
-        if (logic.resumeRecord != null && logic.resumeDrama(allDramas) != null)
-          SliverToBoxAdapter(
-            child: Padding(
-              padding: const EdgeInsets.fromLTRB(16, 0, 16, 14),
-              child: _continueCard(
-                l10n,
-                logic.resumeDrama(allDramas)!,
-                logic.resumeRecord!,
-              ),
-            ),
-          ),
-        SliverToBoxAdapter(
-          child: Padding(
-            padding: const EdgeInsets.fromLTRB(16, 0, 16, 14),
-            child: _quickActions(l10n, categories),
-          ),
-        ),
-        SliverToBoxAdapter(
-          child: Padding(
-            padding: const EdgeInsets.fromLTRB(14, 2, 14, 10),
-            child: Row(
-              children: [
-                Container(
-                  width: 3,
-                  height: 18,
-                  decoration: BoxDecoration(
-                    color: AppColors.blue,
-                    borderRadius: BorderRadius.circular(2),
-                  ),
-                ),
-                const SizedBox(width: 6),
-                Expanded(
-                  child: Text(
-                    l10n.trendingMicroDramas,
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                    style: const TextStyle(
-                      color: AppColors.onSurface,
-                      fontSize: AppDimens.previewSectionTitle,
-                      fontWeight: FontWeight.w800,
-                    ),
-                  ),
-                ),
-                TextButton(
-                  onPressed: () =>
-                      categories.selectCode(CategoryController.allCode),
-                  style: TextButton.styleFrom(
-                    foregroundColor: AppColors.accent,
-                    minimumSize: const Size(44, 44),
-                    padding: EdgeInsets.zero,
-                  ),
-                  child: Text(
-                    '${l10n.all} ›',
-                    style: const TextStyle(fontSize: 10),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        _HomeDramaGrid(
-          l10n: l10n,
-          categories: categories,
-          dramas: visible,
-          searching: logic.search.text.trim().isNotEmpty,
-          onOpen: (drama) => logic.openCard(
-            context,
-            drama,
-            embedded: widget.embedded,
-            onDramaSelected: widget.onDramaSelected,
-            onAction: widget.onAction,
-          ),
-        ),
-      ],
-    ),
-  );
+        )
+      else
+        DramaGrid(l10n: l10n, dramas: dramas, onOpen: _openDrama),
+    ];
+  }
 
-  Widget _header(AppLocalizations l10n) {
+  Widget _categoryTabs(AppLocalizations l10n, CategoryController categories) {
+    _scheduleSelectedCategoryReveal();
     return SizedBox(
-      height: 46,
-      child: Padding(
+      key: const Key('theater-category-chips'),
+      height: _categoryTabHeight,
+      child: SingleChildScrollView(
+        key: const Key('theater-category-scroll'),
+        controller: _categoryScroll,
+        scrollDirection: Axis.horizontal,
         padding: const EdgeInsets.symmetric(horizontal: 14),
         child: Row(
+          mainAxisSize: MainAxisSize.min,
           children: [
-            Container(
-              width: 24,
-              height: 24,
-              alignment: Alignment.center,
-              decoration: BoxDecoration(
-                color: AppColors.blue,
-                borderRadius: BorderRadius.circular(7),
-              ),
-              child: const Icon(
-                Icons.play_arrow_rounded,
-                color: AppColors.onPrimary,
-                size: 16,
-              ),
+            _categoryTab(
+              key: const Key('theater-category-all'),
+              anchorKey: _anchorFor('all'),
+              id: 'all',
+              label: l10n.all,
+              selected: logic.selectedCategoryId == null,
+              onTap: () => _selectCategory(null),
             ),
-            const SizedBox(width: 8),
+            for (final category in categories.categories) ...[
+              const SizedBox(width: _categoryTabGap),
+              _categoryTab(
+                key: Key('theater-category-${category.id}'),
+                anchorKey: _anchorFor(category.id),
+                id: category.id,
+                label: category.name,
+                selected: logic.selectedCategoryId == category.id,
+                onTap: () => _selectCategory(category.id),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _categoryTab({
+    required Key key,
+    required GlobalKey anchorKey,
+    required String id,
+    required String label,
+    required bool selected,
+    required VoidCallback onTap,
+  }) {
+    return KeyedSubtree(
+      key: anchorKey,
+      child: GestureDetector(
+        key: key,
+        behavior: HitTestBehavior.opaque,
+        onTap: onTap,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
             Text(
-              l10n.discoverTab,
-              style: const TextStyle(
-                fontFamily: 'Outfit',
-                color: AppColors.onSurface,
-                fontSize: 15,
-                fontWeight: FontWeight.w800,
+              label,
+              maxLines: 1,
+              style: TextStyle(
+                color: selected ? AppColors.onSurface : AppColors.muted,
+                fontSize: selected
+                    ? _categorySelectedFontSize
+                    : _categoryFontSize,
+                fontWeight: selected ? FontWeight.w800 : FontWeight.w500,
               ),
             ),
-            const Spacer(),
-            _HeaderIcon(
-              key: const Key('discover-search-button'),
-              icon: Icons.search_rounded,
-              tooltip: l10n.search,
-              onTap: logic.openSearch,
-            ),
-            const SizedBox(width: 8),
-            Semantics(
-              button: true,
-              label: widget.signedIn ? l10n.myTab : l10n.logIn,
-              child: InkWell(
-                key: const Key('discover-profile'),
-                customBorder: const CircleBorder(),
-                onTap: widget.signedIn ? widget.onCoins : widget.onSignIn,
-                child: Container(
-                  width: 36,
-                  height: 36,
-                  decoration: BoxDecoration(
-                    shape: BoxShape.circle,
-                    gradient: const LinearGradient(
-                      begin: Alignment.topLeft,
-                      end: Alignment.bottomRight,
-                      colors: [Color(0xFF6A5CFF), AppColors.blue],
-                    ),
-                  ),
-                  child: const Icon(
-                    Icons.person_rounded,
-                    color: AppColors.onSurface,
-                    size: 18,
-                  ),
-                ),
+            const SizedBox(height: 4),
+            CustomPaint(
+              key: Key('theater-category-underline-$id'),
+              size: const Size(
+                _categoryUnderlineWidth,
+                _categoryUnderlineHeight,
+              ),
+              painter: CategoryUnderlinePainter(
+                color: selected ? AppColors.blue : Colors.transparent,
               ),
             ),
           ],
@@ -302,376 +380,127 @@ class _DiscoverPageState extends State<DiscoverPage> {
     );
   }
 
-  Widget _search() {
+  GlobalKey _anchorFor(String id) {
+    return _categoryAnchors.putIfAbsent(id, GlobalKey.new);
+  }
+
+  void _selectCategory(String? categoryId) {
+    logic.selectCategory(categoryId);
+    final id = categoryId ?? 'all';
+    _ensuredCategoryId = id;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted) unawaited(_revealCategory(id));
+    });
+  }
+
+  void _scheduleSelectedCategoryReveal() {
+    final selectedId = logic.selectedCategoryId ?? 'all';
+    if (_categoryRevealScheduled || _ensuredCategoryId == selectedId) return;
+    _categoryRevealScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      _categoryRevealScheduled = false;
+      if (!mounted || (logic.selectedCategoryId ?? 'all') != selectedId) return;
+      final revealed = await _revealCategory(selectedId);
+      if (revealed) _ensuredCategoryId = selectedId;
+    });
+  }
+
+  Future<bool> _revealCategory(String id) async {
+    final target = _categoryAnchors[id]?.currentContext;
+    if (target == null) return false;
+    await Scrollable.ensureVisible(
+      target,
+      alignment: 0.5,
+      duration: _categoryScrollDuration,
+      curve: Curves.easeOutCubic,
+    );
+    return true;
+  }
+
+  Widget _toolbar(AppLocalizations l10n) {
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 14),
-      child: SizedBox(
-        height: 36,
-        child: TextField(
-          key: const Key('discover-search'),
-          controller: logic.search,
-          focusNode: logic.searchFocus,
-          onChanged: (_) => logic.onSearchChanged(),
-          onTapOutside: (_) => logic.searchFocus.unfocus(),
-          textInputAction: TextInputAction.search,
-          style: const TextStyle(color: AppColors.onSurface, fontSize: 13),
-          decoration: InputDecoration(
-            isDense: true,
-            filled: true,
-            fillColor: AppColors.input,
-            hintText: AppLocalizations.of(context)!.searchDiscover,
-            hintStyle: const TextStyle(color: AppColors.cream, fontSize: 11),
-            prefixIcon: const Icon(
-              Icons.search_rounded,
-              color: AppColors.subtle,
-              size: 17,
-            ),
-            contentPadding: const EdgeInsets.symmetric(horizontal: 12),
-            enabledBorder: OutlineInputBorder(
-              borderRadius: BorderRadius.circular(20),
-              borderSide: BorderSide.none,
-            ),
-            focusedBorder: OutlineInputBorder(
-              borderRadius: BorderRadius.circular(20),
-              borderSide: const BorderSide(color: AppColors.blue, width: 1),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _categories(AppLocalizations l10n, CategoryController categories) {
-    final choices = <({String code, String label})>[
-      (code: CategoryController.allCode, label: l10n.recommended),
-      for (final category in categories.categories)
-        (code: 'category-${category.id}', label: category.name),
-    ];
-    return SizedBox(
-      key: const Key('home-category-chips'),
-      height: AppDimens.tapTarget,
-      child: ListView.separated(
-        padding: const EdgeInsets.symmetric(horizontal: 14),
-        scrollDirection: Axis.horizontal,
-        itemCount: choices.length,
-        separatorBuilder: (_, _) => const SizedBox(width: 8),
-        itemBuilder: (context, index) {
-          final choice = choices[index];
-          final selected = categories.selectedCode == choice.code;
-          return Semantics(
-            selected: selected,
-            button: true,
-            child: GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () => categories.selectCode(choice.code),
-              child: Center(
-                child: AnimatedContainer(
-                  duration: const Duration(milliseconds: 180),
-                  alignment: Alignment.center,
-                  padding: const EdgeInsets.symmetric(horizontal: 15),
-                  decoration: BoxDecoration(
-                    color: selected ? AppColors.blue : const Color(0xFF29272B),
-                    borderRadius: BorderRadius.circular(999),
-                    border: Border.all(
-                      color: selected ? AppColors.blue : Colors.transparent,
-                    ),
-                  ),
-                  child: Text(
-                    choice.label,
-                    maxLines: 1,
-                    style: TextStyle(
-                      color: selected ? AppColors.onPrimary : AppColors.muted,
-                      fontSize: AppDimens.chipFont,
-                      fontWeight: selected ? FontWeight.w700 : FontWeight.w500,
-                      height: 1.1,
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  Widget _continueCard(
-    AppLocalizations l10n,
-    Drama drama,
-    WatchProgress record,
-  ) {
-    final progress = record.fraction;
-    return Container(
-      key: const Key('discover-continue-watching'),
-      padding: const EdgeInsets.all(9),
-      decoration: BoxDecoration(
-        color: AppColors.cardAlt,
-        borderRadius: BorderRadius.circular(12),
-      ),
+      padding: const EdgeInsets.fromLTRB(14, 2, 14, 12),
       child: Row(
         children: [
-          ClipRRect(
-            borderRadius: BorderRadius.circular(10),
-            child: SizedBox(
-              width: 52,
-              height: 66,
-              child: RemoteImage(
-                drama.posterUrl,
-                fit: BoxFit.cover,
-                showFallbackIcon: true,
-              ),
-            ),
-          ),
-          const SizedBox(width: 9),
           Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  l10n.continueWatching,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    color: AppColors.accent,
-                    fontSize: 8,
-                    fontWeight: FontWeight.w800,
-                  ),
-                ),
-                const SizedBox(height: 2),
-                Text(
-                  drama.title,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    color: AppColors.onSurface,
-                    fontSize: 12,
-                    fontWeight: FontWeight.w800,
-                  ),
-                ),
-                const SizedBox(height: 2),
-                Text(
-                  _resumeShort(drama, record),
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(color: Color(0xFFBBBBBB), fontSize: 9),
-                ),
-                const SizedBox(height: 7),
-                ClipRRect(
-                  borderRadius: BorderRadius.circular(999),
-                  child: LinearProgressIndicator(
-                    value: progress <= 0 ? null : progress,
-                    minHeight: 3,
-                    backgroundColor: const Color(0xFF474248),
-                    valueColor: const AlwaysStoppedAnimation(AppColors.blue),
-                  ),
-                ),
-              ],
+            child: _toolButton(
+              key: const Key('theater-toolbar-filter'),
+              icon: Icons.tune_rounded,
+              color: _filterIconColor,
+              label: l10n.filter,
+              onTap: () => _openPage(context, const FilterPage()),
             ),
           ),
-          const SizedBox(width: 10),
-          FilledButton(
-            key: const Key('discover-continue-play'),
-            onPressed: () => logic.openCard(
-              context,
-              drama,
-              embedded: widget.embedded,
-              onDramaSelected: widget.onDramaSelected,
-              onAction: widget.onAction,
+          const SizedBox(width: _toolbarGap),
+          Expanded(
+            child: _toolButton(
+              key: const Key('theater-toolbar-ranking'),
+              icon: Icons.local_fire_department_rounded,
+              color: AppColors.blue,
+              label: l10n.rankingTab,
+              onTap: () => _openPage(context, const RankingPage()),
             ),
-            style: FilledButton.styleFrom(
-              backgroundColor: AppColors.blue,
-              foregroundColor: AppColors.onPrimary,
-              minimumSize: const Size(56, 28),
-              padding: EdgeInsets.zero,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(9),
-              ),
-              textStyle: const TextStyle(
-                fontSize: 10,
-                fontWeight: FontWeight.w700,
-              ),
+          ),
+          const SizedBox(width: _toolbarGap),
+          Expanded(
+            child: _toolButton(
+              key: const Key('theater-toolbar-new'),
+              icon: Icons.play_circle_fill_rounded,
+              color: _newIconColor,
+              label: l10n.newDramas,
+              onTap: () => _openPage(context, const NewReleasesPage()),
+            ),
+          ),
+          const SizedBox(width: _toolbarGap),
+          Expanded(
+            child: _toolButton(
+              key: const Key('theater-toolbar-reserve'),
+              icon: Icons.calendar_month_rounded,
+              color: AppColors.blue,
+              label: l10n.reserve,
+              onTap: () => _openPage(context, const ReservePage()),
             ),
-            child: Text(l10n.resume),
           ),
         ],
       ),
     );
   }
 
-  String _resumeShort(Drama drama, WatchProgress record) {
-    final label = AppLocalizations.of(context)!;
-    Episode? episode;
-    for (final item in drama.episodes) {
-      if (item.id == record.episodeId) {
-        episode = item;
-        break;
-      }
-    }
-    if (episode == null) return _duration(record.position);
-    return label.episodeOfTotal(episode.number, drama.episodeCount);
-  }
-
-  Widget _quickActions(AppLocalizations l10n, CategoryController categories) {
-    return Row(
-      children: [
-        Expanded(
-          child: _QuickAction(
-            key: const Key('discover-quick-filter'),
-            icon: Icons.tune_rounded,
-            label: l10n.filter,
-            color: AppColors.secondary,
-            onTap: logic.openSearch,
-          ),
-        ),
-        const SizedBox(width: 7),
-        Expanded(
-          child: _QuickAction(
-            key: const Key('discover-quick-charts'),
-            icon: Icons.local_fire_department_rounded,
-            label: l10n.topCharts,
-            color: AppColors.blue,
-            onTap: () => categories.selectCode(CategoryController.hotCode),
-          ),
-        ),
-        const SizedBox(width: 7),
-        Expanded(
-          child: _QuickAction(
-            key: const Key('discover-quick-new'),
-            icon: Icons.auto_awesome_rounded,
-            label: l10n.newReleases,
-            color: AppColors.gold,
-            onTap: () => categories.selectCode(CategoryController.newCode),
-          ),
-        ),
-        const SizedBox(width: 7),
-        Expanded(
-          child: _QuickAction(
-            key: const Key('discover-quick-watchlist'),
-            icon: Icons.bookmark_border_rounded,
-            label: l10n.watchlist,
-            color: AppColors.success,
-            onTap: () => logic.act(
-              context,
-              DiscoverPageAction.watchlist,
-              embedded: widget.embedded,
-              onAction: widget.onAction,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _bottomNav(AppLocalizations l10n) => AppBottomNav(
-    items: [
-      AppBottomNavItem(
-        tabKey: const Key('discover-nav-home'),
-        icon: Icons.play_circle_outline_rounded,
-        selectedIcon: Icons.play_circle_fill_rounded,
-        label: l10n.homeTab,
-        onTap: () => logic.act(
-          context,
-          DiscoverPageAction.home,
-          embedded: widget.embedded,
-          onAction: widget.onAction,
-        ),
-      ),
-      AppBottomNavItem(
-        tabKey: const Key('discover-nav-current'),
-        icon: Icons.explore_outlined,
-        selectedIcon: Icons.explore_rounded,
-        label: l10n.discoverTab,
-        selected: true,
-        onTap: () {},
-      ),
-      AppBottomNavItem(
-        tabKey: const Key('discover-nav-my'),
-        icon: Icons.video_library_outlined,
-        selectedIcon: Icons.video_library_rounded,
-        label: l10n.myTab,
-        onTap: () => logic.act(
-          context,
-          DiscoverPageAction.my,
-          embedded: widget.embedded,
-          onAction: widget.onAction,
-        ),
-      ),
-    ],
-  );
-}
-
-class _HeaderIcon extends StatelessWidget {
-  const _HeaderIcon({
-    super.key,
-    required this.icon,
-    required this.tooltip,
-    required this.onTap,
-  });
-
-  final IconData icon;
-  final String tooltip;
-  final VoidCallback onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      width: 36,
-      height: 36,
-      child: IconButton(
-        tooltip: tooltip,
-        onPressed: onTap,
-        padding: EdgeInsets.zero,
-        style: IconButton.styleFrom(
-          backgroundColor: const Color(0xFF2C2D33),
-          foregroundColor: AppColors.onSurface,
-        ),
-        icon: Icon(icon, size: 18),
-      ),
-    );
-  }
-}
-
-class _QuickAction extends StatelessWidget {
-  const _QuickAction({
-    super.key,
-    required this.icon,
-    required this.label,
-    required this.color,
-    required this.onTap,
-  });
-
-  final IconData icon;
-  final String label;
-  final Color color;
-  final VoidCallback onTap;
-
-  @override
-  Widget build(BuildContext context) {
+  Widget _toolButton({
+    required Key key,
+    required IconData icon,
+    required Color color,
+    required String label,
+    required VoidCallback onTap,
+  }) {
     return Material(
-      color: AppColors.quick,
-      borderRadius: BorderRadius.circular(12),
-      clipBehavior: Clip.antiAlias,
+      color: AppColors.card,
+      borderRadius: BorderRadius.circular(_toolbarRadius),
       child: InkWell(
+        key: key,
         onTap: onTap,
+        borderRadius: BorderRadius.circular(_toolbarRadius),
         child: Container(
-          height: 62,
-          padding: const EdgeInsets.symmetric(horizontal: 3, vertical: 5),
-          decoration: BoxDecoration(borderRadius: BorderRadius.circular(12)),
-          child: Column(
+          height: _toolbarHeight,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(_toolbarRadius),
+            border: Border.all(color: AppColors.border),
+          ),
+          child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Icon(icon, color: color, size: 16),
-              const SizedBox(height: 4),
-              Text(
-                label,
-                maxLines: 2,
-                textAlign: TextAlign.center,
-                overflow: TextOverflow.ellipsis,
-                style: const TextStyle(
-                  color: AppColors.muted,
-                  fontSize: 9,
-                  fontWeight: FontWeight.w500,
-                  height: 1.05,
+              Icon(icon, size: 16, color: color),
+              const SizedBox(width: 4),
+              Flexible(
+                child: Text(
+                  label,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: 13,
+                    fontWeight: FontWeight.w600,
+                  ),
                 ),
               ),
             ],
@@ -680,10 +509,97 @@ class _QuickAction extends StatelessWidget {
       ),
     );
   }
+
+  void _openPage(BuildContext context, Widget page) {
+    Navigator.of(context).push<void>(MaterialPageRoute(builder: (_) => page));
+  }
+
+  Widget _block(Widget child) => ConstrainedBox(
+    constraints: const BoxConstraints(minHeight: 280),
+    child: Center(child: child),
+  );
+
+  Future<void> _retryCategories(CategoryController categories) {
+    return retryCatalogLoad(reload: categories.load);
+  }
+
+  Future<void> _editCategoriesEndpoint(CategoryController categories) {
+    return showCatalogEndpointEditor(context, reload: categories.load);
+  }
+
+  void _act(DiscoverPageAction action) {
+    logic.act(
+      context,
+      action,
+      embedded: embedded,
+      onAction: widget.callbacks.onAction,
+    );
+  }
+
+  void _openDrama(Drama drama) {
+    final callback = widget.callbacks.onDramaSelected;
+    if (callback != null) {
+      callback(drama);
+      return;
+    }
+    unawaited(playDramaFromCatalog(context, drama));
+  }
+
+  Widget _bottomNav(AppLocalizations l10n) => AppBottomNav(
+    items: [
+      AppBottomNavItem(
+        tabKey: const Key('discover-nav-home'),
+        icon: Icons.home_outlined,
+        selectedIcon: Icons.home_rounded,
+        label: l10n.homeTab,
+        onTap: () => _act(DiscoverPageAction.home),
+      ),
+      AppBottomNavItem(
+        tabKey: const Key('discover-nav-current'),
+        icon: Icons.explore_outlined,
+        selectedIcon: Icons.explore_rounded,
+        label: l10n.theaterTab,
+        selected: true,
+        onTap: () {},
+      ),
+      AppBottomNavItem(
+        tabKey: const Key('discover-nav-create'),
+        icon: Icons.add_box_outlined,
+        selectedIcon: Icons.add_box_rounded,
+        label: l10n.createTab,
+        onTap: () => _act(DiscoverPageAction.create),
+      ),
+      AppBottomNavItem(
+        tabKey: const Key('discover-nav-my'),
+        icon: Icons.person_outline_rounded,
+        selectedIcon: Icons.person_rounded,
+        label: l10n.myTab,
+        onTap: () => _act(DiscoverPageAction.my),
+      ),
+    ],
+  );
 }
 
-String _duration(Duration value) {
-  final minutes = value.inMinutes.remainder(60).toString().padLeft(2, '0');
-  final seconds = value.inSeconds.remainder(60).toString().padLeft(2, '0');
-  return '$minutes:$seconds';
+/// 分类 tab 的弧形选中线。
+class CategoryUnderlinePainter extends CustomPainter {
+  const CategoryUnderlinePainter({required this.color});
+
+  final Color color;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = color
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = _categoryUnderlineStrokeWidth
+      ..strokeCap = StrokeCap.round;
+    final path = Path()
+      ..moveTo(1, 1)
+      ..quadraticBezierTo(size.width / 2, size.height + 1, size.width - 1, 1);
+    canvas.drawPath(path, paint);
+  }
+
+  @override
+  bool shouldRepaint(covariant CategoryUnderlinePainter oldDelegate) =>
+      color != oldDelegate.color;
 }
diff --git a/lib/pages/discover/ranking_logic.dart b/lib/pages/discover/ranking_logic.dart
new file mode 100644
index 0000000..5312e30
--- /dev/null
+++ b/lib/pages/discover/ranking_logic.dart
@@ -0,0 +1,76 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+
+import '../../core/data/models/drama.dart';
+import '../../core/data/models/home_feed.dart';
+
+/// Ranking boards backed by the feed sections the server already returns.
+enum RankingBoard { hot, newReleases }
+
+/// One ranked title; rank is one-based and mirrors server section order.
+class RankingEntry {
+  const RankingEntry({required this.rank, required this.drama});
+
+  final int rank;
+  final Drama drama;
+}
+
+/// Keeps the active board and turns real feed sections into ranked entries.
+///
+/// The backend does not expose a dedicated ranking endpoint, so this class
+/// never invents scores: it preserves the order of the `hot` and `new`
+/// sections and only falls back to the catalog when a section is absent.
+class RankingLogic extends ChangeNotifier {
+  RankingLogic({required this.sections, required this.fallback});
+
+  static const hotSectionCode = 'hot';
+  static const newSectionCode = 'new';
+
+  List<FeedSection> sections;
+  List<Drama> fallback;
+  RankingBoard _board = RankingBoard.hot;
+
+  RankingBoard get board => _board;
+
+  List<RankingEntry> get entries {
+    final sectionCode = _board == RankingBoard.hot
+        ? hotSectionCode
+        : newSectionCode;
+    final source = _sectionDramas(sectionCode);
+    final dramas = source.isEmpty ? fallback : source;
+    final seen = <String>{};
+    final unique = [
+      for (final drama in dramas)
+        if (seen.add(drama.id)) drama,
+    ];
+    return [
+      for (var index = 0; index < unique.length; index++)
+        RankingEntry(rank: index + 1, drama: unique[index]),
+    ];
+  }
+
+  /// Switches boards and notifies only when the visible source changes.
+  void select(RankingBoard next) {
+    if (_board == next) return;
+    _board = next;
+    notifyListeners();
+  }
+
+  /// Applies refreshed feed data without rebuilding the page state.
+  void updateSources({
+    required List<FeedSection> sections,
+    required List<Drama> fallback,
+  }) {
+    this.sections = sections;
+    this.fallback = fallback;
+    notifyListeners();
+  }
+
+  List<Drama> _sectionDramas(String code) {
+    for (final section in sections) {
+      if (section.code == code) return section.dramas;
+    }
+    return const [];
+  }
+}
diff --git a/lib/pages/discover/widgets/discover_header.dart b/lib/pages/discover/widgets/discover_header.dart
new file mode 100644
index 0000000..ab14549
--- /dev/null
+++ b/lib/pages/discover/widgets/discover_header.dart
@@ -0,0 +1,37 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/theme/app_dimens.dart';
+import 'discover_search_field.dart';
+
+/// 剧场页页头：整行搜索框（内嵌识剧入口）。
+class DiscoverHeader extends StatelessWidget {
+  const DiscoverHeader({
+    super.key,
+    required this.controller,
+    required this.focusNode,
+    required this.onChanged,
+    required this.loading,
+  });
+
+  final TextEditingController controller;
+  final FocusNode focusNode;
+  final ValueChanged<String> onChanged;
+  final bool loading;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: AppDimens.contentHeaderHeight,
+      child: Center(
+        child: DiscoverSearchField(
+          controller: controller,
+          focusNode: focusNode,
+          onChanged: onChanged,
+          loading: loading,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/discover/widgets/discover_search_field.dart b/lib/pages/discover/widgets/discover_search_field.dart
new file mode 100644
index 0000000..871548f
--- /dev/null
+++ b/lib/pages/discover/widgets/discover_search_field.dart
@@ -0,0 +1,185 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/theme/app_colors.dart';
+import '../../../l10n/app_localizations.dart';
+
+const double _searchHeight = 44;
+const double _searchRadius = 22;
+const double _searchPadding = 14;
+const double _iconSize = 18;
+const double _iconGap = 8;
+const double _trailingWidth = 42;
+const double _trailingGap = 6;
+const double _clearSize = 18;
+const double _clearIconSize = 12;
+const Duration _focusTransition = Duration(milliseconds: 160);
+
+/// 剧场顶部整行搜索框：浅灰胶囊，聚焦时变白并显示主题色描边。
+class DiscoverSearchField extends StatefulWidget {
+  const DiscoverSearchField({
+    super.key,
+    required this.controller,
+    required this.focusNode,
+    required this.onChanged,
+    required this.loading,
+    this.horizontalPadding = 14,
+  });
+
+  final TextEditingController controller;
+  final FocusNode focusNode;
+  final ValueChanged<String> onChanged;
+  final bool loading;
+  final double horizontalPadding;
+
+  @override
+  State<DiscoverSearchField> createState() => _DiscoverSearchFieldState();
+}
+
+class _DiscoverSearchFieldState extends State<DiscoverSearchField> {
+  bool _focused = false;
+
+  @override
+  void initState() {
+    super.initState();
+    widget.focusNode.addListener(_onFocusChanged);
+    widget.controller.addListener(_onTextChanged);
+  }
+
+  @override
+  void didUpdateWidget(covariant DiscoverSearchField oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.focusNode != widget.focusNode) {
+      oldWidget.focusNode.removeListener(_onFocusChanged);
+      widget.focusNode.addListener(_onFocusChanged);
+      _focused = widget.focusNode.hasFocus;
+    }
+    if (oldWidget.controller != widget.controller) {
+      oldWidget.controller.removeListener(_onTextChanged);
+      widget.controller.addListener(_onTextChanged);
+    }
+  }
+
+  @override
+  void dispose() {
+    widget.focusNode.removeListener(_onFocusChanged);
+    widget.controller.removeListener(_onTextChanged);
+    super.dispose();
+  }
+
+  void _onFocusChanged() {
+    final focused = widget.focusNode.hasFocus;
+    if (focused != _focused) setState(() => _focused = focused);
+  }
+
+  void _onTextChanged() {
+    if (mounted) setState(() {});
+  }
+
+  void _clear() {
+    widget.controller.clear();
+    widget.onChanged('');
+    widget.focusNode.requestFocus();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.symmetric(horizontal: widget.horizontalPadding),
+      child: AnimatedContainer(
+        key: const Key('discover-search-shell'),
+        duration: _focusTransition,
+        curve: Curves.easeOut,
+        height: _searchHeight,
+        padding: const EdgeInsets.symmetric(horizontal: _searchPadding),
+        decoration: BoxDecoration(
+          color: AppColors.card,
+          borderRadius: BorderRadius.circular(_searchRadius),
+          border: Border.all(
+            color: _focused ? AppColors.blue : Colors.transparent,
+          ),
+        ),
+        child: Row(
+          children: [
+            const Icon(
+              Icons.search_rounded,
+              color: AppColors.subtle,
+              size: _iconSize,
+            ),
+            const SizedBox(width: _iconGap),
+            Expanded(
+              child: TextField(
+                key: const Key('discover-search'),
+                controller: widget.controller,
+                focusNode: widget.focusNode,
+                onChanged: widget.onChanged,
+                onTapOutside: (_) => widget.focusNode.unfocus(),
+                textInputAction: TextInputAction.search,
+                textAlignVertical: TextAlignVertical.center,
+                style: const TextStyle(
+                  color: AppColors.onSurface,
+                  fontSize: 14,
+                ),
+                decoration: InputDecoration(
+                  isDense: true,
+                  hintText: AppLocalizations.of(context)!.searchDiscover,
+                  hintStyle: const TextStyle(
+                    color: AppColors.subtle,
+                    fontSize: 14,
+                  ),
+                  border: InputBorder.none,
+                  enabledBorder: InputBorder.none,
+                  focusedBorder: InputBorder.none,
+                  contentPadding: EdgeInsets.zero,
+                  suffixIcon: _trailing(),
+                  suffixIconConstraints: const BoxConstraints(
+                    minWidth: 0,
+                    minHeight: 0,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _trailing() {
+    final hasText = widget.controller.text.isNotEmpty;
+    return SizedBox(
+      width: _trailingWidth,
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.end,
+        children: [
+          if (widget.loading)
+            const SizedBox.square(
+              key: Key('discover-search-loading'),
+              dimension: _iconSize,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            ),
+          if (widget.loading && hasText) const SizedBox(width: _trailingGap),
+          if (hasText)
+            SizedBox.square(
+              key: const Key('discover-search-clear'),
+              dimension: _clearSize,
+              child: Material(
+                color: AppColors.raised,
+                shape: const CircleBorder(),
+                clipBehavior: Clip.antiAlias,
+                child: InkWell(
+                  onTap: _clear,
+                  child: const Icon(
+                    Icons.close_rounded,
+                    size: _clearIconSize,
+                    color: AppColors.muted,
+                  ),
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/discover/widgets/discover_search_results.dart b/lib/pages/discover/widgets/discover_search_results.dart
new file mode 100644
index 0000000..dfaa0d5
--- /dev/null
+++ b/lib/pages/discover/widgets/discover_search_results.dart
@@ -0,0 +1,65 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../core/formatting/error_text.dart';
+import '../../../core/widgets/empty_state.dart';
+import '../../../l10n/app_localizations.dart';
+import 'drama_grid.dart';
+
+/// 剧场搜索结果：加载、失败与空结果都留在同一页内。
+class DiscoverSearchResults extends StatelessWidget {
+  const DiscoverSearchResults({
+    super.key,
+    required this.loading,
+    required this.error,
+    required this.results,
+    required this.onRetry,
+    required this.onOpen,
+  });
+
+  final bool loading;
+  final String? error;
+  final List<Drama> results;
+  final VoidCallback onRetry;
+  final ValueChanged<Drama> onOpen;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Padding(
+      padding: const EdgeInsets.only(top: 12),
+      child: _content(l10n),
+    );
+  }
+
+  Widget _content(AppLocalizations l10n) {
+    if (loading) {
+      return const Padding(
+        padding: EdgeInsets.symmetric(vertical: 80),
+        child: Center(child: CircularProgressIndicator(strokeWidth: 2)),
+      );
+    }
+    final message = error;
+    if (message != null) {
+      return EmptyState(
+        key: const Key('discover-search-error'),
+        icon: Icons.cloud_off_rounded,
+        title: errorText(l10n, message, l10n.searchFailed),
+        actionLabel: l10n.retry,
+        actionKey: const Key('discover-search-retry'),
+        onAction: onRetry,
+      );
+    }
+    if (results.isEmpty) {
+      return EmptyState(
+        key: const Key('discover-search-empty'),
+        icon: Icons.search_off_rounded,
+        title: l10n.noSearchResults,
+        subtitle: l10n.emptyHint,
+      );
+    }
+    return DramaGrid(l10n: l10n, dramas: results, onOpen: onOpen);
+  }
+}
diff --git a/lib/pages/discover/widgets/drama_grid.dart b/lib/pages/discover/widgets/drama_grid.dart
new file mode 100644
index 0000000..b58d8cf
--- /dev/null
+++ b/lib/pages/discover/widgets/drama_grid.dart
@@ -0,0 +1,244 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/config/app_config.dart';
+import '../../../core/data/models/drama.dart';
+import '../../../core/formatting/count_format.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/theme/app_dimens.dart';
+import '../../../l10n/app_localizations.dart';
+
+const int _columns = 2;
+const double _columnGap = 8;
+const double _cardGap = 14;
+const double _gridHorizontalPadding = 12;
+const double _coverAspectRatio = 3 / 4;
+const double _coverRadius = 10;
+const double _titleGap = 8;
+const double _tagsGap = 6;
+const double _titleFontSize = 15;
+const double _tagChipRadius = 6;
+const double _tagChipFontSize = 11;
+const double _heatFontSize = 9;
+const double _heatIconSize = 11;
+const int _maxTags = 3;
+const Color _heatBackground = Color(0x99000000);
+const Color _tagChipBackground = Color(0xFFF4F1EE);
+final RegExp _tagSplitter = RegExp(r'[,/、·]');
+
+/// 剧场/分类页共用的双列剧目网格。
+class DramaGrid extends StatelessWidget {
+  const DramaGrid({
+    super.key,
+    required this.l10n,
+    required this.dramas,
+    required this.onOpen,
+  });
+
+  final AppLocalizations l10n;
+  final List<Drama> dramas;
+  final ValueChanged<Drama> onOpen;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      key: const Key('home-all-dramas-section'),
+      padding: const EdgeInsets.symmetric(horizontal: _gridHorizontalPadding),
+      child: Row(
+        key: const Key('home-all-dramas-grid'),
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(child: _column(0)),
+          const SizedBox(width: _columnGap),
+          Expanded(child: _column(1)),
+        ],
+      ),
+    );
+  }
+
+  Widget _column(int start) {
+    final children = <Widget>[];
+    for (var index = start; index < dramas.length; index += _columns) {
+      final drama = dramas[index];
+      children.add(
+        DramaGridCard(l10n: l10n, drama: drama, onTap: () => onOpen(drama)),
+      );
+      if (index + _columns < dramas.length) {
+        children.add(const SizedBox(height: _cardGap));
+      }
+    }
+    return Column(children: children);
+  }
+}
+
+/// 双列网格中的剧目卡片：海报 + 标题 + 题材标签。
+class DramaGridCard extends StatelessWidget {
+  const DramaGridCard({
+    super.key,
+    required this.l10n,
+    required this.drama,
+    required this.onTap,
+  });
+
+  final AppLocalizations l10n;
+  final Drama drama;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      key: Key('home-drama-card-${drama.id}'),
+      behavior: HitTestBehavior.opaque,
+      onTap: onTap,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _cover(),
+          const SizedBox(height: _titleGap),
+          _title(),
+          const SizedBox(height: _tagsGap),
+          _tags(),
+        ],
+      ),
+    );
+  }
+
+  Widget _cover() {
+    return ClipRRect(
+      key: Key('home-drama-cover-${drama.id}'),
+      borderRadius: BorderRadius.circular(_coverRadius),
+      child: AspectRatio(
+        aspectRatio: _coverAspectRatio,
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            _DiscoverCoverImage(path: drama.posterUrl),
+            Positioned(left: 8, bottom: 8, child: _heatBadge()),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _heatBadge() {
+    return Container(
+      key: Key('drama-heat-${drama.id}'),
+      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 3),
+      decoration: BoxDecoration(
+        color: _heatBackground,
+        borderRadius: BorderRadius.circular(AppDimens.pillRadius),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Icon(
+            Icons.local_fire_department_rounded,
+            color: AppColors.onPrimary,
+            size: _heatIconSize,
+          ),
+          const SizedBox(width: 2),
+          Text(
+            l10n.heatLabel(formatInteractionCount(drama.viewCount)),
+            style: const TextStyle(
+              color: AppColors.onPrimary,
+              fontSize: _heatFontSize,
+              fontWeight: FontWeight.w600,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _title() {
+    return Text(
+      drama.title,
+      key: Key('home-drama-title-${drama.id}'),
+      maxLines: 2,
+      overflow: TextOverflow.ellipsis,
+      style: const TextStyle(
+        color: AppColors.onSurface,
+        fontSize: _titleFontSize,
+        fontWeight: FontWeight.w700,
+        height: 1.25,
+      ),
+    );
+  }
+
+  Widget _tags() {
+    final tags = _tagValues();
+    if (tags.isEmpty) return const SizedBox.shrink();
+    return Wrap(
+      spacing: 6,
+      runSpacing: 4,
+      children: [
+        for (var index = 0; index < tags.length; index++)
+          Container(
+            key: Key('drama-tag-chip-${drama.id}-$index'),
+            padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+            decoration: BoxDecoration(
+              color: _tagChipBackground,
+              borderRadius: BorderRadius.circular(_tagChipRadius),
+            ),
+            child: Text(
+              tags[index],
+              style: const TextStyle(
+                color: AppColors.muted,
+                fontSize: _tagChipFontSize,
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+
+  List<String> _tagValues() {
+    final result = <String>[];
+    for (final value in [drama.genre, drama.category]) {
+      for (final part in value.split(_tagSplitter)) {
+        final tag = part.trim();
+        if (tag.isEmpty || result.contains(tag)) continue;
+        result.add(tag);
+        if (result.length == _maxTags) return result;
+      }
+    }
+    return result;
+  }
+}
+
+class _DiscoverCoverImage extends StatelessWidget {
+  const _DiscoverCoverImage({required this.path});
+
+  final String path;
+
+  @override
+  Widget build(BuildContext context) {
+    final url = AppConfig.mediaUrl(path);
+    if (url.isEmpty) return _placeholder();
+    return Image.network(
+      url,
+      width: double.infinity,
+      height: double.infinity,
+      fit: BoxFit.cover,
+      loadingBuilder: (context, child, progress) {
+        if (progress == null) return child;
+        return _placeholder();
+      },
+      errorBuilder: (_, _, _) => _placeholder(),
+    );
+  }
+
+  Widget _placeholder() {
+    return const ColoredBox(
+      color: AppColors.card,
+      child: Center(
+        child: Icon(
+          Icons.image_not_supported_outlined,
+          color: AppColors.muted,
+          size: 32,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/discover/widgets/feed_banner_carousel.dart b/lib/pages/discover/widgets/feed_banner_carousel.dart
new file mode 100644
index 0000000..b48cc83
--- /dev/null
+++ b/lib/pages/discover/widgets/feed_banner_carousel.dart
@@ -0,0 +1,305 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../core/data/models/home_feed.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/theme/app_dimens.dart';
+import '../../../core/widgets/remote_image.dart';
+import '../../../l10n/app_localizations.dart';
+
+const double _carouselHeight = 154;
+const double _indicatorHeight = 24;
+const double _dotSize = 6;
+const double _activeDotWidth = 18;
+const double _viewportFraction = 0.94;
+const Duration _autoAdvanceInterval = Duration(milliseconds: 4500);
+const Duration _pageTransition = Duration(milliseconds: 520);
+
+/// Auto-advancing, touch-pausable carousel for real `/app/home/feed` banners.
+class FeedBannerCarousel extends StatefulWidget {
+  const FeedBannerCarousel({
+    super.key,
+    required this.banners,
+    required this.onOpen,
+    this.active = true,
+    this.dramaFor,
+    this.flush = false,
+  });
+
+  final List<FeedBanner> banners;
+  final ValueChanged<FeedBanner> onOpen;
+  final bool active;
+  final Drama? Function(FeedBanner banner)? dramaFor;
+
+  /// 首页 hero 铺满屏幕并去掉圆角；发现页保持默认 false。
+  final bool flush;
+
+  @override
+  State<FeedBannerCarousel> createState() => _FeedBannerCarouselState();
+}
+
+class _FeedBannerCarouselState extends State<FeedBannerCarousel> {
+  late final PageController _controller;
+  Timer? _timer;
+  int _index = 0;
+  bool _pressed = false;
+  bool _tickerEnabled = true;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = PageController(
+      viewportFraction: widget.dramaFor == null ? _viewportFraction : 1,
+    );
+    WidgetsBinding.instance.addPostFrameCallback((_) => _syncTimer());
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    final enabled = TickerMode.valuesOf(context).enabled;
+    if (enabled != _tickerEnabled) {
+      _tickerEnabled = enabled;
+      _syncTimer();
+    }
+  }
+
+  @override
+  void didUpdateWidget(covariant FeedBannerCarousel oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.banners.length != widget.banners.length ||
+        oldWidget.active != widget.active) {
+      if (_index >= widget.banners.length) _index = 0;
+      _syncTimer();
+    }
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    _controller.dispose();
+    super.dispose();
+  }
+
+  void _syncTimer() {
+    _timer?.cancel();
+    _timer = null;
+    final canAdvance =
+        mounted &&
+        widget.active &&
+        _tickerEnabled &&
+        !_pressed &&
+        widget.banners.length > 1;
+    if (!canAdvance) return;
+    _timer = Timer.periodic(_autoAdvanceInterval, (_) => _advance());
+  }
+
+  void _advance() {
+    if (!_controller.hasClients || widget.banners.length < 2) return;
+    final next = (_index + 1) % widget.banners.length;
+    _controller.animateToPage(
+      next,
+      duration: _pageTransition,
+      curve: Curves.easeOutCubic,
+    );
+  }
+
+  void _pause() {
+    _pressed = true;
+    _timer?.cancel();
+  }
+
+  void _resume() {
+    _pressed = false;
+    _syncTimer();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.banners.isEmpty) return const SizedBox.shrink();
+    final hero = widget.dramaFor != null;
+    final height = hero ? AppDimens.heroBannerHeight : _carouselHeight;
+    final pages = PageView.builder(
+      controller: _controller,
+      itemCount: widget.banners.length,
+      onPageChanged: (value) => setState(() => _index = value),
+      itemBuilder: (context, index) => _bannerCard(index),
+    );
+    return Listener(
+      key: const Key('feed-banner-carousel'),
+      onPointerDown: (_) => _pause(),
+      onPointerUp: (_) => _resume(),
+      onPointerCancel: (_) => _resume(),
+      child: hero
+          ? SizedBox(
+              height: height,
+              child: Stack(
+                children: [
+                  Positioned.fill(child: pages),
+                  Positioned(
+                    left: 0,
+                    right: 0,
+                    bottom: AppDimens.spaceXs,
+                    child: SizedBox(
+                      height: _indicatorHeight,
+                      child: _indicator(context),
+                    ),
+                  ),
+                ],
+              ),
+            )
+          : Column(
+              children: [
+                SizedBox(height: height, child: pages),
+                SizedBox(height: _indicatorHeight, child: _indicator(context)),
+              ],
+            ),
+    );
+  }
+
+  Widget _bannerCard(int index) {
+    final banner = widget.banners[index];
+    final dramaId = banner.dramaId;
+    final drama = widget.dramaFor?.call(banner);
+    final radius = widget.flush
+        ? 0.0
+        : (drama == null
+              ? AppDimens.authCardRadius
+              : AppDimens.heroBannerRadius);
+    final borderRadius = BorderRadius.circular(radius);
+    final card = ClipRRect(
+      borderRadius: borderRadius,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          RemoteImage(banner.imageUrl, showFallbackIcon: true),
+          DecoratedBox(
+            decoration: BoxDecoration(
+              gradient: LinearGradient(
+                begin: Alignment.topCenter,
+                end: Alignment.bottomCenter,
+                colors: drama == null
+                    ? const [Color(0x00000000), Color(0x8A0B0C10)]
+                    : const [Color(0x00000000), Color(0xE6000000)],
+              ),
+            ),
+          ),
+          if (drama != null)
+            Positioned(
+              left: AppDimens.pageHorizontal,
+              right: _copyRightGap,
+              bottom: AppDimens.spaceXl + AppDimens.spaceSm,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(
+                    drama.title,
+                    key: Key('home-hero-title-$index'),
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                    style: const TextStyle(
+                      fontFamily: 'Outfit',
+                      color: AppColors.onSurface,
+                      fontSize: AppDimens.heroTitle,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                  const SizedBox(height: AppDimens.spaceXs),
+                  Text(
+                    drama.synopsis,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: const TextStyle(
+                      color: AppColors.muted,
+                      fontSize: AppDimens.heroSubtitle,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          if (dramaId != null && drama == null)
+            const Positioned(right: 14, bottom: 14, child: _PlayMark()),
+        ],
+      ),
+    );
+    final page = Padding(
+      padding: EdgeInsets.symmetric(horizontal: drama == null ? 5 : 0),
+      child: dramaId == null
+          ? card
+          : Material(
+              color: Colors.transparent,
+              borderRadius: borderRadius,
+              clipBehavior: Clip.antiAlias,
+              child: InkWell(
+                key: Key('feed-banner-$index'),
+                onTap: () => widget.onOpen(banner),
+                child: card,
+              ),
+            ),
+    );
+    return Semantics(container: true, button: dramaId != null, child: page);
+  }
+
+  Widget _indicator(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return ExcludeSemantics(
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          for (var index = 0; index < widget.banners.length; index++)
+            Semantics(
+              label: l10n.carouselSemantics(index + 1, widget.banners.length),
+              selected: index == _index,
+              child: AnimatedContainer(
+                duration: const Duration(milliseconds: 180),
+                curve: Curves.easeOut,
+                key: Key('feed-banner-dot-$index'),
+                width: index == _index ? _activeDotWidth : _dotSize,
+                height: _dotSize,
+                margin: const EdgeInsets.symmetric(horizontal: 3),
+                decoration: BoxDecoration(
+                  color: index == _index
+                      ? AppColors.onPrimary
+                      : AppColors.muted,
+                  borderRadius: BorderRadius.circular(_dotSize),
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+const double _copyRightGap = 64;
+
+class _PlayMark extends StatelessWidget {
+  const _PlayMark();
+
+  @override
+  Widget build(BuildContext context) => Container(
+    width: 38,
+    height: 38,
+    decoration: BoxDecoration(
+      color: AppColors.blue,
+      shape: BoxShape.circle,
+      boxShadow: [
+        BoxShadow(
+          color: AppColors.blue.withValues(alpha: 0.35),
+          blurRadius: 18,
+          offset: const Offset(0, 6),
+        ),
+      ],
+    ),
+    child: const Icon(
+      Icons.play_arrow_rounded,
+      color: AppColors.onPrimary,
+      size: 22,
+    ),
+  );
+}
diff --git a/lib/pages/discover/widgets/home_drama_grid.dart b/lib/pages/discover/widgets/home_drama_grid.dart
deleted file mode 100644
index d2bd04c..0000000
--- a/lib/pages/discover/widgets/home_drama_grid.dart
+++ /dev/null
@@ -1,219 +0,0 @@
-// Author: fruit.com.cn
-
-part of '../discover_view.dart';
-
-class _HomeDramaGrid extends StatelessWidget {
-  const _HomeDramaGrid({
-    required this.l10n,
-    required this.categories,
-    required this.dramas,
-    required this.searching,
-    required this.onOpen,
-  });
-
-  final AppLocalizations l10n;
-  final CategoryController categories;
-  final List<Drama> dramas;
-  final bool searching;
-  final ValueChanged<Drama> onOpen;
-
-  @override
-  Widget build(BuildContext context) {
-    if (categories.loading && categories.feed.sections.isEmpty) {
-      return const SliverFillRemaining(
-        hasScrollBody: false,
-        child: Center(child: CircularProgressIndicator(strokeWidth: 2)),
-      );
-    }
-    if (categories.error != null) {
-      return _fill(
-        EmptyState(
-          key: const Key('home-categories-error'),
-          icon: Icons.cloud_off_rounded,
-          title: l10n.categoriesError,
-          subtitle: l10n.emptyHint,
-          actionLabel: l10n.retry,
-          onAction: categories.load,
-        ),
-      );
-    }
-    if (dramas.isEmpty) {
-      return _fill(
-        EmptyState(
-          key: const Key('home-all-dramas-empty'),
-          icon: searching
-              ? Icons.search_off_rounded
-              : Icons.movie_filter_outlined,
-          title: searching
-              ? l10n.noSearchResults
-              : categories.selectedSectionMissing
-              ? l10n.noCategoryDramas
-              : l10n.noSearchResults,
-          subtitle: l10n.emptyHint,
-        ),
-      );
-    }
-    return SliverMainAxisGroup(
-      slivers: [
-        SliverToBoxAdapter(child: _masonry(dramas)),
-        const SliverToBoxAdapter(child: SizedBox(height: 24)),
-      ],
-    );
-  }
-
-  Widget _masonry(List<Drama> items) {
-    return Padding(
-      key: const Key('home-all-dramas-section'),
-      padding: const EdgeInsets.symmetric(horizontal: 14),
-      child: Row(
-        key: const Key('home-all-dramas-grid'),
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Expanded(child: _column(items, 0)),
-          const SizedBox(width: 10),
-          Expanded(child: _column(items, 1)),
-        ],
-      ),
-    );
-  }
-
-  Widget _column(List<Drama> items, int start) {
-    final children = <Widget>[];
-    for (var index = start; index < items.length; index += 2) {
-      children.add(
-        _HomeDramaCard(
-          l10n: l10n,
-          drama: items[index],
-          onTap: () => onOpen(items[index]),
-        ),
-      );
-      if (index + 2 < items.length) {
-        children.add(const SizedBox(height: 10));
-      }
-    }
-    return Column(children: children);
-  }
-
-  Widget _fill(Widget child) =>
-      SliverFillRemaining(hasScrollBody: false, child: child);
-}
-
-class _HomeDramaCard extends StatelessWidget {
-  const _HomeDramaCard({
-    required this.l10n,
-    required this.drama,
-    required this.onTap,
-  });
-
-  final AppLocalizations l10n;
-  final Drama drama;
-  final VoidCallback onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    final genre = drama.genre.isEmpty ? drama.category : drama.genre;
-    final free =
-        drama.freeEpisodes > 0 ||
-        drama.episodes.any((episode) => episode.isFree);
-    return InkWell(
-      key: Key('home-drama-card-${drama.id}'),
-      onTap: onTap,
-      borderRadius: BorderRadius.circular(10),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          ClipRRect(
-            key: Key('home-drama-cover-${drama.id}'),
-            borderRadius: BorderRadius.circular(10),
-            child: Stack(
-              children: [
-                _DiscoverCoverImage(path: drama.posterUrl),
-                if (free)
-                  Positioned(
-                    top: 6,
-                    left: 6,
-                    child: Container(
-                      padding: const EdgeInsets.symmetric(
-                        horizontal: 6,
-                        vertical: 2,
-                      ),
-                      decoration: BoxDecoration(
-                        color: AppColors.blue,
-                        borderRadius: BorderRadius.circular(6),
-                      ),
-                      child: Text(
-                        l10n.free,
-                        style: const TextStyle(
-                          color: AppColors.onPrimary,
-                          fontSize: 8,
-                          fontWeight: FontWeight.w800,
-                        ),
-                      ),
-                    ),
-                  ),
-              ],
-            ),
-          ),
-          const SizedBox(height: 5),
-          Text(
-            drama.title,
-            key: Key('home-drama-title-${drama.id}'),
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-            style: const TextStyle(
-              color: AppColors.onSurface,
-              fontSize: 11,
-              fontWeight: FontWeight.w800,
-            ),
-          ),
-          const SizedBox(height: 2),
-          Text(
-            genre.isEmpty ? l10n.videoPending : genre,
-            key: Key('home-drama-genre-${drama.id}'),
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-            style: const TextStyle(color: Color(0xFFBBBBBB), fontSize: 9),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _DiscoverCoverImage extends StatelessWidget {
-  const _DiscoverCoverImage({required this.path});
-
-  final String path;
-
-  @override
-  Widget build(BuildContext context) {
-    final url = AppConfig.mediaUrl(path);
-    if (url.isEmpty) return _placeholder();
-    return Image.network(
-      url,
-      width: double.infinity,
-      fit: BoxFit.fitWidth,
-      loadingBuilder: (context, child, progress) {
-        if (progress == null) return child;
-        return _placeholder();
-      },
-      errorBuilder: (_, _, _) => _placeholder(),
-    );
-  }
-
-  Widget _placeholder() {
-    return AspectRatio(
-      aspectRatio: 3 / 4,
-      child: ColoredBox(
-        color: AppColors.card,
-        child: const Center(
-          child: Icon(
-            Icons.image_not_supported_outlined,
-            color: AppColors.muted,
-            size: 32,
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/pages/downloads/downloads_page.dart b/lib/pages/downloads/downloads_page.dart
index ba7aff8..359c2a7 100644
--- a/lib/pages/downloads/downloads_page.dart
+++ b/lib/pages/downloads/downloads_page.dart
@@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
 
 import '../../core/data/models/download_license.dart';
 import '../../core/data/models/download_policy.dart';
+import '../../core/data/models/drama.dart';
 import '../../core/data/services/auth_controller.dart';
 import '../../core/data/services/download_controller.dart';
 import '../../core/formatting/error_text.dart';
@@ -15,9 +16,12 @@ import '../../core/platform/haptics.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
+import '../../core/widgets/app_pull_to_refresh.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/empty_state.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
 import '../../l10n/app_localizations.dart';
+import '../player/player_view.dart';
 import 'downloads_binding.dart';
 
 /// 下载授权与状态管理页；本批不落盘，只管理服务端授权。
@@ -52,21 +56,14 @@ class _DownloadsPageState extends State<DownloadsPage> {
     final l10n = AppLocalizations.of(context)!;
     final signedIn = context.watch<AuthController>().isSignedIn;
     return Theme(
-      data: AppTheme.dark(),
-      child: Scaffold(
-        key: const Key('downloads-page'),
-        backgroundColor: AppColors.ink,
-        appBar: AppBar(
-          backgroundColor: AppColors.ink,
-          foregroundColor: Colors.white,
-          title: Text(l10n.downloads),
-        ),
-        body: SafeArea(
-          top: false,
-          child: signedIn
-              ? _DownloadsBody(downloads: context.watch<DownloadController>())
-              : const AuthGatePanel(),
-        ),
+      data: AppTheme.light(),
+      child: PlainPageScaffold(
+        pageKey: const Key('downloads-page'),
+        backKey: const Key('downloads-back'),
+        title: l10n.downloads,
+        child: signedIn
+            ? _DownloadsBody(downloads: context.watch<DownloadController>())
+            : const AuthGatePanel(),
       ),
     );
   }
@@ -94,9 +91,10 @@ class _DownloadsBody extends StatelessWidget {
       );
     }
     final policy = downloads.policy!;
-    return RefreshIndicator(
+    return AppPullToRefresh(
       onRefresh: downloads.load,
       child: ListView(
+        physics: AppPullToRefresh.physics,
         padding: const EdgeInsets.fromLTRB(16, 10, 16, 28),
         children: [
           _PolicyPanel(downloads: downloads, policy: policy),
@@ -135,7 +133,12 @@ class _DownloadsBody extends StatelessWidget {
             for (final license in downloads.licenses) ...[
               _LicenseTile(
                 license: license,
+                downloads: downloads,
                 onRemove: () => _remove(context, license.episodeId),
+                onPlay: () => _playOffline(context, license),
+                onDownload: () => unawaited(
+                  downloads.startDownload(license.episodeId, license: license),
+                ),
               ),
               const SizedBox(height: 10),
             ],
@@ -144,6 +147,29 @@ class _DownloadsBody extends StatelessWidget {
     );
   }
 
+  void _playOffline(BuildContext context, DownloadLicense license) {
+    final drama = Drama(
+      id: license.dramaId,
+      title: license.dramaTitle,
+      synopsis: '',
+      posterUrl: '',
+      episodes: [
+        Episode(
+          id: license.episodeId,
+          number: license.episodeNo,
+          title: 'Episode ${license.episodeNo}',
+          isFree: true,
+        ),
+      ],
+    );
+    Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (_) =>
+            PlayerPage(drama: drama, initialIndex: 0, downloads: downloads),
+      ),
+    );
+  }
+
   Future<void> _remove(BuildContext context, String episodeId) async {
     unawaited(context.read<Haptics>().mediumImpact());
     final ok = await downloads.remove(episodeId);
@@ -302,14 +328,35 @@ class _PolicyPanel extends StatelessWidget {
 }
 
 class _LicenseTile extends StatelessWidget {
-  const _LicenseTile({required this.license, required this.onRemove});
+  const _LicenseTile({
+    required this.license,
+    required this.downloads,
+    required this.onRemove,
+    required this.onPlay,
+    required this.onDownload,
+  });
 
   final DownloadLicense license;
+  final DownloadController downloads;
   final VoidCallback onRemove;
+  final VoidCallback onPlay;
+  final VoidCallback onDownload;
 
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
+    final downloaded = downloads.isDownloaded(license.episodeId);
+    final downloading = downloads.isDownloading(license.episodeId);
+    final progress = downloaded
+        ? 1.0
+        : downloading
+        ? downloads.progressFor(license.episodeId)
+        : license.progressPercent / 100;
+    final taskStatus = downloaded
+        ? 'COMPLETED'
+        : downloading
+        ? 'DOWNLOADING'
+        : license.taskStatus;
     return Container(
       key: ValueKey('download-license-${license.episodeId}'),
       padding: const EdgeInsets.all(12),
@@ -335,6 +382,20 @@ class _LicenseTile extends StatelessWidget {
                 ),
               ),
               Text(l10n.episodeLabel(license.episodeNo)),
+              if (downloaded)
+                IconButton(
+                  key: ValueKey('download-play-${license.episodeId}'),
+                  tooltip: l10n.play,
+                  onPressed: onPlay,
+                  icon: const Icon(Icons.play_circle_outline_rounded),
+                )
+              else if (!downloading)
+                IconButton(
+                  key: ValueKey('download-start-${license.episodeId}'),
+                  tooltip: l10n.downloads,
+                  onPressed: onDownload,
+                  icon: const Icon(Icons.download_rounded),
+                ),
               IconButton(
                 key: ValueKey('download-remove-${license.episodeId}'),
                 tooltip: l10n.remove,
@@ -352,7 +413,7 @@ class _LicenseTile extends StatelessWidget {
                 style: const TextStyle(color: AppColors.blueSoft, fontSize: 12),
               ),
               Text(
-                l10n.downloadTaskStatus(license.taskStatus),
+                l10n.downloadTaskStatus(taskStatus),
                 style: const TextStyle(color: AppColors.muted, fontSize: 12),
               ),
               Text(
@@ -371,7 +432,7 @@ class _LicenseTile extends StatelessWidget {
             borderRadius: BorderRadius.circular(AppDimens.progressRadius),
             child: LinearProgressIndicator(
               minHeight: AppDimens.progressHeight,
-              value: (license.progressPercent / 100).clamp(0.0, 1.0),
+              value: progress.clamp(0.0, 1.0),
               backgroundColor: Colors.white24,
               valueColor: const AlwaysStoppedAnimation(AppColors.blueSoft),
             ),
diff --git a/lib/pages/drama_detail/drama_detail_logic.dart b/lib/pages/drama_detail/drama_detail_logic.dart
index 128dc7f..9dc74df 100644
--- a/lib/pages/drama_detail/drama_detail_logic.dart
+++ b/lib/pages/drama_detail/drama_detail_logic.dart
@@ -2,6 +2,7 @@
 
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
 import '../../core/data/models/watch_progress.dart';
@@ -9,6 +10,8 @@ import '../../core/data/remote/api_client.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
 import '../../core/data/repositories/playback_repository.dart';
 import '../../core/data/services/favorite_controller.dart';
+import '../../core/data/services/download_controller.dart';
+import '../../core/data/services/wallet_controller.dart';
 import '../player/player_view.dart';
 
 class DramaDetailLogic extends ChangeNotifier {
@@ -104,7 +107,12 @@ class DramaDetailLogic extends ChangeNotifier {
   Future<void> openPlayer(BuildContext context, int index) async {
     await Navigator.of(context).push(
       MaterialPageRoute<void>(
-        builder: (_) => PlayerPage(drama: drama, initialIndex: index),
+        builder: (_) => PlayerPage(
+          drama: drama,
+          initialIndex: index,
+          wallet: context.read<WalletController>(),
+          downloads: context.read<DownloadController>(),
+        ),
       ),
     );
     await loadContinue();
diff --git a/lib/pages/drama_detail/drama_detail_view.dart b/lib/pages/drama_detail/drama_detail_view.dart
index 952dda7..d3f0725 100644
--- a/lib/pages/drama_detail/drama_detail_view.dart
+++ b/lib/pages/drama_detail/drama_detail_view.dart
@@ -3,6 +3,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
@@ -16,22 +17,33 @@ import '../../core/formatting/error_text.dart';
 import '../../core/formatting/localized_content.dart';
 import '../../core/platform/haptics.dart';
 import '../../core/theme/app_colors.dart';
-import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/download_action.dart';
 import '../../core/widgets/empty_state.dart';
-import '../../core/widgets/remote_image.dart';
+import '../../core/widgets/subpage_header.dart';
 import '../../l10n/app_localizations.dart';
 import '../interaction/widgets/report_dialog.dart';
 import 'drama_detail_binding.dart';
 import 'drama_detail_logic.dart';
+import 'widgets/drama_detail_bottom_bar.dart';
+import 'widgets/drama_detail_header.dart';
+import 'widgets/drama_detail_sections.dart';
+import 'widgets/drama_episode_states.dart';
 
 const String _menuFavorite = 'favorite';
 const String _menuDownload = 'download';
 const String _menuShare = 'share';
 const String _menuReport = 'report';
+const int _maxTags = 4;
+const double _stateHeaderHeight = 52;
+const double _stateHeaderHorizontal = 14;
+const double _stateTitleGap = 12;
+const double _stateTitleSize = 18;
 
+final RegExp _tagSplitter = RegExp(r'[,/、·]');
+
+/// 短剧详情页：暖色主信息、简介、标签、选集和固定播放入口。
 class DramaDetailPage extends StatefulWidget {
   const DramaDetailPage({super.key, required this.drama});
 
@@ -72,53 +84,108 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Theme(
-      data: AppTheme.dark(),
-      child: ListenableBuilder(
-        listenable: logic,
-        builder: (context, _) => _page(context),
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      key: const Key('detail-system-overlay'),
+      value: SystemUiOverlayStyle.dark.copyWith(
+        statusBarColor: Colors.transparent,
+        systemNavigationBarColor: AppColors.ink,
+        systemNavigationBarDividerColor: Colors.transparent,
+        systemNavigationBarIconBrightness: Brightness.dark,
+        systemNavigationBarContrastEnforced: false,
+      ),
+      child: Theme(
+        data: AppTheme.light(),
+        child: ListenableBuilder(
+          listenable: logic,
+          builder: (context, _) => _page(context),
+        ),
       ),
     );
   }
 
   Widget _page(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    if (logic.loading) return _loading(l10n);
-    if (logic.failed) return _failed(l10n);
     final drama = logic.drama;
-    if (drama.episodes.isEmpty) return _empty(l10n, drama);
-
+    final hasCardContent =
+        drama.title.trim().isNotEmpty || drama.posterUrl.trim().isNotEmpty;
+    if (!hasCardContent && logic.loading) return _loading(l10n);
+    if (!hasCardContent && logic.failed) return _failed(l10n);
+    if (drama.episodes.isEmpty && !logic.loading && !logic.failed) {
+      return _empty(l10n, drama);
+    }
+    final saved = context.watch<FavoriteController>().isSaved(drama.id);
+    final continueIndex = logic.continueIndex;
+    final episodesReady = drama.detailLoaded && drama.episodes.isNotEmpty;
     return Scaffold(
       backgroundColor: AppColors.ink,
+      bottomNavigationBar: DramaDetailBottomBar(
+        l10n: l10n,
+        continueIndex: episodesReady ? continueIndex : null,
+        enabled: episodesReady,
+        onPlay: () => logic.openPlayer(context, continueIndex ?? 0),
+        resume: _resume(l10n),
+      ),
       body: CustomScrollView(
         key: const Key('detail-scroll'),
         slivers: [
-          SliverToBoxAdapter(child: _hero(context, l10n, drama)),
-          SliverToBoxAdapter(child: _content(context, l10n, drama)),
-          const SliverToBoxAdapter(child: SizedBox(height: 28)),
+          SliverToBoxAdapter(
+            child: DramaDetailHeader(
+              l10n: l10n,
+              drama: drama,
+              saved: saved,
+              actions: DramaDetailHeaderActions(
+                onBack: () => Navigator.of(context).maybePop(),
+                onShare: () => unawaited(_shareDrama(l10n, drama)),
+                onFavorite: () => unawaited(_toggleFavorite(l10n)),
+                moreMenu: _moreMenu(context, l10n, saved),
+              ),
+            ),
+          ),
+          SliverToBoxAdapter(
+            child: DramaStatsCard(l10n: l10n, drama: drama),
+          ),
+          SliverToBoxAdapter(
+            child: DramaSynopsisSection(
+              l10n: l10n,
+              synopsis: localizedDramaSynopsis(l10n, drama),
+            ),
+          ),
+          if (_tagValues(drama).isNotEmpty)
+            SliverToBoxAdapter(child: DramaTags(tags: _tagValues(drama))),
+          SliverToBoxAdapter(child: _episodes(l10n, drama, continueIndex)),
+          const SliverToBoxAdapter(child: SizedBox(height: 24)),
         ],
       ),
     );
   }
 
-  Widget _loading(AppLocalizations l10n) => Scaffold(
-    backgroundColor: AppColors.ink,
-    appBar: AppBar(
-      backgroundColor: AppColors.ink,
-      foregroundColor: AppColors.onPrimary,
-      title: Text(localizedDramaTitle(l10n, widget.drama)),
-    ),
-    body: const Center(child: CircularProgressIndicator()),
+  Widget _episodes(AppLocalizations l10n, Drama drama, int? continueIndex) {
+    if (!drama.detailLoaded && logic.failed) {
+      return DramaEpisodesLoadError(
+        l10n: l10n,
+        message: logic.failureMessage,
+        onRetry: _load,
+      );
+    }
+    if (!drama.detailLoaded && logic.loading && drama.episodes.isEmpty) {
+      return DramaEpisodesLoading(l10n: l10n, episodeCount: drama.episodeCount);
+    }
+    return DramaEpisodeGrid(
+      l10n: l10n,
+      drama: drama,
+      continueIndex: continueIndex,
+      onOpen: (index) => logic.openPlayer(context, index),
+    );
+  }
+
+  Widget _loading(AppLocalizations l10n) => _statePage(
+    localizedDramaTitle(l10n, widget.drama),
+    const Center(child: CircularProgressIndicator()),
   );
 
-  Widget _failed(AppLocalizations l10n) => Scaffold(
-    backgroundColor: AppColors.ink,
-    appBar: AppBar(
-      backgroundColor: AppColors.ink,
-      foregroundColor: AppColors.onPrimary,
-      title: Text(localizedDramaTitle(l10n, widget.drama)),
-    ),
-    body: Center(
+  Widget _failed(AppLocalizations l10n) => _statePage(
+    localizedDramaTitle(l10n, widget.drama),
+    Center(
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 32),
         child: Column(
@@ -137,14 +204,9 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
     ),
   );
 
-  Widget _empty(AppLocalizations l10n, Drama drama) => Scaffold(
-    backgroundColor: AppColors.ink,
-    appBar: AppBar(
-      backgroundColor: AppColors.ink,
-      foregroundColor: AppColors.onPrimary,
-      title: Text(localizedDramaTitle(l10n, drama)),
-    ),
-    body: EmptyState(
+  Widget _empty(AppLocalizations l10n, Drama drama) => _statePage(
+    localizedDramaTitle(l10n, drama),
+    EmptyState(
       key: const Key('drama-detail-empty'),
       icon: Icons.video_library_outlined,
       title: l10n.noEpisodesYet,
@@ -154,236 +216,85 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
     ),
   );
 
-  Widget _hero(BuildContext context, AppLocalizations l10n, Drama drama) {
-    return SizedBox(
-      key: const Key('detail-hero'),
-      height: 190,
-      child: Stack(
-        fit: StackFit.expand,
-        children: [
-          RemoteImage(
-            drama.posterUrl,
-            fit: BoxFit.cover,
-            showFallbackIcon: true,
-          ),
-          const DecoratedBox(
-            decoration: BoxDecoration(
-              gradient: LinearGradient(
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
-                colors: [Color(0x33000000), Color(0xCC0B0C10)],
-              ),
-            ),
-          ),
-          Positioned(
-            top: MediaQuery.paddingOf(context).top + 14,
-            left: 14,
-            child: _RoundAction(
-              key: const Key('detail-back'),
-              tooltip: MaterialLocalizations.of(context).backButtonTooltip,
-              icon: Icons.chevron_left_rounded,
-              onPressed: () => Navigator.of(context).maybePop(),
-            ),
-          ),
-          Positioned(
-            top: MediaQuery.paddingOf(context).top + 14,
-            right: 14,
-            child: _moreMenu(context, l10n),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _content(BuildContext context, AppLocalizations l10n, Drama drama) {
-    final continueIndex = logic.continueIndex;
-    return Padding(
-      padding: const EdgeInsets.fromLTRB(16, 14, 16, 0),
+  Widget _statePage(String title, Widget child) => Scaffold(
+    backgroundColor: AppColors.ink,
+    body: SafeArea(
       child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Text(
-            l10n.episodeCount(drama.episodeCount),
-            key: const Key('detail-episode-count'),
-            style: const TextStyle(
-              color: AppColors.secondary,
-              fontSize: 9,
-              fontWeight: FontWeight.w800,
-              letterSpacing: 1,
-            ),
-          ),
-          const SizedBox(height: 7),
-          Text(
-            localizedDramaTitle(l10n, drama),
-            key: const Key('detail-title'),
-            style: const TextStyle(
-              fontFamily: 'Outfit',
-              color: AppColors.onSurface,
-              fontSize: 18,
-              fontWeight: FontWeight.w800,
-              height: 1.2,
-            ),
-          ),
-          const SizedBox(height: 10),
-          Text(
-            localizedDramaSynopsis(l10n, drama),
-            key: const Key('detail-synopsis'),
-            style: const TextStyle(
-              color: AppColors.muted,
-              fontSize: 11,
-              height: 1.6,
-            ),
-          ),
-          const SizedBox(height: 12),
           SizedBox(
-            width: double.infinity,
-            height: 40,
-            child: FilledButton.icon(
-              key: const Key('detail-cta'),
-              onPressed: () => logic.openPlayer(context, continueIndex ?? 0),
-              style: FilledButton.styleFrom(
-                backgroundColor: AppColors.blue,
-                foregroundColor: AppColors.onPrimary,
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(AppDimens.buttonRadius),
-                ),
-                textStyle: const TextStyle(
-                  fontSize: 13,
-                  fontWeight: FontWeight.w700,
-                ),
+            height: _stateHeaderHeight,
+            child: Padding(
+              padding: const EdgeInsets.symmetric(
+                horizontal: _stateHeaderHorizontal,
               ),
-              icon: const Icon(Icons.play_arrow_rounded, size: 18),
-              label: Text(
-                continueIndex == null
-                    ? l10n.startWatching
-                    : l10n.continueEpisode(continueIndex + 1),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-              ),
-            ),
-          ),
-          if (_continueFraction != null) ...[
-            const SizedBox(height: 8),
-            _ResumeBar(
-              fraction: _continueFraction!,
-              label: l10n.resumeProgress(
-                _clock(logic.progress!.position),
-                _clock(logic.progress!.duration),
-              ),
-            ),
-          ],
-          if (logic.progressError != null) ...[
-            const SizedBox(height: 8),
-            Row(
-              children: [
-                Expanded(
-                  child: Text(
-                    errorText(l10n, logic.progressError, l10n.progressError),
-                    style: const TextStyle(
-                      color: AppColors.muted,
-                      fontSize: 11,
+              child: Row(
+                children: [
+                  const AppSubpageBackButton(
+                    backKey: Key('detail-back'),
+                    dark: true,
+                  ),
+                  const SizedBox(width: _stateTitleGap),
+                  Expanded(
+                    child: Text(
+                      title,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: const TextStyle(
+                        color: AppColors.onSurface,
+                        fontSize: _stateTitleSize,
+                        fontWeight: FontWeight.w800,
+                      ),
                     ),
                   ),
-                ),
-                TextButton(
-                  onPressed: () => unawaited(logic.loadContinue()),
-                  child: Text(l10n.retry),
-                ),
-              ],
-            ),
-          ],
-          const SizedBox(height: 18),
-          Text(
-            l10n.episodes,
-            style: const TextStyle(
-              fontFamily: 'Outfit',
-              color: AppColors.onSurface,
-              fontSize: 14,
-              fontWeight: FontWeight.w800,
+                ],
+              ),
             ),
           ),
-          const SizedBox(height: 8),
-          LayoutBuilder(
-            builder: (context, constraints) {
-              final sixColumnsWidth = (constraints.maxWidth - 5 * 8) / 6;
-              final columns = sixColumnsWidth >= 40 ? 6 : 5;
-              final selectedIndex = continueIndex ?? 0;
-              final selectedNumber = drama.episodes.isEmpty
-                  ? null
-                  : drama.episodes[selectedIndex].number;
-              final ordered = [
-                for (var index = 0; index < drama.episodes.length; index++)
-                  (index: index, episode: drama.episodes[index]),
-              ]..sort((a, b) => a.episode.number.compareTo(b.episode.number));
-              return GridView.builder(
-                key: const Key('detail-episode-chips'),
-                shrinkWrap: true,
-                physics: const NeverScrollableScrollPhysics(),
-                padding: EdgeInsets.zero,
-                itemCount: ordered.length,
-                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                  crossAxisCount: columns,
-                  mainAxisSpacing: 8,
-                  crossAxisSpacing: 8,
-                  childAspectRatio: 1.35,
-                ),
-                itemBuilder: (context, position) {
-                  final item = ordered[position];
-                  return _episodeChip(
-                    context,
-                    item.episode,
-                    item.index,
-                    selectedNumber,
-                  );
-                },
-              );
-            },
-          ),
+          Expanded(child: child),
         ],
       ),
-    );
-  }
+    ),
+  );
 
-  Widget _episodeChip(
-    BuildContext context,
-    Episode episode,
-    int index,
-    int? selectedNumber,
-  ) {
-    final selected = episode.number == selectedNumber;
-    final locked = episode.locked || (!episode.isFree && index > 0);
-    return InkWell(
-      key: Key('detail-episode-chip-${episode.number}'),
-      onTap: () => logic.openPlayer(context, index),
-      borderRadius: BorderRadius.circular(9),
-      child: Container(
-        alignment: Alignment.center,
-        decoration: BoxDecoration(
-          color: selected
-              ? AppColors.blue
-              : locked
-              ? AppColors.secondary.withValues(alpha: 0.16)
-              : const Color(0xFF29272B),
-          borderRadius: BorderRadius.circular(9),
-        ),
-        child: Text(
-          '${episode.number}',
-          style: TextStyle(
-            color: selected
-                ? AppColors.onPrimary
-                : locked
-                ? AppColors.secondary
-                : AppColors.muted,
-            fontSize: 11,
-            fontWeight: FontWeight.w700,
+  Widget? _resume(AppLocalizations l10n) {
+    final fraction = _continueFraction;
+    final progressError = logic.progressError;
+    if (fraction == null && progressError == null) return null;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (fraction != null)
+          DramaResumeBar(
+            fraction: fraction,
+            label: l10n.resumeProgress(
+              _clock(logic.progress!.position),
+              _clock(logic.progress!.duration),
+            ),
           ),
-        ),
-      ),
+        if (progressError != null) ...[
+          if (fraction != null) const SizedBox(height: 4),
+          Row(
+            children: [
+              Expanded(
+                child: Text(
+                  errorText(l10n, progressError, l10n.progressError),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(color: AppColors.muted, fontSize: 11),
+                ),
+              ),
+              TextButton(
+                onPressed: () => unawaited(logic.loadContinue()),
+                child: Text(l10n.retry),
+              ),
+            ],
+          ),
+        ],
+      ],
     );
   }
 
-  Widget _moreMenu(BuildContext context, AppLocalizations l10n) {
-    final saved = context.watch<FavoriteController>().isSaved(logic.drama.id);
+  Widget _moreMenu(BuildContext context, AppLocalizations l10n, bool saved) {
     return PopupMenuButton<String>(
       key: const Key('detail-more'),
       tooltip: l10n.more,
@@ -402,78 +313,60 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
       },
       itemBuilder: (_) => [
         PopupMenuItem(
-          key: const Key('detail-favorite'),
+          key: const Key('detail-menu-favorite'),
           value: _menuFavorite,
-          child: Row(
-            children: [
-              Icon(
-                saved ? Icons.star_rounded : Icons.star_border_rounded,
-                color: saved ? AppColors.blue : AppColors.muted,
-                size: 18,
-              ),
-              const SizedBox(width: 9),
-              Text(l10n.favorite),
-            ],
+          child: _menuItem(
+            saved ? Icons.star_rounded : Icons.star_border_rounded,
+            l10n.favorite,
+            saved ? AppColors.blue : AppColors.muted,
           ),
         ),
         PopupMenuItem(
           key: const Key('detail-download'),
           value: _menuDownload,
-          child: Row(
-            children: [
-              const Icon(
-                Icons.download_outlined,
-                color: AppColors.muted,
-                size: 18,
-              ),
-              const SizedBox(width: 9),
-              Text(l10n.downloads),
-            ],
+          child: _menuItem(
+            Icons.download_outlined,
+            l10n.downloads,
+            AppColors.muted,
           ),
         ),
         PopupMenuItem(
-          key: const Key('detail-share'),
+          key: const Key('detail-menu-share'),
           value: _menuShare,
-          child: Row(
-            children: [
-              const Icon(
-                Icons.share_outlined,
-                color: AppColors.muted,
-                size: 18,
-              ),
-              const SizedBox(width: 9),
-              Text(l10n.share),
-            ],
-          ),
+          child: _menuItem(Icons.share_outlined, l10n.share, AppColors.muted),
         ),
         PopupMenuItem(
           key: const Key('detail-report'),
           value: _menuReport,
-          child: Row(
-            children: [
-              const Icon(Icons.flag_outlined, color: AppColors.muted, size: 18),
-              const SizedBox(width: 9),
-              Text(l10n.reportDrama),
-            ],
+          child: _menuItem(
+            Icons.flag_outlined,
+            l10n.reportDrama,
+            AppColors.muted,
           ),
         ),
       ],
-      child: Container(
-        width: 36,
-        height: 36,
-        decoration: const BoxDecoration(
-          color: Color(0x80000000),
-          shape: BoxShape.circle,
-        ),
-        child: const Icon(
-          Icons.more_horiz_rounded,
-          size: 18,
-          color: AppColors.onSurface,
+      child: IgnorePointer(
+        child: AppSubpageCircleButton(
+          buttonKey: const Key('detail-more-visual'),
+          tooltip: l10n.more,
+          icon: Icons.more_horiz_rounded,
+          dark: true,
+          onPressed: () {},
         ),
       ),
     );
   }
 
+  Widget _menuItem(IconData icon, String label, Color color) {
+    return Row(
+      children: [
+        Icon(icon, color: color, size: 18),
+        const SizedBox(width: 9),
+        Text(label),
+      ],
+    );
+  }
+
   Future<void> _shareDrama(AppLocalizations l10n, Drama drama) async {
     try {
       await const PlatformShareService().shareDrama(
@@ -536,6 +429,23 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
     return record.fraction;
   }
 
+  List<String> _tagValues(Drama drama) {
+    final result = <String>[];
+    for (final source in [drama.category, drama.genre]) {
+      for (final part in source.split(_tagSplitter)) {
+        final value = part.trim();
+        if (value.isNotEmpty && !result.contains(value)) result.add(value);
+        if (result.length == _maxTags) return result;
+      }
+    }
+    final language = drama.language.trim();
+    if (language.isNotEmpty) {
+      final label = _languageNames[language.toLowerCase()] ?? language;
+      if (!result.contains(label)) result.add(label);
+    }
+    return result.take(_maxTags).toList();
+  }
+
   String _clock(Duration duration) {
     final minutes = duration.inMinutes.remainder(60).toString().padLeft(2, '0');
     final seconds = duration.inSeconds.remainder(60).toString().padLeft(2, '0');
@@ -545,65 +455,12 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
   }
 }
 
-class _RoundAction extends StatelessWidget {
-  const _RoundAction({
-    super.key,
-    required this.tooltip,
-    required this.icon,
-    required this.onPressed,
-  });
-
-  final String tooltip;
-  final IconData icon;
-  final VoidCallback? onPressed;
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      width: 36,
-      height: 36,
-      decoration: const BoxDecoration(
-        color: Color(0x80000000),
-        shape: BoxShape.circle,
-      ),
-      child: IconButton(
-        tooltip: tooltip.isEmpty ? null : tooltip,
-        onPressed: onPressed,
-        padding: EdgeInsets.zero,
-        icon: Icon(icon, size: 18, color: AppColors.onSurface),
-      ),
-    );
-  }
-}
-
-class _ResumeBar extends StatelessWidget {
-  const _ResumeBar({required this.fraction, this.label});
-
-  final double fraction;
-  final String? label;
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        ClipRRect(
-          borderRadius: BorderRadius.circular(2),
-          child: LinearProgressIndicator(
-            value: fraction,
-            minHeight: 3,
-            backgroundColor: const Color(0xFF474248),
-            valueColor: const AlwaysStoppedAnimation(AppColors.blue),
-          ),
-        ),
-        if (label != null) ...[
-          const SizedBox(height: 4),
-          Text(
-            label!,
-            style: const TextStyle(color: AppColors.muted, fontSize: 10),
-          ),
-        ],
-      ],
-    );
-  }
-}
+const Map<String, String> _languageNames = {
+  'zh': '简体中文',
+  'zh-cn': '简体中文',
+  'zh-hans': '简体中文',
+  'en': 'English',
+  'en-us': 'English',
+  'id': 'Bahasa Indonesia',
+  'id-id': 'Bahasa Indonesia',
+};
diff --git a/lib/pages/drama_detail/widgets/drama_detail_bottom_bar.dart b/lib/pages/drama_detail/widgets/drama_detail_bottom_bar.dart
new file mode 100644
index 0000000..e2852e2
--- /dev/null
+++ b/lib/pages/drama_detail/widgets/drama_detail_bottom_bar.dart
@@ -0,0 +1,113 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/theme/app_colors.dart';
+import '../../../l10n/app_localizations.dart';
+
+const double _ctaHeight = 46;
+const double _ctaRadius = 23;
+const double _horizontal = 14;
+
+/// 详情页固定底部按钮与可选续播信息。
+class DramaDetailBottomBar extends StatelessWidget {
+  const DramaDetailBottomBar({
+    super.key,
+    required this.l10n,
+    required this.continueIndex,
+    required this.onPlay,
+    required this.enabled,
+    this.resume,
+  });
+
+  final AppLocalizations l10n;
+  final int? continueIndex;
+  final VoidCallback onPlay;
+  final bool enabled;
+  final Widget? resume;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      key: const Key('detail-bottom-bar'),
+      decoration: const BoxDecoration(
+        color: AppColors.ink,
+        border: Border(top: BorderSide(color: AppColors.border)),
+      ),
+      child: SafeArea(
+        top: false,
+        minimum: const EdgeInsets.fromLTRB(_horizontal, 8, _horizontal, 12),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            if (resume != null) ...[resume!, const SizedBox(height: 8)],
+            SizedBox(
+              width: double.infinity,
+              height: _ctaHeight,
+              child: FilledButton.icon(
+                key: const Key('detail-cta'),
+                onPressed: enabled ? onPlay : null,
+                style: FilledButton.styleFrom(
+                  backgroundColor: AppColors.blue,
+                  foregroundColor: AppColors.onPrimary,
+                  disabledBackgroundColor: AppColors.raised,
+                  disabledForegroundColor: AppColors.muted,
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(_ctaRadius),
+                  ),
+                  textStyle: const TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.w800,
+                  ),
+                ),
+                icon: const Icon(Icons.play_arrow_rounded, size: 20),
+                label: Text(
+                  continueIndex == null
+                      ? l10n.startWatching
+                      : l10n.continueEpisode(continueIndex! + 1),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// 详情页续播进度条与可选时间说明。
+class DramaResumeBar extends StatelessWidget {
+  const DramaResumeBar({super.key, required this.fraction, this.label});
+
+  final double fraction;
+  final String? label;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        ClipRRect(
+          borderRadius: BorderRadius.circular(2),
+          child: LinearProgressIndicator(
+            value: fraction,
+            minHeight: 3,
+            backgroundColor: AppColors.border,
+            valueColor: const AlwaysStoppedAnimation(AppColors.blue),
+          ),
+        ),
+        if (label != null) ...[
+          const SizedBox(height: 3),
+          Text(
+            label!,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: const TextStyle(color: AppColors.muted, fontSize: 10),
+          ),
+        ],
+      ],
+    );
+  }
+}
diff --git a/lib/pages/drama_detail/widgets/drama_detail_header.dart b/lib/pages/drama_detail/widgets/drama_detail_header.dart
new file mode 100644
index 0000000..d1da929
--- /dev/null
+++ b/lib/pages/drama_detail/widgets/drama_detail_header.dart
@@ -0,0 +1,202 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../core/formatting/localized_content.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/widgets/remote_image.dart';
+import '../../../core/widgets/subpage_header.dart';
+import '../../../l10n/app_localizations.dart';
+
+const double _horizontal = 14;
+const double _topGap = 8;
+const double _posterWidth = 96;
+const double _posterHeight = 128;
+const double _posterRadius = 12;
+const double _infoGap = 14;
+const double _favoriteHeight = 34;
+const double _favoriteRadius = 17;
+const double _favoriteHorizontal = 12;
+
+/// 详情页顶部操作与短剧主信息所需的交互回调。
+class DramaDetailHeaderActions {
+  const DramaDetailHeaderActions({
+    required this.onBack,
+    required this.onShare,
+    required this.onFavorite,
+    required this.moreMenu,
+  });
+
+  final VoidCallback onBack;
+  final VoidCallback onShare;
+  final VoidCallback onFavorite;
+  final Widget moreMenu;
+}
+
+/// 详情页暖色渐变头部：操作行、封面、标题、集数与收藏按钮。
+class DramaDetailHeader extends StatelessWidget {
+  const DramaDetailHeader({
+    super.key,
+    required this.l10n,
+    required this.drama,
+    required this.saved,
+    required this.actions,
+  });
+
+  final AppLocalizations l10n;
+  final Drama drama;
+  final bool saved;
+  final DramaDetailHeaderActions actions;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      key: const Key('detail-hero'),
+      decoration: const BoxDecoration(
+        gradient: LinearGradient(
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+          colors: [AppColors.surfaceTop, AppColors.ink],
+        ),
+      ),
+      child: SafeArea(
+        bottom: false,
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(_horizontal, 8, _horizontal, 10),
+          child: Column(
+            children: [
+              _actions(context),
+              const SizedBox(height: _topGap),
+              _identity(context),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _actions(BuildContext context) {
+    return Row(
+      children: [
+        AppSubpageBackButton(
+          backKey: const Key('detail-back'),
+          dark: true,
+          onBack: actions.onBack,
+        ),
+        const Spacer(),
+        AppSubpageCircleButton(
+          buttonKey: const Key('detail-share'),
+          tooltip: l10n.share,
+          icon: Icons.share_outlined,
+          dark: true,
+          onPressed: actions.onShare,
+        ),
+        const SizedBox(width: 8),
+        actions.moreMenu,
+      ],
+    );
+  }
+
+  Widget _identity(BuildContext context) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Container(
+          key: const Key('detail-poster'),
+          width: _posterWidth,
+          height: _posterHeight,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(_posterRadius),
+            boxShadow: const [
+              BoxShadow(
+                color: AppColors.cardShadow,
+                blurRadius: 16,
+                offset: Offset(0, 5),
+              ),
+            ],
+          ),
+          child: ClipRRect(
+            borderRadius: BorderRadius.circular(_posterRadius),
+            child: RemoteImage(
+              drama.posterUrl,
+              fit: BoxFit.cover,
+              showFallbackIcon: true,
+              fallbackAspectRatio: 3 / 4,
+            ),
+          ),
+        ),
+        const SizedBox(width: _infoGap),
+        Expanded(
+          child: SizedBox(
+            height: _posterHeight,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  localizedDramaTitle(l10n, drama),
+                  key: const Key('detail-title'),
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: 20,
+                    fontWeight: FontWeight.w800,
+                    height: 1.2,
+                  ),
+                ),
+                const SizedBox(height: 6),
+                Text(
+                  l10n.episodeCountLabel(drama.episodeCount),
+                  key: const Key('detail-episode-count'),
+                  style: const TextStyle(
+                    color: AppColors.muted,
+                    fontSize: 12,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                const Spacer(),
+                _favoriteButton(),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _favoriteButton() {
+    return GestureDetector(
+      onTap: actions.onFavorite,
+      child: Container(
+        key: const Key('detail-favorite'),
+        height: _favoriteHeight,
+        padding: const EdgeInsets.symmetric(horizontal: _favoriteHorizontal),
+        decoration: BoxDecoration(
+          color: saved ? AppColors.blue : AppColors.card,
+          borderRadius: BorderRadius.circular(_favoriteRadius),
+          border: Border.all(color: saved ? AppColors.blue : AppColors.blue),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(
+              saved ? Icons.star_rounded : Icons.star_border_rounded,
+              size: 16,
+              color: saved ? AppColors.onPrimary : AppColors.blue,
+            ),
+            const SizedBox(width: 4),
+            Text(
+              l10n.favorite,
+              style: TextStyle(
+                color: saved ? AppColors.onPrimary : AppColors.blue,
+                fontSize: 12,
+                fontWeight: FontWeight.w700,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/drama_detail/widgets/drama_detail_sections.dart b/lib/pages/drama_detail/widgets/drama_detail_sections.dart
new file mode 100644
index 0000000..1b8981f
--- /dev/null
+++ b/lib/pages/drama_detail/widgets/drama_detail_sections.dart
@@ -0,0 +1,406 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../core/formatting/count_format.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../l10n/app_localizations.dart';
+
+const double _horizontal = 14;
+const double _sectionTop = 16;
+const double _statsVertical = 12;
+const double _statsRadius = 14;
+const double _dividerHeight = 28;
+const int _synopsisLines = 3;
+const int _gridColumns = 6;
+const double _gridSpacing = 8;
+const double _chipHeight = 44;
+const double _chipRadius = 10;
+const double _tagRadius = 999;
+const double _tagHorizontal = 8;
+const double _tagVertical = 4;
+const double _lockSize = 10;
+const TextStyle _synopsisStyle = TextStyle(
+  color: AppColors.muted,
+  fontSize: 13,
+  height: 1.5,
+);
+
+/// 详情页三项数据卡：热度、收藏与点赞，缺失值不做伪造。
+class DramaStatsCard extends StatelessWidget {
+  const DramaStatsCard({super.key, required this.l10n, required this.drama});
+
+  final AppLocalizations l10n;
+  final Drama drama;
+
+  @override
+  Widget build(BuildContext context) {
+    final favorite = drama.favoriteCount == null
+        ? l10n.episodeCountLabel(drama.episodeCount)
+        : '${formatInteractionCount(drama.favoriteCount!)} ${l10n.favorite}';
+    final like = drama.likeCount == null
+        ? '—'
+        : '${formatInteractionCount(drama.likeCount!)} ${l10n.like}';
+    return Container(
+      key: const Key('detail-stats'),
+      margin: const EdgeInsets.fromLTRB(
+        _horizontal,
+        _sectionTop,
+        _horizontal,
+        0,
+      ),
+      padding: const EdgeInsets.symmetric(vertical: _statsVertical),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(_statsRadius),
+      ),
+      child: Row(
+        children: [
+          Expanded(
+            child: _StatCell(
+              valueKey: const Key('detail-stat-heat-value'),
+              icon: Icons.local_fire_department_rounded,
+              color: AppColors.blue,
+              value: l10n.heatLabel(formatInteractionCount(drama.viewCount)),
+            ),
+          ),
+          const _StatDivider(),
+          Expanded(
+            child: _StatCell(
+              valueKey: const Key('detail-stat-favorite-value'),
+              icon: Icons.star_rounded,
+              color: AppColors.gold,
+              value: favorite,
+            ),
+          ),
+          const _StatDivider(),
+          Expanded(
+            child: _StatCell(
+              valueKey: const Key('detail-stat-like-value'),
+              icon: Icons.favorite_rounded,
+              color: AppColors.favorite,
+              value: like,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// 详情简介区：默认三行，超出时允许展开与收起。
+class DramaSynopsisSection extends StatefulWidget {
+  const DramaSynopsisSection({
+    super.key,
+    required this.l10n,
+    required this.synopsis,
+  });
+
+  final AppLocalizations l10n;
+  final String synopsis;
+
+  @override
+  State<DramaSynopsisSection> createState() => _DramaSynopsisSectionState();
+}
+
+class _DramaSynopsisSectionState extends State<DramaSynopsisSection> {
+  bool _expanded = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      key: const Key('detail-synopsis-section'),
+      padding: const EdgeInsets.fromLTRB(
+        _horizontal,
+        _sectionTop,
+        _horizontal,
+        0,
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            widget.l10n.synopsisTitle,
+            style: const TextStyle(
+              color: AppColors.onSurface,
+              fontSize: 14,
+              fontWeight: FontWeight.w800,
+            ),
+          ),
+          const SizedBox(height: 6),
+          LayoutBuilder(
+            builder: (context, constraints) => Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  widget.synopsis,
+                  key: const Key('detail-synopsis'),
+                  maxLines: _expanded ? null : _synopsisLines,
+                  overflow: _expanded
+                      ? TextOverflow.visible
+                      : TextOverflow.ellipsis,
+                  style: _synopsisStyle,
+                ),
+                if (_overflows(context, constraints.maxWidth))
+                  TextButton(
+                    key: const Key('detail-synopsis-toggle'),
+                    onPressed: () => setState(() => _expanded = !_expanded),
+                    style: TextButton.styleFrom(
+                      foregroundColor: AppColors.blue,
+                      minimumSize: const Size(44, 34),
+                      padding: EdgeInsets.zero,
+                      tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                    ),
+                    child: Text(
+                      _expanded
+                          ? widget.l10n.showLess
+                          : widget.l10n.expandSynopsis,
+                      style: const TextStyle(
+                        fontSize: 12,
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  bool _overflows(BuildContext context, double maxWidth) {
+    final painter = TextPainter(
+      text: TextSpan(text: widget.synopsis, style: _synopsisStyle),
+      maxLines: _synopsisLines,
+      textDirection: Directionality.of(context),
+      textScaler: MediaQuery.textScalerOf(context),
+    )..layout(maxWidth: maxWidth);
+    final result = painter.didExceedMaxLines;
+    painter.dispose();
+    return result;
+  }
+}
+
+/// 详情页分类、题材与语言标签，最多展示四个。
+class DramaTags extends StatelessWidget {
+  const DramaTags({super.key, required this.tags});
+
+  final List<String> tags;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(_horizontal, 12, _horizontal, 0),
+      child: Wrap(
+        key: const Key('detail-tags'),
+        spacing: 6,
+        runSpacing: 6,
+        children: [
+          for (final tag in tags)
+            Container(
+              padding: const EdgeInsets.symmetric(
+                horizontal: _tagHorizontal,
+                vertical: _tagVertical,
+              ),
+              decoration: BoxDecoration(
+                color: AppColors.badgeBeige,
+                borderRadius: BorderRadius.circular(_tagRadius),
+              ),
+              child: Text(
+                tag,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: AppColors.blue,
+                  fontSize: 12,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+/// 详情页选集网格：免费、锁定与当前集使用不同状态样式。
+class DramaEpisodeGrid extends StatelessWidget {
+  const DramaEpisodeGrid({
+    super.key,
+    required this.l10n,
+    required this.drama,
+    required this.continueIndex,
+    required this.onOpen,
+  });
+
+  final AppLocalizations l10n;
+  final Drama drama;
+  final int? continueIndex;
+  final ValueChanged<int> onOpen;
+
+  @override
+  Widget build(BuildContext context) {
+    final ordered = [
+      for (var index = 0; index < drama.episodes.length; index++)
+        (index: index, episode: drama.episodes[index]),
+    ]..sort((a, b) => a.episode.number.compareTo(b.episode.number));
+    final selectedIndex = (continueIndex ?? 0).clamp(
+      0,
+      drama.episodes.length - 1,
+    );
+    final selectedNumber = drama.episodes[selectedIndex].number;
+    return Padding(
+      key: const Key('detail-episodes-section'),
+      padding: const EdgeInsets.fromLTRB(
+        _horizontal,
+        _sectionTop,
+        _horizontal,
+        0,
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Text(
+                l10n.episodes,
+                style: const TextStyle(
+                  color: AppColors.onSurface,
+                  fontSize: 14,
+                  fontWeight: FontWeight.w800,
+                ),
+              ),
+              const Spacer(),
+              Text(
+                l10n.episodeCountLabel(drama.episodeCount),
+                style: const TextStyle(color: AppColors.muted, fontSize: 11),
+              ),
+            ],
+          ),
+          const SizedBox(height: 8),
+          GridView.builder(
+            key: const Key('detail-episode-chips'),
+            shrinkWrap: true,
+            physics: const NeverScrollableScrollPhysics(),
+            padding: EdgeInsets.zero,
+            itemCount: ordered.length,
+            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount: _gridColumns,
+              mainAxisSpacing: _gridSpacing,
+              crossAxisSpacing: _gridSpacing,
+              mainAxisExtent: _chipHeight,
+            ),
+            itemBuilder: (context, position) {
+              final item = ordered[position];
+              return _episodeChip(item.episode, item.index, selectedNumber);
+            },
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _episodeChip(Episode episode, int index, int selectedNumber) {
+    final selected = episode.number == selectedNumber;
+    final locked = episode.locked || (!episode.isFree && index > 0);
+    final background = selected
+        ? AppColors.blue
+        : locked
+        ? AppColors.raised
+        : AppColors.card;
+    final foreground = selected
+        ? AppColors.onPrimary
+        : locked
+        ? AppColors.muted
+        : AppColors.onSurface;
+    return Material(
+      key: Key('detail-episode-chip-${episode.number}'),
+      color: background,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(_chipRadius),
+        side: BorderSide(
+          color: selected || locked ? Colors.transparent : AppColors.border,
+        ),
+      ),
+      clipBehavior: Clip.antiAlias,
+      child: InkWell(
+        onTap: () => onOpen(index),
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            Center(
+              child: Text(
+                '${episode.number}',
+                style: TextStyle(
+                  color: foreground,
+                  fontSize: 12,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ),
+            if (locked)
+              Positioned(
+                top: 4,
+                right: 4,
+                child: Icon(
+                  Icons.lock_rounded,
+                  key: Key('detail-episode-lock-${episode.number}'),
+                  size: _lockSize,
+                  color: selected ? AppColors.onPrimary : AppColors.subtle,
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _StatCell extends StatelessWidget {
+  const _StatCell({
+    required this.valueKey,
+    required this.icon,
+    required this.color,
+    required this.value,
+  });
+
+  final Key valueKey;
+  final IconData icon;
+  final Color color;
+  final String value;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Icon(icon, size: 16, color: color),
+        const SizedBox(width: 4),
+        Flexible(
+          child: Text(
+            value,
+            key: valueKey,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: const TextStyle(
+              color: AppColors.onSurface,
+              fontSize: 12,
+              fontWeight: FontWeight.w800,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _StatDivider extends StatelessWidget {
+  const _StatDivider();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(width: 1, height: _dividerHeight, color: AppColors.border);
+  }
+}
diff --git a/lib/pages/drama_detail/widgets/drama_episode_states.dart b/lib/pages/drama_detail/widgets/drama_episode_states.dart
new file mode 100644
index 0000000..de7787d
--- /dev/null
+++ b/lib/pages/drama_detail/widgets/drama_episode_states.dart
@@ -0,0 +1,181 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/formatting/error_text.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../l10n/app_localizations.dart';
+
+const int _skeletonCount = 6;
+const int _gridColumns = 6;
+const double _gridSpacing = 8;
+const double _radius = 10;
+const double _horizontal = 14;
+const double _sectionTop = 16;
+const double _minOpacity = 0.45;
+const double _maxOpacity = 0.8;
+const Duration _breathDuration = Duration(milliseconds: 900);
+
+/// 详情接口返回前在选集区展示六个呼吸骨架格。
+class DramaEpisodesLoading extends StatefulWidget {
+  const DramaEpisodesLoading({
+    super.key,
+    required this.l10n,
+    required this.episodeCount,
+  });
+
+  final AppLocalizations l10n;
+  final int episodeCount;
+
+  @override
+  State<DramaEpisodesLoading> createState() => _DramaEpisodesLoadingState();
+}
+
+class _DramaEpisodesLoadingState extends State<DramaEpisodesLoading>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _controller;
+  late final Animation<double> _opacity;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(vsync: this, duration: _breathDuration)
+      ..repeat(reverse: true);
+    _opacity = Tween<double>(
+      begin: _minOpacity,
+      end: _maxOpacity,
+    ).animate(CurvedAnimation(parent: _controller, curve: Curves.easeInOut));
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      key: const Key('detail-episodes-section'),
+      padding: const EdgeInsets.fromLTRB(
+        _horizontal,
+        _sectionTop,
+        _horizontal,
+        0,
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              _SectionTitle(title: widget.l10n.episodes),
+              const Spacer(),
+              if (widget.episodeCount > 0)
+                Text(
+                  widget.l10n.episodeCountLabel(widget.episodeCount),
+                  style: const TextStyle(color: AppColors.muted, fontSize: 11),
+                ),
+            ],
+          ),
+          const SizedBox(height: 8),
+          GridView.builder(
+            key: const Key('detail-episodes-loading'),
+            shrinkWrap: true,
+            physics: const NeverScrollableScrollPhysics(),
+            padding: EdgeInsets.zero,
+            itemCount: _skeletonCount,
+            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount: _gridColumns,
+              mainAxisSpacing: _gridSpacing,
+              crossAxisSpacing: _gridSpacing,
+            ),
+            itemBuilder: (context, index) => FadeTransition(
+              opacity: _opacity,
+              child: Container(
+                decoration: BoxDecoration(
+                  color: AppColors.raised,
+                  borderRadius: BorderRadius.circular(_radius),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// 详情接口失败时只替换选集区，保留上方卡片与简介。
+class DramaEpisodesLoadError extends StatelessWidget {
+  const DramaEpisodesLoadError({
+    super.key,
+    required this.l10n,
+    required this.message,
+    required this.onRetry,
+  });
+
+  final AppLocalizations l10n;
+  final String? message;
+  final VoidCallback onRetry;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      key: const Key('detail-episodes-section'),
+      padding: const EdgeInsets.fromLTRB(
+        _horizontal,
+        _sectionTop,
+        _horizontal,
+        0,
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _SectionTitle(title: l10n.episodes),
+          const SizedBox(height: 8),
+          Container(
+            width: double.infinity,
+            padding: const EdgeInsets.all(16),
+            decoration: BoxDecoration(
+              color: AppColors.card,
+              borderRadius: BorderRadius.circular(14),
+            ),
+            child: Column(
+              children: [
+                Text(
+                  errorText(l10n, message, l10n.detailError),
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(color: AppColors.muted, fontSize: 13),
+                ),
+                const SizedBox(height: 10),
+                TextButton(
+                  key: const Key('detail-episodes-retry'),
+                  onPressed: onRetry,
+                  child: Text(l10n.retry),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _SectionTitle extends StatelessWidget {
+  const _SectionTitle({required this.title});
+
+  final String title;
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      title,
+      style: const TextStyle(
+        color: AppColors.onSurface,
+        fontSize: 14,
+        fontWeight: FontWeight.w800,
+      ),
+    );
+  }
+}
diff --git a/lib/pages/favorites/favorites_page.dart b/lib/pages/favorites/favorites_page.dart
index d1626fb..2676569 100644
--- a/lib/pages/favorites/favorites_page.dart
+++ b/lib/pages/favorites/favorites_page.dart
@@ -8,17 +8,36 @@ import 'package:provider/provider.dart';
 import '../../core/data/models/drama.dart';
 import '../../core/data/services/auth_controller.dart';
 import '../../core/data/services/favorite_controller.dart';
+import '../../core/formatting/count_format.dart';
 import '../../core/formatting/error_text.dart';
 import '../../core/platform/haptics.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_theme.dart';
+import '../../core/widgets/app_pull_to_refresh.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/empty_state.dart';
-import '../../core/widgets/library_drama_tile.dart';
+import '../../core/widgets/remote_image.dart';
+import '../../core/widgets/subpage_header.dart';
 import '../../l10n/app_localizations.dart';
 import '../drama_detail/drama_detail_view.dart';
 import 'favorites_binding.dart';
 
+const double _pageHorizontal = 14;
+const double _cardRadius = 14;
+const double _cardPadding = 10;
+const double _coverWidth = 80;
+const double _coverHeight = 106;
+const double _coverRadius = 10;
+const double _removeSize = 28;
+const double _removeIconSize = 20;
+const double _statsFontSize = 12;
+const double _metaFontSize = 11;
+const double _titleFontSize = 15;
+const int _maxTags = 2;
+const double _emptyListHeight = 360;
+
+final RegExp _tagSplitter = RegExp(r'[,/、·]');
+
 /// 独立我的收藏页。
 class FavoritesPage extends StatefulWidget {
   const FavoritesPage({super.key});
@@ -51,19 +70,26 @@ class _FavoritesPageState extends State<FavoritesPage> {
     final l10n = AppLocalizations.of(context)!;
     final signedIn = context.watch<AuthController>().isSignedIn;
     return Theme(
-      data: AppTheme.dark(),
+      data: AppTheme.light(),
       child: Scaffold(
+        key: const Key('favorites-page'),
         backgroundColor: AppColors.ink,
-        appBar: AppBar(
-          backgroundColor: AppColors.ink,
-          foregroundColor: Colors.white,
-          title: Text(l10n.myFavorites),
-        ),
         body: SafeArea(
-          top: false,
-          child: signedIn
-              ? _FavoritesBody(favorites: context.watch<FavoriteController>())
-              : const AuthGatePanel(),
+          child: Column(
+            children: [
+              AppSubpageHeader(
+                title: l10n.myFavorites,
+                backKey: const Key('favorites-back'),
+              ),
+              Expanded(
+                child: signedIn
+                    ? _FavoritesBody(
+                        favorites: context.watch<FavoriteController>(),
+                      )
+                    : const AuthGatePanel(),
+              ),
+            ],
+          ),
         ),
       ),
     );
@@ -79,49 +105,90 @@ class _FavoritesBody extends StatelessWidget {
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     if (favorites.loading && favorites.cards.isEmpty) {
-      return const Center(child: CircularProgressIndicator());
+      return const Center(
+        child: CircularProgressIndicator(key: Key('favorites-loading')),
+      );
     }
     if (favorites.error != null && favorites.cards.isEmpty) {
-      return EmptyState(
-        key: const Key('favorites-error'),
-        icon: Icons.cloud_off_rounded,
-        title: errorText(l10n, favorites.error, l10n.favoritesError),
-        actionLabel: l10n.retry,
-        actionKey: const Key('favorites-retry'),
-        onAction: () => unawaited(favorites.load()),
+      return _refreshable(
+        favorites,
+        children: [
+          SizedBox(
+            height: _emptyListHeight,
+            child: EmptyState(
+              key: const Key('favorites-error'),
+              icon: Icons.cloud_off_rounded,
+              title: errorText(l10n, favorites.error, l10n.favoritesError),
+              actionLabel: l10n.retry,
+              actionKey: const Key('favorites-retry'),
+              onAction: () => unawaited(favorites.load()),
+            ),
+          ),
+        ],
       );
     }
     if (favorites.cards.isEmpty) {
-      return EmptyState(
-        key: const Key('favorites-empty'),
-        icon: Icons.favorite_border_rounded,
-        title: l10n.noFavorites,
-        subtitle: l10n.emptyHint,
+      return _refreshable(
+        favorites,
+        children: [
+          SizedBox(
+            height: _emptyListHeight,
+            child: EmptyState(
+              key: const Key('favorites-empty'),
+              icon: Icons.star_border_rounded,
+              title: l10n.noFavorites,
+              subtitle: l10n.emptyHint,
+            ),
+          ),
+        ],
       );
     }
-    return RefreshIndicator(
-      onRefresh: favorites.load,
-      child: ListView.separated(
-        padding: const EdgeInsets.fromLTRB(16, 12, 16, 28),
-        itemCount: favorites.cards.length,
-        separatorBuilder: (_, _) => const SizedBox(height: 10),
-        itemBuilder: (context, index) {
-          final drama = favorites.cards[index];
-          return LibraryDramaTile(
-            key: ValueKey('favorite-card-${drama.id}'),
+    return _refreshable(
+      favorites,
+      children: [
+        _summary(l10n),
+        for (final (index, drama) in favorites.cards.indexed) ...[
+          if (index > 0) const SizedBox(height: 10),
+          _FavoriteCard(
             drama: drama,
-            onTap: () => _open(context, drama),
-            trailing: IconButton(
-              key: ValueKey('favorite-remove-${drama.id}'),
-              tooltip: l10n.remove,
-              onPressed: () => _remove(context, drama.id),
-              icon: const Icon(
-                Icons.favorite_rounded,
-                color: AppColors.favorite,
-              ),
-            ),
-          );
-        },
+            isFavorite: favorites.isSaved(drama.id),
+            onOpen: () => _open(context, drama),
+            onRemove: () => _remove(context, drama.id),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget _refreshable(
+    FavoriteController favorites, {
+    required List<Widget> children,
+  }) {
+    return AppPullToRefresh(
+      onRefresh: favorites.load,
+      child: ListView(
+        physics: AppPullToRefresh.physics,
+        padding: const EdgeInsets.fromLTRB(
+          _pageHorizontal,
+          4,
+          _pageHorizontal,
+          28,
+        ),
+        children: children,
+      ),
+    );
+  }
+
+  Widget _summary(AppLocalizations l10n) {
+    return Align(
+      alignment: Alignment.centerLeft,
+      child: Text(
+        l10n.favoritesCount(favorites.cards.length),
+        key: const Key('favorites-count'),
+        style: const TextStyle(
+          color: AppColors.muted,
+          fontSize: _statsFontSize,
+        ),
       ),
     );
   }
@@ -142,3 +209,192 @@ class _FavoritesBody extends StatelessWidget {
     ).showSnackBar(SnackBar(content: Text(l10n.favoriteToggleFailed)));
   }
 }
+
+class _FavoriteCard extends StatelessWidget {
+  const _FavoriteCard({
+    required this.drama,
+    required this.isFavorite,
+    required this.onOpen,
+    required this.onRemove,
+  });
+
+  final Drama drama;
+  final bool isFavorite;
+  final VoidCallback onOpen;
+  final VoidCallback onRemove;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final tags = _tags();
+    return Container(
+      key: ValueKey('favorite-card-${drama.id}'),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(_cardRadius),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(_cardRadius),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          onTap: onOpen,
+          child: Padding(
+            padding: const EdgeInsets.all(_cardPadding),
+            child: Stack(
+              children: [
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    ClipRRect(
+                      borderRadius: BorderRadius.circular(_coverRadius),
+                      child: RemoteImage(
+                        drama.posterUrl,
+                        key: ValueKey('favorite-cover-${drama.id}'),
+                        width: _coverWidth,
+                        height: _coverHeight,
+                      ),
+                    ),
+                    const SizedBox(width: 12),
+                    Expanded(
+                      child: Padding(
+                        padding: const EdgeInsets.only(
+                          right: _removeSize,
+                          top: 2,
+                        ),
+                        child: SizedBox(
+                          height: _coverHeight,
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                drama.title,
+                                key: ValueKey('favorite-title-${drama.id}'),
+                                maxLines: 2,
+                                overflow: TextOverflow.ellipsis,
+                                style: const TextStyle(
+                                  color: AppColors.onSurface,
+                                  fontSize: _titleFontSize,
+                                  fontWeight: FontWeight.w700,
+                                ),
+                              ),
+                              const SizedBox(height: 6),
+                              if (tags.isNotEmpty)
+                                SizedBox(
+                                  height: 20,
+                                  child: SingleChildScrollView(
+                                    scrollDirection: Axis.horizontal,
+                                    physics:
+                                        const NeverScrollableScrollPhysics(),
+                                    child: Row(
+                                      children: [
+                                        for (final tag in tags)
+                                          Padding(
+                                            padding: const EdgeInsets.only(
+                                              right: 5,
+                                            ),
+                                            child: Container(
+                                              padding:
+                                                  const EdgeInsets.symmetric(
+                                                    horizontal: 6,
+                                                    vertical: 2,
+                                                  ),
+                                              decoration: BoxDecoration(
+                                                color: AppColors.raised,
+                                                borderRadius:
+                                                    BorderRadius.circular(6),
+                                              ),
+                                              child: Text(
+                                                tag,
+                                                maxLines: 1,
+                                                overflow: TextOverflow.ellipsis,
+                                                style: const TextStyle(
+                                                  color: AppColors.muted,
+                                                  fontSize: _metaFontSize,
+                                                ),
+                                              ),
+                                            ),
+                                          ),
+                                      ],
+                                    ),
+                                  ),
+                                ),
+                              const Spacer(),
+                              Row(
+                                children: [
+                                  const Icon(
+                                    Icons.local_fire_department_rounded,
+                                    color: AppColors.blue,
+                                    size: 13,
+                                  ),
+                                  const SizedBox(width: 3),
+                                  Text(
+                                    formatInteractionCount(drama.viewCount),
+                                    style: const TextStyle(
+                                      color: AppColors.muted,
+                                      fontSize: _metaFontSize,
+                                    ),
+                                  ),
+                                  const Spacer(),
+                                  Text(
+                                    l10n.episodeCountLabel(drama.episodeCount),
+                                    style: const TextStyle(
+                                      color: AppColors.muted,
+                                      fontSize: _metaFontSize,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+                Positioned(
+                  top: 0,
+                  right: 0,
+                  child: SizedBox.square(
+                    dimension: _removeSize,
+                    child: Material(
+                      color: AppColors.raised,
+                      shape: const CircleBorder(),
+                      clipBehavior: Clip.antiAlias,
+                      child: IconButton(
+                        key: ValueKey('favorite-remove-${drama.id}'),
+                        tooltip: l10n.remove,
+                        padding: EdgeInsets.zero,
+                        onPressed: onRemove,
+                        icon: Icon(
+                          isFavorite
+                              ? Icons.star_rounded
+                              : Icons.star_border_rounded,
+                          color: isFavorite ? AppColors.blue : AppColors.muted,
+                          size: _removeIconSize,
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  List<String> _tags() {
+    final values = <String>[];
+    for (final source in [drama.genre, drama.category]) {
+      for (final part in source.split(_tagSplitter)) {
+        final value = part.trim();
+        if (value.isNotEmpty && !values.contains(value)) values.add(value);
+        if (values.length == _maxTags) return values;
+      }
+    }
+    return values;
+  }
+}
diff --git a/lib/pages/filter/filter_page.dart b/lib/pages/filter/filter_page.dart
new file mode 100644
index 0000000..2def7eb
--- /dev/null
+++ b/lib/pages/filter/filter_page.dart
@@ -0,0 +1,429 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/models/drama.dart';
+import '../../core/data/services/catalog_controller.dart';
+import '../../core/data/services/category_controller.dart';
+import '../../core/theme/app_colors.dart';
+import '../../core/widgets/empty_state.dart';
+import '../../core/widgets/subpage_header.dart';
+import '../../l10n/app_localizations.dart';
+import 'widgets/filter_result_card.dart';
+
+const String _allValue = '__all__';
+const double _pageHorizontal = 14;
+const double _groupHorizontal = 12;
+const double _groupVertical = 9;
+const double _labelWidth = 84;
+const double _groupGap = 10;
+const double _optionHorizontal = 5;
+const double _optionVertical = 5;
+const double _optionRunGap = 4;
+const double _cardGap = 14;
+const double _gridAspectRatio = 0.56;
+const double _groupFontSize = 13;
+const double _labelFontSize = 12;
+
+final RegExp _tagSplitter = RegExp(r'[,/、·]');
+
+/// 剧场筛选页：分组条件实时过滤三列短剧结果。
+class FilterPage extends StatefulWidget {
+  const FilterPage({super.key});
+
+  @override
+  State<FilterPage> createState() => _FilterPageState();
+}
+
+class _FilterPageState extends State<FilterPage> {
+  bool _expanded = false;
+  String _category = _allValue;
+  String _theme = _allValue;
+  String _language = _allValue;
+  _SortMode _sort = _SortMode.recommended;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final categories = context.watch<CategoryController>();
+    final catalog = context.watch<CatalogController>();
+    final categoryOptions = _uniqueValues(
+      categories.categories.map((category) => category.name),
+    );
+    final themeOptions = _uniqueValues(catalog.dramas.expand(_themeValues));
+    final languageOptions = _uniqueValues(
+      catalog.dramas.map((drama) => drama.language),
+    );
+    final results = _filtered(catalog.dramas);
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      value: SystemUiOverlayStyle.dark,
+      child: Scaffold(
+        key: const Key('filter-page'),
+        backgroundColor: AppColors.ink,
+        body: SafeArea(
+          child: Column(
+            children: [
+              AppSubpageHeader(
+                title: l10n.filter,
+                backKey: const Key('filter-back'),
+              ),
+              Expanded(
+                child: CustomScrollView(
+                  slivers: [
+                    SliverToBoxAdapter(
+                      child: _groups(
+                        l10n,
+                        categoryOptions,
+                        themeOptions,
+                        languageOptions,
+                      ),
+                    ),
+                    if (results.isEmpty)
+                      SliverFillRemaining(
+                        hasScrollBody: false,
+                        child: EmptyState(
+                          key: const Key('filter-empty'),
+                          icon: Icons.movie_filter_outlined,
+                          title: l10n.filterEmpty,
+                          subtitle: l10n.emptyHint,
+                        ),
+                      )
+                    else
+                      SliverPadding(
+                        key: const Key('filter-results'),
+                        padding: const EdgeInsets.fromLTRB(
+                          _pageHorizontal,
+                          10,
+                          _pageHorizontal,
+                          24,
+                        ),
+                        sliver: SliverGrid(
+                          gridDelegate:
+                              const SliverGridDelegateWithFixedCrossAxisCount(
+                                crossAxisCount: 3,
+                                crossAxisSpacing: _cardGap,
+                                mainAxisSpacing: _cardGap,
+                                childAspectRatio: _gridAspectRatio,
+                              ),
+                          delegate: SliverChildBuilderDelegate(
+                            (context, index) => FilterResultCard(
+                              drama: results[index],
+                              l10n: l10n,
+                              categoryLabel: _metaCategory(results[index]),
+                            ),
+                            childCount: results.length,
+                          ),
+                        ),
+                      ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _groups(
+    AppLocalizations l10n,
+    List<String> categories,
+    List<String> themes,
+    List<String> languages,
+  ) {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(
+        _pageHorizontal,
+        2,
+        _pageHorizontal,
+        0,
+      ),
+      child: Column(
+        key: const Key('filter-groups'),
+        children: [
+          _group(
+            group: _FilterGroup.category,
+            label: _selectedLabel(_category, l10n.filterGroupCategory),
+            values: categories,
+            selected: _category,
+            onSelected: (value) => setState(() => _category = value),
+            allLabel: l10n.filterAll,
+          ),
+          _group(
+            group: _FilterGroup.theme,
+            label: _selectedLabel(_theme, l10n.filterGroupTheme),
+            values: themes,
+            selected: _theme,
+            onSelected: (value) => setState(() => _theme = value),
+            allLabel: l10n.filterAll,
+          ),
+          AnimatedSize(
+            duration: const Duration(milliseconds: 200),
+            curve: Curves.easeOutCubic,
+            alignment: Alignment.topCenter,
+            child: _expanded
+                ? Column(
+                    children: [
+                      _group(
+                        group: _FilterGroup.language,
+                        label: _languageLabel(_language, l10n),
+                        values: languages,
+                        selected: _language,
+                        onSelected: (value) =>
+                            setState(() => _language = value),
+                        allLabel: l10n.filterAll,
+                        optionLabel: (value) => _languageLabel(value, l10n),
+                      ),
+                      _group(
+                        group: _FilterGroup.sort,
+                        label: _sortLabel(_sort, l10n),
+                        values: const ['newest', 'hottest'],
+                        selected: switch (_sort) {
+                          _SortMode.recommended => _allValue,
+                          _SortMode.newest => 'newest',
+                          _SortMode.hottest => 'hottest',
+                        },
+                        onSelected: (value) => setState(() {
+                          _sort = switch (value) {
+                            'newest' => _SortMode.newest,
+                            'hottest' => _SortMode.hottest,
+                            _ => _SortMode.recommended,
+                          };
+                        }),
+                        allLabel: l10n.filterGroupSort,
+                        optionLabel: (value) => switch (value) {
+                          'newest' => l10n.sortNewest,
+                          'hottest' => l10n.sortHottest,
+                          _ => l10n.filterGroupSort,
+                        },
+                      ),
+                    ],
+                  )
+                : const SizedBox.shrink(),
+          ),
+          TextButton.icon(
+            key: const Key('filter-expand'),
+            onPressed: () => setState(() => _expanded = !_expanded),
+            style: TextButton.styleFrom(
+              foregroundColor: AppColors.muted,
+              minimumSize: const Size(88, 38),
+              padding: const EdgeInsets.symmetric(horizontal: 12),
+            ),
+            iconAlignment: IconAlignment.end,
+            icon: Icon(
+              _expanded
+                  ? Icons.keyboard_arrow_up_rounded
+                  : Icons.keyboard_arrow_down_rounded,
+              size: 18,
+            ),
+            label: Text(
+              _expanded ? l10n.collapseFilters : l10n.expandFilters,
+              style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w600),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _group({
+    required _FilterGroup group,
+    required String label,
+    required List<String> values,
+    required String selected,
+    required ValueChanged<String> onSelected,
+    required String allLabel,
+    String Function(String value)? optionLabel,
+  }) {
+    final options = [
+      _FilterOption(key: 'all', value: _allValue, label: allLabel),
+      for (final value in values)
+        _FilterOption(
+          key: value,
+          value: value,
+          label: optionLabel?.call(value) ?? value,
+        ),
+    ];
+    return Container(
+      margin: const EdgeInsets.only(bottom: 8),
+      padding: const EdgeInsets.symmetric(
+        horizontal: _groupHorizontal,
+        vertical: _groupVertical,
+      ),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Container(
+            key: Key('filter-group-label-${group.name}'),
+            width: _labelWidth,
+            constraints: const BoxConstraints(minHeight: 28),
+            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),
+            alignment: Alignment.center,
+            decoration: BoxDecoration(
+              color: AppColors.badgeBeige,
+              borderRadius: BorderRadius.circular(7),
+            ),
+            child: Text(
+              label,
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                color: AppColors.blue,
+                fontSize: _labelFontSize,
+                fontWeight: FontWeight.w700,
+                height: 1.15,
+              ),
+            ),
+          ),
+          const SizedBox(width: _groupGap),
+          Expanded(
+            child: Wrap(
+              spacing: 8,
+              runSpacing: _optionRunGap,
+              children: [
+                for (final option in options)
+                  _option(
+                    group: group,
+                    option: option,
+                    selected: selected == option.value,
+                    onTap: () => onSelected(option.value),
+                  ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _option({
+    required _FilterGroup group,
+    required _FilterOption option,
+    required bool selected,
+    required VoidCallback onTap,
+  }) {
+    return GestureDetector(
+      key: Key('filter-option-${group.name}-${option.key}'),
+      behavior: HitTestBehavior.opaque,
+      onTap: onTap,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: _optionHorizontal,
+          vertical: _optionVertical,
+        ),
+        child: Text(
+          option.label,
+          style: TextStyle(
+            color: selected ? AppColors.blue : AppColors.onSurface,
+            fontSize: _groupFontSize,
+            fontWeight: selected ? FontWeight.w800 : FontWeight.w500,
+          ),
+        ),
+      ),
+    );
+  }
+
+  List<Drama> _filtered(List<Drama> dramas) {
+    final result = dramas.where((drama) {
+      if (_category != _allValue && drama.category != _category) return false;
+      if (_theme != _allValue && !_themeValues(drama).contains(_theme)) {
+        return false;
+      }
+      if (_language != _allValue && drama.language != _language) return false;
+      return true;
+    }).toList();
+    switch (_sort) {
+      case _SortMode.recommended:
+        break;
+      case _SortMode.newest:
+        result.sort((a, b) => _compareIds(b.id, a.id));
+      case _SortMode.hottest:
+        result.sort((a, b) => b.viewCount.compareTo(a.viewCount));
+    }
+    return result;
+  }
+
+  String _selectedLabel(String value, String fallback) {
+    if (value == _allValue) return fallback;
+    return value;
+  }
+
+  String _languageLabel(String value, AppLocalizations l10n) {
+    if (value == _allValue) return l10n.filterGroupLanguage;
+    return _languageNames[value.toLowerCase()] ?? value;
+  }
+
+  String _sortLabel(_SortMode value, AppLocalizations l10n) {
+    return switch (value) {
+      _SortMode.recommended => l10n.filterGroupSort,
+      _SortMode.newest => l10n.sortNewest,
+      _SortMode.hottest => l10n.sortHottest,
+    };
+  }
+
+  String _metaCategory(Drama drama) {
+    if (drama.category.trim().isNotEmpty) return drama.category.trim();
+    final themes = _themeValues(drama);
+    return themes.isEmpty ? '' : themes.first;
+  }
+}
+
+class _FilterOption {
+  const _FilterOption({
+    required this.key,
+    required this.value,
+    required this.label,
+  });
+
+  final String key;
+  final String value;
+  final String label;
+}
+
+enum _FilterGroup { category, theme, language, sort }
+
+enum _SortMode { recommended, newest, hottest }
+
+const Map<String, String> _languageNames = {
+  'zh': '简体中文',
+  'zh-cn': '简体中文',
+  'zh-hans': '简体中文',
+  'en': 'English',
+  'en-us': 'English',
+  'id': 'Bahasa Indonesia',
+  'id-id': 'Bahasa Indonesia',
+};
+
+List<String> _themeValues(Drama drama) {
+  final values = <String>[];
+  for (final source in [drama.genre, drama.category]) {
+    for (final part in source.split(_tagSplitter)) {
+      final value = part.trim();
+      if (value.isNotEmpty && !values.contains(value)) values.add(value);
+    }
+  }
+  return values;
+}
+
+List<String> _uniqueValues(Iterable<String> source) {
+  final result = <String>[];
+  for (final raw in source) {
+    final value = raw.trim();
+    if (value.isNotEmpty && !result.contains(value)) result.add(value);
+  }
+  return result;
+}
+
+int _compareIds(String a, String b) {
+  final numberA = int.tryParse(a);
+  final numberB = int.tryParse(b);
+  if (numberA != null && numberB != null) return numberA.compareTo(numberB);
+  return a.compareTo(b);
+}
diff --git a/lib/pages/filter/widgets/filter_result_card.dart b/lib/pages/filter/widgets/filter_result_card.dart
new file mode 100644
index 0000000..d51a8a2
--- /dev/null
+++ b/lib/pages/filter/widgets/filter_result_card.dart
@@ -0,0 +1,122 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../core/formatting/count_format.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/widgets/remote_image.dart';
+import '../../../l10n/app_localizations.dart';
+import '../../player/open_player.dart';
+
+const double _coverRadius = 10;
+const double _titleGap = 6;
+const double _metaGap = 2;
+const double _badgeHorizontal = 5;
+const double _badgeVertical = 2;
+const double _badgeRadius = 6;
+const double _titleFontSize = 12.5;
+const double _metaFontSize = 11;
+const double _badgeFontSize = 9;
+
+/// 筛选结果三列卡片：封面、标题、集数与热度和分类元信息。
+class FilterResultCard extends StatelessWidget {
+  const FilterResultCard({
+    super.key,
+    required this.drama,
+    required this.l10n,
+    required this.categoryLabel,
+  });
+
+  final Drama drama;
+  final AppLocalizations l10n;
+  final String categoryLabel;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      key: Key('filter-card-${drama.id}'),
+      behavior: HitTestBehavior.opaque,
+      onTap: () => unawaited(playDramaFromCatalog(context, drama)),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          ClipRRect(
+            borderRadius: BorderRadius.circular(_coverRadius),
+            child: AspectRatio(
+              aspectRatio: 3 / 4,
+              child: Stack(
+                fit: StackFit.expand,
+                children: [
+                  RemoteImage(
+                    drama.posterUrl,
+                    fit: BoxFit.cover,
+                    showFallbackIcon: true,
+                    fallbackAspectRatio: 3 / 4,
+                  ),
+                  if (drama.isHot)
+                    Positioned(
+                      top: 6,
+                      right: 6,
+                      child: Container(
+                        key: Key('filter-badge-hot-${drama.id}'),
+                        padding: const EdgeInsets.symmetric(
+                          horizontal: _badgeHorizontal,
+                          vertical: _badgeVertical,
+                        ),
+                        decoration: BoxDecoration(
+                          color: AppColors.blue,
+                          borderRadius: BorderRadius.circular(_badgeRadius),
+                        ),
+                        child: Text(
+                          l10n.hotBadge,
+                          style: const TextStyle(
+                            color: AppColors.onPrimary,
+                            fontSize: _badgeFontSize,
+                            fontWeight: FontWeight.w800,
+                          ),
+                        ),
+                      ),
+                    ),
+                ],
+              ),
+            ),
+          ),
+          const SizedBox(height: _titleGap),
+          Text(
+            drama.title,
+            key: Key('filter-title-${drama.id}'),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: const TextStyle(
+              color: AppColors.onSurface,
+              fontSize: _titleFontSize,
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+          const SizedBox(height: _metaGap),
+          Text(
+            _meta(),
+            key: Key('filter-meta-${drama.id}'),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: const TextStyle(
+              color: AppColors.muted,
+              fontSize: _metaFontSize,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  String _meta() {
+    return [
+      l10n.episodeCountLabel(drama.episodeCount),
+      formatInteractionCount(drama.viewCount),
+      if (categoryLabel.isNotEmpty) categoryLabel,
+    ].join(' · ');
+  }
+}
diff --git a/lib/pages/home/home_logic.dart b/lib/pages/home/home_logic.dart
index 307b42c..ae4310f 100644
--- a/lib/pages/home/home_logic.dart
+++ b/lib/pages/home/home_logic.dart
@@ -1,14 +1,14 @@
 // Author: fruit.com.cn
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
-import '../../core/data/services/catalog_controller.dart';
-import '../discover/discover_logic.dart';
+import '../discover/discover_types.dart';
 import '../drama_detail/drama_detail_view.dart';
-import '../mine/mine_logic.dart';
-import '../player/player_view.dart';
+import '../favorites/favorites_page.dart';
+import '../mine/mine_types.dart';
+import '../player/open_player.dart';
+import '../watch_records/watch_records_page.dart';
 
 class HomeLogic extends ChangeNotifier {
   HomeLogic(List<Drama> dramas) : currentDrama = dramas.first;
@@ -17,34 +17,21 @@ class HomeLogic extends ChangeNotifier {
   Drama currentDrama;
   int tab = 0;
   int searchRequest = 0;
-  int sectionRequest = 0;
   int resumeRequest = 0;
   int backRequest = 0;
-  int mySection = 0;
   bool drawerOpen = false;
   bool detailOpen = false;
   bool videoImmersive = false;
-  bool profile = false;
   bool _disposed = false;
 
   void notify() {
     if (!_disposed) notifyListeners();
   }
 
-  void select(
-    int nextTab, {
-    bool search = false,
-    bool watchlist = false,
-    bool resume = false,
-    int? mySection,
-  }) {
+  void select(int nextTab, {bool search = false, bool resume = false}) {
     FocusManager.instance.primaryFocus?.unfocus();
     tab = nextTab;
     if (search) searchRequest++;
-    if (watchlist || mySection != null) {
-      this.mySection = mySection ?? 1;
-      sectionRequest++;
-    }
     if (resume) resumeRequest++;
     notify();
   }
@@ -55,11 +42,6 @@ class HomeLogic extends ChangeNotifier {
     notify();
   }
 
-  void selectFromMenu(int nextTab, {int? mySection}) {
-    drawerOpen = false;
-    select(nextTab, mySection: mySection);
-  }
-
   Future<void> openCurrentSeries(BuildContext context) async {
     detailOpen = true;
     notify();
@@ -83,53 +65,45 @@ class HomeLogic extends ChangeNotifier {
     );
   }
 
-  Future<void> playDrama(BuildContext context, Drama drama) async {
-    // 列表卡片只有一集预览，进入播放前补齐完整剧集，否则选集列表是空的。
-    var playable = drama;
-    try {
-      playable = await context.read<CatalogController>().requireDetail(drama);
-    } catch (_) {
-      // 取详情失败就用卡片自带的那一集起播。
-    }
-    if (!context.mounted) return;
-    Navigator.of(context).push(
-      MaterialPageRoute<void>(
-        builder: (_) => PlayerPage(drama: playable, initialIndex: 0),
-      ),
-    );
-  }
+  Future<void> playDrama(
+    BuildContext context,
+    Drama drama, {
+    String? episodeId,
+  }) => playDramaFromCatalog(context, drama, episodeId: episodeId);
 
-  void openProfile() {
-    profile = true;
-    select(2, mySection: 0);
-  }
+  void openProfile() => select(3);
 
-  void openLibrary({int section = 1}) {
-    profile = false;
-    select(2, mySection: section);
-  }
-
-  void discoverAction(BuildContext context, DiscoverPageAction action) {
+  void discoverAction(DiscoverPageAction action) {
     switch (action) {
       case DiscoverPageAction.home:
         select(0);
-      case DiscoverPageAction.my:
+      case DiscoverPageAction.create:
         select(2);
-      case DiscoverPageAction.watchlist:
-        openLibrary();
-      case DiscoverPageAction.resume:
-        select(0, resume: true);
-      case DiscoverPageAction.detail:
-        openDrama(context, currentDrama);
+      case DiscoverPageAction.my:
+        select(3);
     }
   }
 
+  void openFavorites(BuildContext context) {
+    Navigator.of(
+      context,
+    ).push(MaterialPageRoute<void>(builder: (_) => const FavoritesPage()));
+  }
+
+  void openHistory(BuildContext context) {
+    Navigator.of(
+      context,
+    ).push(MaterialPageRoute<void>(builder: (_) => const WatchRecordsPage()));
+  }
+
   void myAction(MyPageAction action) {
     switch (action) {
       case MyPageAction.home:
         select(0);
       case MyPageAction.discover:
         select(1, search: true);
+      case MyPageAction.create:
+        select(2);
       case MyPageAction.resume:
         select(0, resume: true);
     }
@@ -139,8 +113,8 @@ class HomeLogic extends ChangeNotifier {
     if (videoImmersive) {
       backRequest++;
       notify();
-    } else if (tab != 1) {
-      select(1);
+    } else if (tab != 0) {
+      select(0);
     }
   }
 
diff --git a/lib/pages/home/home_view.dart b/lib/pages/home/home_view.dart
index 2c9377c..a30acc7 100644
--- a/lib/pages/home/home_view.dart
+++ b/lib/pages/home/home_view.dart
@@ -4,38 +4,97 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
 import '../../core/config/app_config.dart';
 import '../../core/data/models/drama.dart';
-import '../../core/data/services/auth_controller.dart';
 import '../../core/data/services/catalog_controller.dart';
+import '../../core/data/services/catalog_retry.dart';
+import '../../core/data/services/category_controller.dart';
 import '../../core/platform/haptics.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/app_bottom_nav.dart';
-import '../../core/widgets/auth_gate.dart';
+import '../../core/widgets/catalog_debug_info.dart';
+import '../../core/widgets/catalog_endpoint_editor.dart';
 import '../../core/widgets/empty_state.dart';
-import '../../core/widgets/server_endpoint_dialog.dart';
 import '../../l10n/app_localizations.dart';
+import '../discover/discover_types.dart';
 import '../discover/discover_view.dart';
-import '../splash/splash_page.dart';
-import '../mine/mine_view.dart';
+import '../create/create_view.dart';
+import '../mine/mine_types.dart';
 import '../player/player_view.dart';
+import '../mine/mine_view.dart';
 import 'home_binding.dart';
 import 'home_logic.dart';
-import 'widgets/home_menu_sheet.dart';
 
-class HomePage extends StatelessWidget {
+class HomePage extends StatefulWidget {
   const HomePage({super.key});
 
+  @override
+  State<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
+  static const _androidSplashAsset = 'assets/icon/splash_logo_android12.png';
+  static const _defaultSplashAsset = 'assets/icon/splash_logo.png';
+  static const _androidSplashSize = 288.0;
+  static const _defaultSplashSize = 384.0;
+
+  bool _resumeRetryInFlight = false;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state != AppLifecycleState.resumed || _resumeRetryInFlight) return;
+    final catalog = context.read<CatalogController>();
+    final categories = context.read<CategoryController>();
+    if (catalog.error == null && categories.error == null) return;
+    unawaited(_retryAfterResume(catalog, categories));
+  }
+
+  Future<void> _retryAfterResume(
+    CatalogController catalog,
+    CategoryController categories,
+  ) async {
+    _resumeRetryInFlight = true;
+    try {
+      await AppConfig.probeAndApplyBaseUrl();
+      await Future.wait([
+        if (catalog.error != null) catalog.load(),
+        if (categories.error != null) categories.load(),
+      ]);
+    } finally {
+      _resumeRetryInFlight = false;
+    }
+  }
+
+  Future<void> _retryHome(CatalogController catalog) {
+    return retryCatalogLoad(reload: catalog.load);
+  }
+
+  Future<void> _editHomeEndpoint(CatalogController catalog) {
+    return showCatalogEndpointEditor(context, reload: catalog.load);
+  }
+
   @override
   Widget build(BuildContext context) {
     final catalog = context.watch<CatalogController>();
-    if (!catalog.settled) return const SplashPage();
     final l10n = AppLocalizations.of(context)!;
     return Theme(
-      data: AppTheme.dark(),
+      data: AppTheme.light(),
       child: _buildHome(context, catalog, l10n),
     );
   }
@@ -46,23 +105,21 @@ class HomePage extends StatelessWidget {
     AppLocalizations l10n,
   ) {
     if (catalog.loading) {
-      return const Scaffold(
-        backgroundColor: AppColors.ink,
-        body: Center(child: CircularProgressIndicator()),
-      );
+      return catalog.settled ? _retryLoading() : _startupSplash();
     }
     if (catalog.error != null) {
       return Scaffold(
-        backgroundColor: AppColors.ink,
+        backgroundColor: Colors.transparent,
         body: HomeFailureView(
-          onRetry: catalog.load,
-          showDebugTools: kDebugMode,
+          error: catalog.debugError ?? catalog.error,
+          onRetry: () => unawaited(_retryHome(catalog)),
+          onEditEndpoint: () => unawaited(_editHomeEndpoint(catalog)),
         ),
       );
     }
     if (catalog.dramas.isEmpty) {
       return Scaffold(
-        backgroundColor: AppColors.ink,
+        backgroundColor: Colors.transparent,
         body: EmptyState(
           key: const Key('home-empty'),
           icon: Icons.movie_outlined,
@@ -77,66 +134,79 @@ class HomePage extends StatelessWidget {
     return _HomeTabs(
       key: ValueKey(catalog.dramas.first.id),
       dramas: catalog.dramas,
+      onRefreshFeed: catalog.refresh,
     );
   }
-}
 
-/// Home catalog failure with optional debug-only endpoint controls.
-class HomeFailureView extends StatelessWidget {
-  const HomeFailureView({
-    super.key,
-    required this.onRetry,
-    this.showDebugTools = kDebugMode,
-  });
-
-  final VoidCallback onRetry;
-  final bool showDebugTools;
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
-    return Column(
-      children: [
-        Expanded(
-          child: EmptyState(
-            icon: Icons.cloud_off_rounded,
-            title: l10n.catalogError,
-            actionLabel: l10n.retry,
-            onAction: onRetry,
+  Widget _startupSplash() {
+    final isAndroid = defaultTargetPlatform == TargetPlatform.android;
+    final size = isAndroid ? _androidSplashSize : _defaultSplashSize;
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      value: SystemUiOverlayStyle.light,
+      child: ColoredBox(
+        color: AppColors.splashInk,
+        child: Center(
+          child: Image.asset(
+            isAndroid ? _androidSplashAsset : _defaultSplashAsset,
+            key: const Key('startup-splash'),
+            width: size,
+            height: size,
+            fit: BoxFit.contain,
           ),
         ),
-        if (showDebugTools) _debugTools(context, l10n),
-      ],
+      ),
     );
   }
 
-  Widget _debugTools(BuildContext context, AppLocalizations l10n) {
-    return Padding(
-      padding: const EdgeInsets.fromLTRB(24, 0, 24, 24),
-      child: Column(
-        children: [
-          Text(
-            AppConfig.apiBaseUrl,
-            style: const TextStyle(fontSize: 12, color: AppColors.muted),
-          ),
-          const SizedBox(height: 8),
-          OutlinedButton.icon(
-            key: const Key('home-server-settings'),
-            onPressed: () => showServerEndpointDialog(context, l10n),
-            icon: const Icon(Icons.dns_outlined),
-            label: Text(l10n.serverSettings),
-          ),
-        ],
+  Widget _retryLoading() {
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      value: SystemUiOverlayStyle.light,
+      child: const Scaffold(
+        backgroundColor: AppColors.splashInk,
+        body: Center(child: CircularProgressIndicator(color: AppColors.blue)),
       ),
     );
   }
 }
 
-/// The three primary destinations share a single route and keep their state.
+/// 首页目录加载失败与重试入口。
+class HomeFailureView extends StatelessWidget {
+  const HomeFailureView({
+    super.key,
+    this.error,
+    required this.onRetry,
+    this.onEditEndpoint,
+  });
+
+  final String? error;
+  final VoidCallback onRetry;
+  final VoidCallback? onEditEndpoint;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return EmptyState(
+      icon: Icons.cloud_off_rounded,
+      title: l10n.catalogError,
+      actionLabel: l10n.retry,
+      onAction: onRetry,
+      footer: kDebugMode
+          ? CatalogDebugInfo(error: error, onEditEndpoint: onEditEndpoint)
+          : null,
+    );
+  }
+}
+
+/// 四个根页面共享同一路由并保持各自状态。
 class _HomeTabs extends StatefulWidget {
-  const _HomeTabs({super.key, required this.dramas});
+  const _HomeTabs({
+    super.key,
+    required this.dramas,
+    required this.onRefreshFeed,
+  });
 
   final List<Drama> dramas;
+  final Future<bool> Function() onRefreshFeed;
 
   @override
   State<_HomeTabs> createState() => _HomeTabsState();
@@ -167,134 +237,145 @@ class _HomeTabsState extends State<_HomeTabs> {
 
   Widget _scaffold(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    // 登录态统一从 AuthController 取（原来是 home_logic 里的本地演示开关）
-    final signedIn = context.watch<AuthController>().isSignedIn;
-    return PopScope(
+    final feed = logic.tab == 0;
+    final content = PopScope(
       canPop: false,
       onPopInvokedWithResult: (didPop, _) {
         if (didPop) return;
-        if (!logic.videoImmersive && logic.tab == 1) {
-          unawaited(_openMenu(context));
-        } else {
-          logic.onSystemBack();
-        }
+        logic.onSystemBack();
       },
       child: Scaffold(
         key: logic.scaffoldKey,
-        backgroundColor: AppColors.ink,
-        body: IndexedStack(
-          index: logic.tab,
-          children: [
-            PlayerPage(
-              drama: widget.dramas.first,
-              feedDramas: widget.dramas,
-              onDramaChanged: logic.onDramaChanged,
-              initialIndex: 0,
-              homeMode: true,
-              embedded: true,
-              active: logic.tab == 0 && !logic.drawerOpen && !logic.detailOpen,
-              resumeRequest: logic.resumeRequest,
-              backRequest: logic.backRequest,
-              onDiscover: () => logic.select(1),
-              onMy: logic.openProfile,
-              onSearch: () => logic.select(1, search: true),
-              onMenu: () => _openMenu(context),
-              onImmersiveChanged: logic.onImmersiveChanged,
+        backgroundColor: Colors.transparent,
+        body: _body(context),
+        bottomNavigationBar: logic.videoImmersive ? null : _nav(context, l10n),
+      ),
+    );
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      value: feed ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark,
+      child: feed
+          ? content
+          : DecoratedBox(
+              key: const Key('home-page-gradient'),
+              decoration: const BoxDecoration(gradient: AppTheme.pageGradient),
+              child: content,
             ),
-            DiscoverPage(
-              drama: logic.currentDrama,
-              dramas: widget.dramas,
-              onDramaSelected: (drama) => logic.playDrama(context, drama),
-              duration: Duration.zero,
-              embedded: true,
-              active: logic.tab == 1,
-              searchRequest: logic.searchRequest,
-              signedIn: signedIn,
-              onSignIn: () => openAuthPage(context),
-              onCoins: logic.openProfile,
-              onRewards: logic.openProfile,
-              onAction: (action) => logic.discoverAction(context, action),
-            ),
-            MyPage(
-              drama: logic.currentDrama,
-              dramas: widget.dramas,
-              onDramaSelected: (drama) => logic.openDrama(context, drama),
-              duration: Duration.zero,
-              initialSection: logic.mySection,
-              profile: logic.profile,
-              sectionRequest: logic.sectionRequest,
-              embedded: true,
-              active: logic.tab == 2,
-              onAction: logic.myAction,
-              signedIn: signedIn,
-              onSignIn: () => openAuthPage(context),
-              onSignOut: () => context.read<AuthController>().signOut(),
-            ),
-          ],
-        ),
-        bottomNavigationBar: logic.videoImmersive
-            ? null
-            : AppBottomNav(
-                barKey: const Key('home-tabs-bar'),
-                items: [
-                  AppBottomNavItem(
-                    tabKey: const Key('tab-home'),
-                    icon: Icons.play_circle_outline_rounded,
-                    selectedIcon: Icons.play_circle_fill_rounded,
-                    label: l10n.homeTab,
-                    selected: logic.tab == 0,
-                    onTap: () => _selectTab(context, 0),
-                  ),
-                  AppBottomNavItem(
-                    tabKey: const Key('tab-discover'),
-                    icon: Icons.explore_outlined,
-                    selectedIcon: Icons.explore_rounded,
-                    label: l10n.discoverTab,
-                    selected: logic.tab == 1,
-                    onTap: () => _selectTab(context, 1),
-                  ),
-                  AppBottomNavItem(
-                    tabKey: const Key('tab-my'),
-                    icon: Icons.video_library_outlined,
-                    selectedIcon: Icons.video_library_rounded,
-                    label: l10n.myTab,
-                    selected: logic.tab == 2,
-                    onTap: () => _selectTab(context, 2, myProfile: true),
-                  ),
-                ],
-              ),
+    );
+  }
+
+  Widget _body(BuildContext context) {
+    return IndexedStack(
+      index: logic.tab,
+      children: [
+        _home(context),
+        _discover(context),
+        const CreatePage(),
+        _my(context),
+      ],
+    );
+  }
+
+  Widget _home(BuildContext context) {
+    return PlayerPage(
+      homeMode: true,
+      embedded: true,
+      active: logic.tab == 0,
+      drama: widget.dramas.first,
+      initialIndex: 0,
+      feedDramas: widget.dramas,
+      onOpenFullPlayer: (drama, episode) =>
+          logic.playDrama(context, drama, episodeId: episode.id),
+      onRefreshFeed: widget.onRefreshFeed,
+      onDramaChanged: logic.onDramaChanged,
+      onImmersiveChanged: logic.onImmersiveChanged,
+      onSearch: () => logic.select(1, search: true),
+      onDiscover: () => logic.select(1),
+      onMy: () => logic.select(3),
+    );
+  }
+
+  Widget _discover(BuildContext context) {
+    return DiscoverPage(
+      active: logic.tab == 1,
+      searchRequest: logic.searchRequest,
+      callbacks: DiscoverPageCallbacks(
+        onAction: logic.discoverAction,
+        onDramaSelected: (drama) => logic.playDrama(context, drama),
+        onProfile: logic.openProfile,
       ),
     );
   }
 
-  void _selectTab(BuildContext context, int tab, {bool myProfile = false}) {
+  Widget _my(BuildContext context) {
+    return MyPage(
+      active: logic.tab == 3,
+      callbacks: MyPageCallbacks(
+        onAction: logic.myAction,
+        onDramaSelected: (drama) => logic.openDrama(context, drama),
+      ),
+    );
+  }
+
+  Widget _nav(BuildContext context, AppLocalizations l10n) {
+    return AppBottomNav(
+      barKey: const Key('home-tabs-bar'),
+      dark: logic.tab == 0,
+      items: [
+        _navItem(context, l10n, 0),
+        _navItem(context, l10n, 1),
+        _navItem(context, l10n, 2),
+        _navItem(context, l10n, 3),
+      ],
+    );
+  }
+
+  AppBottomNavItem _navItem(
+    BuildContext context,
+    AppLocalizations l10n,
+    int index,
+  ) {
+    final selected = logic.tab == index;
+    return switch (index) {
+      0 => AppBottomNavItem(
+        tabKey: const Key('tab-home'),
+        icon: Icons.home_outlined,
+        selectedIcon: Icons.home_rounded,
+        label: l10n.homeTab,
+        selected: selected,
+        onTap: () => _selectTab(context, index),
+      ),
+      1 => AppBottomNavItem(
+        tabKey: const Key('tab-theater'),
+        icon: Icons.explore_outlined,
+        selectedIcon: Icons.explore_rounded,
+        label: l10n.theaterTab,
+        selected: selected,
+        onTap: () => _selectTab(context, index),
+      ),
+      2 => AppBottomNavItem(
+        tabKey: const Key('tab-create'),
+        icon: Icons.add_box_outlined,
+        selectedIcon: Icons.add_box_rounded,
+        label: l10n.createTab,
+        selected: selected,
+        onTap: () => _selectTab(context, index),
+      ),
+      _ => AppBottomNavItem(
+        tabKey: const Key('tab-mine'),
+        icon: Icons.person_outline_rounded,
+        selectedIcon: Icons.person_rounded,
+        label: l10n.myTab,
+        selected: selected,
+        onTap: () => _selectTab(context, index),
+      ),
+    };
+  }
+
+  void _selectTab(BuildContext context, int tab) {
     final same = logic.tab == tab;
     if (!same) {
       unawaited(context.read<Haptics>().selectionClick());
     }
-    if (tab == 2) {
-      myProfile ? logic.openProfile() : logic.openLibrary();
-    } else {
-      logic.select(tab);
-    }
-  }
-
-  Future<void> _openMenu(BuildContext context) async {
-    logic.setMenuOpen(true);
-    await showModalBottomSheet<void>(
-      context: context,
-      backgroundColor: AppColors.card,
-      showDragHandle: true,
-      isScrollControlled: true,
-      builder: (_) => HomeMenuSheet(
-        drama: logic.currentDrama,
-        onOpenSeries: () => logic.openCurrentSeries(context),
-        onDiscover: () => logic.selectFromMenu(1),
-        onHistory: () => logic.openLibrary(section: 0),
-        onWatchlist: logic.openLibrary,
-        onLiked: () => logic.selectFromMenu(2, mySection: 2),
-      ),
-    );
-    logic.setMenuOpen(false);
+    logic.select(tab);
   }
 }
diff --git a/lib/pages/home/widgets/home_drama_grid.dart b/lib/pages/home/widgets/home_drama_grid.dart
new file mode 100644
index 0000000..a5b82ce
--- /dev/null
+++ b/lib/pages/home/widgets/home_drama_grid.dart
@@ -0,0 +1,252 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../core/formatting/count_format.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/theme/app_dimens.dart';
+import '../../../core/theme/app_theme.dart';
+import '../../../core/widgets/remote_image.dart';
+import '../../../l10n/app_localizations.dart';
+
+const int _columns = 2;
+const double _columnGap = 10;
+const double _cardGap = 10;
+const double _coverAspectRatio = 5 / 6;
+const double _cardPadding = 8;
+const double _coverTitleGap = 6;
+const double _lineGap = 2;
+const double _viewsIconSize = 10;
+const double _viewsFontSize = 9;
+
+/// 首页浏览态使用的双列剧目网格。
+class HomeDramaGrid extends StatelessWidget {
+  const HomeDramaGrid({
+    super.key,
+    required this.l10n,
+    required this.dramas,
+    required this.onOpen,
+  });
+
+  final AppLocalizations l10n;
+  final List<Drama> dramas;
+  final ValueChanged<Drama> onOpen;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      key: const Key('home-popular-grid'),
+      padding: const EdgeInsets.symmetric(horizontal: AppDimens.pageHorizontal),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(child: _column(0)),
+          const SizedBox(width: _columnGap),
+          Expanded(child: _column(1)),
+        ],
+      ),
+    );
+  }
+
+  Widget _column(int start) {
+    final children = <Widget>[];
+    for (var index = start; index < dramas.length; index += _columns) {
+      final drama = dramas[index];
+      children.add(
+        HomeDramaCard(l10n: l10n, drama: drama, onTap: () => onOpen(drama)),
+      );
+      if (index + _columns < dramas.length) {
+        children.add(const SizedBox(height: _cardGap));
+      }
+    }
+    return Column(children: children);
+  }
+}
+
+/// 首页剧卡：封面、角标、标题、题材、集数与热度。
+class HomeDramaCard extends StatelessWidget {
+  const HomeDramaCard({
+    super.key,
+    required this.l10n,
+    required this.drama,
+    required this.onTap,
+  });
+
+  final AppLocalizations l10n;
+  final Drama drama;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          key: Key('home-drama-card-${drama.id}'),
+          onTap: onTap,
+          child: Padding(
+            padding: const EdgeInsets.all(_cardPadding),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                _cover(),
+                const SizedBox(height: _coverTitleGap),
+                _title(),
+                const SizedBox(height: _lineGap),
+                _genre(),
+                const SizedBox(height: _lineGap),
+                _metadata(),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _cover() {
+    return ClipRRect(
+      key: Key('home-drama-cover-${drama.id}'),
+      borderRadius: BorderRadius.circular(AppDimens.coverRadius),
+      child: Stack(
+        children: [
+          RemoteImage(
+            drama.posterUrl,
+            width: double.infinity,
+            fit: BoxFit.fitWidth,
+            showFallbackIcon: true,
+            fallbackAspectRatio: _coverAspectRatio,
+          ),
+          Positioned(top: 8, left: 8, child: _tagBadge()),
+          Positioned(left: 8, bottom: 8, child: _viewsBadge()),
+          Positioned(right: 8, bottom: 8, child: _episodeBadge()),
+        ],
+      ),
+    );
+  }
+
+  bool get _isFree {
+    return drama.freeEpisodes > 0 ||
+        drama.episodes.any((episode) => episode.isFree);
+  }
+
+  Widget _tagBadge() {
+    final label = _isFree ? l10n.free : l10n.originalTag;
+    return Container(
+      key: Key('home-drama-tag-${drama.id}'),
+      padding: const EdgeInsets.symmetric(
+        horizontal: AppDimens.spaceSm,
+        vertical: 3,
+      ),
+      decoration: BoxDecoration(
+        color: AppColors.badgePink,
+        borderRadius: BorderRadius.circular(AppDimens.pillRadius),
+      ),
+      child: Text(
+        label,
+        style: const TextStyle(
+          color: AppColors.badgePinkText,
+          fontSize: AppDimens.cardMeta,
+          fontWeight: FontWeight.w800,
+        ),
+      ),
+    );
+  }
+
+  Widget _episodeBadge() {
+    return Container(
+      key: Key('home-drama-episodes-badge-${drama.id}'),
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+      decoration: BoxDecoration(
+        color: AppColors.badgeBeige,
+        borderRadius: BorderRadius.circular(AppDimens.pillRadius),
+      ),
+      child: Text(
+        l10n.allEpisodesBadge(drama.episodeCount),
+        style: const TextStyle(
+          color: AppColors.onSurface,
+          fontSize: 9,
+          fontWeight: FontWeight.w700,
+        ),
+      ),
+    );
+  }
+
+  /// 播放次数角标：深色半透明胶囊 + 白色小播放图标。
+  Widget _viewsBadge() {
+    return Container(
+      key: Key('home-drama-views-${drama.id}'),
+      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+      decoration: BoxDecoration(
+        color: AppColors.playerOverlayPill,
+        borderRadius: BorderRadius.circular(AppDimens.pillRadius),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Icon(
+            Icons.play_arrow_rounded,
+            color: AppColors.onPrimary,
+            size: _viewsIconSize,
+          ),
+          const SizedBox(width: 2),
+          Text(
+            formatInteractionCount(drama.viewCount),
+            style: const TextStyle(
+              color: AppColors.onPrimary,
+              fontSize: _viewsFontSize,
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _title() {
+    return Text(
+      drama.title,
+      key: Key('home-drama-title-${drama.id}'),
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+      style: const TextStyle(
+        color: AppColors.onSurface,
+        fontSize: AppDimens.cardTitle,
+        fontWeight: FontWeight.w800,
+      ),
+    );
+  }
+
+  Widget _genre() {
+    final genre = drama.genre.isEmpty ? drama.category : drama.genre;
+    return Text(
+      genre.isEmpty ? l10n.videoPending : genre,
+      key: Key('home-drama-genre-${drama.id}'),
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+      style: const TextStyle(
+        color: AppColors.muted,
+        fontSize: AppDimens.cardMeta,
+      ),
+    );
+  }
+
+  Widget _metadata() {
+    return Text(
+      l10n.episodeCount(drama.episodeCount),
+      key: Key('home-drama-episode-count-${drama.id}'),
+      style: const TextStyle(
+        color: AppColors.subtle,
+        fontSize: AppDimens.cardViews,
+      ),
+    );
+  }
+}
diff --git a/lib/pages/home/widgets/home_menu_sheet.dart b/lib/pages/home/widgets/home_menu_sheet.dart
deleted file mode 100644
index e870bd4..0000000
--- a/lib/pages/home/widgets/home_menu_sheet.dart
+++ /dev/null
@@ -1,246 +0,0 @@
-// Author: fruit.com.cn
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-import '../../../core/config/locale_controller.dart';
-import '../../../core/data/models/drama.dart';
-import '../../../core/formatting/localized_content.dart';
-import '../../../core/theme/app_colors.dart';
-import '../../../core/widgets/remote_image.dart';
-import '../../../l10n/app_localizations.dart';
-
-/// Compact navigation menu opened from the preview home header.
-class HomeMenuSheet extends StatelessWidget {
-  const HomeMenuSheet({
-    super.key,
-    required this.drama,
-    required this.onOpenSeries,
-    required this.onDiscover,
-    required this.onHistory,
-    required this.onWatchlist,
-    required this.onLiked,
-  });
-
-  final Drama drama;
-  final VoidCallback onOpenSeries;
-  final VoidCallback onDiscover;
-  final VoidCallback onHistory;
-  final VoidCallback onWatchlist;
-  final VoidCallback onLiked;
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
-    final languageCode = Localizations.localeOf(context).languageCode;
-    void closeThen(VoidCallback action) {
-      Navigator.pop(context);
-      action();
-    }
-
-    return SafeArea(
-      child: SingleChildScrollView(
-        padding: const EdgeInsets.fromLTRB(16, 4, 16, 20),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Container(
-              padding: const EdgeInsets.all(10),
-              decoration: BoxDecoration(
-                color: AppColors.cardAlt,
-                borderRadius: BorderRadius.circular(12),
-              ),
-              child: Row(
-                children: [
-                  ClipRRect(
-                    borderRadius: BorderRadius.circular(10),
-                    child: RemoteImage(drama.posterUrl, width: 64, height: 86),
-                  ),
-                  const SizedBox(width: 10),
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          localizedDramaTitle(l10n, drama),
-                          maxLines: 2,
-                          overflow: TextOverflow.ellipsis,
-                          style: const TextStyle(
-                            color: AppColors.onSurface,
-                            fontSize: 15,
-                            fontWeight: FontWeight.w800,
-                          ),
-                        ),
-                        const SizedBox(height: 4),
-                        Text(
-                          l10n.episodeCount(drama.episodeCount),
-                          style: const TextStyle(
-                            color: AppColors.muted,
-                            fontSize: 9,
-                          ),
-                        ),
-                        const SizedBox(height: 8),
-                        SizedBox(
-                          height: 34,
-                          child: FilledButton.icon(
-                            key: const Key('drawer-open-series'),
-                            onPressed: () => closeThen(onOpenSeries),
-                            style: FilledButton.styleFrom(
-                              backgroundColor: AppColors.blue,
-                              foregroundColor: AppColors.onPrimary,
-                              shape: RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(9),
-                              ),
-                              textStyle: const TextStyle(fontSize: 11),
-                            ),
-                            icon: const Icon(
-                              Icons.play_arrow_rounded,
-                              size: 15,
-                            ),
-                            label: Text(l10n.exploreSeries),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(height: 14),
-            Text(
-              l10n.quickAccess,
-              style: const TextStyle(
-                color: AppColors.onSurface,
-                fontSize: 13,
-                fontWeight: FontWeight.w800,
-              ),
-            ),
-            const SizedBox(height: 8),
-            Row(
-              children: [
-                Expanded(
-                  child: _MenuTile(
-                    key: const Key('drawer-discover'),
-                    icon: Icons.explore_outlined,
-                    label: l10n.discoverTab,
-                    onTap: () => closeThen(onDiscover),
-                  ),
-                ),
-                const SizedBox(width: 8),
-                Expanded(
-                  child: _MenuTile(
-                    key: const Key('drawer-history'),
-                    icon: Icons.history_rounded,
-                    label: l10n.history,
-                    onTap: () => closeThen(onHistory),
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 8),
-            Row(
-              children: [
-                Expanded(
-                  child: _MenuTile(
-                    key: const Key('drawer-watchlist'),
-                    icon: Icons.bookmark_border_rounded,
-                    label: l10n.watchlist,
-                    onTap: () => closeThen(onWatchlist),
-                  ),
-                ),
-                const SizedBox(width: 8),
-                Expanded(
-                  child: _MenuTile(
-                    key: const Key('drawer-liked'),
-                    icon: Icons.favorite_border_rounded,
-                    label: l10n.likedTab,
-                    onTap: () => closeThen(onLiked),
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 14),
-            Text(
-              l10n.appLanguage,
-              style: const TextStyle(
-                color: AppColors.onSurface,
-                fontSize: 13,
-                fontWeight: FontWeight.w800,
-              ),
-            ),
-            const SizedBox(height: 8),
-            Wrap(
-              spacing: 8,
-              runSpacing: 8,
-              children: [
-                for (final (code, label) in [
-                  ('en', l10n.english),
-                  ('zh', l10n.simplifiedChinese),
-                  ('id', l10n.bahasaIndonesia),
-                ])
-                  ChoiceChip(
-                    label: Text(label),
-                    selected: languageCode == code,
-                    onSelected: (_) =>
-                        context.read<LocaleController>().select(code),
-                    backgroundColor: AppColors.input,
-                    selectedColor: AppColors.blue,
-                    labelStyle: TextStyle(
-                      color: languageCode == code
-                          ? AppColors.onPrimary
-                          : AppColors.muted,
-                      fontSize: 10,
-                    ),
-                    side: BorderSide.none,
-                    showCheckmark: false,
-                  ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _MenuTile extends StatelessWidget {
-  const _MenuTile({
-    super.key,
-    required this.icon,
-    required this.label,
-    required this.onTap,
-  });
-
-  final IconData icon;
-  final String label;
-  final VoidCallback onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    return Material(
-      color: AppColors.quick,
-      borderRadius: BorderRadius.circular(12),
-      clipBehavior: Clip.antiAlias,
-      child: InkWell(
-        onTap: onTap,
-        child: SizedBox(
-          height: 58,
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Icon(icon, color: AppColors.secondary, size: 16),
-              const SizedBox(height: 4),
-              Text(
-                label,
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                style: const TextStyle(color: AppColors.muted, fontSize: 9),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/pages/mine/mine_binding.dart b/lib/pages/mine/mine_binding.dart
index 6c684ec..83017a5 100644
--- a/lib/pages/mine/mine_binding.dart
+++ b/lib/pages/mine/mine_binding.dart
@@ -1,17 +1,10 @@
 // Author: fruit.com.cn
 
-import '../../core/data/models/drama.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
 import 'mine_logic.dart';
 
+/// 组装「我的」页状态。
 class MineBinding {
-  MineLogic create({
-    required Drama drama,
-    required int initialSection,
-    required WatchHistoryRepository history,
-  }) => MineLogic(
-    drama: drama,
-    initialSection: initialSection,
-    history: history,
-  );
+  MineLogic create({required WatchHistoryRepository history}) =>
+      MineLogic(history: history);
 }
diff --git a/lib/pages/mine/mine_logic.dart b/lib/pages/mine/mine_logic.dart
index 3c56aaf..b60be77 100644
--- a/lib/pages/mine/mine_logic.dart
+++ b/lib/pages/mine/mine_logic.dart
@@ -1,62 +1,28 @@
 // Author: fruit.com.cn
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
-import '../../core/config/app_config.dart';
-import '../../core/config/locale_controller.dart';
-import '../../core/data/models/drama.dart';
 import '../../core/data/models/watch_progress.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
-import '../../core/theme/app_colors.dart';
-import '../../core/widgets/server_endpoint_dialog.dart';
-import '../../l10n/app_localizations.dart';
-
-enum MyPageAction { home, discover, resume }
+import 'mine_types.dart';
 
+/// 「我的」页状态：最近观看与根导航动作。
 class MineLogic extends ChangeNotifier {
-  MineLogic({
-    required this.history,
-    required this.drama,
-    required int initialSection,
-  }) : section = initialSection {
-    refreshPosition();
+  MineLogic({required this.history}) {
+    refreshRecent();
   }
 
   final WatchHistoryRepository history;
-  Drama drama;
-  late Future<Duration?> position;
   List<WatchProgress> recent = const [];
   bool recentLoading = false;
   String? recentError;
-
-  /// 续看位置读取失败：与"没有记录"区分开，失败要能重试（不能假装成从 0 开始）
-  bool positionFailed = false;
-  int section;
-  int filter = 0;
   bool _disposed = false;
 
   void notify() {
     if (!_disposed) notifyListeners();
   }
 
-  void refreshPosition() {
-    position = history
-        .resumePointFor(drama.id)
-        .then((point) {
-          positionFailed = false;
-          return point?.position;
-        })
-        .catchError((Object _) {
-          positionFailed = true;
-          notify();
-          return null;
-        });
-    refreshRecent();
-  }
-
-  /// 最近观看：服务端只给 dramaId/位置，剧名封面用已加载的目录卡片按 id 映射。
+  /// 最近观看：服务端只给 dramaId/位置，剧名封面用目录卡片按 id 映射。
   Future<void> refreshRecent() async {
     recentLoading = true;
     recentError = null;
@@ -71,34 +37,9 @@ class MineLogic extends ChangeNotifier {
     }
   }
 
-  void selectSection(int index) {
-    section = index;
-    notify();
-  }
-
-  void selectFilter(int index) {
-    filter = index;
-    notify();
-  }
-
-  void syncPage({
-    required bool active,
-    required bool wasActive,
-    required Drama nextDrama,
-    required bool dramaChanged,
-    required int sectionRequest,
-    required int previousSectionRequest,
-    required int initialSection,
-  }) {
-    if (active && (!wasActive || dramaChanged)) {
-      drama = nextDrama;
-      refreshPosition();
-      notify();
-    }
-    if (sectionRequest != previousSectionRequest) {
-      section = initialSection;
-      notify();
-    }
+  /// 页面重新可见时刷新最近观看，避免停留在旧进度。
+  void syncPage({required bool active, required bool wasActive}) {
+    if (active && !wasActive) refreshRecent();
   }
 
   void act(
@@ -114,63 +55,6 @@ class MineLogic extends ChangeNotifier {
     }
   }
 
-  Future<void> showLanguage(
-    BuildContext context, {
-    bool showServerSetting = kDebugMode,
-  }) async {
-    final l10n = AppLocalizations.of(context)!;
-    await showModalBottomSheet<void>(
-      context: context,
-      backgroundColor: AppColors.ink,
-      showDragHandle: true,
-      isScrollControlled: true,
-      builder: (sheetContext) => SafeArea(
-        child: ConstrainedBox(
-          constraints: BoxConstraints(
-            maxHeight: MediaQuery.sizeOf(sheetContext).height * 0.85,
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                ListTile(title: Text(l10n.language)),
-                for (final (code, label) in [
-                  ('en', l10n.english),
-                  ('zh', l10n.simplifiedChinese),
-                  ('id', l10n.bahasaIndonesia),
-                ])
-                  ListTile(
-                    title: Text(label),
-                    onTap: () {
-                      context.read<LocaleController>().select(code);
-                      Navigator.pop(sheetContext);
-                    },
-                  ),
-                if (showServerSetting) ...[
-                  const Divider(height: 1),
-                  ListTile(
-                    key: const Key('server-endpoint-setting'),
-                    leading: const Icon(Icons.dns_outlined),
-                    title: Text(l10n.serverAddress),
-                    subtitle: Text(AppConfig.apiBaseUrl),
-                    trailing: const Icon(Icons.edit_outlined),
-                    onTap: () => _editServerEndpoint(context, l10n),
-                  ),
-                ],
-                const SizedBox(height: 8),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Future<void> _editServerEndpoint(
-    BuildContext context,
-    AppLocalizations l10n,
-  ) => showServerEndpointDialog(context, l10n);
-
   @override
   void dispose() {
     _disposed = true;
diff --git a/lib/pages/mine/mine_types.dart b/lib/pages/mine/mine_types.dart
new file mode 100644
index 0000000..a823e8b
--- /dev/null
+++ b/lib/pages/mine/mine_types.dart
@@ -0,0 +1,32 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+
+import '../../core/data/models/drama.dart';
+
+/// 「我的」页与根导航之间的返回动作。
+enum MyPageAction { home, discover, create, resume }
+
+/// 「我的」页可进入的功能目的地。
+enum MineDestination {
+  watchlist,
+  history,
+  downloads,
+  wallet,
+  vip,
+  works,
+  creatorCenter,
+  notices,
+  settings,
+  help,
+}
+
+/// 「我的」页导航回调；没有 `onAction` 时按独立页面处理。
+class MyPageCallbacks {
+  const MyPageCallbacks({this.onAction, this.onDramaSelected});
+
+  final ValueChanged<MyPageAction>? onAction;
+  final ValueChanged<Drama>? onDramaSelected;
+
+  bool get embedded => onAction != null;
+}
diff --git a/lib/pages/mine/mine_view.dart b/lib/pages/mine/mine_view.dart
index bc1e7a5..3b777a5 100644
--- a/lib/pages/mine/mine_view.dart
+++ b/lib/pages/mine/mine_view.dart
@@ -2,68 +2,44 @@
 
 import 'dart:async';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-import '../../core/config/locale_controller.dart';
-import '../../core/data/models/drama.dart';
-import '../../core/data/models/watch_progress.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
 import '../../core/data/services/auth_controller.dart';
-import '../../core/data/services/favorite_controller.dart';
-import '../../core/data/services/interaction_controller.dart';
-import '../../core/formatting/error_text.dart';
-import '../../core/formatting/localized_content.dart';
+import '../../core/data/services/locale_controller.dart';
+import '../../core/data/services/wallet_controller.dart';
 import '../../core/theme/app_colors.dart';
+import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/app_bottom_nav.dart';
-import '../../core/widgets/empty_state.dart';
-import '../../core/widgets/remote_image.dart';
+import '../../core/widgets/auth_gate.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
 import '../../l10n/app_localizations.dart';
-import '../account/account_entry_card.dart';
 import '../downloads/downloads_page.dart';
 import '../favorites/favorites_page.dart';
 import '../notices/notices_page.dart';
+import '../settings/settings_page.dart';
+import '../store/recharge_page.dart';
+import '../store/vip_page.dart';
+import '../wallet/wallet_page.dart';
 import '../watch_records/watch_records_page.dart';
 import 'mine_binding.dart';
 import 'mine_logic.dart';
+import 'mine_types.dart';
+import 'widgets/mine_header.dart';
+import 'widgets/mine_menu.dart';
 
+/// K28-B 我的页。
 class MyPage extends StatefulWidget {
   const MyPage({
     super.key,
-    required this.drama,
-    required this.duration,
-    this.initialSection = 0,
-    this.profile = false,
-    this.history,
-    this.embedded = false,
     this.active = true,
-    this.sectionRequest = 0,
-    this.onAction,
-    this.signedIn = false,
-    this.onSignIn,
-    this.onSignOut,
-    this.dramas,
-    this.onDramaSelected,
-    this.debugShowSetting = kDebugMode,
+    this.callbacks = const MyPageCallbacks(),
   });
 
-  final Drama drama;
-  final Duration duration;
-  final int initialSection;
-  final bool profile;
-  final WatchHistoryRepository? history;
-  final bool embedded;
   final bool active;
-  final int sectionRequest;
-  final ValueChanged<MyPageAction>? onAction;
-  final bool signedIn;
-  final VoidCallback? onSignIn;
-  final VoidCallback? onSignOut;
-  final List<Drama>? dramas;
-  final ValueChanged<Drama>? onDramaSelected;
-  final bool debugShowSetting;
+  final MyPageCallbacks callbacks;
 
   @override
   State<MyPage> createState() => _MyPageState();
@@ -72,28 +48,20 @@ class MyPage extends StatefulWidget {
 class _MyPageState extends State<MyPage> {
   late final MineLogic logic;
 
+  bool get embedded => widget.callbacks.embedded;
+
   @override
   void initState() {
     super.initState();
     logic = MineBinding().create(
-      drama: widget.drama,
-      initialSection: widget.initialSection,
-      history: widget.history ?? context.read<WatchHistoryRepository>(),
+      history: context.read<WatchHistoryRepository>(),
     );
   }
 
   @override
   void didUpdateWidget(covariant MyPage oldWidget) {
     super.didUpdateWidget(oldWidget);
-    logic.syncPage(
-      active: widget.active,
-      wasActive: oldWidget.active,
-      nextDrama: widget.drama,
-      dramaChanged: oldWidget.drama.id != widget.drama.id,
-      sectionRequest: widget.sectionRequest,
-      previousSectionRequest: oldWidget.sectionRequest,
-      initialSection: widget.initialSection,
-    );
+    logic.syncPage(active: widget.active, wasActive: oldWidget.active);
   }
 
   @override
@@ -113,876 +81,302 @@ class _MyPageState extends State<MyPage> {
   Widget _page(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     final content = SafeArea(
-      bottom: !widget.embedded,
+      bottom: !embedded,
       child: Column(
         children: [
           _topBar(l10n),
-          Expanded(
-            child: ListView(
-              padding: const EdgeInsets.fromLTRB(14, 2, 14, 18),
-              children: [
-                _userRow(l10n),
-                const SizedBox(height: 12),
-                _wallet(l10n),
-                if (_continueDrama != null) ...[
-                  const SizedBox(height: 12),
-                  _continueCard(l10n, _continueDrama!, _continueRecord!),
-                ],
-                const SizedBox(height: 14),
-                _library(l10n),
-                const SizedBox(height: 14),
-                _languageRow(l10n),
-                if (widget.signedIn) ...[
-                  const SizedBox(height: 12),
-                  const AccountEntryCard(),
-                ],
-                const SizedBox(height: 12),
-                _menuCard(l10n),
-              ],
-            ),
-          ),
-          if (!widget.embedded) _bottomNav(l10n),
+          Expanded(child: _body(context, l10n)),
+          if (!embedded) _bottomNav(l10n),
         ],
       ),
     );
     return Theme(
-      data: AppTheme.dark(),
-      child: widget.embedded
+      data: AppTheme.light(),
+      child: embedded
           ? content
           : Scaffold(backgroundColor: AppColors.ink, body: content),
     );
   }
 
-  Widget _topBar(AppLocalizations l10n) => SizedBox(
-    height: 46,
-    child: Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 14),
-      child: Row(
-        children: [
-          Container(
-            width: 24,
-            height: 24,
-            alignment: Alignment.center,
-            decoration: BoxDecoration(
-              color: AppColors.blue,
-              borderRadius: BorderRadius.circular(7),
-            ),
-            child: const Icon(
-              Icons.play_arrow_rounded,
-              color: AppColors.onPrimary,
-              size: 16,
-            ),
-          ),
-          const SizedBox(width: 8),
-          Text(
+  Widget _topBar(AppLocalizations l10n) {
+    return SizedBox(
+      height: AppDimens.contentHeaderHeight,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: AppDimens.pageHorizontal,
+        ),
+        child: Align(
+          alignment: Alignment.centerLeft,
+          child: Text(
             l10n.myTab,
             style: const TextStyle(
               fontFamily: 'Outfit',
               color: AppColors.onSurface,
-              fontSize: 15,
+              fontSize: AppDimens.pageTitle,
               fontWeight: FontWeight.w800,
             ),
           ),
-          const Spacer(),
-          _RoundHeaderButton(
-            key: const Key('mine-search-button'),
-            tooltip: l10n.search,
-            icon: Icons.search_rounded,
-            onTap: () => logic.act(
-              context,
-              MyPageAction.discover,
-              embedded: widget.embedded,
-              onAction: widget.onAction,
-            ),
-          ),
-          const SizedBox(width: 8),
-          Container(
-            key: const Key('mine-avatar'),
-            width: 36,
-            height: 36,
-            decoration: const BoxDecoration(
-              shape: BoxShape.circle,
-              gradient: LinearGradient(
-                begin: Alignment.topLeft,
-                end: Alignment.bottomRight,
-                colors: [Color(0xFF6A5CFF), AppColors.blue],
-              ),
-            ),
-            child: const Icon(
-              Icons.person_rounded,
-              color: AppColors.onSurface,
-              size: 18,
-            ),
-          ),
-        ],
-      ),
-    ),
-  );
-
-  Widget _userRow(AppLocalizations l10n) {
-    final user = widget.signedIn ? context.watch<AuthController>().user : null;
-    final name = widget.signedIn
-        ? ((user?.nickname.isNotEmpty ?? false)
-              ? user!.nickname
-              : l10n.localViewer)
-        : l10n.localViewer;
-    final subtitle = widget.signedIn
-        ? ((user?.uid.isNotEmpty ?? false)
-              ? 'ID: ${user!.uid}'
-              : l10n.myAccount)
-        : l10n.logInHint;
-    return Row(
-      key: const Key('mine-user-row'),
-      children: [
-        Container(
-          width: 48,
-          height: 48,
-          decoration: const BoxDecoration(
-            shape: BoxShape.circle,
-            gradient: LinearGradient(
-              begin: Alignment.topLeft,
-              end: Alignment.bottomRight,
-              colors: [Color(0xFF6A5CFF), AppColors.blue],
-            ),
-          ),
-          child: const Icon(
-            Icons.person_rounded,
-            color: AppColors.onSurface,
-            size: 22,
-          ),
-        ),
-        const SizedBox(width: 10),
-        Expanded(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                name,
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                style: const TextStyle(
-                  color: AppColors.onSurface,
-                  fontSize: 15,
-                  fontWeight: FontWeight.w800,
-                ),
-              ),
-              const SizedBox(height: 2),
-              Text(
-                subtitle,
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                style: const TextStyle(color: Color(0xFFBBBBBB), fontSize: 10),
-              ),
-            ],
-          ),
-        ),
-        if (widget.signedIn)
-          TextButton(
-            onPressed: widget.onSignOut,
-            style: TextButton.styleFrom(
-              foregroundColor: AppColors.muted,
-              backgroundColor: const Color(0xFF24252A),
-              minimumSize: const Size(52, 30),
-              padding: const EdgeInsets.symmetric(horizontal: 10),
-              shape: const StadiumBorder(),
-              textStyle: const TextStyle(fontSize: 10),
-            ),
-            child: Text(l10n.signOut),
-          )
-        else
-          TextButton(
-            key: const Key('mine-sign-in'),
-            onPressed: widget.onSignIn,
-            style: TextButton.styleFrom(
-              foregroundColor: AppColors.cream,
-              backgroundColor: const Color(0xFF24252A),
-              minimumSize: const Size(64, 30),
-              padding: const EdgeInsets.symmetric(horizontal: 10),
-              shape: const StadiumBorder(),
-              textStyle: const TextStyle(fontSize: 10),
-            ),
-            child: Text('${l10n.logIn}/${l10n.signUp}'),
-          ),
-      ],
-    );
-  }
-
-  Widget _wallet(AppLocalizations l10n) {
-    return InkWell(
-      key: const Key('mine-wallet'),
-      onTap: () => _mockSnack(l10n),
-      borderRadius: BorderRadius.circular(13),
-      child: Container(
-        padding: const EdgeInsets.all(12),
-        decoration: BoxDecoration(
-          color: AppColors.goldCard,
-          borderRadius: BorderRadius.circular(13),
-        ),
-        child: Row(
-          children: [
-            const Icon(
-              Icons.monetization_on_rounded,
-              color: AppColors.gold,
-              size: 20,
-            ),
-            const SizedBox(width: 9),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    l10n.coins,
-                    style: const TextStyle(
-                      color: AppColors.onSurface,
-                      fontSize: 12,
-                      fontWeight: FontWeight.w800,
-                    ),
-                  ),
-                  const SizedBox(height: 2),
-                  Text(
-                    '0 ${l10n.coins} · ${l10n.topUpWallet}',
-                    style: const TextStyle(
-                      color: AppColors.accent,
-                      fontSize: 9,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const Icon(
-              Icons.chevron_right_rounded,
-              color: Color(0xFF666666),
-              size: 16,
-            ),
-          ],
         ),
       ),
     );
   }
 
-  WatchProgress? get _continueRecord {
-    for (final record in logic.recent) {
-      if (!record.finished && record.hasPosition) return record;
-    }
-    return null;
-  }
-
-  Drama? get _continueDrama {
-    final record = _continueRecord;
-    if (record == null) return null;
-    for (final drama in <Drama>[...?widget.dramas, widget.drama]) {
-      if (drama.id == record.dramaId) return drama;
-    }
-    return null;
-  }
-
-  Widget _continueCard(
-    AppLocalizations l10n,
-    Drama drama,
-    WatchProgress record,
-  ) {
-    return Container(
-      key: const Key('mine-continue-watching'),
-      padding: const EdgeInsets.all(9),
-      decoration: BoxDecoration(
-        color: AppColors.card,
-        borderRadius: BorderRadius.circular(12),
-      ),
-      child: Row(
-        children: [
-          _poster(drama, width: 50, height: 64, radius: 7),
-          const SizedBox(width: 9),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  l10n.continueWatching,
-                  style: const TextStyle(
-                    color: AppColors.accent,
-                    fontSize: 9,
-                    fontWeight: FontWeight.w800,
-                  ),
-                ),
-                const SizedBox(height: 2),
-                Text(
-                  localizedDramaTitle(l10n, drama),
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    color: AppColors.onSurface,
-                    fontSize: 12,
-                    fontWeight: FontWeight.w800,
-                  ),
-                ),
-                const SizedBox(height: 2),
-                Text(
-                  '${_episodeText(drama, record)} · '
-                  '${_clock(record.position)} / ${_clock(record.duration)}',
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(color: Color(0xFFBBBBBB), fontSize: 9),
-                ),
-              ],
-            ),
-          ),
-          const SizedBox(width: 8),
-          SizedBox(
-            width: 60,
-            height: 28,
-            child: FilledButton(
-              onPressed: () => _resume(drama),
-              style: FilledButton.styleFrom(
-                backgroundColor: AppColors.blue,
-                foregroundColor: AppColors.onPrimary,
-                padding: EdgeInsets.zero,
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(9),
-                ),
-                textStyle: const TextStyle(
-                  fontSize: 10,
-                  fontWeight: FontWeight.w700,
-                ),
-              ),
-              child: Text(l10n.resume),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _library(AppLocalizations l10n) {
-    final tabs = [l10n.history, l10n.watchlist, l10n.likedTab];
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        SingleChildScrollView(
-          scrollDirection: Axis.horizontal,
-          child: Row(
-            children: [
-              for (var index = 0; index < tabs.length; index++)
-                Padding(
-                  padding: EdgeInsets.only(
-                    right: index == tabs.length - 1 ? 0 : 20,
-                  ),
-                  child: Semantics(
-                    selected: logic.section == index,
-                    button: true,
-                    child: InkWell(
-                      key: Key('mine-library-tab-$index'),
-                      onTap: () => logic.selectSection(index),
-                      child: Padding(
-                        padding: const EdgeInsets.symmetric(vertical: 6),
-                        child: Column(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            Text(
-                              tabs[index],
-                              maxLines: 1,
-                              style: TextStyle(
-                                color: logic.section == index
-                                    ? AppColors.blue
-                                    : const Color(0xFFE4DBDD),
-                                fontSize: 14,
-                                fontWeight: FontWeight.w800,
-                              ),
-                            ),
-                            const SizedBox(height: 4),
-                            AnimatedContainer(
-                              duration: const Duration(milliseconds: 160),
-                              width: 18,
-                              height: 2,
-                              decoration: BoxDecoration(
-                                color: logic.section == index
-                                    ? AppColors.blue
-                                    : Colors.transparent,
-                                borderRadius: BorderRadius.circular(1),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-            ],
-          ),
-        ),
-        const SizedBox(height: 12),
-        if (logic.section == 1 && context.watch<FavoriteController>().loading)
-          const Center(
-            child: Padding(
-              padding: EdgeInsets.all(12),
-              child: CircularProgressIndicator(strokeWidth: 2),
-            ),
-          )
-        else if (logic.section == 1)
-          ..._favoriteCards(l10n)
-        else if (logic.section == 2)
-          ..._likedCards(l10n)
-        else if (logic.recentLoading)
-          const Center(
-            child: Padding(
-              padding: EdgeInsets.all(12),
-              child: CircularProgressIndicator(strokeWidth: 2),
-            ),
-          )
-        else if (_recentDramas.isEmpty)
-          EmptyState(
-            key: const Key('mine-recent-empty'),
-            icon: Icons.history_rounded,
-            title: l10n.noStories,
-            subtitle: l10n.emptyHint,
-            compact: true,
-          )
-        else
-          for (final drama in _recentDramas) ...[
-            _historyCard(l10n, drama),
-            const SizedBox(height: 8),
-          ],
-      ],
-    );
-  }
-
-  List<Widget> _favoriteCards(AppLocalizations l10n) {
-    final favorites = context.watch<FavoriteController>();
-    if (favorites.error != null && favorites.cards.isEmpty) {
-      return [
-        EmptyState(
-          icon: Icons.cloud_off_rounded,
-          title: errorText(l10n, favorites.error, l10n.favoritesError),
-          actionLabel: l10n.retry,
-          onAction: () => unawaited(favorites.load()),
-          compact: true,
-        ),
-      ];
-    }
-    if (favorites.cards.isEmpty) {
-      return [
-        EmptyState(
-          key: const Key('mine-saved-empty'),
-          icon: Icons.bookmark_border_rounded,
-          title: l10n.noSavedShows,
-          subtitle: l10n.emptyHint,
-          compact: true,
-        ),
-      ];
-    }
-    return [
-      for (final drama in favorites.cards) ...[
-        _smallDramaCard(l10n, drama),
-        const SizedBox(height: 8),
-      ],
-    ];
-  }
-
-  List<Widget> _likedCards(AppLocalizations l10n) {
-    final interactions = context.watch<InteractionController>();
-    final dramas = <Drama>[
-      ...?widget.dramas,
-      widget.drama,
-    ].where((drama) => interactions.isLiked(drama.id)).toList();
-    if (dramas.isEmpty) {
-      return [
-        EmptyState(
-          key: const Key('mine-saved-empty'),
-          icon: Icons.favorite_border_rounded,
-          title: l10n.noSavedShows,
-          subtitle: l10n.emptyHint,
-          compact: true,
-        ),
-      ];
-    }
-    return [
-      for (final drama in dramas) ...[
-        _smallDramaCard(l10n, drama),
-        const SizedBox(height: 8),
-      ],
-    ];
-  }
-
-  Widget _historyCard(AppLocalizations l10n, Drama drama) {
-    final record = _recordFor(drama.id);
-    return InkWell(
-      key: Key('mine-history-card-${drama.id}'),
-      onTap: () => _resume(drama),
-      borderRadius: BorderRadius.circular(12),
-      child: Container(
-        padding: const EdgeInsets.all(10),
-        decoration: BoxDecoration(
-          color: AppColors.card,
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: Row(
-          children: [
-            _poster(drama, width: 48, height: 60, radius: 7),
-            const SizedBox(width: 9),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    localizedDramaTitle(l10n, drama),
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                    style: const TextStyle(
-                      color: AppColors.onSurface,
-                      fontSize: 11,
-                      fontWeight: FontWeight.w700,
-                    ),
-                  ),
-                  const SizedBox(height: 3),
-                  Text(
-                    record == null
-                        ? l10n.episodeCount(drama.episodeCount)
-                        : '${_episodeText(drama, record)} · '
-                              '${_clock(record.position)} / ${_clock(record.duration)}',
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                    style: const TextStyle(
-                      color: Color(0xFFBBBBBB),
-                      fontSize: 9,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            Container(
-              width: 26,
-              height: 26,
-              decoration: const BoxDecoration(
-                color: Color(0xFF313137),
-                shape: BoxShape.circle,
-              ),
-              child: const Icon(
-                Icons.play_arrow_rounded,
-                color: AppColors.blue,
-                size: 15,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _smallDramaCard(AppLocalizations l10n, Drama drama) {
-    return InkWell(
-      onTap: () {
-        if (widget.onDramaSelected != null) {
-          widget.onDramaSelected!(drama);
-        } else {
-          _resume(drama);
-        }
-      },
-      borderRadius: BorderRadius.circular(12),
-      child: Container(
-        padding: const EdgeInsets.all(10),
-        decoration: BoxDecoration(
-          color: AppColors.card,
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: Row(
-          children: [
-            _poster(drama, width: 48, height: 60, radius: 7),
-            const SizedBox(width: 9),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    localizedDramaTitle(l10n, drama),
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                    style: const TextStyle(
-                      color: AppColors.onSurface,
-                      fontSize: 11,
-                      fontWeight: FontWeight.w700,
-                    ),
-                  ),
-                  const SizedBox(height: 3),
-                  Text(
-                    l10n.episodeCount(drama.episodeCount),
-                    style: const TextStyle(
-                      color: Color(0xFFBBBBBB),
-                      fontSize: 9,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const Icon(
-              Icons.chevron_right_rounded,
-              color: AppColors.muted,
-              size: 16,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _languageRow(AppLocalizations l10n) {
+  Widget _body(BuildContext context, AppLocalizations l10n) {
+    final auth = context.watch<AuthController>();
+    final wallet = context.watch<WalletController>();
     final locale = context.watch<LocaleController>();
-    final code = locale.locale?.languageCode ?? 'id';
-    final value = switch (code) {
+    return ListView(
+      key: const Key('mine-page-scroll'),
+      padding: const EdgeInsets.fromLTRB(
+        AppDimens.pageHorizontal,
+        0,
+        AppDimens.pageHorizontal,
+        AppDimens.spaceXl,
+      ),
+      children: [
+        MineHeader(onTap: () => _openDestination(MineDestination.settings)),
+        const SizedBox(height: AppDimens.spaceMd),
+        MineShortcutGrid(onOpen: _openDestination),
+        const SizedBox(height: AppDimens.spaceMd),
+        MineWalletCard(
+          balance: _walletValue(l10n, auth, wallet),
+          onOpen: () => _openDestination(MineDestination.wallet),
+          onRecharge: _openRecharge,
+        ),
+        const SizedBox(height: AppDimens.spaceMd),
+        MineVipCard(onOpen: () => _openDestination(MineDestination.vip)),
+        const SizedBox(height: AppDimens.spaceMd),
+        MineMenuList(
+          onOpen: _openDestination,
+          onLanguage: _openLanguage,
+          languageLabel: _languageLabel(l10n, locale.locale),
+        ),
+      ],
+    );
+  }
+
+  String _walletValue(
+    AppLocalizations l10n,
+    AuthController auth,
+    WalletController wallet,
+  ) {
+    if (!auth.isSignedIn) return l10n.logInHint;
+    if (wallet.snapshot == null) return l10n.coins;
+    return l10n.walletBalanceShort(wallet.balance);
+  }
+
+  void _openDestination(MineDestination destination) {
+    switch (destination) {
+      case MineDestination.watchlist:
+        _push(const FavoritesPage());
+      case MineDestination.history:
+        _push(const WatchRecordsPage());
+      case MineDestination.downloads:
+        _push(const DownloadsPage());
+      case MineDestination.wallet:
+        _openProtected(const WalletPage());
+      case MineDestination.vip:
+        _openVip();
+      case MineDestination.works:
+        _pushPlaceholder(MinePlaceholderKind.works);
+      case MineDestination.creatorCenter:
+        _pushPlaceholder(MinePlaceholderKind.creator);
+      case MineDestination.notices:
+        _push(const NoticesPage());
+      case MineDestination.settings:
+        _push(const SettingsPage());
+      case MineDestination.help:
+        _pushPlaceholder(MinePlaceholderKind.help);
+    }
+  }
+
+  void _push(Widget page) {
+    Navigator.of(context).push<void>(MaterialPageRoute(builder: (_) => page));
+  }
+
+  void _pushPlaceholder(MinePlaceholderKind kind) {
+    _push(_MinePlaceholderPage(kind: kind));
+  }
+
+  Future<void> _openProtected(Widget page) async {
+    if (!context.read<AuthController>().isSignedIn) {
+      await ensureSignedIn(context);
+      return;
+    }
+    if (mounted) _push(page);
+  }
+
+  void _openVip() {
+    final wallet = context.read<WalletController>();
+    _openProtected(VipPage(onPurchased: () => unawaited(wallet.load())));
+  }
+
+  String _languageLabel(AppLocalizations l10n, Locale? locale) {
+    return switch (locale?.languageCode) {
       'zh' => l10n.simplifiedChinese,
       'en' => l10n.english,
-      _ => l10n.bahasaIndonesia,
+      'id' => l10n.bahasaIndonesia,
+      _ => l10n.language,
     };
-    return InkWell(
-      key: const Key('mine-language'),
-      onTap: () => logic.showLanguage(
-        context,
-        showServerSetting: widget.debugShowSetting,
-      ),
-      borderRadius: BorderRadius.circular(12),
-      child: Container(
-        padding: const EdgeInsets.all(12),
-        decoration: BoxDecoration(
-          color: AppColors.card,
-          borderRadius: BorderRadius.circular(12),
+  }
+
+  Future<void> _openLanguage() async {
+    final selected = await showModalBottomSheet<Locale>(
+      context: context,
+      backgroundColor: Colors.transparent,
+      showDragHandle: false,
+      builder: (_) =>
+          _LanguageSheet(selected: context.read<LocaleController>().locale),
+    );
+    if (selected == null || !mounted) return;
+    await context.read<LocaleController>().select(selected);
+  }
+
+  void _openRecharge() {
+    final wallet = context.read<WalletController>();
+    _openProtected(RechargePage(onPurchased: () => unawaited(wallet.load())));
+  }
+
+  Widget _bottomNav(AppLocalizations l10n) {
+    return AppBottomNav(
+      items: [
+        AppBottomNavItem(
+          tabKey: const Key('mine-nav-home'),
+          icon: Icons.home_outlined,
+          selectedIcon: Icons.home_rounded,
+          label: l10n.homeTab,
+          onTap: () => _act(MyPageAction.home),
         ),
-        child: Row(
-          children: [
-            const Icon(
-              Icons.language_rounded,
-              color: AppColors.muted,
-              size: 14,
-            ),
-            const SizedBox(width: 9),
-            Expanded(
-              child: Text(
-                l10n.appLanguage,
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                style: const TextStyle(
-                  color: AppColors.onSurface,
-                  fontSize: 11,
-                ),
-              ),
-            ),
-            Text(
-              value,
-              style: const TextStyle(color: AppColors.accent, fontSize: 10),
-            ),
-            const SizedBox(width: 3),
-            const Icon(
-              Icons.chevron_right_rounded,
-              color: AppColors.accent,
-              size: 16,
-            ),
-          ],
+        AppBottomNavItem(
+          tabKey: const Key('mine-nav-discover'),
+          icon: Icons.explore_outlined,
+          selectedIcon: Icons.explore_rounded,
+          label: l10n.theaterTab,
+          onTap: () => _act(MyPageAction.discover),
         ),
-      ),
+        AppBottomNavItem(
+          tabKey: const Key('mine-nav-create'),
+          icon: Icons.add_box_outlined,
+          selectedIcon: Icons.add_box_rounded,
+          label: l10n.createTab,
+          onTap: () => _act(MyPageAction.create),
+        ),
+        AppBottomNavItem(
+          tabKey: const Key('mine-nav-current'),
+          icon: Icons.person_outline_rounded,
+          selectedIcon: Icons.person_rounded,
+          label: l10n.myTab,
+          selected: true,
+          onTap: () {},
+        ),
+      ],
     );
   }
 
-  Widget _menuCard(AppLocalizations l10n) {
-    return Material(
-      color: AppColors.card,
-      borderRadius: BorderRadius.circular(12),
-      clipBehavior: Clip.antiAlias,
-      child: Column(
-        children: [
-          _menuTile(
-            icon: Icons.notifications_none_rounded,
-            title: l10n.notices,
-            key: const Key('mine-notices'),
-            onTap: () => Navigator.of(context).push<void>(
-              MaterialPageRoute(builder: (_) => const NoticesPage()),
-            ),
-          ),
-          _menuTile(
-            icon: Icons.history_rounded,
-            title: l10n.watchHistory,
-            onTap: () => Navigator.of(context).push<void>(
-              MaterialPageRoute(builder: (_) => const WatchRecordsPage()),
-            ),
-          ),
-          _menuTile(
-            icon: Icons.favorite_outline_rounded,
-            title: l10n.myFavorites,
-            onTap: () => Navigator.of(context).push<void>(
-              MaterialPageRoute(builder: (_) => const FavoritesPage()),
-            ),
-          ),
-          _menuTile(
-            icon: Icons.download_outlined,
-            title: l10n.downloads,
-            onTap: () => Navigator.of(context).push<void>(
-              MaterialPageRoute(builder: (_) => const DownloadsPage()),
-            ),
-          ),
-          _menuTile(
-            icon: Icons.settings_rounded,
-            title: l10n.settings,
-            onTap: () => logic.showLanguage(
-              context,
-              showServerSetting: widget.debugShowSetting,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _menuTile({
-    required IconData icon,
-    required String title,
-    required VoidCallback onTap,
-    Key? key,
-  }) {
-    return ListTile(
-      key: key,
-      dense: true,
-      minTileHeight: 44,
-      leading: Icon(icon, color: AppColors.secondary, size: 17),
-      title: Text(
-        title,
-        style: const TextStyle(color: AppColors.onSurface, fontSize: 11),
-      ),
-      trailing: const Icon(
-        Icons.chevron_right_rounded,
-        color: AppColors.muted,
-        size: 16,
-      ),
-      onTap: onTap,
-    );
-  }
-
-  Widget _bottomNav(AppLocalizations l10n) => AppBottomNav(
-    items: [
-      AppBottomNavItem(
-        tabKey: const Key('mine-nav-home'),
-        icon: Icons.play_circle_outline_rounded,
-        selectedIcon: Icons.play_circle_fill_rounded,
-        label: l10n.homeTab,
-        onTap: () => logic.act(
-          context,
-          MyPageAction.home,
-          embedded: widget.embedded,
-          onAction: widget.onAction,
-        ),
-      ),
-      AppBottomNavItem(
-        tabKey: const Key('mine-nav-discover'),
-        icon: Icons.explore_outlined,
-        selectedIcon: Icons.explore_rounded,
-        label: l10n.discoverTab,
-        onTap: () => logic.act(
-          context,
-          MyPageAction.discover,
-          embedded: widget.embedded,
-          onAction: widget.onAction,
-        ),
-      ),
-      AppBottomNavItem(
-        tabKey: const Key('mine-nav-current'),
-        icon: Icons.video_library_outlined,
-        selectedIcon: Icons.video_library_rounded,
-        label: l10n.myTab,
-        selected: true,
-        onTap: () {},
-      ),
-    ],
-  );
-
-  List<Drama> get _recentDramas {
-    final pool = <Drama>[...?widget.dramas, widget.drama];
-    final result = <Drama>[];
-    for (final item in logic.recent) {
-      for (final drama in pool) {
-        if (drama.id == item.dramaId &&
-            !result.any((picked) => picked.id == drama.id)) {
-          result.add(drama);
-        }
-      }
-    }
-    return result;
-  }
-
-  WatchProgress? _recordFor(String dramaId) {
-    for (final record in logic.recent) {
-      if (record.dramaId == dramaId) return record;
-    }
-    return null;
-  }
-
-  String _episodeText(Drama drama, WatchProgress record) {
-    for (final episode in drama.episodes) {
-      if (episode.id == record.episodeId) {
-        return AppLocalizations.of(
-          context,
-        )!.episodeOfTotal(episode.number, drama.episodeCount);
-      }
-    }
-    return AppLocalizations.of(context)!.episodeCount(drama.episodeCount);
-  }
-
-  void _resume(Drama drama) {
-    if (widget.onDramaSelected != null) {
-      widget.onDramaSelected!(drama);
-    } else {
-      logic.act(
-        context,
-        MyPageAction.resume,
-        embedded: widget.embedded,
-        onAction: widget.onAction,
-      );
-    }
-  }
-
-  void _mockSnack(AppLocalizations l10n) {
-    ScaffoldMessenger.of(
+  void _act(MyPageAction action) {
+    logic.act(
       context,
-    ).showSnackBar(SnackBar(content: Text(l10n.mockNotice)));
-  }
-
-  Widget _poster(
-    Drama drama, {
-    required double width,
-    required double height,
-    required double radius,
-  }) => ClipRRect(
-    borderRadius: BorderRadius.circular(radius),
-    child: RemoteImage(drama.posterUrl, width: width, height: height),
-  );
-
-  String _clock(Duration duration) {
-    final minutes = duration.inMinutes.remainder(60).toString().padLeft(2, '0');
-    final seconds = duration.inSeconds.remainder(60).toString().padLeft(2, '0');
-    return '$minutes:$seconds';
+      action,
+      embedded: embedded,
+      onAction: widget.callbacks.onAction,
+    );
   }
 }
 
-class _RoundHeaderButton extends StatelessWidget {
-  const _RoundHeaderButton({
-    super.key,
-    required this.tooltip,
-    required this.icon,
-    required this.onTap,
-  });
+class _LanguageSheet extends StatelessWidget {
+  const _LanguageSheet({required this.selected});
 
-  final String tooltip;
-  final IconData icon;
-  final VoidCallback onTap;
+  final Locale? selected;
 
   @override
   Widget build(BuildContext context) {
-    return SizedBox(
-      width: 36,
-      height: 36,
-      child: IconButton(
-        tooltip: tooltip,
-        onPressed: onTap,
-        padding: EdgeInsets.zero,
-        style: IconButton.styleFrom(
-          backgroundColor: const Color(0xFF2C2D33),
-          foregroundColor: AppColors.onSurface,
+    final l10n = AppLocalizations.of(context)!;
+    final options = [
+      (
+        const Locale('zh'),
+        const Key('mine-language-zh'),
+        l10n.simplifiedChinese,
+      ),
+      (const Locale('en'), const Key('mine-language-en'), l10n.english),
+      (const Locale('id'), const Key('mine-language-id'), l10n.bahasaIndonesia),
+    ];
+    return Material(
+      key: const Key('mine-language-sheet'),
+      color: AppColors.card,
+      borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
+      clipBehavior: Clip.antiAlias,
+      child: SafeArea(
+        top: false,
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(20, 14, 20, 20),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      l10n.language,
+                      style: const TextStyle(
+                        color: AppColors.onSurface,
+                        fontSize: 20,
+                        fontWeight: FontWeight.w800,
+                      ),
+                    ),
+                  ),
+                  IconButton(
+                    tooltip: l10n.close,
+                    onPressed: () => Navigator.pop(context),
+                    icon: const Icon(Icons.close_rounded),
+                  ),
+                ],
+              ),
+              for (final option in options)
+                ListTile(
+                  key: option.$2,
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 4),
+                  title: Text(option.$3),
+                  trailing: selected?.languageCode == option.$1.languageCode
+                      ? const Icon(Icons.check_rounded, color: AppColors.blue)
+                      : null,
+                  onTap: () => Navigator.pop(context, option.$1),
+                ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+enum MinePlaceholderKind { works, creator, help }
+
+class _MinePlaceholderPage extends StatelessWidget {
+  const _MinePlaceholderPage({required this.kind});
+
+  final MinePlaceholderKind kind;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final title = switch (kind) {
+      MinePlaceholderKind.works => l10n.myWorks,
+      MinePlaceholderKind.creator => l10n.creatorCenter,
+      MinePlaceholderKind.help => l10n.helpFeedback,
+    };
+    return PlainPageScaffold(
+      pageKey: const Key('mine-placeholder-page'),
+      backKey: const Key('mine-placeholder-back'),
+      title: title,
+      child: Center(
+        child: Text(
+          l10n.comingSoon,
+          style: const TextStyle(
+            color: AppColors.muted,
+            fontSize: AppDimens.body,
+          ),
         ),
-        icon: Icon(icon, size: 18),
       ),
     );
   }
diff --git a/lib/pages/mine/widgets/mine_header.dart b/lib/pages/mine/widgets/mine_header.dart
new file mode 100644
index 0000000..cce6ebc
--- /dev/null
+++ b/lib/pages/mine/widgets/mine_header.dart
@@ -0,0 +1,112 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../../core/data/services/auth_controller.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/theme/app_dimens.dart';
+import '../../../core/theme/app_theme.dart';
+import '../../../core/widgets/remote_image.dart';
+import '../../../l10n/app_localizations.dart';
+
+/// 「我的」页顶部身份卡。
+class MineHeader extends StatelessWidget {
+  const MineHeader({super.key, required this.onTap});
+
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final auth = context.watch<AuthController>();
+    final user = auth.user;
+    final signedIn = auth.isSignedIn;
+    final name = signedIn && (user?.nickname.isNotEmpty ?? false)
+        ? user!.nickname
+        : l10n.localViewer;
+    final subtitle = signedIn && (user?.uid.isNotEmpty ?? false)
+        ? 'ID: ${user!.uid}'
+        : l10n.logInHint;
+    return Container(
+      key: const Key('mine-user-row'),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          onTap: onTap,
+          child: Padding(
+            padding: const EdgeInsets.all(AppDimens.cardPadding),
+            child: Row(
+              children: [
+                _avatar(user?.avatarUrl ?? ''),
+                const SizedBox(width: AppDimens.spaceMd),
+                Expanded(child: _labels(name, subtitle)),
+                const Icon(
+                  Icons.chevron_right_rounded,
+                  color: AppColors.subtle,
+                  size: 20,
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _avatar(String path) {
+    return Container(
+      key: const Key('mine-avatar'),
+      width: 64,
+      height: 64,
+      decoration: const BoxDecoration(
+        color: AppColors.badgePink,
+        shape: BoxShape.circle,
+      ),
+      clipBehavior: Clip.antiAlias,
+      child: path.isEmpty
+          ? const Icon(
+              Icons.person_rounded,
+              color: AppColors.badgePinkText,
+              size: 30,
+            )
+          : RemoteImage(path, fit: BoxFit.cover),
+    );
+  }
+
+  Widget _labels(String name, String subtitle) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          name,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: const TextStyle(
+            fontFamily: 'Outfit',
+            color: AppColors.onSurface,
+            fontSize: 18,
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+        const SizedBox(height: AppDimens.spaceXs),
+        Text(
+          subtitle,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: const TextStyle(
+            color: AppColors.muted,
+            fontSize: AppDimens.caption,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/mine/widgets/mine_menu.dart b/lib/pages/mine/widgets/mine_menu.dart
new file mode 100644
index 0000000..8fc6270
--- /dev/null
+++ b/lib/pages/mine/widgets/mine_menu.dart
@@ -0,0 +1,404 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/theme/app_colors.dart';
+import '../../../core/theme/app_dimens.dart';
+import '../../../core/theme/app_theme.dart';
+import '../../../l10n/app_localizations.dart';
+import '../mine_types.dart';
+
+/// 我的页三宫格快捷入口。
+class MineShortcutGrid extends StatelessWidget {
+  const MineShortcutGrid({super.key, required this.onOpen});
+
+  final ValueChanged<MineDestination> onOpen;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Row(
+      children: [
+        Expanded(
+          child: _ShortcutTile(
+            key: const Key('mine-watchlist'),
+            icon: Icons.bookmark_rounded,
+            label: l10n.watchlist,
+            onTap: () => onOpen(MineDestination.watchlist),
+          ),
+        ),
+        const SizedBox(width: 10),
+        Expanded(
+          child: _ShortcutTile(
+            key: const Key('mine-history'),
+            icon: Icons.history_rounded,
+            label: l10n.watchHistory,
+            onTap: () => onOpen(MineDestination.history),
+          ),
+        ),
+        const SizedBox(width: 10),
+        Expanded(
+          child: _ShortcutTile(
+            key: const Key('mine-downloads'),
+            icon: Icons.download_rounded,
+            label: l10n.downloads,
+            onTap: () => onOpen(MineDestination.downloads),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _ShortcutTile extends StatelessWidget {
+  const _ShortcutTile({
+    super.key,
+    required this.icon,
+    required this.label,
+    required this.onTap,
+  });
+
+  final IconData icon;
+  final String label;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          onTap: onTap,
+          child: SizedBox(
+            height: 88,
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Icon(icon, color: AppColors.blue, size: 24),
+                const SizedBox(height: AppDimens.spaceSm),
+                Text(
+                  label,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: AppDimens.caption,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+/// 金币余额卡。
+class MineWalletCard extends StatelessWidget {
+  const MineWalletCard({
+    super.key,
+    required this.balance,
+    required this.onOpen,
+    required this.onRecharge,
+  });
+
+  final String balance;
+  final VoidCallback onOpen;
+  final VoidCallback onRecharge;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Container(
+      key: const Key('mine-wallet'),
+      padding: const EdgeInsets.all(AppDimens.cardPadding),
+      decoration: BoxDecoration(
+        gradient: const LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: [AppColors.goldCard, AppColors.card],
+        ),
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Row(
+        children: [
+          const Icon(
+            Icons.monetization_on_rounded,
+            color: AppColors.gold,
+            size: 30,
+          ),
+          const SizedBox(width: AppDimens.spaceMd),
+          Expanded(
+            child: InkWell(
+              onTap: onOpen,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    l10n.coinBalance,
+                    style: const TextStyle(
+                      color: AppColors.muted,
+                      fontSize: AppDimens.caption,
+                    ),
+                  ),
+                  const SizedBox(height: 3),
+                  Text(
+                    balance,
+                    style: const TextStyle(
+                      color: AppColors.onSurface,
+                      fontSize: AppDimens.pageTitle,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          TextButton(
+            key: const Key('mine-wallet-recharge'),
+            onPressed: onRecharge,
+            style: TextButton.styleFrom(
+              backgroundColor: AppColors.blue,
+              foregroundColor: AppColors.onPrimary,
+              minimumSize: const Size(64, AppDimens.buttonCompact),
+              shape: const StadiumBorder(),
+            ),
+            child: Text(l10n.topUpWallet),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// 会员权益卡。
+class MineVipCard extends StatelessWidget {
+  const MineVipCard({super.key, required this.onOpen});
+
+  final VoidCallback onOpen;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Container(
+      key: const Key('mine-vip'),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          onTap: onOpen,
+          child: Padding(
+            padding: const EdgeInsets.all(AppDimens.cardPadding),
+            child: Row(
+              children: [
+                Container(
+                  width: AppDimens.buttonLarge,
+                  height: AppDimens.buttonLarge,
+                  decoration: const BoxDecoration(
+                    color: AppColors.badgePink,
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Icon(
+                    Icons.workspace_premium_rounded,
+                    color: AppColors.badgePinkText,
+                    size: 22,
+                  ),
+                ),
+                const SizedBox(width: AppDimens.spaceMd),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        l10n.vipMembership,
+                        style: const TextStyle(
+                          color: AppColors.onSurface,
+                          fontSize: AppDimens.listTitle,
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                      const SizedBox(height: 3),
+                      Text(
+                        l10n.vipUnlockMessage,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          color: AppColors.muted,
+                          fontSize: AppDimens.caption,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                Text(
+                  l10n.joinVip,
+                  style: const TextStyle(
+                    color: AppColors.blue,
+                    fontSize: AppDimens.caption,
+                    fontWeight: FontWeight.w700,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+/// 我的页功能菜单。
+class MineMenuList extends StatelessWidget {
+  const MineMenuList({
+    super.key,
+    required this.onOpen,
+    required this.onLanguage,
+    required this.languageLabel,
+  });
+
+  final ValueChanged<MineDestination> onOpen;
+  final VoidCallback onLanguage;
+  final String languageLabel;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Container(
+      key: const Key('mine-menu'),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        clipBehavior: Clip.antiAlias,
+        child: Column(
+          children: [
+            _row(
+              key: const Key('mine-works'),
+              icon: Icons.video_collection_outlined,
+              title: l10n.myWorks,
+              destination: MineDestination.works,
+            ),
+            _divider(),
+            _row(
+              key: const Key('mine-creator-center'),
+              icon: Icons.auto_awesome_rounded,
+              title: l10n.creatorCenter,
+              destination: MineDestination.creatorCenter,
+            ),
+            _divider(),
+            _row(
+              key: const Key('mine-notices'),
+              icon: Icons.notifications_none_rounded,
+              title: l10n.notices,
+              destination: MineDestination.notices,
+            ),
+            _divider(),
+            _row(
+              key: const Key('mine-settings'),
+              icon: Icons.settings_outlined,
+              title: l10n.settings,
+              destination: MineDestination.settings,
+            ),
+            _divider(),
+            _languageRow(context),
+            _divider(),
+            _row(
+              key: const Key('mine-help'),
+              icon: Icons.help_outline_rounded,
+              title: l10n.helpFeedback,
+              destination: MineDestination.help,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _languageRow(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return ListTile(
+      key: const Key('mine-language'),
+      minTileHeight: 48,
+      contentPadding: const EdgeInsets.symmetric(horizontal: 14),
+      leading: const Icon(
+        Icons.language_rounded,
+        color: AppColors.blue,
+        size: 20,
+      ),
+      title: Text(
+        l10n.language,
+        style: const TextStyle(
+          color: AppColors.onSurface,
+          fontSize: AppDimens.body,
+        ),
+      ),
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(
+            languageLabel,
+            style: const TextStyle(color: AppColors.muted, fontSize: 11),
+          ),
+          const SizedBox(width: 4),
+          const Icon(
+            Icons.chevron_right_rounded,
+            color: AppColors.subtle,
+            size: 18,
+          ),
+        ],
+      ),
+      onTap: onLanguage,
+    );
+  }
+
+  Widget _row({
+    required Key key,
+    required IconData icon,
+    required String title,
+    required MineDestination destination,
+  }) {
+    return ListTile(
+      key: key,
+      minTileHeight: 48,
+      contentPadding: const EdgeInsets.symmetric(horizontal: 14),
+      leading: Icon(icon, color: AppColors.blue, size: 20),
+      title: Text(
+        title,
+        style: const TextStyle(
+          color: AppColors.onSurface,
+          fontSize: AppDimens.body,
+        ),
+      ),
+      trailing: const Icon(
+        Icons.chevron_right_rounded,
+        color: AppColors.subtle,
+        size: 18,
+      ),
+      onTap: () => onOpen(destination),
+    );
+  }
+
+  Widget _divider() {
+    return const Divider(height: 1, indent: 14, endIndent: 14);
+  }
+}
diff --git a/lib/pages/new_releases/new_releases_page.dart b/lib/pages/new_releases/new_releases_page.dart
new file mode 100644
index 0000000..3076aab
--- /dev/null
+++ b/lib/pages/new_releases/new_releases_page.dart
@@ -0,0 +1,540 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/models/drama.dart';
+import '../../core/data/services/catalog_controller.dart';
+import '../../core/formatting/count_format.dart';
+import '../../core/theme/app_colors.dart';
+import '../../core/widgets/app_pull_to_refresh.dart';
+import '../../core/widgets/paged_local_list.dart';
+import '../../core/widgets/remote_image.dart';
+import '../../core/widgets/subpage_header.dart';
+import '../../l10n/app_localizations.dart';
+import '../discover/widgets/drama_grid.dart';
+import '../player/open_player.dart';
+
+const int _moreLimit = 12;
+const int _filmHoles = 8;
+const double _cardPadding = 8;
+const double _cardWidth = 124;
+const double _rowHeight = 204;
+const double _cardRadius = 12;
+const double _loadMoreThreshold = 200;
+
+/// 新剧页：暖色首映厅，今日首映大卡 + 横向更多新剧。
+class NewReleasesPage extends StatefulWidget {
+  const NewReleasesPage({super.key});
+
+  @override
+  State<NewReleasesPage> createState() => _NewReleasesPageState();
+}
+
+class _NewReleasesPageState extends State<NewReleasesPage> {
+  final ScrollController _scroll = ScrollController();
+  PagedLocalListController<Drama>? _pager;
+  bool _refreshing = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (_pager != null) return;
+    _pager = PagedLocalListController<Drama>(
+      items: _newest(context.read<CatalogController>().dramas),
+    )..addListener(_rebuild);
+  }
+
+  @override
+  void dispose() {
+    _pager
+      ?..removeListener(_rebuild)
+      ..dispose();
+    _scroll.dispose();
+    super.dispose();
+  }
+
+  void _rebuild() {
+    if (mounted) setState(() {});
+  }
+
+  List<Drama> _newest(List<Drama> source) {
+    return [...source]..sort((a, b) => b.id.compareTo(a.id));
+  }
+
+  Future<void> _refresh() async {
+    if (_refreshing) return;
+    _refreshing = true;
+    try {
+      final catalog = context.read<CatalogController>();
+      await catalog.refresh();
+      if (!mounted) return;
+      _pager!.replaceAll(_newest(catalog.dramas));
+      if (_scroll.hasClients) {
+        _scroll.jumpTo(_scroll.position.minScrollExtent);
+      }
+    } finally {
+      _refreshing = false;
+    }
+  }
+
+  bool _onScroll(ScrollNotification notification) {
+    if (notification.depth != 0 || _refreshing) return false;
+    final reachedBottom =
+        notification.metrics.extentAfter <= _loadMoreThreshold;
+    if (reachedBottom &&
+        (notification is ScrollUpdateNotification ||
+            notification is ScrollEndNotification ||
+            notification is OverscrollNotification)) {
+      unawaited(_pager!.loadMore());
+    }
+    return false;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final pager = _pager!;
+    final visible = pager.visibleItems;
+    final hero = visible.isEmpty ? null : visible.first;
+    final more = pager.items.skip(1).take(_moreLimit).toList();
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      value: SystemUiOverlayStyle.dark,
+      child: Scaffold(
+        key: const Key('new-releases-page'),
+        backgroundColor: AppColors.ink,
+        body: DecoratedBox(
+          decoration: const BoxDecoration(
+            gradient: LinearGradient(
+              begin: Alignment.topCenter,
+              end: Alignment.bottomCenter,
+              colors: [AppColors.surfaceTop, AppColors.ink],
+            ),
+          ),
+          child: SafeArea(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                AppSubpageHeader(
+                  title: l10n.newReleasesTitle,
+                  subtitle: l10n.newReleasesSubtitle,
+                  backKey: const Key('new-releases-back'),
+                  actions: _countChip(l10n, pager.items.length),
+                ),
+                Expanded(
+                  child: NotificationListener<ScrollNotification>(
+                    onNotification: _onScroll,
+                    child: AppPullToRefresh(
+                      key: const Key('new-releases-refresh'),
+                      onRefresh: _refresh,
+                      child: ListView(
+                        key: const Key('new-releases-list'),
+                        controller: _scroll,
+                        physics: AppPullToRefresh.physics,
+                        padding: const EdgeInsets.only(bottom: 24),
+                        children: hero == null
+                            ? [
+                                SizedBox(
+                                  height: 420,
+                                  child: Center(
+                                    child: Text(
+                                      l10n.noStories,
+                                      key: const Key('new-releases-empty'),
+                                      style: const TextStyle(
+                                        color: AppColors.muted,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ]
+                            : [
+                                Padding(
+                                  padding: const EdgeInsets.symmetric(
+                                    horizontal: 16,
+                                  ),
+                                  child: _heroCard(context, l10n, hero),
+                                ),
+                                const SizedBox(height: 14),
+                                const _FilmStrip(),
+                                const SizedBox(height: 14),
+                                if (more.isNotEmpty) ...[
+                                  _moreHeader(l10n),
+                                  const SizedBox(height: 10),
+                                  SizedBox(
+                                    height: _rowHeight,
+                                    child: ListView.separated(
+                                      key: const Key('new-releases-row'),
+                                      scrollDirection: Axis.horizontal,
+                                      padding: const EdgeInsets.symmetric(
+                                        horizontal: 16,
+                                      ),
+                                      itemCount: more.length,
+                                      separatorBuilder: (_, _) =>
+                                          const SizedBox(width: 10),
+                                      itemBuilder: (context, index) =>
+                                          _moreCard(
+                                            context,
+                                            l10n,
+                                            more[index],
+                                            index,
+                                          ),
+                                    ),
+                                  ),
+                                ],
+                                const SizedBox(height: 20),
+                                _allHeader(l10n),
+                                const SizedBox(height: 10),
+                                DramaGrid(
+                                  key: const Key('new-releases-all-grid'),
+                                  l10n: l10n,
+                                  dramas: visible,
+                                  onOpen: (drama) => unawaited(
+                                    playDramaFromCatalog(context, drama),
+                                  ),
+                                ),
+                                PagedLoadFooter(
+                                  loading: pager.loading,
+                                  hasMore: pager.hasMore,
+                                  hasItems: pager.items.isNotEmpty,
+                                  loadMoreKey: const Key(
+                                    'new-releases-load-more',
+                                  ),
+                                  noMoreKey: const Key('new-releases-no-more'),
+                                  noMoreLabel: l10n.noMore,
+                                ),
+                              ],
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _countChip(AppLocalizations l10n, int count) {
+    return Container(
+      key: const Key('new-releases-count'),
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+      decoration: BoxDecoration(
+        color: AppColors.badgeBeige,
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Text(
+        l10n.newReleasesCount(count),
+        style: const TextStyle(
+          color: AppColors.blue,
+          fontSize: 11,
+          fontWeight: FontWeight.w700,
+        ),
+      ),
+    );
+  }
+
+  Widget _heroCard(BuildContext context, AppLocalizations l10n, Drama drama) {
+    return GestureDetector(
+      key: const Key('new-releases-hero'),
+      onTap: () => unawaited(playDramaFromCatalog(context, drama)),
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(18),
+        child: AspectRatio(
+          aspectRatio: 16 / 9,
+          child: Stack(
+            fit: StackFit.expand,
+            children: [
+              RemoteImage(
+                drama.posterUrl,
+                fit: BoxFit.cover,
+                showFallbackIcon: true,
+                fallbackAspectRatio: 16 / 9,
+              ),
+              const DecoratedBox(
+                decoration: BoxDecoration(
+                  gradient: LinearGradient(
+                    begin: Alignment.topCenter,
+                    end: Alignment.bottomCenter,
+                    colors: [Color(0x00000000), Color(0xB3000000)],
+                  ),
+                ),
+              ),
+              Positioned(
+                top: 10,
+                left: 10,
+                child: _newBadge(
+                  l10n,
+                  key: const Key('new-releases-hero-badge'),
+                ),
+              ),
+              Positioned(
+                left: 12,
+                right: 64,
+                bottom: 10,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text(
+                      l10n.premiereToday,
+                      style: const TextStyle(
+                        color: Colors.white70,
+                        fontSize: 10,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    const SizedBox(height: 2),
+                    Text(
+                      drama.title,
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 20,
+                        fontWeight: FontWeight.w800,
+                      ),
+                    ),
+                    const SizedBox(height: 4),
+                    Row(
+                      children: [
+                        const Icon(
+                          Icons.local_fire_department_rounded,
+                          color: AppColors.blue,
+                          size: 12,
+                        ),
+                        const SizedBox(width: 4),
+                        Flexible(
+                          child: Text(
+                            l10n.heatLabel(
+                              formatInteractionCount(drama.viewCount),
+                            ),
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: const TextStyle(
+                              color: Colors.white70,
+                              fontSize: 11,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+              Positioned(
+                right: 12,
+                bottom: 12,
+                child: Container(
+                  key: const Key('new-releases-hero-play'),
+                  width: 40,
+                  height: 40,
+                  decoration: const BoxDecoration(
+                    color: AppColors.blue,
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Icon(
+                    Icons.play_arrow_rounded,
+                    color: Colors.white,
+                    size: 22,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _moreHeader(AppLocalizations l10n) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Row(
+        children: [
+          Expanded(
+            child: Text(
+              l10n.rankingNew,
+              style: const TextStyle(
+                color: AppColors.onSurface,
+                fontSize: 16,
+                fontWeight: FontWeight.w800,
+              ),
+            ),
+          ),
+          Text(
+            l10n.seeAll,
+            style: const TextStyle(color: AppColors.subtle, fontSize: 12),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _allHeader(AppLocalizations l10n) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Text(
+        l10n.newReleasesAll,
+        key: const Key('new-releases-all-header'),
+        style: const TextStyle(
+          color: AppColors.onSurface,
+          fontSize: 16,
+          fontWeight: FontWeight.w800,
+        ),
+      ),
+    );
+  }
+
+  Widget _moreCard(
+    BuildContext context,
+    AppLocalizations l10n,
+    Drama drama,
+    int index,
+  ) {
+    return GestureDetector(
+      key: Key('new-release-card-${drama.id}'),
+      onTap: () => unawaited(playDramaFromCatalog(context, drama)),
+      child: Container(
+        width: _cardWidth,
+        padding: const EdgeInsets.all(_cardPadding),
+        decoration: BoxDecoration(
+          color: AppColors.card,
+          borderRadius: BorderRadius.circular(_cardRadius),
+          boxShadow: const [
+            BoxShadow(
+              color: AppColors.cardShadow,
+              blurRadius: 12,
+              offset: Offset(0, 4),
+            ),
+          ],
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            ClipRRect(
+              borderRadius: BorderRadius.circular(8),
+              child: SizedBox(
+                width: 108,
+                height: 144,
+                child: Stack(
+                  fit: StackFit.expand,
+                  children: [
+                    RemoteImage(
+                      drama.posterUrl,
+                      fit: BoxFit.cover,
+                      showFallbackIcon: true,
+                      fallbackAspectRatio: 3 / 4,
+                    ),
+                    Positioned(
+                      top: 8,
+                      left: 8,
+                      child: _newBadge(
+                        l10n,
+                        key: Key('new-release-badge-$index'),
+                        compact: true,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            const SizedBox(height: 6),
+            Text(
+              drama.title,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: const TextStyle(
+                color: AppColors.onSurface,
+                fontSize: 13,
+                fontWeight: FontWeight.w700,
+              ),
+            ),
+            const SizedBox(height: 2),
+            Text(
+              _releaseDate(index),
+              style: const TextStyle(color: AppColors.subtle, fontSize: 12),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  /// 目录暂无上架时间字段，用倒序位次生成近几日的展示日期。
+  String _releaseDate(int index) {
+    final date = DateTime.now().subtract(Duration(days: index + 1));
+    final month = date.month.toString().padLeft(2, '0');
+    final day = date.day.toString().padLeft(2, '0');
+    return '$month/$day';
+  }
+
+  Widget _newBadge(
+    AppLocalizations l10n, {
+    required Key key,
+    bool compact = false,
+  }) {
+    return Container(
+      key: key,
+      padding: EdgeInsets.symmetric(
+        horizontal: compact ? 6 : 8,
+        vertical: compact ? 2 : 3,
+      ),
+      decoration: BoxDecoration(
+        color: AppColors.blue,
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Text(
+        l10n.newBadge,
+        style: TextStyle(
+          color: Colors.white,
+          fontSize: compact ? 9 : 10,
+          fontWeight: FontWeight.w800,
+        ),
+      ),
+    );
+  }
+}
+
+class _FilmStrip extends StatelessWidget {
+  const _FilmStrip();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      key: const Key('new-releases-film'),
+      height: 22,
+      decoration: const BoxDecoration(
+        color: AppColors.raised,
+        border: Border(
+          top: BorderSide(color: AppColors.border),
+          bottom: BorderSide(color: AppColors.border),
+        ),
+      ),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+        children: [_holes(), _holes()],
+      ),
+    );
+  }
+
+  Widget _holes() {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      children: [
+        for (var index = 0; index < _filmHoles; index++)
+          Container(
+            width: 6,
+            height: 8,
+            decoration: BoxDecoration(
+              color: AppColors.border,
+              borderRadius: BorderRadius.circular(2),
+            ),
+          ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/notices/notices_page.dart b/lib/pages/notices/notices_page.dart
index 0b16bac..ef59a4d 100644
--- a/lib/pages/notices/notices_page.dart
+++ b/lib/pages/notices/notices_page.dart
@@ -13,7 +13,9 @@ import '../../core/formatting/localized_date_time.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
+import '../../core/widgets/app_pull_to_refresh.dart';
 import '../../core/widgets/empty_state.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
 import '../../l10n/app_localizations.dart';
 
 /// Anonymous system notice list with pagination and detail dialog.
@@ -44,21 +46,14 @@ class _NoticesPageState extends State<NoticesPage> {
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     return Theme(
-      data: AppTheme.dark(),
-      child: Scaffold(
-        key: const Key('notices-page'),
-        backgroundColor: AppColors.ink,
-        appBar: AppBar(
-          backgroundColor: AppColors.ink,
-          foregroundColor: AppColors.onPrimary,
-          title: Text(l10n.notices),
-        ),
-        body: SafeArea(
-          top: false,
-          child: ListenableBuilder(
-            listenable: _controller,
-            builder: (context, _) => _body(l10n),
-          ),
+      data: AppTheme.light(),
+      child: PlainPageScaffold(
+        pageKey: const Key('notices-page'),
+        backKey: const Key('notices-back'),
+        title: l10n.notices,
+        child: ListenableBuilder(
+          listenable: _controller,
+          builder: (context, _) => _body(l10n),
         ),
       ),
     );
@@ -71,10 +66,10 @@ class _NoticesPageState extends State<NoticesPage> {
       );
     }
     if (_controller.error != null && _controller.notices.isEmpty) {
-      return RefreshIndicator(
+      return AppPullToRefresh(
         onRefresh: _controller.refresh,
         child: ListView(
-          physics: const AlwaysScrollableScrollPhysics(),
+          physics: AppPullToRefresh.physics,
           children: [
             SizedBox(
               height: MediaQuery.sizeOf(context).height * 0.7,
@@ -96,10 +91,10 @@ class _NoticesPageState extends State<NoticesPage> {
       );
     }
     if (_controller.notices.isEmpty) {
-      return RefreshIndicator(
+      return AppPullToRefresh(
         onRefresh: _controller.refresh,
         child: ListView(
-          physics: const AlwaysScrollableScrollPhysics(),
+          physics: AppPullToRefresh.physics,
           children: [
             SizedBox(
               height: MediaQuery.sizeOf(context).height * 0.7,
@@ -114,11 +109,11 @@ class _NoticesPageState extends State<NoticesPage> {
         ),
       );
     }
-    return RefreshIndicator(
+    return AppPullToRefresh(
       onRefresh: _controller.refresh,
       child: ListView.separated(
         key: const Key('notices-list'),
-        physics: const AlwaysScrollableScrollPhysics(),
+        physics: AppPullToRefresh.physics,
         padding: const EdgeInsets.fromLTRB(16, 12, 16, 28),
         itemCount: _controller.notices.length + 1,
         separatorBuilder: (_, _) => const SizedBox(height: 10),
diff --git a/lib/pages/player/comments_auth.dart b/lib/pages/player/comments_auth.dart
new file mode 100644
index 0000000..c1178bc
--- /dev/null
+++ b/lib/pages/player/comments_auth.dart
@@ -0,0 +1,24 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/models/drama.dart';
+import '../../core/data/services/auth_controller.dart';
+import '../../core/widgets/auth_gate.dart';
+
+/// 评论入口统一登录闸：登录成功且页面仍存在时再打开评论面板。
+Future<void> openCommentsWithAuth(
+  BuildContext context,
+  Drama drama, {
+  required Future<void> Function(BuildContext context, Drama drama) show,
+}) async {
+  final auth = context.read<AuthController>();
+  if (auth.isSignedIn) {
+    await show(context, drama);
+    return;
+  }
+  await ensureSignedIn(context);
+  if (!context.mounted || !auth.isSignedIn) return;
+  await show(context, drama);
+}
diff --git a/lib/pages/player/open_player.dart b/lib/pages/player/open_player.dart
new file mode 100644
index 0000000..af7ea66
--- /dev/null
+++ b/lib/pages/player/open_player.dart
@@ -0,0 +1,41 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/models/drama.dart';
+import '../../core/data/services/catalog_controller.dart';
+import '../../core/data/services/download_controller.dart';
+import '../../core/data/services/wallet_controller.dart';
+import 'player_view.dart';
+
+/// 目录卡片统一入口：补齐详情后直接进入全屏播放页。
+Future<void> playDramaFromCatalog(
+  BuildContext context,
+  Drama drama, {
+  String? episodeId,
+}) async {
+  final catalog = context.read<CatalogController>();
+  final wallet = context.read<WalletController>();
+  final downloads = context.read<DownloadController>();
+  var playable = drama;
+  try {
+    playable = await catalog.requireDetail(drama);
+  } catch (_) {
+    // 取详情失败就用卡片自带的可播预览集起播。
+  }
+  if (!context.mounted) return;
+  final index = episodeId == null
+      ? 0
+      : playable.episodes.indexWhere((episode) => episode.id == episodeId);
+  await Navigator.of(context).push(
+    MaterialPageRoute<void>(
+      builder: (_) => PlayerPage(
+        drama: playable,
+        initialIndex: index < 0 ? 0 : index,
+        wallet: wallet,
+        downloads: downloads,
+      ),
+    ),
+  );
+}
diff --git a/lib/pages/player/player_binding.dart b/lib/pages/player/player_binding.dart
index 873901d..088245a 100644
--- a/lib/pages/player/player_binding.dart
+++ b/lib/pages/player/player_binding.dart
@@ -3,15 +3,21 @@
 import '../../core/data/repositories/watch_history_repository.dart';
 import '../../core/data/repositories/playback_repository.dart';
 import '../../core/data/services/android_picture_in_picture.dart';
+import '../../core/data/services/download_controller.dart';
+import '../../core/data/services/wallet_controller.dart';
 import 'player_logic.dart';
 
 class PlayerBinding {
   PlayerLogic create({
     required WatchHistoryRepository history,
     required PlaybackRepository playback,
+    WalletController? wallet,
+    DownloadController? downloads,
   }) => PlayerLogic(
     history: history,
     playback: playback,
     pictureInPicture: AndroidPictureInPicture(),
+    wallet: wallet,
+    downloads: downloads,
   );
 }
diff --git a/lib/pages/player/player_logic.dart b/lib/pages/player/player_logic.dart
index 321a3b6..2ab8cca 100644
--- a/lib/pages/player/player_logic.dart
+++ b/lib/pages/player/player_logic.dart
@@ -14,34 +14,37 @@ import '../../core/data/repositories/playback_repository.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
 import '../../core/data/services/android_picture_in_picture.dart';
 import '../../core/data/services/catalog_controller.dart';
+import '../../core/data/services/download_controller.dart';
 import '../../core/data/services/platform_share_service.dart';
 import '../../core/data/services/playback_queue.dart';
 import '../../core/data/services/playback_session.dart';
 import '../../core/data/services/video_player_port.dart';
+import '../../core/data/services/wallet_controller.dart';
 import '../../core/formatting/localized_content.dart';
-import '../../core/theme/app_colors.dart';
 import '../../l10n/app_localizations.dart';
-import '../discover/discover_logic.dart';
+import '../discover/discover_types.dart';
 import '../discover/discover_view.dart';
 import '../drama_detail/drama_detail_view.dart';
-import '../mine/mine_logic.dart';
+import '../mine/mine_types.dart';
 import '../mine/mine_view.dart';
 import 'player_view.dart';
 import 'widgets/drama_comments_sheet.dart';
-import 'widgets/episode_picker_cell.dart';
-
-const double _episodeCellAspect = 1.05;
+import 'widgets/episode_picker_sheet.dart';
 
 class PlayerLogic extends ChangeNotifier {
   PlayerLogic({
     required this.history,
     required this.playback,
     required this.pictureInPicture,
+    this.wallet,
+    this.downloads,
   });
 
   final WatchHistoryRepository history;
   final PlaybackRepository playback;
   final AndroidPictureInPicture pictureInPicture;
+  final WalletController? wallet;
+  final DownloadController? downloads;
 
   late PageController pages;
   late PlaybackQueue queue;
@@ -66,6 +69,7 @@ class PlayerLogic extends ChangeNotifier {
   PlayTicket? blockedTicket;
   String? blockedEpisodeId;
   List<Episode> sessionEpisodes = const [];
+  List<String> qualities = const [];
   int pageRequest = 0;
   bool muted = false;
   double playbackSpeed = 1.0;
@@ -75,6 +79,10 @@ class PlayerLogic extends ChangeNotifier {
   bool pipPreparing = false;
   final Map<String, int> pickedEpisode = {};
 
+  /// 解锁中的集 id 与失败文案；空表示没有进行中的解锁。
+  String? unlockingEpisodeId;
+  String? unlockError;
+
   bool Function() isMounted = () => false;
   bool homeMode = false;
   bool embedded = false;
@@ -194,7 +202,7 @@ class PlayerLogic extends ChangeNotifier {
 
   /// 票据门：起播前先拿票（命中未过期缓存就不会重复请求），
   /// 拿不到地址就交给 [blockedTicket] 让 UI 提示解锁/暂无片源。
-  Future<bool> ensureTicket(int index) async {
+  Future<bool> ensureTicket(int index, {bool forceRefresh = false}) async {
     if (index < 0 || index >= sessionEpisodes.length) return false;
     final episode = sessionEpisodes[index];
     final request = pageRequest;
@@ -202,10 +210,23 @@ class PlayerLogic extends ChangeNotifier {
     ticketError = null;
     notify();
     try {
-      final ticket = await playback.ticketFor(episode.id);
+      final localPath = await downloads?.findLocalPath(episode.id);
+      if (request != pageRequest) return false;
+      if (localPath != null) {
+        blockedTicket = null;
+        blockedEpisodeId = null;
+        qualities = const [];
+        sessionEpisodes[index] = episode.withVideoUrl(_fileUrl(localPath));
+        return true;
+      }
+      final ticket = await playback.ticketFor(
+        episode.id,
+        forceRefresh: forceRefresh,
+      );
       if (request != pageRequest) return false;
       blockedTicket = null;
       blockedEpisodeId = null;
+      qualities = ticket.qualities;
       if (ticket.accessible && ticket.playUrl.isNotEmpty) {
         // 签名地址原样写回，不做任何拼接/改写（AppConfig.mediaUrl 只补 host）
         sessionEpisodes[index] = episode.withVideoUrl(ticket.playUrl);
@@ -231,6 +252,9 @@ class PlayerLogic extends ChangeNotifier {
     }
   }
 
+  String _fileUrl(String path) =>
+      path.startsWith('file:') ? path : Uri.file(path).toString();
+
   /// 重试当前集的票据（失败态的"重试"按钮）。
   Future<void> retryTicket() async {
     ticketError = null;
@@ -238,6 +262,47 @@ class PlayerLogic extends ChangeNotifier {
     unawaited(selectEpisode(session.currentIndex));
   }
 
+  /// 金币解锁当前集；成功后强制刷新票据并直接起播。
+  Future<bool> unlockEpisode(int index) async {
+    final service = wallet;
+    if (service == null || index < 0 || index >= sessionEpisodes.length) {
+      return false;
+    }
+    final episode = sessionEpisodes[index];
+    unlockingEpisodeId = episode.id;
+    unlockError = null;
+    notify();
+    try {
+      final result = await service.unlock(episode.id);
+      if (result == null || !result.unlocked) {
+        unlockError = service.unlockError;
+        return false;
+      }
+      final ready = await ensureTicket(index, forceRefresh: true);
+      if (ready) {
+        await session.select(index, preloadIndex: nextVisibleIndex(index));
+      }
+      return ready;
+    } finally {
+      unlockingEpisodeId = null;
+      if (isMounted()) notify();
+    }
+  }
+
+  /// 当前播放器页面被其它 PageRoute 覆盖时暂停并保存进度。
+  void onRouteCovered() {
+    if (!_started) return;
+    session.setRouteVisible(false);
+    cancelScrub();
+    unawaited(saveCurrentProgress());
+  }
+
+  /// 覆盖播放器的 PageRoute 返回后恢复当前 Tab 的播放状态。
+  void onRouteRevealed() {
+    if (!_started || !isMounted()) return;
+    session.setRouteVisible(active);
+  }
+
   void onPageUpdated(PlayerPage previous) {
     if (previous.active != active) {
       session.setRouteVisible(active && visibleIndices.isNotEmpty);
@@ -262,6 +327,14 @@ class PlayerLogic extends ChangeNotifier {
   void onLifecycle(AppLifecycleState state) {
     if (state != AppLifecycleState.resumed) unawaited(saveCurrentProgress());
     if (state == AppLifecycleState.resumed) {
+      // 部分机型退出画中画不会回调 onPipChanged(false)：回前台先兜底复位，
+      // 否则 chromeHidden 恒为 true，播放浮层与首页底栏都会消失。
+      if (pip || pipPreparing) {
+        pip = false;
+        pipPreparing = false;
+        notify();
+        notifyImmersive();
+      }
       // 签名地址有有效期：回前台时若票据已过期，重新取一张再起播，
       // 否则会撞上 403（契约 §1.4）
       final episode = trackedEpisode;
@@ -519,7 +592,11 @@ class PlayerLogic extends ChangeNotifier {
       await session.playbackSettled;
       if (scrubbingPlayer != player || session.active != player) return;
       await player.controller.seekTo(position);
-      if (session.active == player) await saveCurrentProgress();
+      if (session.active == player) {
+        // 暂停时拖动进度后直接恢复播放，避免画面停在旧位置。
+        resumeAfterSeek();
+        await saveCurrentProgress();
+      }
     } catch (_) {
       if (context.mounted && session.active == player) {
         final l10n = AppLocalizations.of(context)!;
@@ -532,23 +609,31 @@ class PlayerLogic extends ChangeNotifier {
     }
   }
 
+  /// 拖动进度落点后恢复播放；暂停态拖动不应停留在暂停。
+  @visibleForTesting
+  void resumeAfterSeek() {
+    if (!session.userWantsPlay) session.setUserWantsPlay(true);
+  }
+
   Future<void> leave(BuildContext context) async {
     await saveCurrentProgress();
     if (context.mounted) Navigator.of(context).pop();
   }
 
   Future<void> openDetail(BuildContext context) async {
-    session.setRouteVisible(false);
-    await session.playbackSettled;
+    session.setOverlayOpen(true);
+    try {
+      if (!context.mounted) return;
+      await Navigator.of(context).push(
+        MaterialPageRoute<void>(
+          builder: (_) =>
+              DramaDetailPage(drama: queue.entryAt(session.currentIndex).drama),
+        ),
+      );
+    } finally {
+      session.setOverlayOpen(false);
+    }
     await saveCurrentProgress();
-    if (!context.mounted) return;
-    await Navigator.of(context).push(
-      MaterialPageRoute<void>(
-        builder: (_) =>
-            DramaDetailPage(drama: queue.entryAt(session.currentIndex).drama),
-      ),
-    );
-    if (isMounted()) session.setRouteVisible(active);
   }
 
   Future<void> openSeriesAt(
@@ -562,19 +647,22 @@ class PlayerLogic extends ChangeNotifier {
     if (!context.mounted) return;
     await Navigator.of(context).push(
       MaterialPageRoute<void>(
-        builder: (_) => PlayerPage(drama: drama, initialIndex: index),
+        builder: (_) => PlayerPage(
+          drama: drama,
+          initialIndex: index,
+          wallet: wallet,
+          downloads: downloads,
+        ),
       ),
     );
     if (isMounted()) session.setRouteVisible(active);
   }
 
   Future<void> showEpisodes(BuildContext context) async {
-    final l10n = AppLocalizations.of(context)!;
     final entry = queue.entryAt(session.currentIndex);
     final drama = await _withFullEpisodes(context, entry.drama);
     if (!context.mounted) return;
     final homeFeed = feedDramas != null;
-    final episodes = drama.episodes;
     final currentNumber = entry.episode.number;
     session.setOverlayOpen(true);
     await session.playbackSettled;
@@ -585,62 +673,13 @@ class PlayerLogic extends ChangeNotifier {
     try {
       await showModalBottomSheet<void>(
         context: context,
-        backgroundColor: AppColors.ink,
-        showDragHandle: true,
-        builder: (sheetContext) => SafeArea(
-          child: SizedBox(
-            height: MediaQuery.sizeOf(sheetContext).height * 0.46,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(20, 0, 20, 4),
-                  child: Text(
-                    l10n.episodes,
-                    style: const TextStyle(
-                      fontSize: 18,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(20, 0, 20, 16),
-                  child: Text(
-                    localizedDramaTitle(l10n, drama),
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                    style: const TextStyle(
-                      color: Color(0xFFB7B3B8),
-                      fontSize: 14,
-                      fontWeight: FontWeight.w400,
-                    ),
-                  ),
-                ),
-                Expanded(
-                  child: GridView.builder(
-                    padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
-                    gridDelegate:
-                        const SliverGridDelegateWithFixedCrossAxisCount(
-                          crossAxisCount: 6,
-                          mainAxisSpacing: 10,
-                          crossAxisSpacing: 10,
-                          childAspectRatio: _episodeCellAspect,
-                        ),
-                    itemCount: episodes.length,
-                    itemBuilder: (_, index) => _episodeCell(
-                      context,
-                      sheetContext,
-                      drama,
-                      episodes[index],
-                      index,
-                      homeFeed,
-                      currentNumber,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
+        backgroundColor: Colors.transparent,
+        isScrollControlled: true,
+        builder: (_) => EpisodePickerSheet(
+          drama: drama,
+          currentNumber: currentNumber,
+          onSelect: (index) =>
+              _selectFromSheet(context, drama, index, homeFeed, currentNumber),
         ),
       );
     } finally {
@@ -665,41 +704,29 @@ class PlayerLogic extends ChangeNotifier {
     }
   }
 
-  Widget _episodeCell(
+  void _selectFromSheet(
     BuildContext pageContext,
-    BuildContext sheetContext,
     Drama drama,
-    Episode episode,
     int index,
     bool homeFeed,
     int currentNumber,
   ) {
-    final selected = episode.number == currentNumber;
-    final l10n = AppLocalizations.of(pageContext)!;
-    return EpisodePickerCell(
-      episode: episode,
-      selected: selected,
-      lockLabel: l10n.locked,
-      onTap: () {
-        Navigator.of(sheetContext).pop();
-        if (homeFeed) {
-          if (episode.number == currentNumber) return;
-          unawaited(openSeriesAt(pageContext, drama, index));
-          return;
-        }
-        if (index == session.currentIndex) return;
-        unawaited(
-          pages.animateToPage(
-            index,
-            duration: const Duration(milliseconds: 260),
-            curve: Curves.easeOutCubic,
-          ),
-        );
-      },
+    if (homeFeed) {
+      if (drama.episodes[index].number == currentNumber) return;
+      unawaited(openSeriesAt(pageContext, drama, index));
+      return;
+    }
+    if (index == session.currentIndex) return;
+    unawaited(
+      pages.animateToPage(
+        index,
+        duration: const Duration(milliseconds: 260),
+        curve: Curves.easeOutCubic,
+      ),
     );
   }
 
-  Future<void> showMy(BuildContext context, {int initialSection = 0}) async {
+  Future<void> showMy(BuildContext context) async {
     if (embedded) {
       onMy?.call();
       return;
@@ -708,20 +735,9 @@ class PlayerLogic extends ChangeNotifier {
     await session.playbackSettled;
     await saveCurrentProgress();
     if (!context.mounted) return;
-    final port = session.active;
-    final drama = queue.entryAt(session.currentIndex).drama;
-    final duration = port is VideoPlayerPort
-        ? port.controller.value.duration
-        : Duration.zero;
-    final action = await Navigator.of(context).push<MyPageAction>(
-      MaterialPageRoute(
-        builder: (_) => MyPage(
-          drama: drama,
-          duration: duration,
-          initialSection: initialSection,
-        ),
-      ),
-    );
+    final action = await Navigator.of(
+      context,
+    ).push<MyPageAction>(MaterialPageRoute(builder: (_) => const MyPage()));
     if (!context.mounted) return;
     if (action == MyPageAction.discover) {
       await showDiscover(context);
@@ -751,33 +767,14 @@ class PlayerLogic extends ChangeNotifier {
     await session.playbackSettled;
     await saveCurrentProgress();
     if (!context.mounted) return;
-    final port = session.active;
-    final duration = port is VideoPlayerPort
-        ? port.controller.value.duration
-        : Duration.zero;
     final action = await Navigator.of(context).push<DiscoverPageAction>(
-      MaterialPageRoute(
-        builder: (_) => DiscoverPage(
-          drama: pageDrama,
-          duration: duration,
-          focusSearch: focusSearch,
-        ),
-      ),
+      MaterialPageRoute(builder: (_) => DiscoverPage(focusSearch: focusSearch)),
     );
     if (!context.mounted) return;
-    if (action == DiscoverPageAction.detail) {
-      await openDetail(context);
-    } else if (action == DiscoverPageAction.my ||
-        action == DiscoverPageAction.watchlist) {
-      await showMy(
-        context,
-        initialSection: action == DiscoverPageAction.watchlist ? 1 : 0,
-      );
+    if (action == DiscoverPageAction.my) {
+      await showMy(context);
     } else {
       session.setRouteVisible(true);
-      if (action == DiscoverPageAction.resume) {
-        session.setUserWantsPlay(true);
-      }
     }
   }
 
@@ -810,8 +807,8 @@ class PlayerLogic extends ChangeNotifier {
       await showModalBottomSheet<void>(
         context: context,
         isScrollControlled: true,
-        backgroundColor: AppColors.ink,
-        showDragHandle: true,
+        backgroundColor: Colors.transparent,
+        showDragHandle: false,
         builder: (_) => DramaCommentsSheet(drama: drama),
       );
     } finally {
diff --git a/lib/pages/player/player_view.dart b/lib/pages/player/player_view.dart
index 20ac336..2bbdb2d 100644
--- a/lib/pages/player/player_view.dart
+++ b/lib/pages/player/player_view.dart
@@ -5,32 +5,42 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
-import 'package:video_player/video_player.dart';
 
 import '../../core/data/models/drama.dart';
-import '../../core/data/models/play_ticket.dart';
 import '../../core/data/services/favorite_controller.dart';
+import '../../core/data/services/download_controller.dart';
 import '../../core/data/services/interaction_controller.dart';
 import '../../core/data/services/playback_session.dart';
 import '../../core/data/services/video_player_port.dart';
+import '../../core/data/services/wallet_controller.dart';
 import '../../core/formatting/error_text.dart';
-import '../../core/formatting/localized_content.dart';
+import '../../core/navigation/app_route_observer.dart';
 import '../../core/platform/haptics.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/download_action.dart';
 import '../../l10n/app_localizations.dart';
+import 'comments_auth.dart';
 import 'player_binding.dart';
 import 'player_logic.dart';
+import 'widgets/home_feed_header.dart';
 import 'widgets/home_feed_overlay.dart';
 import 'widgets/exit_clear_screen_button.dart';
 import 'widgets/player_center_toggle.dart';
-import 'widgets/player_featured_comment.dart';
-import 'widgets/seek_progress_bar.dart';
+import 'widgets/player_more_sheet.dart';
+import 'widgets/player_overlay.dart';
+import 'widgets/player_overlay_models.dart';
+import 'widgets/player_speed_sheet.dart';
+import 'widgets/player_unlock_sheet.dart';
+import 'widgets/player_video_surface.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
 import '../../core/data/repositories/playback_repository.dart';
 
+part 'player_view_actions.dart';
+
+const double _boostPlaybackSpeed = 2.0;
+
 class PlayerPage extends StatefulWidget {
   const PlayerPage({
     super.key,
@@ -48,6 +58,10 @@ class PlayerPage extends StatefulWidget {
     this.feedDramas,
     this.onDramaChanged,
     this.onImmersiveChanged,
+    this.onOpenFullPlayer,
+    this.onRefreshFeed,
+    this.wallet,
+    this.downloads,
   });
 
   final Drama drama;
@@ -64,15 +78,27 @@ class PlayerPage extends StatefulWidget {
   final List<Drama>? feedDramas;
   final ValueChanged<Drama>? onDramaChanged;
   final ValueChanged<bool>? onImmersiveChanged;
+  final Future<void> Function(Drama drama, Episode episode)? onOpenFullPlayer;
+  final Future<bool> Function()? onRefreshFeed;
+  final WalletController? wallet;
+  final DownloadController? downloads;
 
   @override
   State<PlayerPage> createState() => _PlayerPageState();
 }
 
-class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
+class _PlayerPageState extends State<PlayerPage>
+    with WidgetsBindingObserver, RouteAware {
   late final PlayerLogic logic;
+  PageRoute<dynamic>? _subscribedRoute;
   bool _chromeVisible = true;
   double _playbackSpeed = 1.0;
+  bool _boosting = false;
+  double? _speedBeforeBoost;
+  bool? _chromeBeforeBoost;
+
+  /// 收藏切换后的本地增量：基准是详情快照，切换成功按服务端状态 ±1。
+  final Map<String, int> _favoriteDelta = {};
 
   @override
   void initState() {
@@ -80,6 +106,8 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
     logic = PlayerBinding().create(
       history: context.read<WatchHistoryRepository>(),
       playback: context.read<PlaybackRepository>(),
+      wallet: widget.wallet,
+      downloads: widget.downloads,
     );
     logic.attach(widget, isMounted: () => mounted);
     WidgetsBinding.instance.addObserver(this);
@@ -96,18 +124,85 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
     logic.onPageUpdated(oldWidget);
   }
 
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    final route = ModalRoute.of(context);
+    if (route is! PageRoute<dynamic> || route == _subscribedRoute) return;
+    if (_subscribedRoute != null) appRouteObserver.unsubscribe(this);
+    _subscribedRoute = route;
+    appRouteObserver.subscribe(this, route);
+  }
+
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     logic.onLifecycle(state);
   }
 
+  @override
+  void didPushNext() {
+    logic.onRouteCovered();
+  }
+
+  @override
+  void didPopNext() {
+    logic.onRouteRevealed();
+  }
+
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
+    appRouteObserver.unsubscribe(this);
     logic.dispose();
     super.dispose();
   }
 
+  void _updatePlaybackSpeed(double value) {
+    setState(() => _playbackSpeed = value);
+  }
+
+  void _hideChrome() {
+    setState(() => _chromeVisible = false);
+  }
+
+  /// 长按两侧：切 2 倍速并清屏，记下进入前的状态用于松手恢复。
+  void _startBoost() {
+    if (_boosting) return;
+    // 暂停时长按两侧先恢复播放，再进入 2 倍速。
+    if (!logic.session.userWantsPlay) logic.session.setUserWantsPlay(true);
+    setState(() {
+      _boosting = true;
+      _speedBeforeBoost = _playbackSpeed;
+      _chromeBeforeBoost = _chromeVisible;
+      _playbackSpeed = _boostPlaybackSpeed;
+      _chromeVisible = false;
+    });
+    unawaited(logic.setPlaybackSpeed(_boostPlaybackSpeed));
+  }
+
+  /// 松手或手势取消：恢复长按前的倍速与清屏状态。
+  void _endBoost() {
+    if (!_boosting) return;
+    final speed = _speedBeforeBoost ?? _playbackSpeed;
+    final chrome = _chromeBeforeBoost ?? true;
+    setState(() {
+      _boosting = false;
+      _speedBeforeBoost = null;
+      _chromeBeforeBoost = null;
+      _playbackSpeed = speed;
+      _chromeVisible = chrome;
+    });
+    unawaited(logic.setPlaybackSpeed(speed));
+  }
+
+  /// 收藏状态确认后同步右侧计数（总数没有独立计数接口，按 ±1 跟随）。
+  void _applyFavoriteDelta(String dramaId, {required bool nowSaved}) {
+    setState(() {
+      _favoriteDelta[dramaId] =
+          (_favoriteDelta[dramaId] ?? 0) + (nowSaved ? 1 : -1);
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return ListenableBuilder(
@@ -118,6 +213,7 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
 
   Widget _buildPlayer(BuildContext context) {
     final interactions = context.watch<InteractionController>();
+    final l10n = AppLocalizations.of(context)!;
     final indices = logic.visibleIndices;
     final pages = logic.pages;
     final content = AnimatedBuilder(
@@ -136,17 +232,62 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
             _buildEpisode(context, indices[position], interactions),
       ),
     );
+    final body = Stack(
+      fit: StackFit.expand,
+      children: [
+        content,
+        if (widget.homeMode && !_boosting && !logic.pip && !logic.pipPreparing)
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: SafeArea(
+              bottom: false,
+              child: HomeFeedHeader(
+                l10n: l10n,
+                onRefresh: () async {
+                  final ok = await widget.onRefreshFeed?.call() ?? true;
+                  if (context.mounted && !ok) {
+                    ScaffoldMessenger.of(
+                      context,
+                    ).showSnackBar(SnackBar(content: Text(l10n.catalogError)));
+                  }
+                  return ok;
+                },
+                onSearch: widget.onSearch ?? () => logic.showDiscover(context),
+                onMore: _openCurrentMore,
+              ),
+            ),
+          ),
+      ],
+    );
     return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: SystemUiOverlayStyle.light,
+      key: const Key('player-system-overlay'),
+      value: SystemUiOverlayStyle.light.copyWith(
+        statusBarColor: Colors.transparent,
+        systemNavigationBarColor: Colors.black,
+        systemNavigationBarDividerColor: Colors.transparent,
+        systemNavigationBarIconBrightness: Brightness.light,
+        systemNavigationBarContrastEnforced: false,
+      ),
       child: Theme(
-        data: AppTheme.dark(),
+        data: AppTheme.light(),
         child: widget.embedded
-            ? content
-            : Scaffold(backgroundColor: AppColors.ink, body: content),
+            ? body
+            : Scaffold(
+                key: const Key('player-scaffold'),
+                backgroundColor: Colors.transparent,
+                body: body,
+              ),
       ),
     );
   }
 
+  void _openCurrentMore() {
+    final entry = logic.queue.entryAt(logic.session.currentIndex);
+    _openMore(context, entry.episode);
+  }
+
   Widget _buildEpisode(
     BuildContext context,
     int index,
@@ -167,49 +308,23 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
     final videoPort = port is VideoPlayerPort ? port : null;
     final ready = videoPort?.controller.value.isInitialized ?? false;
     final theater = logic.pip || logic.pipPreparing;
-    Widget? video;
-    if (ready) {
-      video = GestureDetector(
-        onTap: () =>
-            logic.session.setUserWantsPlay(!logic.session.userWantsPlay),
-        child: FittedBox(
-          fit: theater ? BoxFit.contain : BoxFit.cover,
-          child: SizedBox(
-            width: videoPort!.controller.value.size.width,
-            height: videoPort.controller.value.size.height,
-            child: VideoPlayer(
-              videoPort.controller,
-              key: ValueKey(videoPort.controller),
-            ),
-          ),
-        ),
-      );
-    }
 
     return Stack(
       fit: StackFit.expand,
       children: [
-        const ColoredBox(color: AppColors.ink),
-        ?video,
-        if (!logic.chromeHidden && (!widget.homeMode || _chromeVisible))
-          IgnorePointer(
-            key: widget.homeMode ? const Key('home-feed-scrim') : null,
-            child: const DecoratedBox(
-              decoration: BoxDecoration(
-                gradient: LinearGradient(
-                  begin: Alignment.topCenter,
-                  end: Alignment.bottomCenter,
-                  colors: [
-                    Color(0x66000000),
-                    Color(0x00000000),
-                    Color(0x33000000),
-                    Color(0xE6000000),
-                  ],
-                  stops: [0, 0.16, 0.55, 1],
-                ),
-              ),
-            ),
+        if (widget.homeMode)
+          const ColoredBox(
+            key: Key('home-feed-black-background'),
+            color: Colors.black,
           ),
+        PlayerVideoSurface(
+          controller: videoPort?.controller,
+          posterUrl: drama.posterUrl,
+          videoUrl: videoPort?.controller.dataSource ?? episode.videoUrl,
+          theater: theater,
+          onTap: () =>
+              logic.session.setUserWantsPlay(!logic.session.userWantsPlay),
+        ),
         if (widget.homeMode && _chromeVisible && !logic.chromeHidden)
           Positioned.fill(
             child: GestureDetector(
@@ -222,7 +337,10 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
         // 票据三态之一：起播前正在向后端要签名地址
         if (selected && logic.ticketLoading)
           const Center(
-            child: CircularProgressIndicator(color: AppColors.blueSoft),
+            child: CircularProgressIndicator(
+              key: Key('player-ticket-loading'),
+              color: AppColors.blue,
+            ),
           ),
         // 票据三态之二：拿票失败（断网/服务异常）→ 可重试，不假装在加载
         if (selected && !logic.ticketLoading && logic.ticketError != null)
@@ -254,7 +372,10 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
           ),
         if (selected && logic.session.loading)
           const Center(
-            child: CircularProgressIndicator(color: AppColors.blueSoft),
+            child: CircularProgressIndicator(
+              key: Key('player-session-loading'),
+              color: AppColors.blue,
+            ),
           ),
         if (selected && !ready && logic.session.error != null)
           Center(
@@ -278,14 +399,6 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
               ),
             ),
           ),
-        // 票据三态之三：后端判定不可播放 —— 用 accessType 驱动文案，不在前端猜
-        if (selected && !ready && logic.blockedEpisodeId == episode.id)
-          _BlockedNotice(
-            l10n: l10n,
-            episode: episode,
-            accessType: logic.blockedTicket?.accessType,
-            unlockCoin: logic.blockedTicket?.unlockCoin ?? 0,
-          ),
         // 没有票据信息时的兜底（例如详情里就没地址、也没走票据流程）
         if (selected &&
             !ready &&
@@ -318,81 +431,24 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
         if (logic.pip || logic.pipPreparing)
           const SizedBox.expand()
         else if (widget.homeMode)
-          _chromeVisible
-              ? HomeFeedOverlay(
-                  l10n: l10n,
-                  drama: drama,
-                  episode: episode,
-                  liked: interactions.isLiked(drama.id),
-                  saved: context.watch<FavoriteController>().isSaved(drama.id),
-                  onLike: () async {
-                    if (await ensureSignedIn(context)) {
-                      if (!context.mounted) return;
-                      unawaited(context.read<Haptics>().lightImpact());
-                      final result = await interactions.toggleDramaLike(
-                        drama.id,
-                      );
-                      if (!result.isSuccess && context.mounted) {
-                        ScaffoldMessenger.of(context).showSnackBar(
-                          SnackBar(
-                            content: Text(
-                              result.errorMessage ??
-                                  AppLocalizations.of(context)!.likeFailed,
-                            ),
-                          ),
-                        );
-                      }
-                    }
-                  },
-                  onSave: () async {
-                    final favorites = context.read<FavoriteController>();
-                    if (await ensureSignedIn(context)) {
-                      if (!context.mounted) return;
-                      unawaited(context.read<Haptics>().lightImpact());
-                      final ok = await favorites.toggle(drama.id, card: drama);
-                      if (ok || !context.mounted) return;
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(content: Text(l10n.favoriteToggleFailed)),
-                      );
-                    }
-                  },
-                  onComments: () => logic.showComments(context, drama),
-                  onShare: () => logic.shareDrama(context, drama),
-                  onEpisodes: () => logic.showEpisodes(context),
-                  onDownload: () => requestEpisodeDownload(context, episode.id),
-                  onClear: () => setState(() => _chromeVisible = false),
-                  onSearch:
-                      widget.onSearch ?? () => logic.showDiscover(context),
-                  onPip: logic.pictureInPicture.isPlatformSupported
-                      ? () => unawaited(logic.enterPip(context))
-                      : null,
-                )
-              : const SizedBox.shrink()
-        else
-          _PlaybackOverlay(
+          HomeFeedOverlay(
             l10n: l10n,
             drama: drama,
             episode: episode,
             controller: ready ? videoPort!.controller : null,
-            liked: interactions.isLiked(drama.id),
-            // 收藏以服务端为准（FavoriteController 由 app 注入，登录后自动加载）
-            saved: context.watch<FavoriteController>().isSaved(drama.id),
-            onBack: widget.embedded
-                ? null
-                : () => unawaited(logic.leave(context)),
-            onEpisodes: () => logic.showEpisodes(context),
-            onNext: logic.hasNextEpisode
-                ? () => unawaited(logic.playNextEpisode())
-                : null,
-            playing: logic.session.userWantsPlay,
-            playbackSpeed: _playbackSpeed,
-            onSpeedTap: () => unawaited(_openSpeedSheet(context)),
-            controlsVisible: _chromeVisible,
-            onClear: () => setState(() => _chromeVisible = false),
-            onExitClear: () => setState(() => _chromeVisible = true),
+            visible: _chromeVisible,
+            boosting: _boosting,
+            onBoostStart: _startBoost,
+            onBoostEnd: _endBoost,
             onTogglePlay: () =>
                 logic.session.setUserWantsPlay(!logic.session.userWantsPlay),
-            // 收藏/点赞要对到具体账号：未登录先引导登录（首页/详情仍可匿名浏览）
+            liked: interactions.isLiked(drama.id),
+            likeCount: interactions.likeCount(drama.id) ?? drama.likeCount,
+            favoriteCount: drama.favoriteCount == null
+                ? null
+                : drama.favoriteCount! + (_favoriteDelta[drama.id] ?? 0),
+            commentCount: drama.commentCount,
+            saved: context.watch<FavoriteController>().isSaved(drama.id),
             onLike: () async {
               if (await ensureSignedIn(context)) {
                 if (!context.mounted) return;
@@ -422,39 +478,91 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
                 );
               }
             },
-            onDownload: () => requestEpisodeDownload(context, episode.id),
-            onComments: () => logic.showComments(context, drama),
+            onComments: () => unawaited(
+              openCommentsWithAuth(context, drama, show: logic.showComments),
+            ),
             onShare: () => logic.shareDrama(context, drama),
-            onPip: logic.pictureInPicture.isPlatformSupported
-                ? () => unawaited(logic.enterPip(context))
-                : null,
+            onDetail: () => unawaited(logic.openDetail(context)),
+            onOpenFullPlayer: () async {
+              await widget.onOpenFullPlayer?.call(drama, episode);
+              if (!mounted || !widget.active) return;
+              logic.session.setUserWantsPlay(true);
+            },
+            onMore: _openCurrentMore,
             onScrubStart: ready ? () => logic.beginScrub(videoPort!) : null,
             onSeek: ready
                 ? (position) => logic.seekTo(context, videoPort!, position)
                 : null,
-          ),
-        if (widget.homeMode && !_chromeVisible)
-          Positioned.fill(
-            child: GestureDetector(
-              key: const Key('home-feed-video-tap'),
-              behavior: HitTestBehavior.opaque,
-              onTap: () =>
-                  logic.session.setUserWantsPlay(!logic.session.userWantsPlay),
+          )
+        else
+          PlayerPlaybackOverlay(
+            data: PlayerOverlayData(
+              l10n: l10n,
+              drama: drama,
+              episode: episode,
+              controller: ready ? videoPort!.controller : null,
+              liked: interactions.isLiked(drama.id),
+              likeCount: interactions.likeCount(drama.id) ?? drama.likeCount,
+              commentCount: drama.commentCount,
+              favoriteCount: drama.favoriteCount == null
+                  ? null
+                  : drama.favoriteCount! + (_favoriteDelta[drama.id] ?? 0),
+              saved: context.watch<FavoriteController>().isSaved(drama.id),
+              playing: logic.session.userWantsPlay,
+              playbackSpeed: _playbackSpeed,
+              totalEpisodes: logic.visibleIndices.length,
+              boosting: _boosting,
             ),
-          ),
-        if (widget.homeMode && !_chromeVisible)
-          Positioned(
-            top: 0,
-            right: 0,
-            child: SafeArea(
-              left: false,
-              bottom: false,
-              minimum: const EdgeInsets.only(top: 8, right: 12),
-              child: ExitClearScreenButton(
-                key: const Key('home-feed-exit-clear-screen'),
-                tooltip: l10n.exitClearScreen,
-                onPressed: () => setState(() => _chromeVisible = true),
+            actions: PlayerOverlayActions(
+              onBack: widget.embedded
+                  ? null
+                  : () => unawaited(logic.leave(context)),
+              onTogglePlay: () =>
+                  logic.session.setUserWantsPlay(!logic.session.userWantsPlay),
+              onClear: () => setState(() => _chromeVisible = false),
+              onExitClear: () => setState(() => _chromeVisible = true),
+              onDetail: () => unawaited(logic.openDetail(context)),
+              onSpeed: () => unawaited(_openSpeedSheet(context)),
+              onEpisodes: () => logic.showEpisodes(context),
+              onComments: () => unawaited(
+                openCommentsWithAuth(context, drama, show: logic.showComments),
               ),
+              onLike: () =>
+                  unawaited(_toggleLike(context, interactions, drama)),
+              onSave: () => unawaited(_toggleSave(context, drama)),
+              onShare: () => logic.shareDrama(context, drama),
+              onMore: () => _openMore(context, episode),
+              onScrubStart: ready ? () => logic.beginScrub(videoPort!) : null,
+              onSeek: ready
+                  ? (position) => logic.seekTo(context, videoPort!, position)
+                  : null,
+              onLongPressCenter: () => _openMore(context, episode),
+              onBoostStart: _startBoost,
+              onBoostEnd: _endBoost,
+            ),
+            controlsVisible: _chromeVisible,
+          ),
+        // 票据三态之三：后端判定不可播放 —— 用 accessType 驱动文案，不在前端猜
+        if (selected && !ready && logic.blockedEpisodeId == episode.id)
+          PlayerBlockedNotice(
+            l10n: l10n,
+            episode: episode,
+            accessType: logic.blockedTicket?.accessType,
+            unlockCoin: logic.blockedTicket?.unlockCoin ?? 0,
+            unlocking: logic.unlockingEpisodeId == episode.id,
+            error: logic.unlockError,
+            onOpenUnlock: logic.wallet == null
+                ? null
+                : () => _openUnlockSheet(context, index, episode),
+          ),
+        if (widget.homeMode && !_chromeVisible && !_boosting)
+          Positioned(
+            right: 12,
+            bottom: 56,
+            child: ExitClearScreenButton(
+              key: const Key('home-feed-exit-clear-screen'),
+              tooltip: l10n.exitClearScreen,
+              onPressed: () => setState(() => _chromeVisible = true),
             ),
           ),
         if (widget.homeMode &&
@@ -472,616 +580,4 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
       ],
     );
   }
-
-  Future<void> _openSpeedSheet(BuildContext context) async {
-    final selected = await showModalBottomSheet<double>(
-      context: context,
-      backgroundColor: AppColors.card,
-      showDragHandle: true,
-      builder: (_) => _PlaybackSpeedSheet(selected: _playbackSpeed),
-    );
-    if (selected == null || !mounted) return;
-    setState(() => _playbackSpeed = selected);
-    await logic.setPlaybackSpeed(selected);
-  }
-}
-
-/// 不可播放提示：文案由后端返回的 `accessType` 驱动（契约 §1.4），前端不自行推断。
-class _BlockedNotice extends StatelessWidget {
-  const _BlockedNotice({
-    required this.l10n,
-    required this.episode,
-    required this.accessType,
-    required this.unlockCoin,
-  });
-
-  final AppLocalizations l10n;
-  final Episode episode;
-  final String? accessType;
-  final int unlockCoin;
-
-  @override
-  Widget build(BuildContext context) {
-    final needsUnlock =
-        accessType == PlayTicket.coinRequired ||
-        accessType == PlayTicket.vipRequired;
-    final title = needsUnlock
-        ? l10n.lockedTitle(episode.number)
-        : accessType == PlayTicket.noMedia
-        ? l10n.noMediaNotice
-        : episode.locked
-        ? l10n.lockedTitle(episode.number)
-        : l10n.noMediaNotice;
-    return Center(
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 28),
-        child: _UnlockCard(
-          locked: needsUnlock,
-          title: title,
-          coinLabel: needsUnlock && unlockCoin > 0
-              ? '$unlockCoin ${l10n.coins}'
-              : null,
-          footnote: needsUnlock ? l10n.unlockComingSoon : null,
-        ),
-      ),
-    );
-  }
-}
-
-/// Coin lock presented as a reward card: gold chip, chili only on the icon.
-class _UnlockCard extends StatelessWidget {
-  const _UnlockCard({
-    required this.locked,
-    required this.title,
-    required this.coinLabel,
-    required this.footnote,
-  });
-
-  final bool locked;
-  final String title;
-  final String? coinLabel;
-  final String? footnote;
-
-  @override
-  Widget build(BuildContext context) {
-    return DecoratedBox(
-      decoration: BoxDecoration(
-        color: AppColors.card,
-        borderRadius: BorderRadius.circular(20),
-        border: Border.all(color: AppColors.gold.withValues(alpha: 0.55)),
-      ),
-      child: Padding(
-        padding: const EdgeInsets.fromLTRB(20, 22, 20, 18),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Icon(
-              locked ? Icons.lock_outline_rounded : Icons.movie_filter_outlined,
-              color: locked ? AppColors.gold : AppColors.cream,
-              size: 32,
-            ),
-            const SizedBox(height: 12),
-            Text(
-              title,
-              textAlign: TextAlign.center,
-              style: const TextStyle(
-                color: AppColors.cream,
-                fontSize: 16,
-                fontWeight: FontWeight.w700,
-              ),
-            ),
-            if (coinLabel != null) ...[
-              const SizedBox(height: 12),
-              DecoratedBox(
-                decoration: BoxDecoration(
-                  color: AppColors.gold,
-                  borderRadius: BorderRadius.circular(20),
-                ),
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 12,
-                    vertical: 6,
-                  ),
-                  child: Text(
-                    coinLabel!,
-                    style: const TextStyle(
-                      color: AppColors.onGold,
-                      fontSize: 13,
-                      fontWeight: FontWeight.w800,
-                    ),
-                  ),
-                ),
-              ),
-            ],
-            if (footnote != null) ...[
-              const SizedBox(height: 8),
-              Text(
-                footnote!,
-                textAlign: TextAlign.center,
-                style: const TextStyle(color: AppColors.muted, fontSize: 12),
-              ),
-            ],
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _PlaybackOverlay extends StatefulWidget {
-  const _PlaybackOverlay({
-    required this.l10n,
-    required this.drama,
-    required this.episode,
-    required this.controller,
-    required this.liked,
-    required this.saved,
-    required this.playing,
-    required this.playbackSpeed,
-    required this.onSpeedTap,
-    required this.controlsVisible,
-    required this.onTogglePlay,
-    required this.onClear,
-    required this.onExitClear,
-    required this.onBack,
-    required this.onEpisodes,
-    required this.onComments,
-    required this.onLike,
-    required this.onSave,
-    required this.onDownload,
-    required this.onShare,
-    required this.onPip,
-    required this.onScrubStart,
-    required this.onSeek,
-    this.onNext,
-  });
-
-  final AppLocalizations l10n;
-  final Drama drama;
-  final Episode episode;
-  final VideoPlayerController? controller;
-  final bool liked;
-  final bool saved;
-  final bool playing;
-  final double playbackSpeed;
-  final VoidCallback onSpeedTap;
-  final bool controlsVisible;
-  final VoidCallback onTogglePlay;
-  final VoidCallback onClear;
-  final VoidCallback onExitClear;
-  final VoidCallback? onBack;
-  final VoidCallback onEpisodes;
-  final VoidCallback onComments;
-  final VoidCallback? onNext;
-  final VoidCallback onLike;
-  final VoidCallback onSave;
-  final VoidCallback onDownload;
-  final VoidCallback onShare;
-  final VoidCallback? onPip;
-  final VoidCallback? onScrubStart;
-  final Future<void> Function(Duration)? onSeek;
-
-  @override
-  State<_PlaybackOverlay> createState() => _PlaybackOverlayState();
-}
-
-class _PlaybackOverlayState extends State<_PlaybackOverlay> {
-  @override
-  Widget build(BuildContext context) {
-    return SafeArea(
-      child: Stack(
-        children: [
-          Positioned.fill(
-            child: GestureDetector(
-              key: const Key('player-video-tap'),
-              behavior: HitTestBehavior.opaque,
-              onTap: widget.onTogglePlay,
-            ),
-          ),
-          if (widget.controlsVisible)
-            Column(
-              key: const Key('player-controls-visible'),
-              children: [
-                _topBar(context),
-                const Spacer(),
-                Padding(
-                  key: const Key('player-controls-bottom'),
-                  padding: const EdgeInsets.fromLTRB(14, 8, 14, 12),
-                  child: Column(
-                    children: [
-                      SeekProgressBar(
-                        key: const Key('player-progress'),
-                        valueListenable: widget.controller,
-                        semanticsLabel: widget.l10n.seekVideo,
-                        showTimes: true,
-                        onScrubStart: widget.onScrubStart,
-                        onSeek: widget.onSeek,
-                      ),
-                      const SizedBox(height: 10),
-                      Row(
-                        children: [
-                          Expanded(
-                            child: _PlayerAction(
-                              key: const Key('player-episodes'),
-                              icon: Icons.view_list_rounded,
-                              label: widget.l10n.episodes,
-                              onTap: widget.onEpisodes,
-                            ),
-                          ),
-                          const SizedBox(width: 8),
-                          Expanded(
-                            child: _PlayerAction(
-                              key: const Key('player-comments'),
-                              icon: Icons.chat_bubble_outline_rounded,
-                              label: widget.l10n.comments,
-                              onTap: widget.onComments,
-                            ),
-                          ),
-                          const SizedBox(width: 8),
-                          Expanded(
-                            child: SizedBox(
-                              height: 32,
-                              child: FilledButton(
-                                key: const Key('player-next'),
-                                onPressed: widget.onNext,
-                                style: FilledButton.styleFrom(
-                                  backgroundColor: AppColors.blue,
-                                  disabledBackgroundColor: AppColors.raised,
-                                  disabledForegroundColor: AppColors.subtle,
-                                  foregroundColor: AppColors.onPrimary,
-                                  shape: RoundedRectangleBorder(
-                                    borderRadius: BorderRadius.circular(9),
-                                  ),
-                                  padding: EdgeInsets.zero,
-                                  textStyle: const TextStyle(
-                                    fontSize: 11,
-                                    fontWeight: FontWeight.w700,
-                                  ),
-                                ),
-                                child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.center,
-                                  children: [
-                                    Flexible(
-                                      child: Text(
-                                        widget.l10n.nextEpisode,
-                                        maxLines: 1,
-                                        overflow: TextOverflow.ellipsis,
-                                      ),
-                                    ),
-                                    const SizedBox(width: 2),
-                                    const Icon(
-                                      Icons.skip_next_rounded,
-                                      size: 14,
-                                    ),
-                                  ],
-                                ),
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 12),
-                      PlayerFeaturedComment(
-                        drama: widget.drama,
-                        onViewAll: widget.onComments,
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          if (!widget.controlsVisible)
-            Positioned(
-              top: 8,
-              right: 12,
-              child: ExitClearScreenButton(
-                key: const Key('player-exit-clear-screen'),
-                tooltip: widget.l10n.exitClearScreen,
-                onPressed: widget.onExitClear,
-              ),
-            ),
-          if (!widget.playing)
-            Center(
-              child: PlayerCenterToggle(
-                key: const Key('player-play-toggle'),
-                playing: false,
-                onTap: widget.onTogglePlay,
-              ),
-            ),
-        ],
-      ),
-    );
-  }
-
-  Widget _topBar(BuildContext context) {
-    return SizedBox(
-      key: const Key('player-controls-top'),
-      height: 46,
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 14),
-        child: Row(
-          children: [
-            if (widget.onBack != null)
-              _TopAction(
-                key: const Key('player-back'),
-                tooltip: widget.l10n.backToSeries,
-                icon: Icons.chevron_left_rounded,
-                onPressed: widget.onBack!,
-              )
-            else
-              const SizedBox(width: 36),
-            const SizedBox(width: 8),
-            Expanded(
-              child: Text(
-                '${localizedDramaTitle(widget.l10n, widget.drama)} · '
-                '${widget.l10n.episodeLabel(widget.episode.number)}',
-                key: const Key('player-title'),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                textAlign: TextAlign.center,
-                style: const TextStyle(
-                  fontFamily: 'Outfit',
-                  color: AppColors.onSurface,
-                  fontSize: 13,
-                  fontWeight: FontWeight.w700,
-                ),
-              ),
-            ),
-            const SizedBox(width: 8),
-            _TopAction(
-              key: const Key('player-clear-screen'),
-              tooltip: widget.l10n.clearScreen,
-              icon: Icons.fullscreen_rounded,
-              onPressed: widget.onClear,
-            ),
-            const SizedBox(width: 8),
-            _TopAction(
-              key: const Key('player-more'),
-              tooltip: widget.l10n.more,
-              icon: Icons.more_horiz_rounded,
-              onPressed: () => _openMore(context),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Future<void> _openMore(BuildContext context) async {
-    await showModalBottomSheet<void>(
-      context: context,
-      backgroundColor: AppColors.card,
-      showDragHandle: true,
-      builder: (sheetContext) => SafeArea(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            ListTile(
-              key: const Key('player-more-speed'),
-              leading: const Icon(
-                Icons.speed_rounded,
-                color: AppColors.secondary,
-              ),
-              title: Text(widget.l10n.playbackSpeed),
-              trailing: Text(
-                _speedLabel(widget.playbackSpeed),
-                style: const TextStyle(
-                  color: AppColors.blue,
-                  fontSize: 12,
-                  fontWeight: FontWeight.w600,
-                ),
-              ),
-              onTap: () {
-                Navigator.pop(sheetContext);
-                WidgetsBinding.instance.addPostFrameCallback((_) {
-                  if (mounted) widget.onSpeedTap();
-                });
-              },
-            ),
-            ListTile(
-              key: const Key('player-more-download'),
-              leading: const Icon(
-                Icons.download_outlined,
-                color: AppColors.secondary,
-              ),
-              title: Text(widget.l10n.downloads),
-              onTap: () {
-                Navigator.pop(sheetContext);
-                widget.onDownload();
-              },
-            ),
-            if (widget.onPip != null)
-              ListTile(
-                key: const Key('player-more-pip'),
-                leading: const Icon(
-                  Icons.picture_in_picture_alt_outlined,
-                  color: AppColors.secondary,
-                ),
-                title: Text(widget.l10n.pictureInPicture),
-                onTap: () {
-                  Navigator.pop(sheetContext);
-                  widget.onPip!();
-                },
-              ),
-            ListTile(
-              key: const Key('player-more-like'),
-              leading: Icon(
-                widget.liked
-                    ? Icons.favorite_rounded
-                    : Icons.favorite_border_rounded,
-                color: widget.liked ? AppColors.blue : AppColors.muted,
-              ),
-              title: Text(widget.l10n.like),
-              onTap: () {
-                Navigator.pop(sheetContext);
-                widget.onLike();
-              },
-            ),
-            ListTile(
-              key: const Key('player-more-favorite'),
-              leading: Icon(
-                widget.saved ? Icons.star_rounded : Icons.star_border_rounded,
-                color: widget.saved ? AppColors.blue : AppColors.muted,
-              ),
-              title: Text(widget.l10n.favorite),
-              onTap: () {
-                Navigator.pop(sheetContext);
-                widget.onSave();
-              },
-            ),
-            ListTile(
-              key: const Key('player-more-share'),
-              leading: const Icon(Icons.share_outlined, color: AppColors.muted),
-              title: Text(widget.l10n.share),
-              onTap: () {
-                Navigator.pop(sheetContext);
-                widget.onShare();
-              },
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-const List<double> _speedOptions = [0.5, 0.75, 1.0, 1.25, 1.5, 2.0];
-
-String _speedLabel(double value) => '${value.toString()}x';
-
-class _PlaybackSpeedSheet extends StatelessWidget {
-  const _PlaybackSpeedSheet({required this.selected});
-
-  final double selected;
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
-    return SafeArea(
-      child: Column(
-        key: const Key('player-speed-sheet'),
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsets.fromLTRB(20, 2, 20, 8),
-            child: Align(
-              alignment: Alignment.centerLeft,
-              child: Text(
-                l10n.playbackSpeed,
-                style: const TextStyle(
-                  color: AppColors.onSurface,
-                  fontSize: 14,
-                  fontWeight: FontWeight.w700,
-                ),
-              ),
-            ),
-          ),
-          for (final value in _speedOptions)
-            ListTile(
-              key: Key('player-speed-${value.toString()}'),
-              dense: true,
-              tileColor: value == selected
-                  ? AppColors.blue.withValues(alpha: 0.12)
-                  : null,
-              title: Text(
-                _speedLabel(value),
-                style: TextStyle(
-                  color: value == selected ? AppColors.blue : AppColors.cream,
-                  fontSize: 13,
-                  fontWeight: value == selected
-                      ? FontWeight.w700
-                      : FontWeight.w500,
-                ),
-              ),
-              trailing: value == selected
-                  ? const Icon(
-                      Icons.check_rounded,
-                      color: AppColors.blue,
-                      size: 18,
-                    )
-                  : null,
-              onTap: () => Navigator.pop(context, value),
-            ),
-        ],
-      ),
-    );
-  }
-}
-
-class _TopAction extends StatelessWidget {
-  const _TopAction({
-    super.key,
-    required this.tooltip,
-    required this.icon,
-    required this.onPressed,
-  });
-
-  final String tooltip;
-  final IconData icon;
-  final VoidCallback onPressed;
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      width: 36,
-      height: 36,
-      child: IconButton(
-        tooltip: tooltip,
-        onPressed: onPressed,
-        padding: EdgeInsets.zero,
-        style: IconButton.styleFrom(
-          backgroundColor: const Color(0xFF2C2D33),
-          foregroundColor: AppColors.onSurface,
-        ),
-        icon: Icon(icon, size: 18),
-      ),
-    );
-  }
-}
-
-class _PlayerAction extends StatelessWidget {
-  const _PlayerAction({
-    super.key,
-    required this.icon,
-    required this.label,
-    required this.onTap,
-  });
-
-  final IconData icon;
-  final String label;
-  final VoidCallback onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    return Material(
-      color: const Color(0xFF2A2A30),
-      borderRadius: BorderRadius.circular(9),
-      clipBehavior: Clip.antiAlias,
-      child: InkWell(
-        onTap: onTap,
-        child: SizedBox(
-          height: 32,
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Icon(icon, size: 14, color: AppColors.secondary),
-              const SizedBox(width: 3),
-              Flexible(
-                child: Text(
-                  label,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    color: AppColors.onSurface,
-                    fontSize: 11,
-                    fontWeight: FontWeight.w500,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
 }
diff --git a/lib/pages/player/player_view_actions.dart b/lib/pages/player/player_view_actions.dart
new file mode 100644
index 0000000..3f9fd81
--- /dev/null
+++ b/lib/pages/player/player_view_actions.dart
@@ -0,0 +1,119 @@
+// Author: fruit.com.cn
+
+part of 'player_view.dart';
+
+extension _PlayerViewActions on _PlayerPageState {
+  Future<void> _openSpeedSheet(BuildContext context) async {
+    final selected = await showModalBottomSheet<double>(
+      context: context,
+      backgroundColor: Colors.transparent,
+      showDragHandle: false,
+      builder: (_) => PlayerSpeedSheet(selected: _playbackSpeed),
+    );
+    if (selected == null || !mounted) return;
+    _updatePlaybackSpeed(selected);
+    await logic.setPlaybackSpeed(selected);
+  }
+
+  Future<void> _openMore(BuildContext context, Episode episode) async {
+    final l10n = AppLocalizations.of(context)!;
+    await showModalBottomSheet<void>(
+      context: context,
+      backgroundColor: Colors.transparent,
+      showDragHandle: false,
+      isScrollControlled: true,
+      builder: (_) => PlayerMoreSheet(
+        l10n: l10n,
+        state: PlayerMoreState(
+          speed: _playbackSpeed,
+          qualities: logic.qualities,
+        ),
+        actions: PlayerMoreActions(
+          onSpeedChanged: (value) {
+            _updatePlaybackSpeed(value);
+            unawaited(logic.setPlaybackSpeed(value));
+          },
+          onClear: _hideChrome,
+          onDownload: () => requestEpisodeDownload(context, episode.id),
+          onPip: logic.pictureInPicture.isPlatformSupported
+              ? () => unawaited(logic.enterPip(context))
+              : null,
+        ),
+      ),
+    );
+  }
+
+  Future<void> _openUnlockSheet(
+    BuildContext context,
+    int index,
+    Episode episode,
+  ) async {
+    final wallet = logic.wallet;
+    if (wallet == null) return;
+    await showModalBottomSheet<bool>(
+      context: context,
+      backgroundColor: Colors.transparent,
+      showDragHandle: false,
+      isScrollControlled: true,
+      builder: (_) => PlayerUnlockSheet(
+        l10n: AppLocalizations.of(context)!,
+        episodeNumber: episode.number,
+        coinCost: logic.blockedTicket?.unlockCoin ?? 0,
+        balance: wallet.snapshot == null ? null : wallet.balance,
+        onUnlock: () => _unlockEpisode(context, index),
+      ),
+    );
+  }
+
+  Future<bool> _unlockEpisode(BuildContext context, int index) async {
+    if (!await ensureSignedIn(context) || !context.mounted) return false;
+    final ok = await logic.unlockEpisode(index);
+    if (ok || !context.mounted) return ok;
+    final l10n = AppLocalizations.of(context)!;
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(errorText(l10n, logic.unlockError, l10n.unlockFailed)),
+      ),
+    );
+    return false;
+  }
+
+  Future<void> _toggleLike(
+    BuildContext context,
+    InteractionController interactions,
+    Drama drama,
+  ) async {
+    if (!await ensureSignedIn(context) || !context.mounted) return;
+    unawaited(context.read<Haptics>().lightImpact());
+    final result = await interactions.toggleDramaLike(drama.id);
+    if (result.isSuccess || !context.mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(
+          result.errorMessage ?? AppLocalizations.of(context)!.likeFailed,
+        ),
+      ),
+    );
+  }
+
+  Future<void> _toggleSave(BuildContext context, Drama drama) async {
+    final favorites = context.read<FavoriteController>();
+    if (!await ensureSignedIn(context) || !context.mounted) return;
+    unawaited(context.read<Haptics>().lightImpact());
+    final wasSaved = favorites.isSaved(drama.id);
+    final ok = await favorites.toggle(drama.id, card: drama);
+    if (!context.mounted) return;
+    if (ok) {
+      final nowSaved = favorites.isSaved(drama.id);
+      if (nowSaved != wasSaved) {
+        _applyFavoriteDelta(drama.id, nowSaved: nowSaved);
+      }
+      return;
+    }
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(AppLocalizations.of(context)!.favoriteToggleFailed),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/comment_tile.dart b/lib/pages/player/widgets/comment_tile.dart
index 56c1c19..3c567f4 100644
--- a/lib/pages/player/widgets/comment_tile.dart
+++ b/lib/pages/player/widgets/comment_tile.dart
@@ -4,8 +4,10 @@ import 'package:flutter/material.dart';
 
 import '../../../core/data/models/comment.dart';
 import '../../../core/data/services/comment_controller.dart';
+import '../../../core/formatting/localized_date_time.dart';
 import '../../../core/theme/app_colors.dart';
 import '../../../core/theme/app_dimens.dart';
+import '../../../core/widgets/remote_image.dart';
 import '../../../l10n/app_localizations.dart';
 
 const String _deleteAction = 'delete';
@@ -49,20 +51,12 @@ class CommentTile extends StatelessWidget {
         : comment.nickname;
     return Padding(
       key: Key('comment-item-${comment.id}'),
-      padding: const EdgeInsets.symmetric(vertical: 8),
+      padding: const EdgeInsets.symmetric(vertical: 12),
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          CircleAvatar(
-            radius: isReply ? 12 : 16,
-            backgroundColor: AppColors.raised,
-            child: Icon(
-              Icons.person_rounded,
-              size: isReply ? 14 : 18,
-              color: AppColors.cream,
-            ),
-          ),
-          const SizedBox(width: 12),
+          _avatar(),
+          const SizedBox(width: 10),
           Expanded(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -73,11 +67,21 @@ class CommentTile extends StatelessWidget {
                       child: Text(
                         name,
                         style: const TextStyle(
-                          color: AppColors.muted,
-                          fontSize: 12,
+                          color: AppColors.cream,
+                          fontSize: 13,
+                          fontWeight: FontWeight.w700,
                         ),
                       ),
                     ),
+                    if (comment.createdAt != null)
+                      Text(
+                        formatLocalizedDateTime(context, comment.createdAt!),
+                        style: const TextStyle(
+                          color: AppColors.subtle,
+                          fontSize: 11,
+                        ),
+                      ),
+                    const SizedBox(width: 4),
                     PopupMenuButton<String>(
                       key: Key('comment-menu-${comment.id}'),
                       tooltip: l10n.more,
@@ -104,7 +108,11 @@ class CommentTile extends StatelessWidget {
                 ),
                 Text(
                   comment.content,
-                  style: const TextStyle(color: AppColors.cream, fontSize: 14),
+                  style: const TextStyle(
+                    color: AppColors.cream,
+                    fontSize: 14,
+                    height: 1.4,
+                  ),
                 ),
                 if (comment.isPending)
                   Padding(
@@ -122,6 +130,12 @@ class CommentTile extends StatelessWidget {
                   children: [
                     TextButton.icon(
                       key: Key('comment-like-${comment.id}'),
+                      style: TextButton.styleFrom(
+                        foregroundColor: AppColors.muted,
+                        padding: const EdgeInsets.symmetric(horizontal: 4),
+                        minimumSize: const Size(0, 28),
+                        tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                      ),
                       onPressed: controller.likingComment(comment.id)
                           ? null
                           : () => handlers.onLike(comment),
@@ -131,11 +145,24 @@ class CommentTile extends StatelessWidget {
                             : Icons.favorite_border_rounded,
                         size: 16,
                       ),
-                      label: Text('${comment.likeCount}'),
+                      label: Text(
+                        '${comment.likeCount}',
+                        style: const TextStyle(fontSize: 11),
+                      ),
                     ),
                     if (!isReply)
                       TextButton(
                         key: Key('comment-reply-${comment.id}'),
+                        style: TextButton.styleFrom(
+                          foregroundColor: AppColors.blue,
+                          textStyle: const TextStyle(
+                            fontSize: 12,
+                            fontWeight: FontWeight.w600,
+                          ),
+                          padding: const EdgeInsets.symmetric(horizontal: 4),
+                          minimumSize: const Size(0, 28),
+                          tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                        ),
                         onPressed: () => handlers.onReply(comment),
                         child: Text(l10n.reply),
                       ),
@@ -148,4 +175,26 @@ class CommentTile extends StatelessWidget {
       ),
     );
   }
+
+  Widget _avatar() {
+    final size = isReply ? 24.0 : 32.0;
+    if (comment.avatarUrl.isEmpty) {
+      return CircleAvatar(
+        radius: size / 2,
+        backgroundColor: AppColors.raised,
+        child: Icon(
+          Icons.person_rounded,
+          size: isReply ? 14 : 18,
+          color: AppColors.cream,
+        ),
+      );
+    }
+    return ClipOval(
+      child: SizedBox(
+        width: size,
+        height: size,
+        child: RemoteImage(comment.avatarUrl, fit: BoxFit.cover),
+      ),
+    );
+  }
 }
diff --git a/lib/pages/player/widgets/drama_comments_sheet.dart b/lib/pages/player/widgets/drama_comments_sheet.dart
index e95d820..c3b4c34 100644
--- a/lib/pages/player/widgets/drama_comments_sheet.dart
+++ b/lib/pages/player/widgets/drama_comments_sheet.dart
@@ -10,6 +10,7 @@ import '../../../core/data/models/drama.dart';
 import '../../../core/data/repositories/comment_repository.dart';
 import '../../../core/data/repositories/interaction_repository.dart';
 import '../../../core/data/services/comment_controller.dart';
+import '../../../core/data/services/auth_controller.dart';
 import '../../../core/formatting/error_text.dart';
 import '../../../core/platform/haptics.dart';
 import '../../../core/theme/app_colors.dart';
@@ -22,7 +23,10 @@ import 'comment_tile.dart';
 const double _minSheetHeight = 280;
 const double _maxSheetHeight = 520;
 const int _maxCommentLength = 300;
-const double _composerRadius = 22;
+const double _composerRadius = 12;
+const double _composerHeight = 52;
+const double _sendButtonSize = 40;
+const double _sheetRadius = 20;
 
 /// 服务端评论底部弹窗：匿名列表、游标翻页、回复、点赞和本人删除。
 class DramaCommentsSheet extends StatefulWidget {
@@ -61,14 +65,15 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
 
   Future<void> _post() async {
     if (_controller.submitting) return;
-    if (_input.text.trim().isEmpty) return;
     if (!await ensureSignedIn(context) || !mounted) return;
+    if (_input.text.trim().isEmpty) return;
     unawaited(context.read<Haptics>().lightImpact());
     final result = await _controller.publish(_input.text, replyTo: _replyTo);
     if (!mounted) return;
     if (result.isSuccess) {
       _input.clear();
       setState(() => _replyTo = null);
+      FocusScope.of(context).unfocus();
       return;
     }
     _showMessage(
@@ -86,6 +91,13 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
     setState(() => _replyTo = null);
   }
 
+  Future<void> _authenticateForComment() async {
+    _inputFocus.unfocus();
+    await ensureSignedIn(context);
+    if (!mounted || !context.read<AuthController>().isSignedIn) return;
+    _inputFocus.requestFocus();
+  }
+
   Future<void> _like(DramaComment comment) async {
     if (!await ensureSignedIn(context) || !mounted) return;
     unawaited(context.read<Haptics>().lightImpact());
@@ -160,15 +172,24 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
         24;
     return Padding(
       padding: EdgeInsets.only(bottom: MediaQuery.viewInsetsOf(context).bottom),
-      child: SizedBox(
-        height: available.clamp(_minSheetHeight, _maxSheetHeight),
-        child: SafeArea(
-          top: false,
-          child: Padding(
-            padding: const EdgeInsets.fromLTRB(20, 4, 20, 12),
-            child: ListenableBuilder(
-              listenable: _controller,
-              builder: (context, _) => _content(context),
+      child: Container(
+        key: const Key('player-comments-sheet'),
+        decoration: const BoxDecoration(
+          color: AppColors.card,
+          borderRadius: BorderRadius.vertical(
+            top: Radius.circular(_sheetRadius),
+          ),
+        ),
+        child: SizedBox(
+          height: available.clamp(_minSheetHeight, _maxSheetHeight),
+          child: SafeArea(
+            top: false,
+            child: Padding(
+              padding: const EdgeInsets.fromLTRB(12, 4, 12, 12),
+              child: ListenableBuilder(
+                listenable: _controller,
+                builder: (context, _) => _content(context),
+              ),
             ),
           ),
         ),
@@ -178,18 +199,55 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
 
   Widget _content(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
+    final count = _controller.exactCount;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(
-          l10n.comments,
-          style: const TextStyle(
-            color: AppColors.cream,
-            fontSize: 18,
-            fontWeight: FontWeight.w700,
+        Center(
+          child: Container(
+            key: const Key('player-comments-drag-handle'),
+            width: 36,
+            height: 4,
+            decoration: BoxDecoration(
+              color: AppColors.border,
+              borderRadius: BorderRadius.circular(999),
+            ),
           ),
         ),
-        const SizedBox(height: 12),
+        const SizedBox(height: 8),
+        Row(
+          children: [
+            Expanded(
+              child: Text(
+                count == null ? l10n.comments : l10n.commentsWithCount(count),
+                key: count == null ? null : const Key('comment-count-label'),
+                style: const TextStyle(
+                  color: AppColors.onSurface,
+                  fontSize: 15,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ),
+            IconButton(
+              key: const Key('player-comments-close'),
+              tooltip: l10n.close,
+              onPressed: () => Navigator.pop(context),
+              visualDensity: VisualDensity.compact,
+              icon: const Icon(Icons.close_rounded, size: 20),
+            ),
+          ],
+        ),
+        Text(
+          widget.drama.title,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: const TextStyle(
+            color: AppColors.muted,
+            fontSize: 12,
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+        const SizedBox(height: 8),
         Expanded(child: _list(l10n)),
         if (_replyTo != null) _replyBanner(l10n, _replyTo!),
         _composer(l10n),
@@ -292,43 +350,61 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
       hintStyle: const TextStyle(color: AppColors.muted, fontSize: 14),
       counterText: '',
       filled: true,
-      fillColor: AppColors.raised,
-      contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+      fillColor: AppColors.commentInput,
+      contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
+      isDense: true,
       border: clear,
       enabledBorder: clear,
       focusedBorder: clear,
     );
   }
 
-  Widget _composer(AppLocalizations l10n) => Row(
-    children: [
-      Expanded(
-        child: TextField(
-          key: const Key('comment-input'),
-          controller: _input,
-          focusNode: _inputFocus,
-          maxLength: _maxCommentLength,
-          maxLines: 1,
-          style: const TextStyle(color: AppColors.cream, fontSize: 14),
-          cursorColor: AppColors.gold,
-          decoration: _composerDecoration(l10n.writeComment),
-          onSubmitted: (_) => _post(),
+  Widget _composer(AppLocalizations l10n) {
+    final signedIn = context.watch<AuthController>().isSignedIn;
+    return Row(
+      children: [
+        Expanded(
+          child: SizedBox(
+            height: _composerHeight,
+            child: TextField(
+              key: const Key('comment-input'),
+              controller: _input,
+              focusNode: _inputFocus,
+              readOnly: !signedIn,
+              canRequestFocus: signedIn,
+              maxLength: _maxCommentLength,
+              maxLines: 1,
+              textAlignVertical: TextAlignVertical.center,
+              style: const TextStyle(color: AppColors.cream, fontSize: 14),
+              cursorColor: AppColors.blue,
+              decoration: _composerDecoration(
+                signedIn ? l10n.writeComment : l10n.commentLoginHint,
+              ),
+              onTap: signedIn ? null : _authenticateForComment,
+              onSubmitted: (_) => _post(),
+            ),
+          ),
         ),
-      ),
-      const SizedBox(width: 8),
-      IconButton.filled(
-        key: const Key('comment-post'),
-        tooltip: l10n.postComment,
-        onPressed: _controller.submitting ? null : _post,
-        icon: _controller.submitting
-            ? const SizedBox.square(
-                dimension: 18,
-                child: CircularProgressIndicator(strokeWidth: 2),
-              )
-            : const Icon(Icons.send_rounded),
-      ),
-    ],
-  );
+        const SizedBox(width: 8),
+        SizedBox.square(
+          dimension: _sendButtonSize,
+          child: IconButton.filled(
+            key: const Key('comment-post'),
+            tooltip: l10n.postComment,
+            padding: EdgeInsets.zero,
+            iconSize: 18,
+            onPressed: _controller.submitting ? null : _post,
+            icon: _controller.submitting
+                ? const SizedBox.square(
+                    dimension: 16,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                : const Icon(Icons.send_rounded),
+          ),
+        ),
+      ],
+    );
+  }
 }
 
 class _CommentThread extends StatelessWidget {
@@ -356,10 +432,20 @@ class _CommentThread extends StatelessWidget {
         ),
         if (comment.replyCount > 0 || replies.isNotEmpty)
           Padding(
-            padding: const EdgeInsets.only(left: 44, bottom: 8),
+            padding: const EdgeInsets.only(left: 42, bottom: 4),
             child: TextButton(
               key: Key('comment-replies-${comment.id}'),
               onPressed: () => _toggleReplies(context),
+              style: TextButton.styleFrom(
+                foregroundColor: AppColors.blue,
+                textStyle: const TextStyle(
+                  fontSize: 12,
+                  fontWeight: FontWeight.w600,
+                ),
+                padding: const EdgeInsets.symmetric(horizontal: 4),
+                minimumSize: const Size(0, 28),
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+              ),
               child: Text(
                 expanded
                     ? AppLocalizations.of(context)!.hideReplies
@@ -394,7 +480,10 @@ class _CommentThread extends StatelessWidget {
               ],
             ),
           ),
-        const Divider(height: 1, color: AppColors.outlineVariantDark),
+        const Padding(
+          padding: EdgeInsets.only(left: 42),
+          child: Divider(height: 1, color: AppColors.border),
+        ),
       ],
     );
   }
diff --git a/lib/pages/player/widgets/episode_picker_cell.dart b/lib/pages/player/widgets/episode_picker_cell.dart
index b5069b7..d282460 100644
--- a/lib/pages/player/widgets/episode_picker_cell.dart
+++ b/lib/pages/player/widgets/episode_picker_cell.dart
@@ -10,7 +10,7 @@ const double _numberSize = 15;
 const double _lockSize = 16;
 const double _lockGap = 4;
 const double _lockWeight = 300;
-const double _coverAlpha = 0.45;
+const double _coverAlpha = 0.55;
 
 /// 选集格子。需要解锁时铺一层透明底，锁在上，集数在锁下面。
 class EpisodePickerCell extends StatelessWidget {
@@ -38,12 +38,19 @@ class EpisodePickerCell extends StatelessWidget {
         child: Stack(
           fit: StackFit.expand,
           children: [
-            if (!episode.locked) Center(child: _EpisodeNumber(episode.number)),
+            if (!episode.locked)
+              Center(
+                child: _EpisodeNumber(
+                  episode.number,
+                  color: selected ? AppColors.onPrimary : AppColors.cream,
+                ),
+              ),
             if (episode.locked)
               _LockCover(
                 episodeId: episode.id,
                 number: episode.number,
                 label: lockLabel,
+                selected: selected,
               ),
           ],
         ),
@@ -53,16 +60,17 @@ class EpisodePickerCell extends StatelessWidget {
 }
 
 class _EpisodeNumber extends StatelessWidget {
-  const _EpisodeNumber(this.number);
+  const _EpisodeNumber(this.number, {required this.color});
 
   final int number;
+  final Color color;
 
   @override
   Widget build(BuildContext context) {
     return Text(
       '$number',
-      style: const TextStyle(
-        color: AppColors.cream,
+      style: TextStyle(
+        color: color,
         fontSize: _numberSize,
         fontWeight: FontWeight.w600,
         height: 1,
@@ -77,11 +85,13 @@ class _LockCover extends StatelessWidget {
     required this.episodeId,
     required this.number,
     required this.label,
+    required this.selected,
   });
 
   final String episodeId;
   final int number;
   final String label;
+  final bool selected;
 
   @override
   Widget build(BuildContext context) {
@@ -90,7 +100,7 @@ class _LockCover extends StatelessWidget {
       children: [
         ColoredBox(
           key: ValueKey('episode-lock-cover-$episodeId'),
-          color: AppColors.ink.withValues(alpha: _coverAlpha),
+          color: AppColors.card.withValues(alpha: _coverAlpha),
         ),
         Center(
           child: Column(
@@ -102,11 +112,14 @@ class _LockCover extends StatelessWidget {
                 size: _lockSize,
                 weight: _lockWeight,
                 fill: 0,
-                color: AppColors.gold,
+                color: AppColors.secondary,
                 semanticLabel: label,
               ),
               const SizedBox(height: _lockGap),
-              _EpisodeNumber(number),
+              _EpisodeNumber(
+                number,
+                color: selected ? AppColors.onPrimary : AppColors.cream,
+              ),
             ],
           ),
         ),
diff --git a/lib/pages/player/widgets/episode_picker_sheet.dart b/lib/pages/player/widgets/episode_picker_sheet.dart
new file mode 100644
index 0000000..a59d148
--- /dev/null
+++ b/lib/pages/player/widgets/episode_picker_sheet.dart
@@ -0,0 +1,145 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../core/formatting/localized_content.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/theme/app_dimens.dart';
+import '../../../l10n/app_localizations.dart';
+import 'episode_picker_cell.dart';
+
+const int _columns = 6;
+const double _sheetHeightFactor = 0.52;
+const double _cellAspect = 1.05;
+const double _sheetRadius = 20;
+
+/// K28 选集面板：六列等宽网格、当前集高亮、锁定集显示锁标。
+class EpisodePickerSheet extends StatelessWidget {
+  /// 创建选集面板。
+  const EpisodePickerSheet({
+    super.key,
+    required this.drama,
+    required this.currentNumber,
+    required this.onSelect,
+  });
+
+  /// 当前短剧。
+  final Drama drama;
+
+  /// 当前集号。
+  final int currentNumber;
+
+  /// 点击某集，参数为该集在原始列表中的索引。
+  final ValueChanged<int> onSelect;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final episodes = drama.episodes;
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      key: const Key('player-episodes-system-overlay'),
+      value: SystemUiOverlayStyle.dark.copyWith(
+        statusBarColor: Colors.transparent,
+        systemNavigationBarColor: AppColors.card,
+        systemNavigationBarDividerColor: Colors.transparent,
+        systemNavigationBarIconBrightness: Brightness.dark,
+        systemNavigationBarContrastEnforced: false,
+      ),
+      child: Container(
+        key: const Key('player-episodes-sheet'),
+        height: MediaQuery.sizeOf(context).height * _sheetHeightFactor,
+        decoration: const BoxDecoration(
+          color: AppColors.card,
+          borderRadius: BorderRadius.vertical(
+            top: Radius.circular(_sheetRadius),
+          ),
+        ),
+        child: SafeArea(
+          top: false,
+          bottom: true,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Padding(
+                padding: const EdgeInsets.fromLTRB(20, 14, 8, 4),
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: Text(
+                        l10n.episodes,
+                        style: const TextStyle(
+                          color: AppColors.onSurface,
+                          fontSize: 20,
+                          fontWeight: FontWeight.w800,
+                        ),
+                      ),
+                    ),
+                    IconButton(
+                      key: const Key('player-episodes-close'),
+                      tooltip: l10n.close,
+                      onPressed: () => Navigator.pop(context),
+                      icon: const Icon(Icons.close_rounded),
+                    ),
+                  ],
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.fromLTRB(20, 0, 20, 12),
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: Text(
+                        localizedDramaTitle(l10n, drama),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          color: AppColors.onSurface,
+                          fontSize: 14,
+                          fontWeight: FontWeight.w600,
+                        ),
+                      ),
+                    ),
+                    Text(
+                      l10n.episodeCountLabel(episodes.length),
+                      style: const TextStyle(
+                        color: AppColors.muted,
+                        fontSize: 12,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              Expanded(
+                child: GridView.builder(
+                  padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+                  gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                    crossAxisCount: _columns,
+                    mainAxisSpacing: AppDimens.spaceSm,
+                    crossAxisSpacing: AppDimens.spaceSm,
+                    childAspectRatio: _cellAspect,
+                  ),
+                  itemCount: episodes.length,
+                  itemBuilder: (context, index) {
+                    final episode = episodes[index];
+                    return EpisodePickerCell(
+                      key: Key('player-episode-${episode.number}'),
+                      episode: episode,
+                      selected: episode.number == currentNumber,
+                      lockLabel: l10n.locked,
+                      onTap: () {
+                        Navigator.pop(context);
+                        onSelect(index);
+                      },
+                    );
+                  },
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/home_feed_header.dart b/lib/pages/player/widgets/home_feed_header.dart
new file mode 100644
index 0000000..fad82ac
--- /dev/null
+++ b/lib/pages/player/widgets/home_feed_header.dart
@@ -0,0 +1,275 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../l10n/app_localizations.dart';
+
+const double _topIconSize = 36;
+const double _topIconGlyph = 22;
+const double _tabGap = 22;
+const double _tabFontSize = 15;
+const double _underlineWidth = 18;
+const double _underlineHeight = 2;
+
+/// 首页 feed 固定顶栏：刷新 / 漫剧·真人剧·推荐 / 搜索。
+class HomeFeedHeader extends StatefulWidget {
+  const HomeFeedHeader({
+    super.key,
+    required this.l10n,
+    required this.onRefresh,
+    required this.onSearch,
+    required this.onMore,
+  });
+
+  final AppLocalizations l10n;
+  final Future<bool> Function() onRefresh;
+  final VoidCallback onSearch;
+  final VoidCallback onMore;
+
+  @override
+  State<HomeFeedHeader> createState() => _HomeFeedHeaderState();
+}
+
+class _HomeFeedHeaderState extends State<HomeFeedHeader> {
+  _FeedTab _tab = _FeedTab.recommend;
+  bool _refreshing = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(8, 6, 8, 4),
+      child: Row(
+        children: [
+          _RefreshButton(
+            tooltip: widget.l10n.retry,
+            dimension: _topIconSize,
+            glyphSize: _topIconGlyph,
+            refreshing: _refreshing,
+            onTap: _refresh,
+            onLongPress: widget.onMore,
+          ),
+          Expanded(
+            child: Center(
+              child: SingleChildScrollView(
+                scrollDirection: Axis.horizontal,
+                child: Row(
+                  children: [
+                    for (var index = 0; index < _FeedTab.values.length; index++)
+                      _tabSlot(_FeedTab.values[index], index),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          _TopIconButton(
+            key: const Key('home-feed-search'),
+            tooltip: widget.l10n.search,
+            icon: Icons.search_rounded,
+            dimension: _topIconSize,
+            glyphSize: _topIconGlyph,
+            onPressed: widget.onSearch,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _tabSlot(_FeedTab tab, int index) {
+    final item = _FeedTabItem(
+      tab: tab,
+      label: tab.label(widget.l10n),
+      selected: _tab == tab,
+      fontSize: _tabFontSize,
+      underlineWidth: _underlineWidth,
+      underlineHeight: _underlineHeight,
+      onTap: () => _selectTab(tab),
+    );
+    if (index == 0) return item;
+    return Padding(
+      padding: const EdgeInsets.only(left: _tabGap),
+      child: item,
+    );
+  }
+
+  void _selectTab(_FeedTab tab) {
+    if (tab.comingSoon) {
+      _showComingSoon();
+      return;
+    }
+    setState(() => _tab = tab);
+  }
+
+  Future<void> _refresh() async {
+    if (_refreshing) return;
+    setState(() => _refreshing = true);
+    await widget.onRefresh();
+    if (mounted) setState(() => _refreshing = false);
+  }
+
+  void _showComingSoon() {
+    ScaffoldMessenger.of(
+      context,
+    ).showSnackBar(SnackBar(content: Text(widget.l10n.comingSoon)));
+  }
+}
+
+/// 顶部频道 tab：漫剧点击提示即将上线。
+enum _FeedTab {
+  anime,
+  real,
+  recommend;
+
+  bool get comingSoon => this == _FeedTab.anime;
+
+  String get keyName => switch (this) {
+    _FeedTab.anime => 'anime',
+    _FeedTab.real => 'real',
+    _FeedTab.recommend => 'recommend',
+  };
+
+  String label(AppLocalizations l10n) => switch (this) {
+    _FeedTab.anime => l10n.feedTabAnime,
+    _FeedTab.real => l10n.feedTabReal,
+    _FeedTab.recommend => l10n.feedTabForYou,
+  };
+}
+
+class _TopIconButton extends StatelessWidget {
+  const _TopIconButton({
+    super.key,
+    required this.tooltip,
+    required this.icon,
+    required this.dimension,
+    required this.glyphSize,
+    required this.onPressed,
+  });
+
+  final String tooltip;
+  final IconData icon;
+  final double dimension;
+  final double glyphSize;
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox.square(
+      dimension: dimension,
+      child: IconButton(
+        tooltip: tooltip,
+        onPressed: onPressed,
+        padding: EdgeInsets.zero,
+        icon: Icon(
+          icon,
+          size: glyphSize,
+          color: Colors.white,
+          shadows: const [Shadow(blurRadius: 6, color: Colors.black)],
+        ),
+      ),
+    );
+  }
+}
+
+/// 刷新入口：点击重新加载 feed，长按打开更多（清屏等）。
+class _RefreshButton extends StatelessWidget {
+  const _RefreshButton({
+    required this.tooltip,
+    required this.dimension,
+    required this.glyphSize,
+    required this.refreshing,
+    required this.onTap,
+    required this.onLongPress,
+  });
+
+  final String tooltip;
+  final double dimension;
+  final double glyphSize;
+  final bool refreshing;
+  final VoidCallback onTap;
+  final VoidCallback onLongPress;
+
+  @override
+  Widget build(BuildContext context) {
+    return Tooltip(
+      message: tooltip,
+      child: GestureDetector(
+        key: const Key('home-feed-refresh'),
+        behavior: HitTestBehavior.opaque,
+        onTap: onTap,
+        onLongPress: onLongPress,
+        child: SizedBox.square(
+          dimension: dimension,
+          child: refreshing
+              ? const Center(
+                  child: SizedBox.square(
+                    dimension: 18,
+                    child: CircularProgressIndicator(
+                      key: Key('home-feed-refreshing'),
+                      strokeWidth: 2,
+                      color: Colors.white,
+                    ),
+                  ),
+                )
+              : Icon(
+                  Icons.refresh_rounded,
+                  size: glyphSize,
+                  color: Colors.white,
+                  shadows: const [Shadow(blurRadius: 6, color: Colors.black)],
+                ),
+        ),
+      ),
+    );
+  }
+}
+
+class _FeedTabItem extends StatelessWidget {
+  const _FeedTabItem({
+    required this.tab,
+    required this.label,
+    required this.selected,
+    required this.fontSize,
+    required this.underlineWidth,
+    required this.underlineHeight,
+    required this.onTap,
+  });
+
+  final _FeedTab tab;
+  final String label;
+  final bool selected;
+  final double fontSize;
+  final double underlineWidth;
+  final double underlineHeight;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      key: Key('home-feed-tab-${tab.keyName}'),
+      behavior: HitTestBehavior.opaque,
+      onTap: onTap,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(
+            label,
+            maxLines: 1,
+            style: TextStyle(
+              color: selected ? Colors.white : Colors.white70,
+              fontSize: fontSize,
+              fontWeight: selected ? FontWeight.w800 : FontWeight.w600,
+              shadows: const [Shadow(blurRadius: 6, color: Colors.black)],
+            ),
+          ),
+          const SizedBox(height: 4),
+          Container(
+            width: underlineWidth,
+            height: underlineHeight,
+            decoration: BoxDecoration(
+              color: selected ? Colors.white : Colors.transparent,
+              borderRadius: BorderRadius.circular(1),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/home_feed_overlay.dart b/lib/pages/player/widgets/home_feed_overlay.dart
index 3fc5c00..35a3374 100644
--- a/lib/pages/player/widgets/home_feed_overlay.dart
+++ b/lib/pages/player/widgets/home_feed_overlay.dart
@@ -1,422 +1,402 @@
 // Author: fruit.com.cn
 
-import 'dart:async';
-
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:video_player/video_player.dart';
 
 import '../../../core/data/models/drama.dart';
+import '../../../core/formatting/count_format.dart';
 import '../../../core/formatting/localized_content.dart';
 import '../../../core/theme/app_colors.dart';
-import '../../../core/theme/app_dimens.dart';
-import '../../../core/widgets/glass_panel.dart';
 import '../../../l10n/app_localizations.dart';
+import 'interaction_rail.dart';
 
-/// Home feed layer from `docs/移动端设计预览.html` screen 01.
-class HomeFeedOverlay extends StatelessWidget {
+part 'home_feed_overlay_parts.dart';
+
+const Color _overlayPill = Color(0x66000000);
+const Color _fullBarBackground = Color(0x4D000000);
+const double _titleFontSize = 17;
+const double _metaFontSize = 12;
+const double _tagFontSize = 11;
+const double _fullBarHeight = 44;
+const double _progressHeight = 2;
+const double _progressHitHeight = 24;
+const List<Shadow> _boostTextShadows = [
+  Shadow(color: Colors.black54, blurRadius: 5, offset: Offset(0, 1)),
+];
+const int _maxTags = 4;
+final RegExp _tagSplitter = RegExp(r'[,/、·]');
+
+/// 首页沉浸式 feed 浮层：手势层、右侧互动栏、底部信息与整集进度条。
+class HomeFeedOverlay extends StatefulWidget {
   const HomeFeedOverlay({
     super.key,
     required this.l10n,
     required this.drama,
     required this.episode,
+    required this.controller,
     required this.liked,
     required this.saved,
+    required this.visible,
+    required this.boosting,
     required this.onLike,
     required this.onSave,
     required this.onComments,
     required this.onShare,
-    required this.onEpisodes,
-    required this.onDownload,
-    required this.onClear,
-    required this.onSearch,
-    this.onPip,
+    required this.onDetail,
+    required this.onOpenFullPlayer,
+    required this.onTogglePlay,
+    required this.onBoostStart,
+    required this.onBoostEnd,
+    required this.onMore,
+    this.likeCount,
+    this.favoriteCount,
+    this.commentCount,
+    this.authorNote = '',
+    this.onScrubStart,
+    this.onSeek,
   });
 
   final AppLocalizations l10n;
   final Drama drama;
   final Episode episode;
+  final ValueListenable<VideoPlayerValue>? controller;
   final bool liked;
+  final int? likeCount;
+  final int? favoriteCount;
+  final int? commentCount;
   final bool saved;
+  final String authorNote;
+  final bool visible;
+  final bool boosting;
   final VoidCallback onLike;
   final VoidCallback onSave;
   final VoidCallback onComments;
   final VoidCallback onShare;
-  final VoidCallback onEpisodes;
-  final VoidCallback onDownload;
-  final VoidCallback onClear;
-  final VoidCallback onSearch;
-  final VoidCallback? onPip;
+  final VoidCallback onDetail;
+  final VoidCallback onOpenFullPlayer;
+  final VoidCallback onTogglePlay;
+  final VoidCallback onBoostStart;
+  final VoidCallback onBoostEnd;
+  final VoidCallback onMore;
+  final VoidCallback? onScrubStart;
+  final ValueChanged<Duration>? onSeek;
 
+  @override
+  State<HomeFeedOverlay> createState() => _HomeFeedOverlayState();
+}
+
+class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
   @override
   Widget build(BuildContext context) {
     return SafeArea(
       bottom: false,
-      child: Column(
+      child: Stack(
         children: [
-          _header(context),
-          Expanded(
-            child: Align(
-              alignment: const Alignment(1.0, 0.45),
-              child: Padding(
-                padding: const EdgeInsets.fromLTRB(0, 0, 12, 16),
-                child: _rail(),
+          Positioned.fill(
+            child: LayoutBuilder(
+              builder: (context, constraints) => Listener(
+                onPointerUp: (_) => widget.onBoostEnd(),
+                onPointerCancel: (_) => widget.onBoostEnd(),
+                child: GestureDetector(
+                  key: const Key('home-feed-gesture'),
+                  behavior: HitTestBehavior.opaque,
+                  onTap: widget.onTogglePlay,
+                  onLongPressStart: (details) =>
+                      _handleLongPressStart(details, constraints.maxWidth),
+                  onLongPressEnd: (_) => widget.onBoostEnd(),
+                  onLongPressCancel: widget.onBoostEnd,
+                ),
               ),
             ),
           ),
-          Padding(
-            padding: const EdgeInsets.fromLTRB(14, 0, 14, 14),
-            child: _infoCard(),
-          ),
+          if (widget.boosting)
+            Column(children: [const Spacer(), _boostHint(), _fullSeriesBar()])
+          else
+            Column(
+              children: [
+                const Spacer(),
+                if (widget.visible) _bottomInfo(),
+                _fullSeriesBar(),
+              ],
+            ),
+          if (widget.visible && !widget.boosting)
+            Positioned(right: 10, bottom: 56, child: _rail()),
         ],
       ),
     );
   }
 
-  Widget _header(BuildContext context) {
+  void _handleLongPressStart(LongPressStartDetails details, double width) {
+    final third = width / 3;
+    final dx = details.localPosition.dx;
+    if (dx < third || dx > width - third) {
+      widget.onBoostStart();
+      return;
+    }
+    widget.onMore();
+  }
+
+  Widget _boostHint() {
     return Padding(
-      padding: const EdgeInsets.fromLTRB(14, 6, 10, 4),
+      key: const Key('home-feed-speed-boost-hint'),
+      padding: const EdgeInsets.only(bottom: 8),
       child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          Expanded(
-            child: Text(
-              localizedDramaTitle(l10n, drama),
-              key: const Key('home-feed-title'),
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
-              style: const TextStyle(
-                fontFamily: 'Outfit',
-                color: AppColors.onSurface,
-                fontSize: 13,
-                fontWeight: FontWeight.w800,
-                shadows: [Shadow(blurRadius: 8, color: Colors.black)],
-              ),
+          const Icon(
+            Icons.play_arrow_rounded,
+            color: AppColors.blue,
+            size: 16,
+            shadows: _boostTextShadows,
+          ),
+          const SizedBox(width: 4),
+          Text(
+            widget.l10n.speedBoosting('2.0'),
+            style: const TextStyle(
+              color: AppColors.blue,
+              fontSize: 13,
+              fontWeight: FontWeight.w700,
+              shadows: _boostTextShadows,
             ),
           ),
-          _RoundIcon(
-            key: const Key('home-feed-search'),
-            tooltip: l10n.search,
-            icon: Icons.search_rounded,
-            onPressed: onSearch,
-          ),
-          const SizedBox(width: 8),
-          _RoundIcon(
-            key: const Key('home-feed-clear-screen'),
-            tooltip: l10n.clearScreen,
-            icon: Icons.fullscreen_rounded,
-            onPressed: onClear,
-          ),
-          const SizedBox(width: 8),
-          _RoundIcon(
-            key: const Key('home-feed-more'),
-            tooltip: l10n.more,
-            icon: Icons.menu_rounded,
-            onPressed: () => _openMore(context),
-          ),
         ],
       ),
     );
   }
 
   Widget _rail() {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        _RailItem(
-          key: const Key('rail-like'),
-          icon: liked ? Icons.favorite_rounded : Icons.favorite_border_rounded,
-          label: l10n.like,
-          selected: liked,
-          onTap: onLike,
+    return InteractionRail(
+      items: [
+        InteractionRailItem(
+          key: const Key('rail-save'),
+          icon: Icons.star_border_rounded,
+          activeIcon: Icons.star_rounded,
+          label: widget.l10n.favorite,
+          count: widget.favoriteCount,
+          countKey: const Key('rail-save-count'),
+          selected: widget.saved,
+          onTap: widget.onSave,
         ),
-        _RailItem(
+        InteractionRailItem(
           key: const Key('rail-comments'),
           icon: Icons.chat_bubble_outline_rounded,
-          label: l10n.comments,
-          onTap: onComments,
+          activeIcon: Icons.chat_bubble_rounded,
+          label: widget.l10n.comments,
+          count: widget.commentCount,
+          countKey: const Key('rail-comments-count'),
+          onTap: widget.onComments,
         ),
-        _RailItem(
+        InteractionRailItem(
+          key: const Key('rail-like'),
+          icon: Icons.favorite_border_rounded,
+          activeIcon: Icons.favorite_rounded,
+          label: widget.l10n.like,
+          count: widget.likeCount,
+          countKey: const Key('rail-like-count'),
+          selected: widget.liked,
+          onTap: widget.onLike,
+        ),
+        InteractionRailItem(
           key: const Key('rail-share'),
           icon: Icons.ios_share_rounded,
-          label: l10n.share,
-          onTap: onShare,
-        ),
-        _RailItem(
-          key: const Key('rail-save'),
-          icon: saved ? Icons.star_rounded : Icons.star_border_rounded,
-          label: l10n.favorite,
-          selected: saved,
-          onTap: onSave,
+          activeIcon: Icons.ios_share_rounded,
+          label: widget.l10n.share,
+          onTap: widget.onShare,
         ),
       ],
     );
   }
 
-  Widget _infoCard() {
-    final genre = drama.genre.isEmpty ? drama.category : drama.genre;
-    return GlassPanel(
-      key: const Key('home-feed-info-card'),
-      radius: 14,
-      blur: 6,
-      padding: const EdgeInsets.all(12),
-      gradient: const LinearGradient(
-        begin: Alignment.topLeft,
-        end: Alignment.bottomRight,
-        colors: [Color(0xBF0F0F14), Color(0xA60F0F14)],
-      ),
-      borderColor: Colors.white.withValues(alpha: 0.06),
+  Widget _bottomInfo() {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(14, 0, 56, 8),
       child: Column(
-        mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
         children: [
-          Wrap(
-            spacing: 6,
-            runSpacing: 4,
-            crossAxisAlignment: WrapCrossAlignment.center,
-            children: [
-              if (genre.isNotEmpty)
-                _tag(
-                  genre,
-                  background: AppColors.blue,
-                  foreground: AppColors.onPrimary,
-                ),
-              if (drama.category.isNotEmpty && drama.category != genre)
-                _tag(
-                  drama.category,
-                  background: const Color(0xFF333333),
-                  foreground: const Color(0xFFDDDDDD),
-                ),
-              Text(
-                l10n.episodeOfTotal(episode.number, drama.episodeCount),
-                key: const Key('home-feed-episode'),
-                style: const TextStyle(color: Color(0xFFBBBBBB), fontSize: 9),
+          _seriesMetaRow(),
+          const SizedBox(height: 2),
+          _titleRow(),
+          const SizedBox(height: 6),
+          _tagsRow(),
+          if (widget.authorNote.isNotEmpty) ...[
+            const SizedBox(height: 6),
+            Text(
+              '${widget.l10n.authorNoteLabel}: ${widget.authorNote}',
+              key: const Key('home-feed-author-note'),
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+              style: const TextStyle(color: Colors.white70, fontSize: 11),
+            ),
+          ],
+        ],
+      ),
+    );
+  }
+
+  Widget _seriesMetaRow() {
+    return GestureDetector(
+      key: const Key('home-feed-series-meta'),
+      onTap: widget.onDetail,
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Flexible(
+            child: Text(
+              widget.l10n.seriesMeta(
+                '${widget.drama.episodeCount}',
+                formatInteractionCount(widget.drama.viewCount),
+              ),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: const TextStyle(
+                color: Colors.white70,
+                fontSize: _metaFontSize,
               ),
-            ],
-          ),
-          const SizedBox(height: 8),
-          Text(
-            episode.title.trim().isEmpty
-                ? localizedDramaTitle(l10n, drama)
-                : episode.title,
-            key: const Key('home-feed-episode-title'),
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-            style: const TextStyle(
-              color: AppColors.onSurface,
-              fontSize: 13,
-              fontWeight: FontWeight.w800,
             ),
           ),
-          const SizedBox(height: 10),
-          Row(
-            children: [
-              Expanded(
-                child: SizedBox(
-                  height: 34,
-                  child: FilledButton.icon(
-                    key: const Key('home-feed-follow-series'),
-                    onPressed: onSave,
-                    style: FilledButton.styleFrom(
-                      backgroundColor: AppColors.blue,
-                      foregroundColor: AppColors.onPrimary,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(
-                          AppDimens.buttonRadius,
-                        ),
-                      ),
-                      padding: EdgeInsets.zero,
-                      textStyle: const TextStyle(
-                        fontSize: 12,
-                        fontWeight: FontWeight.w700,
-                      ),
-                    ),
-                    icon: const Icon(Icons.play_arrow_rounded, size: 16),
-                    label: Text(
-                      saved ? l10n.followingTab : l10n.followSeries,
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                  ),
-                ),
-              ),
-              const SizedBox(width: 8),
-              Expanded(
-                child: SizedBox(
-                  height: 34,
-                  child: FilledButton(
-                    key: const Key('home-feed-episodes'),
-                    onPressed: onEpisodes,
-                    style: FilledButton.styleFrom(
-                      backgroundColor: const Color(0xFF2A2A30),
-                      foregroundColor: AppColors.onSurface,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(
-                          AppDimens.buttonRadius,
-                        ),
-                      ),
-                      padding: EdgeInsets.zero,
-                      textStyle: const TextStyle(
-                        fontSize: 12,
-                        fontWeight: FontWeight.w600,
-                      ),
-                    ),
-                    child: Text(
-                      l10n.episodes,
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                  ),
-                ),
-              ),
-            ],
+          const Icon(
+            Icons.chevron_right_rounded,
+            color: Colors.white70,
+            size: 16,
           ),
         ],
       ),
     );
   }
 
-  Widget _tag(
-    String label, {
-    required Color background,
-    required Color foreground,
-  }) {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-      decoration: BoxDecoration(
-        color: background,
-        borderRadius: BorderRadius.circular(6),
-      ),
-      child: Text(
-        label,
-        maxLines: 1,
-        style: TextStyle(
-          color: foreground,
-          fontSize: 8,
-          fontWeight: FontWeight.w800,
-        ),
+  Widget _titleRow() {
+    return GestureDetector(
+      onTap: widget.onDetail,
+      child: Row(
+        children: [
+          Flexible(
+            child: Text(
+              localizedDramaTitle(widget.l10n, widget.drama),
+              key: const Key('home-feed-title'),
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+              style: const TextStyle(
+                fontFamily: 'Outfit',
+                color: Colors.white,
+                fontSize: _titleFontSize,
+                fontWeight: FontWeight.w800,
+                shadows: [Shadow(blurRadius: 8, color: Colors.black)],
+              ),
+            ),
+          ),
+          const Icon(Icons.chevron_right_rounded, color: Colors.white, size: 20),
+        ],
       ),
     );
   }
 
-  Future<void> _openMore(BuildContext context) async {
-    await showModalBottomSheet<void>(
-      context: context,
-      backgroundColor: AppColors.card,
-      showDragHandle: true,
-      builder: (sheetContext) => SafeArea(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            ListTile(
-              key: const Key('home-feed-download'),
-              leading: const Icon(
-                Icons.download_outlined,
-                color: AppColors.secondary,
-              ),
-              title: Text(l10n.downloads),
-              onTap: () {
-                Navigator.pop(sheetContext);
-                onDownload();
-              },
+  Widget _tagsRow() {
+    final tags = [
+      widget.l10n.episodeLabel(widget.episode.number),
+      ..._tagValues(),
+    ].take(_maxTags).toList();
+    return Wrap(
+      key: const Key('home-feed-tags'),
+      spacing: 6,
+      runSpacing: 4,
+      children: [
+        for (final tag in tags)
+          Container(
+            padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+            decoration: BoxDecoration(
+              color: _overlayPill,
+              borderRadius: BorderRadius.circular(6),
             ),
-            if (onPip != null)
-              ListTile(
-                key: const Key('home-feed-pip'),
-                leading: const Icon(
-                  Icons.picture_in_picture_alt_outlined,
-                  color: AppColors.secondary,
-                ),
-                title: Text(l10n.pictureInPicture),
-                onTap: () {
-                  Navigator.pop(sheetContext);
-                  onPip!();
-                },
+            child: Text(
+              tag,
+              maxLines: 1,
+              style: const TextStyle(
+                color: Colors.white,
+                fontSize: _tagFontSize,
               ),
+            ),
+          ),
+      ],
+    );
+  }
+
+  List<String> _tagValues() {
+    final result = <String>[];
+    for (final value in [widget.drama.genre, widget.drama.category]) {
+      for (final part in value.split(_tagSplitter)) {
+        final tag = part.trim();
+        if (tag.isEmpty || result.contains(tag)) continue;
+        result.add(tag);
+      }
+    }
+    return result;
+  }
+
+  Widget _fullSeriesBar() {
+    return GestureDetector(
+      key: const Key('home-feed-full-series'),
+      onTap: widget.onOpenFullPlayer,
+      child: SizedBox(
+        height: _fullBarHeight,
+        child: Stack(
+          children: [
+            Positioned.fill(
+              child: Container(
+                key: const Key('home-feed-full-series-bg'),
+                color: _fullBarBackground,
+              ),
+            ),
+            Positioned.fill(
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 14),
+                child: Row(
+                  children: [
+                    const Icon(
+                      Icons.play_arrow_rounded,
+                      color: Colors.white,
+                      size: 14,
+                    ),
+                    const SizedBox(width: 6),
+                    Expanded(
+                      child: Text(
+                        widget.l10n.watchFullSeries(
+                          '${widget.drama.episodeCount}',
+                        ),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 13,
+                          fontWeight: FontWeight.w600,
+                        ),
+                      ),
+                    ),
+                    const Icon(
+                      Icons.chevron_right_rounded,
+                      color: Colors.white,
+                      size: 18,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            Positioned(
+              left: 0,
+              right: 0,
+              bottom: 0,
+              child: _FeedProgressBar(
+                controller: widget.controller,
+                height: _progressHeight,
+                hitHeight: _progressHitHeight,
+                onScrubStart: widget.onScrubStart,
+                onSeek: widget.onSeek,
+              ),
+            ),
           ],
         ),
       ),
     );
   }
 }
-
-class _RoundIcon extends StatelessWidget {
-  const _RoundIcon({
-    super.key,
-    required this.tooltip,
-    required this.icon,
-    required this.onPressed,
-  });
-
-  final String tooltip;
-  final IconData icon;
-  final VoidCallback onPressed;
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      width: 36,
-      height: 36,
-      child: IconButton(
-        tooltip: tooltip,
-        onPressed: onPressed,
-        padding: EdgeInsets.zero,
-        style: IconButton.styleFrom(
-          backgroundColor: const Color(0xCC2C2D33),
-          foregroundColor: AppColors.onSurface,
-        ),
-        icon: Icon(icon, size: 18),
-      ),
-    );
-  }
-}
-
-class _RailItem extends StatelessWidget {
-  const _RailItem({
-    super.key,
-    required this.icon,
-    required this.label,
-    required this.onTap,
-    this.selected = false,
-  });
-
-  final IconData icon;
-  final String label;
-  final VoidCallback onTap;
-  final bool selected;
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 14),
-      child: Semantics(
-        button: true,
-        label: label,
-        child: InkWell(
-          onTap: onTap,
-          borderRadius: BorderRadius.circular(22),
-          child: SizedBox(
-            width: 44,
-            child: Column(
-              children: [
-                Icon(
-                  icon,
-                  size: 22,
-                  color: selected ? AppColors.blue : AppColors.onSurface,
-                ),
-                const SizedBox(height: 2),
-                Text(
-                  label,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    color: AppColors.cream,
-                    fontSize: 9,
-                    shadows: [Shadow(blurRadius: 6, color: Colors.black)],
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/pages/player/widgets/home_feed_overlay_parts.dart b/lib/pages/player/widgets/home_feed_overlay_parts.dart
new file mode 100644
index 0000000..c5cc0fe
--- /dev/null
+++ b/lib/pages/player/widgets/home_feed_overlay_parts.dart
@@ -0,0 +1,135 @@
+// Author: fruit.com.cn
+
+part of 'home_feed_overlay.dart';
+
+const double _thumbSize = 6;
+const double _thumbActiveSize = 14;
+const double _trackActiveHeight = 6;
+const double _lineCenterFromBottom = 8;
+
+/// 整集条底部的进度线：20px 手势区内可点按/拖动 seek。
+class _FeedProgressBar extends StatefulWidget {
+  const _FeedProgressBar({
+    required this.controller,
+    required this.height,
+    required this.hitHeight,
+    this.onScrubStart,
+    this.onSeek,
+  });
+
+  final ValueListenable<VideoPlayerValue>? controller;
+  final double height;
+  final double hitHeight;
+  final VoidCallback? onScrubStart;
+  final ValueChanged<Duration>? onSeek;
+
+  @override
+  State<_FeedProgressBar> createState() => _FeedProgressBarState();
+}
+
+class _FeedProgressBarState extends State<_FeedProgressBar> {
+  double? _preview;
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final width = constraints.maxWidth;
+        final source = widget.controller;
+        final track = source == null
+            ? _track(0, width)
+            : ValueListenableBuilder<VideoPlayerValue>(
+                valueListenable: source,
+                builder: (context, value, _) {
+                  final total = value.duration.inMilliseconds;
+                  final played = total <= 0
+                      ? 0.0
+                      : (value.position.inMilliseconds / total)
+                            .clamp(0.0, 1.0)
+                            .toDouble();
+                  return _track(_preview ?? played, width);
+                },
+              );
+        return GestureDetector(
+          key: const Key('home-feed-progress'),
+          behavior: HitTestBehavior.opaque,
+          onHorizontalDragStart: (details) {
+            widget.onScrubStart?.call();
+            _update(details.localPosition.dx / width);
+          },
+          onHorizontalDragUpdate: (details) =>
+              _update(details.localPosition.dx / width),
+          onHorizontalDragEnd: (_) => _commit(_preview),
+          onHorizontalDragCancel: () => setState(() => _preview = null),
+          child: track,
+        );
+      },
+    );
+  }
+
+  void _update(double fraction) {
+    setState(() => _preview = fraction.clamp(0.0, 1.0).toDouble());
+  }
+
+  void _commit(double? fraction) {
+    if (fraction == null) return;
+    final total = widget.controller?.value.duration.inMilliseconds ?? 0;
+    if (total > 0) {
+      widget.onSeek?.call(
+        Duration(milliseconds: (total * fraction.clamp(0.0, 1.0)).round()),
+      );
+    }
+    setState(() => _preview = null);
+  }
+
+  Widget _track(double fraction, double width) {
+    final dragging = _preview != null;
+    final trackHeight = dragging ? _trackActiveHeight : widget.height;
+    final size = dragging ? _thumbActiveSize : _thumbSize;
+    final left = (width * fraction - size / 2)
+        .clamp(0.0, width - size)
+        .toDouble();
+    final lineBottom = _lineCenterFromBottom - trackHeight / 2;
+    final thumbBottom = _lineCenterFromBottom - size / 2;
+    return SizedBox(
+      height: widget.hitHeight,
+      child: Stack(
+        clipBehavior: Clip.none,
+        children: [
+          Positioned(
+            left: 0,
+            right: 0,
+            bottom: lineBottom,
+            child: Container(
+              key: const Key('home-feed-progress-track'),
+              height: trackHeight,
+              color: Colors.white24,
+            ),
+          ),
+          Positioned(
+            left: 0,
+            bottom: lineBottom,
+            child: Container(
+              width: width * fraction,
+              height: trackHeight,
+              color: AppColors.blue,
+            ),
+          ),
+          Positioned(
+            left: left,
+            bottom: thumbBottom,
+            child: Container(
+              key: const Key('home-feed-progress-thumb'),
+              width: size,
+              height: size,
+              decoration: const BoxDecoration(
+                color: Colors.white,
+                shape: BoxShape.circle,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/interaction_rail.dart b/lib/pages/player/widgets/interaction_rail.dart
new file mode 100644
index 0000000..1411bc3
--- /dev/null
+++ b/lib/pages/player/widgets/interaction_rail.dart
@@ -0,0 +1,99 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/formatting/count_format.dart';
+import '../../../core/theme/app_colors.dart';
+
+const double _buttonSize = 34;
+const double _iconSize = 24;
+const double _itemGap = 18;
+const Color _buttonBackground = Color(0x80000000);
+
+/// 互动栏单项：图标、计数与点击。
+class InteractionRailItem {
+  const InteractionRailItem({
+    required this.key,
+    required this.icon,
+    required this.activeIcon,
+    required this.label,
+    required this.onTap,
+    this.count,
+    this.countKey,
+    this.selected = false,
+  });
+
+  final Key key;
+  final IconData icon;
+  final IconData activeIcon;
+  final String label;
+  final VoidCallback onTap;
+  final int? count;
+  final Key? countKey;
+  final bool selected;
+}
+
+/// 播放页与首页 feed 共用的右侧互动栏：收藏/评论/喜欢/分享。
+class InteractionRail extends StatelessWidget {
+  const InteractionRail({super.key, required this.items});
+
+  final List<InteractionRailItem> items;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        for (var index = 0; index < items.length; index++) ...[
+          if (index > 0) const SizedBox(height: _itemGap),
+          _RailButton(item: items[index]),
+        ],
+      ],
+    );
+  }
+}
+
+class _RailButton extends StatelessWidget {
+  const _RailButton({required this.item});
+
+  final InteractionRailItem item;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      key: item.key,
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        SizedBox.square(
+          dimension: _buttonSize,
+          child: IconButton(
+            onPressed: item.onTap,
+            padding: EdgeInsets.zero,
+            style: IconButton.styleFrom(
+              backgroundColor: _buttonBackground,
+              foregroundColor: item.selected ? AppColors.blue : Colors.white,
+            ),
+            icon: Icon(
+              item.selected ? item.activeIcon : item.icon,
+              size: _iconSize,
+            ),
+          ),
+        ),
+        const SizedBox(height: 2),
+        Text(
+          item.count == null ? item.label : formatInteractionCount(item.count!),
+          key: item.countKey,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: const TextStyle(
+            color: Colors.white,
+            height: 1,
+            fontSize: 11,
+            fontWeight: FontWeight.w600,
+            shadows: [Shadow(blurRadius: 6, color: Colors.black)],
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/player_center_toggle.dart b/lib/pages/player/widgets/player_center_toggle.dart
index b15e355..cfb03c9 100644
--- a/lib/pages/player/widgets/player_center_toggle.dart
+++ b/lib/pages/player/widgets/player_center_toggle.dart
@@ -4,7 +4,14 @@ import 'package:flutter/material.dart';
 
 import '../../../core/theme/app_colors.dart';
 
-/// Shared play/pause control used by the home feed and full-screen player.
+const double _toggleSize = 68;
+const double _iconSize = 36;
+const Color _toggleBackground = Colors.black26;
+const List<Shadow> _iconShadows = [
+  Shadow(color: Colors.black54, blurRadius: 12),
+];
+
+/// 首页沉浸流与全屏播放器共用的播放/暂停按钮。
 class PlayerCenterToggle extends StatelessWidget {
   const PlayerCenterToggle({
     super.key,
@@ -23,16 +30,17 @@ class PlayerCenterToggle extends StatelessWidget {
       child: GestureDetector(
         onTap: onTap,
         child: Container(
-          width: 52,
-          height: 52,
+          width: _toggleSize,
+          height: _toggleSize,
           decoration: const BoxDecoration(
-            color: Color(0x80000000),
+            color: _toggleBackground,
             shape: BoxShape.circle,
           ),
           child: Icon(
             playing ? Icons.pause_rounded : Icons.play_arrow_rounded,
             color: AppColors.onPrimary,
-            size: 26,
+            size: _iconSize,
+            shadows: _iconShadows,
           ),
         ),
       ),
diff --git a/lib/pages/player/widgets/player_featured_comment.dart b/lib/pages/player/widgets/player_featured_comment.dart
deleted file mode 100644
index e888ba8..0000000
--- a/lib/pages/player/widgets/player_featured_comment.dart
+++ /dev/null
@@ -1,158 +0,0 @@
-// Author: fruit.com.cn
-
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-import '../../../core/data/models/comment.dart';
-import '../../../core/data/models/drama.dart';
-import '../../../core/data/repositories/comment_repository.dart';
-import '../../../core/data/repositories/interaction_repository.dart';
-import '../../../core/data/services/comment_controller.dart';
-import '../../../core/theme/app_colors.dart';
-import '../../../l10n/app_localizations.dart';
-
-class PlayerFeaturedComment extends StatefulWidget {
-  const PlayerFeaturedComment({
-    super.key,
-    required this.drama,
-    required this.onViewAll,
-  });
-
-  final Drama drama;
-  final VoidCallback onViewAll;
-
-  @override
-  State<PlayerFeaturedComment> createState() => _PlayerFeaturedCommentState();
-}
-
-class _PlayerFeaturedCommentState extends State<PlayerFeaturedComment> {
-  late final CommentController _controller;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = CommentController(
-      comments: context.read<CommentRepository>(),
-      interactions: context.read<InteractionRepository>(),
-      dramaId: widget.drama.id,
-    );
-    unawaited(_controller.load());
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListenableBuilder(
-      listenable: _controller,
-      builder: (context, _) {
-        if (_controller.comments.isEmpty) return const SizedBox.shrink();
-        return _card(context, _controller.comments.first);
-      },
-    );
-  }
-
-  Widget _card(BuildContext context, DramaComment comment) {
-    final l10n = AppLocalizations.of(context)!;
-    final time = _time(l10n, comment.createdAt);
-    return InkWell(
-      key: const Key('player-featured-comment'),
-      onTap: widget.onViewAll,
-      borderRadius: BorderRadius.circular(10),
-      child: Container(
-        width: double.infinity,
-        padding: const EdgeInsets.all(9),
-        decoration: BoxDecoration(
-          color: AppColors.card,
-          borderRadius: BorderRadius.circular(10),
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Row(
-              children: [
-                Container(
-                  width: 18,
-                  height: 18,
-                  alignment: Alignment.center,
-                  decoration: BoxDecoration(
-                    shape: BoxShape.circle,
-                    color: AppColors.secondary.withValues(alpha: 0.2),
-                  ),
-                  child: Text(
-                    _initial(comment.nickname),
-                    style: const TextStyle(
-                      color: AppColors.onSurface,
-                      fontSize: 8,
-                      fontWeight: FontWeight.w700,
-                    ),
-                  ),
-                ),
-                const SizedBox(width: 6),
-                Expanded(
-                  child: Row(
-                    children: [
-                      Flexible(
-                        child: Text(
-                          comment.nickname.isEmpty
-                              ? l10n.localViewer
-                              : comment.nickname,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: const TextStyle(
-                            color: AppColors.onSurface,
-                            fontSize: 10,
-                            fontWeight: FontWeight.w700,
-                          ),
-                        ),
-                      ),
-                      if (time != null) ...[
-                        const SizedBox(width: 4),
-                        Text(
-                          '· $time',
-                          style: const TextStyle(
-                            color: Color(0xFF777777),
-                            fontSize: 9,
-                          ),
-                        ),
-                      ],
-                    ],
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 5),
-            Text(
-              comment.content,
-              maxLines: 2,
-              overflow: TextOverflow.ellipsis,
-              style: const TextStyle(
-                color: Color(0xFFDDDDDD),
-                fontSize: 10,
-                height: 1.5,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  String? _time(AppLocalizations l10n, DateTime? createdAt) {
-    if (createdAt == null) return null;
-    final diff = DateTime.now().difference(createdAt);
-    if (diff.inMinutes < 1) return null;
-    return l10n.minutesAgo(diff.inMinutes);
-  }
-
-  String _initial(String nickname) {
-    final trimmed = nickname.trim();
-    return trimmed.isEmpty ? '?' : trimmed.substring(0, 1).toUpperCase();
-  }
-}
diff --git a/lib/pages/player/widgets/player_more_sheet.dart b/lib/pages/player/widgets/player_more_sheet.dart
new file mode 100644
index 0000000..49eb80f
--- /dev/null
+++ b/lib/pages/player/widgets/player_more_sheet.dart
@@ -0,0 +1,369 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/theme/app_colors.dart';
+import '../../../l10n/app_localizations.dart';
+
+const double _sheetRadius = 20;
+const double _rowHeight = 44;
+const double _groupGap = 12;
+const double _segmentHeight = 28;
+const double _segmentRadius = 8;
+const double _segmentPadding = 10;
+const double _segmentGap = 6;
+const List<double> _speedOptions = [0.75, 1.0, 1.25, 1.5, 2.0, 3.0];
+const List<String> _qualityOptions = ['AUTO', '720P', '1080P'];
+const String _autoQuality = 'AUTO';
+
+/// 更多面板运行状态。
+class PlayerMoreState {
+  /// 创建更多面板状态。
+  const PlayerMoreState({required this.speed, required this.qualities});
+
+  /// 当前倍速。
+  final double speed;
+
+  /// 后端下发的清晰度档位。
+  final List<String> qualities;
+}
+
+/// 更多面板动作集合。
+class PlayerMoreActions {
+  /// 创建动作集合。
+  const PlayerMoreActions({
+    required this.onSpeedChanged,
+    required this.onClear,
+    required this.onDownload,
+    this.onPip,
+  });
+
+  /// 倍速变化。
+  final ValueChanged<double> onSpeedChanged;
+
+  /// 进入清屏播放。
+  final VoidCallback onClear;
+
+  /// 离线缓存当前集。
+  final VoidCallback onDownload;
+
+  /// 进入小窗播放；平台不支持时为 null。
+  final VoidCallback? onPip;
+}
+
+/// K29.6 精简版播放页更多面板。
+class PlayerMoreSheet extends StatefulWidget {
+  /// 创建更多面板。
+  const PlayerMoreSheet({
+    super.key,
+    required this.l10n,
+    required this.state,
+    required this.actions,
+  });
+
+  /// 当前语言包。
+  final AppLocalizations l10n;
+
+  /// 面板状态。
+  final PlayerMoreState state;
+
+  /// 面板动作。
+  final PlayerMoreActions actions;
+
+  @override
+  State<PlayerMoreSheet> createState() => _PlayerMoreSheetState();
+}
+
+class _PlayerMoreSheetState extends State<PlayerMoreSheet> {
+  late double _speed = widget.state.speed;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = widget.l10n;
+    return Material(
+      key: const Key('player-more-sheet'),
+      color: AppColors.card,
+      borderRadius: const BorderRadius.vertical(
+        top: Radius.circular(_sheetRadius),
+      ),
+      clipBehavior: Clip.antiAlias,
+      child: SafeArea(
+        top: false,
+        child: SingleChildScrollView(
+          padding: const EdgeInsets.fromLTRB(16, 8, 16, 20),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Center(
+                child: Container(
+                  key: const Key('player-more-drag-handle'),
+                  width: 36,
+                  height: 4,
+                  decoration: BoxDecoration(
+                    color: AppColors.border,
+                    borderRadius: BorderRadius.circular(999),
+                  ),
+                ),
+              ),
+              const SizedBox(height: 8),
+              _header(l10n),
+              _speedPicker(),
+              const SizedBox(height: 4),
+              _qualityPicker(l10n),
+              const SizedBox(height: _groupGap),
+              _actionRow(
+                key: const Key('player-more-clear'),
+                icon: Icons.fullscreen_rounded,
+                title: l10n.clearPlayback,
+                onTap: _clear,
+              ),
+              if (widget.actions.onPip != null)
+                _actionRow(
+                  key: const Key('player-more-pip'),
+                  icon: Icons.picture_in_picture_alt_rounded,
+                  title: l10n.pictureInPicture,
+                  onTap: () => _closeThen(widget.actions.onPip!),
+                ),
+              _actionRow(
+                key: const Key('player-more-offline'),
+                icon: Icons.download_rounded,
+                title: l10n.offlineCache,
+                onTap: () => _closeThen(widget.actions.onDownload),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _header(AppLocalizations l10n) => Row(
+    children: [
+      Expanded(
+        child: Text(
+          l10n.more,
+          style: const TextStyle(
+            color: AppColors.onSurface,
+            fontSize: 15,
+            fontWeight: FontWeight.w700,
+          ),
+        ),
+      ),
+      SizedBox.square(
+        dimension: 32,
+        child: IconButton(
+          key: const Key('player-more-close'),
+          tooltip: l10n.close,
+          padding: EdgeInsets.zero,
+          onPressed: () => Navigator.pop(context),
+          icon: const Icon(Icons.close_rounded, size: 18),
+        ),
+      ),
+    ],
+  );
+
+  Widget _speedPicker() => _optionRow(
+    rowKey: const Key('player-more-speed-row'),
+    optionsKey: const Key('player-more-speed'),
+    icon: Icons.speed_rounded,
+    title: widget.l10n.playbackSpeed,
+    options: [
+      for (final value in _speedOptions)
+        _SegmentButton(
+          key: Key('player-more-speed-$value'),
+          label: '${value}x',
+          selected: (_speed - value).abs() < 0.001,
+          onTap: () {
+            setState(() => _speed = value);
+            widget.actions.onSpeedChanged(value);
+          },
+        ),
+    ],
+  );
+
+  Widget _qualityPicker(AppLocalizations l10n) => _optionRow(
+    rowKey: const Key('player-more-quality-row'),
+    optionsKey: const Key('player-more-quality'),
+    icon: Icons.high_quality_rounded,
+    title: l10n.playbackQuality,
+    options: [
+      for (final quality in _qualityOptions) _qualitySegment(l10n, quality),
+    ],
+  );
+
+  Widget _optionRow({
+    required Key rowKey,
+    required Key optionsKey,
+    required IconData icon,
+    required String title,
+    required List<Widget> options,
+  }) {
+    return SizedBox(
+      key: rowKey,
+      height: _rowHeight,
+      child: Row(
+        children: [
+          SizedBox(
+            width: 88,
+            child: Row(
+              children: [
+                Icon(icon, color: AppColors.muted, size: 18),
+                const SizedBox(width: 6),
+                Expanded(
+                  child: Text(
+                    title,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: const TextStyle(
+                      color: AppColors.onSurface,
+                      fontSize: 12,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          const SizedBox(width: 6),
+          Expanded(
+            child: SingleChildScrollView(
+              key: optionsKey,
+              scrollDirection: Axis.horizontal,
+              child: Row(
+                children: [
+                  for (var index = 0; index < options.length; index++) ...[
+                    if (index > 0) const SizedBox(width: _segmentGap),
+                    options[index],
+                  ],
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _qualitySegment(AppLocalizations l10n, String quality) {
+    final enabled = widget.state.qualities.contains(quality);
+    final selected =
+        quality == _autoQuality && enabled ||
+        !widget.state.qualities.contains(_autoQuality) &&
+            widget.state.qualities.isNotEmpty &&
+            widget.state.qualities.first == quality;
+    return _SegmentButton(
+      key: Key('player-more-quality-$quality'),
+      label: enabled ? quality : '$quality · ${l10n.qualityUnavailable}',
+      selected: selected,
+      enabled: enabled,
+      onTap: enabled ? () {} : null,
+    );
+  }
+
+  Widget _actionRow({
+    required Key key,
+    required IconData icon,
+    required String title,
+    required VoidCallback onTap,
+  }) {
+    return Material(
+      key: key,
+      color: Colors.transparent,
+      borderRadius: BorderRadius.circular(8),
+      child: InkWell(
+        borderRadius: BorderRadius.circular(8),
+        onTap: onTap,
+        child: SizedBox(
+          height: _rowHeight,
+          child: Row(
+            children: [
+              Icon(icon, color: AppColors.muted, size: 20),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Text(
+                  title,
+                  style: const TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: 14,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+              ),
+              const Icon(
+                Icons.chevron_right_rounded,
+                color: AppColors.subtle,
+                size: 18,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _clear() {
+    Navigator.pop(context);
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) => widget.actions.onClear(),
+    );
+  }
+
+  void _closeThen(VoidCallback action) {
+    Navigator.pop(context);
+    WidgetsBinding.instance.addPostFrameCallback((_) => action());
+  }
+}
+
+class _SegmentButton extends StatelessWidget {
+  const _SegmentButton({
+    super.key,
+    required this.label,
+    required this.selected,
+    this.enabled = true,
+    this.onTap,
+  });
+
+  final String label;
+  final bool selected;
+  final bool enabled;
+  final VoidCallback? onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final background = selected
+        ? AppColors.blue
+        : enabled
+        ? AppColors.raised
+        : AppColors.cardAlt;
+    final foreground = selected
+        ? AppColors.onPrimary
+        : enabled
+        ? AppColors.onSurface
+        : AppColors.subtle;
+    return Material(
+      color: background,
+      borderRadius: BorderRadius.circular(_segmentRadius),
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(_segmentRadius),
+        child: SizedBox(
+          height: _segmentHeight,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: _segmentPadding),
+            child: Center(
+              child: Text(
+                label,
+                maxLines: 1,
+                style: TextStyle(
+                  color: foreground,
+                  fontSize: 12,
+                  fontWeight: selected ? FontWeight.w700 : FontWeight.w500,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/player_overlay.dart b/lib/pages/player/widgets/player_overlay.dart
new file mode 100644
index 0000000..910cc13
--- /dev/null
+++ b/lib/pages/player/widgets/player_overlay.dart
@@ -0,0 +1,382 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import '../../../core/formatting/localized_content.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/theme/app_dimens.dart';
+import '../../../l10n/app_localizations.dart';
+import 'player_center_toggle.dart';
+import 'interaction_rail.dart';
+import 'player_overlay_models.dart';
+import 'seek_progress_bar.dart';
+
+part 'player_overlay_parts.dart';
+
+const double _topButtonSize = 36;
+const double _topBarHeight = 58;
+const double _boostHintIconSize = 16;
+const double _boostHintFontSize = 13;
+const List<Shadow> _playerTextShadows = [
+  Shadow(color: Colors.black54, blurRadius: 5, offset: Offset(0, 1)),
+];
+
+/// K29 竖屏播放页浮层。
+class PlayerPlaybackOverlay extends StatelessWidget {
+  /// 创建播放浮层。
+  const PlayerPlaybackOverlay({
+    super.key,
+    required this.data,
+    required this.actions,
+    required this.controlsVisible,
+  });
+
+  /// 展示数据。
+  final PlayerOverlayData data;
+
+  /// 交互动作。
+  final PlayerOverlayActions actions;
+
+  /// 控制层是否可见。
+  final bool controlsVisible;
+
+  @override
+  Widget build(BuildContext context) {
+    return SafeArea(
+      child: Stack(
+        children: [
+          Positioned.fill(
+            child: LayoutBuilder(
+              builder: (context, constraints) => GestureDetector(
+                key: const Key('player-video-tap'),
+                behavior: HitTestBehavior.opaque,
+                onTap: actions.onTogglePlay,
+                onLongPressStart: (details) =>
+                    _handleLongPressStart(details, constraints.maxWidth),
+                onLongPressEnd: (_) => actions.onBoostEnd(),
+                onLongPressCancel: actions.onBoostEnd,
+              ),
+            ),
+          ),
+          _top(context),
+          _bottom(context),
+          if (controlsVisible) _rail(context),
+          if (!data.playing)
+            Center(
+              child: PlayerCenterToggle(
+                key: const Key('player-play-toggle'),
+                playing: false,
+                onTap: actions.onTogglePlay,
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
+  Widget _top(BuildContext context) {
+    return Positioned(
+      top: 0,
+      left: 0,
+      right: 0,
+      child: Container(
+        key: const Key('player-controls-top'),
+        height: _topBarHeight,
+        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
+        child: Row(
+          children: [
+            if (actions.onBack != null)
+              _TopButton(
+                key: const Key('player-back'),
+                tooltip: data.l10n.backToSeries,
+                icon: Icons.chevron_left_rounded,
+                onPressed: actions.onBack!,
+              )
+            else
+              const SizedBox(width: _topButtonSize),
+            const SizedBox(width: 8),
+            Expanded(
+              child: Text(
+                data.l10n.episodeLabel(data.episode.number),
+                key: const Key('player-episode-heading'),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: AppColors.onPrimary,
+                  fontSize: 15,
+                  fontWeight: FontWeight.w700,
+                  shadows: _playerTextShadows,
+                ),
+              ),
+            ),
+            _SpeedEntry(
+              key: const Key('player-speed-entry'),
+              speed: data.playbackSpeed,
+              onTap: actions.onSpeed,
+            ),
+            const SizedBox(width: 8),
+            _TopButton(
+              key: const Key('player-more'),
+              tooltip: data.l10n.more,
+              icon: Icons.more_vert_rounded,
+              onPressed: actions.onMore,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  /// 长按分区：中间 1/3 弹更多，左右各 1/3 开始加速。
+  void _handleLongPressStart(LongPressStartDetails details, double width) {
+    final third = width / 3;
+    final dx = details.localPosition.dx;
+    if (dx < third || dx > width - third) {
+      actions.onBoostStart();
+      return;
+    }
+    actions.onLongPressCenter();
+  }
+
+  Widget _rail(BuildContext context) {
+    final compact = MediaQuery.sizeOf(context).height < 700;
+    return Positioned(
+      right: AppDimens.spaceMd,
+      top: MediaQuery.sizeOf(context).height * (compact ? 0.42 : 0.55),
+      child: InteractionRail(
+        key: const Key('player-interaction-rail'),
+        items: [
+          InteractionRailItem(
+            key: const Key('player-rail-save'),
+            icon: Icons.star_border_rounded,
+            activeIcon: Icons.star_rounded,
+            label: data.l10n.favorite,
+            count: data.favoriteCount,
+            countKey: const Key('player-rail-save-count'),
+            selected: data.saved,
+            onTap: actions.onSave,
+          ),
+          InteractionRailItem(
+            key: const Key('player-rail-comments'),
+            icon: Icons.chat_bubble_outline_rounded,
+            activeIcon: Icons.chat_bubble_rounded,
+            label: data.l10n.comments,
+            count: data.commentCount,
+            countKey: const Key('player-rail-comments-count'),
+            onTap: actions.onComments,
+          ),
+          InteractionRailItem(
+            key: const Key('player-rail-like'),
+            icon: Icons.favorite_border_rounded,
+            activeIcon: Icons.favorite_rounded,
+            label: data.l10n.like,
+            count: data.likeCount,
+            countKey: const Key('player-rail-like-count'),
+            selected: data.liked,
+            onTap: actions.onLike,
+          ),
+          InteractionRailItem(
+            key: const Key('player-rail-share'),
+            icon: Icons.ios_share_rounded,
+            activeIcon: Icons.ios_share_rounded,
+            label: data.l10n.share,
+            onTap: actions.onShare,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _bottom(BuildContext context) {
+    return Positioned(
+      left: 0,
+      right: 0,
+      bottom: 0,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          if (controlsVisible) _bottomInfo(context),
+          if (data.boosting) _boostHint(),
+          _bottomProgress(),
+          // 加速态只保留进度条与提示，便于全屏快进时看清画面。
+          if (!data.boosting) _bottomActions(),
+        ],
+      ),
+    );
+  }
+
+  /// 加速提示：橙色小三角 + 当前倍速文案，悬在进度条上方。
+  Widget _boostHint() {
+    return Padding(
+      key: const Key('player-speed-boost-hint'),
+      padding: const EdgeInsets.only(bottom: 6),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          const Icon(
+            Icons.play_arrow_rounded,
+            color: AppColors.blue,
+            size: _boostHintIconSize,
+            shadows: _playerTextShadows,
+          ),
+          const SizedBox(width: 4),
+          Text(
+            data.l10n.speedBoosting(data.playbackSpeed.toStringAsFixed(1)),
+            style: const TextStyle(
+              color: AppColors.blue,
+              fontSize: _boostHintFontSize,
+              fontWeight: FontWeight.w700,
+              shadows: _playerTextShadows,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _bottomInfo(BuildContext context) {
+    final series = localizedDramaTitle(data.l10n, data.drama);
+    final synopsis = localizedDramaSynopsis(data.l10n, data.drama);
+    return Padding(
+      key: const Key('player-controls-bottom'),
+      padding: const EdgeInsets.fromLTRB(14, 8, 14, 0),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _detailRow(series),
+          const SizedBox(height: 4),
+          _EpisodeSynopsis(
+            key: const Key('player-episode-synopsis'),
+            l10n: data.l10n,
+            episodeNumber: data.episode.number,
+            synopsis: synopsis,
+            authorNote: data.authorNote,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _bottomProgress() {
+    return Padding(
+      key: const Key('player-progress-container'),
+      padding: EdgeInsets.fromLTRB(14, controlsVisible ? 2 : 8, 14, 0),
+      child: SeekProgressBar(
+        key: const Key('player-progress'),
+        valueListenable: data.controller,
+        semanticsLabel: data.l10n.seekVideo,
+        showTimes: true,
+        compact: true,
+        inactiveTrackColor: Colors.white24,
+        onScrubStart: actions.onScrubStart,
+        onSeek: actions.onSeek,
+      ),
+    );
+  }
+
+  Widget _detailRow(String series) {
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        key: const Key('player-open-detail'),
+        onTap: actions.onDetail,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 1),
+          child: Row(
+            children: [
+              Flexible(
+                child: Text(
+                  series,
+                  key: const Key('player-drama-title'),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: TextStyle(
+                    color: AppColors.onPrimary,
+                    fontFamily: 'Outfit',
+                    fontSize: 18,
+                    fontWeight: FontWeight.w800,
+                    shadows: _playerTextShadows,
+                  ),
+                ),
+              ),
+              const SizedBox(width: 4),
+              const Icon(
+                Icons.chevron_right_rounded,
+                color: AppColors.playerMuted,
+                size: 20,
+                shadows: _playerTextShadows,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _bottomActions() {
+    return Padding(
+      key: const Key('player-bottom-actions'),
+      padding: const EdgeInsets.fromLTRB(14, 6, 14, 6),
+      child: Row(
+        children: [
+          Expanded(
+            child: Material(
+              key: const Key('player-episodes-pill'),
+              color: AppColors.playerOverlayPill,
+              borderRadius: BorderRadius.circular(7),
+              clipBehavior: Clip.antiAlias,
+              child: InkWell(
+                key: const Key('player-episodes'),
+                onTap: actions.onEpisodes,
+                borderRadius: BorderRadius.circular(7),
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 14,
+                    vertical: 8,
+                  ),
+                  child: Row(
+                    children: [
+                      Expanded(
+                        child: Text(
+                          '${data.l10n.episodes} · '
+                          '${data.l10n.allEpisodesBadge(data.totalEpisodes)} · '
+                          '${data.l10n.freeWatch}',
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                          style: const TextStyle(
+                            color: AppColors.onPrimary,
+                            fontSize: 13.5,
+                            fontWeight: FontWeight.w800,
+                            shadows: _playerTextShadows,
+                          ),
+                        ),
+                      ),
+                      const SizedBox(width: 8),
+                      const Icon(
+                        Icons.keyboard_arrow_up_rounded,
+                        color: AppColors.onPrimary,
+                        size: 18,
+                        shadows: _playerTextShadows,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+          const SizedBox(width: 8),
+          _BottomIconButton(
+            key: const Key('player-bottom-clear-screen'),
+            tooltip: controlsVisible
+                ? data.l10n.clearScreen
+                : data.l10n.exitClearScreen,
+            icon: controlsVisible
+                ? Icons.fullscreen_rounded
+                : Icons.fullscreen_exit_rounded,
+            onPressed: controlsVisible ? actions.onClear : actions.onExitClear,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/player_overlay_models.dart b/lib/pages/player/widgets/player_overlay_models.dart
new file mode 100644
index 0000000..0bdc23e
--- /dev/null
+++ b/lib/pages/player/widgets/player_overlay_models.dart
@@ -0,0 +1,145 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/widgets.dart';
+import 'package:video_player/video_player.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../l10n/app_localizations.dart';
+
+/// 播放浮层展示数据。
+class PlayerOverlayData {
+  /// 创建播放浮层数据。
+  const PlayerOverlayData({
+    required this.l10n,
+    required this.drama,
+    required this.episode,
+    required this.controller,
+    required this.liked,
+    required this.likeCount,
+    required this.commentCount,
+    required this.favoriteCount,
+    required this.saved,
+    required this.playing,
+    required this.playbackSpeed,
+    required this.totalEpisodes,
+    required this.boosting,
+    this.authorNote = '',
+  });
+
+  /// 当前语言包。
+  final AppLocalizations l10n;
+
+  /// 当前短剧。
+  final Drama drama;
+
+  /// 当前剧集。
+  final Episode episode;
+
+  /// 当前播放器。
+  final VideoPlayerController? controller;
+
+  /// 是否已点赞。
+  final bool liked;
+
+  /// 点赞数；未知时隐藏。
+  final int? likeCount;
+
+  /// 评论数；未知时隐藏。
+  final int? commentCount;
+
+  /// 收藏数；未知时隐藏。
+  final int? favoriteCount;
+
+  /// 是否已收藏。
+  final bool saved;
+
+  /// 是否处于播放状态。
+  final bool playing;
+
+  /// 当前倍速。
+  final double playbackSpeed;
+
+  /// 可见集数量。
+  final int totalEpisodes;
+
+  /// 是否处于长按加速态。
+  final bool boosting;
+
+  /// 作者声明；没有后端字段时为空。
+  final String authorNote;
+}
+
+/// 播放浮层动作集合。
+class PlayerOverlayActions {
+  /// 创建动作集合。
+  const PlayerOverlayActions({
+    required this.onBack,
+    required this.onTogglePlay,
+    required this.onClear,
+    required this.onExitClear,
+    required this.onDetail,
+    required this.onSpeed,
+    required this.onEpisodes,
+    required this.onComments,
+    required this.onLike,
+    required this.onSave,
+    required this.onShare,
+    required this.onMore,
+    required this.onScrubStart,
+    required this.onSeek,
+    required this.onLongPressCenter,
+    required this.onBoostStart,
+    required this.onBoostEnd,
+  });
+
+  /// 返回上一页。
+  final VoidCallback? onBack;
+
+  /// 切换播放状态。
+  final VoidCallback onTogglePlay;
+
+  /// 进入清屏。
+  final VoidCallback onClear;
+
+  /// 退出清屏。
+  final VoidCallback onExitClear;
+
+  /// 打开详情。
+  final VoidCallback onDetail;
+
+  /// 打开顶部倍速入口。
+  final VoidCallback onSpeed;
+
+  /// 打开选集。
+  final VoidCallback onEpisodes;
+
+  /// 打开评论。
+  final VoidCallback onComments;
+
+  /// 切换点赞。
+  final VoidCallback onLike;
+
+  /// 切换收藏。
+  final VoidCallback onSave;
+
+  /// 分享。
+  final VoidCallback onShare;
+
+  /// 打开更多面板。
+  final VoidCallback onMore;
+
+  /// 开始拖动进度。
+  final VoidCallback? onScrubStart;
+
+  /// 提交进度跳转。
+  final Future<void> Function(Duration)? onSeek;
+
+  /// 长按画面中间：弹出更多面板。
+  final VoidCallback onLongPressCenter;
+
+  /// 长按画面两侧：开始加速。
+  final VoidCallback onBoostStart;
+
+  /// 长按结束或取消：结束加速。
+  final VoidCallback onBoostEnd;
+}
diff --git a/lib/pages/player/widgets/player_overlay_parts.dart b/lib/pages/player/widgets/player_overlay_parts.dart
new file mode 100644
index 0000000..383365d
--- /dev/null
+++ b/lib/pages/player/widgets/player_overlay_parts.dart
@@ -0,0 +1,219 @@
+// Author: fruit.com.cn
+
+part of 'player_overlay.dart';
+
+class _TopButton extends StatelessWidget {
+  const _TopButton({
+    super.key,
+    required this.tooltip,
+    required this.icon,
+    required this.onPressed,
+  });
+
+  final String tooltip;
+  final IconData icon;
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox.square(
+      dimension: _topButtonSize,
+      child: IconButton(
+        tooltip: tooltip,
+        padding: EdgeInsets.zero,
+        style: IconButton.styleFrom(
+          backgroundColor: const Color(0x80000000),
+          foregroundColor: AppColors.onPrimary,
+        ),
+        onPressed: onPressed,
+        icon: Icon(icon, size: 18),
+      ),
+    );
+  }
+}
+
+class _SpeedEntry extends StatelessWidget {
+  const _SpeedEntry({super.key, required this.speed, required this.onTap});
+
+  final double speed;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: const Color(0x80000000),
+      borderRadius: BorderRadius.circular(999),
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(999),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 7),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Icon(
+                Icons.speed_rounded,
+                color: AppColors.onPrimary,
+                size: 15,
+                shadows: _playerTextShadows,
+              ),
+              const SizedBox(width: 4),
+              Text(
+                '${speed}x',
+                style: const TextStyle(
+                  color: AppColors.onPrimary,
+                  fontSize: 12,
+                  fontWeight: FontWeight.w700,
+                  shadows: _playerTextShadows,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _BottomIconButton extends StatelessWidget {
+  const _BottomIconButton({
+    super.key,
+    required this.tooltip,
+    required this.icon,
+    required this.onPressed,
+  });
+
+  final String tooltip;
+  final IconData icon;
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox.square(
+      dimension: 40,
+      child: IconButton(
+        tooltip: tooltip,
+        padding: EdgeInsets.zero,
+        style: IconButton.styleFrom(
+          backgroundColor: AppColors.playerOverlayPill,
+          foregroundColor: AppColors.onPrimary,
+        ),
+        onPressed: onPressed,
+        icon: Icon(icon, size: 22),
+      ),
+    );
+  }
+}
+
+class _EpisodeSynopsis extends StatefulWidget {
+  const _EpisodeSynopsis({
+    super.key,
+    required this.l10n,
+    required this.episodeNumber,
+    required this.synopsis,
+    required this.authorNote,
+  });
+
+  final AppLocalizations l10n;
+  final int episodeNumber;
+  final String synopsis;
+  final String authorNote;
+
+  @override
+  State<_EpisodeSynopsis> createState() => _EpisodeSynopsisState();
+}
+
+class _EpisodeSynopsisState extends State<_EpisodeSynopsis> {
+  bool _expanded = false;
+
+  /// 「第 n 集」、分隔符与简介正文共用同一套灰字规格。
+  static const TextStyle _lineStyle = TextStyle(
+    color: AppColors.playerMuted,
+    fontSize: 12,
+    fontWeight: FontWeight.w500,
+    height: 1.35,
+    shadows: _playerTextShadows,
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.baseline,
+          textBaseline: TextBaseline.alphabetic,
+          children: [
+            Text(
+              widget.l10n.episodeLabel(widget.episodeNumber),
+              key: const Key('player-episode-label'),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: _lineStyle,
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 6),
+              child: Text(
+                '|',
+                maxLines: 1,
+                style: _lineStyle.copyWith(
+                  color: AppColors.playerMuted.withValues(alpha: 0.6),
+                ),
+              ),
+            ),
+            Flexible(
+              child: Text(
+                widget.synopsis,
+                key: const Key('player-synopsis'),
+                maxLines: _expanded ? null : 1,
+                overflow: _expanded ? TextOverflow.clip : TextOverflow.ellipsis,
+                style: _lineStyle,
+              ),
+            ),
+            if (!_expanded) _toggle(widget.l10n.expandSynopsis),
+          ],
+        ),
+        if (_expanded) ...[
+          if (widget.authorNote.isNotEmpty) ...[
+            const SizedBox(height: 4),
+            Text(
+              widget.authorNote,
+              key: const Key('player-author-note'),
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+              style: const TextStyle(
+                color: AppColors.playerMuted,
+                fontSize: 10,
+                shadows: _playerTextShadows,
+              ),
+            ),
+          ],
+          _toggle(widget.l10n.showLess),
+        ],
+      ],
+    );
+  }
+
+  Widget _toggle(String label) {
+    return InkWell(
+      key: const Key('player-synopsis-toggle'),
+      onTap: () => setState(() => _expanded = !_expanded),
+      borderRadius: BorderRadius.circular(4),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),
+        child: Text(
+          label,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: const TextStyle(
+            color: AppColors.blue,
+            fontSize: 12,
+            fontWeight: FontWeight.w700,
+            shadows: _playerTextShadows,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/player_speed_sheet.dart b/lib/pages/player/widgets/player_speed_sheet.dart
new file mode 100644
index 0000000..475ac5c
--- /dev/null
+++ b/lib/pages/player/widgets/player_speed_sheet.dart
@@ -0,0 +1,75 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/theme/app_colors.dart';
+import '../../../l10n/app_localizations.dart';
+
+const List<double> _speedOptions = [0.75, 1.0, 1.25, 1.5, 2.0, 3.0];
+const double _sheetRadius = 20;
+
+/// 播放倍速选择弹窗。
+class PlayerSpeedSheet extends StatelessWidget {
+  /// 创建倍速选择弹窗。
+  const PlayerSpeedSheet({super.key, required this.selected});
+
+  /// 当前倍速。
+  final double selected;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Material(
+      key: const Key('player-speed-sheet'),
+      color: AppColors.card,
+      borderRadius: const BorderRadius.vertical(
+        top: Radius.circular(_sheetRadius),
+      ),
+      clipBehavior: Clip.antiAlias,
+      child: SafeArea(
+        top: false,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+              padding: const EdgeInsets.fromLTRB(20, 16, 20, 8),
+              child: Align(
+                alignment: Alignment.centerLeft,
+                child: Text(
+                  l10n.playbackSpeed,
+                  style: const TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: 18,
+                    fontWeight: FontWeight.w800,
+                  ),
+                ),
+              ),
+            ),
+            for (final value in _speedOptions) _option(context, value),
+            const SizedBox(height: 8),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _option(BuildContext context, double value) {
+    final active = value == selected;
+    return ListTile(
+      key: Key('player-speed-${value.toString()}'),
+      dense: true,
+      title: Text(
+        '${value.toString()}x',
+        style: TextStyle(
+          color: active ? AppColors.blue : AppColors.onSurface,
+          fontSize: 14,
+          fontWeight: active ? FontWeight.w800 : FontWeight.w500,
+        ),
+      ),
+      trailing: active
+          ? const Icon(Icons.check_rounded, color: AppColors.blue, size: 20)
+          : null,
+      onTap: () => Navigator.pop(context, value),
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/player_unlock_sheet.dart b/lib/pages/player/widgets/player_unlock_sheet.dart
new file mode 100644
index 0000000..4cdedc4
--- /dev/null
+++ b/lib/pages/player/widgets/player_unlock_sheet.dart
@@ -0,0 +1,373 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../core/data/models/play_ticket.dart';
+import '../../../core/formatting/error_text.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../l10n/app_localizations.dart';
+
+const double _cardRadius = 20;
+const double _optionRadius = 14;
+const double _sheetWidth = 360;
+
+/// 视频区占位提示：由后端票据决定是解锁、无片源还是会员限制。
+class PlayerBlockedNotice extends StatelessWidget {
+  /// 创建不可播放提示。
+  const PlayerBlockedNotice({
+    super.key,
+    required this.l10n,
+    required this.episode,
+    required this.accessType,
+    required this.unlockCoin,
+    required this.unlocking,
+    required this.error,
+    required this.onOpenUnlock,
+  });
+
+  /// 当前语言包。
+  final AppLocalizations l10n;
+
+  /// 当前剧集。
+  final Episode episode;
+
+  /// 后端下发的内容访问类型。
+  final String? accessType;
+
+  /// 金币解锁价格。
+  final int unlockCoin;
+
+  /// 是否正在解锁。
+  final bool unlocking;
+
+  /// 最近一次解锁失败信息。
+  final String? error;
+
+  /// 打开内容解锁面板。
+  final VoidCallback? onOpenUnlock;
+
+  bool get _needsUnlock =>
+      accessType == PlayTicket.coinRequired ||
+      accessType == PlayTicket.vipRequired;
+
+  @override
+  Widget build(BuildContext context) {
+    final title = _needsUnlock
+        ? l10n.lockedTitle(episode.number)
+        : accessType == PlayTicket.noMedia || !episode.locked
+        ? l10n.noMediaNotice
+        : l10n.lockedTitle(episode.number);
+    return Center(
+      child: ConstrainedBox(
+        constraints: const BoxConstraints(maxWidth: _sheetWidth),
+        child: Container(
+          key: const Key('player-unlock-notice'),
+          margin: const EdgeInsets.symmetric(horizontal: 24),
+          padding: const EdgeInsets.fromLTRB(20, 22, 20, 18),
+          decoration: BoxDecoration(
+            color: AppColors.card,
+            borderRadius: BorderRadius.circular(_cardRadius),
+            boxShadow: const [
+              BoxShadow(
+                color: AppColors.cardShadow,
+                blurRadius: 18,
+                offset: Offset(0, 6),
+              ),
+            ],
+          ),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(
+                _needsUnlock ? Icons.lock_rounded : Icons.movie_filter_outlined,
+                color: _needsUnlock ? AppColors.blue : AppColors.muted,
+                size: 30,
+              ),
+              const SizedBox(height: 12),
+              Text(
+                title,
+                textAlign: TextAlign.center,
+                style: const TextStyle(
+                  color: AppColors.onSurface,
+                  fontSize: 16,
+                  fontWeight: FontWeight.w800,
+                ),
+              ),
+              if (_needsUnlock && unlockCoin > 0) ...[
+                const SizedBox(height: 10),
+                _coinLabel(l10n),
+              ],
+              if (error != null) ...[
+                const SizedBox(height: 8),
+                Text(
+                  errorText(l10n, error, l10n.unlockFailed),
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(
+                    color: AppColors.badgePinkText,
+                    fontSize: 12,
+                  ),
+                ),
+              ],
+              if (_needsUnlock) ...[
+                const SizedBox(height: 14),
+                SizedBox(
+                  width: double.infinity,
+                  child: FilledButton(
+                    key: const Key('player-open-unlock'),
+                    onPressed: unlocking ? null : onOpenUnlock,
+                    child: unlocking
+                        ? const SizedBox.square(
+                            dimension: 18,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          )
+                        : Text(l10n.unlockEpisode),
+                  ),
+                ),
+              ],
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _coinLabel(AppLocalizations l10n) => DecoratedBox(
+    decoration: BoxDecoration(
+      color: AppColors.goldCard,
+      borderRadius: BorderRadius.circular(999),
+    ),
+    child: Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      child: Text(
+        l10n.walletBalanceShort(unlockCoin),
+        style: const TextStyle(
+          color: AppColors.onGold,
+          fontSize: 12,
+          fontWeight: FontWeight.w800,
+        ),
+      ),
+    ),
+  );
+}
+
+/// 内容解锁面板：金币可用，广告与会员在契约缺失时明确禁用。
+class PlayerUnlockSheet extends StatefulWidget {
+  /// 创建内容解锁面板。
+  const PlayerUnlockSheet({
+    super.key,
+    required this.l10n,
+    required this.episodeNumber,
+    required this.coinCost,
+    required this.balance,
+    required this.onUnlock,
+  });
+
+  /// 当前语言包。
+  final AppLocalizations l10n;
+
+  /// 当前集号。
+  final int episodeNumber;
+
+  /// 金币解锁价格。
+  final int coinCost;
+
+  /// 当前金币余额；未知时隐藏。
+  final int? balance;
+
+  /// 金币解锁动作，成功后返回 true。
+  final Future<bool> Function()? onUnlock;
+
+  @override
+  State<PlayerUnlockSheet> createState() => _PlayerUnlockSheetState();
+}
+
+class _PlayerUnlockSheetState extends State<PlayerUnlockSheet> {
+  bool _busy = false;
+  String? _error;
+
+  Future<void> _unlock() async {
+    final action = widget.onUnlock;
+    if (action == null || _busy) return;
+    setState(() {
+      _busy = true;
+      _error = null;
+    });
+    final success = await action();
+    if (!mounted) return;
+    if (success) {
+      Navigator.of(context).pop(true);
+      return;
+    }
+    setState(() {
+      _busy = false;
+      _error = widget.l10n.unlockFailed;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = widget.l10n;
+    return Container(
+      key: const Key('player-unlock-panel'),
+      decoration: const BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.vertical(top: Radius.circular(_cardRadius)),
+      ),
+      child: SafeArea(
+        top: false,
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(20, 16, 20, 20),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      l10n.lockedTitle(widget.episodeNumber),
+                      style: const TextStyle(
+                        color: AppColors.onSurface,
+                        fontSize: 20,
+                        fontWeight: FontWeight.w800,
+                      ),
+                    ),
+                  ),
+                  IconButton(
+                    key: const Key('player-unlock-close'),
+                    tooltip: l10n.close,
+                    onPressed: () => Navigator.pop(context),
+                    icon: const Icon(Icons.close_rounded),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 8),
+              _UnlockOption(
+                optionKey: const Key('player-unlock-coins'),
+                icon: Icons.toll_rounded,
+                title: l10n.unlockWithCoins,
+                subtitle: widget.balance == null
+                    ? l10n.walletBalanceShort(widget.coinCost)
+                    : '${l10n.walletBalanceShort(widget.coinCost)} · '
+                          '${l10n.walletBalanceShort(widget.balance!)}',
+                enabled: widget.onUnlock != null && !_busy,
+                busy: _busy,
+                onTap: _unlock,
+              ),
+              const SizedBox(height: 10),
+              _UnlockOption(
+                optionKey: const Key('player-unlock-ad'),
+                icon: Icons.ondemand_video_rounded,
+                title: l10n.watchAdToUnlock,
+                subtitle: l10n.comingSoon,
+                enabled: false,
+                onTap: null,
+              ),
+              const SizedBox(height: 10),
+              _UnlockOption(
+                optionKey: const Key('player-unlock-vip'),
+                icon: Icons.workspace_premium_rounded,
+                title: l10n.unlockWithVip,
+                subtitle: l10n.comingSoon,
+                enabled: false,
+                onTap: null,
+              ),
+              if (_error != null) ...[
+                const SizedBox(height: 10),
+                Text(
+                  _error!,
+                  style: const TextStyle(
+                    color: AppColors.badgePinkText,
+                    fontSize: 12,
+                  ),
+                ),
+              ],
+              const SizedBox(height: 14),
+              Text(
+                l10n.unlockMethodsVary,
+                style: const TextStyle(color: AppColors.muted, fontSize: 12),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _UnlockOption extends StatelessWidget {
+  const _UnlockOption({
+    required this.optionKey,
+    required this.icon,
+    required this.title,
+    required this.subtitle,
+    required this.enabled,
+    this.busy = false,
+    this.onTap,
+  });
+
+  final Key optionKey;
+  final IconData icon;
+  final String title;
+  final String subtitle;
+  final bool enabled;
+  final bool busy;
+  final VoidCallback? onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      key: optionKey,
+      color: enabled ? AppColors.quick : AppColors.raised,
+      borderRadius: BorderRadius.circular(_optionRadius),
+      child: InkWell(
+        borderRadius: BorderRadius.circular(_optionRadius),
+        onTap: enabled ? onTap : null,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
+          child: Row(
+            children: [
+              Icon(
+                icon,
+                color: enabled ? AppColors.blue : AppColors.subtle,
+                size: 22,
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      title,
+                      style: TextStyle(
+                        color: enabled ? AppColors.onSurface : AppColors.subtle,
+                        fontSize: 14,
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                    const SizedBox(height: 2),
+                    Text(
+                      subtitle,
+                      style: const TextStyle(
+                        color: AppColors.muted,
+                        fontSize: 11,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              if (busy)
+                const SizedBox.square(
+                  dimension: 18,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                )
+              else if (enabled)
+                const Icon(Icons.chevron_right_rounded, color: AppColors.blue),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/player_video_surface.dart b/lib/pages/player/widgets/player_video_surface.dart
new file mode 100644
index 0000000..cdd66c3
--- /dev/null
+++ b/lib/pages/player/widgets/player_video_surface.dart
@@ -0,0 +1,198 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:video_player/video_player.dart';
+
+import '../../../core/widgets/remote_image.dart';
+
+const Duration _videoFadeDuration = Duration(milliseconds: 200);
+const double _errorHorizontal = 32;
+const int _errorMaxLines = 3;
+
+/// 封面底层与视频层共用同一控制器，视频首帧就绪后再淡入。
+class PlayerVideoSurface extends StatefulWidget {
+  const PlayerVideoSurface({
+    super.key,
+    required this.controller,
+    required this.posterUrl,
+    required this.videoUrl,
+    required this.theater,
+    required this.onTap,
+  });
+
+  final VideoPlayerController? controller;
+  final String posterUrl;
+  final String videoUrl;
+  final bool theater;
+  final VoidCallback onTap;
+
+  @override
+  State<PlayerVideoSurface> createState() => _PlayerVideoSurfaceState();
+}
+
+class _PlayerVideoSurfaceState extends State<PlayerVideoSurface> {
+  String? _lastDebugState;
+
+  @override
+  void didUpdateWidget(covariant PlayerVideoSurface oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.controller != widget.controller) _lastDebugState = null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final controller = widget.controller;
+    if (controller == null) return _frame(null);
+    return ValueListenableBuilder<VideoPlayerValue>(
+      valueListenable: controller,
+      builder: (context, value, _) => _frame(value),
+    );
+  }
+
+  Widget _frame(VideoPlayerValue? value) {
+    final controller = widget.controller;
+    final reveal = _shouldReveal(value);
+    _logStateChange(value);
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        _FallbackBackground(posterUrl: widget.posterUrl),
+        AnimatedOpacity(
+          key: const Key('player-video-opacity'),
+          opacity: reveal ? 1 : 0,
+          duration: _videoFadeDuration,
+          curve: Curves.easeOut,
+          child: reveal && controller != null
+              ? _VideoLayer(
+                  controller: controller,
+                  value: value!,
+                  theater: widget.theater,
+                  onTap: widget.onTap,
+                )
+              : const SizedBox.expand(),
+        ),
+        if (kDebugMode && value?.hasError == true)
+          Center(
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: _errorHorizontal),
+              child: Text(
+                value?.errorDescription ?? 'unknown video error',
+                key: const Key('player-video-error'),
+                maxLines: _errorMaxLines,
+                overflow: TextOverflow.ellipsis,
+                textAlign: TextAlign.center,
+                style: const TextStyle(color: Colors.white70, fontSize: 13),
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+
+  bool _shouldReveal(VideoPlayerValue? value) {
+    return value != null &&
+        !value.hasError &&
+        value.isInitialized &&
+        value.size.width > 0 &&
+        (value.position > Duration.zero || value.isPlaying);
+  }
+
+  void _logStateChange(VideoPlayerValue? value) {
+    if (!kDebugMode) return;
+    final status = _debugStatus(value);
+    final signature =
+        '$status|${value?.isInitialized ?? false}|'
+        '${value?.errorDescription ?? 'none'}';
+    if (signature == _lastDebugState) return;
+    _lastDebugState = signature;
+    final source = widget.controller?.dataSource ?? widget.videoUrl;
+    debugPrint(
+      '[video] init=${value?.isInitialized ?? false} '
+      'err=${value?.errorDescription ?? 'none'} host=${_host(source)}',
+    );
+  }
+
+  String _debugStatus(VideoPlayerValue? value) {
+    if (value == null) return 'loading';
+    if (value.hasError) {
+      return 'error: ${value.errorDescription ?? 'unknown'}';
+    }
+    if (value.isBuffering) return 'buffering';
+    if (value.isInitialized) return 'initialized';
+    return 'loading';
+  }
+
+  String _host(String source) {
+    final uri = Uri.tryParse(source);
+    if (uri == null || uri.host.isEmpty) return 'unknown';
+    final port = uri.hasPort
+        ? uri.port
+        : uri.scheme == 'https'
+        ? 443
+        : 80;
+    return '${uri.host}:$port';
+  }
+}
+
+class _VideoLayer extends StatelessWidget {
+  const _VideoLayer({
+    required this.controller,
+    required this.value,
+    required this.theater,
+    required this.onTap,
+  });
+
+  final VideoPlayerController controller;
+  final VideoPlayerValue value;
+  final bool theater;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: onTap,
+      child: FittedBox(
+        fit: theater ? BoxFit.contain : BoxFit.cover,
+        child: SizedBox(
+          width: value.size.width,
+          height: value.size.height,
+          child: VideoPlayer(controller, key: ValueKey(controller)),
+        ),
+      ),
+    );
+  }
+}
+
+class _FallbackBackground extends StatelessWidget {
+  const _FallbackBackground({required this.posterUrl});
+
+  final String posterUrl;
+
+  @override
+  Widget build(BuildContext context) {
+    if (posterUrl.trim().isEmpty) {
+      return const ColoredBox(
+        key: Key('player-fallback-background'),
+        color: Colors.black,
+      );
+    }
+    return Stack(
+      key: const Key('player-fallback-background'),
+      fit: StackFit.expand,
+      children: [
+        RemoteImage(
+          posterUrl,
+          key: const Key('player-fallback-cover'),
+          fit: BoxFit.cover,
+          fallbackColor: Colors.black,
+        ),
+        const ColoredBox(
+          key: Key('player-fallback-scrim'),
+          color: Color(0x4D000000),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/player/widgets/seek_progress_bar.dart b/lib/pages/player/widgets/seek_progress_bar.dart
index 6680fa1..faa2e85 100644
--- a/lib/pages/player/widgets/seek_progress_bar.dart
+++ b/lib/pages/player/widgets/seek_progress_bar.dart
@@ -27,6 +27,7 @@ class SeekProgressBar extends StatefulWidget {
     this.onSeek,
     this.showTimes = true,
     this.compact = false,
+    this.inactiveTrackColor = AppColors.border,
   });
 
   final ValueListenable<VideoPlayerValue>? valueListenable;
@@ -35,6 +36,7 @@ class SeekProgressBar extends StatefulWidget {
   final Future<void> Function(Duration)? onSeek;
   final bool showTimes;
   final bool compact;
+  final Color inactiveTrackColor;
 
   @override
   State<SeekProgressBar> createState() => _SeekProgressBarState();
@@ -127,10 +129,8 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
                   ? (scrubbing ? 3 : 1.5)
                   : (scrubbing ? 4 : 3),
               activeTrackColor: AppColors.blue,
-              inactiveTrackColor: widget.compact
-                  ? Colors.white.withValues(alpha: 0.18)
-                  : const Color(0xFF474248),
-              thumbColor: widget.compact ? AppColors.blue : Colors.white,
+              inactiveTrackColor: widget.inactiveTrackColor,
+              thumbColor: AppColors.onPrimary,
               thumbShape: RoundSliderThumbShape(
                 enabledThumbRadius: widget.compact
                     ? (scrubbing ? 6 : 4)
@@ -144,6 +144,8 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
               label: widget.semanticsLabel,
               child: Slider(
                 value: fraction,
+                // 轨道与上方文案共用同一层水平内边距，避免 Slider 默认内缩。
+                padding: EdgeInsets.zero,
                 onChangeStart: enabled
                     ? (value) {
                         _previewFraction.value = value;
diff --git a/lib/pages/ranking/ranking_page.dart b/lib/pages/ranking/ranking_page.dart
new file mode 100644
index 0000000..e28923d
--- /dev/null
+++ b/lib/pages/ranking/ranking_page.dart
@@ -0,0 +1,476 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/models/drama.dart';
+import '../../core/data/services/catalog_controller.dart';
+import '../../core/formatting/count_format.dart';
+import '../../core/theme/app_colors.dart';
+import '../../core/theme/app_theme.dart';
+import '../../core/widgets/app_pull_to_refresh.dart';
+import '../../core/widgets/empty_state.dart';
+import '../../core/widgets/paged_local_list.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
+import '../../core/widgets/remote_image.dart';
+import '../../l10n/app_localizations.dart';
+import '../player/open_player.dart';
+
+const int _topCount = 50;
+const double _podiumGap = 8;
+const double _coverRadius = 12;
+const double _titleSlotHeight = 24;
+const double _rowGap = 12;
+const double _rankColumnWidth = 56;
+const double _listCoverWidth = 72;
+const double _listCoverHeight = 96;
+const double _loadMoreThreshold = 200;
+const Color _goldStart = Color(0xFFF3B34C);
+const Color _goldEnd = Color(0xFFD9A23A);
+const Color _bronzeStart = Color(0xFFCD7F32);
+const Color _bronzeEnd = Color(0xFFA9713A);
+
+/// 剧场榜单页：前三名横排领奖台，第 4 名起纵向列表。
+class RankingPage extends StatefulWidget {
+  const RankingPage({super.key});
+
+  @override
+  State<RankingPage> createState() => _RankingPageState();
+}
+
+class _RankingPageState extends State<RankingPage> {
+  final ScrollController _scroll = ScrollController();
+  PagedLocalListController<Drama>? _pager;
+  bool _refreshing = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (_pager != null) return;
+    _pager = PagedLocalListController<Drama>(
+      items: _ranked(context.read<CatalogController>().dramas),
+    )..addListener(_rebuild);
+  }
+
+  @override
+  void dispose() {
+    _pager
+      ?..removeListener(_rebuild)
+      ..dispose();
+    _scroll.dispose();
+    super.dispose();
+  }
+
+  void _rebuild() {
+    if (mounted) setState(() {});
+  }
+
+  List<Drama> _ranked(List<Drama> source) {
+    final dramas = [...source]
+      ..sort((a, b) => b.viewCount.compareTo(a.viewCount));
+    return dramas.take(_topCount).toList(growable: false);
+  }
+
+  Future<void> _refresh() async {
+    if (_refreshing) return;
+    _refreshing = true;
+    try {
+      final catalog = context.read<CatalogController>();
+      await catalog.refresh();
+      if (!mounted) return;
+      _pager!.replaceAll(_ranked(catalog.dramas));
+      if (_scroll.hasClients) {
+        _scroll.jumpTo(_scroll.position.minScrollExtent);
+      }
+    } finally {
+      _refreshing = false;
+    }
+  }
+
+  bool _onScroll(ScrollNotification notification) {
+    if (notification.depth != 0 || _refreshing) return false;
+    final reachedBottom =
+        notification.metrics.extentAfter <= _loadMoreThreshold;
+    if (reachedBottom &&
+        (notification is ScrollUpdateNotification ||
+            notification is ScrollEndNotification ||
+            notification is OverscrollNotification)) {
+      unawaited(_pager!.loadMore());
+    }
+    return false;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final pager = _pager!;
+    final top = pager.visibleItems;
+    final podium = top.take(3).toList();
+    final rest = top.skip(3).toList();
+    return PlainPageScaffold(
+      pageKey: const Key('ranking-page'),
+      backKey: const Key('ranking-back'),
+      title: l10n.topCharts,
+      subtitle: l10n.rankingSubtitle,
+      child: NotificationListener<ScrollNotification>(
+        onNotification: _onScroll,
+        child: AppPullToRefresh(
+          key: const Key('ranking-refresh'),
+          onRefresh: _refresh,
+          child: ListView(
+            key: const Key('ranking-list'),
+            controller: _scroll,
+            physics: AppPullToRefresh.physics,
+            padding: const EdgeInsets.only(top: 4, bottom: 24),
+            children: top.isEmpty
+                ? [
+                    SizedBox(
+                      height: 420,
+                      child: EmptyState(
+                        icon: Icons.leaderboard_outlined,
+                        title: l10n.noStories,
+                      ),
+                    ),
+                  ]
+                : [
+                    if (podium.isNotEmpty)
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 14),
+                        child: _Podium(podium: podium, l10n: l10n),
+                      ),
+                    if (rest.isNotEmpty) ...[
+                      const SizedBox(height: 16),
+                      for (var index = 0; index < rest.length; index++) ...[
+                        if (index > 0) const SizedBox(height: _rowGap),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 14),
+                          child: _RankingRow(
+                            index: index + 3,
+                            drama: rest[index],
+                            l10n: l10n,
+                          ),
+                        ),
+                      ],
+                    ],
+                    PagedLoadFooter(
+                      loading: pager.loading,
+                      hasMore: pager.hasMore,
+                      hasItems: pager.items.isNotEmpty,
+                      loadMoreKey: const Key('ranking-load-more'),
+                      noMoreKey: const Key('ranking-no-more'),
+                      noMoreLabel: l10n.noMore,
+                    ),
+                  ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _Podium extends StatelessWidget {
+  const _Podium({required this.podium, required this.l10n});
+
+  final List<Drama> podium;
+  final AppLocalizations l10n;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.end,
+      children: [
+        Expanded(flex: 100, child: _slot(2)),
+        const SizedBox(width: _podiumGap),
+        Expanded(flex: 115, child: _slot(1)),
+        const SizedBox(width: _podiumGap),
+        Expanded(flex: 100, child: _slot(3)),
+      ],
+    );
+  }
+
+  Widget _slot(int rank) {
+    if (podium.length < rank) return const SizedBox.shrink();
+    return _PodiumCard(rank: rank, drama: podium[rank - 1], l10n: l10n);
+  }
+}
+
+class _PodiumCard extends StatelessWidget {
+  const _PodiumCard({
+    required this.rank,
+    required this.drama,
+    required this.l10n,
+  });
+
+  final int rank;
+  final Drama drama;
+  final AppLocalizations l10n;
+
+  bool get _center => rank == 1;
+
+  LinearGradient get _badgeGradient => switch (rank) {
+    1 => const LinearGradient(
+      begin: Alignment.topLeft,
+      end: Alignment.bottomRight,
+      colors: [AppColors.blue, AppColors.bluePressed],
+    ),
+    2 => const LinearGradient(
+      begin: Alignment.topLeft,
+      end: Alignment.bottomRight,
+      colors: [_goldStart, _goldEnd],
+    ),
+    _ => const LinearGradient(
+      begin: Alignment.topLeft,
+      end: Alignment.bottomRight,
+      colors: [_bronzeStart, _bronzeEnd],
+    ),
+  };
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => unawaited(playDramaFromCatalog(context, drama)),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          ClipRRect(
+            borderRadius: BorderRadius.circular(_coverRadius),
+            child: AspectRatio(
+              key: Key('ranking-cover-$rank'),
+              aspectRatio: 3 / 4,
+              child: Stack(
+                fit: StackFit.expand,
+                children: [
+                  RemoteImage(
+                    drama.posterUrl,
+                    fit: BoxFit.cover,
+                    showFallbackIcon: true,
+                    fallbackAspectRatio: 3 / 4,
+                  ),
+                  Positioned(
+                    top: 8,
+                    left: 8,
+                    child: Container(
+                      key: Key('ranking-top-$rank'),
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 8,
+                        vertical: 3,
+                      ),
+                      decoration: BoxDecoration(
+                        gradient: _badgeGradient,
+                        borderRadius: BorderRadius.circular(999),
+                      ),
+                      child: Text(
+                        l10n.topLabel(rank),
+                        maxLines: 1,
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 11,
+                          fontWeight: FontWeight.w800,
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          const SizedBox(height: 6),
+          SizedBox(
+            height: _titleSlotHeight,
+            child: Center(
+              child: Text(
+                drama.title,
+                key: Key('ranking-title-$rank'),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: AppColors.onSurface,
+                  fontSize: _center ? 15 : 13,
+                  fontWeight: _center ? FontWeight.w800 : FontWeight.w700,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _RankingRow extends StatelessWidget {
+  const _RankingRow({
+    required this.index,
+    required this.drama,
+    required this.l10n,
+  });
+
+  final int index;
+  final Drama drama;
+  final AppLocalizations l10n;
+
+  int get _rank => index + 1;
+
+  List<String> _tagValues() {
+    final result = <String>[];
+    for (final value in [drama.genre, drama.category]) {
+      for (final part in value.split(RegExp(r'[,/、·]'))) {
+        final tag = part.trim();
+        if (tag.isEmpty || result.contains(tag)) continue;
+        result.add(tag);
+        if (result.length == 3) return result;
+      }
+    }
+    return result;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(14),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(14),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          key: Key('ranking-row-$index'),
+          onTap: () => unawaited(playDramaFromCatalog(context, drama)),
+          child: Padding(
+            padding: const EdgeInsets.all(10),
+            child: Row(
+              children: [
+                SizedBox(
+                  width: _rankColumnWidth,
+                  child: Text(
+                    l10n.topLabel(_rank),
+                    key: Key('ranking-top-$_rank'),
+                    textAlign: TextAlign.center,
+                    maxLines: 1,
+                    style: const TextStyle(
+                      color: AppColors.subtle,
+                      fontSize: 18,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                ClipRRect(
+                  borderRadius: BorderRadius.circular(10),
+                  child: SizedBox(
+                    width: _listCoverWidth,
+                    height: _listCoverHeight,
+                    child: RemoteImage(
+                      drama.posterUrl,
+                      fit: BoxFit.cover,
+                      showFallbackIcon: true,
+                      fallbackAspectRatio: 3 / 4,
+                    ),
+                  ),
+                ),
+                const SizedBox(width: 12),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        drama.title,
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          color: AppColors.onSurface,
+                          fontSize: 15,
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                      if (drama.synopsis.trim().isNotEmpty) ...[
+                        const SizedBox(height: 4),
+                        Text(
+                          drama.synopsis,
+                          maxLines: 2,
+                          overflow: TextOverflow.ellipsis,
+                          style: const TextStyle(
+                            color: AppColors.muted,
+                            fontSize: 12,
+                            height: 1.3,
+                          ),
+                        ),
+                      ],
+                      if (_tagValues().isNotEmpty) ...[
+                        const SizedBox(height: 6),
+                        Wrap(
+                          spacing: 6,
+                          runSpacing: 4,
+                          children: [
+                            for (final tag in _tagValues())
+                              Container(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 6,
+                                  vertical: 2,
+                                ),
+                                decoration: BoxDecoration(
+                                  color: AppColors.raised,
+                                  borderRadius: BorderRadius.circular(6),
+                                ),
+                                child: Text(
+                                  tag,
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: const TextStyle(
+                                    color: AppColors.muted,
+                                    fontSize: 11,
+                                  ),
+                                ),
+                              ),
+                          ],
+                        ),
+                      ],
+                      const SizedBox(height: 8),
+                      Row(
+                        children: [
+                          const Icon(
+                            Icons.local_fire_department_rounded,
+                            color: AppColors.blue,
+                            size: 12,
+                          ),
+                          const SizedBox(width: 4),
+                          Flexible(
+                            child: Text(
+                              l10n.heatLabel(
+                                formatInteractionCount(drama.viewCount),
+                              ),
+                              maxLines: 1,
+                              overflow: TextOverflow.ellipsis,
+                              style: const TextStyle(
+                                color: AppColors.muted,
+                                fontSize: 11,
+                              ),
+                            ),
+                          ),
+                          const SizedBox(width: 8),
+                          Text(
+                            l10n.episodeCount(drama.episodeCount),
+                            maxLines: 1,
+                            style: const TextStyle(
+                              color: AppColors.muted,
+                              fontSize: 11,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/reserve/reserve_page.dart b/lib/pages/reserve/reserve_page.dart
new file mode 100644
index 0000000..551449d
--- /dev/null
+++ b/lib/pages/reserve/reserve_page.dart
@@ -0,0 +1,338 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/services/catalog_controller.dart';
+import '../../core/theme/app_colors.dart';
+import '../../core/widgets/app_pull_to_refresh.dart';
+import '../../core/widgets/subpage_header.dart';
+import '../../l10n/app_localizations.dart';
+import '../new_releases/new_releases_page.dart';
+
+const double _ticketRadius = 20;
+const double _notchSize = 24;
+const Color _ticketDash = Color(0x66FF7A1A);
+
+/// 预约页：档期周历 + 电影票式空态 + 预约权益说明。
+class ReservePage extends StatefulWidget {
+  const ReservePage({super.key});
+
+  @override
+  State<ReservePage> createState() => _ReservePageState();
+}
+
+class _ReservePageState extends State<ReservePage> {
+  late final List<DateTime> _week;
+  late int _selected;
+
+  @override
+  void initState() {
+    super.initState();
+    final today = DateTime.now();
+    final monday = today.subtract(Duration(days: today.weekday - 1));
+    _week = [
+      for (var index = 0; index < 7; index++) monday.add(Duration(days: index)),
+    ];
+    _selected = today.weekday - 1;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Scaffold(
+      key: const Key('reserve-page'),
+      backgroundColor: AppColors.ink,
+      body: SafeArea(
+        child: AppPullToRefresh(
+          key: const Key('reserve-refresh'),
+          onRefresh: _refresh,
+          child: ListView(
+            key: const Key('reserve-list'),
+            physics: AppPullToRefresh.physics,
+            padding: const EdgeInsets.fromLTRB(0, 4, 0, 24),
+            children: [
+              AppSubpageHeader(
+                title: l10n.reserveTitle,
+                subtitle: l10n.reserveSubtitle,
+                backKey: const Key('reserve-back'),
+              ),
+              Padding(
+                padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
+                child: _weekStrip(l10n),
+              ),
+              Padding(
+                padding: const EdgeInsets.fromLTRB(16, 16, 16, 0),
+                child: _ticketCard(context, l10n),
+              ),
+              Padding(
+                padding: const EdgeInsets.fromLTRB(16, 24, 16, 0),
+                child: _steps(l10n),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Future<void> _refresh() async {
+    await context.read<CatalogController>().refresh();
+  }
+
+  Widget _weekStrip(AppLocalizations l10n) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          l10n.reserveWeek,
+          style: const TextStyle(
+            color: AppColors.onSurface,
+            fontSize: 13,
+            fontWeight: FontWeight.w700,
+          ),
+        ),
+        const SizedBox(height: 8),
+        SizedBox(
+          key: const Key('reserve-week-strip'),
+          height: 56,
+          child: Row(
+            children: [
+              for (var index = 0; index < _week.length; index++) ...[
+                if (index > 0) const SizedBox(width: 6),
+                Expanded(child: _dayCapsule(index)),
+              ],
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _dayCapsule(int index) {
+    final date = _week[index];
+    final selected = _selected == index;
+    final weekdays = ['一', '二', '三', '四', '五', '六', '日'];
+    return GestureDetector(
+      key: Key('reserve-day-$index'),
+      behavior: HitTestBehavior.opaque,
+      onTap: () => setState(() => _selected = index),
+      child: Container(
+        decoration: BoxDecoration(
+          color: selected ? AppColors.blue : AppColors.card,
+          borderRadius: BorderRadius.circular(14),
+          border: Border.all(
+            color: selected ? AppColors.blue : AppColors.border,
+          ),
+        ),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text(
+              weekdays[date.weekday - 1],
+              style: TextStyle(
+                color: selected ? Colors.white : AppColors.muted,
+                fontSize: 11,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+            const SizedBox(height: 2),
+            Text(
+              '${date.day}',
+              style: TextStyle(
+                color: selected ? Colors.white : AppColors.onSurface,
+                fontSize: 15,
+                fontWeight: FontWeight.w800,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _ticketCard(BuildContext context, AppLocalizations l10n) {
+    return LayoutBuilder(
+      builder: (context, constraints) => Stack(
+        clipBehavior: Clip.none,
+        children: [
+          Container(
+            key: const Key('reserve-empty'),
+            width: double.infinity,
+            padding: const EdgeInsets.fromLTRB(28, 26, 28, 22),
+            decoration: BoxDecoration(
+              color: AppColors.card,
+              borderRadius: BorderRadius.circular(_ticketRadius),
+            ),
+            child: Column(
+              children: [
+                Container(
+                  width: 56,
+                  height: 56,
+                  decoration: const BoxDecoration(
+                    color: AppColors.raised,
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Icon(
+                    Icons.notifications_active_rounded,
+                    color: AppColors.blue,
+                    size: 32,
+                  ),
+                ),
+                const SizedBox(height: 12),
+                Text(
+                  l10n.reserveEmptyTitle,
+                  style: const TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: 17,
+                    fontWeight: FontWeight.w800,
+                  ),
+                ),
+                const SizedBox(height: 6),
+                Text(
+                  l10n.reserveEmptyHint,
+                  maxLines: 2,
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(color: AppColors.muted, fontSize: 12),
+                ),
+                const SizedBox(height: 16),
+                SizedBox(
+                  height: 40,
+                  child: FilledButton(
+                    key: const Key('reserve-go-new'),
+                    onPressed: () => Navigator.of(context).push<void>(
+                      MaterialPageRoute(
+                        builder: (_) => const NewReleasesPage(),
+                      ),
+                    ),
+                    style: FilledButton.styleFrom(
+                      backgroundColor: AppColors.blue,
+                      foregroundColor: Colors.white,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                    ),
+                    child: Text(
+                      l10n.goNewReleases,
+                      style: const TextStyle(
+                        fontSize: 13,
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          Positioned(left: -_notchSize / 2, top: 120, child: _notch()),
+          Positioned(right: -_notchSize / 2, top: 120, child: _notch()),
+          Positioned.fill(
+            child: IgnorePointer(
+              child: CustomPaint(painter: _DashedTicketPainter()),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _notch() {
+    return Container(
+      width: _notchSize,
+      height: _notchSize,
+      decoration: const BoxDecoration(
+        color: AppColors.ink,
+        shape: BoxShape.circle,
+      ),
+    );
+  }
+
+  Widget _steps(AppLocalizations l10n) {
+    final steps = [l10n.reserveStep1, l10n.reserveStep2, l10n.reserveStep3];
+    return Column(
+      key: const Key('reserve-steps'),
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          l10n.reserveStepsTitle,
+          style: const TextStyle(
+            color: AppColors.onSurface,
+            fontSize: 16,
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+        const SizedBox(height: 10),
+        for (var index = 0; index < steps.length; index++) ...[
+          if (index > 0) const SizedBox(height: 8),
+          Container(
+            key: Key('reserve-step-${index + 1}'),
+            padding: const EdgeInsets.all(12),
+            decoration: BoxDecoration(
+              color: AppColors.card,
+              borderRadius: BorderRadius.circular(12),
+              border: Border.all(color: AppColors.border),
+            ),
+            child: Row(
+              children: [
+                Container(
+                  width: 22,
+                  height: 22,
+                  alignment: Alignment.center,
+                  decoration: const BoxDecoration(
+                    color: AppColors.blue,
+                    shape: BoxShape.circle,
+                  ),
+                  child: Text(
+                    '${index + 1}',
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 12,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                const SizedBox(width: 10),
+                Text(
+                  steps[index],
+                  style: const TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: 14,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ],
+    );
+  }
+}
+
+class _DashedTicketPainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = _ticketDash
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 1;
+    final path = Path()
+      ..addRRect(
+        RRect.fromRectAndRadius(
+          Offset.zero & size,
+          const Radius.circular(_ticketRadius),
+        ),
+      );
+    for (final metric in path.computeMetrics()) {
+      var distance = 0.0;
+      while (distance < metric.length) {
+        final next = (distance + 6).clamp(0.0, metric.length);
+        canvas.drawPath(metric.extractPath(distance, next), paint);
+        distance = next + 4;
+      }
+    }
+  }
+
+  @override
+  bool shouldRepaint(covariant _DashedTicketPainter oldDelegate) => false;
+}
diff --git a/lib/pages/settings/settings_page.dart b/lib/pages/settings/settings_page.dart
new file mode 100644
index 0000000..bd8cc4e
--- /dev/null
+++ b/lib/pages/settings/settings_page.dart
@@ -0,0 +1,85 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/services/auth_controller.dart';
+import '../../core/theme/app_colors.dart';
+import '../../core/theme/app_theme.dart';
+import '../../core/widgets/auth_gate.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
+import '../../l10n/app_localizations.dart';
+import '../account/account_entry_card.dart';
+import '../notices/notices_page.dart';
+
+/// 设置页：收纳账号、通知与登录态，不提供手动语言切换。
+class SettingsPage extends StatelessWidget {
+  const SettingsPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final auth = context.watch<AuthController>();
+    return Theme(
+      data: AppTheme.light(),
+      child: PlainPageScaffold(
+        pageKey: const Key('settings-page'),
+        backKey: const Key('settings-back'),
+        title: l10n.settings,
+        child: ListView(
+          padding: const EdgeInsets.fromLTRB(14, 8, 14, 28),
+          children: [
+            if (auth.isSignedIn) ...[
+              const AccountEntryCard(),
+              const SizedBox(height: 12),
+            ],
+            _noticesTile(context, l10n),
+            const SizedBox(height: 24),
+            _authAction(context, l10n, auth),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _noticesTile(BuildContext context, AppLocalizations l10n) {
+    return Material(
+      color: AppColors.card,
+      borderRadius: BorderRadius.circular(14),
+      clipBehavior: Clip.antiAlias,
+      child: ListTile(
+        key: const Key('settings-notices'),
+        leading: const Icon(
+          Icons.notifications_none_rounded,
+          color: AppColors.blueSoft,
+        ),
+        title: Text(l10n.notices),
+        trailing: const Icon(Icons.chevron_right_rounded),
+        onTap: () => Navigator.of(
+          context,
+        ).push<void>(MaterialPageRoute(builder: (_) => const NoticesPage())),
+      ),
+    );
+  }
+
+  Widget _authAction(
+    BuildContext context,
+    AppLocalizations l10n,
+    AuthController auth,
+  ) {
+    if (auth.isSignedIn) {
+      return OutlinedButton(
+        key: const Key('settings-sign-out'),
+        onPressed: () => unawaited(auth.signOut()),
+        child: Text(l10n.signOut),
+      );
+    }
+    return FilledButton(
+      key: const Key('settings-sign-in'),
+      onPressed: () => unawaited(openAuthPage(context)),
+      child: Text(l10n.signIn),
+    );
+  }
+}
diff --git a/lib/pages/splash/splash_page.dart b/lib/pages/splash/splash_page.dart
deleted file mode 100644
index 2eac25c..0000000
--- a/lib/pages/splash/splash_page.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-// Author: fruit.com.cn
-
-import 'package:flutter/material.dart';
-
-import '../../core/theme/app_colors.dart';
-
-const double _markSize = 84;
-const double _markRadius = 18;
-const double _loaderSize = 22;
-const double _loaderStroke = 2.5;
-const String _markAsset = 'assets/icon/splash_mark.png';
-
-/// 系统开屏已经放好同一块底和图标。这一页接上加载，直到首页数据回来。
-class SplashPage extends StatelessWidget {
-  const SplashPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ColoredBox(
-      key: Key('splash-screen'),
-      color: AppColors.ink,
-      child: Stack(
-        fit: StackFit.expand,
-        children: [
-          Center(
-            child: ClipRRect(
-              borderRadius: BorderRadius.circular(_markRadius),
-              child: const Image(
-                image: AssetImage(_markAsset),
-                width: _markSize,
-                height: _markSize,
-                filterQuality: FilterQuality.medium,
-                gaplessPlayback: true,
-              ),
-            ),
-          ),
-          Align(
-            alignment: Alignment(0, 0.24),
-            child: SizedBox(
-              width: _loaderSize,
-              height: _loaderSize,
-              child: CircularProgressIndicator(
-                key: Key('splash-loading'),
-                strokeWidth: _loaderStroke,
-                color: AppColors.gold,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/pages/store/recharge_page.dart b/lib/pages/store/recharge_page.dart
new file mode 100644
index 0000000..50645d7
--- /dev/null
+++ b/lib/pages/store/recharge_page.dart
@@ -0,0 +1,24 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../core/data/repositories/store_repository.dart';
+import '../../core/data/services/store_controller.dart';
+import 'store_page.dart';
+
+/// 金币充值页：展示上架金币包并在点击购买时创建订单。
+class RechargePage extends StatelessWidget {
+  const RechargePage({super.key, this.repository, this.onPurchased});
+
+  final StoreRepository? repository;
+  final VoidCallback? onPurchased;
+
+  @override
+  Widget build(BuildContext context) {
+    return StorePage(
+      type: StoreController.coinPackType,
+      repository: repository,
+      onPurchased: onPurchased,
+    );
+  }
+}
diff --git a/lib/pages/store/store_page.dart b/lib/pages/store/store_page.dart
new file mode 100644
index 0000000..beed81a
--- /dev/null
+++ b/lib/pages/store/store_page.dart
@@ -0,0 +1,269 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/models/product.dart';
+import '../../core/data/repositories/store_repository.dart';
+import '../../core/data/services/store_controller.dart';
+import '../../core/formatting/error_text.dart';
+import '../../core/theme/app_colors.dart';
+import '../../core/theme/app_dimens.dart';
+import '../../core/theme/app_theme.dart';
+import '../../core/widgets/empty_state.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
+import '../../l10n/app_localizations.dart';
+
+/// 商品货架：金币包与会员档位共用一套真实接口渲染。
+class StorePage extends StatefulWidget {
+  const StorePage({
+    super.key,
+    required this.type,
+    this.repository,
+    this.onPurchased,
+  });
+
+  final String type;
+  final StoreRepository? repository;
+  final VoidCallback? onPurchased;
+
+  @override
+  State<StorePage> createState() => _StorePageState();
+}
+
+class _StorePageState extends State<StorePage> {
+  late final StoreController controller;
+
+  @override
+  void initState() {
+    super.initState();
+    controller = StoreController(
+      widget.repository ?? context.read<StoreRepository>(),
+      type: widget.type,
+    );
+    unawaited(controller.load());
+  }
+
+  @override
+  void dispose() {
+    controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final isVip = widget.type == StoreController.vipType;
+    return Theme(
+      data: AppTheme.light(),
+      child: PlainPageScaffold(
+        pageKey: const Key('store-page'),
+        backKey: const Key('store-back'),
+        title: isVip ? l10n.vipTitle : l10n.rechargeTitle,
+        child: ListenableBuilder(
+          listenable: controller,
+          builder: (context, _) => _body(l10n, isVip),
+        ),
+      ),
+    );
+  }
+
+  Widget _body(AppLocalizations l10n, bool isVip) {
+    if (controller.loading && controller.products.isEmpty) {
+      return const Center(
+        child: CircularProgressIndicator(key: Key('store-loading')),
+      );
+    }
+    if (controller.error != null && controller.products.isEmpty) {
+      return EmptyState(
+        key: const Key('store-error'),
+        icon: Icons.cloud_off_rounded,
+        title: errorText(l10n, controller.error, l10n.productsLoadFailed),
+        actionLabel: l10n.retry,
+        actionKey: const Key('store-retry'),
+        onAction: () => unawaited(controller.load()),
+      );
+    }
+    if (controller.products.isEmpty) {
+      return EmptyState(
+        key: const Key('store-empty'),
+        icon: isVip ? Icons.workspace_premium_outlined : Icons.savings_outlined,
+        title: isVip ? l10n.noVipPlans : l10n.noCoinPacks,
+      );
+    }
+    return ListView.separated(
+      padding: const EdgeInsets.fromLTRB(16, 12, 16, 28),
+      itemCount: controller.products.length,
+      separatorBuilder: (_, _) => const SizedBox(height: 12),
+      itemBuilder: (context, index) => _ProductTile(
+        product: controller.products[index],
+        purchasing:
+            controller.purchasingProductId == controller.products[index].id,
+        onBuy: () => _buy(controller.products[index]),
+      ),
+    );
+  }
+
+  Future<void> _buy(AppProduct product) async {
+    final order = await controller.buy(product);
+    if (!mounted) return;
+    final l10n = AppLocalizations.of(context)!;
+    if (order == null) {
+      final message = errorText(
+        l10n,
+        controller.purchaseError,
+        l10n.orderCreateFailed,
+      );
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text(message)));
+      return;
+    }
+    widget.onPurchased?.call();
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(
+          '${l10n.orderCreated(order.orderNo)} ${l10n.paymentPending}',
+        ),
+      ),
+    );
+  }
+}
+
+class _ProductTile extends StatelessWidget {
+  const _ProductTile({
+    required this.product,
+    required this.purchasing,
+    required this.onBuy,
+  });
+
+  final AppProduct product;
+  final bool purchasing;
+  final VoidCallback onBuy;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Container(
+      key: Key('store-product-${product.id}'),
+      padding: const EdgeInsets.fromLTRB(14, 14, 12, 14),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(16),
+        border: Border.all(color: AppColors.gold.withValues(alpha: 0.26)),
+      ),
+      child: Row(
+        children: [
+          _ProductBadge(vip: product.isVip),
+          const SizedBox(width: 12),
+          Expanded(child: _info(l10n)),
+          const SizedBox(width: 10),
+          _price(l10n),
+        ],
+      ),
+    );
+  }
+
+  Widget _info(AppLocalizations l10n) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          product.name,
+          key: Key('store-product-name-${product.id}'),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: const TextStyle(
+            color: AppColors.onSurface,
+            fontSize: 14,
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Text(
+          _detail(l10n),
+          style: const TextStyle(color: AppColors.muted, fontSize: 11),
+        ),
+      ],
+    );
+  }
+
+  Widget _price(AppLocalizations l10n) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.end,
+      children: [
+        Text(
+          product.displayPrice,
+          key: Key('store-product-price-${product.id}'),
+          style: const TextStyle(
+            color: AppColors.gold,
+            fontSize: 13,
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+        const SizedBox(height: 8),
+        SizedBox(
+          width: 88,
+          height: 32,
+          child: FilledButton(
+            key: Key('store-buy-${product.id}'),
+            onPressed: purchasing ? null : onBuy,
+            style: FilledButton.styleFrom(
+              backgroundColor: AppColors.blue,
+              foregroundColor: AppColors.onPrimary,
+              padding: EdgeInsets.zero,
+              textStyle: const TextStyle(
+                fontSize: 11,
+                fontWeight: FontWeight.w700,
+              ),
+            ),
+            child: purchasing ? _buyProgress() : Text(l10n.buy),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buyProgress() {
+    return const SizedBox(
+      width: 14,
+      height: 14,
+      child: CircularProgressIndicator(
+        strokeWidth: 2,
+        color: AppColors.onPrimary,
+      ),
+    );
+  }
+
+  String _detail(AppLocalizations l10n) {
+    if (product.isVip) return l10n.vipDuration(product.vipDays);
+    final base = l10n.walletBalanceShort(product.coinAmount);
+    if (product.bonusCoin <= 0) return base;
+    return '$base · ${l10n.bonusCoin(product.bonusCoin)}';
+  }
+}
+
+class _ProductBadge extends StatelessWidget {
+  const _ProductBadge({required this.vip});
+
+  final bool vip;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 46,
+      height: 46,
+      decoration: BoxDecoration(
+        color: AppColors.goldCard,
+        borderRadius: BorderRadius.circular(13),
+      ),
+      child: Icon(
+        vip ? Icons.workspace_premium_rounded : Icons.monetization_on_rounded,
+        color: AppColors.gold,
+        size: AppDimens.sectionTitle,
+      ),
+    );
+  }
+}
diff --git a/lib/pages/store/vip_page.dart b/lib/pages/store/vip_page.dart
new file mode 100644
index 0000000..4df4e10
--- /dev/null
+++ b/lib/pages/store/vip_page.dart
@@ -0,0 +1,24 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../core/data/repositories/store_repository.dart';
+import '../../core/data/services/store_controller.dart';
+import 'store_page.dart';
+
+/// 会员页：展示 VIP 档位并在点击开通时创建订单。
+class VipPage extends StatelessWidget {
+  const VipPage({super.key, this.repository, this.onPurchased});
+
+  final StoreRepository? repository;
+  final VoidCallback? onPurchased;
+
+  @override
+  Widget build(BuildContext context) {
+    return StorePage(
+      type: StoreController.vipType,
+      repository: repository,
+      onPurchased: onPurchased,
+    );
+  }
+}
diff --git a/lib/pages/wallet/wallet_page.dart b/lib/pages/wallet/wallet_page.dart
new file mode 100644
index 0000000..72a5948
--- /dev/null
+++ b/lib/pages/wallet/wallet_page.dart
@@ -0,0 +1,451 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../core/data/models/wallet.dart';
+import '../../core/data/services/wallet_controller.dart';
+import '../../core/formatting/error_text.dart';
+import '../../core/formatting/localized_date_time.dart';
+import '../../core/theme/app_colors.dart';
+import '../../core/theme/app_dimens.dart';
+import '../../core/theme/app_theme.dart';
+import '../../core/widgets/app_pull_to_refresh.dart';
+import '../../core/widgets/empty_state.dart';
+import '../../core/widgets/plain_page_scaffold.dart';
+import '../store/recharge_page.dart';
+import '../store/vip_page.dart';
+import '../../l10n/app_localizations.dart';
+
+/// 金币钱包：余额、累计收支与最近流水。
+class WalletPage extends StatefulWidget {
+  const WalletPage({super.key});
+
+  @override
+  State<WalletPage> createState() => _WalletPageState();
+}
+
+class _WalletPageState extends State<WalletPage> {
+  bool _requested = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (_requested) return;
+    _requested = true;
+    final wallet = context.read<WalletController>();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted) unawaited(wallet.load());
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final wallet = context.watch<WalletController>();
+    return Theme(
+      data: AppTheme.light(),
+      child: PlainPageScaffold(
+        pageKey: const Key('wallet-page'),
+        backKey: const Key('wallet-back'),
+        title: l10n.wallet,
+        child: _body(l10n, wallet),
+      ),
+    );
+  }
+
+  Widget _storeActions(AppLocalizations l10n, WalletController wallet) {
+    return Row(
+      children: [
+        Expanded(
+          child: FilledButton.icon(
+            key: const Key('wallet-top-up'),
+            onPressed: () => _openRecharge(wallet),
+            icon: const Icon(Icons.add_card_rounded, size: 16),
+            label: Text(l10n.topUpWallet),
+            style: FilledButton.styleFrom(
+              backgroundColor: AppColors.blue,
+              foregroundColor: AppColors.onPrimary,
+            ),
+          ),
+        ),
+        const SizedBox(width: 10),
+        Expanded(
+          child: OutlinedButton.icon(
+            key: const Key('wallet-vip'),
+            onPressed: () => _openVip(wallet),
+            icon: const Icon(Icons.workspace_premium_outlined, size: 16),
+            label: Text(l10n.vipMembership),
+            style: OutlinedButton.styleFrom(foregroundColor: AppColors.gold),
+          ),
+        ),
+      ],
+    );
+  }
+
+  void _openRecharge(WalletController wallet) {
+    Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (_) =>
+            RechargePage(onPurchased: () => unawaited(wallet.load())),
+      ),
+    );
+  }
+
+  void _openVip(WalletController wallet) {
+    Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (_) => VipPage(onPurchased: () => unawaited(wallet.load())),
+      ),
+    );
+  }
+
+  Widget _body(AppLocalizations l10n, WalletController wallet) {
+    if (wallet.loading && wallet.snapshot == null) {
+      return const Center(child: CircularProgressIndicator());
+    }
+    final snapshot = wallet.snapshot;
+    if (snapshot == null) {
+      return EmptyState(
+        key: const Key('wallet-error'),
+        icon: Icons.account_balance_wallet_outlined,
+        title: errorText(l10n, wallet.error, l10n.walletLoadFailed),
+        actionLabel: l10n.retry,
+        actionKey: const Key('wallet-retry'),
+        onAction: () => unawaited(wallet.load()),
+      );
+    }
+    return AppPullToRefresh(
+      onRefresh: wallet.load,
+      child: ListView(
+        physics: AppPullToRefresh.physics,
+        padding: const EdgeInsets.fromLTRB(16, 8, 16, 28),
+        children: [
+          _BalanceHero(wallet: snapshot.wallet),
+          const SizedBox(height: 12),
+          _storeActions(l10n, wallet),
+          const SizedBox(height: 14),
+          Row(
+            children: [
+              Expanded(
+                child: _SummaryTile(
+                  icon: Icons.add_card_rounded,
+                  label: l10n.totalRecharged,
+                  value: snapshot.wallet.totalRechargedCoin,
+                  color: AppColors.success,
+                ),
+              ),
+              const SizedBox(width: 10),
+              Expanded(
+                child: _SummaryTile(
+                  icon: Icons.local_fire_department_rounded,
+                  label: l10n.totalConsumed,
+                  value: snapshot.wallet.totalConsumedCoin,
+                  color: AppColors.accent,
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 22),
+          Text(
+            l10n.coinLedger,
+            style: const TextStyle(
+              color: AppColors.onSurface,
+              fontSize: AppDimens.sectionTitle,
+              fontWeight: FontWeight.w800,
+            ),
+          ),
+          const SizedBox(height: 10),
+          if (snapshot.ledger.isEmpty)
+            _LedgerEmpty(message: l10n.noCoinLedger)
+          else
+            for (final entry in snapshot.ledger) ...[
+              _LedgerTile(entry: entry),
+              const SizedBox(height: 8),
+            ],
+        ],
+      ),
+    );
+  }
+}
+
+class _BalanceHero extends StatelessWidget {
+  const _BalanceHero({required this.wallet});
+
+  final CoinWallet wallet;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Container(
+      key: const Key('wallet-balance-card'),
+      padding: const EdgeInsets.fromLTRB(20, 22, 20, 20),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(20),
+        gradient: const LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: [AppColors.goldCard, AppColors.card],
+        ),
+        border: Border.all(color: AppColors.gold.withValues(alpha: 0.35)),
+        boxShadow: [
+          BoxShadow(
+            color: AppColors.gold.withValues(alpha: 0.08),
+            blurRadius: 28,
+            offset: const Offset(0, 14),
+          ),
+        ],
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Container(
+                width: 38,
+                height: 38,
+                decoration: BoxDecoration(
+                  color: AppColors.gold.withValues(alpha: 0.15),
+                  shape: BoxShape.circle,
+                ),
+                child: const Icon(
+                  Icons.monetization_on_rounded,
+                  color: AppColors.gold,
+                  size: 21,
+                ),
+              ),
+              const SizedBox(width: 10),
+              Text(
+                l10n.coinBalance,
+                style: const TextStyle(
+                  color: AppColors.muted,
+                  fontSize: 13,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 18),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.end,
+            children: [
+              Text(
+                '${wallet.coinBalance}',
+                key: const Key('wallet-balance'),
+                style: const TextStyle(
+                  color: AppColors.onSurface,
+                  fontSize: 42,
+                  height: 1,
+                  fontWeight: FontWeight.w800,
+                ),
+              ),
+              const SizedBox(width: 8),
+              Padding(
+                padding: const EdgeInsets.only(bottom: 5),
+                child: Text(
+                  l10n.coins,
+                  style: const TextStyle(
+                    color: AppColors.gold,
+                    fontSize: 14,
+                    fontWeight: FontWeight.w700,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _SummaryTile extends StatelessWidget {
+  const _SummaryTile({
+    required this.icon,
+    required this.label,
+    required this.value,
+    required this.color,
+  });
+
+  final IconData icon;
+  final String label;
+  final int value;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(14),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        border: Border.all(color: AppColors.border),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Icon(icon, color: color, size: 18),
+          const SizedBox(height: 10),
+          Text(
+            '$value',
+            style: const TextStyle(
+              color: AppColors.onSurface,
+              fontSize: 20,
+              fontWeight: FontWeight.w800,
+            ),
+          ),
+          const SizedBox(height: 2),
+          Text(
+            label,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: const TextStyle(color: AppColors.subtle, fontSize: 11),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _LedgerTile extends StatelessWidget {
+  const _LedgerTile({required this.entry});
+
+  final CoinLedgerEntry entry;
+
+  @override
+  Widget build(BuildContext context) {
+    final positive = entry.changeAmount >= 0;
+    final color = positive ? AppColors.success : AppColors.accent;
+    final amount = positive
+        ? '+${entry.changeAmount}'
+        : '${entry.changeAmount}';
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        border: Border.all(color: AppColors.border),
+      ),
+      child: Row(
+        children: [
+          Container(
+            width: 34,
+            height: 34,
+            alignment: Alignment.center,
+            decoration: BoxDecoration(
+              color: color.withValues(alpha: 0.12),
+              borderRadius: BorderRadius.circular(10),
+            ),
+            child: Icon(
+              positive ? Icons.south_west_rounded : Icons.north_east_rounded,
+              color: color,
+              size: 18,
+            ),
+          ),
+          const SizedBox(width: 10),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  _ledgerLabel(context, entry.bizType),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: 13,
+                    fontWeight: FontWeight.w700,
+                  ),
+                ),
+                if (entry.remark.isNotEmpty) ...[
+                  const SizedBox(height: 3),
+                  Text(
+                    entry.remark,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: const TextStyle(
+                      color: AppColors.subtle,
+                      fontSize: 11,
+                    ),
+                  ),
+                ],
+                if (entry.createdAt != null) ...[
+                  const SizedBox(height: 3),
+                  Text(
+                    formatLocalizedDateTime(context, entry.createdAt!),
+                    style: const TextStyle(
+                      color: AppColors.subtle,
+                      fontSize: 10,
+                    ),
+                  ),
+                ],
+              ],
+            ),
+          ),
+          const SizedBox(width: 8),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.end,
+            children: [
+              Text(
+                amount,
+                key: Key('wallet-ledger-${entry.id}'),
+                style: TextStyle(
+                  color: color,
+                  fontSize: 14,
+                  fontWeight: FontWeight.w800,
+                ),
+              ),
+              const SizedBox(height: 2),
+              Text(
+                '${entry.balanceAfter}',
+                style: const TextStyle(color: AppColors.subtle, fontSize: 10),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  String _ledgerLabel(BuildContext context, String bizType) {
+    final l10n = AppLocalizations.of(context)!;
+    return switch (bizType) {
+      'UNLOCK' => l10n.ledgerUnlock,
+      'RECHARGE' || 'ORDER' => l10n.ledgerRecharge,
+      'REFUND' => l10n.ledgerRefund,
+      _ => l10n.ledgerAdjustment,
+    };
+  }
+}
+
+class _LedgerEmpty extends StatelessWidget {
+  const _LedgerEmpty({required this.message});
+
+  final String message;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 22),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(AppDimens.cardRadius),
+        border: Border.all(color: AppColors.border),
+      ),
+      child: Row(
+        children: [
+          const Icon(Icons.receipt_long_outlined, color: AppColors.subtle),
+          const SizedBox(width: 10),
+          Expanded(
+            child: Text(
+              message,
+              style: const TextStyle(color: AppColors.subtle, fontSize: 12),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/watch_records/watch_records_page.dart b/lib/pages/watch_records/watch_records_page.dart
index d5250c5..157c48b 100644
--- a/lib/pages/watch_records/watch_records_page.dart
+++ b/lib/pages/watch_records/watch_records_page.dart
@@ -6,23 +6,26 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
-import '../../core/data/models/watch_record.dart';
 import '../../core/data/repositories/catalog_repository.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
 import '../../core/data/services/auth_controller.dart';
 import '../../core/data/services/watch_records_controller.dart';
 import '../../core/formatting/error_text.dart';
-import '../../core/formatting/localized_date_time.dart';
 import '../../core/platform/haptics.dart';
 import '../../core/theme/app_colors.dart';
-import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
+import '../../core/widgets/app_pull_to_refresh.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/empty_state.dart';
-import '../../core/widgets/remote_image.dart';
+import '../../core/widgets/subpage_header.dart';
 import '../../l10n/app_localizations.dart';
 import '../drama_detail/drama_detail_view.dart';
 import 'watch_records_binding.dart';
+import 'widgets/watch_record_card.dart';
+
+const double _pageHorizontal = 14;
+const double _statsFontSize = 12;
+const double _emptyListHeight = 360;
 
 /// 独立观看记录页。
 class WatchRecordsPage extends StatelessWidget {
@@ -33,18 +36,24 @@ class WatchRecordsPage extends StatelessWidget {
     final signedIn = context.watch<AuthController>().isSignedIn;
     final l10n = AppLocalizations.of(context)!;
     return Theme(
-      data: AppTheme.dark(),
+      data: AppTheme.light(),
       child: Scaffold(
         key: const Key('watch-records-page'),
         backgroundColor: AppColors.ink,
-        appBar: AppBar(
-          backgroundColor: AppColors.ink,
-          foregroundColor: Colors.white,
-          title: Text(l10n.watchHistory),
-        ),
         body: SafeArea(
-          top: false,
-          child: signedIn ? const _WatchRecordsBody() : const AuthGatePanel(),
+          child: Column(
+            children: [
+              AppSubpageHeader(
+                title: l10n.watchHistory,
+                backKey: const Key('watch-records-back'),
+              ),
+              Expanded(
+                child: signedIn
+                    ? const _WatchRecordsBody()
+                    : const AuthGatePanel(),
+              ),
+            ],
+          ),
         ),
       ),
     );
@@ -88,52 +97,94 @@ class _WatchRecordsBodyState extends State<_WatchRecordsBody> {
   Widget _content(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     if (controller.loading && controller.records.isEmpty) {
-      return const Center(child: CircularProgressIndicator());
+      return const Center(
+        child: CircularProgressIndicator(key: Key('watch-records-loading')),
+      );
     }
     if (controller.error != null && controller.records.isEmpty) {
-      return _FailureState(
-        message: errorText(l10n, controller.error, l10n.progressError),
-        onRetry: controller.load,
+      return _refreshable(
+        children: [
+          SizedBox(
+            height: _emptyListHeight,
+            child: _FailureState(
+              message: errorText(l10n, controller.error, l10n.progressError),
+              onRetry: controller.load,
+            ),
+          ),
+        ],
       );
     }
     if (controller.records.isEmpty) {
-      return EmptyState(
-        key: const Key('watch-records-empty'),
-        icon: Icons.history_rounded,
-        title: l10n.noWatchRecords,
-        subtitle: l10n.emptyHint,
+      return _refreshable(
+        children: [
+          SizedBox(
+            height: _emptyListHeight,
+            child: EmptyState(
+              key: const Key('watch-records-empty'),
+              icon: Icons.history_rounded,
+              title: l10n.noWatchRecords,
+              subtitle: l10n.emptyHint,
+            ),
+          ),
+        ],
       );
     }
-    return Column(
+    return _refreshable(
       children: [
-        Align(
-          alignment: Alignment.centerRight,
-          child: TextButton.icon(
-            key: const Key('watch-records-clear'),
-            onPressed: controller.clearing ? null : _confirmClear,
-            icon: const Icon(Icons.delete_sweep_outlined),
-            label: Text(l10n.clearAll),
+        _summary(l10n),
+        for (final (index, record) in controller.records.indexed) ...[
+          if (index > 0) const SizedBox(height: 10),
+          WatchRecordCard(
+            record: record,
+            onRetry: () => controller.retryDetail(record.dramaId),
+            onRemove: () => _remove(record.dramaId),
+            onOpen: record.drama == null ? null : () => _open(record.drama!),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget _refreshable({required List<Widget> children}) {
+    return AppPullToRefresh(
+      onRefresh: controller.load,
+      child: ListView(
+        physics: AppPullToRefresh.physics,
+        padding: const EdgeInsets.fromLTRB(
+          _pageHorizontal,
+          4,
+          _pageHorizontal,
+          28,
+        ),
+        children: children,
+      ),
+    );
+  }
+
+  Widget _summary(AppLocalizations l10n) {
+    return Row(
+      children: [
+        Text(
+          l10n.watchRecordsCount(controller.records.length),
+          key: const Key('watch-records-count'),
+          style: const TextStyle(
+            color: AppColors.muted,
+            fontSize: _statsFontSize,
           ),
         ),
-        Expanded(
-          child: RefreshIndicator(
-            onRefresh: controller.load,
-            child: ListView.separated(
-              padding: const EdgeInsets.fromLTRB(16, 4, 16, 28),
-              itemCount: controller.records.length,
-              separatorBuilder: (_, _) => const SizedBox(height: 10),
-              itemBuilder: (context, index) {
-                final record = controller.records[index];
-                return _RecordTile(
-                  record: record,
-                  onRetry: () => controller.retryDetail(record.dramaId),
-                  onRemove: () => _remove(record.dramaId),
-                  onOpen: record.drama == null
-                      ? null
-                      : () => _open(record.drama!),
-                );
-              },
-            ),
+        const Spacer(),
+        TextButton.icon(
+          key: const Key('watch-records-clear'),
+          onPressed: controller.clearing ? null : _confirmClear,
+          style: TextButton.styleFrom(
+            foregroundColor: AppColors.blue,
+            minimumSize: const Size(44, 36),
+            padding: const EdgeInsets.symmetric(horizontal: 8),
+          ),
+          icon: const Icon(Icons.delete_sweep_outlined, size: 16),
+          label: Text(
+            l10n.clearAll,
+            style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w700),
           ),
         ),
       ],
@@ -188,181 +239,6 @@ class _WatchRecordsBodyState extends State<_WatchRecordsBody> {
   }
 }
 
-class _RecordTile extends StatelessWidget {
-  const _RecordTile({
-    required this.record,
-    required this.onRetry,
-    required this.onRemove,
-    this.onOpen,
-  });
-
-  final WatchRecord record;
-  final VoidCallback onRetry;
-  final VoidCallback onRemove;
-  final VoidCallback? onOpen;
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
-    if (record.detailFailed) {
-      return _FailedRecordTile(record: record, onRetry: onRetry);
-    }
-    final drama = record.drama;
-    if (drama == null || record.detailLoading) {
-      return Container(
-        key: ValueKey('watch-record-${record.dramaId}'),
-        height: AppDimens.watchPlaceholderHeight,
-        decoration: BoxDecoration(
-          color: AppColors.card,
-          borderRadius: BorderRadius.circular(AppDimens.innerRadius),
-        ),
-        child: const Padding(
-          padding: EdgeInsets.all(AppDimens.innerPadding),
-          child: Center(
-            child: SizedBox(
-              width: 22,
-              height: 22,
-              child: CircularProgressIndicator(strokeWidth: 2),
-            ),
-          ),
-        ),
-      );
-    }
-    final episodeLabel = record.episodeNumber > 0
-        ? l10n.episodeLabel(record.episodeNumber)
-        : l10n.episodeUnavailable;
-    return Material(
-      key: ValueKey('watch-record-${record.dramaId}'),
-      color: AppColors.card,
-      borderRadius: BorderRadius.circular(AppDimens.innerRadius),
-      clipBehavior: Clip.antiAlias,
-      child: InkWell(
-        onTap: onOpen,
-        child: Padding(
-          padding: const EdgeInsets.all(AppDimens.innerPadding),
-          child: Row(
-            children: [
-              ClipRRect(
-                borderRadius: BorderRadius.circular(8),
-                child: RemoteImage(drama.posterUrl, width: 72, height: 96),
-              ),
-              const SizedBox(width: 12),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      drama.title,
-                      maxLines: 2,
-                      overflow: TextOverflow.ellipsis,
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: AppDimens.listTitle,
-                        fontWeight: FontWeight.w700,
-                      ),
-                    ),
-                    const SizedBox(height: 5),
-                    Text(
-                      episodeLabel,
-                      key: ValueKey('watch-record-episode-${record.dramaId}'),
-                      style: const TextStyle(
-                        color: AppColors.muted,
-                        fontSize: AppDimens.caption,
-                      ),
-                    ),
-                    const SizedBox(height: 7),
-                    ClipRRect(
-                      borderRadius: BorderRadius.circular(
-                        AppDimens.progressRadius,
-                      ),
-                      child: LinearProgressIndicator(
-                        minHeight: AppDimens.progressHeight,
-                        value: record.progress.fraction,
-                        backgroundColor: Colors.white24,
-                        valueColor: const AlwaysStoppedAnimation(
-                          AppColors.blueSoft,
-                        ),
-                      ),
-                    ),
-                    const SizedBox(height: 6),
-                    Text(
-                      l10n.resumeProgress(
-                        _clock(record.progress.position),
-                        _clock(record.progress.duration),
-                      ),
-                      style: const TextStyle(
-                        color: AppColors.blueSoft,
-                        fontSize: AppDimens.caption,
-                      ),
-                    ),
-                    if (record.progress.updatedAt != null)
-                      Text(
-                        l10n.updatedAtLabel(
-                          formatLocalizedDateTime(
-                            context,
-                            record.progress.updatedAt!,
-                          ),
-                        ),
-                        key: ValueKey('watch-record-updated-${record.dramaId}'),
-                        style: const TextStyle(
-                          color: AppColors.muted,
-                          fontSize: AppDimens.caption,
-                        ),
-                      ),
-                  ],
-                ),
-              ),
-              IconButton(
-                key: ValueKey('watch-record-remove-${record.dramaId}'),
-                tooltip: l10n.remove,
-                onPressed: onRemove,
-                icon: const Icon(Icons.close_rounded),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _FailedRecordTile extends StatelessWidget {
-  const _FailedRecordTile({required this.record, required this.onRetry});
-
-  final WatchRecord record;
-  final VoidCallback onRetry;
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
-    return Container(
-      key: ValueKey('watch-record-failed-${record.dramaId}'),
-      padding: const EdgeInsets.all(AppDimens.innerPadding),
-      decoration: BoxDecoration(
-        color: AppColors.card,
-        borderRadius: BorderRadius.circular(AppDimens.innerRadius),
-      ),
-      child: Row(
-        children: [
-          const Icon(Icons.broken_image_outlined, color: Colors.white38),
-          const SizedBox(width: 12),
-          Expanded(
-            child: Text(
-              l10n.detailLoadFailed,
-              style: const TextStyle(color: Colors.white70),
-            ),
-          ),
-          TextButton(
-            key: ValueKey('watch-record-retry-${record.dramaId}'),
-            onPressed: onRetry,
-            child: Text(l10n.retryDetail),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
 class _FailureState extends StatelessWidget {
   const _FailureState({required this.message, required this.onRetry});
 
@@ -381,9 +257,3 @@ class _FailureState extends StatelessWidget {
     );
   }
 }
-
-String _clock(Duration value) {
-  final minutes = value.inMinutes;
-  final seconds = value.inSeconds.remainder(60);
-  return '$minutes:${seconds.toString().padLeft(2, '0')}';
-}
diff --git a/lib/pages/watch_records/widgets/watch_record_card.dart b/lib/pages/watch_records/widgets/watch_record_card.dart
new file mode 100644
index 0000000..5bb67cc
--- /dev/null
+++ b/lib/pages/watch_records/widgets/watch_record_card.dart
@@ -0,0 +1,248 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/data/models/watch_record.dart';
+import '../../../core/formatting/localized_date_time.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/theme/app_theme.dart';
+import '../../../core/widgets/remote_image.dart';
+import '../../../l10n/app_localizations.dart';
+
+const double _cardRadius = 14;
+const double _cardPadding = 10;
+const double _coverWidth = 72;
+const double _coverHeight = 96;
+const double _coverRadius = 10;
+const double _removeSize = 32;
+const double _removeIconSize = 18;
+const double _progressHeight = 4;
+const double _progressRadius = 2;
+const double _statsFontSize = 12;
+const double _metaFontSize = 11;
+const double _titleFontSize = 15;
+
+/// 观看记录卡片：覆盖加载、失败与完整记录三种状态。
+class WatchRecordCard extends StatelessWidget {
+  const WatchRecordCard({
+    super.key,
+    required this.record,
+    required this.onRetry,
+    required this.onRemove,
+    this.onOpen,
+  });
+
+  final WatchRecord record;
+  final VoidCallback onRetry;
+  final VoidCallback onRemove;
+  final VoidCallback? onOpen;
+
+  @override
+  Widget build(BuildContext context) {
+    if (record.detailFailed) {
+      return _FailedRecordTile(record: record, onRetry: onRetry);
+    }
+    final drama = record.drama;
+    if (drama == null || record.detailLoading) {
+      return _loadingCard();
+    }
+    final l10n = AppLocalizations.of(context)!;
+    final episodeLabel = record.episodeNumber > 0
+        ? l10n.episodeLabel(record.episodeNumber)
+        : l10n.episodeUnavailable;
+    return _card(
+      onTap: onOpen,
+      child: Stack(
+        children: [
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              ClipRRect(
+                borderRadius: BorderRadius.circular(_coverRadius),
+                child: RemoteImage(
+                  drama.posterUrl,
+                  key: ValueKey('watch-record-cover-${record.dramaId}'),
+                  width: _coverWidth,
+                  height: _coverHeight,
+                ),
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.only(right: _removeSize),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        drama.title,
+                        key: ValueKey('watch-record-title-${record.dramaId}'),
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          color: AppColors.onSurface,
+                          fontSize: _titleFontSize,
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        episodeLabel,
+                        key: ValueKey('watch-record-episode-${record.dramaId}'),
+                        style: const TextStyle(
+                          color: AppColors.muted,
+                          fontSize: _statsFontSize,
+                        ),
+                      ),
+                      const SizedBox(height: 8),
+                      ClipRRect(
+                        borderRadius: BorderRadius.circular(_progressRadius),
+                        child: LinearProgressIndicator(
+                          minHeight: _progressHeight,
+                          value: record.progress.fraction,
+                          backgroundColor: AppColors.border,
+                          valueColor: const AlwaysStoppedAnimation(
+                            AppColors.blue,
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        '${_clock(record.progress.position)} / '
+                        '${_clock(record.progress.duration)}',
+                        style: const TextStyle(
+                          color: AppColors.muted,
+                          fontSize: _metaFontSize,
+                        ),
+                      ),
+                      if (record.progress.updatedAt != null)
+                        Text(
+                          l10n.updatedAtLabel(
+                            formatLocalizedDateTime(
+                              context,
+                              record.progress.updatedAt!,
+                            ),
+                          ),
+                          key: ValueKey(
+                            'watch-record-updated-${record.dramaId}',
+                          ),
+                          style: const TextStyle(
+                            color: AppColors.subtle,
+                            fontSize: _metaFontSize,
+                          ),
+                        ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+          Positioned(top: 0, right: 0, child: _removeButton(l10n.remove)),
+        ],
+      ),
+    );
+  }
+
+  Widget _loadingCard() => Container(
+    key: ValueKey('watch-record-${record.dramaId}'),
+    padding: const EdgeInsets.all(_cardPadding),
+    decoration: _cardDecoration(),
+    child: const SizedBox(
+      height: _coverHeight,
+      child: Center(child: CircularProgressIndicator(strokeWidth: 2)),
+    ),
+  );
+
+  Widget _card({required VoidCallback? onTap, required Widget child}) {
+    return Container(
+      key: ValueKey('watch-record-${record.dramaId}'),
+      decoration: _cardDecoration(),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(_cardRadius),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          onTap: onTap,
+          child: Padding(
+            padding: const EdgeInsets.all(_cardPadding),
+            child: child,
+          ),
+        ),
+      ),
+    );
+  }
+
+  BoxDecoration _cardDecoration() => BoxDecoration(
+    color: AppColors.card,
+    borderRadius: BorderRadius.circular(_cardRadius),
+    boxShadow: const [AppTheme.cardShadow],
+  );
+
+  Widget _removeButton(String tooltip) {
+    return SizedBox.square(
+      dimension: _removeSize,
+      child: Material(
+        color: AppColors.raised,
+        shape: const CircleBorder(),
+        clipBehavior: Clip.antiAlias,
+        child: IconButton(
+          key: ValueKey('watch-record-remove-${record.dramaId}'),
+          tooltip: tooltip,
+          padding: EdgeInsets.zero,
+          onPressed: onRemove,
+          icon: const Icon(
+            Icons.delete_outline_rounded,
+            size: _removeIconSize,
+            color: AppColors.muted,
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _FailedRecordTile extends StatelessWidget {
+  const _FailedRecordTile({required this.record, required this.onRetry});
+
+  final WatchRecord record;
+  final VoidCallback onRetry;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Container(
+      key: ValueKey('watch-record-${record.dramaId}'),
+      decoration: BoxDecoration(
+        color: AppColors.card,
+        borderRadius: BorderRadius.circular(_cardRadius),
+        boxShadow: const [AppTheme.cardShadow],
+      ),
+      child: Container(
+        key: ValueKey('watch-record-failed-${record.dramaId}'),
+        padding: const EdgeInsets.all(_cardPadding),
+        child: Row(
+          children: [
+            const Icon(Icons.broken_image_outlined, color: AppColors.muted),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Text(
+                l10n.detailLoadFailed,
+                style: const TextStyle(color: AppColors.muted, fontSize: 12),
+              ),
+            ),
+            TextButton(
+              key: ValueKey('watch-record-retry-${record.dramaId}'),
+              onPressed: onRetry,
+              child: Text(l10n.retryDetail),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+String _clock(Duration value) {
+  final minutes = value.inMinutes;
+  final seconds = value.inSeconds.remainder(60);
+  return '$minutes:${seconds.toString().padLeft(2, '0')}';
+}
diff --git a/pubspec.lock b/pubspec.lock
index 2db1ec3..156b4f0 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.3"
   archive:
     dependency: transitive
     description:
@@ -61,10 +69,18 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.3"
+    version: "1.1.2"
+  code_assets:
+    dependency: transitive
+    description:
+      name: code_assets
+      sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.2.1"
   collection:
     dependency: transitive
     description:
@@ -73,6 +89,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.19.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.7"
   csslib:
     dependency: transitive
     description:
@@ -160,6 +184,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_native_splash:
+    dependency: "direct dev"
+    description:
+      name: flutter_native_splash
+      sha256: "9db4b80b044e9af17cc4b1272137fc7ace0054d879ef8210a76adc34aaf4cdff"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.4.8"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -175,6 +207,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  hooks:
+    dependency: transitive
+    description:
+      name: hooks
+      sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.2"
   html:
     dependency: transitive
     description:
@@ -208,10 +248,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867"
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.20.3"
+    version: "0.20.2"
   jni:
     dependency: transitive
     description:
@@ -220,6 +260,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
+  jni_flutter:
+    dependency: transitive
+    description:
+      name: jni_flutter
+      sha256: "0dd33d67797560f66e961a6053882d4df54bd345bf063b8fe7ea133f7ad8b191"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.4+1"
   jni_util:
     dependency: transitive
     description:
@@ -268,14 +316,22 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd"
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.20"
+    version: "0.12.19"
   material_color_utilities:
     dependency: transitive
     description:
@@ -288,10 +344,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9"
+      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.19.0"
+    version: "1.18.0"
   mime:
     dependency: transitive
     description:
@@ -308,6 +364,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "9.5.0"
   package_config:
     dependency: transitive
     description:
@@ -316,6 +380,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: "2f1564aadb14215e478563b5406cb80729d022158c01dc50c96013c2f7eb4790"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "7.1.0"
   path:
     dependency: transitive
     description:
@@ -324,6 +396,30 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.9.1"
+  path_provider:
+    dependency: "direct main"
+    description:
+      name: path_provider
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.5"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.1"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.6.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -388,24 +484,40 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.5+1"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.2.1"
+  record_use:
+    dependency: transitive
+    description:
+      name: record_use
+      sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.6.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "1e85e0dccf5b4a016077fea7dfbb4a7cb39c759ac1596fcf60c06deadb7da91f"
+      sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.6"
+    version: "2.3.3"
   shared_preferences_android:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: shared_preferences_android
-      sha256: b90caa27669d5f3ef9918d55343b44000f088ee9d4685ed822310848004c793e
+      sha256: "1e12aafe408aa50da80edfd679a2a6bf63ba7ab37c7fa98286da459a757b3399"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.0"
+    version: "2.4.28"
   shared_preferences_foundation:
-    dependency: "direct overridden"
+    dependency: "direct main"
     description:
       name: shared_preferences_foundation
       sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
@@ -461,10 +573,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.12.2"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
@@ -501,10 +613,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11"
+      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.7.12"
+    version: "0.7.11"
   typed_data:
     dependency: transitive
     description:
@@ -513,14 +625,22 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.4.0"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "92b9910f66ed1057fd4da7b040ae7c74cafacf885bdc81be496928d5049b032d"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.3"
+    version: "2.2.0"
   video_player:
     dependency: "direct main"
     description:
@@ -593,6 +713,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: "0fe8cc98946def31cbcbc8734aa4067031e6f65ea3a78a508060bfed2200bfeb"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "7.1.0"
   yaml:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index d184d02..09d3088 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -40,9 +40,13 @@ dependencies:
   dio: ^5.7.0
   provider: ^6.1.5+1
   video_player: ^2.14.0
-  shared_preferences: ^2.5.5
+  shared_preferences: 2.3.3
+  shared_preferences_android: 2.4.28
+  # 规避 2.6.0 的 Pigeon 生成代码尾随逗号需要新版 Swift。
+  shared_preferences_foundation: 2.5.6
   flutter_localizations:
     sdk: flutter
+  path_provider: 2.1.5
 
 dev_dependencies:
   flutter_test:
@@ -59,12 +63,9 @@ dev_dependencies:
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
   flutter_lints: ^6.0.0
-  shared_preferences_platform_interface: ^2.4.2
   flutter_launcher_icons: ^0.14.4
-
-# Xcode 16.2 / Swift 6.0.3 cannot parse the trailing comma in foundation 2.6.0.
-dependency_overrides:
-  shared_preferences_foundation: 2.5.6
+  shared_preferences_platform_interface: 2.4.2
+  flutter_native_splash: ^2.4.8
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
@@ -80,27 +81,8 @@ flutter:
   # the material Icons class.
   uses-material-design: true
   assets:
-    - assets/icon/splash_mark.png
-
-  fonts:
-    - family: Outfit
-      fonts:
-        - asset: assets/fonts/Outfit-Regular.ttf
-          weight: 400
-        - asset: assets/fonts/Outfit-SemiBold.ttf
-          weight: 600
-        - asset: assets/fonts/Outfit-Bold.ttf
-          weight: 700
-    - family: PlusJakartaSans
-      fonts:
-        - asset: assets/fonts/PlusJakartaSans-Regular.ttf
-          weight: 400
-        - asset: assets/fonts/PlusJakartaSans-Medium.ttf
-          weight: 500
-        - asset: assets/fonts/PlusJakartaSans-SemiBold.ttf
-          weight: 600
-        - asset: assets/fonts/PlusJakartaSans-Bold.ttf
-          weight: 700
+    - assets/icon/splash_logo.png
+    - assets/icon/splash_logo_android12.png
 
   # To add assets to your application, add an assets section, like this:
   # assets:
@@ -140,3 +122,15 @@ flutter_launcher_icons:
   adaptive_icon_background: "#C4322A"
   adaptive_icon_foreground: assets/icon/fruitshorts.png
   remove_alpha_ios: true
+
+# 修改以下开屏配置后，必须重新执行：
+# dart run flutter_native_splash:create
+flutter_native_splash:
+  color: "#1F1B16"
+  image: assets/icon/splash_logo.png
+  android: true
+  ios: true
+  web: false
+  android_12:
+    color: "#1F1B16"
+    image: assets/icon/splash_logo_android12.png
diff --git a/test/account/account_pages_test.dart b/test/account/account_pages_test.dart
index 90cc7d0..c73f6fc 100644
--- a/test/account/account_pages_test.dart
+++ b/test/account/account_pages_test.dart
@@ -28,15 +28,19 @@ void main() {
       AccountProfilePage(),
       repository: repository,
       auth: auth,
+      locale: const Locale('zh'),
     );
 
     final nickname = find.byKey(const Key('account-nickname'));
+    expect(find.byKey(const Key('account-birthday')), findsNothing);
+    expect(find.text('保存'), findsOneWidget);
     expect(tester.widget<TextField>(nickname).controller?.text, 'Nadia');
     await tester.enterText(nickname, 'Nadia Baru');
     await tester.tap(find.byKey(const Key('account-profile-save')));
     await tester.pumpAndSettle();
 
     expect(repository.lastUpdate?.nickname, 'Nadia Baru');
+    expect(repository.lastUpdate?.birthday, isNull);
   });
 
   testWidgets('should_show_device_empty_state_when_list_is_empty', (
diff --git a/test/account/mine_account_entry_test.dart b/test/account/mine_account_entry_test.dart
index d0612ca..11d17b6 100644
--- a/test/account/mine_account_entry_test.dart
+++ b/test/account/mine_account_entry_test.dart
@@ -24,10 +24,15 @@ void main() {
         InMemorySharedPreferencesAsync.empty();
     await _pumpApp(tester);
 
-    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.tap(find.byKey(const Key('tab-mine')));
+    await tester.pumpAndSettle();
+    await tester.ensureVisible(find.byKey(const Key('mine-settings')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('mine-settings')));
     await tester.pumpAndSettle();
 
     expect(find.byKey(const Key('mine-account-card')), findsNothing);
+    expect(find.byKey(const Key('settings-sign-in')), findsOneWidget);
   });
 
   testWidgets('should_show_four_account_entries_when_signed_in', (
@@ -44,9 +49,11 @@ void main() {
     );
     await _pumpApp(tester);
 
-    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.tap(find.byKey(const Key('tab-mine')));
     await tester.pumpAndSettle();
-    await tester.drag(find.byType(ListView), const Offset(0, -520));
+    await tester.ensureVisible(find.byKey(const Key('mine-settings')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('mine-settings')));
     await tester.pumpAndSettle();
 
     expect(find.byKey(const Key('mine-account-card')), findsOneWidget);
diff --git a/test/auth/auth_controller_test.dart b/test/auth/auth_controller_test.dart
index cbefd61..630b2fa 100644
--- a/test/auth/auth_controller_test.dart
+++ b/test/auth/auth_controller_test.dart
@@ -165,4 +165,56 @@ void main() {
     expect(auth.isSignedIn, isFalse);
     expect(await AuthSessionStore().read(), isNull);
   });
+
+  test('should_store_session_when_phone_code_login_succeeds', () async {
+    late AuthController auth;
+    final adapter = FakeHttpAdapter((options) async {
+      if (options.uri.path == '/app/auth/otp') {
+        final body = (options.data as Map).cast<String, dynamic>();
+        expect(body['targetType'], 'PHONE');
+        expect(body['target'], '08123456789');
+        expect(body['scene'], 'LOGIN');
+        expect(body['deviceId'], isNotEmpty);
+        return FakeHttpResponse(
+          jsonEncode({'code': 0, 'message': 'ok', 'data': null}),
+        );
+      }
+      expect(options.uri.path, '/app/auth/login');
+      final body = (options.data as Map).cast<String, dynamic>();
+      expect(body['targetType'], 'PHONE');
+      expect(body['code'], '123456');
+      return FakeHttpResponse(tokenBody(accessToken: 'p1', refreshToken: 'pr1'));
+    });
+    final store = AuthSessionStore();
+    auth = AuthController(
+      AuthApi(clientWith(() => auth, adapter: adapter)),
+      store,
+    );
+
+    await auth.sendOtp(target: '08123456789', scene: 'LOGIN');
+    await auth.signInWithPhone(target: '08123456789', code: '123456');
+
+    expect(auth.isSignedIn, isTrue);
+    expect(auth.accessToken, 'p1');
+  });
+
+  test('should_store_session_when_phone_registration_succeeds', () async {
+    late AuthController auth;
+    final adapter = FakeHttpAdapter((options) async {
+      expect(options.uri.path, '/app/auth/register');
+      final body = (options.data as Map).cast<String, dynamic>();
+      expect(body['targetType'], 'PHONE');
+      expect(body['code'], '654321');
+      return FakeHttpResponse(tokenBody(accessToken: 'p2', refreshToken: 'pr2'));
+    });
+    auth = AuthController(
+      AuthApi(clientWith(() => auth, adapter: adapter)),
+      AuthSessionStore(),
+    );
+
+    await auth.registerWithPhone(target: '08123456789', code: '654321');
+
+    expect(auth.isSignedIn, isTrue);
+    expect(auth.user?.uid, 'U1');
+  });
 }
diff --git a/test/auth/auth_k21_test.dart b/test/auth/auth_k21_test.dart
index 6312819..52612e9 100644
--- a/test/auth/auth_k21_test.dart
+++ b/test/auth/auth_k21_test.dart
@@ -53,7 +53,7 @@ void main() {
     final errorBorder = email.decoration!.errorBorder! as OutlineInputBorder;
     final scheme = Theme.of(tester.element(emailFinder)).colorScheme;
     expect(errorBorder.borderSide.color, scheme.error);
-    expect(errorBorder.borderSide.width, 1.5);
+    expect(errorBorder.borderSide.width, 1);
   });
 }
 
diff --git a/test/auth/auth_landing_test.dart b/test/auth/auth_landing_test.dart
index af8b6d7..63b66d8 100644
--- a/test/auth/auth_landing_test.dart
+++ b/test/auth/auth_landing_test.dart
@@ -18,7 +18,7 @@ import '../support/fake_haptics.dart';
 import '../support/fake_http_adapter.dart';
 
 void main() {
-  testWidgets('should_show_three_login_entries_and_open_email_form', (
+  testWidgets('should_show_real_login_entries_and_open_phone_sheet', (
     tester,
   ) async {
     SharedPreferencesAsyncPlatform.instance =
@@ -48,14 +48,17 @@ void main() {
     );
     await tester.pumpAndSettle();
 
-    expect(find.byKey(const Key('auth-entry-google')), findsOneWidget);
+    expect(find.byKey(const Key('auth-entry-google')), findsNothing);
     expect(find.byKey(const Key('auth-entry-phone')), findsOneWidget);
     expect(find.byKey(const Key('auth-entry-email')), findsOneWidget);
     expect(find.byKey(const Key('auth-legal')), findsOneWidget);
 
-    await tester.tap(find.byKey(const Key('auth-entry-google')));
+    await tester.tap(find.byKey(const Key('auth-entry-phone')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('phone-auth-sheet')), findsOneWidget);
+
+    await tester.tapAt(const Offset(8, 8));
     await tester.pumpAndSettle();
-    expect(find.text('Coming soon'), findsOneWidget);
 
     await tester.tap(find.byKey(const Key('auth-entry-email')));
     await tester.pumpAndSettle();
diff --git a/test/auth/auth_visual_test.dart b/test/auth/auth_visual_test.dart
index 10c94f4..192ed41 100644
--- a/test/auth/auth_visual_test.dart
+++ b/test/auth/auth_visual_test.dart
@@ -13,6 +13,7 @@ import 'package:fruitshorts/core/data/services/auth_controller.dart';
 import 'package:fruitshorts/core/data/services/auth_session_store.dart';
 import 'package:fruitshorts/core/platform/haptics.dart';
 import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/theme/app_theme.dart';
 import 'package:fruitshorts/l10n/app_localizations.dart';
 import 'package:fruitshorts/pages/auth/auth_view.dart';
 
@@ -30,6 +31,7 @@ void main() {
     AuthApi? api,
     FakeHaptics? haptics,
     bool openEmail = true,
+    bool asRoute = false,
   }) async {
     final auth = AuthController(
       api ??
@@ -53,11 +55,15 @@ void main() {
           locale: const Locale('en'),
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
-          home: const AuthPage(),
+          home: asRoute ? const _AuthRouteHost() : const AuthPage(),
         ),
       ),
     );
     await tester.pump(const Duration(milliseconds: 220));
+    if (asRoute) {
+      await tester.tap(find.byKey(const Key('auth-open')));
+      await tester.pumpAndSettle();
+    }
     if (openEmail) {
       await tester.ensureVisible(find.byKey(const Key('auth-entry-email')));
       await tester.tap(find.byKey(const Key('auth-entry-email')));
@@ -78,21 +84,46 @@ void main() {
       );
       expect(
         tester.getSize(find.byKey(const Key('auth-brand-logo'))),
-        const Size(64, 64),
+        const Size(72, 72),
       );
-      expect(find.byKey(const Key('auth-entry-google')), findsOneWidget);
+      expect(find.byKey(const Key('auth-entry-google')), findsNothing);
       expect(find.byKey(const Key('auth-entry-phone')), findsOneWidget);
       expect(find.byKey(const Key('auth-entry-email')), findsOneWidget);
       expect(find.byKey(const Key('auth-legal')), findsOneWidget);
+      expect(
+        tester.getSize(find.byKey(const Key('auth-entry-phone'))).height,
+        50,
+      );
+      expect(
+        tester.getSize(find.byKey(const Key('auth-entry-email'))).height,
+        50,
+      );
+      final phoneButton = tester.widget<Material>(
+        find.descendant(
+          of: find.byKey(const Key('auth-entry-phone')),
+          matching: find.byType(Material),
+        ),
+      );
+      expect(phoneButton.color, AppColors.blue);
+      final emailButton = tester.widget<Material>(
+        find.descendant(
+          of: find.byKey(const Key('auth-entry-email')),
+          matching: find.byType(Material),
+        ),
+      );
+      expect(emailButton.color, AppColors.card);
+      expect(
+        (emailButton.shape! as RoundedRectangleBorder).side.color,
+        AppColors.border,
+      );
 
       final glow = tester.widget<Container>(
         find.byKey(const Key('auth-background-glow')),
       );
       final glowDecoration = glow.decoration! as BoxDecoration;
-      final gradient = glowDecoration.gradient! as LinearGradient;
-      for (final color in gradient.colors) {
-        expect(color.a, lessThanOrEqualTo(0.18));
-      }
+      final gradient = glowDecoration.gradient! as RadialGradient;
+      expect(gradient.colors.first, AppColors.surfaceTop);
+      expect(gradient.colors.last.a, 0);
 
       await tester.tap(find.byKey(const Key('auth-entry-email')));
       await tester.pumpAndSettle();
@@ -101,19 +132,28 @@ void main() {
       final cardDecoration = card.decoration! as BoxDecoration;
       expect(cardDecoration.color, AppColors.card);
       expect(cardDecoration.borderRadius, BorderRadius.circular(20));
-      expect(
-        (cardDecoration.border! as Border).top.color,
-        AppColors.outlineVariantDark,
-      );
-      expect((cardDecoration.border! as Border).top.width, 1);
+      expect(cardDecoration.boxShadow, contains(AppTheme.cardShadow));
+      expect(card.padding, const EdgeInsets.all(20));
 
       final email = tester.widget<TextField>(
         find.byKey(const Key('auth-email')),
       );
-      expect(email.decoration?.fillColor, AppColors.bar);
+      expect(email.decoration?.fillColor, AppColors.card);
+      expect(email.style?.color, AppColors.onSurface);
+      expect(email.style?.fontSize, 15);
+      expect(email.cursorColor, AppColors.blue);
       expect(tester.getSize(find.byKey(const Key('auth-email'))).height, 52);
-      final emailBorder = email.decoration!.border! as OutlineInputBorder;
+      final emailBorder =
+          email.decoration!.enabledBorder! as OutlineInputBorder;
       expect(emailBorder.borderRadius, BorderRadius.circular(14));
+      expect(emailBorder.borderSide.color, AppColors.border);
+      expect(emailBorder.borderSide.width, 1);
+      final password = tester.widget<TextField>(
+        find.byKey(const Key('auth-password')),
+      );
+      expect(password.style?.color, AppColors.onSurface);
+      expect(password.style?.fontSize, 15);
+      expect(password.cursorColor, AppColors.blue);
 
       final submit = tester.widget<FilledButton>(
         find.byKey(const Key('auth-submit')),
@@ -123,11 +163,11 @@ void main() {
         submit.style!.backgroundColor!.resolve(const {WidgetState.pressed}),
         AppColors.bluePressed,
       );
-      expect(tester.getSize(find.byKey(const Key('auth-submit'))).height, 52);
+      expect(tester.getSize(find.byKey(const Key('auth-submit'))).height, 50);
       expect(
         (submit.style!.shape!.resolve(const {})! as RoundedRectangleBorder)
             .borderRadius,
-        BorderRadius.circular(26),
+        BorderRadius.circular(25),
       );
 
       expect(find.text('Sign In'), findsWidgets);
@@ -139,6 +179,23 @@ void main() {
     },
   );
 
+  testWidgets('should_render_40px_back_button_when_page_is_pushed', (
+    tester,
+  ) async {
+    await pumpAuthPage(tester, openEmail: false, asRoute: true);
+
+    final back = find.byKey(const Key('auth-back'));
+    expect(tester.getSize(back), const Size(40, 40));
+    expect(
+      tester
+          .widget<Material>(
+            find.descendant(of: back, matching: find.byType(Material)),
+          )
+          .color,
+      AppColors.card,
+    );
+  });
+
   testWidgets('should_fade_and_slide_content_in_within_220ms', (tester) async {
     await pumpAuthPage(tester);
 
@@ -198,10 +255,10 @@ void main() {
       final focusedBorder =
           email.decoration!.focusedBorder! as OutlineInputBorder;
       expect(focusedBorder.borderSide.color, AppColors.blue);
-      expect(focusedBorder.borderSide.width, 1.5);
+      expect(focusedBorder.borderSide.width, 1);
       expect(
         tester.widget<Icon>(find.byIcon(Icons.mail_outline_rounded)).color,
-        AppColors.blueSoft,
+        AppColors.blue,
       );
 
       await tester.tap(find.byKey(const Key('auth-password-visibility')));
@@ -280,6 +337,7 @@ void main() {
     final error = tester.widget<Text>(errorFinder);
     final scheme = Theme.of(tester.element(errorFinder)).colorScheme;
     expect(error.style?.color, scheme.error);
+    expect(error.style?.fontSize, 12);
     expect(
       find.descendant(
         of: capsuleFinder,
@@ -325,3 +383,22 @@ class _PendingAuthApi extends AuthApi {
     throw const ApiException(500, 'pending failure');
   }
 }
+
+class _AuthRouteHost extends StatelessWidget {
+  const _AuthRouteHost();
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: TextButton(
+          key: const Key('auth-open'),
+          onPressed: () => Navigator.of(
+            context,
+          ).push<void>(MaterialPageRoute(builder: (_) => const AuthPage())),
+          child: const Text('Open auth'),
+        ),
+      ),
+    );
+  }
+}
diff --git a/test/auth/phone_auth_sheet_test.dart b/test/auth/phone_auth_sheet_test.dart
new file mode 100644
index 0000000..9656a31
--- /dev/null
+++ b/test/auth/phone_auth_sheet_test.dart
@@ -0,0 +1,127 @@
+// Author: fruit.com.cn
+
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/remote/api_client.dart';
+import 'package:fruitshorts/core/data/remote/auth_api.dart';
+import 'package:fruitshorts/core/data/services/auth_controller.dart';
+import 'package:fruitshorts/core/data/services/auth_session_store.dart';
+import 'package:fruitshorts/core/platform/haptics.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/auth/phone_auth_sheet.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+
+import '../support/fake_haptics.dart';
+import '../support/fake_http_adapter.dart';
+
+void main() {
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+  });
+
+  testWidgets('should_send_otp_and_sign_in_when_phone_form_is_submitted', (
+    tester,
+  ) async {
+    final adapter = FakeHttpAdapter((options) async {
+      if (options.uri.path == '/app/auth/otp') {
+        return FakeHttpResponse(
+          jsonEncode({'code': 0, 'message': 'ok', 'data': null}),
+        );
+      }
+      expect(options.uri.path, '/app/auth/login');
+      return FakeHttpResponse(
+        jsonEncode({
+          'code': 0,
+          'message': 'ok',
+          'data': {
+            'accessToken': 'phone-token',
+            'refreshToken': 'phone-refresh',
+            'expiresIn': 7200,
+            'user': {'uid': 'U9', 'nickname': 'Phone User'},
+          },
+        }),
+      );
+    });
+    final auth = AuthController(
+      AuthApi(ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter)),
+      AuthSessionStore(),
+    );
+    await _pumpHost(tester, auth);
+
+    await tester.tap(find.byKey(const Key('open-phone-sheet')));
+    await tester.pumpAndSettle();
+    await tester.enterText(
+      find.byKey(const Key('auth-phone-number')),
+      '08123456789',
+    );
+    await tester.tap(find.byKey(const Key('auth-send-code')));
+    await tester.pumpAndSettle();
+    expect(
+      adapter.requests.where((item) => item.uri.path == '/app/auth/otp'),
+      hasLength(1),
+    );
+
+    await tester.enterText(find.byKey(const Key('auth-phone-code')), '123456');
+    await tester.tap(find.byKey(const Key('auth-phone-submit')));
+    await tester.pumpAndSettle();
+
+    expect(auth.isSignedIn, isTrue);
+    expect(auth.accessToken, 'phone-token');
+  });
+
+  testWidgets('should_keep_sheet_open_when_phone_number_is_invalid', (
+    tester,
+  ) async {
+    final adapter = FakeHttpAdapter(
+      (_) async => FakeHttpResponse(
+        jsonEncode({'code': 0, 'message': 'ok', 'data': null}),
+      ),
+    );
+    final auth = AuthController(
+      AuthApi(ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter)),
+      AuthSessionStore(),
+    );
+    await _pumpHost(tester, auth);
+    await tester.tap(find.byKey(const Key('open-phone-sheet')));
+    await tester.pumpAndSettle();
+
+    await tester.enterText(find.byKey(const Key('auth-phone-number')), '12');
+    await tester.tap(find.byKey(const Key('auth-send-code')));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Enter a valid phone number'), findsOneWidget);
+    expect(adapter.requests, isEmpty);
+  });
+}
+
+Future<void> _pumpHost(WidgetTester tester, AuthController auth) {
+  return tester.pumpWidget(
+    MultiProvider(
+      providers: [
+        ChangeNotifierProvider<AuthController>.value(value: auth),
+        Provider<Haptics>.value(value: FakeHaptics()),
+      ],
+      child: MaterialApp(
+        locale: const Locale('en'),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Builder(
+          builder: (context) => Scaffold(
+            body: Center(
+              child: TextButton(
+                key: const Key('open-phone-sheet'),
+                onPressed: () => showPhoneAuthSheet(context),
+                child: const Text('Open'),
+              ),
+            ),
+          ),
+        ),
+      ),
+    ),
+  );
+}
diff --git a/test/catalog/catalog_controller_test.dart b/test/catalog/catalog_controller_test.dart
index d5fbf83..1654c61 100644
--- a/test/catalog/catalog_controller_test.dart
+++ b/test/catalog/catalog_controller_test.dart
@@ -1,61 +1,102 @@
 // Author: fruit.com.cn
 
+import 'dart:async';
+
 import 'package:flutter_test/flutter_test.dart';
 import 'package:fruitshorts/core/data/models/drama.dart';
 import 'package:fruitshorts/core/data/models/home_feed.dart';
 import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
 import 'package:fruitshorts/core/data/services/catalog_controller.dart';
+import 'package:fruitshorts/core/config/app_config.dart';
 
 void main() {
-  test('should_distinguish_empty_catalog_from_load_failure_when_retry_succeeds', () async {
+  setUp(() {
+    AppConfig.clearRuntimeBaseUrl();
+    AppConfig.ready = Future<void>.value();
+  });
+
+  tearDown(() {
+    AppConfig.clearRuntimeBaseUrl();
+    AppConfig.ready = Future<void>.value();
+  });
+
+  test(
+    'should_distinguish_empty_catalog_from_load_failure_when_retry_succeeds',
+    () async {
+      final repository = ScriptedCatalogRepository();
+      final controller = CatalogController(repository);
+
+      expect(controller.settled, isFalse);
+      await controller.load();
+      expect(controller.settled, isTrue);
+      expect(controller.dramas, isEmpty);
+      expect(controller.error, isNull);
+
+      repository.fail = true;
+      await controller.load();
+      expect(controller.error, isNotNull);
+
+      repository.fail = false;
+      repository.feed = HomeFeed(
+        sections: [
+          FeedSection(code: 'hot', title: '热门推荐', dramas: [_card('1')]),
+        ],
+      );
+      await controller.load();
+      expect(controller.error, isNull);
+      expect(controller.dramas, hasLength(1));
+      expect(controller.sections.single.title, '热门推荐');
+    },
+  );
+
+  test(
+    'should_request_drama_detail_once_when_it_is_loaded_on_demand',
+    () async {
+      final repository = ScriptedCatalogRepository();
+      final controller = CatalogController(repository);
+      repository.feed = HomeFeed(
+        sections: [
+          FeedSection(code: 'hot', title: '热门推荐', dramas: [_card('1')]),
+        ],
+      );
+      await controller.load();
+
+      final card = controller.dramas.single;
+      expect(card.episodes, isEmpty);
+
+      final detail = await controller.requireDetail(card);
+      expect(detail.episodes, hasLength(2));
+      expect(repository.detailCalls, 1);
+
+      // 第二次已经是详情，直接复用，不再请求
+      await controller.requireDetail(detail);
+      expect(repository.detailCalls, 1);
+      expect(controller.dramas.single.episodes, hasLength(2));
+    },
+  );
+
+  test('should_wait_for_ready_and_use_final_endpoint_before_loading', () async {
+    const finalBaseUrl = 'http://final.test:8081';
+    final ready = Completer<void>();
+    AppConfig.ready = ready.future;
     final repository = ScriptedCatalogRepository();
     final controller = CatalogController(repository);
 
-    expect(controller.settled, isFalse);
-    await controller.load();
+    final loading = controller.load();
+    await Future<void>.delayed(Duration.zero);
+
+    expect(controller.loading, isTrue);
+    expect(repository.homeCalls, 0);
+
+    AppConfig.applyRuntimeBaseUrl(finalBaseUrl);
+    ready.complete();
+    await loading;
+
+    expect(repository.homeCalls, 1);
+    expect(repository.requestBaseUrl, finalBaseUrl);
+    expect(controller.loading, isFalse);
     expect(controller.settled, isTrue);
-    expect(controller.dramas, isEmpty);
-    expect(controller.error, isNull);
-
-    repository.fail = true;
-    await controller.load();
-    expect(controller.error, isNotNull);
-
-    repository.fail = false;
-    repository.feed = HomeFeed(
-      sections: [
-        FeedSection(code: 'hot', title: '热门推荐', dramas: [_card('1')]),
-      ],
-    );
-    await controller.load();
-    expect(controller.error, isNull);
-    expect(controller.dramas, hasLength(1));
-    expect(controller.sections.single.title, '热门推荐');
   });
-
-  test('should_request_drama_detail_once_when_it_is_loaded_on_demand', () async {
-    final repository = ScriptedCatalogRepository();
-    final controller = CatalogController(repository);
-    repository.feed = HomeFeed(
-      sections: [
-        FeedSection(code: 'hot', title: '热门推荐', dramas: [_card('1')]),
-      ],
-    );
-    await controller.load();
-
-    final card = controller.dramas.single;
-    expect(card.episodes, isEmpty);
-
-    final detail = await controller.requireDetail(card);
-    expect(detail.episodes, hasLength(2));
-    expect(repository.detailCalls, 1);
-
-    // 第二次已经是详情，直接复用，不再请求
-    await controller.requireDetail(detail);
-    expect(repository.detailCalls, 1);
-    expect(controller.dramas.single.episodes, hasLength(2));
-  });
-
 }
 
 Drama _card(String id) => Drama(
@@ -81,9 +122,13 @@ class ScriptedCatalogRepository implements CatalogRepository {
   bool fail = false;
   HomeFeed feed = const HomeFeed();
   int detailCalls = 0;
+  int homeCalls = 0;
+  String? requestBaseUrl;
 
   @override
   Future<HomeFeed> fetchHomeFeed() async {
+    homeCalls++;
+    requestBaseUrl = AppConfig.apiBaseUrl;
     if (fail) throw StateError('offline');
     return feed;
   }
@@ -96,5 +141,4 @@ class ScriptedCatalogRepository implements CatalogRepository {
     detailCalls++;
     return _detail(dramaId);
   }
-
 }
diff --git a/test/catalog/drama_model_test.dart b/test/catalog/drama_model_test.dart
index 7b715cb..bb99b81 100644
--- a/test/catalog/drama_model_test.dart
+++ b/test/catalog/drama_model_test.dart
@@ -13,6 +13,7 @@ void main() {
       'totalEpisodes': 77,
       'isHot': true,
       'viewCount': 3100000,
+      'language': 'zh-CN',
       'preview': {
         'id': 9,
         'number': 1,
@@ -27,6 +28,7 @@ void main() {
     expect(drama.episodes.single.videoUrl, '/files/episode/9.mp4');
     expect(drama.episodeCount, 77);
     expect(drama.isHot, isTrue);
+    expect(drama.language, 'zh-CN');
   });
 
   test('should_have_no_episodes_when_list_card_has_no_playable_preview', () {
diff --git a/test/catalog/search_api_test.dart b/test/catalog/search_api_test.dart
new file mode 100644
index 0000000..e9ff252
--- /dev/null
+++ b/test/catalog/search_api_test.dart
@@ -0,0 +1,54 @@
+// Author: fruit.com.cn
+
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/remote/api_client.dart';
+import 'package:fruitshorts/core/data/remote/catalog_api.dart';
+
+import '../support/fake_http_adapter.dart';
+
+void main() {
+  test(
+    'should_request_search_with_keyword_and_paging_when_searching',
+    () async {
+      final adapter = FakeHttpAdapter(
+        (options) async => FakeHttpResponse(
+          jsonEncode({
+            'code': 0,
+            'message': 'ok',
+            'data': {
+              'total': 1,
+              'list': [
+                {
+                  'id': '2111012753262120962',
+                  'title': 'Velvet Nights',
+                  'synopsis': 'A city romance',
+                  'cover': '/files/velvet.png',
+                  'genre': 'Romance',
+                  'totalEpisodes': 12,
+                  'isHot': true,
+                  'language': 'id',
+                },
+              ],
+            },
+          }),
+        ),
+      );
+      final api = CatalogApi(
+        ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter),
+      );
+
+      final page = await api.search('velvet');
+
+      final request = adapter.requests.single;
+      expect(request.uri.path, '/app/search');
+      expect(request.queryParameters['keyword'], 'velvet');
+      expect(request.queryParameters['pageIndex'], '1');
+      expect(request.queryParameters['pageSize'], '20');
+      expect(page.total, 1);
+      expect(page.list.single.title, 'Velvet Nights');
+      expect(page.list.single.language, 'id');
+    },
+  );
+}
diff --git a/test/category/category_controller_test.dart b/test/category/category_controller_test.dart
index 6ade3eb..b67a7eb 100644
--- a/test/category/category_controller_test.dart
+++ b/test/category/category_controller_test.dart
@@ -49,44 +49,34 @@ void main() {
     },
   );
 
-  test(
-    'should_map_category_id_to_discover_section_when_category_is_selected',
-    () async {
-      final repository = ScriptedCategoryRepository(
-        categories: const [
-          ContentCategory(id: '7', name: 'Romance'),
-          ContentCategory(id: '8', name: 'Action'),
+  test('should_return_category_dramas_when_category_id_exists', () async {
+    final repository = ScriptedCategoryRepository(
+      categories: const [
+        ContentCategory(id: '7', name: 'Romance'),
+        ContentCategory(id: '8', name: 'Action'),
+      ],
+      feed: HomeFeed(
+        sections: [
+          FeedSection(code: 'hot', title: 'Hot', dramas: [_drama('hot-1')]),
+          FeedSection(code: 'new', title: 'New', dramas: [_drama('new-1')]),
+          FeedSection(
+            code: 'category-7',
+            title: 'Romance',
+            dramas: [_drama('romance-1')],
+          ),
         ],
-        feed: HomeFeed(
-          sections: [
-            FeedSection(code: 'hot', title: 'Hot', dramas: [_drama('hot-1')]),
-            FeedSection(code: 'new', title: 'New', dramas: [_drama('new-1')]),
-            FeedSection(
-              code: 'category-7',
-              title: 'Romance',
-              dramas: [_drama('romance-1')],
-            ),
-          ],
-        ),
-      );
-      final controller = CategoryController(repository);
+      ),
+    );
+    final controller = CategoryController(repository);
 
-      await controller.load();
-      controller.selectCategory('7');
+    await controller.load();
 
-      expect(controller.selectedCode, 'category-7');
-      expect(controller.visibleDramas.map((drama) => drama.id), ['romance-1']);
-      expect(controller.selectedSectionMissing, isFalse);
-
-      controller.selectCategory('8');
-      expect(controller.selectedCode, 'category-8');
-      expect(controller.visibleDramas, isEmpty);
-      expect(controller.selectedSectionMissing, isTrue);
-    },
-  );
+    expect(controller.dramasOf('7').map((drama) => drama.id), ['romance-1']);
+    expect(controller.dramasOf('8'), isEmpty);
+  });
 
   test(
-    'should_keep_hot_and_new_entries_when_discover_feed_provides_them',
+    'should_keep_hot_and_new_sections_when_discover_feed_provides_them',
     () async {
       final repository = ScriptedCategoryRepository(
         feed: HomeFeed(
@@ -104,15 +94,12 @@ void main() {
       final controller = CategoryController(repository);
 
       await controller.load();
-      controller.selectCode(CategoryController.hotCode);
-      expect(controller.visibleDramas.map((drama) => drama.id), ['hot-1']);
-
-      controller.selectCode(CategoryController.newCode);
-      expect(controller.visibleDramas.map((drama) => drama.id), ['new-1']);
+      expect(controller.feed.sections.first.code, 'hot');
+      expect(controller.feed.sections[1].dramas.single.id, 'new-1');
     },
   );
 
-  test('should_dedupe_dramas_when_all_categories_are_selected', () async {
+  test('should_dedupe_dramas_when_feed_sections_overlap', () async {
     final repository = ScriptedCategoryRepository(
       feed: HomeFeed(
         sections: [
@@ -129,11 +116,7 @@ void main() {
 
     await controller.load();
 
-    expect(controller.selectedCode, CategoryController.allCode);
-    expect(controller.visibleDramas.map((drama) => drama.id), [
-      'same',
-      'other',
-    ]);
+    expect(controller.feed.dramas.map((drama) => drama.id), ['same', 'other']);
   });
 
   test('should_clear_error_and_retry_when_initial_load_fails', () async {
diff --git a/test/comment/comment_controller_test.dart b/test/comment/comment_controller_test.dart
index b47f97f..30b0868 100644
--- a/test/comment/comment_controller_test.dart
+++ b/test/comment/comment_controller_test.dart
@@ -42,6 +42,27 @@ void main() {
     model.dispose();
   });
 
+  test('should_expose_exact_count_only_when_last_page_is_loaded', () async {
+    final repository = FakeCommentRepository(
+      pages: [
+        CommentPage(
+          comments: [commentFixture(id: '2')],
+          nextCursor: '2',
+          hasMore: true,
+        ),
+        CommentPage(comments: [commentFixture(id: '1')]),
+      ],
+    );
+    final model = controller(repository);
+
+    await model.load();
+    expect(model.exactCount, isNull);
+
+    await model.loadMore();
+    expect(model.exactCount, 2);
+    model.dispose();
+  });
+
   test('should_use_server_content_and_pending_status_when_review_is_returned', () async {
     final repository = FakeCommentRepository(
       publishResult: commentFixture(
diff --git a/test/comment/drama_comments_sheet_test.dart b/test/comment/drama_comments_sheet_test.dart
index 4c5d436..9e8cff8 100644
--- a/test/comment/drama_comments_sheet_test.dart
+++ b/test/comment/drama_comments_sheet_test.dart
@@ -1,5 +1,7 @@
 // Author: fruit.com.cn
 
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:fruitshorts/core/data/models/comment.dart';
@@ -41,6 +43,71 @@ void main() {
         });
   });
 
+  testWidgets('should_gate_guest_comment_input_without_focus', (tester) async {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+    final repository = FakeCommentRepository(pages: [const CommentPage()]);
+
+    await _pumpSheet(tester, repository: repository);
+    final input = find.byKey(const Key('comment-input'));
+    final field = tester.widget<TextField>(input);
+
+    expect(field.decoration?.hintText, 'Sign in to comment');
+    expect(field.focusNode?.hasFocus, isFalse);
+    await tester.tap(input);
+    await tester.pumpAndSettle();
+
+    expect(find.text('Sign in to continue'), findsOneWidget);
+    expect(tester.widget<TextField>(input).focusNode?.hasFocus, isFalse);
+    await tester.tap(find.text('Not now'));
+    await tester.pumpAndSettle();
+    expect(tester.widget<TextField>(input).focusNode?.hasFocus, isFalse);
+  });
+
+  testWidgets('should_focus_comment_input_after_successful_login', (
+    tester,
+  ) async {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+    final repository = FakeCommentRepository(pages: [const CommentPage()]);
+    final auth = await _pumpSheet(tester, repository: repository);
+
+    await tester.tap(find.byKey(const Key('comment-input')));
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 300));
+    await tester.tap(find.text('Sign In'));
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 300));
+    (auth as _TestAuthController).setSignedIn(true);
+    await tester.pump();
+    Navigator.of(tester.element(find.byKey(const Key('auth-landing')))).pop();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 300));
+
+    expect(
+      tester
+          .widget<TextField>(find.byKey(const Key('comment-input')))
+          .focusNode
+          ?.hasFocus,
+      isTrue,
+    );
+  });
+
+  testWidgets('should_gate_guest_post_without_creating_comment', (
+    tester,
+  ) async {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+    final repository = FakeCommentRepository(pages: [const CommentPage()]);
+
+    await _pumpSheet(tester, repository: repository);
+    await tester.tap(find.byKey(const Key('comment-post')));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Sign in to continue'), findsOneWidget);
+    expect(repository.publishCalls, isEmpty);
+  });
+
   testWidgets('should_show_server_comments_and_append_next_cursor_page', (
     tester,
   ) async {
@@ -62,11 +129,13 @@ void main() {
     await _pumpSheet(tester, repository: repository);
     expect(find.text('Great episode'), findsOneWidget);
     expect(find.byKey(const Key('comment-list-load-more')), findsOneWidget);
+    expect(find.byKey(const Key('comment-count-label')), findsNothing);
 
     await tester.tap(find.byKey(const Key('comment-list-load-more')));
     await tester.pumpAndSettle();
 
     expect(find.text('Second page'), findsOneWidget);
+    expect(find.text('2 comments'), findsOneWidget);
     expect(repository.pageCalls.last.cursor, '10');
   });
 
@@ -104,9 +173,68 @@ void main() {
         find.byKey(const Key('comment-input')),
       );
       expect(field.controller?.text, 'blocked text');
+      // 发送失败时保留输入与焦点，用户可以直接改完再发。
+      expect(field.focusNode?.hasFocus, isTrue);
     },
   );
 
+  testWidgets('should_unfocus_input_after_successful_post', (tester) async {
+    final repository = FakeCommentRepository(
+      pages: [const CommentPage()],
+      publishResult: commentFixture(id: '11', content: 'Nice demo', mine: true),
+    );
+
+    await _pumpSheet(tester, repository: repository);
+    final input = find.byKey(const Key('comment-input'));
+    await tester.tap(input);
+    await tester.pump();
+    expect(tester.widget<TextField>(input).focusNode?.hasFocus, isTrue);
+    await tester.enterText(input, 'Nice demo');
+    await tester.tap(find.byKey(const Key('comment-post')));
+    await tester.pumpAndSettle();
+
+    expect(tester.widget<TextField>(input).focusNode?.hasFocus, isFalse);
+  });
+
+  testWidgets('should_use_polished_comment_sizes', (tester) async {
+    final repository = FakeCommentRepository(
+      pages: [
+        CommentPage(
+          comments: [commentFixture(id: '10', content: 'Great episode')],
+        ),
+      ],
+    );
+
+    await _pumpSheet(tester, repository: repository);
+
+    expect(
+      tester.getSize(find.byKey(const Key('comment-post'))),
+      const Size(40, 40),
+    );
+    expect(tester.getSize(find.byKey(const Key('comment-input'))).height, 52);
+    expect(
+      find.byKey(const Key('player-comments-drag-handle')),
+      findsOneWidget,
+    );
+    final avatar = tester.widget<CircleAvatar>(
+      find.descendant(
+        of: find.byKey(const Key('comment-item-10')),
+        matching: find.byType(CircleAvatar),
+      ),
+    );
+    expect(avatar.radius, 16);
+    final body = tester.widget<Text>(find.text('Great episode'));
+    expect(body.style?.fontSize, 14);
+    expect(body.style?.height, 1.4);
+    expect(
+      tester
+          .widget<TextField>(find.byKey(const Key('comment-input')))
+          .decoration
+          ?.fillColor,
+      AppColors.commentInput,
+    );
+  });
+
   testWidgets('should_show_review_badge_and_server_replaced_content', (
     tester,
   ) async {
@@ -331,7 +459,7 @@ void main() {
   });
 }
 
-Future<void> _pumpSheet(
+Future<AuthController> _pumpSheet(
   WidgetTester tester, {
   required FakeCommentRepository repository,
   FakeInteractionRepository? interactions,
@@ -360,16 +488,51 @@ Future<void> _pumpSheet(
     ),
   );
   await tester.pumpAndSettle();
+  return auth;
 }
 
 Future<AuthController> _auth() async {
   final client = ApiClient(
     baseUrl: 'http://127.0.0.1:8081',
-    adapter: FakeHttpAdapter(
-      (_) async => FakeHttpResponse('{"code":0,"message":"ok","data":null}'),
-    ),
+    adapter: FakeHttpAdapter((options) async {
+      if (options.uri.path == '/app/auth/login') {
+        return FakeHttpResponse(
+          jsonEncode({
+            'code': 0,
+            'message': 'ok',
+            'data': {
+              'accessToken': 'access',
+              'refreshToken': 'refresh',
+              'expiresIn': 7200,
+              'user': {'uid': '9', 'nickname': 'Viewer', 'avatarUrl': ''},
+            },
+          }),
+        );
+      }
+      return FakeHttpResponse('{"code":0,"message":"ok","data":null}');
+    }),
+  );
+  final store = AuthSessionStore();
+  final session = await store.read();
+  final auth = _TestAuthController(
+    AuthApi(client),
+    store,
+    signedIn: session != null,
   );
-  final auth = AuthController(AuthApi(client), AuthSessionStore());
   await auth.load();
   return auth;
 }
+
+class _TestAuthController extends AuthController {
+  _TestAuthController(super.api, super.store, {required this._signedIn});
+
+  bool _signedIn;
+
+  @override
+  bool get isSignedIn => _signedIn;
+
+  void setSignedIn(bool value) {
+    _signedIn = value;
+    notifyListeners();
+  }
+}
diff --git a/test/commerce/commerce_api_test.dart b/test/commerce/commerce_api_test.dart
new file mode 100644
index 0000000..02f4a02
--- /dev/null
+++ b/test/commerce/commerce_api_test.dart
@@ -0,0 +1,81 @@
+// Author: fruit.com.cn
+
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/remote/api_client.dart';
+import 'package:fruitshorts/core/data/remote/commerce_api.dart';
+
+import '../support/fake_http_adapter.dart';
+
+void main() {
+  test('should_parse_wallet_and_ledger_when_server_returns_string_ids', () async {
+    final adapter = FakeHttpAdapter(
+      (options) async => FakeHttpResponse(
+        jsonEncode({
+          'code': 0,
+          'message': 'ok',
+          'data': {
+            'wallet': {
+              'id': '2111012753262120962',
+              'coinBalance': '320',
+              'totalRechargedCoin': '500',
+              'totalConsumedCoin': '180',
+              'totalRefundedCoin': '0',
+            },
+            'ledger': [
+              {
+                'id': '2111012753262120963',
+                'changeAmount': '-50',
+                'balanceAfter': '320',
+                'bizType': 'UNLOCK',
+                'remark': '解锁第 3 集',
+                'createdAt': '2026-10-19 10:00:00',
+              },
+            ],
+          },
+        }),
+      ),
+    );
+    final api = CommerceApi(
+      ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter),
+    );
+
+    final snapshot = await api.wallet();
+
+    expect(adapter.requests.single.uri.path, '/app/wallet');
+    expect(snapshot.wallet.coinBalance, 320);
+    expect(snapshot.ledger.single.id, '2111012753262120963');
+    expect(snapshot.ledger.single.changeAmount, -50);
+  });
+
+  test('should_post_unlock_for_episode_when_requested', () async {
+    final adapter = FakeHttpAdapter(
+      (options) async => FakeHttpResponse(
+        jsonEncode({
+          'code': 0,
+          'message': 'ok',
+          'data': {
+            'episodeId': '12',
+            'dramaId': '5',
+            'unlocked': true,
+            'accessType': 'UNLOCKED',
+            'coinCost': '50',
+            'coinBalance': '270',
+          },
+        }),
+      ),
+    );
+    final api = CommerceApi(
+      ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter),
+    );
+
+    final result = await api.unlock('12');
+
+    expect(adapter.requests.single.method, 'POST');
+    expect(adapter.requests.single.uri.path, '/app/episodes/12/unlock');
+    expect(result.unlocked, isTrue);
+    expect(result.coinCost, 50);
+    expect(result.coinBalance, 270);
+  });
+}
diff --git a/test/commerce/store_api_test.dart b/test/commerce/store_api_test.dart
new file mode 100644
index 0000000..7e623c6
--- /dev/null
+++ b/test/commerce/store_api_test.dart
@@ -0,0 +1,87 @@
+// Author: fruit.com.cn
+
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/remote/api_client.dart';
+import 'package:fruitshorts/core/data/remote/commerce_api.dart';
+
+import '../support/fake_http_adapter.dart';
+
+void main() {
+  test('should_request_coin_packs_when_type_is_given', () async {
+    final adapter = FakeHttpAdapter(
+      (options) async => FakeHttpResponse(
+        jsonEncode({
+          'code': 0,
+          'message': 'ok',
+          'data': [
+            {
+              'id': '2111012753262120962',
+              'code': 'coin_550',
+              'name': '550 Coins',
+              'type': 'COIN_PACK',
+              'coinAmount': '500',
+              'bonusCoin': '50',
+              'totalCoin': '550',
+              'displayPrice': 'Rp 15.000',
+              'currency': 'IDR',
+              'vipDays': 0,
+            },
+          ],
+        }),
+      ),
+    );
+    final api = CommerceApi(
+      ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter),
+    );
+
+    final products = await api.products(type: 'COIN_PACK');
+
+    final request = adapter.requests.single;
+    expect(request.method, 'GET');
+    expect(request.uri.path, '/app/products');
+    expect(request.queryParameters['type'], 'COIN_PACK');
+    expect(products.single.id, '2111012753262120962');
+    expect(products.single.coinAmount, 500);
+    expect(products.single.bonusCoin, 50);
+    expect(products.single.displayPrice, 'Rp 15.000');
+  });
+
+  test('should_post_product_id_when_creating_an_order', () async {
+    final adapter = FakeHttpAdapter(
+      (options) async => FakeHttpResponse(
+        jsonEncode({
+          'code': 0,
+          'message': 'ok',
+          'data': {
+            'id': '2111012753262120999',
+            'orderNo': 'ORD20261020001',
+            'productId': '2111012753262120962',
+            'productName': '550 Coins',
+            'type': 'COIN_PACK',
+            'coinAmount': '550',
+            'status': 'CREATED',
+            'createdAt': '2026-10-20 10:00:00',
+          },
+        }),
+      ),
+    );
+    final api = CommerceApi(
+      ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter),
+    );
+
+    final order = await api.createOrder('2111012753262120962');
+
+    final request = adapter.requests.single;
+    expect(request.method, 'POST');
+    expect(request.uri.path, '/app/orders');
+    final body = request.data is String
+        ? jsonDecode(request.data as String)
+        : request.data;
+    expect(body, {'productId': '2111012753262120962'});
+    expect(order.orderNo, 'ORD20261020001');
+    expect(order.coinAmount, 550);
+    expect(order.status, 'CREATED');
+  });
+}
diff --git a/test/commerce/store_controller_test.dart b/test/commerce/store_controller_test.dart
new file mode 100644
index 0000000..726fb9d
--- /dev/null
+++ b/test/commerce/store_controller_test.dart
@@ -0,0 +1,104 @@
+// Author: fruit.com.cn
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/order.dart';
+import 'package:fruitshorts/core/data/models/product.dart';
+import 'package:fruitshorts/core/data/remote/api_exception.dart';
+import 'package:fruitshorts/core/data/repositories/store_repository.dart';
+import 'package:fruitshorts/core/data/services/store_controller.dart';
+
+void main() {
+  test('should_expose_coin_packs_when_store_loads', () async {
+    final repository = _FakeStoreRepository(
+      products: [_product('550 Coins', coinAmount: 500, bonusCoin: 50)],
+    );
+    final controller = StoreController(
+      repository,
+      type: StoreController.coinPackType,
+    );
+
+    await controller.load();
+
+    expect(repository.requestedTypes, [StoreController.coinPackType]);
+    expect(controller.products.single.name, '550 Coins');
+    expect(controller.error, isNull);
+  });
+
+  test('should_create_order_and_keep_purchase_when_buying', () async {
+    final repository = _FakeStoreRepository(
+      products: [_product('550 Coins')],
+      order: const AppOrder(
+        id: '99',
+        orderNo: 'ORD1',
+        productName: '550 Coins',
+        coinAmount: 550,
+        status: 'CREATED',
+      ),
+    );
+    final controller = StoreController(
+      repository,
+      type: StoreController.coinPackType,
+    );
+    await controller.load();
+
+    final order = await controller.buy(controller.products.single);
+
+    expect(repository.orderedProductIds, ['2111012753262120962']);
+    expect(order?.orderNo, 'ORD1');
+    expect(controller.purchaseError, isNull);
+    expect(controller.purchasingProductId, isNull);
+  });
+
+  test('should_expose_server_message_when_order_is_rejected', () async {
+    final repository = _FakeStoreRepository(
+      products: [_product('550 Coins')],
+      orderError: const ApiException(400, 'Product is offline'),
+    );
+    final controller = StoreController(
+      repository,
+      type: StoreController.coinPackType,
+    );
+    await controller.load();
+
+    final order = await controller.buy(controller.products.single);
+
+    expect(order, isNull);
+    expect(controller.purchaseError, 'Product is offline');
+  });
+}
+
+AppProduct _product(String name, {int coinAmount = 550, int bonusCoin = 0}) =>
+    AppProduct(
+      id: '2111012753262120962',
+      code: 'coin_550',
+      name: name,
+      type: StoreController.coinPackType,
+      coinAmount: coinAmount,
+      bonusCoin: bonusCoin,
+      totalCoin: coinAmount + bonusCoin,
+      displayPrice: 'Rp 15.000',
+      vipDays: 0,
+    );
+
+class _FakeStoreRepository implements StoreRepository {
+  _FakeStoreRepository({this.products = const [], this.order, this.orderError});
+
+  final List<AppProduct> products;
+  final AppOrder? order;
+  final ApiException? orderError;
+  final List<String?> requestedTypes = [];
+  final List<String> orderedProductIds = [];
+
+  @override
+  Future<List<AppProduct>> fetchProducts({String? type}) async {
+    requestedTypes.add(type);
+    return products;
+  }
+
+  @override
+  Future<AppOrder> createOrder(String productId) async {
+    orderedProductIds.add(productId);
+    if (orderError != null) throw orderError!;
+    return order!;
+  }
+}
diff --git a/test/commerce/wallet_controller_test.dart b/test/commerce/wallet_controller_test.dart
new file mode 100644
index 0000000..f1939dd
--- /dev/null
+++ b/test/commerce/wallet_controller_test.dart
@@ -0,0 +1,100 @@
+// Author: fruit.com.cn
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/wallet.dart';
+import 'package:fruitshorts/core/data/remote/api_exception.dart';
+import 'package:fruitshorts/core/data/repositories/commerce_repository.dart';
+import 'package:fruitshorts/core/data/services/wallet_controller.dart';
+
+void main() {
+  test('should_expose_server_balance_when_wallet_loads', () async {
+    final controller = WalletController(
+      FakeCommerceRepository(snapshot: _snapshot(balance: 320)),
+    );
+
+    await controller.load();
+
+    expect(controller.balance, 320);
+    expect(controller.ledger.single.changeAmount, -50);
+    expect(controller.error, isNull);
+  });
+
+  test('should_update_balance_and_clear_error_when_unlock_succeeds', () async {
+    final repository = FakeCommerceRepository(
+      snapshot: _snapshot(balance: 320),
+      unlockResult: const UnlockResult(
+        unlocked: true,
+        accessType: 'UNLOCKED',
+        coinCost: 50,
+        coinBalance: 270,
+      ),
+    );
+    final controller = WalletController(repository);
+    await controller.load();
+
+    final result = await controller.unlock('episode-9');
+
+    expect(result?.unlocked, isTrue);
+    expect(controller.balance, 270);
+    expect(controller.unlocking, isFalse);
+    expect(controller.unlockError, isNull);
+  });
+
+  test('should_keep_balance_and_expose_message_when_unlock_is_rejected', () async {
+    final controller = WalletController(
+      FakeCommerceRepository(
+        snapshot: _snapshot(balance: 20),
+        unlockError: const ApiException(100002, '金币余额不足'),
+      ),
+    );
+    await controller.load();
+
+    final result = await controller.unlock('episode-9');
+
+    expect(result, isNull);
+    expect(controller.balance, 20);
+    expect(controller.unlockError, '金币余额不足');
+  });
+}
+
+WalletSnapshot _snapshot({required int balance}) => WalletSnapshot(
+  wallet: CoinWallet(
+    coinBalance: balance,
+    totalRechargedCoin: 500,
+    totalConsumedCoin: 180,
+    totalRefundedCoin: 0,
+  ),
+  ledger: [
+    CoinLedgerEntry(
+      id: '1',
+      changeAmount: -50,
+      balanceAfter: balance,
+      bizType: 'UNLOCK',
+      remark: '解锁第 3 集',
+      createdAt: DateTime(2026, 10, 19),
+    ),
+  ],
+);
+
+class FakeCommerceRepository implements CommerceRepository {
+  FakeCommerceRepository({
+    required this.snapshot,
+    this.unlockResult,
+    this.unlockError,
+  });
+
+  final WalletSnapshot snapshot;
+  final UnlockResult? unlockResult;
+  final ApiException? unlockError;
+  final List<String> unlockedEpisodes = [];
+
+  @override
+  Future<WalletSnapshot> fetchWallet() async => snapshot;
+
+  @override
+  Future<UnlockResult> unlock(String episodeId) async {
+    unlockedEpisodes.add(episodeId);
+    if (unlockError != null) throw unlockError!;
+    return unlockResult!;
+  }
+}
diff --git a/test/config/app_locale_test.dart b/test/config/app_locale_test.dart
new file mode 100644
index 0000000..a73bfb2
--- /dev/null
+++ b/test/config/app_locale_test.dart
@@ -0,0 +1,19 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/config/app_locale.dart';
+
+void main() {
+  test('should_resolve_supported_device_languages', () {
+    expect(resolveAppLocale(const Locale('en')), const Locale('en'));
+    expect(resolveAppLocale(const Locale('zh')), const Locale('zh'));
+    expect(resolveAppLocale(const Locale('id')), const Locale('id'));
+    expect(resolveAppLocale(const Locale('in')), const Locale('id'));
+  });
+
+  test('should_fallback_to_indonesian_when_device_language_is_unsupported', () {
+    expect(resolveAppLocale(const Locale('fr')), const Locale('id'));
+    expect(resolveAppLocale(null), const Locale('id'));
+  });
+}
diff --git a/test/config/locale_controller_test.dart b/test/config/locale_controller_test.dart
deleted file mode 100644
index 077b54c..0000000
--- a/test/config/locale_controller_test.dart
+++ /dev/null
@@ -1,122 +0,0 @@
-import 'package:flutter/widgets.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:fruitshorts/core/config/locale_controller.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
-import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
-
-void main() {
-  setUp(() {
-    SharedPreferencesAsyncPlatform.instance =
-        InMemorySharedPreferencesAsync.empty();
-  });
-
-  test('should_keep_device_locale_when_no_choice_is_stored', () async {
-    final controller = LocaleController();
-    var notifications = 0;
-    controller.addListener(() => notifications++);
-
-    await controller.load();
-
-    expect(controller.locale, isNull);
-    expect(notifications, 1);
-  });
-
-  test('should_restore_chosen_language_when_app_restarts', () async {
-    final first = LocaleController();
-    await first.select('zh');
-    expect(first.locale, const Locale('zh'));
-
-    final reopened = LocaleController();
-    await reopened.load();
-    expect(reopened.locale, const Locale('zh'));
-  });
-
-  test('should_restore_indonesian_when_selected_and_app_restarts', () async {
-    final first = LocaleController();
-    await first.select('id');
-    expect(first.locale, const Locale('id'));
-
-    final reopened = LocaleController();
-    await reopened.load();
-    expect(reopened.locale, const Locale('id'));
-  });
-
-  test('should_fallback_to_indonesian_when_system_language_is_unsupported', () {
-    expect(resolveAppLocale(null, const Locale('en')), const Locale('en'));
-    expect(resolveAppLocale(null, const Locale('id')), const Locale('id'));
-    expect(resolveAppLocale(null, const Locale('fr')), const Locale('id'));
-    expect(resolveAppLocale(null, const Locale('in')), const Locale('id'));
-    expect(
-      resolveAppLocale(const Locale('zh'), const Locale('fr')),
-      const Locale('zh'),
-    );
-  });
-
-  test(
-    'should_clear_stored_chinese_preference_when_english_is_selected',
-    () async {
-      await LocaleController().select('zh');
-
-      final reopened = LocaleController();
-      await reopened.load();
-      await reopened.select('en');
-
-      final third = LocaleController();
-      await third.load();
-      expect(third.locale, const Locale('en'));
-    },
-  );
-
-  test('should_clear_locale_when_code_is_unsupported', () async {
-    final controller = LocaleController();
-    await controller.select('zh');
-    expect(controller.locale, const Locale('zh'));
-
-    await controller.select('tlh');
-
-    expect(controller.locale, isNull);
-  });
-
-  test(
-    'should_resolve_to_device_locale_when_stored_code_is_unsupported',
-    () async {
-      await SharedPreferencesAsync().setString('ui.locale', 'fr');
-
-      final controller = LocaleController();
-      await controller.load();
-
-      expect(controller.locale, isNull);
-    },
-  );
-
-  test(
-    'should_survive_load_and_select_when_preference_store_is_broken',
-    () async {
-      SharedPreferencesAsyncPlatform.instance = _BrokenPreferences();
-      final controller = LocaleController();
-
-      await controller.load();
-      expect(controller.locale, isNull);
-
-      await controller.select('zh');
-      expect(controller.locale, const Locale('zh'));
-    },
-  );
-}
-
-/// Stands in for a platform whose preference store is unavailable.
-base class _BrokenPreferences extends InMemorySharedPreferencesAsync {
-  _BrokenPreferences() : super.empty();
-
-  @override
-  Future<String?> getString(String key, SharedPreferencesOptions options) =>
-      Future<String?>.error(StateError('preferences unavailable'));
-
-  @override
-  Future<bool> setString(
-    String key,
-    String value,
-    SharedPreferencesOptions options,
-  ) => Future<bool>.error(StateError('preferences unavailable'));
-}
diff --git a/test/config/server_endpoint_test.dart b/test/config/server_endpoint_test.dart
index 4774d95..2348717 100644
--- a/test/config/server_endpoint_test.dart
+++ b/test/config/server_endpoint_test.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter_test/flutter_test.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
@@ -11,9 +13,13 @@ void main() {
     SharedPreferencesAsyncPlatform.instance =
         InMemorySharedPreferencesAsync.empty();
     AppConfig.clearRuntimeBaseUrl();
+    AppConfig.ready = Future<void>.value();
   });
 
-  tearDown(AppConfig.clearRuntimeBaseUrl);
+  tearDown(() {
+    AppConfig.clearRuntimeBaseUrl();
+    AppConfig.ready = Future<void>.value();
+  });
 
   test('should_normalize_http_urls_and_reject_invalid_values', () {
     expect(
@@ -57,13 +63,159 @@ void main() {
   });
 
   test('should_use_the_configured_lan_address_for_device_default', () {
-    expect(AppConfig.devHostBaseUrl, 'http://39.162.50.99:8081');
+    expect(AppConfig.devHostBaseUrl, 'http://192.168.31.187:8081');
+  });
+
+  test('should_skip_probe_when_compiled_override_is_set', () async {
+    const compiled = 'http://compiled.test:8081';
+    var probeCalls = 0;
+
+    await AppConfig.probeAndApplyBaseUrl(
+      compiledOverride: compiled,
+      probe: (_) async {
+        probeCalls++;
+        return true;
+      },
+    );
+
+    expect(probeCalls, 0);
+    expect(AppConfig.apiBaseUrl, compiled);
+  });
+
+  test('should_keep_runtime_endpoint_when_compiled_override_is_set', () async {
+    const runtime = 'http://runtime.test:8081';
+    const compiled = 'http://compiled.test:8081';
+    var probeCalls = 0;
+    AppConfig.applyRuntimeBaseUrl(runtime);
+
+    await AppConfig.probeAndApplyBaseUrl(
+      compiledOverride: compiled,
+      probe: (_) async {
+        probeCalls++;
+        return true;
+      },
+    );
+
+    expect(probeCalls, 0);
+    expect(AppConfig.apiBaseUrl, runtime);
+  });
+
+  test('should_keep_probing_when_compiled_override_is_empty', () async {
+    final attempts = <String>[];
+
+    await AppConfig.probeAndApplyBaseUrl(
+      compiledOverride: '',
+      probe: (baseUrl) async {
+        attempts.add(baseUrl);
+        return baseUrl == AppConfig.publicBaseUrl;
+      },
+    );
+
+    expect(attempts, [
+      AppConfig.lanBaseUrl,
+      AppConfig.devHostBaseUrl,
+      AppConfig.publicBaseUrl,
+    ]);
+    expect(AppConfig.apiBaseUrl, AppConfig.publicBaseUrl);
+  });
+
+  test(
+    'should_probe_all_candidates_in_parallel_before_applying_priority',
+    () async {
+      final attempts = <String>[];
+      var active = 0;
+      var maxActive = 0;
+      final allStarted = Completer<void>();
+
+      final probing = AppConfig.probeAndApplyBaseUrl(
+        fallbackBaseUrl: AppConfig.devHostBaseUrl,
+        probe: (baseUrl) async {
+          attempts.add(baseUrl);
+          active++;
+          if (active > maxActive) maxActive = active;
+          if (active == 3) allStarted.complete();
+          await allStarted.future;
+          active--;
+          return baseUrl == AppConfig.lanBaseUrl ||
+              baseUrl == AppConfig.devHostBaseUrl;
+        },
+      );
+
+      await probing.timeout(const Duration(seconds: 1));
+
+      expect(attempts, [
+        AppConfig.lanBaseUrl,
+        AppConfig.devHostBaseUrl,
+        AppConfig.publicBaseUrl,
+      ]);
+      expect(maxActive, 3);
+      expect(AppConfig.apiBaseUrl, AppConfig.lanBaseUrl);
+    },
+  );
+
+  test('should_probe_loopback_dev_host_then_public_in_order', () async {
+    final attempts = <String>[];
+
+    await AppConfig.probeAndApplyBaseUrl(
+      fallbackBaseUrl: AppConfig.devHostBaseUrl,
+      probe: (baseUrl) async {
+        attempts.add(baseUrl);
+        return baseUrl == AppConfig.publicBaseUrl;
+      },
+    );
+
+    expect(attempts, [
+      AppConfig.lanBaseUrl,
+      AppConfig.devHostBaseUrl,
+      AppConfig.publicBaseUrl,
+    ]);
+    expect(AppConfig.apiBaseUrl, AppConfig.publicBaseUrl);
+  });
+
+  test('should_use_platform_default_when_all_probes_fail', () async {
+    final attempts = <String>[];
+
+    await AppConfig.probeAndApplyBaseUrl(
+      fallbackBaseUrl: AppConfig.devHostBaseUrl,
+      probe: (baseUrl) async {
+        attempts.add(baseUrl);
+        return false;
+      },
+    );
+
+    expect(attempts, [
+      AppConfig.lanBaseUrl,
+      AppConfig.devHostBaseUrl,
+      AppConfig.publicBaseUrl,
+    ]);
+    expect(AppConfig.apiBaseUrl, AppConfig.devHostBaseUrl);
+  });
+
+  test('should_probe_explicit_runtime_endpoint_first', () async {
+    const custom = 'http://custom.test:8081';
+    final attempts = <String>[];
+    AppConfig.applyRuntimeBaseUrl(custom);
+
+    await AppConfig.probeAndApplyBaseUrl(
+      probe: (baseUrl) async {
+        attempts.add(baseUrl);
+        return baseUrl == custom;
+      },
+    );
+
+    expect(attempts, [
+      custom,
+      AppConfig.lanBaseUrl,
+      AppConfig.devHostBaseUrl,
+      AppConfig.publicBaseUrl,
+    ]);
+    expect(AppConfig.apiBaseUrl, custom);
   });
 
   test('should_apply_stored_url_only_when_debug_is_enabled', () async {
     SharedPreferencesAsyncPlatform.instance =
         InMemorySharedPreferencesAsync.withData({
-          ServerEndpoint.preferenceKey: ' http://39.162.50.99:8081/ ',
+          ServerEndpoint.preferenceKey: ' http://192.168.31.187:8081/ ',
         });
     final original = AppConfig.apiBaseUrl;
 
@@ -71,7 +223,7 @@ void main() {
     expect(AppConfig.apiBaseUrl, original);
 
     await ServerEndpoint.load(debug: true);
-    expect(AppConfig.apiBaseUrl, 'http://39.162.50.99:8081');
+    expect(AppConfig.apiBaseUrl, 'http://192.168.31.187:8081');
   });
 
   test('should_save_normalized_url_and_clear_override', () async {
@@ -81,14 +233,12 @@ void main() {
       isNull,
     );
 
-    expect(
-      await ServerEndpoint.save(' http://39.162.50.99:8081/ '),
-      isTrue,
-    );
+    expect(await ServerEndpoint.save(' http://192.168.31.187:8081/ '), isTrue);
     expect(
       await SharedPreferencesAsync().getString(ServerEndpoint.preferenceKey),
-      'http://39.162.50.99:8081',
+      'http://192.168.31.187:8081',
     );
+    expect(AppConfig.apiBaseUrl, 'http://192.168.31.187:8081');
 
     await ServerEndpoint.clear();
     expect(
diff --git a/test/core/api_client_test.dart b/test/core/api_client_test.dart
index 2b69055..b8f12c1 100644
--- a/test/core/api_client_test.dart
+++ b/test/core/api_client_test.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
 
 import 'package:flutter_test/flutter_test.dart';
 
+import 'package:fruitshorts/core/config/app_config.dart';
 import 'package:fruitshorts/core/data/remote/api_client.dart';
 
 import '../support/fake_http_adapter.dart';
@@ -18,63 +19,87 @@ void main() {
     final adapter = FakeHttpAdapter(
       (_) async => FakeHttpResponse(envelope({'id': 7})),
     );
-    final client = ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter);
+    final client = ApiClient(
+      baseUrl: 'http://127.0.0.1:8081',
+      adapter: adapter,
+    );
 
     final data = await client.get('/app/dramas/7');
     expect((data as Map)['id'], 7);
   });
 
-  test('should_throw_api_exception_with_server_message_when_envelope_code_is_not_zero', () async {
+  test(
+    'should_throw_api_exception_with_server_message_when_envelope_code_is_not_zero',
+    () async {
+      final adapter = FakeHttpAdapter(
+        (_) async =>
+            FakeHttpResponse(envelope(null, code: 40001, message: '邮箱格式不正确')),
+      );
+      final client = ApiClient(
+        baseUrl: 'http://127.0.0.1:8081',
+        adapter: adapter,
+      );
+
+      await expectLater(
+        client.post('/app/auth/register', body: {'target': 'bad'}),
+        throwsA(
+          isA<ApiException>()
+              .having((e) => e.code, 'code', 40001)
+              .having((e) => e.message, 'message', '邮箱格式不正确'),
+        ),
+      );
+    },
+  );
+
+  test(
+    'should_map_to_api_exception_with_http_status_when_body_has_no_envelope',
+    () async {
+      final adapter = FakeHttpAdapter(
+        (_) async => FakeHttpResponse('oops', 502),
+      );
+      final client = ApiClient(
+        baseUrl: 'http://127.0.0.1:8081',
+        adapter: adapter,
+      );
+
+      await expectLater(
+        client.get('/app/home/feed'),
+        throwsA(isA<ApiException>().having((e) => e.code, 'code', 502)),
+      );
+    },
+  );
+
+  test(
+    'should_send_bearer_token_and_device_header_when_both_are_available',
+    () async {
+      final adapter = FakeHttpAdapter(
+        (_) async => FakeHttpResponse(envelope(null)),
+      );
+      final client = ApiClient(
+        baseUrl: 'http://127.0.0.1:8081',
+        adapter: adapter,
+        accessTokenReader: () => 'token-1',
+        deviceIdReader: () async => 'device-9',
+      );
+
+      await client.get('/app/me');
+
+      final request = adapter.requests.single;
+      expect(request.headers['Authorization'], 'Bearer token-1');
+      expect(request.headers['X-Device-Id'], 'device-9');
+      expect(request.headers['Accept'], 'application/json');
+    },
+  );
+
+  test('should_put_query_map_into_request_uri_when_query_is_given', () async {
     final adapter = FakeHttpAdapter(
-      (_) async => FakeHttpResponse(
-        envelope(null, code: 40001, message: '邮箱格式不正确'),
-      ),
+      (_) async => FakeHttpResponse(envelope(null)),
     );
-    final client = ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter);
-
-    await expectLater(
-      client.post('/app/auth/register', body: {'target': 'bad'}),
-      throwsA(
-        isA<ApiException>()
-            .having((e) => e.code, 'code', 40001)
-            .having((e) => e.message, 'message', '邮箱格式不正确'),
-      ),
-    );
-  });
-
-  test('should_map_to_api_exception_with_http_status_when_body_has_no_envelope', () async {
-    final adapter = FakeHttpAdapter((_) async => FakeHttpResponse('oops', 502));
-    final client = ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter);
-
-    await expectLater(
-      client.get('/app/home/feed'),
-      throwsA(
-        isA<ApiException>().having((e) => e.code, 'code', 502),
-      ),
-    );
-  });
-
-  test('should_send_bearer_token_and_device_header_when_both_are_available', () async {
-    final adapter = FakeHttpAdapter((_) async => FakeHttpResponse(envelope(null)));
     final client = ApiClient(
       baseUrl: 'http://127.0.0.1:8081',
       adapter: adapter,
-      accessTokenReader: () => 'token-1',
-      deviceIdReader: () async => 'device-9',
     );
 
-    await client.get('/app/me');
-
-    final request = adapter.requests.single;
-    expect(request.headers['Authorization'], 'Bearer token-1');
-    expect(request.headers['X-Device-Id'], 'device-9');
-    expect(request.headers['Accept'], 'application/json');
-  });
-
-  test('should_put_query_map_into_request_uri_when_query_is_given', () async {
-    final adapter = FakeHttpAdapter((_) async => FakeHttpResponse(envelope(null)));
-    final client = ApiClient(baseUrl: 'http://127.0.0.1:8081', adapter: adapter);
-
     await client.get('/app/search', query: {'keyword': '短剧', 'page': '2'});
 
     final uri = adapter.requests.single.uri;
@@ -86,7 +111,8 @@ void main() {
   test('should_skip_refresh_when_call_opts_out_of_auth_retry', () async {
     var refreshed = false;
     final adapter = FakeHttpAdapter(
-      (_) async => FakeHttpResponse(envelope(null, code: 401, message: '登录已过期')),
+      (_) async =>
+          FakeHttpResponse(envelope(null, code: 401, message: '登录已过期')),
     );
     final client = ApiClient(
       baseUrl: 'http://127.0.0.1:8081',
@@ -98,10 +124,31 @@ void main() {
     );
 
     await expectLater(
-      client.post('/app/auth/refresh', body: {'refreshToken': 'r1'}, skipAuthRetry: true),
+      client.post(
+        '/app/auth/refresh',
+        body: {'refreshToken': 'r1'},
+        skipAuthRetry: true,
+      ),
       throwsA(isA<ApiException>().having((e) => e.code, 'code', 401)),
     );
     expect(refreshed, isFalse);
     expect(adapter.requests, hasLength(1));
   });
+
+  test(
+    'should_use_probed_endpoint_when_client_was_created_before_probe',
+    () async {
+      const probedBaseUrl = 'http://probed.test:8081';
+      final adapter = FakeHttpAdapter(
+        (_) async => FakeHttpResponse(envelope(null)),
+      );
+      final client = ApiClient(adapter: adapter);
+
+      AppConfig.applyRuntimeBaseUrl(probedBaseUrl);
+      addTearDown(AppConfig.clearRuntimeBaseUrl);
+      await client.get('/app/home/feed');
+
+      expect(adapter.requests.single.uri.origin, probedBaseUrl);
+    },
+  );
 }
diff --git a/test/core/app_pull_to_refresh_test.dart b/test/core/app_pull_to_refresh_test.dart
new file mode 100644
index 0000000..deb4df4
--- /dev/null
+++ b/test/core/app_pull_to_refresh_test.dart
@@ -0,0 +1,84 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/widgets/app_pull_to_refresh.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+
+void main() {
+  testWidgets(
+    'should_show_pull_release_and_refreshing_states_and_refresh_once',
+    (tester) async {
+      final refresh = Completer<void>();
+      var calls = 0;
+      await tester.pumpWidget(
+        MaterialApp(
+          locale: const Locale('en'),
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: AppPullToRefresh(
+              onRefresh: () {
+                calls++;
+                return refresh.future;
+              },
+              child: ListView(
+                key: const Key('pull-refresh-list'),
+                physics: AppPullToRefresh.physics,
+                children: const [SizedBox(height: 1200)],
+              ),
+            ),
+          ),
+        ),
+      );
+
+      final list = find.byKey(const Key('pull-refresh-list'));
+      final gesture = await tester.startGesture(tester.getCenter(list));
+      await gesture.moveBy(const Offset(0, 30));
+      await tester.pump();
+      final scrollable = tester.state<ScrollableState>(
+        find.descendant(of: list, matching: find.byType(Scrollable)).first,
+      );
+      expect(scrollable.position.pixels, lessThan(0));
+      expect(find.text('Pull to refresh'), findsOneWidget);
+      expect(
+        tester.widget<Text>(find.text('Pull to refresh')).style?.color,
+        AppColors.blue,
+      );
+
+      await gesture.moveBy(const Offset(0, 120));
+      await tester.pump();
+      expect(find.text('Release to refresh'), findsOneWidget);
+      expect(
+        tester.widget<Text>(find.text('Release to refresh')).style?.color,
+        AppColors.blue,
+      );
+
+      await gesture.up();
+      await tester.pump();
+      expect(find.text('Refreshing…'), findsOneWidget);
+      expect(
+        tester.widget<Text>(find.text('Refreshing…')).style?.color,
+        AppColors.blue,
+      );
+      expect(calls, 1);
+
+      final duplicate = await tester.startGesture(
+        tester.getCenter(find.byKey(const Key('pull-refresh-list'))),
+      );
+      await duplicate.moveBy(const Offset(0, 70));
+      await duplicate.up();
+      await tester.pump();
+      expect(calls, 1);
+
+      refresh.complete();
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 200));
+      expect(find.text('Refreshing…'), findsNothing);
+      expect(find.text('Pull to refresh'), findsNothing);
+    },
+  );
+}
diff --git a/test/core/count_format_test.dart b/test/core/count_format_test.dart
new file mode 100644
index 0000000..e80781b
--- /dev/null
+++ b/test/core/count_format_test.dart
@@ -0,0 +1,18 @@
+// Author: fruit.com.cn
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/formatting/count_format.dart';
+
+void main() {
+  test('should_keep_raw_number_below_ten_thousand', () {
+    expect(formatInteractionCount(0), '0');
+    expect(formatInteractionCount(96), '96');
+    expect(formatInteractionCount(9999), '9999');
+  });
+
+  test('should_use_one_decimal_wan_from_ten_thousand', () {
+    expect(formatInteractionCount(10000), '1.0万');
+    expect(formatInteractionCount(12400), '1.2万');
+    expect(formatInteractionCount(123456), '12.3万');
+  });
+}
diff --git a/test/core/haptics_scan_test.dart b/test/core/haptics_scan_test.dart
index f8a448c..d216b17 100644
--- a/test/core/haptics_scan_test.dart
+++ b/test/core/haptics_scan_test.dart
@@ -9,7 +9,8 @@ void main() {
     final violations = <String>[];
     for (final entity in Directory('lib').listSync(recursive: true)) {
       if (entity is! File || !entity.path.endsWith('.dart')) continue;
-      if (entity.path.endsWith('lib/core/platform/haptics.dart')) continue;
+      final normalized = entity.path.replaceAll('\\', '/');
+      if (normalized.endsWith('lib/core/platform/haptics.dart')) continue;
       final lines = entity.readAsLinesSync();
       for (var index = 0; index < lines.length; index++) {
         if (lines[index].contains('HapticFeedback.')) {
diff --git a/test/core/json_id_parsing_test.dart b/test/core/json_id_parsing_test.dart
index 2fbaa11..9974d7f 100644
--- a/test/core/json_id_parsing_test.dart
+++ b/test/core/json_id_parsing_test.dart
@@ -46,10 +46,18 @@ void main() {
     });
 
     test('should_parse_view_count_when_backend_sends_number', () {
-      final drama = Drama.fromCardJson({'id': 5, 'title': 'T', 'viewCount': 1200});
+      final drama = Drama.fromCardJson({
+        'id': 5,
+        'title': 'T',
+        'viewCount': 1200,
+      });
 
       expect(drama.id, '5');
       expect(drama.viewCount, 1200);
+      // 卡片没有互动数量时保持未知，界面才回退到文字标签。
+      expect(drama.likeCount, isNull);
+      expect(drama.favoriteCount, isNull);
+      expect(drama.commentCount, isNull);
     });
 
     test('should_parse_detail_payload_when_ids_are_strings', () {
@@ -59,14 +67,25 @@ void main() {
         'totalEpisodes': 12,
         'freeEpisodes': 3,
         'viewCount': '99',
+        'likeCount': '12400',
+        'favoriteCount': '3200',
+        'commentCount': '96',
         'episodes': [
-          {'id': '2111012753262120963', 'number': 1, 'title': 'E1', 'isFree': true},
+          {
+            'id': '2111012753262120963',
+            'number': 1,
+            'title': 'E1',
+            'isFree': true,
+          },
         ],
       });
 
       expect(drama.id, '2111012753262120962');
       expect(drama.freeEpisodes, 3);
       expect(drama.viewCount, 99);
+      expect(drama.likeCount, 12400);
+      expect(drama.favoriteCount, 3200);
+      expect(drama.commentCount, 96);
       expect(drama.episodes.first.id, '2111012753262120963');
       expect(drama.episodes.first.number, 1);
     });
diff --git a/test/core/locale_controller_test.dart b/test/core/locale_controller_test.dart
new file mode 100644
index 0000000..9b3905b
--- /dev/null
+++ b/test/core/locale_controller_test.dart
@@ -0,0 +1,39 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/services/locale_controller.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+
+void main() {
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+  });
+
+  test('should_restore_saved_locale_when_controller_loads', () async {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.withData({
+          LocaleController.preferenceKey: 'zh',
+        });
+    final controller = LocaleController();
+
+    await controller.load();
+
+    expect(controller.locale?.languageCode, 'zh');
+    controller.dispose();
+  });
+
+  test('should_persist_selected_locale_for_next_launch', () async {
+    final controller = LocaleController();
+    await controller.select(const Locale('id'));
+
+    final restored = LocaleController();
+    await restored.load();
+
+    expect(restored.locale?.languageCode, 'id');
+    controller.dispose();
+    restored.dispose();
+  });
+}
diff --git a/test/core/subpage_header_test.dart b/test/core/subpage_header_test.dart
new file mode 100644
index 0000000..353c4e6
--- /dev/null
+++ b/test/core/subpage_header_test.dart
@@ -0,0 +1,114 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/theme/app_theme.dart';
+import 'package:fruitshorts/core/widgets/subpage_header.dart';
+
+void main() {
+  testWidgets('should_render_unified_light_header_dimensions', (tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: Scaffold(
+          body: AppSubpageHeader(
+            title: 'Title',
+            backKey: const Key('sample-back'),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(const Key('subpage-header'))).height, 52);
+    expect(
+      tester.getSize(find.byKey(const Key('sample-back'))),
+      const Size(40, 40),
+    );
+    final title = tester.widget<Text>(find.byKey(const Key('subpage-title')));
+    expect(title.style?.fontSize, 18);
+    expect(title.style?.fontWeight, FontWeight.w800);
+    expect(title.style?.color, AppColors.onSurface);
+    final back = tester.getRect(find.byKey(const Key('sample-back')));
+    final titleRect = tester.getRect(find.byKey(const Key('subpage-title')));
+    expect(titleRect.left - back.right, closeTo(12, 0.5));
+    final surface = tester.widget<Material>(
+      find.descendant(
+        of: find.byKey(const Key('sample-back')),
+        matching: find.byType(Material),
+      ),
+    );
+    expect(surface.color, AppColors.card);
+    expect((surface.shape! as CircleBorder).side.color, AppColors.border);
+    final shadow =
+        tester
+                .widget<DecoratedBox>(
+                  find.byKey(const Key('subpage-back-shadow')),
+                )
+                .decoration
+            as BoxDecoration;
+    expect(shadow.boxShadow!.single.color, const Color(0x14000000));
+    expect(shadow.boxShadow!.single.blurRadius, 8);
+    expect(shadow.boxShadow!.single.offset, const Offset(0, 2));
+  });
+
+  testWidgets('should_use_64_height_when_subtitle_exists', (tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: Scaffold(
+          body: AppSubpageHeader(
+            title: 'Title',
+            subtitle: 'Subtitle',
+            backKey: const Key('sample-back'),
+          ),
+        ),
+      ),
+    );
+
+    expect(tester.getSize(find.byKey(const Key('subpage-header'))).height, 64);
+    expect(find.byKey(const Key('subpage-subtitle')), findsOneWidget);
+  });
+
+  testWidgets('should_use_translucent_dark_back_button', (tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: const Scaffold(
+          backgroundColor: Colors.black,
+          body: AppSubpageHeader(
+            title: 'Title',
+            backKey: Key('sample-back'),
+            dark: true,
+          ),
+        ),
+      ),
+    );
+
+    final material = tester.widget<Material>(
+      find.descendant(
+        of: find.byKey(const Key('sample-back')),
+        matching: find.byType(Material),
+      ),
+    );
+    final icon = tester.widget<Icon>(
+      find.descendant(
+        of: find.byKey(const Key('sample-back')),
+        matching: find.byIcon(Icons.chevron_left_rounded),
+      ),
+    );
+    expect(material.color, const Color(0x59000000));
+    expect(icon.color, Colors.white);
+    expect(icon.size, 22);
+    expect(icon.weight, 600);
+    final shadow =
+        tester
+                .widget<DecoratedBox>(
+                  find.byKey(const Key('subpage-back-shadow')),
+                )
+                .decoration
+            as BoxDecoration;
+    expect(shadow.boxShadow!.single.color, const Color(0x33000000));
+    expect(shadow.boxShadow!.single.blurRadius, 8);
+  });
+}
diff --git a/test/discover/discover_logic_test.dart b/test/discover/discover_logic_test.dart
index 55fc790..bd84546 100644
--- a/test/discover/discover_logic_test.dart
+++ b/test/discover/discover_logic_test.dart
@@ -1,157 +1,32 @@
+// Author: fruit.com.cn
+
 import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:fruitshorts/core/data/models/drama.dart';
-import 'package:fruitshorts/l10n/app_localizations.dart';
 import 'package:fruitshorts/pages/discover/discover_logic.dart';
-
-import '../support/fake_watch_history.dart';
-
-Drama _drama(String id, {List<int> numbers = const [1, 2, 3]}) => Drama(
-  id: id,
-  title: id,
-  synopsis: 'synopsis',
-  posterUrl: '/files/poster.png',
-  episodes: [
-    for (final number in numbers)
-      Episode(
-        id: '$id-$number',
-        number: number,
-        title: 'Episode $number',
-        videoUrl: 'https://example.test/clip.mp4',
-        isFree: true,
-      ),
-  ],
-);
+import 'package:fruitshorts/pages/discover/discover_types.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
-  test('should_resolve_resume_position_of_episode_one_when_constructed', () async {
-    final history = FakeWatchHistory()..saved = const Duration(seconds: 4);
-    final logic = DiscoverLogic(history: history, drama: _drama('signal'));
+  test('should_report_query_only_for_non_whitespace_text', () {
+    final logic = DiscoverLogic();
 
-    expect(await logic.position, const Duration(seconds: 4));
-    expect(history.reads, ['signal']);
-    expect(logic.searchOpen, isFalse);
+    expect(logic.hasSearchQuery, isFalse);
+
+    logic.search.text = '   ';
+    expect(logic.hasSearchQuery, isFalse);
+
+    logic.search.text = 'remote';
+    expect(logic.hasSearchQuery, isTrue);
     logic.dispose();
   });
 
-  test('should_reread_resume_position_when_drama_is_swapped', () async {
-    final history = FakeWatchHistory();
-    final logic = DiscoverLogic(history: history, drama: _drama('signal'));
-
-    logic.drama = _drama('city');
-    logic.refreshPosition();
-    await logic.position;
-
-    expect(history.reads, ['signal', 'city']);
-    logic.dispose();
-  });
-
-  test('should_resume_from_last_watch_when_list_card_has_no_episodes', () async {
-    final history = FakeWatchHistory()
-      ..saved = const Duration(seconds: 9)
-      ..lastEpisode = 'signal-2';
-    final logic = DiscoverLogic(
-      history: history,
-      drama: _drama('signal', numbers: const []),
-    );
-
-    expect(await logic.position, const Duration(seconds: 9));
-    expect(history.reads, ['signal']);
-    logic.dispose();
-  });
-
-  test('should_have_no_resume_position_when_server_has_no_record', () async {
-    final history = FakeWatchHistory();
-    final logic = DiscoverLogic(
-      history: history,
-      drama: _drama('signal', numbers: const []),
-    );
-
-    expect(await logic.position, isNull);
-    // 续看位置改为按剧问服务端：即使卡片没有剧集也会读一次
-    expect(history.reads, ['signal']);
-    logic.dispose();
-  });
-
-  test('should_show_search_when_flag_is_on_or_text_is_typed', () {
-    final logic = DiscoverLogic(history: FakeWatchHistory(), drama: _drama('s'));
-
-    expect(logic.showSearch, isFalse);
-
-    logic.search.text = 'vengeance';
-    logic.onSearchChanged();
-    expect(logic.showSearch, isTrue);
-
-    logic.search.clear();
-    expect(logic.showSearch, isFalse);
-
-    logic.searchOpen = true;
-    expect(logic.showSearch, isTrue);
-    logic.dispose();
-  });
-
-  test('should_match_by_id_and_tolerate_missing_id_when_looking_up_drama', () {
-    final logic = DiscoverLogic(history: FakeWatchHistory(), drama: _drama('s'));
-    final catalog = [_drama('signal'), _drama('city')];
-
-    expect(logic.dramaFor('city', catalog)?.id, 'city');
-    expect(logic.dramaFor('missing', catalog), isNull);
-    expect(logic.dramaFor(null, catalog), isNull);
-    expect(logic.dramaFor('city', const []), isNull);
-    logic.dispose();
-  });
-
-  test('should_adopt_drama_only_when_page_is_active', () {
-    final history = FakeWatchHistory();
-    final logic = DiscoverLogic(history: history, drama: _drama('signal'));
-
-    void sync(
-      Drama next, {
-      required bool active,
-      required bool wasActive,
-      required bool dramaChanged,
-      int searchRequest = 0,
-      int previousSearchRequest = 0,
-    }) => logic.syncDrama(
-      active: active,
-      wasActive: wasActive,
-      nextDrama: next,
-      dramaChanged: dramaChanged,
-      searchRequest: searchRequest,
-      previousSearchRequest: previousSearchRequest,
-      isActive: () => active,
-    );
-
-    // An inactive page keeps showing its own drama.
-    sync(_drama('city'), active: false, wasActive: true, dramaChanged: true);
-    expect(logic.drama.id, 'signal');
-
-    // Becoming active adopts the incoming drama.
-    sync(_drama('city'), active: true, wasActive: false, dramaChanged: false);
-    expect(logic.drama.id, 'city');
-
-    // Staying active with a changed drama re-reads history.
-    history.reads.clear();
-    sync(_drama('vengeance'), active: true, wasActive: true, dramaChanged: true);
-    expect(logic.drama.id, 'vengeance');
-    expect(history.reads, ['vengeance']);
-
-    // Staying active with no change leaves both drama and history alone.
-    history.reads.clear();
-    sync(_drama('other'), active: true, wasActive: true, dramaChanged: false);
-    expect(logic.drama.id, 'vengeance');
-    expect(history.reads, isEmpty);
-    logic.dispose();
-  });
-
-  testWidgets('should_open_and_focus_field_when_search_is_requested_and_page_is_active', (
+  testWidgets('should_focus_search_only_for_new_request_on_active_page', (
     tester,
   ) async {
-    final logic = DiscoverLogic(history: FakeWatchHistory(), drama: _drama('s'));
+    final logic = DiscoverLogic();
     await tester.pumpWidget(
       MaterialApp(
         home: Scaffold(
@@ -163,63 +38,33 @@ void main() {
       ),
     );
 
-    logic.syncDrama(
+    logic.syncSearch(
+      active: false,
+      request: 1,
+      previousRequest: 0,
+      isActive: () => false,
+    );
+    await tester.pump();
+    expect(logic.searchFocus.hasFocus, isFalse);
+
+    logic.syncSearch(
       active: true,
-      wasActive: true,
-      nextDrama: logic.drama,
-      dramaChanged: false,
-      searchRequest: 1,
-      previousSearchRequest: 0,
+      request: 2,
+      previousRequest: 1,
       isActive: () => true,
     );
-
-    expect(logic.searchOpen, isTrue);
-    await tester.pumpAndSettle();
+    await tester.pump();
+    await tester.pump();
     expect(logic.searchFocus.hasFocus, isTrue);
 
     await tester.pumpWidget(const SizedBox.shrink());
     logic.dispose();
   });
 
-  testWidgets('should_keep_search_field_closed_when_page_is_hidden', (
+  testWidgets('should_forward_action_when_embedded_or_pop_when_standalone', (
     tester,
   ) async {
-    final logic = DiscoverLogic(history: FakeWatchHistory(), drama: _drama('s'));
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: TextField(
-            controller: logic.search,
-            focusNode: logic.searchFocus,
-          ),
-        ),
-      ),
-    );
-
-    // The search request branch is gated on `active`, so a page that is not on
-    // screen must neither reveal the field nor pull focus away from the visible tab.
-    logic.syncDrama(
-      active: false,
-      wasActive: false,
-      nextDrama: logic.drama,
-      dramaChanged: false,
-      searchRequest: 1,
-      previousSearchRequest: 0,
-      isActive: () => false,
-    );
-
-    expect(logic.searchOpen, isFalse);
-    await tester.pumpAndSettle();
-    expect(logic.searchFocus.hasFocus, isFalse);
-
-    await tester.pumpWidget(const SizedBox.shrink());
-    logic.dispose();
-  });
-
-  testWidgets('should_return_choice_and_forward_it_when_act_runs_embedded', (
-    tester,
-  ) async {
-    final logic = DiscoverLogic(history: FakeWatchHistory(), drama: _drama('s'));
+    final logic = DiscoverLogic();
     final forwarded = <DiscoverPageAction>[];
     final popped = Completer<DiscoverPageAction?>();
     late BuildContext pageContext;
@@ -243,7 +88,6 @@ void main() {
         ),
       ),
     );
-
     await tester.tap(find.text('open'));
     await tester.pumpAndSettle();
 
@@ -254,72 +98,15 @@ void main() {
       onAction: forwarded.add,
     );
     expect(forwarded, [DiscoverPageAction.home]);
-    expect(Navigator.of(pageContext).canPop(), isTrue);
 
-    logic.act(pageContext, DiscoverPageAction.watchlist, embedded: false);
+    logic.act(pageContext, DiscoverPageAction.my, embedded: false);
     await tester.pumpAndSettle();
-
-    await expectLater(popped.future, completion(DiscoverPageAction.watchlist));
-    logic.dispose();
-  });
-
-  testWidgets('should_show_artwork_notice_when_card_has_no_playable_media', (
-    tester,
-  ) async {
-    final logic = DiscoverLogic(history: FakeWatchHistory(), drama: _drama('s'));
-    late BuildContext context;
-
-    await tester.pumpWidget(
-      MaterialApp(
-        locale: const Locale('en'),
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        home: Builder(
-          builder: (inner) {
-            context = inner;
-            return const Scaffold(body: SizedBox.shrink());
-          },
-        ),
-      ),
-    );
-
-    logic.openCard(context, null, embedded: false);
-    await tester.pumpAndSettle();
-
-    final l10n = AppLocalizations.of(context)!;
-    expect(find.text(l10n.artworkOnlyNotice), findsOneWidget);
-    logic.dispose();
-  });
-
-  testWidgets('should_forward_chosen_drama_when_card_is_embedded', (tester) async {
-    final logic = DiscoverLogic(history: FakeWatchHistory(), drama: _drama('s'));
-    late BuildContext context;
-    Drama? selected;
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Builder(
-          builder: (inner) {
-            context = inner;
-            return const SizedBox.shrink();
-          },
-        ),
-      ),
-    );
-
-    logic.openCard(
-      context,
-      _drama('city'),
-      embedded: true,
-      onDramaSelected: (drama) => selected = drama,
-    );
-
-    expect(selected?.id, 'city');
+    await expectLater(popped.future, completion(DiscoverPageAction.my));
     logic.dispose();
   });
 
   test('should_do_nothing_when_notifying_after_dispose', () {
-    final logic = DiscoverLogic(history: FakeWatchHistory(), drama: _drama('s'));
+    final logic = DiscoverLogic();
     var notifications = 0;
     logic.addListener(() => notifications++);
 
diff --git a/test/discover/discover_search_field_test.dart b/test/discover/discover_search_field_test.dart
new file mode 100644
index 0000000..62d8e29
--- /dev/null
+++ b/test/discover/discover_search_field_test.dart
@@ -0,0 +1,57 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/discover/widgets/discover_search_field.dart';
+
+void main() {
+  testWidgets('should_clear_text_and_keep_focus_when_clear_is_tapped', (
+    tester,
+  ) async {
+    final controller = TextEditingController();
+    final focusNode = FocusNode();
+    final changes = <String>[];
+    addTearDown(controller.dispose);
+    addTearDown(focusNode.dispose);
+
+    await tester.pumpWidget(
+      MaterialApp(
+        locale: const Locale('en'),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: DiscoverSearchField(
+            controller: controller,
+            focusNode: focusNode,
+            onChanged: changes.add,
+            loading: true,
+          ),
+        ),
+      ),
+    );
+
+    final search = find.byKey(const Key('discover-search'));
+    expect(find.byKey(const Key('discover-search-clear')), findsNothing);
+
+    await tester.tap(search);
+    await tester.enterText(search, 'velvet');
+    await tester.pump();
+    changes.clear();
+
+    final clear = find.byKey(const Key('discover-search-clear'));
+    final loading = find.byKey(const Key('discover-search-loading'));
+    expect(clear, findsOneWidget);
+    expect(loading, findsOneWidget);
+    expect(tester.getSize(clear), const Size(18, 18));
+    expect(tester.getRect(loading).right, lessThan(tester.getRect(clear).left));
+
+    await tester.tap(clear);
+    await tester.pump();
+
+    expect(controller.text, isEmpty);
+    expect(changes, ['']);
+    expect(find.byKey(const Key('discover-search-clear')), findsNothing);
+    expect(focusNode.hasFocus, isTrue);
+  });
+}
diff --git a/test/discover/discover_search_test.dart b/test/discover/discover_search_test.dart
new file mode 100644
index 0000000..cf8cfae
--- /dev/null
+++ b/test/discover/discover_search_test.dart
@@ -0,0 +1,109 @@
+// Author: fruit.com.cn
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/search_result.dart';
+import 'package:fruitshorts/core/data/remote/api_exception.dart';
+import 'package:fruitshorts/core/data/repositories/search_repository.dart';
+import 'package:fruitshorts/pages/discover/discover_logic.dart';
+
+Drama _drama(String id, {String language = 'id'}) => Drama(
+  id: id,
+  title: id,
+  synopsis: 'synopsis',
+  posterUrl: '/files/$id.png',
+  language: language,
+  episodes: const [],
+);
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  test(
+    'should_query_backend_and_render_results_when_search_text_changes',
+    () async {
+      final repository = _FakeSearchRepository(results: [_drama('velvet')]);
+      final logic = DiscoverLogic(searchRepository: repository)
+        ..searchDebounce = Duration.zero;
+
+      logic.search.text = 'velvet';
+      logic.onSearchChanged();
+      await pumpEventQueue();
+
+      expect(repository.calls, [
+        (keyword: 'velvet', pageIndex: 1, pageSize: 20),
+      ]);
+      expect(logic.searchLoading, isFalse);
+      expect(logic.searchResults.single.id, 'velvet');
+      logic.dispose();
+    },
+  );
+
+  test('should_keep_server_results_when_text_only_loses_whitespace', () async {
+    final repository = _FakeSearchRepository(results: [_drama('velvet')]);
+    final logic = DiscoverLogic(searchRepository: repository)
+      ..searchDebounce = Duration.zero;
+
+    logic.search.text = 'velvet ';
+    logic.onSearchChanged();
+    await pumpEventQueue();
+    logic.search.text = 'velvet';
+    logic.onSearchChanged();
+    await pumpEventQueue();
+
+    expect(repository.calls, hasLength(1));
+    expect(logic.searchResults.single.id, 'velvet');
+    logic.dispose();
+  });
+
+  test('should_expose_error_message_when_search_fails', () async {
+    final logic = DiscoverLogic(
+      searchRepository: _FakeSearchRepository(
+        error: const ApiException(400, 'Keyword is invalid'),
+      ),
+    )..searchDebounce = Duration.zero;
+
+    logic.search.text = '%%%';
+    logic.onSearchChanged();
+    await pumpEventQueue();
+
+    expect(logic.searchError, 'Keyword is invalid');
+    expect(logic.searchLoading, isFalse);
+    logic.dispose();
+  });
+
+  test('should_clear_server_results_when_search_text_is_empty', () async {
+    final repository = _FakeSearchRepository(results: [_drama('velvet')]);
+    final logic = DiscoverLogic(searchRepository: repository)
+      ..searchDebounce = Duration.zero;
+
+    logic.search.text = 'velvet';
+    logic.onSearchChanged();
+    await pumpEventQueue();
+    logic.search.clear();
+    logic.onSearchChanged();
+
+    expect(logic.hasSearchQuery, isFalse);
+    expect(logic.searchResults, isEmpty);
+    logic.dispose();
+  });
+}
+
+class _FakeSearchRepository implements SearchRepository {
+  _FakeSearchRepository({this.results = const [], this.error});
+
+  final List<Drama> results;
+  final ApiException? error;
+  final List<({String keyword, int pageIndex, int pageSize})> calls = [];
+
+  @override
+  Future<SearchResult> search(
+    String keyword, {
+    int pageIndex = 1,
+    int pageSize = 20,
+  }) async {
+    calls.add((keyword: keyword, pageIndex: pageIndex, pageSize: pageSize));
+    if (error != null) throw error!;
+    return SearchResult(total: results.length, list: results);
+  }
+}
diff --git a/test/discover/filter_page_test.dart b/test/discover/filter_page_test.dart
new file mode 100644
index 0000000..10fe4c2
--- /dev/null
+++ b/test/discover/filter_page_test.dart
@@ -0,0 +1,226 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/app.dart';
+import 'package:fruitshorts/core/data/models/content_category.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+
+import '../support/fake_catalog.dart';
+import '../support/fake_category.dart';
+import '../support/fake_haptics.dart';
+import '../support/fake_interaction_repositories.dart';
+import '../support/widget_player.dart';
+
+void main() {
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+  });
+
+  testWidgets('should_expand_all_filter_groups_when_expand_is_tapped', (
+    tester,
+  ) async {
+    await _pumpFilterPage(tester);
+
+    expect(find.byKey(const Key('filter-page')), findsOneWidget);
+    _expectUnifiedHeader(tester, const Key('filter-back'));
+    expect(
+      find.byKey(const Key('filter-group-label-category')),
+      findsOneWidget,
+    );
+    expect(find.byKey(const Key('filter-group-label-theme')), findsOneWidget);
+    expect(find.byKey(const Key('filter-group-label-language')), findsNothing);
+    expect(find.byKey(const Key('filter-group-label-sort')), findsNothing);
+
+    await tester.tap(find.byKey(const Key('filter-expand')));
+    await tester.pumpAndSettle();
+
+    expect(
+      find.byKey(const Key('filter-group-label-language')),
+      findsOneWidget,
+    );
+    expect(find.byKey(const Key('filter-group-label-sort')), findsOneWidget);
+  });
+
+  testWidgets('should_filter_and_sort_dramas_when_options_are_tapped', (
+    tester,
+  ) async {
+    await _pumpFilterPage(tester);
+    await tester.tap(find.byKey(const Key('filter-expand')));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const Key('filter-option-category-Romance')));
+    await tester.pumpAndSettle();
+
+    expect(
+      find.descendant(
+        of: find.byKey(const Key('filter-group-label-category')),
+        matching: find.text('Romance'),
+      ),
+      findsOneWidget,
+    );
+    expect(find.byKey(const Key('filter-card-1001')), findsOneWidget);
+    expect(find.byKey(const Key('filter-card-1003')), findsOneWidget);
+    expect(find.byKey(const Key('filter-card-1002')), findsNothing);
+
+    await tester.tap(find.byKey(const Key('filter-option-sort-hottest')));
+    await tester.pumpAndSettle();
+
+    final hottestFirst = tester.getTopLeft(
+      find.byKey(const Key('filter-card-1001')),
+    );
+    final hottestSecond = tester.getTopLeft(
+      find.byKey(const Key('filter-card-1003')),
+    );
+    expect(hottestFirst.dx, lessThan(hottestSecond.dx));
+
+    await tester.tap(find.byKey(const Key('filter-option-sort-newest')));
+    await tester.pumpAndSettle();
+
+    final newestFirst = tester.getTopLeft(
+      find.byKey(const Key('filter-card-1003')),
+    );
+    final newestSecond = tester.getTopLeft(
+      find.byKey(const Key('filter-card-1001')),
+    );
+    expect(newestFirst.dx, lessThan(newestSecond.dx));
+  });
+
+  testWidgets('should_open_player_when_filter_card_is_tapped', (tester) async {
+    await _pumpFilterPage(tester);
+
+    expect(find.byKey(const Key('filter-badge-hot-1001')), findsOneWidget);
+    expect(find.byKey(const Key('filter-badge-hot-1003')), findsNothing);
+    final meta = tester.widget<Text>(find.byKey(const Key('filter-meta-1001')));
+    expect(meta.data, contains('12'));
+    expect(meta.data, contains('300'));
+    expect(meta.data, contains('Romance'));
+
+    await tester.tap(find.byKey(const Key('filter-card-1001')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-scaffold')), findsOneWidget);
+  });
+
+  testWidgets('should_show_empty_state_when_filters_match_nothing', (
+    tester,
+  ) async {
+    await _pumpFilterPage(tester);
+    await tester.tap(find.byKey(const Key('filter-expand')));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const Key('filter-option-category-Romance')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('filter-option-language-en')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('filter-empty')), findsOneWidget);
+  });
+}
+
+Future<void> _pumpFilterPage(WidgetTester tester) async {
+  tester.view.physicalSize = const Size(390, 844);
+  tester.view.devicePixelRatio = 1;
+  addTearDown(tester.view.resetPhysicalSize);
+  addTearDown(tester.view.resetDevicePixelRatio);
+  final catalog = FakeCatalogRepository(dramas: _filterDramas);
+  await tester.pumpWidget(
+    LumaDramaApp(
+      playerFactory: createWidgetPlayer,
+      catalogRepository: catalog,
+      searchRepository: catalog,
+      categoryRepository: FakeCategoryRepository(
+        catalog: catalog,
+        categories: const [
+          ContentCategory(id: '1', name: 'Romance'),
+          ContentCategory(id: '2', name: 'Action'),
+        ],
+      ),
+      watchHistoryRepository: InMemoryWatchHistoryRepository(),
+      favoriteRepository: InMemoryFavoriteRepository(cards: catalog.dramas),
+      playbackRepository: FakePlaybackRepository(),
+      commentRepository: FakeCommentRepository(),
+      interactionRepository: FakeInteractionRepository(),
+      haptics: FakeHaptics(),
+    ),
+  );
+  await tester.pumpAndSettle();
+  await tester.tap(find.byKey(const Key('tab-theater')));
+  await tester.pumpAndSettle();
+  await tester.tap(find.byKey(const Key('theater-toolbar-filter')));
+  await tester.pumpAndSettle();
+}
+
+final List<Drama> _filterDramas = [
+  _drama(
+    id: '1001',
+    title: 'Alpha',
+    category: 'Romance',
+    genre: 'Suspense · Mystery',
+    language: 'id',
+    viewCount: 300,
+    isHot: true,
+  ),
+  _drama(
+    id: '1002',
+    title: 'Beta',
+    category: 'Action',
+    genre: 'Action · Thriller',
+    language: 'en',
+    viewCount: 500,
+  ),
+  _drama(
+    id: '1003',
+    title: 'Gamma',
+    category: 'Romance',
+    genre: 'Suspense',
+    language: 'zh-CN',
+    viewCount: 100,
+  ),
+];
+
+void _expectUnifiedHeader(WidgetTester tester, Key backKey) {
+  expect(tester.getSize(find.byKey(backKey)), const Size(40, 40));
+  final title = tester.widget<Text>(find.byKey(const Key('subpage-title')));
+  expect(title.style?.fontSize, 18);
+  expect(title.style?.fontWeight, FontWeight.w800);
+}
+
+Drama _drama({
+  required String id,
+  required String title,
+  required String category,
+  required String genre,
+  required String language,
+  required int viewCount,
+  bool isHot = false,
+}) {
+  return Drama(
+    id: id,
+    title: title,
+    synopsis: '$title synopsis',
+    posterUrl: '',
+    category: category,
+    genre: genre,
+    totalEpisodes: 12,
+    viewCount: viewCount,
+    language: language,
+    isHot: isHot,
+    detailLoaded: true,
+    episodes: [
+      Episode(
+        id: '$id-1',
+        number: 1,
+        title: 'Episode 1',
+        isFree: true,
+        videoUrl: 'https://example.test/$id.mp4',
+      ),
+    ],
+  );
+}
diff --git a/test/discover/home_all_dramas_grid_test.dart b/test/discover/home_all_dramas_grid_test.dart
index de51edf..38c4860 100644
--- a/test/discover/home_all_dramas_grid_test.dart
+++ b/test/discover/home_all_dramas_grid_test.dart
@@ -1,17 +1,20 @@
+// Author: fruit.com.cn
+
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
-import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
-
 import 'package:fruitshorts/app.dart';
 import 'package:fruitshorts/core/data/models/content_category.dart';
 import 'package:fruitshorts/core/data/models/drama.dart';
 import 'package:fruitshorts/core/data/models/home_feed.dart';
-import 'package:fruitshorts/core/data/models/watch_progress.dart';
 import 'package:fruitshorts/core/data/repositories/category_repository.dart';
 import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/widgets/app_pull_to_refresh.dart';
+import 'package:fruitshorts/pages/discover/discover_view.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 
 import '../support/fake_catalog.dart';
 import '../support/fake_interaction_repositories.dart';
@@ -24,332 +27,130 @@ void main() {
         InMemorySharedPreferencesAsync.empty();
   });
 
-  testWidgets(
-    'should_show_all_dramas_in_two_column_masonry_without_continue_watching',
-    (tester) async {
-      tester.view.physicalSize = const Size(390, 844);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
+  testWidgets('should_show_search_category_language_chips_and_drama_grid', (
+    tester,
+  ) async {
+    await _pumpTheater(tester, categoryRepository: _GridCategoryRepository());
 
-      await _pumpApp(tester, categoryRepository: _GridCategoryRepository());
-      await tester.tap(find.byKey(const Key('tab-discover')));
-      await tester.pumpAndSettle();
-
-      expect(find.text('Continue Watching'), findsNothing);
-      expect(find.text('Recommended'), findsOneWidget);
-      for (final key in const [
-        Key('discover-search-button'),
-        Key('discover-profile'),
-      ]) {
-        expect(tester.getSize(find.byKey(key)), const Size(36, 36));
-        expect(
-          tester
-              .widget<Icon>(
-                find.descendant(
-                  of: find.byKey(key),
-                  matching: find.byType(Icon),
-                ),
-              )
-              .size,
-          18,
-        );
-      }
-      expect(find.text('For You'), findsNothing);
-      final masonry = tester.widget<Row>(
-        find.byKey(const Key('home-all-dramas-grid')),
-      );
-      expect(masonry.children, hasLength(3));
-      expect((masonry.children[1] as SizedBox).width, 10);
-      expect(
-        tester
-            .widget<Padding>(find.byKey(const Key('home-all-dramas-section')))
-            .padding,
-        const EdgeInsets.symmetric(horizontal: 14),
-      );
-      expect(find.byType(GridView), findsNothing);
-      expect(find.byType(CustomScrollView), findsOneWidget);
-      final signalCard = find.byKey(
-        const Key('home-drama-card-the-signal-demo'),
-      );
-      final cityCard = find.byKey(
-        const Key('home-drama-card-city-lights-demo'),
-      );
-      final vengeanceCard = find.byKey(
-        const Key('home-drama-card-vengeance-demo'),
-      );
-      expect(tester.getTopLeft(signalCard).dy, tester.getTopLeft(cityCard).dy);
-      expect(
-        tester.getTopLeft(vengeanceCard).dx,
-        tester.getTopLeft(signalCard).dx,
-      );
-      expect(
-        tester.getTopLeft(vengeanceCard).dy -
-            tester.getBottomLeft(signalCard).dy,
-        closeTo(10, 1),
-      );
-
-      final cover = find.byKey(const Key('home-drama-cover-city-lights-demo'));
-      expect(tester.getSize(cover).height, greaterThan(120));
-      expect(
-        tester
-            .widget<Image>(
-              find.descendant(of: cover, matching: find.byType(Image)),
-            )
-            .fit,
-        BoxFit.fitWidth,
-      );
-      expect(
-        find.descendant(
-          of: cover,
-          matching: find.text('City Lights & Velvet Nights'),
-        ),
-        findsNothing,
-      );
-      expect(
-        find.byKey(const Key('home-drama-title-city-lights-demo')),
-        findsOneWidget,
-      );
-      expect(
-        tester
-            .getTopLeft(
-              find.byKey(const Key('home-drama-title-city-lights-demo')),
-            )
-            .dy,
-        greaterThan(tester.getBottomLeft(cover).dy),
-      );
-      expect(
-        tester
-            .widget<Text>(
-              find.byKey(const Key('home-drama-title-city-lights-demo')),
-            )
-            .maxLines,
-        1,
-      );
-      expect(
-        tester
-            .widget<Text>(
-              find.byKey(const Key('home-drama-genre-city-lights-demo')),
-            )
-            .maxLines,
-        1,
-      );
-      expect(tester.takeException(), isNull);
-    },
-  );
-
-  testWidgets('should_update_grid_when_category_is_selected', (tester) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
-    await _pumpApp(tester, categoryRepository: _GridCategoryRepository());
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
-
-    expect(find.text('The Signal'), findsWidgets);
-    expect(find.text('City Lights & Velvet Nights'), findsWidgets);
-
-    await tester.tap(find.text('Romance'));
-    await tester.pumpAndSettle();
-
-    expect(find.text('The Signal'), findsNothing);
-    expect(find.text('City Lights & Velvet Nights'), findsWidgets);
+    expect(find.text('Continue Watching'), findsNothing);
+    expect(find.byKey(const Key('discover-search')), findsOneWidget);
+    expect(find.byKey(const Key('theater-category-chips')), findsOneWidget);
+    expect(find.byKey(const Key('theater-language-chips')), findsNothing);
+    expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
+    expect(find.byKey(const Key('discover-profile')), findsNothing);
+    for (final tool in ['filter', 'ranking', 'new', 'reserve']) {
+      expect(find.byKey(Key('theater-toolbar-$tool')), findsOneWidget);
+    }
     expect(
-      find.byKey(const Key('home-drama-card-the-signal-demo')),
-      findsNothing,
+      find.byKey(const Key('drama-heat-city-lights-demo')),
+      findsOneWidget,
     );
+    expect(
+      find.byKey(const Key('drama-tag-chip-city-lights-demo-0')),
+      findsOneWidget,
+    );
+    expect(find.byKey(const Key('drama-tag-city-lights-demo')), findsNothing);
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('should_open_filter_page_from_theater_toolbar', (tester) async {
+    await _pumpTheater(tester, categoryRepository: _GridCategoryRepository());
+
+    await tester.tap(find.byKey(const Key('theater-toolbar-filter')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('filter-page')), findsOneWidget);
+    expect(find.byKey(const Key('filter-groups')), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('filter-back')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('filter-page')), findsNothing);
+    expect(find.byKey(const Key('discover-search')), findsOneWidget);
+  });
+
+  testWidgets('should_filter_grid_when_category_chip_is_tapped', (
+    tester,
+  ) async {
+    await _pumpTheater(tester, categoryRepository: _GridCategoryRepository());
+
+    await tester.tap(find.byKey(const Key('theater-category-7')));
+    await tester.pumpAndSettle();
+
     expect(
       find.byKey(const Key('home-drama-card-city-lights-demo')),
       findsOneWidget,
     );
+    expect(
+      find.byKey(const Key('home-drama-card-the-signal-demo')),
+      findsNothing,
+    );
   });
 
   testWidgets('should_keep_discover_header_fixed_when_content_scrolls', (
     tester,
   ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
-    await _pumpApp(
+    await _pumpTheater(
       tester,
       categoryRepository: _GridCategoryRepository(
         discoverFeed: _tallDiscoverFeed,
       ),
     );
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
 
     final headerBefore = tester.getTopLeft(
-      find.byKey(const Key('discover-search-button')),
+      find.byKey(const Key('discover-search')),
     );
-    final contentBefore = tester.getTopLeft(
-      find.byKey(const Key('home-category-chips')),
+    final scrollable = find.descendant(
+      of: find.byKey(const Key('discover-refresh')),
+      matching: find.byType(Scrollable),
     );
 
-    await tester.drag(find.byType(CustomScrollView), const Offset(0, -40));
+    await tester.drag(_verticalFeed, const Offset(0, -140));
     await tester.pumpAndSettle();
 
     expect(
-      tester.getTopLeft(find.byKey(const Key('discover-search-button'))),
+      tester.getTopLeft(find.byKey(const Key('discover-search'))),
       headerBefore,
     );
     expect(
-      tester.getTopLeft(find.byKey(const Key('home-category-chips'))).dy,
-      lessThan(contentBefore.dy),
+      tester.state<ScrollableState>(scrollable).position.pixels,
+      greaterThan(0),
     );
   });
 
-  testWidgets('should_keep_empty_messages_when_feed_has_no_dramas', (
-    tester,
-  ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
-    await _pumpApp(
+  testWidgets('should_show_empty_and_retry_states', (tester) async {
+    await _pumpTheater(
       tester,
       categoryRepository: _GridCategoryRepository(
         discoverFeed: const HomeFeed(),
       ),
     );
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('discover-empty')), findsOneWidget);
 
-    expect(find.text('No matching dramas.'), findsOneWidget);
-    expect(find.byKey(const Key('empty-state-content')), findsOneWidget);
+    await tester.pumpWidget(const SizedBox.shrink());
+    await _pumpTheater(
+      tester,
+      categoryRepository: _FailingCategoryRepository(),
+    );
 
-    await tester.tap(find.text('Romance'));
-    await tester.pumpAndSettle();
-
-    expect(find.text('No dramas in this category yet.'), findsOneWidget);
-  });
-
-  testWidgets('should_show_retry_when_category_feed_fails', (tester) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
-    await _pumpApp(tester, categoryRepository: _FailingCategoryRepository());
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
-
-    expect(find.text('Categories could not be loaded.'), findsOneWidget);
+    expect(find.byKey(const Key('home-categories-error')), findsOneWidget);
     expect(find.text('Retry'), findsOneWidget);
-    expect(find.byKey(const Key('empty-state-icon')), findsOneWidget);
-    final icon = tester.getCenter(find.byKey(const Key('empty-state-icon')));
-    final feed = tester.getRect(find.byType(CustomScrollView));
-    expect(icon.dx, closeTo(feed.center.dx, 1));
-    expect(find.byKey(const Key('home-all-dramas-grid')), findsNothing);
-  });
-
-  testWidgets('should_fit_two_column_grid_on_compact_screen', (tester) async {
-    tester.view.physicalSize = const Size(320, 568);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
-    await _pumpApp(tester, categoryRepository: _GridCategoryRepository());
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
-    await tester.scrollUntilVisible(
-      find.byKey(const Key('home-drama-card-city-lights-demo')),
-      180,
-      scrollable: find.byType(Scrollable).last,
-    );
-    await tester.pumpAndSettle();
-
-    expect(find.text('City Lights & Velvet Nights'), findsWidgets);
-    expect(tester.takeException(), isNull);
-  });
-
-  testWidgets('should_filter_trending_grid_when_search_text_changes', (
-    tester,
-  ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
-    await _pumpApp(tester, categoryRepository: _GridCategoryRepository());
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
-
+    expect(find.byKey(const Key('catalog-debug-endpoint')), findsOneWidget);
+    expect(find.byKey(const Key('catalog-debug-error')), findsOneWidget);
     expect(
-      find.byKey(const Key('home-drama-card-the-signal-demo')),
-      findsOneWidget,
-    );
-    expect(
-      find.byKey(const Key('home-drama-card-city-lights-demo')),
+      find.byKey(const Key('catalog-debug-endpoint-edit')),
       findsOneWidget,
     );
+    expect(find.textContaining('discover feed unavailable'), findsOneWidget);
+  });
+
+  testWidgets('should_show_search_results_when_text_changes', (tester) async {
+    await _pumpTheater(tester, categoryRepository: _GridCategoryRepository());
 
     await tester.enterText(find.byKey(const Key('discover-search')), 'velvet');
+    await tester.pump(const Duration(milliseconds: 400));
     await tester.pumpAndSettle();
 
-    expect(
-      find.byKey(const Key('home-drama-card-the-signal-demo')),
-      findsNothing,
-    );
-    expect(
-      find.byKey(const Key('home-drama-card-city-lights-demo')),
-      findsOneWidget,
-    );
-
-    await tester.enterText(find.byKey(const Key('discover-search')), '');
-    await tester.pumpAndSettle();
-    expect(
-      find.byKey(const Key('home-drama-card-the-signal-demo')),
-      findsOneWidget,
-    );
-  });
-
-  testWidgets('should_unfocus_search_without_losing_input_or_filter', (
-    tester,
-  ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
-    await _pumpApp(tester, categoryRepository: _GridCategoryRepository());
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
-
-    await tester.tap(find.byKey(const Key('discover-search')));
-    await tester.pump();
-    expect(
-      tester
-          .widget<TextField>(find.byKey(const Key('discover-search')))
-          .focusNode!
-          .hasFocus,
-      isTrue,
-    );
-
-    await tester.enterText(find.byKey(const Key('discover-search')), 'velvet');
-    await tester.pumpAndSettle();
-    expect(
-      find.byKey(const Key('home-drama-card-city-lights-demo')),
-      findsOneWidget,
-    );
-    expect(
-      find.byKey(const Key('home-drama-card-the-signal-demo')),
-      findsNothing,
-    );
-
-    await tester.tapAt(const Offset(70, 23));
-    await tester.pump();
-
-    final field = tester.widget<TextField>(
-      find.byKey(const Key('discover-search')),
-    );
-    expect(field.focusNode!.hasFocus, isFalse);
-    expect(field.controller!.text, 'velvet');
     expect(
       find.byKey(const Key('home-drama-card-city-lights-demo')),
       findsOneWidget,
@@ -361,20 +162,13 @@ void main() {
   });
 
   testWidgets('should_refresh_feed_when_pulled_down', (tester) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
     final counter = _CountingCategoryRepository(
       _GridCategoryRepository(discoverFeed: _tallDiscoverFeed),
     );
-    await _pumpApp(tester, categoryRepository: counter);
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
+    await _pumpTheater(tester, categoryRepository: counter);
 
     final before = counter.categoryLoads + counter.feedLoads;
-    await tester.drag(find.byType(CustomScrollView), const Offset(0, 320));
+    await tester.drag(_verticalFeed, const Offset(0, 320));
     await tester.pump();
     await tester.pump(const Duration(seconds: 1));
     await tester.pumpAndSettle();
@@ -383,53 +177,199 @@ void main() {
     expect(find.byType(RefreshProgressIndicator), findsNothing);
   });
 
-  testWidgets('should_show_continue_watching_only_when_a_record_exists', (
-    tester,
-  ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
+  testWidgets('should_style_search_shell_and_focus_border', (tester) async {
+    await _pumpTheater(tester, categoryRepository: _GridCategoryRepository());
+    BoxDecoration shell() =>
+        tester
+                .widget<AnimatedContainer>(
+                  find.byKey(const Key('discover-search-shell')),
+                )
+                .decoration!
+            as BoxDecoration;
 
-    await _pumpApp(
+    expect(shell().borderRadius, BorderRadius.circular(22));
+    expect(shell().color, AppColors.card);
+    expect((shell().border! as Border).top.color, Colors.transparent);
+    expect(
+      tester.getSize(find.byKey(const Key('discover-search-shell'))).height,
+      44,
+    );
+
+    await tester.tap(find.byKey(const Key('discover-search')));
+    await tester.pump(const Duration(milliseconds: 200));
+
+    expect(shell().color, AppColors.card);
+    expect((shell().border! as Border).top.color, AppColors.blue);
+  });
+
+  testWidgets('should_pin_theater_filters_when_scrolling', (tester) async {
+    await _pumpTheater(
       tester,
-      categoryRepository: _GridCategoryRepository(),
-      history: InMemoryWatchHistoryRepository(
-        seed: const [
-          WatchProgress(
-            dramaId: 'city-lights-demo',
-            episodeId: 'city-lights-demo-1',
-            position: Duration(seconds: 42),
-            duration: Duration(minutes: 2),
-          ),
-        ],
+      categoryRepository: _GridCategoryRepository(
+        discoverFeed: _tallDiscoverFeed,
       ),
     );
-    await tester.tap(find.byKey(const Key('tab-discover')));
+    BoxDecoration header() =>
+        tester
+                .widget<AnimatedContainer>(
+                  find.byKey(const Key('theater-sticky-header')),
+                )
+                .decoration!
+            as BoxDecoration;
+    final before = tester.getRect(
+      find.byKey(const Key('theater-sticky-header')),
+    );
+    expect(header().color, AppColors.ink);
+
+    await tester.drag(_verticalFeed, const Offset(0, -220));
     await tester.pumpAndSettle();
 
-    expect(find.byKey(const Key('discover-continue-watching')), findsOneWidget);
-    expect(find.byKey(const Key('discover-continue-play')), findsOneWidget);
-    expect(find.text('City Lights & Velvet Nights'), findsWidgets);
-    expect(find.byKey(const Key('discover-quick-filter')), findsOneWidget);
-    expect(find.byKey(const Key('discover-quick-charts')), findsOneWidget);
-    expect(find.byKey(const Key('discover-quick-new')), findsOneWidget);
-    expect(find.byKey(const Key('discover-quick-watchlist')), findsOneWidget);
+    final after = tester.getRect(
+      find.byKey(const Key('theater-sticky-header')),
+    );
+    expect(after.top, closeTo(before.top, 0.5));
+    expect(header().color, AppColors.ink);
+  });
+
+  testWidgets('should_paint_theater_surface_with_ink', (tester) async {
+    await _pumpTheater(tester, categoryRepository: _GridCategoryRepository());
+    final surface = tester.widget<ColoredBox>(
+      find.byKey(const Key('theater-page-surface')),
+    );
+
+    expect(surface.color, AppColors.ink);
+  });
+
+  testWidgets('should_keep_category_row_stable_across_scrolls', (tester) async {
+    await _pumpTheater(
+      tester,
+      categoryRepository: _GridCategoryRepository(
+        discoverFeed: _tallDiscoverFeed,
+      ),
+    );
+    double categoryTop() =>
+        tester.getRect(find.byKey(const Key('theater-category-chips'))).top;
+    final initial = categoryTop();
+
+    await tester.drag(_verticalFeed, const Offset(0, -120));
+    await tester.pumpAndSettle();
+    final once = categoryTop();
+    await tester.drag(_verticalFeed, const Offset(0, -120));
+    await tester.pumpAndSettle();
+    final twice = categoryTop();
+    await tester.drag(_verticalFeed, const Offset(0, 400));
+    await tester.pumpAndSettle();
+    final backToTop = categoryTop();
+
+    expect(once, closeTo(initial, 0.5));
+    expect(twice, closeTo(initial, 0.5));
+    expect(backToTop, closeTo(initial, 0.5));
+  });
+
+  testWidgets('should_keep_small_gap_between_category_and_toolbar', (
+    tester,
+  ) async {
+    await _pumpTheater(tester, categoryRepository: _GridCategoryRepository());
+    final categoryBottom = tester
+        .getRect(find.byKey(const Key('theater-category-chips')))
+        .bottom;
+    final toolbarTop = tester
+        .getRect(find.byKey(const Key('theater-toolbar-filter')))
+        .top;
+
+    expect(toolbarTop - categoryBottom, inInclusiveRange(0, 6));
+  });
+
+  testWidgets('should_show_category_underline_for_selection', (tester) async {
+    await _pumpTheater(tester, categoryRepository: _GridCategoryRepository());
+    CategoryUnderlinePainter underline(String id) =>
+        tester
+                .widget<CustomPaint>(
+                  find.byKey(Key('theater-category-underline-$id')),
+                )
+                .painter!
+            as CategoryUnderlinePainter;
+
+    expect(
+      tester
+          .widget<CustomPaint>(
+            find.byKey(const Key('theater-category-underline-all')),
+          )
+          .size,
+      const Size(20, 3),
+    );
+    expect(underline('all').color, AppColors.blue);
+    expect(underline('7').color, Colors.transparent);
+
+    await tester.tap(find.byKey(const Key('theater-category-7')));
+    await tester.pumpAndSettle();
+
+    expect(underline('all').color, Colors.transparent);
+    expect(underline('7').color, AppColors.blue);
+  });
+
+  testWidgets('should_scroll_offscreen_category_into_view_when_tapped', (
+    tester,
+  ) async {
+    final categories = [
+      for (var index = 0; index < 12; index++)
+        ContentCategory(id: '$index', name: 'Long category $index'),
+    ];
+    await _pumpTheater(
+      tester,
+      categoryRepository: _GridCategoryRepository(categories: categories),
+    );
+
+    final target = find.byKey(const Key('theater-category-11'));
+    expect(tester.getRect(target).right, greaterThan(390));
+
+    tester.widget<GestureDetector>(target).onTap!();
+    await tester.pump();
+    await tester.pumpAndSettle();
+
+    final rect = tester.getRect(target);
+    expect(rect.left, greaterThanOrEqualTo(0));
+    expect(rect.right, lessThanOrEqualTo(390));
+  });
+
+  testWidgets('should_use_text_pull_to_refresh', (tester) async {
+    await _pumpTheater(tester, categoryRepository: _GridCategoryRepository());
+    final refresh = tester.widget<AppPullToRefresh>(
+      find.byKey(const Key('discover-refresh')),
+    );
+
+    expect(refresh.edgeOffset, 52);
+    expect(
+      tester.widget<ListView>(_verticalFeed).physics,
+      AppPullToRefresh.physics,
+    );
+    await tester.drag(_verticalFeed, const Offset(0, 240));
+    await tester.pump();
+    expect(find.text('Refreshing…'), findsOneWidget);
+    await tester.pumpAndSettle();
   });
 }
 
-Future<void> _pumpApp(
+final Finder _verticalFeed = find.byWidgetPredicate(
+  (widget) => widget is ListView && widget.scrollDirection == Axis.vertical,
+);
+
+Future<void> _pumpTheater(
   WidgetTester tester, {
   required CategoryRepository categoryRepository,
-  WatchHistoryRepository? history,
 }) async {
+  tester.view.physicalSize = const Size(390, 844);
+  tester.view.devicePixelRatio = 1;
+  addTearDown(tester.view.resetPhysicalSize);
+  addTearDown(tester.view.resetDevicePixelRatio);
   final catalog = FakeCatalogRepository();
   await tester.pumpWidget(
     LumaDramaApp(
       playerFactory: createWidgetPlayer,
       catalogRepository: catalog,
+      searchRepository: catalog,
       categoryRepository: categoryRepository,
-      watchHistoryRepository: history ?? InMemoryWatchHistoryRepository(),
+      watchHistoryRepository: InMemoryWatchHistoryRepository(),
       favoriteRepository: InMemoryFavoriteRepository(),
       playbackRepository: FakePlaybackRepository(),
       commentRepository: FakeCommentRepository(),
@@ -438,18 +378,21 @@ Future<void> _pumpApp(
     ),
   );
   await tester.pumpAndSettle();
+  await tester.tap(find.byKey(const Key('tab-theater')));
+  await tester.pumpAndSettle();
 }
 
 class _GridCategoryRepository implements CategoryRepository {
-  _GridCategoryRepository({HomeFeed? discoverFeed})
-    : discoverFeed = discoverFeed ?? _defaultDiscoverFeed;
+  _GridCategoryRepository({
+    HomeFeed? discoverFeed,
+    this.categories = const [ContentCategory(id: '7', name: 'Romance')],
+  }) : discoverFeed = discoverFeed ?? _defaultDiscoverFeed;
 
   final HomeFeed discoverFeed;
+  final List<ContentCategory> categories;
 
   @override
-  Future<List<ContentCategory>> fetchCategories() async => const [
-    ContentCategory(id: '7', name: 'Romance'),
-  ];
+  Future<List<ContentCategory>> fetchCategories() async => categories;
 
   @override
   Future<HomeFeed> fetchDiscoverFeed() async => discoverFeed;
diff --git a/test/discover/theater_pages_test.dart b/test/discover/theater_pages_test.dart
new file mode 100644
index 0000000..4bb3437
--- /dev/null
+++ b/test/discover/theater_pages_test.dart
@@ -0,0 +1,363 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/app.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/home_feed.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/widgets/app_pull_to_refresh.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+
+import '../support/fake_catalog.dart';
+import '../support/fake_category.dart';
+import '../support/fake_haptics.dart';
+import '../support/fake_interaction_repositories.dart';
+import '../support/widget_player.dart';
+
+void main() {
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+  });
+
+  testWidgets('should_open_ranking_sorted_by_views', (tester) async {
+    await _pumpTheater(tester);
+    await tester.tap(find.byKey(const Key('theater-toolbar-ranking')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('ranking-page')), findsOneWidget);
+    _expectUnifiedHeader(tester, const Key('ranking-back'));
+    expect(find.text('TOP 1'), findsOneWidget);
+    expect(
+      tester.widget<Text>(find.byKey(const Key('ranking-title-1'))).data,
+      'The Signal',
+    );
+
+    await tester.tap(find.byKey(const Key('ranking-top-1')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('player-scaffold')), findsOneWidget);
+  });
+
+  testWidgets('should_open_new_releases_sorted_by_id', (tester) async {
+    await _pumpTheater(tester);
+    await tester.tap(find.byKey(const Key('theater-toolbar-new')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('new-releases-page')), findsOneWidget);
+    _expectUnifiedHeader(tester, const Key('new-releases-back'));
+    final newPage = tester.widget<Scaffold>(
+      find.byKey(const Key('new-releases-page')),
+    );
+    expect(newPage.backgroundColor, AppColors.ink);
+    final badge = tester.widget<Container>(
+      find.byKey(const Key('new-releases-hero-badge')),
+    );
+    expect((badge.decoration! as BoxDecoration).color, AppColors.blue);
+    expect(find.byKey(const Key('new-releases-hero')), findsOneWidget);
+    expect(find.text('Vengeance Rising'), findsWidgets);
+    expect(
+      find.byKey(const Key('new-release-card-the-signal-demo')),
+      findsOneWidget,
+    );
+    expect(
+      find.byKey(const Key('new-release-card-city-lights-demo')),
+      findsOneWidget,
+    );
+
+    await tester.tap(find.byKey(const Key('new-releases-hero')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('player-scaffold')), findsOneWidget);
+  });
+
+  testWidgets('should_open_reserve_empty_state', (tester) async {
+    await _pumpTheater(tester);
+    await tester.tap(find.byKey(const Key('theater-toolbar-reserve')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('reserve-page')), findsOneWidget);
+    _expectUnifiedHeader(tester, const Key('reserve-back'));
+    expect(find.byKey(const Key('reserve-week-strip')), findsOneWidget);
+    for (var index = 0; index < 7; index++) {
+      expect(find.byKey(Key('reserve-day-$index')), findsOneWidget);
+    }
+    expect(find.byKey(const Key('reserve-empty')), findsOneWidget);
+    for (var index = 1; index <= 3; index++) {
+      expect(find.byKey(Key('reserve-step-$index')), findsOneWidget);
+    }
+    final todayIndex = DateTime.now().weekday - 1;
+    final today = tester.widget<Container>(
+      find.descendant(
+        of: find.byKey(Key('reserve-day-$todayIndex')),
+        matching: find.byType(Container),
+      ),
+    );
+    expect((today.decoration! as BoxDecoration).color, AppColors.blue);
+
+    await tester.tap(find.byKey(const Key('reserve-go-new')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('new-releases-page')), findsOneWidget);
+  });
+
+  testWidgets('should_render_podium_with_center_on_top', (tester) async {
+    await _pumpTheater(tester);
+    await tester.tap(find.byKey(const Key('theater-toolbar-ranking')));
+    await tester.pumpAndSettle();
+
+    final top1 = tester.getRect(find.byKey(const Key('ranking-cover-1')));
+    final top2 = tester.getRect(find.byKey(const Key('ranking-cover-2')));
+    final top3 = tester.getRect(find.byKey(const Key('ranking-cover-3')));
+    expect(top1.width, greaterThan(top2.width));
+    expect(top3.width, closeTo(top2.width, 0.5));
+    expect(top2.left, closeTo(14, 0.5));
+    expect(top3.right, closeTo(376, 0.5));
+    expect(top2.left, lessThan(top1.left));
+    expect(top3.left, greaterThan(top1.right));
+    expect(top1.bottom, closeTo(top2.bottom, 0.5));
+    expect(top1.bottom, closeTo(top3.bottom, 0.5));
+    expect(find.byKey(const Key('ranking-row-3')), findsNothing);
+  });
+
+  testWidgets('should_list_rank_four_and_below', (tester) async {
+    await _pumpTheater(tester, dramas: _rankDramas(5));
+    await tester.tap(find.byKey(const Key('theater-toolbar-ranking')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('ranking-row-3')), findsOneWidget);
+    expect(find.byKey(const Key('ranking-row-2')), findsNothing);
+    expect(find.byKey(const Key('ranking-top-4')), findsOneWidget);
+    expect(
+      find.descendant(
+        of: find.byKey(const Key('ranking-row-3')),
+        matching: find.text('synopsis'),
+      ),
+      findsOneWidget,
+    );
+  });
+
+  testWidgets('should_truncate_podium_when_less_than_three', (tester) async {
+    await _pumpTheater(tester, dramas: _rankDramas(1));
+    await tester.tap(find.byKey(const Key('theater-toolbar-ranking')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('ranking-top-1')), findsOneWidget);
+    expect(find.byKey(const Key('ranking-top-2')), findsNothing);
+    expect(find.byKey(const Key('ranking-top-3')), findsNothing);
+  });
+
+  testWidgets('should_open_player_from_new_releases_card', (tester) async {
+    await _pumpTheater(tester);
+    await tester.tap(find.byKey(const Key('theater-toolbar-new')));
+    await tester.pumpAndSettle();
+
+    final card = find.byKey(const Key('new-release-card-the-signal-demo'));
+    await tester.ensureVisible(card);
+    await tester.pumpAndSettle();
+    await tester.tap(card);
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-scaffold')), findsOneWidget);
+  });
+
+  testWidgets('should_go_back_to_theater_from_ranking_page', (tester) async {
+    await _pumpTheater(tester);
+    await tester.tap(find.byKey(const Key('theater-toolbar-ranking')));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const Key('ranking-back')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('ranking-page')), findsNothing);
+    expect(find.byKey(const Key('discover-search')), findsOneWidget);
+  });
+
+  testWidgets('should_page_ranking_and_reset_after_refresh', (tester) async {
+    final repository = _CountingCatalogRepository(dramas: _rankDramas(40));
+    await _pumpTheater(tester, catalogRepository: repository);
+    await tester.tap(find.byKey(const Key('theater-toolbar-ranking')));
+    await tester.pumpAndSettle();
+
+    final list = find.byKey(const Key('ranking-list'));
+    expect(tester.widget<ListView>(list).physics, AppPullToRefresh.physics);
+    final position = _scrollPosition(tester, const Key('ranking-list'));
+    position.jumpTo(position.maxScrollExtent);
+    await tester.pump();
+
+    expect(find.byKey(const Key('ranking-row-19')), findsOneWidget);
+    expect(find.byKey(const Key('ranking-row-20')), findsNothing);
+    expect(find.byKey(const Key('ranking-load-more')), findsOneWidget);
+    await tester.pump(const Duration(milliseconds: 299));
+    expect(find.byKey(const Key('ranking-load-more')), findsOneWidget);
+    await tester.pump(const Duration(milliseconds: 1));
+
+    position.jumpTo(position.maxScrollExtent);
+    await tester.pump();
+    expect(find.byKey(const Key('ranking-row-39')), findsOneWidget);
+    expect(find.byKey(const Key('ranking-row-40')), findsNothing);
+    expect(find.byKey(const Key('ranking-no-more')), findsOneWidget);
+
+    position.jumpTo(0);
+    await tester.pump();
+    final beforeRefresh = repository.fetchCalls;
+    await tester.drag(list, const Offset(0, 240));
+    await tester.pump();
+    await tester.pumpAndSettle();
+
+    expect(repository.fetchCalls, beforeRefresh + 1);
+    expect(position.pixels, 0);
+    position.jumpTo(position.maxScrollExtent);
+    await tester.pump();
+    expect(find.byKey(const Key('ranking-load-more')), findsOneWidget);
+    expect(find.byKey(const Key('ranking-no-more')), findsNothing);
+    await tester.pumpAndSettle();
+  });
+
+  testWidgets('should_page_new_releases_and_reset_after_refresh', (
+    tester,
+  ) async {
+    final repository = _CountingCatalogRepository(dramas: _rankDramas(40));
+    await _pumpTheater(tester, catalogRepository: repository);
+    await tester.tap(find.byKey(const Key('theater-toolbar-new')));
+    await tester.pumpAndSettle();
+
+    final list = find.byKey(const Key('new-releases-list'));
+    expect(tester.widget<ListView>(list).physics, AppPullToRefresh.physics);
+    await tester.drag(list, const Offset(0, -400));
+    await tester.pump();
+    expect(_countKeys('home-drama-card-'), 20);
+
+    final position = _scrollPosition(tester, const Key('new-releases-list'));
+    position.jumpTo(position.maxScrollExtent);
+    await tester.pump();
+    expect(find.byKey(const Key('new-releases-load-more')), findsOneWidget);
+    await tester.pump(const Duration(milliseconds: 299));
+    expect(_countKeys('home-drama-card-'), 20);
+    await tester.pump(const Duration(milliseconds: 1));
+    await tester.pump();
+    expect(_countKeys('home-drama-card-'), 40);
+
+    await tester.pumpAndSettle();
+    position.jumpTo(position.maxScrollExtent);
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('new-releases-no-more')), findsOneWidget);
+
+    position.jumpTo(0);
+    await tester.pump();
+    final beforeRefresh = repository.fetchCalls;
+    await tester.drag(list, const Offset(0, 240));
+    await tester.pump();
+    await tester.pumpAndSettle();
+    expect(repository.fetchCalls, beforeRefresh + 1);
+    expect(position.pixels, 0);
+
+    await tester.drag(list, const Offset(0, -400));
+    await tester.pump();
+    expect(_countKeys('home-drama-card-'), 20);
+  });
+
+  testWidgets('should_refresh_reserve_without_load_more', (tester) async {
+    final repository = _CountingCatalogRepository(dramas: _rankDramas(3));
+    await _pumpTheater(tester, catalogRepository: repository);
+    await tester.tap(find.byKey(const Key('theater-toolbar-reserve')));
+    await tester.pumpAndSettle();
+
+    final beforeRefresh = repository.fetchCalls;
+    final list = find.byKey(const Key('reserve-list'));
+    expect(tester.widget<ListView>(list).physics, AppPullToRefresh.physics);
+    await tester.drag(list, const Offset(0, 240));
+    await tester.pump();
+    await tester.pumpAndSettle();
+
+    expect(repository.fetchCalls, beforeRefresh + 1);
+    expect(find.byKey(const Key('reserve-load-more')), findsNothing);
+    expect(find.byKey(const Key('reserve-no-more')), findsNothing);
+  });
+}
+
+Future<void> _pumpTheater(
+  WidgetTester tester, {
+  List<Drama>? dramas,
+  FakeCatalogRepository? catalogRepository,
+}) async {
+  tester.view.physicalSize = const Size(390, 844);
+  tester.view.devicePixelRatio = 1;
+  addTearDown(tester.view.resetPhysicalSize);
+  addTearDown(tester.view.resetDevicePixelRatio);
+  final catalog = catalogRepository ?? FakeCatalogRepository(dramas: dramas);
+  await tester.pumpWidget(
+    LumaDramaApp(
+      playerFactory: createWidgetPlayer,
+      catalogRepository: catalog,
+      searchRepository: catalog,
+      categoryRepository: FakeCategoryRepository(catalog: catalog),
+      watchHistoryRepository: InMemoryWatchHistoryRepository(),
+      favoriteRepository: InMemoryFavoriteRepository(cards: catalog.dramas),
+      playbackRepository: FakePlaybackRepository(),
+      commentRepository: FakeCommentRepository(),
+      interactionRepository: FakeInteractionRepository(),
+      haptics: FakeHaptics(),
+    ),
+  );
+  await tester.pumpAndSettle();
+  await tester.tap(find.byKey(const Key('tab-theater')));
+  await tester.pumpAndSettle();
+}
+
+ScrollPosition _scrollPosition(WidgetTester tester, Key listKey) {
+  final scrollable = find.descendant(
+    of: find.byKey(listKey),
+    matching: find.byType(Scrollable),
+  );
+  return tester.state<ScrollableState>(scrollable.first).position;
+}
+
+int _countKeys(String prefix) => find
+    .byWidgetPredicate((widget) {
+      final key = widget.key;
+      return key is ValueKey<String> && key.value.startsWith(prefix);
+    })
+    .evaluate()
+    .length;
+
+class _CountingCatalogRepository extends FakeCatalogRepository {
+  _CountingCatalogRepository({super.dramas});
+
+  int fetchCalls = 0;
+
+  @override
+  Future<HomeFeed> fetchHomeFeed() {
+    fetchCalls++;
+    return super.fetchHomeFeed();
+  }
+}
+
+List<Drama> _rankDramas(int count) => [
+  for (var index = 0; index < count; index++)
+    Drama(
+      id: 'rank-$index',
+      title: 'Rank $index',
+      synopsis: 'synopsis',
+      posterUrl: '',
+      totalEpisodes: 10,
+      viewCount: (count - index) * 100,
+      episodes: [
+        Episode(
+          id: 'rank-$index-1',
+          number: 1,
+          title: 'Episode 1',
+          isFree: true,
+        ),
+      ],
+    ),
+];
+
+void _expectUnifiedHeader(WidgetTester tester, Key backKey) {
+  expect(tester.getSize(find.byKey(backKey)), const Size(40, 40));
+  final title = tester.widget<Text>(find.byKey(const Key('subpage-title')));
+  expect(title.style?.fontSize, 18);
+  expect(title.style?.fontWeight, FontWeight.w800);
+}
diff --git a/test/download/download_controller_local_test.dart b/test/download/download_controller_local_test.dart
new file mode 100644
index 0000000..369e808
--- /dev/null
+++ b/test/download/download_controller_local_test.dart
@@ -0,0 +1,149 @@
+// Author: fruit.com.cn
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/download_license.dart';
+import 'package:fruitshorts/core/data/models/download_policy.dart';
+import 'package:fruitshorts/core/data/repositories/download_repository.dart';
+import 'package:fruitshorts/core/data/services/download_controller.dart';
+import 'package:fruitshorts/core/data/services/download_storage.dart';
+
+void main() {
+  test('should_mark_episode_downloaded_and_report_progress_when_download_finishes',
+      () async {
+    final repository = _RecordingRepository(_license('ep-1'));
+    final storage = _FakeStorage();
+    final controller = DownloadController(repository, storage: storage);
+    await controller.load();
+
+    final result = await controller.startDownload('ep-1');
+
+    expect(result.ok, isTrue);
+    expect(controller.isDownloaded('ep-1'), isTrue);
+    expect(controller.localPathFor('ep-1'), 'file:///tmp/ep-1.mp4');
+    expect(repository.statuses, containsAll(['DOWNLOADING', 'COMPLETED']));
+  });
+
+  test('should_keep_local_file_when_backend_delete_fails', () async {
+    final repository = _RecordingRepository(_license('ep-1'));
+    final storage = _FakeStorage();
+    final controller = DownloadController(repository, storage: storage);
+    await controller.load();
+    await controller.startDownload('ep-1');
+    repository.failRemove = true;
+
+    final ok = await controller.remove('ep-1');
+
+    expect(ok, isFalse);
+    expect(controller.isDownloaded('ep-1'), isTrue);
+  });
+}
+
+DownloadLicense _license(String episodeId) => DownloadLicense(
+  licenseId: 'license-$episodeId',
+  dramaId: 'drama-1',
+  dramaTitle: 'The Signal',
+  episodeId: episodeId,
+  episodeNo: 1,
+  deviceId: 'device-1',
+  quality: 'AUTO',
+  playUrl: '/files/episode/ep-1.mp4?e=1&s=abc',
+  licenseKey: 'key',
+  status: 'ACTIVE',
+  grantedAt: DateTime(2026, 10, 19),
+  expireAt: DateTime(2026, 11, 18),
+  taskStatus: 'QUEUED',
+  progressPercent: 0,
+  downloadedBytes: 0,
+  totalBytes: 0,
+  errorMsg: '',
+);
+
+class _FakeStorage implements DownloadStorage {
+  final Set<String> files = {};
+
+  @override
+  Future<Map<String, String>> restore() async => {
+    for (final id in files) id: 'file:///tmp/$id.mp4',
+  };
+
+  @override
+  Future<String?> localPathFor(String episodeId) async =>
+      files.contains(episodeId) ? 'file:///tmp/$episodeId.mp4' : null;
+
+  @override
+  Future<DownloadedMedia> download({
+    required String episodeId,
+    required String url,
+    DownloadProgress? onProgress,
+  }) async {
+    onProgress?.call(50, 100);
+    onProgress?.call(100, 100);
+    files.add(episodeId);
+    return DownloadedMedia(
+      episodeId: episodeId,
+      filePath: 'file:///tmp/$episodeId.mp4',
+      bytes: 100,
+    );
+  }
+
+  @override
+  Future<void> delete(String episodeId) async => files.remove(episodeId);
+
+  @override
+  Future<void> clear() async => files.clear();
+}
+
+class _RecordingRepository implements DownloadRepository {
+  _RecordingRepository(this.license);
+
+  DownloadLicense license;
+  bool failRemove = false;
+  final List<String> statuses = [];
+
+  @override
+  Future<DownloadPolicy> fetchPolicy() async => const DownloadPolicy(
+    maxPerDevice: 20,
+    licenseDays: 30,
+    wifiOnly: false,
+    maxQuality: 'AUTO',
+    maxStorageBytes: 0,
+    used: 1,
+    remaining: 19,
+    expirePolicyText: '30 days',
+  );
+
+  @override
+  Future<List<DownloadLicense>> list() async => [license];
+
+  @override
+  Future<DownloadLicense> grant(String episodeId, {String? quality}) async =>
+      license;
+
+  @override
+  Future<void> updateSettings({bool? wifiOnly, String? maxQuality}) async {}
+
+  @override
+  Future<DownloadLicense> refreshUrl(String episodeId) async => license;
+
+  @override
+  Future<DownloadLicense> reportProgress(
+    String episodeId, {
+    String? deviceId,
+    String? status,
+    int? progressPercent,
+    int? downloadedBytes,
+    int? totalBytes,
+    String? errorMsg,
+  }) async {
+    if (status != null) statuses.add(status);
+    return license;
+  }
+
+  @override
+  Future<void> remove(String episodeId) async {
+    if (failRemove) throw StateError('remove failed');
+  }
+
+  @override
+  Future<int> clear() async => 0;
+}
diff --git a/test/download/download_storage_test.dart b/test/download/download_storage_test.dart
new file mode 100644
index 0000000..f965ac0
--- /dev/null
+++ b/test/download/download_storage_test.dart
@@ -0,0 +1,42 @@
+// Author: fruit.com.cn
+
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/services/download_storage.dart';
+
+void main() {
+  test('should_write_media_file_and_report_progress_when_download_completes',
+      () async {
+    final directory = await Directory.systemTemp.createTemp('fruit-download-');
+    final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
+    final payload = Uint8List.fromList(List<int>.generate(4096, (i) => i % 251));
+    server.listen((request) async {
+      request.response.headers.contentLength = payload.length;
+      request.response.add(payload);
+      await request.response.close();
+    });
+    addTearDown(() async {
+      await server.close(force: true);
+      await directory.delete(recursive: true);
+    });
+    final storage = FileDownloadStorage(directoryProvider: () async => directory);
+    final progress = <double>[];
+
+    final media = await storage.download(
+      episodeId: 'ep-1',
+      url: 'http://127.0.0.1:${server.port}/episode.mp4',
+      onProgress: (received, total) => progress.add(total == 0 ? 0 : received / total),
+    );
+
+    expect(File(media.filePath).existsSync(), isTrue);
+    expect(media.bytes, payload.length);
+    expect(progress.last, 1.0);
+    final localPath = await storage.localPathFor('ep-1');
+    expect(localPath, isNotNull);
+    expect(File(localPath!).existsSync(), isTrue);
+    await storage.delete('ep-1');
+    expect(await storage.localPathFor('ep-1'), isNull);
+  });
+}
diff --git a/test/drama_detail/drama_detail_first_frame_test.dart b/test/drama_detail/drama_detail_first_frame_test.dart
new file mode 100644
index 0000000..8ab2f78
--- /dev/null
+++ b/test/drama_detail/drama_detail_first_frame_test.dart
@@ -0,0 +1,173 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/remote/api_client.dart';
+import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/core/data/services/catalog_controller.dart';
+import 'package:fruitshorts/core/data/services/favorite_controller.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/drama_detail/drama_detail_view.dart';
+
+import '../support/fake_catalog.dart';
+
+void main() {
+  testWidgets('should_show_card_content_before_detail_returns', (tester) async {
+    final pending = Completer<Drama>();
+    final card = _cardDrama();
+    final catalog = _ScriptedCatalog(
+      dramas: [card],
+      loadDetail: () => pending.future,
+    );
+
+    await _pumpDetail(tester, card: card, catalog: catalog, settle: false);
+
+    expect(find.byKey(const Key('detail-title')), findsOneWidget);
+    expect(find.byKey(const Key('detail-poster')), findsOneWidget);
+    expect(find.byKey(const Key('detail-stats')), findsOneWidget);
+    expect(find.byKey(const Key('detail-episodes-loading')), findsOneWidget);
+    expect(find.byType(CircularProgressIndicator), findsNothing);
+    expect(
+      tester
+          .widget<FilledButton>(find.byKey(const Key('detail-cta')))
+          .onPressed,
+      isNull,
+    );
+
+    pending.complete(_detailDrama(card));
+    await tester.pump();
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('detail-episodes-loading')), findsNothing);
+    expect(find.byKey(const Key('detail-episode-chips')), findsOneWidget);
+    expect(
+      tester
+          .widget<FilledButton>(find.byKey(const Key('detail-cta')))
+          .onPressed,
+      isNotNull,
+    );
+  });
+
+  testWidgets('should_keep_card_content_when_detail_load_fails', (
+    tester,
+  ) async {
+    final card = _cardDrama();
+    final catalog = _ScriptedCatalog(
+      dramas: [card],
+      loadDetail: () async => throw const ApiException(500, 'detail failed'),
+    );
+
+    await _pumpDetail(tester, card: card, catalog: catalog);
+
+    expect(find.byKey(const Key('detail-title')), findsOneWidget);
+    expect(find.byKey(const Key('detail-poster')), findsOneWidget);
+    expect(find.byKey(const Key('detail-stats')), findsOneWidget);
+    expect(find.byKey(const Key('detail-episodes-retry')), findsOneWidget);
+    expect(find.byType(CircularProgressIndicator), findsNothing);
+    expect(
+      tester
+          .widget<FilledButton>(find.byKey(const Key('detail-cta')))
+          .onPressed,
+      isNull,
+    );
+  });
+}
+
+Future<void> _pumpDetail(
+  WidgetTester tester, {
+  required Drama card,
+  required CatalogRepository catalog,
+  bool settle = true,
+}) async {
+  tester.view.physicalSize = const Size(390, 844);
+  tester.view.devicePixelRatio = 1;
+  addTearDown(tester.view.resetPhysicalSize);
+  addTearDown(tester.view.resetDevicePixelRatio);
+  final favorites = FavoriteController(
+    InMemoryFavoriteRepository(cards: [card]),
+  );
+  await favorites.load();
+  await tester.pumpWidget(
+    MultiProvider(
+      providers: [
+        Provider<WatchHistoryRepository>.value(
+          value: InMemoryWatchHistoryRepository(),
+        ),
+        Provider<PlaybackRepository>.value(value: FakePlaybackRepository()),
+        ChangeNotifierProvider<FavoriteController>.value(value: favorites),
+        ChangeNotifierProvider(
+          create: (_) => CatalogController(catalog)..load(),
+        ),
+      ],
+      child: MaterialApp(
+        locale: const Locale('en'),
+        supportedLocales: AppLocalizations.supportedLocales,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        home: DramaDetailPage(drama: card),
+      ),
+    ),
+  );
+  if (settle) {
+    await tester.pumpAndSettle();
+  } else {
+    await tester.pump();
+  }
+}
+
+Drama _cardDrama() => const Drama(
+  id: 'detail-k53',
+  title: 'Detail K53',
+  synopsis: 'A card synopsis is available before the detail request finishes.',
+  posterUrl: '/files/detail-k53.png',
+  category: 'Romance',
+  genre: 'Urban',
+  language: 'id',
+  totalEpisodes: 8,
+  viewCount: 120000,
+  favoriteCount: 3200,
+  likeCount: 5600,
+);
+
+Drama _detailDrama(Drama card) => Drama(
+  id: card.id,
+  title: card.title,
+  synopsis: card.synopsis,
+  posterUrl: card.posterUrl,
+  category: card.category,
+  genre: card.genre,
+  language: card.language,
+  totalEpisodes: card.totalEpisodes,
+  viewCount: card.viewCount,
+  favoriteCount: card.favoriteCount,
+  likeCount: card.likeCount,
+  detailLoaded: true,
+  episodes: [
+    for (var number = 1; number <= card.totalEpisodes; number++)
+      Episode(
+        id: '${card.id}-$number',
+        number: number,
+        title: 'Episode $number',
+        isFree: number == 1,
+        videoUrl: number == 1 ? '/files/${card.id}-1.mp4' : '',
+        locked: number > 1,
+      ),
+  ],
+);
+
+class _ScriptedCatalog extends FakeCatalogRepository {
+  _ScriptedCatalog({required List<Drama> dramas, required this.loadDetail})
+    : super(dramas: dramas);
+
+  final Future<Drama> Function() loadDetail;
+
+  @override
+  Future<Drama> fetchDrama(String dramaId) => loadDetail();
+}
diff --git a/test/drama_detail/drama_detail_view_test.dart b/test/drama_detail/drama_detail_view_test.dart
index ed939b3..f66c0ba 100644
--- a/test/drama_detail/drama_detail_view_test.dart
+++ b/test/drama_detail/drama_detail_view_test.dart
@@ -1,20 +1,37 @@
 // Author: fruit.com.cn
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 
+import 'package:fruitshorts/core/data/models/auth_session.dart';
 import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/download_license.dart';
+import 'package:fruitshorts/core/data/models/download_policy.dart';
+import 'package:fruitshorts/core/data/models/wallet.dart';
+import 'package:fruitshorts/core/data/remote/api_client.dart';
+import 'package:fruitshorts/core/data/remote/auth_api.dart';
 import 'package:fruitshorts/core/data/repositories/comment_repository.dart';
+import 'package:fruitshorts/core/data/repositories/commerce_repository.dart';
+import 'package:fruitshorts/core/data/repositories/download_repository.dart';
 import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/interaction_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/core/data/services/auth_controller.dart';
+import 'package:fruitshorts/core/data/services/auth_session_store.dart';
 import 'package:fruitshorts/core/data/services/catalog_controller.dart';
+import 'package:fruitshorts/core/data/services/download_controller.dart';
 import 'package:fruitshorts/core/data/services/favorite_controller.dart';
 import 'package:fruitshorts/core/data/services/interaction_controller.dart';
 import 'package:fruitshorts/core/data/services/playback_session.dart';
+import 'package:fruitshorts/core/data/services/wallet_controller.dart';
 import 'package:fruitshorts/core/platform/haptics.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
 import 'package:fruitshorts/core/theme/app_theme.dart';
 import 'package:fruitshorts/l10n/app_localizations.dart';
 import 'package:fruitshorts/pages/drama_detail/drama_detail_view.dart';
@@ -22,94 +39,171 @@ import 'package:fruitshorts/pages/player/player_view.dart';
 
 import '../support/fake_catalog.dart';
 import '../support/fake_haptics.dart';
+import '../support/fake_http_adapter.dart';
 import '../support/fake_interaction_repositories.dart';
 import '../support/widget_player.dart';
 
 void main() {
-  testWidgets('should_render_preview_hero_cta_synopsis_and_episode_chips', (
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+  });
+
+  testWidgets('should_render_new_detail_layout_and_existing_menu', (
     tester,
   ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
+    await _pumpDetail(tester);
 
-    await tester.pumpWidget(_host(_detailDrama()));
-    await tester.pumpAndSettle();
-
-    expect(tester.getSize(find.byKey(const Key('detail-hero'))).height, 190);
+    final overlay = tester.widget<AnnotatedRegion<SystemUiOverlayStyle>>(
+      find.byKey(const Key('detail-system-overlay')),
+    );
+    expect(overlay.value.systemNavigationBarColor, AppColors.ink);
+    expect(overlay.value.systemNavigationBarContrastEnforced, isFalse);
+    expect(find.byKey(const Key('detail-hero')), findsOneWidget);
+    expect(
+      tester.getSize(find.byKey(const Key('detail-poster'))),
+      const Size(96, 128),
+    );
     expect(
       tester.getSize(find.byKey(const Key('detail-back'))),
-      const Size(36, 36),
+      const Size(40, 40),
     );
     expect(
       tester
-          .widget<Icon>(
+          .widget<Material>(
             find.descendant(
               of: find.byKey(const Key('detail-back')),
-              matching: find.byType(Icon),
+              matching: find.byType(Material),
             ),
           )
-          .size,
-      18,
+          .color,
+      const Color(0x59000000),
     );
-    expect(find.byKey(const Key('detail-cta')), findsOneWidget);
-    expect(tester.getSize(find.byKey(const Key('detail-cta'))).height, 40);
-    expect(find.byKey(const Key('detail-episode-chip-1')), findsOneWidget);
-    expect(find.byKey(const Key('detail-episode-chip-8')), findsOneWidget);
-
-    final synopsis = tester.widget<Text>(
-      find.byKey(const Key('detail-synopsis')),
+    expect(
+      tester
+          .widget<Text>(find.byKey(const Key('detail-title')))
+          .style
+          ?.fontSize,
+      20,
     );
-    expect(synopsis.style?.fontSize, 11);
-    expect(synopsis.style?.height, 1.6);
+    expect(find.byKey(const Key('detail-episode-count')), findsOneWidget);
+    expect(tester.getSize(find.byKey(const Key('detail-favorite'))).height, 34);
+    final stats = tester.widget<Container>(
+      find.byKey(const Key('detail-stats')),
+    );
+    final statsDecoration = stats.decoration! as BoxDecoration;
+    expect(statsDecoration.color, AppColors.card);
+    expect(statsDecoration.borderRadius, BorderRadius.circular(14));
+    expect(find.byKey(const Key('detail-synopsis-section')), findsOneWidget);
+    expect(find.byKey(const Key('detail-tags')), findsOneWidget);
+    expect(find.byKey(const Key('detail-episodes-section')), findsOneWidget);
+    expect(tester.getSize(find.byKey(const Key('detail-cta'))).height, 46);
+    final bottomBar = tester.widget<Container>(
+      find.byKey(const Key('detail-bottom-bar')),
+    );
+    expect((bottomBar.decoration! as BoxDecoration).color, AppColors.ink);
+    expect(find.byKey(const Key('detail-share')), findsOneWidget);
+    expect(find.byKey(const Key('detail-more')), findsOneWidget);
+    for (final key in const [Key('detail-share'), Key('detail-more')]) {
+      expect(tester.getSize(find.byKey(key)), const Size(40, 40));
+      expect(
+        tester
+            .widget<Material>(
+              find.descendant(
+                of: find.byKey(key),
+                matching: find.byType(Material),
+              ),
+            )
+            .color,
+        const Color(0x59000000),
+      );
+    }
 
     await tester.tap(find.byKey(const Key('detail-more')));
     await tester.pumpAndSettle();
-    expect(find.byKey(const Key('detail-favorite')), findsOneWidget);
+    expect(find.byKey(const Key('detail-menu-favorite')), findsOneWidget);
     expect(find.byKey(const Key('detail-download')), findsOneWidget);
-    expect(find.byKey(const Key('detail-share')), findsOneWidget);
+    expect(find.byKey(const Key('detail-menu-share')), findsOneWidget);
     expect(find.byKey(const Key('detail-report')), findsOneWidget);
     expect(tester.takeException(), isNull);
   });
 
-  testWidgets('should_fit_compact_viewport_when_detail_scrolls', (
+  testWidgets('should_switch_favorite_button_style_when_tapped', (
     tester,
   ) async {
-    tester.view.physicalSize = const Size(320, 568);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
+    await _pumpDetail(tester);
+    BoxDecoration decoration() =>
+        tester
+                .widget<Container>(find.byKey(const Key('detail-favorite')))
+                .decoration!
+            as BoxDecoration;
 
-    await tester.pumpWidget(_host(_detailDrama()));
+    expect(decoration().color, AppColors.card);
+    expect((decoration().border! as Border).top.color, AppColors.blue);
+
+    await tester.tap(find.byKey(const Key('detail-favorite')));
     await tester.pumpAndSettle();
-    final grid = tester.widget<GridView>(
-      find.byKey(const Key('detail-episode-chips')),
-    );
+
+    expect(decoration().color, AppColors.blue);
     expect(
-      (grid.gridDelegate as SliverGridDelegateWithFixedCrossAxisCount)
-          .crossAxisCount,
-      6,
+      find.descendant(
+        of: find.byKey(const Key('detail-favorite')),
+        matching: find.byIcon(Icons.star_rounded),
+      ),
+      findsOneWidget,
     );
-    await tester.drag(
-      find.byKey(const Key('detail-scroll')),
-      const Offset(0, -520),
-    );
-    await tester.pumpAndSettle();
-
-    expect(find.byKey(const Key('detail-episode-chip-8')), findsOneWidget);
-    expect(tester.takeException(), isNull);
   });
 
-  testWidgets('should_render_sorted_six_column_grid_and_open_original_index', (
+  testWidgets('should_expand_synopsis_when_it_exceeds_three_lines', (
     tester,
   ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
+    await _pumpDetail(tester, drama: _detailDrama(longSynopsis: true));
+    Text synopsis() =>
+        tester.widget<Text>(find.byKey(const Key('detail-synopsis')));
 
-    await tester.pumpWidget(_host(_detailDrama(count: 80)));
+    expect(synopsis().maxLines, 3);
+    final toggle = find.byKey(const Key('detail-synopsis-toggle'));
+    expect(toggle, findsOneWidget);
+    await tester.ensureVisible(toggle);
+    await tester.tap(toggle);
+    await tester.pumpAndSettle();
+
+    expect(synopsis().maxLines, isNull);
+    expect(
+      tester.widget<Text>(find.byKey(const Key('detail-synopsis'))).data,
+      contains('final secret'),
+    );
+  });
+
+  testWidgets('should_render_stats_and_honest_empty_values', (tester) async {
+    await _pumpDetail(tester);
+
+    expect(find.text('480.0万 heat'), findsOneWidget);
+    expect(find.text('3200 Favorite'), findsOneWidget);
+    expect(find.text('1.2万 Like'), findsOneWidget);
+
+    await tester.pumpWidget(const SizedBox.shrink());
+    await _pumpDetail(tester, drama: _detailDrama(withCounts: false));
+
+    expect(
+      tester
+          .widget<Text>(find.byKey(const Key('detail-stat-favorite-value')))
+          .data,
+      '8 episodes',
+    );
+    expect(
+      tester.widget<Text>(find.byKey(const Key('detail-stat-like-value'))).data,
+      '—',
+    );
+  });
+
+  testWidgets('should_render_six_column_grid_and_open_original_index', (
+    tester,
+  ) async {
+    await _pumpDetail(tester, drama: _detailDrama(count: 80, descending: true));
+    await tester.ensureVisible(
+      find.byKey(const Key('detail-episodes-section')),
+    );
     await tester.pumpAndSettle();
 
     final grid = tester.widget<GridView>(
@@ -120,7 +214,7 @@ void main() {
     expect(delegate.crossAxisCount, 6);
     expect(delegate.mainAxisSpacing, 8);
     expect(delegate.crossAxisSpacing, 8);
-    expect(delegate.childAspectRatio, closeTo(1.35, 0.001));
+    expect(delegate.mainAxisExtent, 44);
 
     final chip1 = find.byKey(const Key('detail-episode-chip-1'));
     final chip2 = find.byKey(const Key('detail-episode-chip-2'));
@@ -132,104 +226,221 @@ void main() {
       greaterThan(tester.getTopLeft(chip1).dy),
     );
     expect(tester.getTopLeft(chip1).dx, lessThan(tester.getTopLeft(chip2).dx));
-    expect(tester.getSize(chip1), tester.getSize(chip2));
+    expect(tester.getSize(chip1).height, 44);
 
-    await tester.drag(
-      find.byKey(const Key('detail-scroll')),
-      const Offset(0, -420),
-    );
-    await tester.pumpAndSettle();
-    final chip12 = find.byKey(const Key('detail-episode-chip-12'));
-    expect(chip12, findsOneWidget);
-    await tester.tap(chip12);
-    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('detail-episode-lock-2')), findsOneWidget);
+    expect(find.byKey(const Key('detail-episode-lock-1')), findsNothing);
 
+    await tester.tap(chip1);
+    await tester.pumpAndSettle();
     final player = tester.widget<PlayerPage>(find.byType(PlayerPage));
-    expect(player.initialIndex, 11);
+    expect(player.initialIndex, 79);
   });
 
-  testWidgets('should_sort_episode_chips_ascending_by_number', (tester) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
-    await tester.pumpWidget(_host(_detailDrama(count: 80, descending: true)));
-    await tester.pumpAndSettle();
-
-    final chip1 = find.byKey(const Key('detail-episode-chip-1'));
-    final chip2 = find.byKey(const Key('detail-episode-chip-2'));
-    final chip6 = find.byKey(const Key('detail-episode-chip-6'));
-    final chip7 = find.byKey(const Key('detail-episode-chip-7'));
-    expect(tester.getTopLeft(chip1).dy, tester.getTopLeft(chip6).dy);
-    expect(tester.getTopLeft(chip1).dx, lessThan(tester.getTopLeft(chip2).dx));
-    expect(
-      tester.getTopLeft(chip7).dy,
-      greaterThan(tester.getTopLeft(chip1).dy),
+  testWidgets('should_fit_compact_viewport_and_keep_cta_visible', (
+    tester,
+  ) async {
+    await _pumpDetail(
+      tester,
+      drama: _detailDrama(count: 80),
+      size: const Size(320, 568),
     );
-    expect(tester.getSize(chip1), tester.getSize(chip2));
+
+    expect(find.byKey(const Key('detail-cta')), findsOneWidget);
+    await tester.ensureVisible(
+      find.byKey(const Key('detail-episodes-section')),
+    );
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('detail-cta')), findsOneWidget);
+    expect(find.byKey(const Key('detail-episode-chip-8')), findsOneWidget);
+    expect(tester.takeException(), isNull);
   });
 }
 
-Widget _host(Drama drama) {
-  final catalog = FakeCatalogRepository(dramas: [drama]);
+Future<void> _pumpDetail(
+  WidgetTester tester, {
+  Drama? drama,
+  Size size = const Size(390, 844),
+}) async {
+  tester.view.physicalSize = size;
+  tester.view.devicePixelRatio = 1;
+  addTearDown(tester.view.resetPhysicalSize);
+  addTearDown(tester.view.resetDevicePixelRatio);
+  final target = drama ?? _detailDrama();
+  final catalog = FakeCatalogRepository(dramas: [target]);
   final interactions = FakeInteractionRepository();
-  return MultiProvider(
-    providers: [
-      Provider<WatchHistoryRepository>.value(
-        value: InMemoryWatchHistoryRepository(),
+  final auth = await _signedInAuth();
+  final favorites = FavoriteController(
+    InMemoryFavoriteRepository(cards: [target]),
+  );
+  await favorites.load();
+  await tester.pumpWidget(
+    MultiProvider(
+      providers: [
+        Provider<WatchHistoryRepository>.value(
+          value: InMemoryWatchHistoryRepository(),
+        ),
+        Provider<PlaybackRepository>.value(value: FakePlaybackRepository()),
+        Provider<PlayerFactory>.value(value: createWidgetPlayer),
+        Provider(create: (_) => PlaybackCoordinator()),
+        Provider<InteractionRepository>.value(value: interactions),
+        Provider<CommentRepository>.value(value: FakeCommentRepository()),
+        Provider<Haptics>.value(value: FakeHaptics()),
+        ChangeNotifierProvider<AuthController>.value(value: auth),
+        ChangeNotifierProvider<FavoriteController>.value(value: favorites),
+        ChangeNotifierProvider(
+          create: (_) => InteractionController(interactions),
+        ),
+        ChangeNotifierProvider(
+          create: (_) => WalletController(_FakeCommerceRepository()),
+        ),
+        ChangeNotifierProvider(
+          create: (_) => DownloadController(_FakeDownloadRepository()),
+        ),
+        ChangeNotifierProvider(
+          create: (_) => CatalogController(catalog)..load(),
+        ),
+      ],
+      child: MaterialApp(
+        theme: AppTheme.light(),
+        locale: const Locale('en'),
+        supportedLocales: AppLocalizations.supportedLocales,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        home: DramaDetailPage(drama: target),
       ),
-      Provider<PlaybackRepository>.value(value: FakePlaybackRepository()),
-      Provider<PlayerFactory>.value(value: createWidgetPlayer),
-      Provider(create: (_) => PlaybackCoordinator()),
-      Provider<InteractionRepository>.value(value: interactions),
-      Provider<CommentRepository>.value(value: FakeCommentRepository()),
-      Provider<Haptics>.value(value: FakeHaptics()),
-      ChangeNotifierProvider(
-        create: (_) => FavoriteController(InMemoryFavoriteRepository()),
-      ),
-      ChangeNotifierProvider(
-        create: (_) => InteractionController(interactions),
-      ),
-      ChangeNotifierProvider(create: (_) => CatalogController(catalog)..load()),
-    ],
-    child: MaterialApp(
-      theme: AppTheme.dark(),
-      locale: const Locale('en'),
-      supportedLocales: AppLocalizations.supportedLocales,
-      localizationsDelegates: AppLocalizations.localizationsDelegates,
-      home: DramaDetailPage(drama: drama),
     ),
   );
+  await tester.pumpAndSettle();
+}
+
+Future<AuthController> _signedInAuth() async {
+  final preferences = SharedPreferencesAsync();
+  final store = AuthSessionStore(preferences: preferences);
+  await store.save(
+    const AuthSession(
+      accessToken: 'access',
+      refreshToken: 'refresh',
+      user: AuthUser(uid: '9', nickname: 'Viewer'),
+    ),
+  );
+  final auth = AuthController(
+    AuthApi(
+      ApiClient(
+        baseUrl: 'http://127.0.0.1:1',
+        adapter: FakeHttpAdapter((_) async => FakeHttpResponse('{}', 500)),
+      ),
+    ),
+    store,
+  );
+  await auth.load();
+  return auth;
+}
+
+class _FakeCommerceRepository implements CommerceRepository {
+  @override
+  Future<WalletSnapshot> fetchWallet() async => const WalletSnapshot(
+    wallet: CoinWallet(
+      coinBalance: 100,
+      totalRechargedCoin: 0,
+      totalConsumedCoin: 0,
+      totalRefundedCoin: 0,
+    ),
+  );
+
+  @override
+  Future<UnlockResult> unlock(String episodeId) async => const UnlockResult(
+    unlocked: true,
+    accessType: 'UNLOCKED',
+    coinCost: 0,
+    coinBalance: 100,
+  );
 }
 
-Drama _detailDrama({int count = 8, bool descending = false}) {
+class _FakeDownloadRepository implements DownloadRepository {
+  @override
+  Future<DownloadPolicy> fetchPolicy() async => const DownloadPolicy(
+    maxPerDevice: 20,
+    licenseDays: 30,
+    wifiOnly: false,
+    maxQuality: 'AUTO',
+    maxStorageBytes: 0,
+    used: 0,
+    remaining: 20,
+    expirePolicyText: '',
+  );
+
+  @override
+  Future<List<DownloadLicense>> list() async => const [];
+
+  @override
+  Future<DownloadLicense> grant(String episodeId, {String? quality}) async =>
+      throw UnimplementedError();
+
+  @override
+  Future<void> updateSettings({bool? wifiOnly, String? maxQuality}) async {}
+
+  @override
+  Future<DownloadLicense> refreshUrl(String episodeId) async =>
+      throw UnimplementedError();
+
+  @override
+  Future<DownloadLicense> reportProgress(
+    String episodeId, {
+    String? deviceId,
+    String? status,
+    int? progressPercent,
+    int? downloadedBytes,
+    int? totalBytes,
+    String? errorMsg,
+  }) async => throw UnimplementedError();
+
+  @override
+  Future<void> remove(String episodeId) async {}
+
+  @override
+  Future<int> clear() async => 0;
+}
+
+Drama _detailDrama({
+  int count = 8,
+  bool descending = false,
+  bool withCounts = true,
+  bool longSynopsis = false,
+}) {
   final numbers = List<int>.generate(
     count,
     (index) => descending ? count - index : index + 1,
   );
+  final synopsis = longSynopsis
+      ? 'She agreed to marry a mysterious stranger to save her family, '
+            'until she discovered his secret identity and the city he controls. '
+            'Every choice pulls her deeper into a dangerous game, and the '
+            'final secret changes everything she thought she knew about him.'
+      : 'She agreed to marry a mysterious stranger to save her family, '
+            'until she discovered his secret identity and the city he controls.';
   return Drama(
-    id: 'detail-k25',
-    title: 'Detail K25',
-    synopsis:
-        'She agreed to marry a mysterious stranger to save her family, '
-        'until she discovered his secret identity and the city he controls.',
-    posterUrl: '/files/detail-k25.png',
+    id: 'detail-k38',
+    title: 'Detail K38',
+    synopsis: synopsis,
+    posterUrl: '/files/detail-k38.png',
     genre: 'Urban Romance',
     category: 'Romance',
+    language: 'id',
     totalEpisodes: count,
     viewCount: 4800000,
+    favoriteCount: withCounts ? 3200 : null,
+    likeCount: withCounts ? 12400 : null,
     detailLoaded: true,
     episodes: [
       for (final number in numbers)
         Episode(
-          id: 'detail-k25-$number',
+          id: 'detail-k38-$number',
           number: number,
           title: 'Episode $number',
           isFree: number == 1,
           durationSec: 135,
           locked: number > 1,
-          videoUrl: number == 1 ? '/files/detail-k25-1.mp4' : '',
+          videoUrl: number == 1 ? '/files/detail-k38-1.mp4' : '',
         ),
     ],
   );
diff --git a/test/empty_state/empty_state_test.dart b/test/empty_state/empty_state_test.dart
index 8f1588e..cfac0bd 100644
--- a/test/empty_state/empty_state_test.dart
+++ b/test/empty_state/empty_state_test.dart
@@ -12,7 +12,7 @@ void main() {
     var taps = 0;
     await _pump(
       tester,
-      theme: AppTheme.dark(),
+      theme: AppTheme.light(),
       child: EmptyState(
         icon: Icons.movie_outlined,
         title: 'No stories',
@@ -33,7 +33,7 @@ void main() {
     );
     expect(
       tester.widget<Icon>(find.byKey(const Key('empty-state-icon'))).color,
-      AppColors.gold,
+      AppColors.blue,
     );
     expect(
       tester
@@ -103,15 +103,15 @@ void main() {
     expect(find.byKey(const Key('empty-state-action')), findsNothing);
   });
 
-  testWidgets('should_tint_the_bare_icon_for_light_and_dark', (tester) async {
+  testWidgets('should_tint_the_bare_icon_with_the_light_theme', (tester) async {
     await _pump(
       tester,
-      theme: AppTheme.dark(),
+      theme: AppTheme.light(),
       child: const EmptyState(icon: Icons.history_rounded, title: 'No history'),
     );
     expect(
       tester.widget<Icon>(find.byKey(const Key('empty-state-icon'))).color,
-      AppColors.gold,
+      AppColors.blue,
     );
 
     await _pump(
@@ -156,7 +156,7 @@ Future<void> _pump(
 }) async {
   await tester.pumpWidget(
     MaterialApp(
-      theme: theme ?? AppTheme.dark(),
+      theme: theme ?? AppTheme.light(),
       home: Scaffold(body: child),
     ),
   );
diff --git a/test/home/app_bottom_nav_test.dart b/test/home/app_bottom_nav_test.dart
index 6e0d181..df8a59e 100644
--- a/test/home/app_bottom_nav_test.dart
+++ b/test/home/app_bottom_nav_test.dart
@@ -2,13 +2,15 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
 import 'package:fruitshorts/core/theme/app_dimens.dart';
 import 'package:fruitshorts/core/widgets/app_bottom_nav.dart';
 
 void main() {
-  testWidgets('should_render_64_high_navigation_and_keep_item_keys', (
+  testWidgets('should_render_four_slots_with_orange_selected_state', (
     tester,
   ) async {
+    var theaterTaps = 0;
     await tester.pumpWidget(
       MaterialApp(
         home: Scaffold(
@@ -23,7 +25,21 @@ void main() {
                 onTap: () {},
               ),
               AppBottomNavItem(
-                tabKey: const Key('tab-my'),
+                tabKey: const Key('tab-theater'),
+                icon: Icons.explore_outlined,
+                selectedIcon: Icons.explore_rounded,
+                label: 'Theater',
+                onTap: () => theaterTaps++,
+              ),
+              AppBottomNavItem(
+                tabKey: const Key('tab-create'),
+                icon: Icons.add_box_outlined,
+                selectedIcon: Icons.add_box_rounded,
+                label: 'Create',
+                onTap: () {},
+              ),
+              AppBottomNavItem(
+                tabKey: const Key('tab-mine'),
                 icon: Icons.person_outline_rounded,
                 selectedIcon: Icons.person_rounded,
                 label: 'Me',
@@ -36,11 +52,34 @@ void main() {
     );
 
     expect(find.byKey(const Key('tab-home')), findsOneWidget);
-    expect(find.byKey(const Key('tab-my')), findsOneWidget);
+    expect(find.byKey(const Key('tab-theater')), findsOneWidget);
+    expect(find.byKey(const Key('tab-create')), findsOneWidget);
+    expect(find.byKey(const Key('tab-mine')), findsOneWidget);
+    expect(find.byKey(const Key('nav-center-action')), findsNothing);
     expect(find.text('Home'), findsOneWidget);
+    final centers = [
+      Key('tab-home'),
+      Key('tab-theater'),
+      Key('tab-create'),
+      Key('tab-mine'),
+    ].map((key) => tester.getCenter(find.byKey(key)).dx).toList();
+    expect(centers, orderedEquals(centers.toList()..sort()));
     expect(
       tester.getSize(find.byType(AppBottomNav)).height,
       AppDimens.navHeight,
     );
+    expect(
+      tester
+          .widget<Icon>(
+            find.descendant(
+              of: find.byKey(const Key('tab-home')),
+              matching: find.byIcon(Icons.movie_rounded),
+            ),
+          )
+          .color,
+      AppColors.blue,
+    );
+    await tester.tap(find.byKey(const Key('tab-theater')));
+    expect(theaterTaps, 1);
   });
 }
diff --git a/test/home/catalog_controller_refresh_test.dart b/test/home/catalog_controller_refresh_test.dart
new file mode 100644
index 0000000..87a36f1
--- /dev/null
+++ b/test/home/catalog_controller_refresh_test.dart
@@ -0,0 +1,72 @@
+// Author: fruit.com.cn
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/home_feed.dart';
+import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
+import 'package:fruitshorts/core/data/services/catalog_controller.dart';
+
+void main() {
+  test('should_keep_state_when_silent_refresh_fails', () async {
+    final repository = _FakeCatalog(fail: true);
+    final controller = CatalogController(repository);
+    const oldFeed = HomeFeed();
+    controller.feed = oldFeed;
+
+    final ok = await controller.refresh();
+
+    expect(ok, isFalse);
+    expect(controller.feed, same(oldFeed));
+    expect(controller.loading, isFalse);
+    expect(controller.error, isNull);
+  });
+
+  test(
+    'should_replace_feed_without_touching_loading_when_refresh_succeeds',
+    () async {
+      final repository = _FakeCatalog();
+      final controller = CatalogController(repository);
+      controller.feed = const HomeFeed();
+      final next = HomeFeed(
+        sections: [
+          FeedSection(code: 'new', title: 'New', dramas: const [_drama]),
+        ],
+      );
+      repository.next = next;
+
+      final ok = await controller.refresh();
+
+      expect(ok, isTrue);
+      expect(controller.feed, same(next));
+      expect(controller.loading, isFalse);
+      expect(controller.error, isNull);
+    },
+  );
+}
+
+class _FakeCatalog implements CatalogRepository {
+  _FakeCatalog({this.fail = false});
+
+  bool fail;
+  HomeFeed next = const HomeFeed();
+
+  @override
+  Future<HomeFeed> fetchHomeFeed() async {
+    if (fail) throw StateError('offline');
+    return next;
+  }
+
+  @override
+  Future<HomeFeed> fetchDiscoverFeed() async => const HomeFeed();
+
+  @override
+  Future<Drama> fetchDrama(String dramaId) async => _drama;
+}
+
+const _drama = Drama(
+  id: 'refresh-drama',
+  title: 'Refresh Drama',
+  synopsis: 'synopsis',
+  posterUrl: '',
+  detailLoaded: true,
+);
diff --git a/test/home/catalog_diagnostics_test.dart b/test/home/catalog_diagnostics_test.dart
new file mode 100644
index 0000000..4c6aefc
--- /dev/null
+++ b/test/home/catalog_diagnostics_test.dart
@@ -0,0 +1,170 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:fruitshorts/core/config/app_config.dart';
+import 'package:fruitshorts/core/data/services/catalog_retry.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/widgets/catalog_endpoint_editor.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/home/home_view.dart';
+
+void main() {
+  tearDown(AppConfig.clearRuntimeBaseUrl);
+
+  testWidgets('should_show_endpoint_and_raw_error_in_debug_failure', (
+    tester,
+  ) async {
+    AppConfig.applyRuntimeBaseUrl('http://probe.test:8081');
+    await tester.pumpWidget(
+      MaterialApp(
+        locale: const Locale('en'),
+        supportedLocales: AppLocalizations.supportedLocales,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        home: Scaffold(
+          body: HomeFailureView(
+            error: 'SocketException: Connection refused',
+            onRetry: () {},
+            onEditEndpoint: () {},
+          ),
+        ),
+      ),
+    );
+
+    final endpoint = tester.widget<Text>(
+      find.byKey(const Key('catalog-debug-endpoint')),
+    );
+    expect(endpoint.data, '服务地址：http://probe.test:8081');
+    expect(endpoint.style?.fontSize, 12);
+    expect(endpoint.style?.color, AppColors.subtle);
+    expect(endpoint.maxLines, 2);
+
+    final error = tester.widget<Text>(
+      find.byKey(const Key('catalog-debug-error')),
+    );
+    expect(error.data, '错误：SocketException: Connection refused');
+    expect(error.style?.fontSize, 12);
+    expect(error.style?.color, AppColors.subtle);
+    expect(error.maxLines, 2);
+    expect(
+      find.byKey(const Key('catalog-debug-endpoint-edit')),
+      findsOneWidget,
+    );
+  });
+
+  test('should_probe_before_reloading_catalog', () async {
+    final steps = <String>[];
+
+    await retryCatalogLoad(
+      probe: () async => steps.add('probe'),
+      reload: () async => steps.add('load'),
+    );
+
+    expect(steps, ['probe', 'load']);
+  });
+
+  testWidgets('should_save_probe_and_reload_after_valid_endpoint', (
+    tester,
+  ) async {
+    AppConfig.applyRuntimeBaseUrl('http://127.0.0.1:8081');
+    final steps = <String>[];
+    await _pumpEndpointEditor(
+      tester,
+      save: (value) async {
+        steps.add('save:$value');
+        return true;
+      },
+      probe: () async => steps.add('probe'),
+      reload: () async => steps.add('load'),
+    );
+
+    expect(
+      tester
+          .widget<TextField>(
+            find.byKey(const Key('catalog-debug-endpoint-input')),
+          )
+          .controller
+          ?.text,
+      'http://127.0.0.1:8081',
+    );
+    expect(
+      find.byKey(const Key('catalog-debug-endpoint-hint')),
+      findsOneWidget,
+    );
+    await tester.enterText(
+      find.byKey(const Key('catalog-debug-endpoint-input')),
+      'http://10.0.0.8:8081///',
+    );
+    await tester.tap(find.byKey(const Key('catalog-debug-endpoint-save')));
+    await tester.pumpAndSettle();
+
+    expect(steps, ['save:http://10.0.0.8:8081', 'probe', 'load']);
+  });
+
+  testWidgets('should_reject_invalid_endpoint_without_saving', (tester) async {
+    var saves = 0;
+    var probes = 0;
+    var loads = 0;
+    await _pumpEndpointEditor(
+      tester,
+      save: (_) async {
+        saves++;
+        return true;
+      },
+      probe: () async => probes++,
+      reload: () async => loads++,
+    );
+
+    await tester.enterText(
+      find.byKey(const Key('catalog-debug-endpoint-input')),
+      'not a valid url',
+    );
+    await tester.tap(find.byKey(const Key('catalog-debug-endpoint-save')));
+    await tester.pump();
+
+    expect(
+      find.byKey(const Key('catalog-debug-endpoint-error')),
+      findsOneWidget,
+    );
+    expect(
+      find.byKey(const Key('catalog-debug-endpoint-input')),
+      findsOneWidget,
+    );
+    expect(saves, 0);
+    expect(probes, 0);
+    expect(loads, 0);
+  });
+}
+
+Future<void> _pumpEndpointEditor(
+  WidgetTester tester, {
+  required Future<bool> Function(String value) save,
+  required Future<void> Function() probe,
+  required Future<void> Function() reload,
+}) async {
+  await tester.pumpWidget(
+    MaterialApp(
+      home: Builder(
+        builder: (context) => Scaffold(
+          body: TextButton(
+            key: const Key('open-endpoint-editor'),
+            onPressed: () => unawaited(
+              showCatalogEndpointEditor(
+                context,
+                save: save,
+                probe: probe,
+                reload: reload,
+              ),
+            ),
+            child: const Text('open'),
+          ),
+        ),
+      ),
+    ),
+  );
+  await tester.tap(find.byKey(const Key('open-endpoint-editor')));
+  await tester.pumpAndSettle();
+}
diff --git a/test/home/feed_banner_carousel_test.dart b/test/home/feed_banner_carousel_test.dart
new file mode 100644
index 0000000..7fac22b
--- /dev/null
+++ b/test/home/feed_banner_carousel_test.dart
@@ -0,0 +1,88 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/home_feed.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/discover/widgets/feed_banner_carousel.dart';
+
+void main() {
+  testWidgets('should_render_nothing_when_banner_list_is_empty', (
+    tester,
+  ) async {
+    await _pump(tester, const []);
+
+    expect(find.byKey(const Key('feed-banner-carousel')), findsNothing);
+  });
+
+  testWidgets('should_open_linked_drama_when_banner_is_tapped', (tester) async {
+    FeedBanner? opened;
+    await _pump(tester, const [
+      FeedBanner(
+        id: 'banner-1',
+        imageUrl: '/files/banner.jpg',
+        linkType: 'DRAMA',
+        linkValue: 'drama-1',
+      ),
+    ], onOpen: (banner) => opened = banner);
+
+    expect(find.byKey(const Key('feed-banner-carousel')), findsOneWidget);
+    expect(find.byKey(const Key('feed-banner-0')), findsOneWidget);
+    await tester.tap(find.byKey(const Key('feed-banner-0')));
+    await tester.pump();
+
+    expect(opened?.dramaId, 'drama-1');
+  });
+
+  testWidgets('should_advance_to_next_banner_when_interval_elapses', (
+    tester,
+  ) async {
+    await _pump(tester, _banners);
+
+    await tester.pump(const Duration(milliseconds: 4600));
+    await tester.pumpAndSettle();
+
+    expect(_page(tester), 1);
+  });
+
+  testWidgets('should_pause_auto_advance_when_pointer_is_held', (tester) async {
+    await _pump(tester, _banners);
+    final gesture = await tester.startGesture(
+      tester.getCenter(find.byKey(const Key('feed-banner-carousel'))),
+    );
+
+    await tester.pump(const Duration(seconds: 5));
+    expect(_page(tester), 0);
+
+    await gesture.up();
+    await tester.pump(const Duration(seconds: 5));
+    await tester.pumpAndSettle();
+    expect(_page(tester), 1);
+  });
+}
+
+const _banners = [
+  FeedBanner(id: 'banner-1', imageUrl: '/files/one.jpg'),
+  FeedBanner(id: 'banner-2', imageUrl: '/files/two.jpg'),
+];
+
+double _page(WidgetTester tester) =>
+    tester.widget<PageView>(find.byType(PageView)).controller!.page!;
+
+Future<void> _pump(
+  WidgetTester tester,
+  List<FeedBanner> banners, {
+  ValueChanged<FeedBanner>? onOpen,
+}) async {
+  await tester.pumpWidget(
+    MaterialApp(
+      locale: const Locale('en'),
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      home: Scaffold(
+        body: FeedBannerCarousel(banners: banners, onOpen: onOpen ?? (_) {}),
+      ),
+    ),
+  );
+  await tester.pump();
+}
diff --git a/test/home/home_card_style_test.dart b/test/home/home_card_style_test.dart
new file mode 100644
index 0000000..c205ebd
--- /dev/null
+++ b/test/home/home_card_style_test.dart
@@ -0,0 +1,97 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/theme/app_dimens.dart';
+import 'package:fruitshorts/core/theme/app_theme.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/home/widgets/home_drama_grid.dart';
+
+void main() {
+  testWidgets('should_render_compact_cover_badges_without_plus_action', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        locale: const Locale('en'),
+        supportedLocales: AppLocalizations.supportedLocales,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        home: Scaffold(
+          body: SingleChildScrollView(
+            child: Builder(
+              builder: (context) => SizedBox(
+                width: 180,
+                child: HomeDramaCard(
+                  l10n: AppLocalizations.of(context)!,
+                  drama: _drama,
+                  onTap: () {},
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final card = find.byKey(const Key('home-drama-card-style-drama'));
+    final cardContainer = tester.widget<Container>(
+      find.ancestor(of: card, matching: find.byType(Container)).last,
+    );
+    final cardDecoration = cardContainer.decoration! as BoxDecoration;
+    expect(cardDecoration.color, AppColors.card);
+    expect(
+      cardDecoration.borderRadius,
+      BorderRadius.circular(AppDimens.cardRadius),
+    );
+    expect(cardDecoration.boxShadow, const [AppTheme.cardShadow]);
+
+    final tag = tester.widget<Container>(
+      find.byKey(const Key('home-drama-tag-style-drama')),
+    );
+    expect((tag.decoration! as BoxDecoration).color, AppColors.badgePink);
+    expect(find.text('Free'), findsOneWidget);
+    expect(find.text('All 24'), findsOneWidget);
+    expect(
+      find.byKey(const Key('home-drama-locked-style-drama')),
+      findsNothing,
+    );
+    expect(find.byKey(const Key('home-drama-add-style-drama')), findsNothing);
+
+    // 播放次数角标落在封面内，并按万位格式化。
+    final views = find.byKey(const Key('home-drama-views-style-drama'));
+    expect(
+      find.descendant(
+        of: find.byKey(const Key('home-drama-cover-style-drama')),
+        matching: views,
+      ),
+      findsOneWidget,
+    );
+    expect(
+      find.descendant(of: views, matching: find.text('1.2万')),
+      findsOneWidget,
+    );
+
+    // 压缩后卡片高度接近「卡宽 × 1.5」，明显矮于旧版 3:4 封面。
+    final cardSize = tester.getSize(card);
+    expect(cardSize.height, lessThan(cardSize.width * 1.6));
+    final coverSize = tester.getSize(
+      find.byKey(const Key('home-drama-cover-style-drama')),
+    );
+    expect(coverSize.height / coverSize.width, closeTo(6 / 5, 0.02));
+  });
+}
+
+const _drama = Drama(
+  id: 'style-drama',
+  title: 'Warm Orange Story',
+  synopsis: '暖橙短剧',
+  posterUrl: '/files/style.jpg',
+  genre: 'Romance',
+  totalEpisodes: 24,
+  freeEpisodes: 6,
+  viewCount: 12400,
+);
diff --git a/test/home/home_logic_test.dart b/test/home/home_logic_test.dart
index 85c609c..f9c2427 100644
--- a/test/home/home_logic_test.dart
+++ b/test/home/home_logic_test.dart
@@ -1,9 +1,10 @@
-import 'package:flutter/material.dart';
+// Author: fruit.com.cn
+
 import 'package:flutter_test/flutter_test.dart';
 import 'package:fruitshorts/core/data/models/drama.dart';
-import 'package:fruitshorts/pages/discover/discover_logic.dart';
+import 'package:fruitshorts/pages/discover/discover_types.dart';
 import 'package:fruitshorts/pages/home/home_logic.dart';
-import 'package:fruitshorts/pages/mine/mine_logic.dart';
+import 'package:fruitshorts/pages/mine/mine_types.dart';
 
 Drama _drama(String id) => Drama(
   id: id,
@@ -18,20 +19,15 @@ void main() {
 
   final dramas = [_drama('signal'), _drama('city')];
 
-  test(
-    'should_make_first_catalog_entry_the_current_drama_when_catalog_loads',
-    () {
-      final logic = HomeLogic(dramas);
+  test('should_make_first_catalog_entry_current_when_catalog_loads', () {
+    final logic = HomeLogic(dramas);
 
-      expect(logic.currentDrama.id, 'signal');
-      expect(logic.tab, 0);
-      expect(logic.mySection, 0);
-      expect(logic.drawerOpen, isFalse);
-      expect(logic.profile, isFalse);
-      expect(logic.videoImmersive, isFalse);
-      logic.dispose();
-    },
-  );
+    expect(logic.currentDrama.id, 'signal');
+    expect(logic.tab, 0);
+    expect(logic.drawerOpen, isFalse);
+    expect(logic.videoImmersive, isFalse);
+    logic.dispose();
+  });
 
   test('should_not_build_shell_when_catalog_is_empty', () {
     expect(() => HomeLogic(const []), throwsStateError);
@@ -46,7 +42,6 @@ void main() {
 
     expect(logic.tab, 1);
     expect(logic.searchRequest, 0);
-    expect(logic.sectionRequest, 0);
     expect(logic.resumeRequest, 0);
     expect(logic.backRequest, 0);
     expect(notifications, 1);
@@ -57,72 +52,34 @@ void main() {
     final logic = HomeLogic(dramas);
 
     logic.select(1, search: true);
-    expect(logic.tab, 1);
-    expect(logic.searchRequest, 1);
-    expect(logic.sectionRequest, 0);
-
-    logic.select(2, mySection: 0);
-    expect(logic.mySection, 0);
-    expect(logic.sectionRequest, 1);
     expect(logic.searchRequest, 1);
+    expect(logic.resumeRequest, 0);
 
     logic.select(0, resume: true);
     expect(logic.resumeRequest, 1);
-    expect(logic.sectionRequest, 1);
-
-    expect(logic.backRequest, 0);
+    expect(logic.searchRequest, 1);
     logic.dispose();
   });
 
-  test('should_default_to_second_section_when_watchlist_shortcut_is_used', () {
+  test('should_open_profile_tab_when_profile_action_is_used', () {
     final logic = HomeLogic(dramas);
 
-    logic.select(2, watchlist: true);
+    logic.openProfile();
 
-    expect(logic.tab, 2);
-    expect(logic.mySection, 1);
-    expect(logic.sectionRequest, 1);
+    expect(logic.tab, 3);
     logic.dispose();
   });
 
-  test(
-    'should_differ_on_profile_flag_when_open_profile_and_open_library_are_used',
-    () {
-      final logic = HomeLogic(dramas);
-
-      logic.openProfile();
-      expect(logic.profile, isTrue);
-      expect(logic.tab, 2);
-      expect(logic.mySection, 0);
-      expect(logic.sectionRequest, 1);
-
-      logic.openLibrary(section: 1);
-      expect(logic.profile, isFalse);
-      expect(logic.mySection, 1);
-      expect(logic.sectionRequest, 2);
-
-      logic.openLibrary();
-      expect(logic.profile, isFalse);
-      expect(logic.mySection, 1);
-      expect(logic.sectionRequest, 3);
-      logic.dispose();
-    },
-  );
-
-  test('should_return_to_discover_and_handle_immersive_back', () {
+  test('should_return_home_and_handle_immersive_back', () {
     final logic = HomeLogic(dramas);
 
-    // Home is the launch tab; the first back press lands on Discover.
     logic.onSystemBack();
-    expect(logic.tab, 1);
-    logic.onSystemBack();
-    expect(logic.tab, 1);
+    expect(logic.tab, 0);
     expect(logic.backRequest, 0);
 
-    logic.select(0);
+    logic.select(1);
     logic.onSystemBack();
-    expect(logic.tab, 1);
-    expect(logic.backRequest, 0);
+    expect(logic.tab, 0);
 
     logic.select(0);
     logic.onImmersiveChanged(true);
@@ -132,7 +89,7 @@ void main() {
 
     logic.onImmersiveChanged(false);
     logic.onSystemBack();
-    expect(logic.tab, 1);
+    expect(logic.tab, 0);
     logic.dispose();
   });
 
@@ -171,6 +128,9 @@ void main() {
     expect(logic.tab, 1);
     expect(logic.searchRequest, 1);
 
+    logic.myAction(MyPageAction.create);
+    expect(logic.tab, 2);
+
     logic.myAction(MyPageAction.resume);
     expect(logic.tab, 0);
     expect(logic.resumeRequest, 1);
@@ -181,6 +141,20 @@ void main() {
     logic.dispose();
   });
 
+  test('should_map_onto_root_tabs_when_discover_actions_fire', () {
+    final logic = HomeLogic(dramas);
+
+    logic.discoverAction(DiscoverPageAction.my);
+    expect(logic.tab, 3);
+
+    logic.discoverAction(DiscoverPageAction.create);
+    expect(logic.tab, 2);
+
+    logic.discoverAction(DiscoverPageAction.home);
+    expect(logic.tab, 0);
+    logic.dispose();
+  });
+
   test('should_do_nothing_when_notifying_after_dispose', () {
     final logic = HomeLogic(dramas);
     var notifications = 0;
@@ -191,41 +165,4 @@ void main() {
 
     expect(notifications, 0);
   });
-
-  testWidgets('should_map_onto_root_tabs_when_discover_actions_fire', (
-    tester,
-  ) async {
-    final logic = HomeLogic(dramas);
-    late BuildContext context;
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Builder(
-          builder: (inner) {
-            context = inner;
-            return const SizedBox.shrink();
-          },
-        ),
-      ),
-    );
-
-    logic.discoverAction(context, DiscoverPageAction.watchlist);
-    expect(logic.tab, 2);
-    expect(logic.profile, isFalse);
-    expect(logic.mySection, 1);
-    expect(logic.sectionRequest, 1);
-
-    logic.discoverAction(context, DiscoverPageAction.my);
-    expect(logic.tab, 2);
-    expect(logic.profile, isFalse);
-
-    logic.discoverAction(context, DiscoverPageAction.resume);
-    expect(logic.tab, 0);
-    expect(logic.resumeRequest, 1);
-
-    logic.discoverAction(context, DiscoverPageAction.home);
-    expect(logic.tab, 0);
-
-    expect(tester.takeException(), isNull);
-    logic.dispose();
-  });
 }
diff --git a/test/home/home_nav_ui_test.dart b/test/home/home_nav_ui_test.dart
index 0c9d15a..763eb84 100644
--- a/test/home/home_nav_ui_test.dart
+++ b/test/home/home_nav_ui_test.dart
@@ -19,8 +19,9 @@ import '../support/widget_player.dart';
 const _keys = [
   Key('home-tabs-bar'),
   Key('tab-home'),
-  Key('tab-discover'),
-  Key('tab-my'),
+  Key('tab-theater'),
+  Key('tab-create'),
+  Key('tab-mine'),
 ];
 
 void main() {
@@ -33,7 +34,7 @@ void main() {
         });
   });
 
-  testWidgets('should_theme_three_tabs_and_switch_selected_state_when_tapped', (
+  testWidgets('should_theme_four_tabs_and_switch_selected_state_when_tapped', (
     tester,
   ) async {
     final haptics = FakeHaptics();
@@ -51,9 +52,21 @@ void main() {
     final bar = tester.widget<Container>(barFinder);
     final decoration = bar.decoration as BoxDecoration;
     final border = decoration.border as Border;
-    expect(decoration.color, AppColors.bar.withValues(alpha: 0.95));
-    expect(border.top.color, AppColors.outlineVariantDark);
-    expect(border.top.color, isNot(Colors.white));
+    // 首页 feed 用深色导航。
+    expect(decoration.color, const Color(0xE6000000));
+    expect(border.top.color, Colors.white12);
+    expect(
+      tester
+          .widget<Text>(
+            find.descendant(
+              of: find.byKey(const Key('tab-theater')),
+              matching: find.text('Theater'),
+            ),
+          )
+          .style
+          ?.color,
+      Colors.white70,
+    );
     expect(
       tester
           .widget<AnimatedScale>(
@@ -68,56 +81,101 @@ void main() {
     expect(
       find.descendant(
         of: find.byKey(const Key('tab-home')),
-        matching: find.byIcon(Icons.play_circle_fill_rounded),
+        matching: find.byIcon(Icons.home_rounded),
       ),
       findsOneWidget,
     );
+    expect(
+      tester
+          .widget<Icon>(
+            find.descendant(
+              of: find.byKey(const Key('tab-home')),
+              matching: find.byIcon(Icons.home_rounded),
+            ),
+          )
+          .color,
+      AppColors.blue,
+    );
 
-    await tester.tap(find.byKey(const Key('tab-discover')));
+    await tester.tap(find.byKey(const Key('tab-theater')));
     await tester.pumpAndSettle();
     expect(haptics.selectionClicks, 1);
-    await tester.tap(find.byKey(const Key('tab-discover')));
+    final lightBar = tester.widget<Container>(barFinder);
+    final lightDecoration = lightBar.decoration as BoxDecoration;
+    expect(lightDecoration.color, AppColors.bar.withValues(alpha: 0.95));
+    expect((lightDecoration.border as Border).top.color, AppColors.border);
+    await tester.tap(find.byKey(const Key('tab-theater')));
     await tester.pumpAndSettle();
     expect(haptics.selectionClicks, 1);
     expect(
       find.descendant(
-        of: find.byKey(const Key('tab-discover')),
+        of: find.byKey(const Key('tab-theater')),
         matching: find.byIcon(Icons.explore_rounded),
       ),
       findsOneWidget,
     );
+    expect(
+      tester
+          .widget<Text>(
+            find.descendant(
+              of: find.byKey(const Key('tab-theater')),
+              matching: find.text('Theater'),
+            ),
+          )
+          .style
+          ?.color,
+      AppColors.blue,
+    );
+    expect(
+      tester
+          .widget<Text>(
+            find.descendant(
+              of: find.byKey(const Key('tab-home')),
+              matching: find.text('Home'),
+            ),
+          )
+          .style
+          ?.color,
+      AppColors.navUnselected,
+    );
     expect(
       find.descendant(
         of: find.byKey(const Key('tab-home')),
-        matching: find.byIcon(Icons.play_circle_outline_rounded),
+        matching: find.byIcon(Icons.home_outlined),
       ),
       findsOneWidget,
     );
   });
 
-  testWidgets('should_map_three_tabs_to_home_discover_and_me', (tester) async {
+  testWidgets('should_map_four_tabs_to_home_theater_create_and_me', (
+    tester,
+  ) async {
     await _pumpApp(tester);
 
     expect(find.byKey(const Key('tab-home')), findsOneWidget);
-    expect(find.byKey(const Key('tab-discover')), findsOneWidget);
-    expect(find.byKey(const Key('tab-my')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-info-card')), findsOneWidget);
+    expect(find.byKey(const Key('tab-theater')), findsOneWidget);
+    expect(find.byKey(const Key('tab-create')), findsOneWidget);
+    expect(find.byKey(const Key('tab-mine')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
 
-    await tester.tap(find.byKey(const Key('tab-discover')));
+    await tester.tap(find.byKey(const Key('tab-theater')));
     await tester.pumpAndSettle();
     expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
 
-    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.tap(find.byKey(const Key('tab-create')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('create-page')), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('tab-mine')));
     await tester.pumpAndSettle();
     expect(find.text('Viewer'), findsOneWidget);
-    expect(
-      find.byKey(const Key('mine-library-tab-0'), skipOffstage: false),
-      findsOneWidget,
-    );
+    expect(find.byKey(const Key('mine-menu')), findsOneWidget);
+    expect(find.byKey(const Key('mine-watchlist')), findsOneWidget);
+    expect(find.byKey(const Key('mine-library-tab-0')), findsNothing);
 
     await tester.tap(find.byKey(const Key('tab-home')));
     await tester.pumpAndSettle();
-    expect(find.byKey(const Key('home-feed-info-card')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
   });
 
   testWidgets('should_not_haptic_when_ordinary_list_item_is_opened', (
@@ -125,15 +183,15 @@ void main() {
   ) async {
     final haptics = FakeHaptics();
     await _pumpApp(tester, haptics);
-    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.tap(find.byKey(const Key('tab-mine')));
     await tester.pumpAndSettle();
     haptics.reset();
 
-    await tester.drag(find.byType(ListView), const Offset(0, -700));
-    await tester.pumpAndSettle();
-    await tester.tap(find.text('App Language'));
+    await tester.ensureVisible(find.byKey(const Key('mine-settings')));
+    await tester.tap(find.byKey(const Key('mine-settings')));
     await tester.pumpAndSettle();
 
+    expect(find.byKey(const Key('settings-page')), findsOneWidget);
     expect(haptics.calls, isEmpty);
   });
 }
diff --git a/test/home/home_preview_layout_test.dart b/test/home/home_preview_layout_test.dart
index 753de68..17224fc 100644
--- a/test/home/home_preview_layout_test.dart
+++ b/test/home/home_preview_layout_test.dart
@@ -1,5 +1,7 @@
 // Author: fruit.com.cn
 
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
@@ -7,12 +9,15 @@ import 'package:shared_preferences_platform_interface/shared_preferences_async_p
 
 import 'package:fruitshorts/app.dart';
 import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/home_feed.dart';
 import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
 import 'package:fruitshorts/core/theme/app_theme.dart';
 import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/player/widgets/home_feed_header.dart';
 import 'package:fruitshorts/pages/player/widgets/home_feed_overlay.dart';
+import 'package:video_player/video_player.dart';
 
 import '../support/fake_catalog.dart';
 import '../support/fake_category.dart';
@@ -22,9 +27,7 @@ import '../support/fake_notice_repository.dart';
 import '../support/widget_player.dart';
 
 void main() {
-  testWidgets('should_render_preview_home_card_without_hot_or_follow_avatar', (
-    tester,
-  ) async {
+  testWidgets('should_render_immersive_feed_on_home', (tester) async {
     SharedPreferencesAsyncPlatform.instance =
         InMemorySharedPreferencesAsync.empty();
     tester.view.physicalSize = const Size(390, 844);
@@ -32,7 +35,16 @@ void main() {
     addTearDown(tester.view.resetPhysicalSize);
     addTearDown(tester.view.resetDevicePixelRatio);
 
-    final catalog = FakeCatalogRepository();
+    final catalog = FakeCatalogRepository(
+      banners: const [
+        FeedBanner(
+          id: 'banner-1',
+          imageUrl: '/files/banner.jpg',
+          linkType: 'DRAMA',
+          linkValue: 'the-signal-demo',
+        ),
+      ],
+    );
     await tester.pumpWidget(
       LumaDramaApp(
         playerFactory: createWidgetPlayer,
@@ -52,107 +64,343 @@ void main() {
     await tester.pumpAndSettle();
 
     expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-info-card')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-episode')), findsOneWidget);
-    final cardRect = tester.getRect(
-      find.byKey(const Key('home-feed-info-card')),
-    );
-    final episodeRect = tester.getRect(
-      find.byKey(const Key('home-feed-episode')),
-    );
-    expect(episodeRect.left, lessThan(cardRect.center.dx));
-    final railCenter = tester.getCenter(find.byKey(const Key('rail-like')));
-    final railBottom = tester.getBottomLeft(find.byKey(const Key('rail-save')));
-    expect(railCenter.dy, greaterThan(844 * 0.4));
-    expect(railBottom.dy, lessThan(cardRect.top));
-    expect(find.byKey(const Key('home-feed-follow-series')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-episodes')), findsOneWidget);
-    for (final key in const [Key('home-feed-search'), Key('home-feed-more')]) {
-      expect(tester.getSize(find.byKey(key)), const Size(36, 36));
-      expect(
-        tester
-            .widget<Icon>(
-              find.descendant(of: find.byKey(key), matching: find.byType(Icon)),
-            )
-            .size,
-        18,
-      );
-    }
-    expect(
-      tester.getSize(find.byKey(const Key('home-feed-follow-series'))).height,
-      34,
-    );
-    expect(find.text('HOT'), findsNothing);
-    expect(find.textContaining('Season'), findsNothing);
-    expect(find.byKey(const Key('home-feed-follow')), findsNothing);
+    expect(find.byKey(const Key('home-feed-full-series')), findsOneWidget);
+    expect(find.byType(PageView), findsOneWidget);
+    expect(find.byKey(const Key('home-browse-page')), findsNothing);
     expect(tester.takeException(), isNull);
   });
 
-  testWidgets('should_use_episode_title_then_drama_title_as_fallback', (
+  testWidgets('should_render_new_feed_structure_with_formatted_counts', (
     tester,
   ) async {
-    Future<void> pumpEpisode(Episode episode) async {
-      await tester.pumpWidget(
-        MaterialApp(
-          theme: AppTheme.dark(),
-          locale: const Locale('en'),
-          supportedLocales: AppLocalizations.supportedLocales,
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          home: Builder(
-            builder: (context) => Scaffold(
-              body: HomeFeedOverlay(
-                l10n: AppLocalizations.of(context)!,
-                drama: _drama,
-                episode: episode,
-                liked: false,
-                saved: false,
-                onLike: () {},
-                onSave: () {},
-                onComments: () {},
-                onShare: () {},
-                onEpisodes: () {},
-                onDownload: () {},
-                onClear: () {},
-                onSearch: () {},
+    const drama = Drama(
+      id: 'feed-drama',
+      title: 'Feed Drama',
+      synopsis: 'synopsis',
+      posterUrl: '',
+      genre: 'Romance',
+      category: 'Urban',
+      totalEpisodes: 8,
+      freeEpisodes: 8,
+      viewCount: 419000,
+      likeCount: 1006,
+      favoriteCount: 32000,
+      commentCount: 12,
+    );
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        locale: const Locale('en'),
+        supportedLocales: AppLocalizations.supportedLocales,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        home: Builder(
+          builder: (context) => Scaffold(
+            body: HomeFeedOverlay(
+              l10n: AppLocalizations.of(context)!,
+              drama: drama,
+              episode: const Episode(
+                id: 'feed-episode',
+                number: 2,
+                title: 'Ignored Episode Title',
+                isFree: true,
               ),
+              controller: null,
+              liked: true,
+              saved: false,
+              visible: true,
+              boosting: false,
+              onTogglePlay: () {},
+              onBoostStart: () {},
+              onBoostEnd: () {},
+              likeCount: 1006,
+              favoriteCount: 32000,
+              commentCount: 12,
+              onLike: () {},
+              onSave: () {},
+              onComments: () {},
+              onShare: () {},
+              onDetail: () {},
+              onOpenFullPlayer: () {},
+              onMore: () {},
             ),
           ),
         ),
-      );
-      await tester.pumpAndSettle();
-    }
-
-    await pumpEpisode(
-      const Episode(
-        id: 'featured',
-        number: 2,
-        title: 'Midnight Contract',
-        isFree: true,
       ),
     );
-    expect(
-      tester
-          .widget<Text>(find.byKey(const Key('home-feed-episode-title')))
-          .data,
-      'Midnight Contract',
-    );
+    await tester.pumpAndSettle();
 
-    await pumpEpisode(
-      const Episode(id: 'fallback', number: 2, title: '', isFree: true),
+    expect(
+      tester.widget<Text>(find.byKey(const Key('home-feed-title'))).data,
+      'Feed Drama',
+    );
+    expect(find.byKey(const Key('home-feed-info-card')), findsNothing);
+    expect(find.byKey(const Key('home-feed-full-series')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-tags')), findsOneWidget);
+    expect(find.text('Episode 2'), findsOneWidget);
+    expect(find.textContaining('41.9万'), findsOneWidget);
+    expect(
+      tester.widget<Text>(find.byKey(const Key('rail-like-count'))).data,
+      '1006',
     );
     expect(
-      tester
-          .widget<Text>(find.byKey(const Key('home-feed-episode-title')))
-          .data,
-      'Fallback Drama',
+      tester.widget<Text>(find.byKey(const Key('rail-save-count'))).data,
+      '3.2万',
+    );
+    expect(
+      tester.widget<Text>(find.byKey(const Key('rail-comments-count'))).data,
+      '12',
     );
   });
-}
 
-const _drama = Drama(
-  id: 'featured-drama',
-  title: 'Fallback Drama',
-  synopsis: 'synopsis',
-  posterUrl: '',
-  totalEpisodes: 8,
-);
+  testWidgets('should_seek_and_open_player_from_feed_actions', (tester) async {
+    var opened = 0;
+    Duration? seeked;
+    final controller = ValueNotifier<VideoPlayerValue>(
+      VideoPlayerValue(
+        duration: const Duration(seconds: 100),
+        position: const Duration(seconds: 10),
+        isInitialized: true,
+      ),
+    );
+    addTearDown(controller.dispose);
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        locale: const Locale('en'),
+        supportedLocales: AppLocalizations.supportedLocales,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        home: Builder(
+          builder: (context) => Scaffold(
+            body: HomeFeedOverlay(
+              l10n: AppLocalizations.of(context)!,
+              drama: const Drama(
+                id: 'action-drama',
+                title: 'Action Drama',
+                synopsis: 'synopsis',
+                posterUrl: '',
+                totalEpisodes: 8,
+                viewCount: 1200,
+              ),
+              episode: const Episode(
+                id: 'action-episode',
+                number: 1,
+                title: 'Episode 1',
+                isFree: true,
+              ),
+              controller: controller,
+              liked: false,
+              saved: false,
+              visible: true,
+              boosting: false,
+              onTogglePlay: () {},
+              onBoostStart: () {},
+              onBoostEnd: () {},
+              onLike: () {},
+              onSave: () {},
+              onComments: () {},
+              onShare: () {},
+              onDetail: () {},
+              onOpenFullPlayer: () => opened++,
+              onMore: () {},
+              onScrubStart: () {},
+              onSeek: (value) => seeked = value,
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final bar = tester.getRect(find.byKey(const Key('home-feed-full-series')));
+    expect(bar.height, 44);
+    expect(
+      tester
+          .widget<Container>(find.byKey(const Key('home-feed-full-series-bg')))
+          .color,
+      const Color(0x4D000000),
+    );
+    expect(
+      tester.getRect(find.textContaining('Watch full series')).center.dy,
+      closeTo(bar.center.dy, 2),
+    );
+    expect(
+      tester.getSize(find.byKey(const Key('home-feed-progress-thumb'))),
+      const Size(6, 6),
+    );
+    expect(
+      tester.getSize(find.byKey(const Key('home-feed-progress'))).height,
+      greaterThanOrEqualTo(24),
+    );
+    expect(
+      tester
+          .getRect(find.byKey(const Key('home-feed-progress-thumb')))
+          .center
+          .dy,
+      closeTo(
+        tester
+            .getRect(find.byKey(const Key('home-feed-progress-track')))
+            .center
+            .dy,
+        0.5,
+      ),
+    );
+
+    final gesture = await tester.startGesture(
+      tester.getCenter(find.byKey(const Key('home-feed-progress'))),
+    );
+    await gesture.moveBy(const Offset(120, 0));
+    await tester.pump();
+    expect(
+      tester.getSize(find.byKey(const Key('home-feed-progress-thumb'))),
+      const Size(14, 14),
+    );
+    expect(
+      tester.getSize(find.byKey(const Key('home-feed-progress-track'))).height,
+      6,
+    );
+    expect(
+      tester
+          .getRect(find.byKey(const Key('home-feed-progress-thumb')))
+          .center
+          .dy,
+      closeTo(
+        tester
+            .getRect(find.byKey(const Key('home-feed-progress-track')))
+            .center
+            .dy,
+        0.5,
+      ),
+    );
+    await gesture.up();
+    await tester.pumpAndSettle();
+    expect(seeked, isNotNull);
+    expect(seeked!.inSeconds, greaterThan(0));
+    expect(
+      tester.getSize(find.byKey(const Key('home-feed-progress-thumb'))),
+      const Size(6, 6),
+    );
+    expect(
+      tester.getSize(find.byKey(const Key('home-feed-progress-track'))).height,
+      2,
+    );
+
+    await tester.tap(find.byKey(const Key('home-feed-full-series')));
+    await tester.pump();
+    expect(opened, 1);
+  });
+
+  testWidgets('should_show_refresh_spinner_until_refresh_finishes', (
+    tester,
+  ) async {
+    final completer = Completer<bool>();
+    var calls = 0;
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        locale: const Locale('en'),
+        supportedLocales: AppLocalizations.supportedLocales,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        home: Builder(
+          builder: (context) => Scaffold(
+            body: HomeFeedHeader(
+              l10n: AppLocalizations.of(context)!,
+              onRefresh: () {
+                calls++;
+                return completer.future;
+              },
+              onSearch: () {},
+              onMore: () {},
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const Key('home-feed-refresh')));
+    await tester.pump();
+    expect(find.byKey(const Key('home-feed-refreshing')), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('home-feed-refresh')));
+    await tester.pump();
+    expect(calls, 1);
+
+    completer.complete(true);
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('home-feed-refreshing')), findsNothing);
+    expect(find.byIcon(Icons.refresh_rounded), findsOneWidget);
+  });
+
+  testWidgets('should_seek_from_series_bar_when_overlay_is_cleared', (
+    tester,
+  ) async {
+    Duration? seeked;
+    final controller = ValueNotifier<VideoPlayerValue>(
+      VideoPlayerValue(
+        duration: const Duration(seconds: 100),
+        position: const Duration(seconds: 10),
+        isInitialized: true,
+      ),
+    );
+    addTearDown(controller.dispose);
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        locale: const Locale('en'),
+        supportedLocales: AppLocalizations.supportedLocales,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        home: Builder(
+          builder: (context) => Scaffold(
+            body: HomeFeedOverlay(
+              l10n: AppLocalizations.of(context)!,
+              drama: const Drama(
+                id: 'clear-drama',
+                title: 'Clear Drama',
+                synopsis: 'synopsis',
+                posterUrl: '',
+                totalEpisodes: 8,
+              ),
+              episode: const Episode(
+                id: 'clear-episode',
+                number: 1,
+                title: 'Episode 1',
+                isFree: true,
+              ),
+              controller: controller,
+              liked: false,
+              saved: false,
+              visible: false,
+              boosting: false,
+              onTogglePlay: () {},
+              onBoostStart: () {},
+              onBoostEnd: () {},
+              onLike: () {},
+              onSave: () {},
+              onComments: () {},
+              onShare: () {},
+              onDetail: () {},
+              onOpenFullPlayer: () {},
+              onMore: () {},
+              onScrubStart: () {},
+              onSeek: (value) => seeked = value,
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('home-feed-full-series')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-progress')), findsOneWidget);
+
+    final gesture = await tester.startGesture(
+      tester.getCenter(find.byKey(const Key('home-feed-progress'))),
+    );
+    await gesture.moveBy(const Offset(80, 0));
+    await gesture.up();
+    await tester.pumpAndSettle();
+
+    expect(seeked, isNotNull);
+    expect(seeked!.inSeconds, greaterThan(0));
+  });
+}
diff --git a/test/home/home_server_setting_test.dart b/test/home/home_server_setting_test.dart
index 239da4f..3278287 100644
--- a/test/home/home_server_setting_test.dart
+++ b/test/home/home_server_setting_test.dart
@@ -12,45 +12,23 @@ void main() {
         InMemorySharedPreferencesAsync.empty();
   });
 
-  testWidgets(
-    'should_show_server_settings_and_open_dialog_when_debug_tools_are_enabled',
-    (tester) async {
-      await _pumpFailureView(tester, showDebugTools: true);
-
-      final button = find.byKey(const Key('home-server-settings'));
-      expect(button, findsOneWidget);
-      expect(find.text('Server settings'), findsOneWidget);
-
-      await tester.tap(button);
-      await tester.pumpAndSettle();
-
-      expect(find.byKey(const Key('server-endpoint-input')), findsOneWidget);
-      expect(find.text('Restart the app to apply.'), findsOneWidget);
-    },
-  );
-
-  testWidgets('should_hide_server_settings_when_debug_tools_are_disabled', (
+  testWidgets('should_not_expose_server_settings_on_catalog_failure', (
     tester,
   ) async {
-    await _pumpFailureView(tester, showDebugTools: false);
-
+    await _pumpFailureView(tester);
     expect(find.byKey(const Key('home-server-settings')), findsNothing);
     expect(find.text('Server settings'), findsNothing);
+    expect(find.text('Retry'), findsOneWidget);
   });
 }
 
-Future<void> _pumpFailureView(
-  WidgetTester tester, {
-  required bool showDebugTools,
-}) async {
+Future<void> _pumpFailureView(WidgetTester tester) async {
   await tester.pumpWidget(
     MaterialApp(
       locale: const Locale('en'),
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
-      home: Scaffold(
-        body: HomeFailureView(onRetry: () {}, showDebugTools: showDebugTools),
-      ),
+      home: Scaffold(body: HomeFailureView(onRetry: () {})),
     ),
   );
   await tester.pumpAndSettle();
diff --git a/test/home/home_startup_splash_test.dart b/test/home/home_startup_splash_test.dart
new file mode 100644
index 0000000..9e37466
--- /dev/null
+++ b/test/home/home_startup_splash_test.dart
@@ -0,0 +1,182 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+
+import 'package:fruitshorts/app.dart';
+import 'package:fruitshorts/core/config/app_config.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/home_feed.dart';
+import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/core/data/services/catalog_controller.dart';
+import 'package:fruitshorts/core/theme/app_theme.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/home/home_view.dart';
+
+import '../support/fake_catalog.dart';
+import '../support/fake_category.dart';
+import '../support/fake_haptics.dart';
+import '../support/fake_interaction_repositories.dart';
+import '../support/fake_notice_repository.dart';
+import '../support/widget_player.dart';
+
+void main() {
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+    AppConfig.clearRuntimeBaseUrl();
+    AppConfig.ready = Future<void>.value();
+  });
+
+  tearDown(() {
+    debugDefaultTargetPlatformOverride = null;
+    AppConfig.clearRuntimeBaseUrl();
+    AppConfig.ready = Future<void>.value();
+  });
+
+  testWidgets('should_show_platform_startup_image_before_catalog_settles', (
+    tester,
+  ) async {
+    final controller = CatalogController(_EmptyCatalogRepository())
+      ..loading = true
+      ..settled = false;
+    addTearDown(controller.dispose);
+
+    for (final platform in [TargetPlatform.android, TargetPlatform.iOS]) {
+      debugDefaultTargetPlatformOverride = platform;
+      await _pumpHomePage(tester, controller);
+
+      final image = tester.widget<Image>(
+        find.byKey(const Key('startup-splash')),
+      );
+      final expectedAsset = platform == TargetPlatform.android
+          ? 'assets/icon/splash_logo_android12.png'
+          : 'assets/icon/splash_logo.png';
+      final expectedSize = platform == TargetPlatform.android ? 288.0 : 384.0;
+
+      expect(
+        image.image,
+        isA<AssetImage>().having(
+          (asset) => asset.assetName,
+          'assetName',
+          expectedAsset,
+        ),
+      );
+      expect(
+        tester.getSize(find.byKey(const Key('startup-splash'))),
+        Size.square(expectedSize),
+      );
+      expect(find.byType(CircularProgressIndicator), findsNothing);
+    }
+    debugDefaultTargetPlatformOverride = null;
+  });
+
+  testWidgets('should_show_spinner_when_retry_loads_after_catalog_settled', (
+    tester,
+  ) async {
+    final controller = CatalogController(_EmptyCatalogRepository())
+      ..loading = true
+      ..settled = true;
+    addTearDown(controller.dispose);
+
+    await _pumpHomePage(tester, controller);
+
+    expect(find.byType(CircularProgressIndicator), findsOneWidget);
+    expect(find.byKey(const Key('startup-splash')), findsNothing);
+  });
+
+  testWidgets('should_enter_home_and_remove_startup_image_when_data_is_ready', (
+    tester,
+  ) async {
+    AppConfig.ready = Future<void>.value();
+    final catalog = _PendingCatalogRepository();
+    await tester.pumpWidget(
+      LumaDramaApp(
+        playerFactory: createWidgetPlayer,
+        catalogRepository: catalog,
+        categoryRepository: FakeCategoryRepository(catalog: catalog),
+        watchHistoryRepository: InMemoryWatchHistoryRepository(),
+        favoriteRepository: InMemoryFavoriteRepository(cards: catalog.dramas),
+        playbackRepository: FakePlaybackRepository(),
+        commentRepository: FakeCommentRepository(),
+        interactionRepository: FakeInteractionRepository(),
+        noticeRepository: FakeNoticeRepository(),
+        haptics: FakeHaptics(),
+      ),
+    );
+    await tester.pump();
+
+    expect(find.byKey(const Key('startup-splash')), findsOneWidget);
+    expect(find.byType(CircularProgressIndicator), findsNothing);
+
+    catalog.complete(_feed);
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('startup-splash')), findsNothing);
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+  });
+}
+
+Future<void> _pumpHomePage(
+  WidgetTester tester,
+  CatalogController controller,
+) async {
+  await tester.pumpWidget(
+    ChangeNotifierProvider<CatalogController>.value(
+      value: controller,
+      child: MaterialApp(
+        theme: AppTheme.light(),
+        locale: const Locale('en'),
+        supportedLocales: AppLocalizations.supportedLocales,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        home: const HomePage(),
+      ),
+    ),
+  );
+  await tester.pump();
+}
+
+final _feed = HomeFeed(
+  sections: [
+    FeedSection(code: 'hot', title: 'Hot', dramas: [demoDramas.first]),
+  ],
+);
+
+class _EmptyCatalogRepository implements CatalogRepository {
+  @override
+  Future<HomeFeed> fetchHomeFeed() async => const HomeFeed();
+
+  @override
+  Future<HomeFeed> fetchDiscoverFeed() async => const HomeFeed();
+
+  @override
+  Future<Drama> fetchDrama(String dramaId) async => _feed.dramas.first;
+}
+
+class _PendingCatalogRepository implements CatalogRepository {
+  final Completer<HomeFeed> _home = Completer<HomeFeed>();
+
+  List<Drama> get dramas => _feed.dramas;
+
+  void complete(HomeFeed feed) {
+    if (!_home.isCompleted) _home.complete(feed);
+  }
+
+  @override
+  Future<HomeFeed> fetchHomeFeed() => _home.future;
+
+  @override
+  Future<HomeFeed> fetchDiscoverFeed() async => _feed;
+
+  @override
+  Future<Drama> fetchDrama(String dramaId) async => _feed.dramas.first;
+}
diff --git a/test/home/k28_a_navigation_test.dart b/test/home/k28_a_navigation_test.dart
new file mode 100644
index 0000000..880bbeb
--- /dev/null
+++ b/test/home/k28_a_navigation_test.dart
@@ -0,0 +1,443 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/app.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/pages/player/player_view.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+
+import '../support/fake_catalog.dart';
+import '../support/fake_category.dart';
+import '../support/fake_haptics.dart';
+import '../support/fake_interaction_repositories.dart';
+import '../support/widget_player.dart';
+
+void main() {
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+  });
+
+  testWidgets('should_render_four_tabs_and_open_create_placeholder', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+
+    for (final key in _tabKeys) {
+      expect(find.byKey(key), findsOneWidget);
+    }
+
+    await tester.tap(find.byKey(const Key('tab-create')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('create-page')), findsOneWidget);
+    expect(find.text('Create'), findsWidgets);
+    expect(find.text('Stories become short dramas'), findsOneWidget);
+    expect(find.byKey(const Key('create-ai')), findsOneWidget);
+    expect(find.byKey(const Key('create-upload')), findsOneWidget);
+    expect(tester.getSize(find.byKey(const Key('create-ai'))).height, 196);
+    expect(find.byKey(const Key('create-motto-primary')), findsOneWidget);
+    expect(find.byKey(const Key('create-motto-secondary')), findsOneWidget);
+    expect(
+      tester.getSize(find.byKey(const Key('create-motto-line'))),
+      const Size(96, 2),
+    );
+
+    await tester.tap(find.byKey(const Key('create-ai')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('create-placeholder-page')), findsOneWidget);
+    expect(find.text('Coming soon'), findsOneWidget);
+  });
+
+  testWidgets('should_start_home_on_immersive_feed', (tester) async {
+    await _pumpApp(tester);
+
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-full-series')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-black-background')), findsOneWidget);
+    expect(find.byType(PageView), findsOneWidget);
+    expect(find.byKey(const Key('home-browse-page')), findsNothing);
+    expect(
+      tester.widget<Text>(find.byKey(const Key('rail-like-count'))).data,
+      '41.9万',
+    );
+    expect(
+      tester.widget<Text>(find.byKey(const Key('rail-save-count'))).data,
+      '1006',
+    );
+    expect(
+      tester.widget<Text>(find.byKey(const Key('rail-comments-count'))).data,
+      '3.2万',
+    );
+    expect(find.byKey(const Key('home-feed-refresh')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-danmaku')), findsNothing);
+    expect(find.byKey(const Key('home-feed-fullscreen')), findsNothing);
+    expect(
+      tester.widget<Scaffold>(find.byType(Scaffold).first).backgroundColor,
+      Colors.transparent,
+    );
+    expect(find.byKey(const Key('home-page-gradient')), findsNothing);
+    expect(_hasLightStatusBar(tester), isTrue);
+    expect(tester.widget<PlayerPage>(find.byType(PlayerPage)).homeMode, isTrue);
+  });
+
+  testWidgets('should_open_full_player_from_full_series_bar', (tester) async {
+    await _pumpApp(tester);
+
+    await tester.tap(find.byKey(const Key('home-feed-full-series')));
+    await tester.pumpAndSettle();
+
+    final player = tester.widget<PlayerPage>(find.byType(PlayerPage).last);
+    expect(player.homeMode, isFalse);
+  });
+
+  testWidgets('should_show_coming_soon_for_anime_tab', (tester) async {
+    await _pumpApp(tester);
+
+    await tester.tap(find.byKey(const Key('home-feed-tab-anime')));
+    await tester.pump();
+    expect(find.text('Coming soon'), findsOneWidget);
+  });
+
+  testWidgets('should_refresh_feed_without_blank_loading', (tester) async {
+    await _pumpApp(tester);
+
+    await tester.tap(find.byKey(const Key('home-feed-refresh')));
+    await tester.pump();
+
+    expect(find.byType(CircularProgressIndicator), findsNothing);
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+  });
+
+  testWidgets('should_keep_feed_rail_above_bottom_panels', (tester) async {
+    await _pumpApp(tester);
+    final railTop = tester.getCenter(find.byKey(const Key('rail-save'))).dy;
+    final railBottom = tester
+        .getRect(find.byKey(const Key('rail-share')))
+        .bottom;
+    final seriesTop = tester
+        .getRect(find.byKey(const Key('home-feed-full-series')))
+        .top;
+    final titleRight = tester
+        .getRect(find.byKey(const Key('home-feed-title')))
+        .right;
+    final railLeft = tester.getRect(find.byKey(const Key('rail-save'))).left;
+
+    expect(railTop, greaterThan(844 * 0.45));
+    expect(seriesTop - railBottom, closeTo(12, 1));
+    expect(titleRight, lessThanOrEqualTo(railLeft + 2));
+  });
+
+  testWidgets('should_keep_feed_header_and_progress_after_clear', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+    final gesture = await tester.startGesture(const Offset(195, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+    await gesture.up();
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('player-more-clear')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('home-feed-refresh')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-tab-recommend')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-search')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-full-series')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-progress')), findsOneWidget);
+    expect(find.byKey(const Key('rail-save')), findsNothing);
+    expect(find.byKey(const Key('home-feed-title')), findsNothing);
+    final exit = tester.getRect(
+      find.byKey(const Key('home-feed-exit-clear-screen')),
+    );
+    expect(exit.right, greaterThan(340));
+    expect(exit.center.dy, greaterThan(600));
+
+    await tester.tap(find.byKey(const Key('home-feed-exit-clear-screen')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('rail-save')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+  });
+
+  testWidgets('should_boost_feed_on_side_long_press', (tester) async {
+    await _pumpApp(tester);
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+
+    final gesture = await tester.startGesture(const Offset(60, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+
+    expect(find.byKey(const Key('home-feed-speed-boost-hint')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-full-series')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-title')), findsNothing);
+    expect(find.byKey(const Key('rail-save')), findsNothing);
+    expect(find.byKey(const Key('home-feed-search')), findsNothing);
+
+    await gesture.up();
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('home-feed-speed-boost-hint')), findsNothing);
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+    expect(find.byKey(const Key('rail-save')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-search')), findsOneWidget);
+  });
+
+  testWidgets('should_hide_exit_clear_button_while_boosting', (tester) async {
+    await _pumpApp(tester);
+    final moreGesture = await tester.startGesture(const Offset(195, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+    await moreGesture.up();
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('player-more-clear')));
+    await tester.pumpAndSettle();
+    expect(
+      find.byKey(const Key('home-feed-exit-clear-screen')),
+      findsOneWidget,
+    );
+
+    final boostGesture = await tester.startGesture(const Offset(60, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+
+    expect(find.byKey(const Key('home-feed-speed-boost-hint')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-full-series')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-progress')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-exit-clear-screen')), findsNothing);
+    expect(find.byKey(const Key('home-feed-search')), findsNothing);
+
+    await boostGesture.up();
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('home-feed-speed-boost-hint')), findsNothing);
+    expect(
+      find.byKey(const Key('home-feed-exit-clear-screen')),
+      findsOneWidget,
+    );
+    expect(find.byKey(const Key('home-feed-search')), findsOneWidget);
+  });
+
+  testWidgets('should_resume_playback_when_boosting_while_paused', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+    await tester.tap(find.byKey(const Key('home-feed-video-toggle')));
+    await tester.pump();
+    expect(find.byKey(const Key('home-feed-center-play')), findsOneWidget);
+
+    final gesture = await tester.startGesture(const Offset(60, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+
+    expect(find.byKey(const Key('home-feed-speed-boost-hint')), findsOneWidget);
+    expect(find.textContaining('2.0'), findsWidgets);
+    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
+
+    await gesture.up();
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('home-feed-speed-boost-hint')), findsNothing);
+    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
+  });
+
+  testWidgets('should_open_more_sheet_on_center_long_press', (tester) async {
+    await _pumpApp(tester);
+
+    final gesture = await tester.startGesture(const Offset(195, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+    await gesture.up();
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-more-sheet')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-clear')), findsNothing);
+    expect(find.byKey(const Key('home-feed-download')), findsNothing);
+    expect(find.byKey(const Key('home-feed-pip')), findsNothing);
+  });
+
+  testWidgets('should_restore_light_theme_after_leaving_feed_tab', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+    expect(_hasLightStatusBar(tester), isTrue);
+
+    await tester.tap(find.byKey(const Key('tab-theater')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('home-page-gradient')), findsOneWidget);
+    expect(_hasLightStatusBar(tester), isFalse);
+  });
+
+  testWidgets('should_switch_feed_drama_when_swiped_up', (tester) async {
+    await _pumpApp(tester);
+    final before = tester
+        .widget<Text>(find.byKey(const Key('home-feed-title')))
+        .data;
+
+    await tester.drag(find.byType(PageView).first, const Offset(0, -600));
+    await tester.pumpAndSettle();
+
+    final after = tester
+        .widget<Text>(find.byKey(const Key('home-feed-title')))
+        .data;
+    expect(after, isNot(before));
+  });
+
+  testWidgets('should_keep_feed_header_fixed_when_swiping', (tester) async {
+    await _pumpApp(tester);
+    final before = tester.getRect(find.byKey(const Key('home-feed-search')));
+
+    await tester.drag(find.byType(PageView).first, const Offset(0, -600));
+    await tester.pumpAndSettle();
+
+    final after = tester.getRect(find.byKey(const Key('home-feed-search')));
+    expect(after.top, closeTo(before.top, 0.5));
+    expect(find.byKey(const Key('home-feed-tab-recommend')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-refresh')), findsOneWidget);
+  });
+
+  testWidgets('should_resume_feed_after_returning_from_full_player', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+    await tester.tap(find.byKey(const Key('home-feed-video-toggle')));
+    await tester.pump();
+    expect(find.byKey(const Key('home-feed-center-play')), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('home-feed-full-series')));
+    await tester.pumpAndSettle();
+    expect(
+      tester.widget<PlayerPage>(find.byType(PlayerPage).last).homeMode,
+      isFalse,
+    );
+
+    await tester.tap(find.byKey(const Key('player-back')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
+  });
+
+  testWidgets('should_hide_feed_when_switching_to_theater', (tester) async {
+    await _pumpApp(tester);
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('tab-theater')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('home-feed-title')), findsNothing);
+    expect(find.byKey(const Key('discover-search')), findsOneWidget);
+  });
+
+  testWidgets('should_open_theater_search_when_feed_search_is_tapped', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+
+    await tester.tap(find.byKey(const Key('home-feed-search')));
+    await tester.pumpAndSettle();
+
+    final field = tester.widget<TextField>(
+      find.byKey(const Key('discover-search')),
+    );
+    expect(field.focusNode?.hasFocus, isTrue);
+  });
+
+  testWidgets('should_not_render_theater_language_filters', (tester) async {
+    await _pumpApp(tester);
+    await tester.tap(find.byKey(const Key('tab-theater')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('theater-language-chips')), findsNothing);
+    expect(find.byKey(const Key('theater-category-chips')), findsOneWidget);
+    expect(find.byKey(const Key('discover-search')), findsOneWidget);
+    expect(find.byKey(const Key('discover-refresh')), findsOneWidget);
+    expect(
+      find.byKey(const Key('home-drama-card-the-signal-demo')),
+      findsOneWidget,
+    );
+  });
+
+  testWidgets('should_open_fullscreen_player_when_theater_card_is_tapped', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+    await tester.tap(find.byKey(const Key('tab-theater')));
+    await tester.pumpAndSettle();
+
+    final card = find.byKey(const Key('home-drama-card-the-signal-demo'));
+    await tester.scrollUntilVisible(
+      card,
+      220,
+      scrollable: find
+          .descendant(
+            of: find.byKey(const Key('discover-refresh')),
+            matching: find.byType(Scrollable),
+          )
+          .first,
+    );
+    await tester.ensureVisible(card);
+    await tester.pumpAndSettle();
+    await tester.tap(card);
+    await tester.pumpAndSettle();
+
+    final player = tester.widget<PlayerPage>(find.byType(PlayerPage).last);
+    expect(player.homeMode, isFalse);
+  });
+
+  testWidgets('should_fit_home_feed_and_theater_on_320_width', (tester) async {
+    await _pumpApp(tester, size: const Size(320, 568));
+
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+    expect(tester.takeException(), isNull);
+
+    await tester.tap(find.byKey(const Key('tab-theater')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('theater-category-chips')), findsOneWidget);
+    expect(find.byKey(const Key('theater-language-chips')), findsNothing);
+    expect(tester.takeException(), isNull);
+  });
+}
+
+const _tabKeys = [
+  Key('tab-home'),
+  Key('tab-theater'),
+  Key('tab-create'),
+  Key('tab-mine'),
+];
+
+bool _hasLightStatusBar(WidgetTester tester) => tester
+    .widgetList<AnnotatedRegion<SystemUiOverlayStyle>>(
+      find.byType(AnnotatedRegion<SystemUiOverlayStyle>),
+    )
+    .any((region) => region.value.statusBarIconBrightness == Brightness.light);
+
+Future<void> _pumpApp(
+  WidgetTester tester, {
+  Size size = const Size(390, 844),
+}) async {
+  tester.view.physicalSize = size;
+  tester.view.devicePixelRatio = 1;
+  addTearDown(tester.view.resetPhysicalSize);
+  addTearDown(tester.view.resetDevicePixelRatio);
+  final catalog = FakeCatalogRepository();
+  await tester.pumpWidget(
+    LumaDramaApp(
+      playerFactory: createWidgetPlayer,
+      catalogRepository: catalog,
+      categoryRepository: FakeCategoryRepository(catalog: catalog),
+      watchHistoryRepository: InMemoryWatchHistoryRepository(),
+      favoriteRepository: InMemoryFavoriteRepository(cards: catalog.dramas),
+      playbackRepository: FakePlaybackRepository(),
+      commentRepository: FakeCommentRepository(),
+      interactionRepository: FakeInteractionRepository(),
+      haptics: FakeHaptics(),
+    ),
+  );
+  await tester.pumpAndSettle();
+}
diff --git a/test/integration/live_catalog_test.dart b/test/integration/live_catalog_test.dart
index 274cf60..d3b03ac 100644
--- a/test/integration/live_catalog_test.dart
+++ b/test/integration/live_catalog_test.dart
@@ -29,7 +29,12 @@ void main() {
     final feed = await api.homeFeed();
     expect(feed.sections, isNotEmpty);
     expect(feed.dramas, isNotEmpty);
-    final card = feed.dramas.first;
+    final withCover = feed.dramas.where((item) => item.posterUrl.isNotEmpty);
+    if (withCover.isEmpty) {
+      markTestSkipped('当前目录没有带封面的剧目，已跳过联调断言');
+      return;
+    }
+    final card = withCover.first;
     expect(card.id, isNotEmpty);
     expect(card.title, isNotEmpty);
     expect(card.posterUrl, startsWith('/files/'));
@@ -41,7 +46,12 @@ void main() {
       return;
     }
     final feed = await api.homeFeed();
-    final card = feed.dramas.first;
+    final cards = feed.dramas.where((item) => item.posterUrl.isNotEmpty);
+    if (cards.isEmpty) {
+      markTestSkipped('当前目录没有带封面的剧目，已跳过联调断言');
+      return;
+    }
+    final card = cards.first;
     final detail = await api.dramaDetail(card.id);
 
     expect(detail.id, card.id);
diff --git a/test/interaction/interaction_controller_test.dart b/test/interaction/interaction_controller_test.dart
index b2690b3..e79b8cc 100644
--- a/test/interaction/interaction_controller_test.dart
+++ b/test/interaction/interaction_controller_test.dart
@@ -26,6 +26,23 @@ void main() {
 
     expect(result.isSuccess, isTrue);
     expect(controller.isLiked('5'), isFalse);
+    expect(controller.likeCount('5'), 0);
+    controller.dispose();
+  });
+
+  test('should_expose_latest_server_count_when_two_toggles_succeed', () async {
+    final repository = FakeInteractionRepository(
+      nextLikeResult: const LikeToggleResult(liked: true, count: 12),
+    );
+    final controller = InteractionController(repository);
+
+    await controller.toggleDramaLike('5');
+    expect(controller.likeCount('5'), 12);
+
+    repository.nextLikeResult = const LikeToggleResult(liked: false, count: 11);
+    await controller.toggleDramaLike('5');
+
+    expect(controller.likeCount('5'), 11);
     controller.dispose();
   });
 
@@ -55,6 +72,7 @@ void main() {
     controller.clear();
 
     expect(controller.isLiked('5'), isFalse);
+    expect(controller.likeCount('5'), isNull);
     controller.dispose();
   });
 }
diff --git a/test/library/favorites_page_test.dart b/test/library/favorites_page_test.dart
index 3d12478..b286d81 100644
--- a/test/library/favorites_page_test.dart
+++ b/test/library/favorites_page_test.dart
@@ -10,6 +10,8 @@ import 'package:fruitshorts/core/data/services/auth_controller.dart';
 import 'package:fruitshorts/core/data/services/auth_session_store.dart';
 import 'package:fruitshorts/core/data/services/favorite_controller.dart';
 import 'package:fruitshorts/core/platform/haptics.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/widgets/app_pull_to_refresh.dart';
 import 'package:fruitshorts/core/widgets/empty_state.dart';
 import 'package:fruitshorts/l10n/app_localizations.dart';
 import 'package:fruitshorts/pages/favorites/favorites_page.dart';
@@ -47,9 +49,45 @@ void main() {
 
     await _pumpPage(tester, auth: auth, favorites: favorites);
 
+    expect(find.byKey(const Key('favorites-page')), findsOneWidget);
+    expect(find.byKey(const Key('favorites-back')), findsOneWidget);
+    expect(
+      tester.widget<Text>(find.byKey(const Key('favorites-count'))).data,
+      '2 favorites',
+    );
+    expect(find.text('Long press a card to remove'), findsNothing);
     expect(find.text('Drama signal'), findsOneWidget);
     expect(find.text('Drama city'), findsOneWidget);
+    final title = tester.widget<Text>(
+      find.byKey(const Key('favorite-title-signal')),
+    );
+    expect(title.style?.color, AppColors.onSurface);
+    expect(title.style?.fontSize, 15);
+    expect(
+      tester.getSize(find.byKey(const Key('favorite-cover-signal'))),
+      const Size(80, 106),
+    );
     expect(find.byKey(const Key('favorite-remove-signal')), findsOneWidget);
+    expect(
+      tester.getSize(find.byKey(const Key('favorite-remove-signal'))),
+      const Size(28, 28),
+    );
+    expect(find.byIcon(Icons.star_rounded), findsNWidgets(2));
+    expect(find.byIcon(Icons.favorite_rounded), findsNothing);
+    expect(find.byType(AppPullToRefresh), findsOneWidget);
+    expect(
+      tester.widget<ListView>(find.byType(ListView)).physics,
+      AppPullToRefresh.physics,
+    );
+    await tester.drag(find.byType(ListView), const Offset(0, 240));
+    await tester.pump();
+    expect(find.text('Refreshing…'), findsOneWidget);
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const Key('favorite-remove-signal')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('favorite-card-signal')), findsNothing);
   });
 
   testWidgets('should_keep_card_and_show_failure_when_remove_fails', (
diff --git a/test/mine/mine_logic_test.dart b/test/mine/mine_logic_test.dart
index 5aed167..30cb8d5 100644
--- a/test/mine/mine_logic_test.dart
+++ b/test/mine/mine_logic_test.dart
@@ -1,173 +1,68 @@
+// Author: fruit.com.cn
+
 import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:fruitshorts/core/config/locale_controller.dart';
-import 'package:fruitshorts/core/data/models/drama.dart';
-import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/core/data/models/watch_progress.dart';
 import 'package:fruitshorts/pages/mine/mine_logic.dart';
-import 'package:provider/provider.dart';
-import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
-import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:fruitshorts/pages/mine/mine_types.dart';
 
 import '../support/fake_watch_history.dart';
 
-Drama _drama(String id, {List<int> numbers = const [1, 2, 3]}) => Drama(
-  id: id,
-  title: id,
-  synopsis: 'synopsis',
-  posterUrl: '/files/poster.png',
-  episodes: [
-    for (final number in numbers)
-      Episode(
-        id: '$id-$number',
-        number: number,
-        title: 'Episode $number',
-        videoUrl: 'https://example.test/clip.mp4',
-        isFree: true,
-      ),
-  ],
+const _record = WatchProgress(
+  dramaId: 'signal',
+  episodeId: 'signal-1',
+  position: Duration(seconds: 7),
+  duration: Duration(minutes: 2),
 );
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
-  test(
-    'should_keep_requested_section_and_read_episode_one_when_constructed',
-    () async {
-      final history = FakeWatchHistory()..saved = const Duration(seconds: 7);
-      final logic = MineLogic(
-        history: history,
-        drama: _drama('signal'),
-        initialSection: 1,
-      );
+  test('should_load_recent_watches_when_constructed', () async {
+    final history = FakeWatchHistory()..recentRecords = const [_record];
+    final logic = MineLogic(history: history);
 
-      expect(logic.section, 1);
-      expect(logic.filter, 0);
-      expect(await logic.position, const Duration(seconds: 7));
-      expect(history.reads, ['signal']);
-      logic.dispose();
-    },
-  );
+    await pumpEventQueue();
 
-  test(
-    'should_resume_from_last_watch_when_list_card_has_no_episodes',
-    () async {
-      final history = FakeWatchHistory()
-        ..saved = const Duration(seconds: 7)
-        ..lastEpisode = 'signal-3';
-      final logic = MineLogic(
-        history: history,
-        drama: _drama('signal', numbers: const []),
-        initialSection: 1,
-      );
-
-      expect(await logic.position, const Duration(seconds: 7));
-      expect(history.reads, ['signal']);
-      logic.dispose();
-    },
-  );
-
-  test('should_notify_when_section_and_filter_are_selected', () {
-    final logic = MineLogic(
-      history: FakeWatchHistory(),
-      drama: _drama('s'),
-      initialSection: 0,
-    );
-    var notifications = 0;
-    logic.addListener(() => notifications++);
-
-    logic.selectSection(1);
-    expect(logic.section, 1);
-    expect(notifications, 1);
-
-    logic.selectFilter(2);
-    expect(logic.filter, 2);
-    expect(notifications, 2);
+    expect(logic.recent.single.dramaId, 'signal');
+    expect(logic.recentLoading, isFalse);
+    expect(logic.recentError, isNull);
     logic.dispose();
   });
 
-  test('should_adopt_drama_only_when_page_is_active', () {
-    final history = FakeWatchHistory();
-    final logic = MineLogic(
-      history: history,
-      drama: _drama('signal'),
-      initialSection: 0,
-    );
+  test('should_expose_error_when_recent_request_fails', () async {
+    final history = FakeWatchHistory()..failReads = true;
+    final logic = MineLogic(history: history);
 
-    void sync(
-      Drama next, {
-      required bool active,
-      required bool wasActive,
-      required bool dramaChanged,
-      int sectionRequest = 0,
-      int previousSectionRequest = 0,
-      int initialSection = 0,
-    }) => logic.syncPage(
-      active: active,
-      wasActive: wasActive,
-      nextDrama: next,
-      dramaChanged: dramaChanged,
-      sectionRequest: sectionRequest,
-      previousSectionRequest: previousSectionRequest,
-      initialSection: initialSection,
-    );
+    await pumpEventQueue();
 
-    sync(_drama('city'), active: false, wasActive: true, dramaChanged: true);
-    expect(logic.drama.id, 'signal');
-
-    sync(_drama('city'), active: true, wasActive: false, dramaChanged: false);
-    expect(logic.drama.id, 'city');
-
-    history.reads.clear();
-    sync(
-      _drama('vengeance'),
-      active: true,
-      wasActive: true,
-      dramaChanged: true,
-    );
-    expect(logic.drama.id, 'vengeance');
-    expect(history.reads, ['vengeance']);
-
-    history.reads.clear();
-    sync(_drama('other'), active: true, wasActive: true, dramaChanged: false);
-    expect(logic.drama.id, 'vengeance');
-    expect(history.reads, isEmpty);
+    expect(logic.recent, isEmpty);
+    expect(logic.recentError, 'progressError');
     logic.dispose();
   });
 
-  test(
-    'should_reset_section_when_section_request_arrives_while_page_is_inactive',
-    () {
-      final logic = MineLogic(
-        history: FakeWatchHistory(),
-        drama: _drama('s'),
-        initialSection: 0,
-      );
+  test('should_refresh_recent_only_when_page_becomes_active', () async {
+    final history = FakeWatchHistory()..recentRecords = const [_record];
+    final logic = MineLogic(history: history);
+    await pumpEventQueue();
 
-      logic.syncPage(
-        active: false,
-        wasActive: false,
-        nextDrama: logic.drama,
-        dramaChanged: false,
-        sectionRequest: 1,
-        previousSectionRequest: 0,
-        initialSection: 1,
-      );
+    history.recentRecords = const [];
+    logic.syncPage(active: true, wasActive: true);
+    await pumpEventQueue();
+    expect(logic.recent, hasLength(1));
 
-      expect(logic.section, 1);
-      logic.dispose();
-    },
-  );
+    logic.syncPage(active: true, wasActive: false);
+    await pumpEventQueue();
+    expect(logic.recent, isEmpty);
+    logic.dispose();
+  });
 
-  testWidgets('should_return_choice_and_forward_it_when_act_runs_embedded', (
+  testWidgets('should_forward_action_when_embedded_or_pop_when_standalone', (
     tester,
   ) async {
-    final logic = MineLogic(
-      history: FakeWatchHistory(),
-      drama: _drama('s'),
-      initialSection: 0,
-    );
+    final logic = MineLogic(history: FakeWatchHistory());
     final forwarded = <MyPageAction>[];
     final popped = Completer<MyPageAction?>();
     late BuildContext pageContext;
@@ -191,7 +86,6 @@ void main() {
         ),
       ),
     );
-
     await tester.tap(find.text('open'));
     await tester.pumpAndSettle();
 
@@ -202,72 +96,15 @@ void main() {
       onAction: forwarded.add,
     );
     expect(forwarded, [MyPageAction.discover]);
-    expect(Navigator.of(pageContext).canPop(), isTrue);
 
     logic.act(pageContext, MyPageAction.resume, embedded: false);
     await tester.pumpAndSettle();
-
     await expectLater(popped.future, completion(MyPageAction.resume));
     logic.dispose();
   });
 
-  testWidgets('should_switch_app_locale_when_language_sheet_is_used', (
-    tester,
-  ) async {
-    SharedPreferencesAsyncPlatform.instance =
-        InMemorySharedPreferencesAsync.empty();
-    final locale = LocaleController();
-    final logic = MineLogic(
-      history: FakeWatchHistory(),
-      drama: _drama('s'),
-      initialSection: 0,
-    );
-    late BuildContext context;
-
-    await tester.pumpWidget(
-      ChangeNotifierProvider<LocaleController>.value(
-        value: locale,
-        child: MaterialApp(
-          locale: const Locale('en'),
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
-          home: Builder(
-            builder: (inner) {
-              context = inner;
-              return const Scaffold(body: SizedBox.shrink());
-            },
-          ),
-        ),
-      ),
-    );
-
-    unawaited(logic.showLanguage(context));
-    await tester.pumpAndSettle();
-
-    final l10n = AppLocalizations.of(context)!;
-    expect(find.text(l10n.english), findsOneWidget);
-    expect(find.text(l10n.simplifiedChinese), findsOneWidget);
-    expect(find.text('Bahasa Indonesia'), findsOneWidget);
-
-    await tester.tap(find.text('Bahasa Indonesia'));
-    await tester.pumpAndSettle();
-    expect(locale.locale, const Locale('id'));
-
-    unawaited(logic.showLanguage(context));
-    await tester.pumpAndSettle();
-    await tester.tap(find.text(l10n.simplifiedChinese));
-    await tester.pumpAndSettle();
-
-    expect(locale.locale, const Locale('zh'));
-    logic.dispose();
-  });
-
   test('should_do_nothing_when_notifying_after_dispose', () {
-    final logic = MineLogic(
-      history: FakeWatchHistory(),
-      drama: _drama('s'),
-      initialSection: 0,
-    );
+    final logic = MineLogic(history: FakeWatchHistory());
     var notifications = 0;
     logic.addListener(() => notifications++);
 
diff --git a/test/mine/mine_preview_layout_test.dart b/test/mine/mine_preview_layout_test.dart
index d9c9946..62eb05a 100644
--- a/test/mine/mine_preview_layout_test.dart
+++ b/test/mine/mine_preview_layout_test.dart
@@ -2,15 +2,12 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
-import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
-
 import 'package:fruitshorts/app.dart';
-import 'package:fruitshorts/core/data/models/watch_progress.dart';
 import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
-import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 
 import '../support/fake_catalog.dart';
 import '../support/fake_category.dart';
@@ -20,7 +17,7 @@ import '../support/fake_notice_repository.dart';
 import '../support/widget_player.dart';
 
 void main() {
-  testWidgets('should_render_me_user_wallet_continue_and_language_rows', (
+  testWidgets('should_render_minimal_profile_shortcuts_wallet_vip_and_menu', (
     tester,
   ) async {
     SharedPreferencesAsyncPlatform.instance =
@@ -36,16 +33,7 @@ void main() {
         playerFactory: createWidgetPlayer,
         catalogRepository: catalog,
         categoryRepository: FakeCategoryRepository(catalog: catalog),
-        watchHistoryRepository: InMemoryWatchHistoryRepository(
-          seed: const [
-            WatchProgress(
-              dramaId: 'city-lights-demo',
-              episodeId: 'city-lights-demo-1',
-              position: Duration(minutes: 2),
-              duration: Duration(minutes: 5),
-            ),
-          ],
-        ),
+        watchHistoryRepository: InMemoryWatchHistoryRepository(),
         favoriteRepository: InMemoryFavoriteRepository(cards: catalog.dramas),
         playbackRepository: FakePlaybackRepository(),
         commentRepository: FakeCommentRepository(),
@@ -55,62 +43,32 @@ void main() {
       ),
     );
     await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.tap(find.byKey(const Key('tab-mine')));
     await tester.pumpAndSettle();
 
     expect(find.byKey(const Key('mine-user-row')), findsOneWidget);
-    expect(find.byKey(const Key('mine-wallet')), findsOneWidget);
-    for (final key in const [Key('mine-search-button'), Key('mine-avatar')]) {
-      expect(tester.getSize(find.byKey(key)), const Size(36, 36));
-      expect(
-        tester
-            .widget<Icon>(
-              find.descendant(of: find.byKey(key), matching: find.byType(Icon)),
-            )
-            .size,
-        18,
-      );
+    expect(find.byKey(const Key('mine-continue-watching')), findsNothing);
+    for (final key in const [
+      Key('mine-watchlist'),
+      Key('mine-history'),
+      Key('mine-downloads'),
+      Key('mine-wallet'),
+      Key('mine-wallet-recharge'),
+      Key('mine-vip'),
+      Key('mine-menu'),
+      Key('mine-works'),
+      Key('mine-creator-center'),
+      Key('mine-notices'),
+      Key('mine-settings'),
+      Key('mine-language'),
+      Key('mine-help'),
+    ]) {
+      expect(find.byKey(key), findsOneWidget);
     }
-    expect(find.byKey(const Key('mine-continue-watching')), findsOneWidget);
     expect(find.byKey(const Key('mine-language')), findsOneWidget);
-    expect(find.byKey(const Key('mine-library-tab-0')), findsOneWidget);
-    expect(find.byKey(const Key('mine-library-tab-1')), findsOneWidget);
-    expect(find.byKey(const Key('mine-library-tab-2')), findsOneWidget);
-    final tab0 = find.byKey(const Key('mine-library-tab-0'));
-    final tab1 = find.byKey(const Key('mine-library-tab-1'));
-    final tab2 = find.byKey(const Key('mine-library-tab-2'));
-    expect(tester.getTopLeft(tab0).dx, lessThan(tester.getTopLeft(tab1).dx));
-    expect(tester.getTopLeft(tab1).dx, lessThan(tester.getTopLeft(tab2).dx));
-    expect(
-      tester.getTopLeft(tab1).dx - tester.getTopRight(tab0).dx,
-      closeTo(20, 1),
-    );
-    expect(
-      (tester
-                  .widget<AnimatedContainer>(
-                    find.descendant(
-                      of: tab0,
-                      matching: find.byType(AnimatedContainer),
-                    ),
-                  )
-                  .decoration
-              as BoxDecoration)
-          .color,
-      AppColors.blue,
-    );
-    expect(
-      (tester
-                  .widget<AnimatedContainer>(
-                    find.descendant(
-                      of: tab1,
-                      matching: find.byType(AnimatedContainer),
-                    ),
-                  )
-                  .decoration
-              as BoxDecoration)
-          .color,
-      Colors.transparent,
-    );
+    expect(find.byKey(const Key('mine-library-tab-0')), findsNothing);
+    expect(find.byKey(const Key('mine-library-tab-1')), findsNothing);
+    expect(find.byKey(const Key('mine-library-tab-2')), findsNothing);
     expect(tester.takeException(), isNull);
   });
 }
diff --git a/test/mine/server_endpoint_setting_test.dart b/test/mine/server_endpoint_setting_test.dart
deleted file mode 100644
index 7eb9c49..0000000
--- a/test/mine/server_endpoint_setting_test.dart
+++ /dev/null
@@ -1,101 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:provider/provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
-import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
-
-import 'package:fruitshorts/core/config/locale_controller.dart';
-import 'package:fruitshorts/core/config/server_endpoint.dart';
-import 'package:fruitshorts/core/data/models/drama.dart';
-import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
-import 'package:fruitshorts/l10n/app_localizations.dart';
-import 'package:fruitshorts/pages/mine/mine_logic.dart';
-
-const _drama = Drama(
-  id: 'drama-1',
-  title: 'The Signal',
-  synopsis: 'synopsis',
-  posterUrl: '/files/1.jpg',
-);
-
-void main() {
-  setUp(() {
-    SharedPreferencesAsyncPlatform.instance =
-        InMemorySharedPreferencesAsync.empty();
-  });
-
-  testWidgets('should_show_server_address_when_debug_entry_is_enabled', (
-    tester,
-  ) async {
-    await _pumpSettings(tester, showServerSetting: true);
-    expect(find.byKey(const Key('server-endpoint-setting')), findsOneWidget);
-    expect(find.text('Server address'), findsOneWidget);
-  });
-
-  testWidgets('should_hide_server_address_when_debug_entry_is_disabled', (
-    tester,
-  ) async {
-    await _pumpSettings(tester, showServerSetting: false);
-    expect(find.byKey(const Key('server-endpoint-setting')), findsNothing);
-    expect(find.text('Server address'), findsNothing);
-  });
-
-  testWidgets('should_reject_invalid_server_address_without_saving', (
-    tester,
-  ) async {
-    await _pumpSettings(tester, showServerSetting: true);
-    await tester.tap(find.byKey(const Key('server-endpoint-setting')));
-    await tester.pumpAndSettle();
-
-    expect(find.text('Restart the app to apply.'), findsOneWidget);
-    await tester.enterText(
-      find.byKey(const Key('server-endpoint-input')),
-      'ftp://invalid',
-    );
-    await tester.tap(find.byKey(const Key('server-endpoint-save')));
-    await tester.pumpAndSettle();
-
-    expect(find.text('Enter a valid http(s) server address.'), findsOneWidget);
-    expect(
-      await SharedPreferencesAsync().getString(ServerEndpoint.preferenceKey),
-      isNull,
-    );
-  });
-}
-
-Future<void> _pumpSettings(
-  WidgetTester tester, {
-  required bool showServerSetting,
-}) async {
-  final logic = MineLogic(
-    history: InMemoryWatchHistoryRepository(),
-    drama: _drama,
-    initialSection: 0,
-  );
-  addTearDown(logic.dispose);
-  await tester.pumpWidget(
-    ChangeNotifierProvider(
-      create: (_) => LocaleController(),
-      child: MaterialApp(
-        locale: const Locale('en'),
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        home: Builder(
-          builder: (context) => Scaffold(
-            body: TextButton(
-              key: const Key('open-settings'),
-              onPressed: () => logic.showLanguage(
-                context,
-                showServerSetting: showServerSetting,
-              ),
-              child: const Text('Open settings'),
-            ),
-          ),
-        ),
-      ),
-    ),
-  );
-  await tester.tap(find.byKey(const Key('open-settings')));
-  await tester.pumpAndSettle();
-}
diff --git a/test/mine/settings_page_test.dart b/test/mine/settings_page_test.dart
new file mode 100644
index 0000000..3e1a8f0
--- /dev/null
+++ b/test/mine/settings_page_test.dart
@@ -0,0 +1,69 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/app.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+
+import '../support/fake_catalog.dart';
+import '../support/fake_category.dart';
+import '../support/fake_interaction_repositories.dart';
+import '../support/fake_notice_repository.dart';
+import '../support/widget_player.dart';
+
+void main() {
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
+  });
+
+  testWidgets('should_open_minimal_settings_without_language_switches', (
+    tester,
+  ) async {
+    tester.view.physicalSize = const Size(390, 844);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.resetPhysicalSize);
+    addTearDown(tester.view.resetDevicePixelRatio);
+    final catalog = FakeCatalogRepository();
+
+    await tester.pumpWidget(
+      LumaDramaApp(
+        playerFactory: createWidgetPlayer,
+        catalogRepository: catalog,
+        categoryRepository: FakeCategoryRepository(catalog: catalog),
+        watchHistoryRepository: InMemoryWatchHistoryRepository(),
+        favoriteRepository: InMemoryFavoriteRepository(),
+        playbackRepository: FakePlaybackRepository(),
+        commentRepository: FakeCommentRepository(),
+        interactionRepository: FakeInteractionRepository(),
+        noticeRepository: FakeNoticeRepository(),
+      ),
+    );
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('tab-mine')));
+    await tester.pumpAndSettle();
+    await tester.ensureVisible(find.byKey(const Key('mine-settings')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('mine-settings')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('settings-page')), findsOneWidget);
+    expect(
+      tester.getSize(find.byKey(const Key('settings-back'))),
+      const Size(40, 40),
+    );
+    final title = tester.widget<Text>(find.byKey(const Key('subpage-title')));
+    expect(title.style?.fontSize, 18);
+    expect(title.style?.fontWeight, FontWeight.w800);
+    expect(find.byKey(const Key('settings-notices')), findsOneWidget);
+    expect(find.byKey(const Key('server-endpoint-setting')), findsNothing);
+    expect(find.text('Server address'), findsNothing);
+    expect(find.text('English'), findsNothing);
+    expect(find.text('简体中文'), findsNothing);
+    expect(find.text('Bahasa Indonesia'), findsNothing);
+  });
+}
diff --git a/test/notice/notices_entry_test.dart b/test/notice/notices_entry_test.dart
index 1767c7f..5515a63 100644
--- a/test/notice/notices_entry_test.dart
+++ b/test/notice/notices_entry_test.dart
@@ -44,16 +44,21 @@ void main() {
       ),
     );
     await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.tap(find.byKey(const Key('tab-mine')));
     await tester.pumpAndSettle();
-    await tester.drag(find.byType(ListView), const Offset(0, -520));
+    await tester.ensureVisible(find.byKey(const Key('mine-notices')));
     await tester.pumpAndSettle();
-
-    expect(find.byKey(const Key('mine-notices')), findsOneWidget);
     await tester.tap(find.byKey(const Key('mine-notices')));
     await tester.pumpAndSettle();
 
     expect(find.byKey(const Key('notices-page')), findsOneWidget);
+    expect(
+      tester.getSize(find.byKey(const Key('notices-back'))),
+      const Size(40, 40),
+    );
+    final title = tester.widget<Text>(find.byKey(const Key('subpage-title')));
+    expect(title.style?.fontSize, 18);
+    expect(title.style?.fontWeight, FontWeight.w800);
     expect(find.byKey(const Key('auth-gate-panel')), findsNothing);
   });
 }
diff --git a/test/playback/play_ticket_quality_test.dart b/test/playback/play_ticket_quality_test.dart
new file mode 100644
index 0000000..809a7b5
--- /dev/null
+++ b/test/playback/play_ticket_quality_test.dart
@@ -0,0 +1,29 @@
+// Author: fruit.com.cn
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/play_ticket.dart';
+
+void main() {
+  test('should_parse_all_qualities_when_ticket_returns_multiple_tracks', () {
+    final ticket = PlayTicket.fromJson(const {
+      'episodeId': '12',
+      'accessible': true,
+      'accessType': 'FREE',
+      'playUrl': '/files/episode/12.m3u8?e=1&s=abc',
+      'qualities': ['AUTO', '720P', '1080P'],
+    });
+
+    expect(ticket.qualities, ['AUTO', '720P', '1080P']);
+  });
+
+  test('should_default_to_empty_qualities_when_field_is_missing', () {
+    final ticket = PlayTicket.fromJson(const {
+      'episodeId': '12',
+      'accessible': true,
+      'accessType': 'FREE',
+      'playUrl': '/files/episode/12.mp4',
+    });
+
+    expect(ticket.qualities, isEmpty);
+  });
+}
diff --git a/test/playback/player_quality_test.dart b/test/playback/player_quality_test.dart
new file mode 100644
index 0000000..b470753
--- /dev/null
+++ b/test/playback/player_quality_test.dart
@@ -0,0 +1,39 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/play_ticket.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/services/android_picture_in_picture.dart';
+import 'package:fruitshorts/pages/player/player_logic.dart';
+
+import '../support/fake_watch_history.dart';
+
+void main() {
+  test('should_expose_ticket_qualities_when_ticket_is_loaded', () async {
+    final logic = PlayerLogic(
+      history: FakeWatchHistory(),
+      playback: FakePlaybackRepository(
+        ticket: const PlayTicket(
+          episodeId: '12',
+          accessible: true,
+          accessType: PlayTicket.free,
+          playUrl: '/files/episode/12.m3u8?e=1&s=abc',
+          qualities: ['AUTO', '720P', '1080P'],
+        ),
+      ),
+      pictureInPicture: AndroidPictureInPicture(
+        channel: const MethodChannel('test/player_quality/pip'),
+      ),
+    );
+    logic.sessionEpisodes = [
+      Episode(id: '12', number: 1, title: 'Episode 1', isFree: true),
+    ];
+
+    final ready = await logic.ensureTicket(0);
+
+    expect(ready, isTrue);
+    expect(logic.qualities, ['AUTO', '720P', '1080P']);
+  });
+}
diff --git a/test/player/player_center_toggle_test.dart b/test/player/player_center_toggle_test.dart
index e6912cd..94b051a 100644
--- a/test/player/player_center_toggle_test.dart
+++ b/test/player/player_center_toggle_test.dart
@@ -2,10 +2,13 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
 import 'package:fruitshorts/pages/player/widgets/player_center_toggle.dart';
 
 void main() {
-  testWidgets('should_use_one_shared_52px_center_toggle_style', (tester) async {
+  testWidgets('should_use_one_shared_68px_translucent_toggle_style', (
+    tester,
+  ) async {
     await tester.pumpWidget(
       MaterialApp(
         home: Scaffold(
@@ -31,17 +34,21 @@ void main() {
       Key('test-center-toggle-a'),
       Key('player-play-toggle'),
     ]) {
-      expect(tester.getSize(find.byKey(key)), const Size(52, 52));
+      expect(tester.getSize(find.byKey(key)), const Size(68, 68));
+      // 圆形底改为半透明黑色，不再是完全透明或蓝色实底。
       final container = tester.widget<Container>(
         find.descendant(of: find.byKey(key), matching: find.byType(Container)),
       );
       final decoration = container.decoration! as BoxDecoration;
-      expect(decoration.color, const Color(0x80000000));
+      expect(decoration.color, Colors.black26);
       expect(decoration.shape, BoxShape.circle);
       final icon = tester.widget<Icon>(
         find.descendant(of: find.byKey(key), matching: find.byType(Icon)),
       );
-      expect(icon.size, 26);
+      expect(icon.size, 36);
+      expect(icon.color, AppColors.onPrimary);
+      expect(icon.shadows, isNotNull);
+      expect(icon.shadows, isNotEmpty);
     }
   });
 }
diff --git a/test/player/player_fullscreen_test.dart b/test/player/player_fullscreen_test.dart
index 45fc167..29f26f2 100644
--- a/test/player/player_fullscreen_test.dart
+++ b/test/player/player_fullscreen_test.dart
@@ -1,14 +1,25 @@
 // Author: fruit.com.cn
 
+import 'dart:async';
+
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
 import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 
 import 'package:fruitshorts/app.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/interaction.dart';
+import 'package:fruitshorts/core/data/models/play_ticket.dart';
+import 'package:fruitshorts/core/data/models/player_port.dart';
 import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/core/data/services/playback_session.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/widgets/remote_image.dart';
+import 'package:fruitshorts/pages/auth/auth_view.dart';
 import 'package:fruitshorts/pages/player/widgets/player_center_toggle.dart';
 import 'package:fruitshorts/pages/player/widgets/seek_progress_bar.dart';
 
@@ -29,7 +40,7 @@ void main() {
     tester,
   ) async {
     await _pumpApp(tester);
-    await tester.tap(find.byKey(const Key('tab-discover')));
+    await tester.tap(find.byKey(const Key('tab-theater')));
     await tester.pumpAndSettle();
     await tester.tap(find.byKey(const Key('home-drama-card-city-lights-demo')));
     await tester.pumpAndSettle();
@@ -38,48 +49,140 @@ void main() {
     expect(find.byType(PageView), findsOneWidget);
     await tester.tap(find.byKey(const Key('player-more')));
     await tester.pumpAndSettle();
-    expect(find.byKey(const Key('player-more-download')), findsOneWidget);
-    expect(find.byKey(const Key('player-more-pip')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-quality-AUTO')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-offline')), findsOneWidget);
+    await tester.tap(find.byKey(const Key('player-more-close')));
+    await tester.pumpAndSettle();
     expect(tester.takeException(), isNull);
   });
 
-  testWidgets('should_open_fullscreen_overlay_from_detail_cta_and_chip', (
+  testWidgets('should_use_black_system_navigation_bar_on_feed_and_player', (
     tester,
   ) async {
     await _pumpApp(tester);
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('drawer-open-series')));
-    await tester.pumpAndSettle();
+    _expectPlayerNavigationBar(tester);
 
-    await tester.tap(find.byKey(const Key('detail-cta')));
-    await tester.pumpAndSettle();
-    _expectFullscreenOverlay(tester);
+    await _openSeriesPlayer(tester);
+    _expectPlayerNavigationBar(tester);
+  });
 
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('detail-episode-chip-2')));
-    await tester.pumpAndSettle();
-    _expectFullscreenOverlay(tester);
-    expect(
-      tester.widget<Text>(find.byKey(const Key('player-title'))).data,
-      contains('Episode 2'),
+  testWidgets('should_pause_and_resume_player_when_page_route_covers_it', (
+    tester,
+  ) async {
+    final players = <_RecordingPlayer>[];
+    await _pumpApp(
+      tester,
+      playerFactory: (_) {
+        final player = _RecordingPlayer();
+        players.add(player);
+        return player;
+      },
     );
-    expect(tester.takeException(), isNull);
+    await _openSeriesPlayer(tester);
+    final player = players.firstWhere((item) => item.playing);
+    expect(player.playing, isTrue);
+
+    final navigator = tester.state<NavigatorState>(
+      find.byType(Navigator).first,
+    );
+    unawaited(
+      navigator.push<void>(
+        MaterialPageRoute(
+          builder: (_) => const Scaffold(key: Key('test-covering-route')),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('test-covering-route')), findsOneWidget);
+    expect(player.playing, isFalse);
+
+    navigator.pop();
+    await tester.pumpAndSettle();
+
+    expect(player.playing, isTrue);
+  });
+
+  testWidgets('should_pause_feed_when_auth_page_is_pushed_and_resume_on_pop', (
+    tester,
+  ) async {
+    final players = <_RecordingPlayer>[];
+    await _pumpApp(
+      tester,
+      playerFactory: (_) {
+        final player = _RecordingPlayer();
+        players.add(player);
+        return player;
+      },
+    );
+    final player = players.firstWhere((item) => item.playing);
+    expect(player.playing, isTrue);
+
+    await tester.tap(find.byKey(const Key('rail-save')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Sign In'));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(AuthPage), findsOneWidget);
+    expect(player.playing, isFalse);
+
+    await tester.pageBack();
+    await tester.pumpAndSettle();
+
+    expect(player.playing, isTrue);
+  });
+
+  testWidgets('should_fall_back_to_black_when_poster_is_empty', (tester) async {
+    await _pumpApp(
+      tester,
+      catalog: FakeCatalogRepository(dramas: const [_noCoverDrama]),
+    );
+    await _openSeriesPlayer(
+      tester,
+      cardKey: const Key('home-drama-card-no-cover-demo'),
+    );
+
+    expect(
+      tester
+          .widget<ColoredBox>(
+            find.byKey(const Key('player-fallback-background')),
+          )
+          .color,
+      Colors.black,
+    );
+  });
+
+  testWidgets('should_gate_comments_before_opening_sheet_when_signed_out', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+
+    await tester.tap(find.byKey(const Key('player-rail-comments')));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Sign in to continue'), findsOneWidget);
+    expect(find.byKey(const Key('player-comments-sheet')), findsNothing);
+  });
+
+  testWidgets('should_open_feed_comments_when_signed_in', (tester) async {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.withData({
+          'auth.accessToken': 'access',
+          'auth.refreshToken': 'refresh',
+          'auth.user': '{"uid":"9","nickname":"Viewer","avatarUrl":""}',
+        });
+    await _pumpApp(tester);
+
+    await tester.tap(find.byKey(const Key('rail-comments')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-comments-sheet')), findsOneWidget);
   });
 
   testWidgets('should_show_center_toggle_only_when_paused', (tester) async {
     await _pumpApp(tester);
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('drawer-open-series')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('detail-cta')));
-    await tester.pumpAndSettle();
+    await _openSeriesPlayer(tester);
 
     expect(find.byKey(const Key('player-play-toggle')), findsNothing);
 
@@ -111,14 +214,7 @@ void main() {
     tester,
   ) async {
     await _pumpApp(tester);
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('drawer-open-series')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('detail-cta')));
-    await tester.pumpAndSettle();
+    await _openSeriesPlayer(tester);
 
     expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
     expect(find.byKey(const Key('player-controls-bottom')), findsOneWidget);
@@ -143,11 +239,14 @@ void main() {
     expect(find.byKey(const Key('player-controls-bottom')), findsOneWidget);
     expect(find.byType(PlayerCenterToggle), findsOneWidget);
 
-    await tester.tap(find.byKey(const Key('player-clear-screen')));
+    await _clearFromMore(tester);
     await tester.pump();
 
-    expect(find.byKey(const Key('player-controls-top')), findsNothing);
+    expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
     expect(find.byKey(const Key('player-controls-bottom')), findsNothing);
+    expect(find.byKey(const Key('player-bottom-actions')), findsOneWidget);
+    expect(find.byKey(const Key('player-progress')), findsOneWidget);
+    expect(find.byKey(const Key('player-interaction-rail')), findsNothing);
     expect(find.byType(PlayerCenterToggle), findsOneWidget);
     expect(
       tester
@@ -158,57 +257,140 @@ void main() {
       isFalse,
     );
     expect(find.byKey(const Key('player-video-tap')), findsOneWidget);
-    expect(find.byKey(const Key('player-exit-clear-screen')), findsOneWidget);
+    expect(find.byKey(const Key('player-bottom-clear-screen')), findsOneWidget);
+    expect(find.byTooltip('Exit clear screen'), findsOneWidget);
     expect(
-      tester.getSize(find.byKey(const Key('player-exit-clear-screen'))),
-      const Size(36, 36),
+      tester.getSize(find.byKey(const Key('player-bottom-clear-screen'))),
+      const Size(40, 40),
     );
 
     await tester.tapAt(const Offset(80, 300));
     await tester.pump();
-    expect(find.byKey(const Key('player-controls-top')), findsNothing);
-    expect(find.byKey(const Key('player-exit-clear-screen')), findsOneWidget);
+    expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
+    expect(find.byKey(const Key('player-bottom-actions')), findsOneWidget);
     expect(find.byType(PlayerCenterToggle), findsNothing);
 
     await tester.tapAt(const Offset(80, 300));
     await tester.pump();
-    expect(find.byKey(const Key('player-controls-top')), findsNothing);
-    expect(find.byKey(const Key('player-exit-clear-screen')), findsOneWidget);
-    expect(
-      tester
-          .widget<PlayerCenterToggle>(
-            find.byKey(const Key('player-play-toggle')),
-          )
-          .playing,
-      isFalse,
-    );
+    expect(find.byType(PlayerCenterToggle), findsOneWidget);
 
-    await tester.tap(find.byKey(const Key('player-exit-clear-screen')));
+    await tester.tap(find.byKey(const Key('player-bottom-clear-screen')));
     await tester.pump();
     expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
     expect(find.byKey(const Key('player-controls-bottom')), findsOneWidget);
+    expect(find.byKey(const Key('player-interaction-rail')), findsOneWidget);
     expect(find.byType(PlayerCenterToggle), findsOneWidget);
+    expect(find.byTooltip('Clear screen'), findsOneWidget);
+  });
+
+  testWidgets('should_open_more_sheet_on_center_long_press', (tester) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+    expect(find.byKey(const Key('player-play-toggle')), findsNothing);
+
+    final gesture = await tester.startGesture(const Offset(195, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+    await gesture.up();
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-more-sheet')), findsOneWidget);
+    await tester.tap(find.byKey(const Key('player-more-close')));
+    await tester.pumpAndSettle();
+    // 长按弹更多不改播放状态，仍处于播放中。
+    expect(find.byKey(const Key('player-play-toggle')), findsNothing);
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('should_boost_speed_on_side_long_press_and_restore', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+    expect(find.byKey(const Key('player-interaction-rail')), findsOneWidget);
+
+    final gesture = await tester.startGesture(const Offset(60, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+
+    expect(find.byKey(const Key('player-speed-boost-hint')), findsOneWidget);
+    expect(find.byKey(const Key('player-progress')), findsOneWidget);
+    expect(find.byKey(const Key('player-episodes-pill')), findsNothing);
+    expect(find.byKey(const Key('player-bottom-clear-screen')), findsNothing);
+    expect(find.byKey(const Key('player-interaction-rail')), findsNothing);
+    expect(find.byKey(const Key('player-controls-bottom')), findsNothing);
     expect(
-      tester
-          .widget<PlayerCenterToggle>(
-            find.byKey(const Key('player-play-toggle')),
-          )
-          .playing,
-      isFalse,
+      find.descendant(
+        of: find.byKey(const Key('player-speed-entry')),
+        matching: find.text('2.0x'),
+      ),
+      findsOneWidget,
+    );
+    // 加速与清屏都不改变播放状态。
+    expect(find.byKey(const Key('player-play-toggle')), findsNothing);
+
+    await gesture.up();
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-speed-boost-hint')), findsNothing);
+    expect(find.byKey(const Key('player-episodes-pill')), findsOneWidget);
+    expect(find.byKey(const Key('player-bottom-clear-screen')), findsOneWidget);
+    expect(find.byKey(const Key('player-interaction-rail')), findsOneWidget);
+    expect(find.byKey(const Key('player-controls-bottom')), findsOneWidget);
+    expect(
+      find.descendant(
+        of: find.byKey(const Key('player-speed-entry')),
+        matching: find.text('1.0x'),
+      ),
+      findsOneWidget,
+    );
+    expect(find.byKey(const Key('player-play-toggle')), findsNothing);
+
+    // 右侧 1/3 同样触发加速。
+    final rightSide = await tester.startGesture(const Offset(330, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+    expect(find.byKey(const Key('player-speed-boost-hint')), findsOneWidget);
+    await rightSide.up();
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('player-speed-boost-hint')), findsNothing);
+  });
+
+  testWidgets('should_keep_previous_clear_state_after_boost', (tester) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+    await tester.tap(find.byKey(const Key('player-bottom-clear-screen')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('player-interaction-rail')), findsNothing);
+
+    final gesture = await tester.startGesture(const Offset(60, 300));
+    await tester.pump(const Duration(milliseconds: 700));
+    await tester.pump();
+    expect(find.byKey(const Key('player-speed-boost-hint')), findsOneWidget);
+    expect(find.byKey(const Key('player-episodes-pill')), findsNothing);
+    expect(find.byKey(const Key('player-bottom-clear-screen')), findsNothing);
+    await gesture.up();
+    await tester.pumpAndSettle();
+
+    // 本来已清屏，松手后仍保持清屏，只恢复倍速与提示。
+    expect(find.byKey(const Key('player-speed-boost-hint')), findsNothing);
+    expect(find.byKey(const Key('player-interaction-rail')), findsNothing);
+    expect(find.byTooltip('Exit clear screen'), findsOneWidget);
+    // 清屏态本来显示的选集胶囊与右下按钮，在加速结束后恢复。
+    expect(find.byKey(const Key('player-episodes-pill')), findsOneWidget);
+    expect(find.byKey(const Key('player-bottom-clear-screen')), findsOneWidget);
+    expect(
+      find.descendant(
+        of: find.byKey(const Key('player-speed-entry')),
+        matching: find.text('1.0x'),
+      ),
+      findsOneWidget,
     );
-    expect(find.byKey(const Key('player-exit-clear-screen')), findsNothing);
   });
 
   testWidgets('should_fit_player_header_on_320_width', (tester) async {
     await _pumpApp(tester, size: const Size(320, 568));
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('drawer-open-series')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('detail-cta')));
-    await tester.pumpAndSettle();
+    await _openSeriesPlayer(tester);
 
     expect(
       tester.getSize(find.byKey(const Key('player-back'))),
@@ -217,58 +399,326 @@ void main() {
     expect(tester.takeException(), isNull);
   });
 
+  testWidgets('should_keep_compact_bottom_panel_and_lower_rail', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+
+    final screenHeight = tester.view.physicalSize.height;
+    final bottom = tester.getRect(
+      find.byKey(const Key('player-controls-bottom')),
+    );
+    final rail = tester.getRect(
+      find.byKey(const Key('player-interaction-rail')),
+    );
+    expect(find.byKey(const Key('player-background')), findsNothing);
+    final fallback = find.byKey(const Key('player-fallback-background'));
+    expect(fallback, findsOneWidget);
+    expect(find.byKey(const Key('player-fallback-cover')), findsOneWidget);
+    expect(
+      tester
+          .widget<RemoteImage>(find.byKey(const Key('player-fallback-cover')))
+          .fallbackColor,
+      Colors.black,
+    );
+    expect(
+      tester
+          .widget<ColoredBox>(find.byKey(const Key('player-fallback-scrim')))
+          .color,
+      const Color(0x4D000000),
+    );
+    expect(
+      tester
+          .widget<Scaffold>(find.byKey(const Key('player-scaffold')))
+          .backgroundColor,
+      Colors.transparent,
+    );
+    expect(
+      tester
+          .widget<Container>(find.byKey(const Key('player-controls-top')))
+          .decoration,
+      isNull,
+    );
+    expect(
+      tester
+          .widget<Padding>(find.byKey(const Key('player-controls-bottom')))
+          .child,
+      isNotNull,
+    );
+    expect(
+      tester
+          .widget<Material>(find.byKey(const Key('player-episodes-pill')))
+          .color,
+      AppColors.playerOverlayPill,
+    );
+    expect(
+      tester
+          .widget<Material>(find.byKey(const Key('player-episodes-pill')))
+          .borderRadius,
+      BorderRadius.circular(7),
+    );
+    expect(
+      tester
+          .widget<Text>(
+            find
+                .descendant(
+                  of: find.byKey(const Key('player-episodes-pill')),
+                  matching: find.byType(Text),
+                )
+                .first,
+          )
+          .style
+          ?.fontSize,
+      13.5,
+    );
+    expect(
+      tester.getSize(find.byKey(const Key('player-bottom-clear-screen'))),
+      const Size(40, 40),
+    );
+    expect(tester.widget<Slider>(find.byType(Slider)).padding, EdgeInsets.zero);
+
+    expect(bottom.height, lessThanOrEqualTo(200));
+    expect(bottom.top, greaterThanOrEqualTo(screenHeight * 0.78));
+    expect(rail.top, greaterThanOrEqualTo(screenHeight * 0.55 - 2));
+    expect(rail.bottom, lessThanOrEqualTo(bottom.top));
+    expect(find.byKey(const Key('player-author-note')), findsNothing);
+    expect(
+      tester
+          .getSize(
+            find.descendant(
+              of: find.byKey(const Key('player-rail-comments')),
+              matching: find.byIcon(Icons.chat_bubble_outline_rounded),
+            ),
+          )
+          .width,
+      24,
+    );
+
+    await tester.tap(find.byKey(const Key('player-synopsis-toggle')));
+    await tester.pumpAndSettle();
+    final expandedBottom = tester.getRect(
+      find.byKey(const Key('player-controls-bottom')),
+    );
+    // K29.9 展开态展示简介全文，高度会增长，但仍需留在画面下半区。
+    expect(expandedBottom.height, lessThanOrEqualTo(330));
+    expect(expandedBottom.top, greaterThanOrEqualTo(screenHeight * 0.5));
+    expect(tester.takeException(), isNull);
+  });
+
   testWidgets('should_keep_series_clear_state_when_swiping_next_episode', (
     tester,
   ) async {
     await _pumpApp(tester);
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('drawer-open-series')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('detail-cta')));
-    await tester.pumpAndSettle();
+    await _openSeriesPlayer(tester);
 
-    await tester.tap(find.byKey(const Key('player-clear-screen')));
+    await _clearFromMore(tester);
     await tester.pump();
-    expect(find.byKey(const Key('player-controls-top')), findsNothing);
+    expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
 
     await tester.drag(find.byType(PageView), const Offset(0, -550));
     await tester.pumpAndSettle();
 
-    expect(find.byKey(const Key('player-controls-top')), findsNothing);
+    expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
     expect(find.byKey(const Key('player-controls-bottom')), findsNothing);
-    expect(find.byKey(const Key('player-exit-clear-screen')), findsOneWidget);
+    expect(find.byKey(const Key('player-bottom-actions')), findsOneWidget);
+    expect(find.byKey(const Key('player-progress')), findsOneWidget);
+    expect(find.byKey(const Key('player-interaction-rail')), findsNothing);
+    expect(find.byKey(const Key('player-bottom-clear-screen')), findsOneWidget);
 
-    await tester.tap(find.byKey(const Key('player-exit-clear-screen')));
+    await tester.tap(find.byKey(const Key('player-bottom-clear-screen')));
     await tester.pump();
     expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
     expect(find.byKey(const Key('player-controls-bottom')), findsOneWidget);
-    expect(find.byKey(const Key('player-exit-clear-screen')), findsNothing);
+    expect(find.byKey(const Key('player-interaction-rail')), findsOneWidget);
+  });
+
+  testWidgets('should_push_episodes_arrow_to_pill_right', (tester) async {
+    // 宽屏下文案不会撑满胶囊，才能验证箭头是否被推到最右侧。
+    await _pumpApp(tester, size: const Size(900, 844));
+    await _openSeriesPlayer(tester);
+
+    final pill = tester.getRect(find.byKey(const Key('player-episodes-pill')));
+    final label = tester.getRect(
+      find
+          .descendant(
+            of: find.byKey(const Key('player-episodes-pill')),
+            matching: find.byType(Text),
+          )
+          .first,
+    );
+    final arrow = tester.getRect(
+      find.descendant(
+        of: find.byKey(const Key('player-episodes-pill')),
+        matching: find.byIcon(Icons.keyboard_arrow_up_rounded),
+      ),
+    );
+    expect(pill.right - arrow.right, closeTo(14, 0.5));
+    expect(arrow.left - label.right, closeTo(8, 0.5));
+  });
+
+  testWidgets('should_show_rail_counts_from_detail_and_follow_server_results', (
+    tester,
+  ) async {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.withData({
+          'auth.accessToken': 'test-access',
+          'auth.refreshToken': 'test-refresh',
+          'auth.user': '{"uid":"9","nickname":"Me","avatarUrl":""}',
+        });
+    await _pumpApp(
+      tester,
+      interactions: FakeInteractionRepository(
+        nextLikeResult: const LikeToggleResult(liked: true, count: 23000),
+      ),
+    );
+    await _openSeriesPlayer(tester);
+
+    String railLabel(Key key) => tester
+        .widget<Text>(
+          find.descendant(of: find.byKey(key), matching: find.byType(Text)),
+        )
+        .data!;
+    expect(railLabel(const Key('player-rail-like')), '1.2万');
+    expect(railLabel(const Key('player-rail-save')), '3200');
+    expect(railLabel(const Key('player-rail-comments')), '96');
+    // 分享没有数量，仍是文字标签。
+    expect(railLabel(const Key('player-rail-share')), 'Share');
+
+    await tester.tap(find.byKey(const Key('player-rail-like')));
+    await tester.pumpAndSettle();
+    expect(railLabel(const Key('player-rail-like')), '2.3万');
+
+    await tester.tap(find.byKey(const Key('player-rail-save')));
+    await tester.pumpAndSettle();
+    expect(railLabel(const Key('player-rail-save')), '3201');
+  });
+
+  testWidgets('should_toggle_synopsis_with_inline_text_button', (tester) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+
+    final toggle = find.byKey(const Key('player-synopsis-toggle'));
+    final synopsis = find.byKey(const Key('player-synopsis'));
+    expect(
+      find.descendant(of: toggle, matching: find.text('More')),
+      findsOneWidget,
+    );
+    expect(tester.widget<Text>(synopsis).maxLines, 1);
+    expect(
+      tester.getRect(toggle).left - tester.getRect(synopsis).right,
+      lessThanOrEqualTo(4),
+    );
+
+    await tester.tap(toggle);
+    await tester.pumpAndSettle();
+    expect(
+      find.descendant(of: toggle, matching: find.text('Less')),
+      findsOneWidget,
+    );
+    expect(tester.widget<Text>(synopsis).maxLines, isNull);
+
+    await tester.tap(toggle);
+    await tester.pumpAndSettle();
+    expect(
+      find.descendant(of: toggle, matching: find.text('More')),
+      findsOneWidget,
+    );
+    expect(tester.widget<Text>(synopsis).maxLines, 1);
+  });
+
+  testWidgets('should_share_one_muted_style_across_label_and_synopsis', (
+    tester,
+  ) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+
+    TextStyle styleOf(Finder finder) =>
+        tester.widget<Text>(finder).style ?? const TextStyle();
+    final label = styleOf(find.byKey(const Key('player-episode-label')));
+    final synopsis = styleOf(find.byKey(const Key('player-synopsis')));
+    final separator = styleOf(
+      find.descendant(
+        of: find.byKey(const Key('player-episode-synopsis')),
+        matching: find.text('|'),
+      ),
+    );
+    for (final style in [label, synopsis, separator]) {
+      expect(style.fontSize, 12);
+      expect(style.fontWeight, FontWeight.w500);
+      expect(style.color?.withValues(alpha: 1), AppColors.playerMuted);
+    }
+    expect(separator.color, isNot(Colors.white));
+  });
+
+  testWidgets('should_fit_long_title_and_synopsis_at_320_width', (
+    tester,
+  ) async {
+    final longCopy = Drama(
+      id: 'long-copy-demo',
+      title:
+          'An Extremely Long Drama Title That Keeps Going Beyond Any '
+          'Sensible Width On A Narrow Screen',
+      synopsis:
+          'A very long synopsis that keeps describing the story far beyond '
+          'the single line space available in the compact bottom panel of '
+          'the fullscreen player.',
+      posterUrl: '/files/long-copy-demo.png',
+      genre: 'Drama',
+      detailLoaded: true,
+      episodes: const [
+        Episode(
+          id: 'long-copy-demo-1',
+          number: 1,
+          title: 'Episode 1',
+          isFree: true,
+          videoUrl: 'https://example.test/long-demo-1.mp4',
+        ),
+      ],
+    );
+    await _pumpApp(
+      tester,
+      size: const Size(320, 568),
+      catalog: FakeCatalogRepository(dramas: [longCopy]),
+    );
+    await _openSeriesPlayer(
+      tester,
+      cardKey: const Key('home-drama-card-long-copy-demo'),
+    );
+
+    expect(tester.takeException(), isNull);
+    final title = tester.getRect(find.byKey(const Key('player-drama-title')));
+    final chevron = tester.getRect(
+      find.descendant(
+        of: find.byKey(const Key('player-open-detail')),
+        matching: find.byIcon(Icons.chevron_right_rounded),
+      ),
+    );
+    expect(chevron.left - title.right, lessThanOrEqualTo(6));
+    expect(chevron.right, lessThanOrEqualTo(320 - 14));
+    final synopsis = tester.widget<Text>(
+      find.byKey(const Key('player-synopsis')),
+    );
+    expect(synopsis.maxLines, 1);
+    expect(synopsis.overflow, TextOverflow.ellipsis);
+    expect(
+      tester.getRect(find.byKey(const Key('player-episodes-pill'))).right,
+      lessThanOrEqualTo(320 - 14 - 40 - 8),
+    );
+    expect(tester.takeException(), isNull);
   });
 
   testWidgets('should_open_speed_sheet_and_apply_selected_speed', (
     tester,
   ) async {
     await _pumpApp(tester);
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('drawer-open-series')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('detail-cta')));
-    await tester.pumpAndSettle();
+    await _openSeriesPlayer(tester);
 
-    await tester.tap(find.byKey(const Key('player-more')));
-    await tester.pumpAndSettle();
-    expect(find.byKey(const Key('player-more-speed')), findsOneWidget);
-    await tester.tap(find.byKey(const Key('player-more-speed')));
+    await tester.tap(find.byKey(const Key('player-speed-entry')));
     await tester.pumpAndSettle();
 
     expect(find.byKey(const Key('player-speed-sheet')), findsOneWidget);
-    for (final value in ['0.5', '0.75', '1.0', '1.25', '1.5', '2.0']) {
+    for (final value in ['0.75', '1.0', '1.25', '1.5', '2.0', '3.0']) {
       expect(find.byKey(Key('player-speed-$value')), findsOneWidget);
     }
 
@@ -276,11 +726,11 @@ void main() {
     await tester.pumpAndSettle();
 
     expect(find.byKey(const Key('player-speed-sheet')), findsNothing);
-    await tester.tap(find.byKey(const Key('player-more')));
+    await tester.tap(find.byKey(const Key('player-speed-entry')));
     await tester.pumpAndSettle();
     expect(
       find.descendant(
-        of: find.byKey(const Key('player-more-speed')),
+        of: find.byKey(const Key('player-speed-entry')),
         matching: find.text('1.5x'),
       ),
       findsOneWidget,
@@ -291,47 +741,24 @@ void main() {
     tester,
   ) async {
     await _pumpApp(tester);
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('drawer-open-series')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('detail-cta')));
-    await tester.pumpAndSettle();
+    await _openSeriesPlayer(tester);
 
-    await tester.tap(find.byKey(const Key('player-more')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('player-more-speed')));
+    await tester.tap(find.byKey(const Key('player-speed-entry')));
     await tester.pumpAndSettle();
     await tester.tap(find.byKey(const Key('player-speed-1.5')));
     await tester.pumpAndSettle();
 
-    await tester.tap(find.byKey(const Key('player-clear-screen')));
+    await _clearFromMore(tester);
     await tester.pump();
-    expect(find.byKey(const Key('player-more')), findsNothing);
+    expect(find.byKey(const Key('player-more')), findsOneWidget);
 
-    await tester.tap(find.byKey(const Key('player-exit-clear-screen')));
+    await tester.tap(find.byKey(const Key('player-bottom-clear-screen')));
     await tester.pump();
-    await tester.tap(find.byKey(const Key('player-more')));
-    await tester.pumpAndSettle();
-    expect(
-      find.descendant(
-        of: find.byKey(const Key('player-more-speed')),
-        matching: find.text('1.5x'),
-      ),
-      findsOneWidget,
-    );
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-
     await tester.drag(find.byType(PageView), const Offset(0, -550));
     await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('player-more')));
-    await tester.pumpAndSettle();
     expect(
       find.descendant(
-        of: find.byKey(const Key('player-more-speed')),
+        of: find.byKey(const Key('player-speed-entry')),
         matching: find.text('1.5x'),
       ),
       findsOneWidget,
@@ -342,14 +769,7 @@ void main() {
     tester,
   ) async {
     await _pumpApp(tester);
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('drawer-open-series')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('detail-cta')));
-    await tester.pumpAndSettle();
+    await _openSeriesPlayer(tester);
 
     final bar = tester.widget<SeekProgressBar>(
       find.byKey(const Key('player-progress')),
@@ -357,169 +777,454 @@ void main() {
     expect(bar.showTimes, isTrue);
   });
 
-  testWidgets('should_clear_and_restore_home_feed_chrome', (tester) async {
+  testWidgets('should_render_k28_player_structure_and_episode_grid', (
+    tester,
+  ) async {
     await _pumpApp(tester);
-    await tester.tap(find.byKey(const Key('tab-home')));
+    await _openSeriesPlayer(tester);
+
+    _expectFullscreenOverlay(tester);
+    await tester.tap(find.byKey(const Key('player-episodes')));
     await tester.pumpAndSettle();
 
-    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-info-card')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-scrim')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
-
-    await tester.tap(find.byKey(const Key('home-feed-clear-screen')));
-    await tester.pump();
-
-    expect(find.byKey(const Key('home-feed-title')), findsNothing);
-    expect(find.byKey(const Key('home-feed-info-card')), findsNothing);
-    expect(find.byKey(const Key('home-feed-scrim')), findsNothing);
-    expect(find.byKey(const Key('home-feed-video-tap')), findsOneWidget);
-    expect(
-      find.byKey(const Key('home-feed-exit-clear-screen')),
-      findsOneWidget,
-    );
-    expect(
-      tester.getSize(find.byKey(const Key('home-feed-exit-clear-screen'))),
-      const Size(36, 36),
-    );
-    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
-    expect(
-      find.ancestor(
-        of: find.byKey(const Key('home-feed-exit-clear-screen')),
-        matching: find.byType(SafeArea),
+    expect(find.byKey(const Key('player-episodes-sheet')), findsOneWidget);
+    expect(find.byKey(const Key('player-episodes-close')), findsOneWidget);
+    final grid = tester.widget<GridView>(
+      find.descendant(
+        of: find.byKey(const Key('player-episodes-sheet')),
+        matching: find.byType(GridView),
       ),
-      findsWidgets,
     );
-    expect(
-      tester
-          .getTopLeft(find.byKey(const Key('home-feed-exit-clear-screen')))
-          .dy,
-      greaterThanOrEqualTo(8),
+    final delegate =
+        grid.gridDelegate as SliverGridDelegateWithFixedCrossAxisCount;
+    expect(delegate.crossAxisCount, 6);
+    final overlay = tester.widget<AnnotatedRegion<SystemUiOverlayStyle>>(
+      find.byKey(const Key('player-episodes-system-overlay')),
     );
-
-    await tester.tapAt(const Offset(80, 300));
-    await tester.pump();
-    expect(find.byKey(const Key('home-feed-title')), findsNothing);
-    expect(
-      find.byKey(const Key('home-feed-exit-clear-screen')),
-      findsOneWidget,
-    );
-    expect(find.byKey(const Key('home-feed-center-play')), findsOneWidget);
-    expect(
-      tester
-          .widget<PlayerCenterToggle>(
-            find.byKey(const Key('home-feed-center-play')),
+    expect(overlay.value.systemNavigationBarColor, AppColors.card);
+    expect(overlay.value.systemNavigationBarContrastEnforced, isFalse);
+    final safeArea = tester.widget<SafeArea>(
+      find
+          .descendant(
+            of: find.byKey(const Key('player-episodes-sheet')),
+            matching: find.byType(SafeArea),
           )
-          .playing,
-      isFalse,
+          .first,
     );
-
-    await tester.tapAt(const Offset(80, 300));
-    await tester.pump();
-    expect(find.byKey(const Key('home-feed-title')), findsNothing);
-    expect(
-      find.byKey(const Key('home-feed-exit-clear-screen')),
-      findsOneWidget,
-    );
-    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
-
-    await tester.tap(find.byKey(const Key('home-feed-exit-clear-screen')));
-    await tester.pump();
-
-    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-info-card')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-scrim')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-exit-clear-screen')), findsNothing);
-    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
+    expect(safeArea.bottom, isTrue);
+    expect(tester.takeException(), isNull);
   });
 
-  testWidgets('should_show_home_center_toggle_only_when_paused', (
+  testWidgets('should_show_locked_episode_in_episode_picker', (tester) async {
+    await _pumpApp(
+      tester,
+      catalog: FakeCatalogRepository(dramas: const [_lockedDrama]),
+    );
+    await _openSeriesPlayer(
+      tester,
+      cardKey: const Key('home-drama-card-locked-demo'),
+    );
+    await tester.tap(find.byKey(const Key('player-episodes')));
+    await tester.pumpAndSettle();
+
+    expect(
+      find.byKey(const ValueKey('episode-lock-locked-demo-1')),
+      findsOneWidget,
+    );
+    expect(find.byKey(const Key('player-episode-2')), findsOneWidget);
+  });
+
+  testWidgets('should_open_compact_more_actions', (tester) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+    await tester.tap(find.byKey(const Key('player-more')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-more-sheet')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-speed')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-quality-AUTO')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-offline')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-clear')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-drag-handle')), findsOneWidget);
+    for (final removed in const [
+      Key('player-more-not-interested'),
+      Key('player-more-danmaku'),
+      Key('player-more-danmaku-settings'),
+      Key('player-more-text-size'),
+      Key('player-more-cast'),
+      Key('player-more-timer'),
+      Key('player-more-report'),
+    ]) {
+      expect(find.byKey(removed), findsNothing);
+    }
+    expect(
+      tester.getSize(find.byKey(const Key('player-more-speed-1.0'))).height,
+      28,
+    );
+    expect(
+      tester.getSize(find.byKey(const Key('player-more-speed-row'))).height,
+      44,
+    );
+    expect(
+      tester.getSize(find.byKey(const Key('player-more-quality-row'))).height,
+      44,
+    );
+    expect(
+      tester
+          .widget<SingleChildScrollView>(
+            find.byKey(const Key('player-more-speed')),
+          )
+          .scrollDirection,
+      Axis.horizontal,
+    );
+    expect(
+      tester
+          .widget<SingleChildScrollView>(
+            find.byKey(const Key('player-more-quality')),
+          )
+          .scrollDirection,
+      Axis.horizontal,
+    );
+    expect(
+      tester
+          .widget<Text>(
+            find.descendant(
+              of: find.byKey(const Key('player-more-speed-1.0')),
+              matching: find.text('1.0x'),
+            ),
+          )
+          .style
+          ?.fontSize,
+      12,
+    );
+    await tester.ensureVisible(find.byKey(const Key('player-more-speed-1.5')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('player-more-speed-1.5')));
+    await tester.pumpAndSettle();
+    expect(
+      tester
+          .widget<Text>(
+            find.descendant(
+              of: find.byKey(const Key('player-more-speed-1.5')),
+              matching: find.text('1.5x'),
+            ),
+          )
+          .style
+          ?.fontWeight,
+      FontWeight.w700,
+    );
+    expect(
+      tester
+          .widget<Text>(
+            find.descendant(
+              of: find.byKey(const Key('player-more-speed-1.0')),
+              matching: find.text('1.0x'),
+            ),
+          )
+          .style
+          ?.fontWeight,
+      FontWeight.w500,
+    );
+  });
+
+  testWidgets('should_disable_quality_not_supplied_by_ticket', (tester) async {
+    await _pumpApp(
+      tester,
+      playback: FakePlaybackRepository(
+        ticket: const PlayTicket(
+          episodeId: 'city-lights-demo-1',
+          accessible: true,
+          accessType: PlayTicket.free,
+          playUrl: '/files/city-lights-demo-1.mp4',
+          qualities: ['AUTO'],
+        ),
+      ),
+    );
+    await _openSeriesPlayer(tester);
+    await tester.tap(find.byKey(const Key('player-more')));
+    await tester.pumpAndSettle();
+
+    expect(
+      tester
+          .widget<InkWell>(
+            find.descendant(
+              of: find.byKey(const Key('player-more-quality-AUTO')),
+              matching: find.byType(InkWell),
+            ),
+          )
+          .onTap,
+      isNotNull,
+    );
+    expect(
+      tester
+          .widget<InkWell>(
+            find.descendant(
+              of: find.byKey(const Key('player-more-quality-720P')),
+              matching: find.byType(InkWell),
+            ),
+          )
+          .onTap,
+      isNull,
+    );
+    expect(find.text('720P · Unavailable'), findsOneWidget);
+  });
+
+  testWidgets('should_show_pip_action_when_platform_supported', (tester) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+    await tester.tap(find.byKey(const Key('player-more')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-more-pip')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-clear')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-offline')), findsOneWidget);
+  }, variant: TargetPlatformVariant.only(TargetPlatform.android));
+
+  testWidgets('should_hide_pip_action_when_platform_unsupported', (
     tester,
   ) async {
     await _pumpApp(tester);
-    await tester.tap(find.byKey(const Key('tab-home')));
+    await _openSeriesPlayer(tester);
+    await tester.tap(find.byKey(const Key('player-more')));
     await tester.pumpAndSettle();
 
-    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
-    await tester.tapAt(const Offset(80, 300));
-    await tester.pump();
-    expect(find.byKey(const Key('home-feed-center-play')), findsOneWidget);
-    expect(
-      tester
-          .widget<PlayerCenterToggle>(
-            find.byKey(const Key('home-feed-center-play')),
-          )
-          .playing,
-      isFalse,
-    );
+    expect(find.byKey(const Key('player-more-pip')), findsNothing);
+    expect(find.byKey(const Key('player-more-clear')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-offline')), findsOneWidget);
+  }, variant: TargetPlatformVariant.only(TargetPlatform.macOS));
 
-    await tester.tap(find.byKey(const Key('home-feed-center-play')));
-    await tester.pump();
-    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
+  testWidgets('should_enter_clear_screen_from_more_panel', (tester) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+    await tester.tap(find.byKey(const Key('player-more')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('player-more-clear')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
+    expect(find.byKey(const Key('player-controls-bottom')), findsNothing);
+    expect(find.byKey(const Key('player-bottom-actions')), findsOneWidget);
+    expect(find.byKey(const Key('player-progress')), findsOneWidget);
+    expect(find.byKey(const Key('player-interaction-rail')), findsNothing);
+    expect(find.byTooltip('Exit clear screen'), findsOneWidget);
   });
 
-  testWidgets('should_keep_home_clear_state_when_swiping_to_next_page', (
+  testWidgets('should_enter_clear_screen_from_bottom_button', (tester) async {
+    await _pumpApp(tester);
+    await _openSeriesPlayer(tester);
+
+    expect(find.byKey(const Key('player-bottom-clear-screen')), findsOneWidget);
+    expect(find.byKey(const Key('player-pip')), findsNothing);
+    await tester.tap(find.byKey(const Key('player-bottom-clear-screen')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
+    expect(find.byKey(const Key('player-controls-bottom')), findsNothing);
+    expect(find.byKey(const Key('player-bottom-actions')), findsOneWidget);
+    expect(find.byKey(const Key('player-progress')), findsOneWidget);
+    expect(find.byKey(const Key('player-interaction-rail')), findsNothing);
+    expect(find.byType(PlayerCenterToggle), findsNothing);
+    expect(find.byTooltip('Exit clear screen'), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('player-bottom-clear-screen')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('player-controls-bottom')), findsOneWidget);
+    expect(find.byKey(const Key('player-interaction-rail')), findsOneWidget);
+    expect(find.byType(PlayerCenterToggle), findsNothing);
+    expect(find.byTooltip('Clear screen'), findsOneWidget);
+  });
+
+  testWidgets('should_open_unlock_panel_with_honest_method_states', (
     tester,
   ) async {
-    await _pumpApp(tester);
-    await tester.tap(find.byKey(const Key('tab-home')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('home-feed-clear-screen')));
-    await tester.pump();
-    expect(find.byKey(const Key('home-feed-title')), findsNothing);
+    await _pumpApp(
+      tester,
+      playback: FakePlaybackRepository(
+        ticket: const PlayTicket(
+          episodeId: 'city-lights-demo-1',
+          accessible: false,
+          accessType: PlayTicket.coinRequired,
+          unlockCoin: 30,
+        ),
+      ),
+    );
+    await _openSeriesPlayer(tester);
 
-    await tester.drag(find.byType(PageView), const Offset(0, -550));
+    expect(find.byKey(const Key('player-unlock-notice')), findsOneWidget);
+    await tester.tap(find.byKey(const Key('player-open-unlock')));
     await tester.pumpAndSettle();
 
-    expect(find.byKey(const Key('home-feed-title')), findsNothing);
-    expect(find.byKey(const Key('home-feed-info-card')), findsNothing);
+    expect(find.byKey(const Key('player-unlock-panel')), findsOneWidget);
+    expect(find.byKey(const Key('player-unlock-coins')), findsOneWidget);
+    expect(find.byKey(const Key('player-unlock-ad')), findsOneWidget);
+    expect(find.byKey(const Key('player-unlock-vip')), findsOneWidget);
     expect(
-      find.byKey(const Key('home-feed-exit-clear-screen')),
+      find.text('Available unlock methods vary by title.'),
       findsOneWidget,
     );
-    expect(find.byKey(const Key('home-feed-center-play')), findsNothing);
   });
 }
 
+void _expectPlayerNavigationBar(WidgetTester tester) {
+  final overlay = tester.widget<AnnotatedRegion<SystemUiOverlayStyle>>(
+    find.byKey(const Key('player-system-overlay')).last,
+  );
+  expect(overlay.value.systemNavigationBarColor, Colors.black);
+  expect(overlay.value.systemNavigationBarDividerColor, Colors.transparent);
+  expect(overlay.value.systemNavigationBarContrastEnforced, isFalse);
+  expect(overlay.value.systemNavigationBarIconBrightness, Brightness.light);
+}
+
 void _expectFullscreenOverlay(WidgetTester tester) {
   expect(find.byKey(const Key('player-back')), findsOneWidget);
-  expect(find.byKey(const Key('player-title')), findsOneWidget);
+  expect(find.byKey(const Key('player-episode-heading')), findsOneWidget);
+  expect(find.byKey(const Key('player-speed-entry')), findsOneWidget);
+  expect(find.byKey(const Key('player-drama-title')), findsOneWidget);
+  expect(find.byKey(const Key('player-episode-label')), findsOneWidget);
+  expect(find.byKey(const Key('player-synopsis')), findsOneWidget);
   expect(find.byKey(const Key('player-more')), findsOneWidget);
   for (final key in const [Key('player-back'), Key('player-more')]) {
     expect(tester.getSize(find.byKey(key)), const Size(36, 36));
   }
   expect(find.byKey(const Key('player-play-toggle')), findsNothing);
   expect(find.byKey(const Key('player-episodes')), findsOneWidget);
-  expect(find.byKey(const Key('player-comments')), findsOneWidget);
-  expect(find.byKey(const Key('player-next')), findsOneWidget);
+  expect(find.byKey(const Key('player-bottom-clear-screen')), findsOneWidget);
+  expect(find.byKey(const Key('player-pip')), findsNothing);
+  expect(find.byKey(const Key('player-rail-comments')), findsOneWidget);
+  expect(find.byKey(const Key('player-fullscreen-toggle')), findsNothing);
   expect(find.byType(Slider), findsOneWidget);
+  expect(find.byKey(const Key('player-title')), findsNothing);
+  expect(find.byKey(const Key('player-subtitle')), findsNothing);
+  expect(find.byKey(const Key('player-genre-chip')), findsNothing);
+  expect(find.byKey(const Key('player-page-dots')), findsNothing);
+  expect(find.byKey(const Key('player-clear-screen')), findsNothing);
+  expect(find.byKey(const Key('player-next')), findsNothing);
 
-  expect(find.byKey(const Key('rail-like')), findsNothing);
-  expect(find.byKey(const Key('rail-save')), findsNothing);
+  expect(find.byKey(const Key('player-interaction-rail')), findsOneWidget);
+  expect(find.byKey(const Key('player-rail-like')), findsOneWidget);
+  expect(find.byKey(const Key('player-rail-save')), findsOneWidget);
+  expect(find.byKey(const Key('player-rail-share')), findsOneWidget);
+}
+
+Future<void> _clearFromMore(WidgetTester tester) async {
+  await tester.tap(find.byKey(const Key('player-more')));
+  await tester.pumpAndSettle();
+  await tester.tap(find.byKey(const Key('player-more-clear')));
+  await tester.pumpAndSettle();
+}
+
+Future<void> _openSeriesPlayer(
+  WidgetTester tester, {
+  Key cardKey = const Key('home-drama-card-city-lights-demo'),
+}) async {
+  await tester.tap(find.byKey(const Key('tab-theater')));
+  await tester.pumpAndSettle();
+  final card = find.byKey(cardKey);
+  await tester.scrollUntilVisible(
+    card,
+    220,
+    scrollable: find
+        .descendant(
+          of: find.byKey(const Key('discover-refresh')),
+          matching: find.byType(Scrollable),
+        )
+        .first,
+  );
+  await tester.ensureVisible(card);
+  await tester.pumpAndSettle();
+  await tester.tap(card);
+  await tester.pumpAndSettle();
 }
 
 Future<void> _pumpApp(
   WidgetTester tester, {
   Size size = const Size(390, 844),
+  FakeCatalogRepository? catalog,
+  FakePlaybackRepository? playback,
+  FakeInteractionRepository? interactions,
+  PlayerFactory? playerFactory,
 }) async {
   tester.view.physicalSize = size;
   tester.view.devicePixelRatio = 1;
   addTearDown(tester.view.resetPhysicalSize);
   addTearDown(tester.view.resetDevicePixelRatio);
-  final catalog = FakeCatalogRepository();
+  final repository = catalog ?? FakeCatalogRepository();
   await tester.pumpWidget(
     LumaDramaApp(
-      playerFactory: createWidgetPlayer,
-      catalogRepository: catalog,
-      categoryRepository: FakeCategoryRepository(catalog: catalog),
+      playerFactory: playerFactory ?? createWidgetPlayer,
+      catalogRepository: repository,
+      categoryRepository: FakeCategoryRepository(catalog: repository),
       watchHistoryRepository: InMemoryWatchHistoryRepository(),
-      favoriteRepository: InMemoryFavoriteRepository(cards: catalog.dramas),
-      playbackRepository: FakePlaybackRepository(),
+      favoriteRepository: InMemoryFavoriteRepository(cards: repository.dramas),
+      playbackRepository: playback ?? FakePlaybackRepository(),
       commentRepository: FakeCommentRepository(),
-      interactionRepository: FakeInteractionRepository(),
+      interactionRepository: interactions ?? FakeInteractionRepository(),
       noticeRepository: FakeNoticeRepository(),
       haptics: FakeHaptics(),
     ),
   );
   await tester.pumpAndSettle();
 }
+
+class _RecordingPlayer implements PlayerPort {
+  bool playing = false;
+
+  @override
+  Future<void> initialize() async {}
+
+  @override
+  Future<void> play() async {
+    playing = true;
+  }
+
+  @override
+  Future<void> pause() async {
+    playing = false;
+  }
+
+  @override
+  Future<void> dispose() async {}
+}
+
+const _lockedDrama = Drama(
+  id: 'locked-demo',
+  title: 'Locked Demo',
+  synopsis: 'Locked demo synopsis',
+  posterUrl: '/files/locked-demo.png',
+  genre: 'Suspense',
+  detailLoaded: true,
+  episodes: [
+    Episode(
+      id: 'locked-demo-1',
+      number: 1,
+      title: 'Locked Episode',
+      isFree: false,
+      locked: true,
+      videoUrl: 'https://example.test/locked-demo-1.mp4',
+    ),
+    Episode(
+      id: 'locked-demo-2',
+      number: 2,
+      title: 'Open Episode',
+      isFree: true,
+      videoUrl: 'https://example.test/locked-demo-2.mp4',
+    ),
+  ],
+);
+
+const _noCoverDrama = Drama(
+  id: 'no-cover-demo',
+  title: 'No Cover Demo',
+  synopsis: 'No cover synopsis',
+  posterUrl: '',
+  detailLoaded: true,
+  episodes: [
+    Episode(
+      id: 'no-cover-demo-1',
+      number: 1,
+      title: 'No Cover Episode',
+      isFree: true,
+      videoUrl: 'https://example.test/no-cover-demo-1.mp4',
+    ),
+  ],
+);
diff --git a/test/player/player_logic_test.dart b/test/player/player_logic_test.dart
index ff0b5c9..9c42526 100644
--- a/test/player/player_logic_test.dart
+++ b/test/player/player_logic_test.dart
@@ -4,7 +4,12 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:fruitshorts/core/data/models/drama.dart';
 import 'package:fruitshorts/core/data/models/play_ticket.dart';
 import 'package:fruitshorts/core/data/models/player_port.dart';
+import 'package:fruitshorts/core/data/models/download_license.dart';
+import 'package:fruitshorts/core/data/models/download_policy.dart';
+import 'package:fruitshorts/core/data/repositories/download_repository.dart';
 import 'package:fruitshorts/core/data/services/android_picture_in_picture.dart';
+import 'package:fruitshorts/core/data/services/download_controller.dart';
+import 'package:fruitshorts/core/data/services/download_storage.dart';
 import 'package:fruitshorts/core/data/services/playback_session.dart';
 import 'package:fruitshorts/pages/player/player_logic.dart';
 import 'package:fruitshorts/pages/player/player_view.dart';
@@ -116,6 +121,34 @@ void main() {
     });
   });
 
+  test('should_play_local_file_without_ticket_when_episode_is_downloaded',
+      () async {
+    final playback = FakePlaybackRepository();
+    final downloads = DownloadController(
+      _EmptyDownloadRepository(),
+      storage: _LocalStorage(),
+    );
+    await downloads.restore();
+    final drama = _drama('signal');
+    final logic = PlayerLogic(
+      history: FakeWatchHistory(),
+      playback: playback,
+      pictureInPicture: _pip(),
+      downloads: downloads,
+    );
+    logic.attach(
+      PlayerPage(drama: drama, initialIndex: 0),
+      isMounted: () => true,
+    );
+
+    logic.start(factory: _RecordingFactory().create, coordinator: PlaybackCoordinator());
+    await pumpEventQueue();
+    await logic.session.playbackSettled;
+
+    expect(playback.requests, isEmpty);
+    expect(logic.sessionEpisodes.first.videoUrl, 'file:///local/signal-1.mp4');
+  });
+
   group('surface flags', () {
     test('should_set_immersive_when_picture_in_picture_callback_fires', () async {
       final factory = _RecordingFactory();
@@ -154,6 +187,55 @@ void main() {
 
       expect(logic.pip, isFalse);
     });
+
+    test('should_clear_stale_pip_when_app_returns_to_foreground', () async {
+      final factory = _RecordingFactory();
+      final drama = _drama('signal');
+      final logic = _logic(FakeWatchHistory());
+      final immersive = <bool>[];
+      logic.attach(
+        PlayerPage(drama: drama, initialIndex: 0),
+        isMounted: () => true,
+      );
+      logic.onImmersiveChanged = immersive.add;
+      logic.start(factory: factory.create, coordinator: PlaybackCoordinator());
+      await _drain(logic);
+
+      // 模拟画中画已进入但退出时没有回调 false。
+      logic.onPipChanged(true);
+      expect(logic.chromeHidden, isTrue);
+
+      logic.onLifecycle(AppLifecycleState.resumed);
+
+      expect(logic.pip, isFalse);
+      expect(logic.pipPreparing, isFalse);
+      expect(logic.chromeHidden, isFalse);
+      expect(immersive.last, isFalse);
+
+      logic.dispose();
+      await _drain(logic);
+    });
+
+    test('should_resume_playback_after_seek_when_paused', () async {
+      final logic = _logic(FakeWatchHistory());
+      logic.attach(
+        PlayerPage(drama: _drama('signal'), initialIndex: 0),
+        isMounted: () => true,
+      );
+      logic.start(
+        factory: _RecordingFactory().create,
+        coordinator: PlaybackCoordinator(),
+      );
+      await _drain(logic);
+      logic.session.setUserWantsPlay(false);
+      expect(logic.session.userWantsPlay, isFalse);
+
+      logic.resumeAfterSeek();
+
+      expect(logic.session.userWantsPlay, isTrue);
+      logic.dispose();
+      await _drain(logic);
+    });
   });
 
   group('history writes', () {
@@ -430,6 +512,75 @@ void main() {
   });
 }
 
+class _LocalStorage implements DownloadStorage {
+  @override
+  Future<Map<String, String>> restore() async => {
+    'signal-1': 'file:///local/signal-1.mp4',
+  };
+
+  @override
+  Future<String?> localPathFor(String episodeId) async =>
+      episodeId == 'signal-1' ? 'file:///local/signal-1.mp4' : null;
+
+  @override
+  Future<DownloadedMedia> download({
+    required String episodeId,
+    required String url,
+    DownloadProgress? onProgress,
+  }) async => throw UnimplementedError();
+
+  @override
+  Future<void> delete(String episodeId) async {}
+
+  @override
+  Future<void> clear() async {}
+}
+
+class _EmptyDownloadRepository implements DownloadRepository {
+  @override
+  Future<DownloadPolicy> fetchPolicy() async => const DownloadPolicy(
+    maxPerDevice: 20,
+    licenseDays: 30,
+    wifiOnly: false,
+    maxQuality: 'AUTO',
+    maxStorageBytes: 0,
+    used: 0,
+    remaining: 20,
+    expirePolicyText: '',
+  );
+
+  @override
+  Future<List<DownloadLicense>> list() async => const [];
+
+  @override
+  Future<DownloadLicense> grant(String episodeId, {String? quality}) async =>
+      throw UnimplementedError();
+
+  @override
+  Future<void> updateSettings({bool? wifiOnly, String? maxQuality}) async {}
+
+  @override
+  Future<DownloadLicense> refreshUrl(String episodeId) async =>
+      throw UnimplementedError();
+
+  @override
+  Future<DownloadLicense> reportProgress(
+    String episodeId, {
+    String? deviceId,
+    String? status,
+    int? progressPercent,
+    int? downloadedBytes,
+    int? totalBytes,
+    String? errorMsg,
+  }) async => throw UnimplementedError();
+
+  @override
+  Future<void> remove(String episodeId) async {}
+
+  @override
+  Future<int> clear() async => 0;
+}
+
 /// Counts native-style allocations so leaks are visible to a test.
 class _RecordingFactory {
   final List<_RecordingPlayer> created = [];
diff --git a/test/player/player_more_sheet_test.dart b/test/player/player_more_sheet_test.dart
new file mode 100644
index 0000000..3929b53
--- /dev/null
+++ b/test/player/player_more_sheet_test.dart
@@ -0,0 +1,77 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/player/widgets/player_more_sheet.dart';
+
+void main() {
+  testWidgets('should_hide_pip_row_when_platform_unsupported', (tester) async {
+    await _openSheet(tester);
+
+    expect(find.byKey(const Key('player-more-sheet')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-clear')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-offline')), findsOneWidget);
+    expect(find.byKey(const Key('player-more-pip')), findsNothing);
+  });
+
+  testWidgets('should_trigger_pip_and_close_sheet_when_tapped', (tester) async {
+    var pipCalls = 0;
+    await _openSheet(tester, onPip: () => pipCalls++);
+
+    expect(find.byKey(const Key('player-more-pip')), findsOneWidget);
+    expect(
+      tester.getTopLeft(find.byKey(const Key('player-more-clear'))).dy <
+          tester.getTopLeft(find.byKey(const Key('player-more-pip'))).dy,
+      isTrue,
+    );
+    expect(
+      tester.getTopLeft(find.byKey(const Key('player-more-pip'))).dy <
+          tester.getTopLeft(find.byKey(const Key('player-more-offline'))).dy,
+      isTrue,
+    );
+
+    await tester.tap(find.byKey(const Key('player-more-pip')));
+    await tester.pumpAndSettle();
+
+    expect(pipCalls, 1);
+    expect(find.byKey(const Key('player-more-sheet')), findsNothing);
+  });
+}
+
+Future<void> _openSheet(WidgetTester tester, {VoidCallback? onPip}) async {
+  await tester.pumpWidget(
+    MaterialApp(
+      supportedLocales: AppLocalizations.supportedLocales,
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      home: Scaffold(
+        body: Builder(
+          builder: (context) => Center(
+            child: TextButton(
+              key: const Key('open-more-sheet'),
+              onPressed: () => showModalBottomSheet<void>(
+                context: context,
+                backgroundColor: Colors.transparent,
+                isScrollControlled: true,
+                builder: (_) => PlayerMoreSheet(
+                  l10n: AppLocalizations.of(context)!,
+                  state: const PlayerMoreState(speed: 1.0, qualities: ['AUTO']),
+                  actions: PlayerMoreActions(
+                    onSpeedChanged: (_) {},
+                    onClear: () {},
+                    onDownload: () {},
+                    onPip: onPip,
+                  ),
+                ),
+              ),
+              child: const Text('open'),
+            ),
+          ),
+        ),
+      ),
+    ),
+  );
+  await tester.tap(find.byKey(const Key('open-more-sheet')));
+  await tester.pumpAndSettle();
+}
diff --git a/test/player/player_open_detail_test.dart b/test/player/player_open_detail_test.dart
new file mode 100644
index 0000000..ae36b5b
--- /dev/null
+++ b/test/player/player_open_detail_test.dart
@@ -0,0 +1,181 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/player_port.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/core/data/services/android_picture_in_picture.dart';
+import 'package:fruitshorts/core/data/services/catalog_controller.dart';
+import 'package:fruitshorts/core/data/services/favorite_controller.dart';
+import 'package:fruitshorts/core/data/services/playback_session.dart';
+import 'package:fruitshorts/core/data/services/video_player_port.dart';
+import 'package:fruitshorts/core/platform/haptics.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/drama_detail/drama_detail_view.dart';
+import 'package:fruitshorts/pages/player/player_logic.dart';
+import 'package:fruitshorts/pages/player/player_view.dart';
+import 'package:provider/provider.dart';
+import 'package:video_player/video_player.dart';
+
+import '../support/fake_catalog.dart';
+import '../support/fake_haptics.dart';
+import '../support/fake_watch_history.dart';
+
+void main() {
+  testWidgets(
+    'should_keep_active_player_and_progress_when_detail_route_is_open',
+    (tester) async {
+      final drama = _drama();
+      final history = FakeWatchHistory();
+      final playback = FakePlaybackRepository();
+      final catalog = CatalogController(FakeCatalogRepository(dramas: [drama]));
+      final favorites = FavoriteController(
+        InMemoryFavoriteRepository(saved: {drama.id}, cards: [drama]),
+      );
+      final logic = PlayerLogic(
+        history: history,
+        playback: playback,
+        pictureInPicture: AndroidPictureInPicture(
+          channel: const MethodChannel('test/player_open_detail/pip'),
+        ),
+      );
+      final factory = _RecordingFactory();
+      logic.attach(
+        PlayerPage(drama: drama, initialIndex: 0),
+        isMounted: () => true,
+      );
+      logic.start(factory: factory.create, coordinator: PlaybackCoordinator());
+      await _pumpSession(tester);
+
+      final active = logic.session.active;
+      final index = logic.session.currentIndex;
+      final player = factory.created.first;
+      final playsBefore = player.plays;
+      final tracked = VideoPlayerPort(drama.episodes.first);
+      tracked.controller.value = const VideoPlayerValue(
+        duration: Duration(minutes: 5),
+        position: Duration(seconds: 37),
+        isInitialized: true,
+      );
+      logic
+        ..trackedPlayer = tracked
+        ..trackedEpisode = drama.episodes.first
+        ..trackedDrama = drama;
+
+      late BuildContext pageContext;
+      await tester.pumpWidget(
+        MultiProvider(
+          providers: [
+            Provider<WatchHistoryRepository>.value(value: history),
+            Provider<PlaybackRepository>.value(value: playback),
+            ChangeNotifierProvider<CatalogController>.value(value: catalog),
+            ChangeNotifierProvider<FavoriteController>.value(value: favorites),
+            Provider<Haptics>.value(value: FakeHaptics()),
+          ],
+          child: MaterialApp(
+            locale: const Locale('en'),
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: Builder(
+              builder: (context) {
+                pageContext = context;
+                return const SizedBox.shrink();
+              },
+            ),
+          ),
+        ),
+      );
+
+      unawaited(logic.openDetail(pageContext));
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 400));
+      await _pumpSession(tester);
+
+      expect(find.byType(DramaDetailPage), findsOneWidget);
+      expect(logic.session.active, same(active));
+      expect(logic.session.currentIndex, index);
+      expect(logic.session.userWantsPlay, isTrue);
+      expect(player.pauses, 1);
+      expect(player.plays, playsBefore);
+      expect(tracked.controller.value.position, const Duration(seconds: 37));
+      expect(history.writes, isEmpty);
+
+      await tester.pageBack();
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 400));
+      await _pumpSession(tester);
+      await logic.pendingWrite;
+
+      expect(logic.session.active, same(active));
+      expect(logic.session.currentIndex, index);
+      expect(logic.session.userWantsPlay, isTrue);
+      expect(player.plays, playsBefore + 1);
+      expect(tracked.controller.value.position, const Duration(seconds: 37));
+      expect(history.writes, ['signal-1|37000|false']);
+
+      logic
+        ..trackedPlayer = null
+        ..trackedEpisode = null
+        ..trackedDrama = null
+        ..dispose();
+      await _pumpSession(tester);
+      await tracked.dispose();
+    },
+  );
+}
+
+Drama _drama() => Drama(
+  id: 'signal',
+  title: 'Signal',
+  synopsis: 'synopsis',
+  posterUrl: '/files/signal.png',
+  episodes: const [
+    Episode(
+      id: 'signal-1',
+      number: 1,
+      title: 'Episode 1',
+      videoUrl: 'https://example.test/signal-1.mp4',
+      isFree: true,
+    ),
+  ],
+);
+
+Future<void> _pumpSession(WidgetTester tester) async {
+  for (var attempt = 0; attempt < 5; attempt++) {
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 1));
+  }
+}
+
+class _RecordingFactory {
+  final List<_RecordingPlayer> created = [];
+
+  PlayerPort create(Episode episode) {
+    final player = _RecordingPlayer();
+    created.add(player);
+    return player;
+  }
+}
+
+class _RecordingPlayer implements PlayerPort {
+  int plays = 0;
+  int pauses = 0;
+
+  @override
+  Future<void> initialize() async {}
+
+  @override
+  Future<void> play() async => plays++;
+
+  @override
+  Future<void> pause() async => pauses++;
+
+  @override
+  Future<void> dispose() async {}
+}
diff --git a/test/player/player_video_surface_test.dart b/test/player/player_video_surface_test.dart
new file mode 100644
index 0000000..3cc3194
--- /dev/null
+++ b/test/player/player_video_surface_test.dart
@@ -0,0 +1,109 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:video_player/video_player.dart';
+
+import 'package:fruitshorts/pages/player/widgets/player_video_surface.dart';
+
+void main() {
+  testWidgets('should_keep_fallback_visible_before_video_is_ready', (
+    tester,
+  ) async {
+    await _pumpSurface(tester);
+
+    expect(find.byKey(const Key('player-fallback-background')), findsOneWidget);
+    expect(find.byKey(const Key('player-fallback-cover')), findsOneWidget);
+    expect(_opacity(tester), 0);
+    expect(find.byKey(const Key('player-debug-video')), findsNothing);
+  });
+
+  testWidgets('should_fade_video_in_within_200ms_after_first_frame', (
+    tester,
+  ) async {
+    final controller = await _pumpSurface(tester);
+    expect(_opacity(tester), 0);
+
+    controller.value = const VideoPlayerValue(
+      duration: Duration(minutes: 1),
+      size: Size(1280, 720),
+      position: Duration(milliseconds: 1),
+      isInitialized: true,
+      isPlaying: true,
+    );
+    await tester.pump();
+
+    expect(_opacity(tester), 1);
+    expect(
+      tester
+          .widget<AnimatedOpacity>(
+            find.byKey(const Key('player-video-opacity')),
+          )
+          .duration,
+      const Duration(milliseconds: 200),
+    );
+    await tester.pump(const Duration(milliseconds: 100));
+    final halfway = _fadeValue(tester);
+    expect(halfway, greaterThan(0));
+    expect(halfway, lessThan(1));
+    await tester.pump(const Duration(milliseconds: 100));
+    expect(_fadeValue(tester), 1);
+    expect(find.byKey(const Key('player-fallback-background')), findsOneWidget);
+    expect(find.byKey(const Key('player-debug-video')), findsNothing);
+  });
+
+  testWidgets('should_show_video_error_above_retained_fallback', (
+    tester,
+  ) async {
+    await _pumpSurface(
+      tester,
+      value: const VideoPlayerValue.erroneous('No route to host'),
+    );
+
+    expect(find.byKey(const Key('player-video-error')), findsOneWidget);
+    expect(find.text('No route to host'), findsOneWidget);
+    expect(find.byKey(const Key('player-fallback-background')), findsOneWidget);
+    expect(_opacity(tester), 0);
+    expect(find.byKey(const Key('player-debug-video')), findsNothing);
+  });
+}
+
+Future<VideoPlayerController> _pumpSurface(
+  WidgetTester tester, {
+  VideoPlayerValue? value,
+}) async {
+  final controller = VideoPlayerController.networkUrl(
+    Uri.parse('http://192.168.31.187:8081/files/video.mp4'),
+  );
+  addTearDown(controller.dispose);
+  if (value != null) controller.value = value;
+  await tester.pumpWidget(
+    MaterialApp(
+      home: Scaffold(
+        body: PlayerVideoSurface(
+          controller: controller,
+          posterUrl: '/files/poster.jpg',
+          videoUrl: controller.dataSource,
+          theater: false,
+          onTap: () {},
+        ),
+      ),
+    ),
+  );
+  await tester.pump();
+  return controller;
+}
+
+double _opacity(WidgetTester tester) {
+  return tester
+      .widget<AnimatedOpacity>(find.byKey(const Key('player-video-opacity')))
+      .opacity;
+}
+
+double _fadeValue(WidgetTester tester) {
+  final fade = find.descendant(
+    of: find.byKey(const Key('player-video-opacity')),
+    matching: find.byType(FadeTransition),
+  );
+  return tester.widget<FadeTransition>(fade).opacity.value;
+}
diff --git a/test/ranking/ranking_logic_test.dart b/test/ranking/ranking_logic_test.dart
new file mode 100644
index 0000000..bc6897e
--- /dev/null
+++ b/test/ranking/ranking_logic_test.dart
@@ -0,0 +1,74 @@
+// Author: fruit.com.cn
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/home_feed.dart';
+import 'package:fruitshorts/pages/discover/ranking_logic.dart';
+
+void main() {
+  test('should_use_backend_hot_order_when_hot_board_is_selected', () {
+    final logic = RankingLogic(
+      sections: [
+        FeedSection(
+          code: 'hot',
+          title: 'Hot',
+          dramas: [_drama('first'), _drama('second')],
+        ),
+        FeedSection(code: 'new', title: 'New', dramas: [_drama('fresh')]),
+      ],
+      fallback: [_drama('fallback')],
+    );
+
+    expect(logic.board, RankingBoard.hot);
+    expect(logic.entries.map((entry) => entry.drama.id), ['first', 'second']);
+    expect(logic.entries.map((entry) => entry.rank), [1, 2]);
+    logic.dispose();
+  });
+
+  test('should_switch_to_new_releases_when_new_board_is_selected', () {
+    final logic = RankingLogic(
+      sections: [
+        FeedSection(code: 'hot', title: 'Hot', dramas: [_drama('hot')]),
+        FeedSection(code: 'new', title: 'New', dramas: [_drama('fresh')]),
+      ],
+      fallback: const [],
+    );
+
+    logic.select(RankingBoard.newReleases);
+
+    expect(logic.board, RankingBoard.newReleases);
+    expect(logic.entries.single.drama.id, 'fresh');
+    logic.dispose();
+  });
+
+  test(
+    'should_deduplicate_and_fall_back_when_requested_section_is_missing',
+    () {
+      final logic = RankingLogic(
+        sections: [
+          FeedSection(
+            code: 'hot',
+            title: 'Hot',
+            dramas: [_drama('a'), _drama('a')],
+          ),
+        ],
+        fallback: [_drama('b'), _drama('a')],
+      );
+
+      expect(logic.entries.map((entry) => entry.drama.id), ['a']);
+
+      logic.select(RankingBoard.newReleases);
+
+      expect(logic.entries.map((entry) => entry.drama.id), ['b', 'a']);
+      expect(logic.entries.last.rank, 2);
+      logic.dispose();
+    },
+  );
+}
+
+Drama _drama(String id) => Drama(
+  id: id,
+  title: 'Drama $id',
+  synopsis: 'Synopsis $id',
+  posterUrl: '/files/$id.jpg',
+);
diff --git a/test/splash/splash_gate_test.dart b/test/splash/splash_gate_test.dart
deleted file mode 100644
index 0806c82..0000000
--- a/test/splash/splash_gate_test.dart
+++ /dev/null
@@ -1,59 +0,0 @@
-// Author: fruit.com.cn
-
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:fruitshorts/core/data/models/drama.dart';
-import 'package:fruitshorts/core/data/models/home_feed.dart';
-import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
-import 'package:fruitshorts/core/data/services/catalog_controller.dart';
-import 'package:fruitshorts/l10n/app_localizations.dart';
-import 'package:fruitshorts/pages/home/home_view.dart';
-import 'package:provider/provider.dart';
-
-void main() {
-  testWidgets(
-    'should_keep_splash_with_loading_until_home_feed_settles',
-    (tester) async {
-      final repository = _PendingCatalog();
-      await tester.pumpWidget(
-        MaterialApp(
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
-          home: ChangeNotifierProvider(
-            create: (_) => CatalogController(repository)..load(),
-            child: const HomePage(),
-          ),
-        ),
-      );
-
-      expect(find.byKey(const Key('splash-screen')), findsOneWidget);
-      expect(find.byKey(const Key('splash-loading')), findsOneWidget);
-      expect(find.byKey(const Key('home-empty')), findsNothing);
-      final clip = tester.widget<ClipRRect>(find.byType(ClipRRect));
-      expect(clip.borderRadius, BorderRadius.circular(18));
-
-      repository.pending.complete(const HomeFeed());
-      await tester.pump();
-      await tester.pump();
-
-      expect(find.byKey(const Key('splash-screen')), findsNothing);
-      expect(find.byKey(const Key('home-empty')), findsOneWidget);
-    },
-  );
-}
-
-class _PendingCatalog implements CatalogRepository {
-  final Completer<HomeFeed> pending = Completer<HomeFeed>();
-
-  @override
-  Future<HomeFeed> fetchHomeFeed() => pending.future;
-
-  @override
-  Future<HomeFeed> fetchDiscoverFeed() => pending.future;
-
-  @override
-  Future<Drama> fetchDrama(String dramaId) =>
-      Future<Drama>.error(StateError('unused'));
-}
diff --git a/test/store/store_pages_test.dart b/test/store/store_pages_test.dart
new file mode 100644
index 0000000..de4fe9e
--- /dev/null
+++ b/test/store/store_pages_test.dart
@@ -0,0 +1,105 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/order.dart';
+import 'package:fruitshorts/core/data/models/product.dart';
+import 'package:fruitshorts/core/data/repositories/store_repository.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/store/recharge_page.dart';
+import 'package:fruitshorts/pages/store/vip_page.dart';
+
+void main() {
+  testWidgets('should_show_coin_packs_and_create_order_when_buying', (
+    tester,
+  ) async {
+    final repository = _FakeStoreRepository();
+
+    await tester.pumpWidget(_app(RechargePage(repository: repository)));
+    await tester.pumpAndSettle();
+
+    expect(find.text('550 Coins'), findsOneWidget);
+    expect(find.textContaining('500 coins'), findsOneWidget);
+    expect(find.textContaining('+50 bonus'), findsOneWidget);
+    expect(find.text('Rp 15.000'), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('store-buy-pack-1')));
+    await tester.pumpAndSettle();
+
+    expect(repository.requestedTypes, ['COIN_PACK']);
+    expect(repository.orderedProductIds, ['pack-1']);
+    expect(find.textContaining('Order ORD1 created.'), findsOneWidget);
+  });
+
+  testWidgets('should_show_vip_tiers_and_create_order_when_joining', (
+    tester,
+  ) async {
+    final repository = _FakeStoreRepository();
+
+    await tester.pumpWidget(_app(VipPage(repository: repository)));
+    await tester.pumpAndSettle();
+
+    expect(find.text('30-day VIP'), findsOneWidget);
+    expect(find.text('Rp 99.000'), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('store-buy-vip-1')));
+    await tester.pumpAndSettle();
+
+    expect(repository.requestedTypes, ['VIP']);
+    expect(repository.orderedProductIds, ['vip-1']);
+    expect(find.textContaining('Order ORD1 created.'), findsOneWidget);
+  });
+}
+
+Widget _app(Widget home) => MaterialApp(
+  locale: const Locale('en'),
+  localizationsDelegates: AppLocalizations.localizationsDelegates,
+  supportedLocales: AppLocalizations.supportedLocales,
+  home: home,
+);
+
+class _FakeStoreRepository implements StoreRepository {
+  final List<String?> requestedTypes = [];
+  final List<String> orderedProductIds = [];
+
+  @override
+  Future<List<AppProduct>> fetchProducts({String? type}) async {
+    requestedTypes.add(type);
+    if (type == AppProduct.vipType) {
+      return const [
+        AppProduct(
+          id: 'vip-1',
+          code: 'vip_30',
+          name: 'Monthly VIP',
+          type: AppProduct.vipType,
+          displayPrice: 'Rp 99.000',
+          vipDays: 30,
+        ),
+      ];
+    }
+    return const [
+      AppProduct(
+        id: 'pack-1',
+        code: 'coin_550',
+        name: '550 Coins',
+        type: AppProduct.coinPackType,
+        coinAmount: 500,
+        bonusCoin: 50,
+        totalCoin: 550,
+        displayPrice: 'Rp 15.000',
+      ),
+    ];
+  }
+
+  @override
+  Future<AppOrder> createOrder(String productId) async {
+    orderedProductIds.add(productId);
+    return const AppOrder(
+      id: 'order-1',
+      orderNo: 'ORD1',
+      productName: 'Coin pack',
+      coinAmount: 550,
+      status: AppOrder.created,
+    );
+  }
+}
diff --git a/test/support/fake_catalog.dart b/test/support/fake_catalog.dart
index fc6d54a..8b5598c 100644
--- a/test/support/fake_catalog.dart
+++ b/test/support/fake_catalog.dart
@@ -1,12 +1,16 @@
 import 'package:fruitshorts/core/data/models/drama.dart';
 import 'package:fruitshorts/core/data/models/home_feed.dart';
+import 'package:fruitshorts/core/data/models/search_result.dart';
 import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
+import 'package:fruitshorts/core/data/repositories/search_repository.dart';
 
 /// 测试用目录数据：三部分区里的短剧，标题与后端演示数据保持一致。
-class FakeCatalogRepository implements CatalogRepository {
-  FakeCatalogRepository({List<Drama>? dramas}) : dramas = dramas ?? demoDramas;
+class FakeCatalogRepository implements CatalogRepository, SearchRepository {
+  FakeCatalogRepository({List<Drama>? dramas, this.banners = const []})
+    : dramas = dramas ?? demoDramas;
 
   final List<Drama> dramas;
+  final List<FeedBanner> banners;
 
   @override
   Future<HomeFeed> fetchHomeFeed() async => _feed();
@@ -19,7 +23,22 @@ class FakeCatalogRepository implements CatalogRepository {
     return dramas.firstWhere((drama) => drama.id == dramaId);
   }
 
+  @override
+  Future<SearchResult> search(
+    String keyword, {
+    int pageIndex = 1,
+    int pageSize = 20,
+  }) async {
+    final query = keyword.trim().toLowerCase();
+    final hits = dramas.where((drama) {
+      final haystack = [drama.title, drama.synopsis, drama.genre].join(' ');
+      return haystack.toLowerCase().contains(query);
+    }).toList();
+    return SearchResult(total: hits.length, list: hits);
+  }
+
   HomeFeed _feed() => HomeFeed(
+    banners: banners,
     sections: [FeedSection(code: 'hot', title: '热门推荐', dramas: dramas)],
   );
 }
@@ -30,19 +49,21 @@ final List<Drama> demoDramas = [
     'The Signal',
     'Suspense · Mystery',
     format: 1,
+    viewCount: 419000,
+    likeCount: 419000,
+    favoriteCount: 1006,
+    commentCount: 32000,
   ),
   _drama(
     'city-lights-demo',
     'City Lights & Velvet Nights',
     'Urban Romance',
     format: 8,
+    likeCount: 12400,
+    favoriteCount: 3200,
+    commentCount: 96,
   ),
-  _drama(
-    'vengeance-demo',
-    'Vengeance Rising',
-    'Action · Thriller',
-    format: 15,
-  ),
+  _drama('vengeance-demo', 'Vengeance Rising', 'Action · Thriller', format: 15),
 ];
 
 Drama _drama(
@@ -50,13 +71,22 @@ Drama _drama(
   String title,
   String genre, {
   required int format,
+  int? likeCount,
+  int? favoriteCount,
+  int? commentCount,
+  int viewCount = 0,
 }) => Drama(
   id: id,
   title: title,
   synopsis: '$title synopsis',
   posterUrl: '/files/$id.png',
   genre: genre,
+  language: 'id',
   detailLoaded: true,
+  viewCount: viewCount,
+  likeCount: likeCount,
+  favoriteCount: favoriteCount,
+  commentCount: commentCount,
   episodes: [
     for (var index = 0; index < 7; index++)
       Episode(
diff --git a/test/theme/app_dimens_test.dart b/test/theme/app_dimens_test.dart
index f4402d4..87b1073 100644
--- a/test/theme/app_dimens_test.dart
+++ b/test/theme/app_dimens_test.dart
@@ -6,18 +6,21 @@ import 'package:fruitshorts/core/theme/app_dimens.dart';
 void main() {
   test('should_expose_the_k20_spacing_and_type_scale', () {
     expect(AppDimens.pageHorizontal, 16);
-    expect(AppDimens.cardRadius, 12);
-    expect(AppDimens.innerRadius, 10);
+    expect(AppDimens.cardRadius, 16);
+    expect(AppDimens.coverRadius, 16);
+    expect(AppDimens.authCardRadius, 20);
+    expect(AppDimens.pillRadius, 999);
+    expect(AppDimens.buttonRadius, 999);
     expect(AppDimens.caption, 12);
     expect(AppDimens.body, 14);
     expect(AppDimens.listTitle, 15);
     expect(AppDimens.sectionTitle, 16);
     expect(AppDimens.pageTitle, 20);
-    expect(AppDimens.navLabel, 9);
+    expect(AppDimens.navLabel, 10);
     expect(AppDimens.buttonHeight, 48);
     expect(AppDimens.primaryButtonHeight, 52);
     expect(AppDimens.tapTarget, 44);
-    expect(AppDimens.navHeight, 54);
+    expect(AppDimens.navHeight, 64);
     expect(AppDimens.progressHeight, 3);
   });
 }
diff --git a/test/theme/app_theme_test.dart b/test/theme/app_theme_test.dart
index 4a7eb85..e7bc83c 100644
--- a/test/theme/app_theme_test.dart
+++ b/test/theme/app_theme_test.dart
@@ -3,7 +3,9 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/app.dart';
 import 'package:fruitshorts/core/theme/app_colors.dart';
 import 'package:fruitshorts/core/theme/app_theme.dart';
 
@@ -14,71 +16,65 @@ double _contrast(Color foreground, Color background) {
 }
 
 void main() {
-  test('should_expose_obsidian_flare_brand_tokens', () {
-    expect(AppColors.blue, const Color(0xFFFF5B3D));
-    expect(AppColors.bluePressed, const Color(0xFFFF4321));
-    expect(AppColors.blueSoft, const Color(0xFF9278EA));
-    expect(AppColors.secondary, const Color(0xFF9278EA));
-    expect(AppColors.gold, const Color(0xFFFBBF24));
-    expect(AppColors.ink, const Color(0xFF0B0C10));
-    expect(AppColors.card, const Color(0xFF1B1C21));
-    expect(AppColors.cardAlt, const Color(0xFF1C1D21));
-    expect(AppColors.raised, const Color(0xFF1C1D21));
-    expect(AppColors.bar, const Color(0xFF0D0D11));
-    expect(AppColors.success, const Color(0xFF34D399));
-    expect(AppColors.onPrimary, const Color(0xFFFFFFFF));
+  test('should_expose_light_warm_orange_tokens', () {
+    expect(AppColors.blue, const Color(0xFFFF7A1A));
+    expect(AppColors.bluePressed, const Color(0xFFFF6A00));
+    expect(AppColors.secondary, const Color(0xFFFF6A8A));
+    expect(AppColors.ink, const Color(0xFFFFF8F0));
+    expect(AppColors.surfaceTop, const Color(0xFFFFE9D6));
+    expect(AppColors.card, const Color(0xFFFFFFFF));
+    expect(AppColors.onSurface, const Color(0xFF1F1B16));
+    expect(AppColors.muted, const Color(0xFF8C837B));
+    expect(AppColors.subtle, const Color(0xFFB3AAA1));
+    expect(AppColors.border, const Color(0xFFF0E4D6));
+    expect(AppColors.badgePink, const Color(0xFFFFE3EC));
+    expect(AppColors.badgePinkText, const Color(0xFFFF6A8A));
+  });
+
+  test('should_keep_primary_text_readable_on_warm_background', () {
     expect(
-      _contrast(AppColors.onGold, AppColors.gold),
+      _contrast(AppColors.onSurface, AppColors.ink),
       greaterThanOrEqualTo(4.5),
     );
+    expect(_contrast(AppColors.muted, AppColors.card), greaterThanOrEqualTo(3));
   });
 
-  test('should_meet_text_and_icon_contrast_when_using_theme_tokens', () {
+  test('should_use_light_color_scheme_and_dark_system_icons', () {
+    final theme = AppTheme.light();
+
+    expect(theme.brightness, Brightness.light);
+    expect(theme.colorScheme.primary, AppColors.blue);
+    expect(theme.colorScheme.onPrimary, AppColors.onPrimary);
+    expect(theme.colorScheme.surface, AppColors.ink);
+    expect(theme.colorScheme.onSurface, AppColors.onSurface);
+    expect(theme.colorScheme.outline, AppColors.border);
+    expect(theme.scaffoldBackgroundColor, AppColors.ink);
+    expect(theme.appBarTheme.systemOverlayStyle, SystemUiOverlayStyle.dark);
+  });
+
+  test('should_use_ink_navigation_bar_without_contrast_scrim', () {
+    expect(appSystemOverlayStyle.statusBarColor, Colors.transparent);
+    expect(appSystemOverlayStyle.systemNavigationBarColor, AppColors.ink);
     expect(
-      _contrast(AppColors.onPrimary, AppColors.blue),
-      greaterThanOrEqualTo(3),
+      appSystemOverlayStyle.systemNavigationBarDividerColor,
+      Colors.transparent,
     );
-    expect(_contrast(AppColors.blue, Colors.white), greaterThanOrEqualTo(3));
     expect(
-      _contrast(AppColors.blueSoft, AppColors.ink),
-      greaterThanOrEqualTo(3),
+      appSystemOverlayStyle.systemNavigationBarIconBrightness,
+      Brightness.dark,
     );
+    expect(appSystemOverlayStyle.systemNavigationBarContrastEnforced, isFalse);
+
+    final sheetTheme = AppTheme.light().bottomSheetTheme;
+    expect(sheetTheme.backgroundColor, Colors.transparent);
+    expect(sheetTheme.modalBackgroundColor, Colors.transparent);
+    expect(sheetTheme.surfaceTintColor, Colors.transparent);
   });
 
-  test('should_use_flare_brand_in_light_and_dark_color_schemes', () {
-    for (final theme in [AppTheme.light(), AppTheme.dark()]) {
-      expect(theme.colorScheme.primary, AppColors.blue);
-      expect(theme.colorScheme.onPrimary, AppColors.onPrimary);
-    }
-  });
-
-  test('should_define_non_white_outline_tokens_in_both_themes', () {
-    final light = AppTheme.light().colorScheme;
-    final dark = AppTheme.dark().colorScheme;
-
-    expect(light.outline, AppColors.outlineLight);
-    expect(light.outlineVariant, AppColors.outlineVariantLight);
-    expect(dark.outline, AppColors.outlineDark);
-    expect(dark.outlineVariant, AppColors.outlineVariantDark);
-    expect(dark.outlineVariant.computeLuminance(), lessThan(0.2));
-    expect(light.outlineVariant.computeLuminance(), lessThan(0.92));
-  });
-
-  testWidgets('should_expose_chili_brand_through_widget_theme', (tester) async {
-    late ThemeData applied;
-    await tester.pumpWidget(
-      MaterialApp(
-        theme: AppTheme.dark(),
-        home: Builder(
-          builder: (context) {
-            applied = Theme.of(context);
-            return const SizedBox.shrink();
-          },
-        ),
-      ),
-    );
-
-    expect(applied.colorScheme.primary, AppColors.blue);
-    expect(applied.colorScheme.onPrimary, AppColors.onPrimary);
+  test('should_expose_page_gradient_and_soft_card_shadow', () {
+    expect(AppTheme.pageGradient.colors, [AppColors.surfaceTop, AppColors.ink]);
+    expect(AppTheme.cardShadow.color, AppColors.cardShadow);
+    expect(AppTheme.cardShadow.blurRadius, 18);
+    expect(AppTheme.cardShadow.offset, const Offset(0, 6));
   });
 }
diff --git a/test/wallet/wallet_page_test.dart b/test/wallet/wallet_page_test.dart
new file mode 100644
index 0000000..f06ee78
--- /dev/null
+++ b/test/wallet/wallet_page_test.dart
@@ -0,0 +1,101 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+
+import 'package:fruitshorts/core/data/models/wallet.dart';
+import 'package:fruitshorts/core/data/repositories/commerce_repository.dart';
+import 'package:fruitshorts/core/data/services/wallet_controller.dart';
+import 'package:fruitshorts/l10n/app_localizations.dart';
+import 'package:fruitshorts/pages/wallet/wallet_page.dart';
+
+void main() {
+  testWidgets('should_show_server_balance_and_ledger_when_wallet_opens', (
+    tester,
+  ) async {
+    final controller = WalletController(_FakeCommerceRepository());
+
+    await tester.pumpWidget(
+      ChangeNotifierProvider<WalletController>.value(
+        value: controller,
+        child: MaterialApp(
+          locale: const Locale('en'),
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: const WalletPage(),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('wallet-balance')), findsOneWidget);
+    expect(
+      tester.widget<Text>(find.byKey(const Key('wallet-balance'))).data,
+      '320',
+    );
+    expect(find.text('Episode unlock'), findsOneWidget);
+    expect(find.text('-50'), findsOneWidget);
+    expect(find.byKey(const Key('wallet-ledger-11')), findsOneWidget);
+  });
+
+  testWidgets('should_show_empty_ledger_copy_when_wallet_has_no_entries', (
+    tester,
+  ) async {
+    final controller = WalletController(
+      _FakeCommerceRepository(includeLedger: false),
+    );
+
+    await tester.pumpWidget(
+      ChangeNotifierProvider<WalletController>.value(
+        value: controller,
+        child: MaterialApp(
+          locale: const Locale('en'),
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: const WalletPage(),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('No coin activity yet.'), findsOneWidget);
+  });
+}
+
+class _FakeCommerceRepository implements CommerceRepository {
+  _FakeCommerceRepository({this.includeLedger = true});
+
+  final bool includeLedger;
+
+  @override
+  Future<WalletSnapshot> fetchWallet() async => WalletSnapshot(
+    wallet: const CoinWallet(
+      coinBalance: 320,
+      totalRechargedCoin: 500,
+      totalConsumedCoin: 180,
+      totalRefundedCoin: 0,
+    ),
+    ledger: includeLedger
+        ? [
+            CoinLedgerEntry(
+              id: '11',
+              changeAmount: -50,
+              balanceAfter: 320,
+              bizType: 'UNLOCK',
+              remark: '',
+              createdAt: DateTime(2026, 10, 19, 10),
+            ),
+          ]
+        : const [],
+  );
+
+  @override
+  Future<UnlockResult> unlock(String episodeId) async =>
+      const UnlockResult(
+        unlocked: true,
+        accessType: 'UNLOCKED',
+        coinCost: 50,
+        coinBalance: 270,
+      );
+}
diff --git a/test/watch/watch_history_provider_test.dart b/test/watch/watch_history_provider_test.dart
index 2b10336..31a3fd7 100644
--- a/test/watch/watch_history_provider_test.dart
+++ b/test/watch/watch_history_provider_test.dart
@@ -40,11 +40,9 @@ void main() {
       ),
     );
     await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.tap(find.byKey(const Key('tab-mine')));
     await tester.pumpAndSettle();
-    await tester.drag(find.byType(ListView), const Offset(0, -520));
-    await tester.pumpAndSettle();
-    await tester.tap(find.text('Watch History'));
+    await tester.tap(find.byKey(const Key('mine-history')));
     await tester.pumpAndSettle();
 
     expect(tester.takeException(), isNull);
diff --git a/test/watch/watch_records_controller_test.dart b/test/watch/watch_records_controller_test.dart
index 2fd55b2..f6a795b 100644
--- a/test/watch/watch_records_controller_test.dart
+++ b/test/watch/watch_records_controller_test.dart
@@ -72,6 +72,43 @@ void main() {
     expect(controller.error, isNull);
   });
 
+  test('should_reuse_cached_details_when_records_are_loaded_again', () async {
+    final history = ControlledWatchHistory([_progress('1'), _progress('2')]);
+    final catalog = ScriptedWatchCatalog();
+    final controller = WatchRecordsController(
+      history: history,
+      catalog: catalog,
+    );
+
+    await controller.load();
+    await controller.load();
+
+    expect(catalog.calls, ['1', '2']);
+    expect(
+      controller.records.every(
+        (record) => !record.detailLoading && record.drama != null,
+      ),
+      isTrue,
+    );
+  });
+
+  test('should_keep_existing_records_when_refresh_fails', () async {
+    final history = ControlledWatchHistory([_progress('1')]);
+    final controller = WatchRecordsController(
+      history: history,
+      catalog: ScriptedWatchCatalog(),
+    );
+    await controller.load();
+
+    history.failRecent = true;
+    await controller.load();
+
+    expect(controller.loading, isFalse);
+    expect(controller.error, 'progressError');
+    expect(controller.records.single.drama?.id, '1');
+    expect(controller.records.single.detailLoading, isFalse);
+  });
+
   test('should_keep_other_records_when_one_detail_request_fails', () async {
     final history = ControlledWatchHistory([_progress('1'), _progress('2')]);
     final catalog = ScriptedWatchCatalog(failedIds: {'1'});
diff --git a/test/watch/watch_records_page_test.dart b/test/watch/watch_records_page_test.dart
index d8c99e3..ec98178 100644
--- a/test/watch/watch_records_page_test.dart
+++ b/test/watch/watch_records_page_test.dart
@@ -12,6 +12,8 @@ import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart
 import 'package:fruitshorts/core/data/services/auth_controller.dart';
 import 'package:fruitshorts/core/data/services/auth_session_store.dart';
 import 'package:fruitshorts/core/platform/haptics.dart';
+import 'package:fruitshorts/core/theme/app_colors.dart';
+import 'package:fruitshorts/core/widgets/app_pull_to_refresh.dart';
 import 'package:fruitshorts/core/widgets/empty_state.dart';
 import 'package:fruitshorts/l10n/app_localizations.dart';
 import 'package:fruitshorts/pages/watch_records/watch_records_page.dart';
@@ -47,11 +49,43 @@ void main() {
     await _pumpPage(tester, auth: auth, history: history, catalog: catalog);
 
     expect(find.byKey(const Key('watch-records-page')), findsOneWidget);
+    expect(find.byKey(const Key('watch-records-back')), findsOneWidget);
+    expect(
+      tester.widget<Text>(find.byKey(const Key('watch-records-count'))).data,
+      '1 records',
+    );
     expect(find.text('The Signal'), findsOneWidget);
+    final title = tester.widget<Text>(
+      find.byKey(const Key('watch-record-title-the-signal-demo')),
+    );
+    expect(title.style?.color, AppColors.onSurface);
+    expect(title.style?.fontSize, 15);
+    expect(
+      tester.getSize(
+        find.byKey(const Key('watch-record-cover-the-signal-demo')),
+      ),
+      const Size(72, 96),
+    );
+    expect(
+      tester.getSize(
+        find.byKey(const Key('watch-record-remove-the-signal-demo')),
+      ),
+      const Size(32, 32),
+    );
+    expect(find.byIcon(Icons.delete_outline_rounded), findsOneWidget);
+    expect(find.byIcon(Icons.close_rounded), findsNothing);
     expect(
       find.byKey(const Key('watch-record-episode-the-signal-demo')),
       findsOneWidget,
     );
+    expect(find.byType(AppPullToRefresh), findsOneWidget);
+    final list = tester.widget<ListView>(
+      find.descendant(
+        of: find.byType(AppPullToRefresh),
+        matching: find.byType(ListView),
+      ),
+    );
+    expect(list.physics, AppPullToRefresh.physics);
   });
 
   testWidgets(
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 430b533..5b910bc 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -5,7 +5,12 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:fruitshorts/app.dart';
 import 'package:fruitshorts/core/data/models/comment.dart';
-import 'package:fruitshorts/core/data/models/interaction.dart';
+import 'package:fruitshorts/core/data/repositories/comment_repository.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/interaction_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/core/data/services/playback_session.dart';
 import 'package:fruitshorts/pages/player/player_view.dart';
 import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
 import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -14,18 +19,8 @@ import 'support/fake_catalog.dart';
 import 'support/fake_category.dart';
 import 'support/fake_interaction_repositories.dart';
 import 'support/widget_player.dart';
-import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
-import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
-import 'package:fruitshorts/core/data/repositories/comment_repository.dart';
-import 'package:fruitshorts/core/data/repositories/interaction_repository.dart';
-import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
-import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
-import 'package:fruitshorts/core/data/services/playback_session.dart';
 
 void main() {
-  /// 默认按「已登录」起测：账号体系接上后，"登录"不再是本地演示开关，
-  /// 而是本地会话（这里直接给 shared_preferences 的内存实现塞一份会话）。
-  /// 昵称/uid 与演示文案保持一致，避免为显示细节改写既有断言。
   void seedSignedInSession() {
     SharedPreferencesAsyncPlatform
         .instance = InMemorySharedPreferencesAsync.withData({
@@ -35,32 +30,20 @@ void main() {
     });
   }
 
-  void seedSignedOutSession() {
-    SharedPreferencesAsyncPlatform.instance =
-        InMemorySharedPreferencesAsync.empty();
-  }
+  setUp(seedSignedInSession);
 
-  setUp(() {
-    seedSignedInSession();
-  });
-
-  /// 所有 widget 测试都注入离线仓库：票据 / 进度 / 收藏都不碰网络，
-  /// 这样断言的是 UI 行为，而不是后端有没有起。
   Widget appUnderTest({
     PlayerFactory? playerFactory,
-    CatalogRepository? catalogRepository,
     CommentRepository? commentRepository,
     InteractionRepository? interactionRepository,
   }) {
-    final catalog = catalogRepository ?? FakeCatalogRepository();
+    final catalog = FakeCatalogRepository();
     return LumaDramaApp(
       playerFactory: playerFactory ?? createWidgetPlayer,
       catalogRepository: catalog,
       categoryRepository: FakeCategoryRepository(catalog: catalog),
       watchHistoryRepository: InMemoryWatchHistoryRepository(),
-      favoriteRepository: InMemoryFavoriteRepository(
-        cards: FakeCatalogRepository().dramas,
-      ),
+      favoriteRepository: InMemoryFavoriteRepository(cards: catalog.dramas),
       playbackRepository: FakePlaybackRepository(),
       commentRepository: commentRepository ?? FakeCommentRepository(),
       interactionRepository:
@@ -68,36 +51,49 @@ void main() {
     );
   }
 
-  testWidgets(
-    'should_promote_next_without_recreating_it_or_showing_loading_when_home_is_swiped',
-    (tester) async {
-      final created = <String>[];
-      await tester.pumpWidget(
-        appUnderTest(
-          playerFactory: (episode) {
-            created.add(episode.id);
-            return WidgetPlayer();
-          },
-        ),
-      );
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-home')));
-      await tester.pumpAndSettle();
-      expect(created, hasLength(2));
-      expect(find.byType(CircularProgressIndicator), findsNothing);
-      await tester.drag(find.byType(PageView), const Offset(0, -550));
-      await tester.pump();
-      expect(find.byType(CircularProgressIndicator), findsNothing);
-      await tester.pumpAndSettle();
-      expect(find.text('City Lights & Velvet Nights'), findsOneWidget);
-      expect(created, hasLength(3));
-      expect(created.toSet(), hasLength(3));
-      await tester.pumpWidget(const SizedBox.shrink());
-      await tester.pumpAndSettle();
-    },
-  );
+  testWidgets('should_preload_next_episode_when_fullscreen_player_opens', (
+    tester,
+  ) async {
+    final created = <String>[];
+    await tester.pumpWidget(
+      appUnderTest(
+        playerFactory: (episode) {
+          created.add(episode.id);
+          return WidgetPlayer();
+        },
+      ),
+    );
+    await tester.pumpAndSettle();
+    // 首页 feed 启动会创建首个播放器，先清掉再统计剧场播放器。
+    created.clear();
+    await _openTheaterPlayer(tester);
 
-  testWidgets('should_open_series_detail_when_immersive_home_is_tapped', (
+    expect(created, hasLength(2));
+    expect(find.byType(CircularProgressIndicator), findsNothing);
+    await tester.drag(find.byType(PageView).last, const Offset(0, -550));
+    await tester.pumpAndSettle();
+
+    expect(
+      tester.widget<Text>(find.byKey(const Key('player-episode-heading'))).data,
+      contains('Episode 2'),
+    );
+    expect(created, hasLength(3));
+    expect(created.toSet(), hasLength(3));
+  });
+
+  testWidgets('should_open_fullscreen_player_when_theater_card_is_tapped', (
+    tester,
+  ) async {
+    await tester.pumpWidget(appUnderTest());
+    await tester.pumpAndSettle();
+    await _openTheaterPlayer(tester);
+
+    final player = tester.widget<PlayerPage>(find.byType(PlayerPage).last);
+    expect(player.homeMode, isFalse);
+    expect(find.byKey(const Key('player-controls-top')), findsOneWidget);
+  });
+
+  testWidgets('should_keep_four_root_tabs_on_one_route_and_return_home', (
     tester,
   ) async {
     tester.view.physicalSize = const Size(390, 844);
@@ -107,533 +103,226 @@ void main() {
 
     await tester.pumpWidget(appUnderTest());
     await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('tab-home')));
+    await _openTheaterPlayer(tester);
+    expect(find.byType(PlayerPage), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('player-back')));
     await tester.pumpAndSettle();
-    expect(find.text('The Signal'), findsOneWidget);
-    expect(find.byType(Slider), findsNothing);
-    expect(find.text('Home'), findsWidgets);
-    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-info-card')), findsOneWidget);
-    expect(find.byKey(const Key('rail-like')), findsOneWidget);
-    expect(find.byKey(const Key('rail-comments')), findsOneWidget);
-    expect(find.byKey(const Key('rail-share')), findsOneWidget);
-    expect(find.byKey(const Key('rail-save')), findsOneWidget);
-    await tester.tap(find.byKey(const Key('home-feed-more')));
-    await tester.pumpAndSettle();
-    expect(find.byKey(const Key('home-feed-download')), findsOneWidget);
-    expect(find.byKey(const Key('home-feed-pip')), findsOneWidget);
+    expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
+    expect(
+      Navigator.of(
+        tester.element(find.byKey(const Key('home-all-dramas-grid'))),
+      ).canPop(),
+      isFalse,
+    );
+
     await tester.binding.handlePopRoute();
     await tester.pumpAndSettle();
-    expect(find.text('Watch Full'), findsNothing);
-    expect(find.byTooltip('Explore series'), findsNothing);
+    expect(find.byKey(const Key('home-feed-title')), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('tab-create')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('create-page')), findsOneWidget);
+    await tester.tap(find.byKey(const Key('tab-mine')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('mine-menu')), findsOneWidget);
+    expect(
+      Navigator.of(tester.element(find.byKey(const Key('mine-menu')))).canPop(),
+      isFalse,
+    );
   });
 
-  testWidgets(
-    'should_open_current_series_and_switch_root_tabs_when_quick_drawer_is_used',
-    (tester) async {
-      tester.view.physicalSize = const Size(360, 720);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-
-      await tester.pumpWidget(appUnderTest());
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-discover')));
-      await tester.pumpAndSettle();
-      expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
-      await tester.binding.handlePopRoute();
-      await tester.pumpAndSettle();
-      expect(
-        tester
-            .widget<PlayerPage>(find.byType(PlayerPage, skipOffstage: false))
-            .active,
-        isFalse,
-      );
-      expect(find.text('Quick access'), findsOneWidget);
-      expect(find.text('Bahasa Indonesia'), findsOneWidget);
-      expect(find.text('7 EPISODES'), findsOneWidget);
-      expect(tester.takeException(), isNull);
-
-      await tester.tap(find.byKey(const Key('drawer-open-series')));
-      await tester.pumpAndSettle();
-      expect(find.byKey(const Key('detail-cta')), findsOneWidget);
-      await tester.binding.handlePopRoute();
-      await tester.pumpAndSettle();
-      expect(
-        tester
-            .widget<PlayerPage>(find.byType(PlayerPage, skipOffstage: false))
-            .active,
-        isFalse,
-      );
-      expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
-
-      await tester.binding.handlePopRoute();
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('drawer-discover')));
-      await tester.pumpAndSettle();
-      expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
-      expect(
-        Navigator.of(
-          tester.element(find.byKey(const Key('home-all-dramas-grid'))),
-        ).canPop(),
-        isFalse,
-      );
-    },
-  );
-
-  testWidgets('should_change_interface_language_when_locale_is_picked', (
-    tester,
-  ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
+  testWidgets('should_show_language_entry_on_mine_page', (tester) async {
     await tester.pumpWidget(appUnderTest());
     await tester.pumpAndSettle();
     expect(find.byTooltip('Captions'), findsNothing);
-    await tester.tap(find.byKey(const Key('tab-my')));
+
+    await tester.tap(find.byKey(const Key('tab-mine')));
     await tester.pumpAndSettle();
     expect(find.text('Vicky sheng'), findsOneWidget);
     expect(find.text('Coins'), findsOneWidget);
-    await tester.drag(find.byType(ListView), const Offset(0, -700));
-    await tester.pumpAndSettle();
-    await tester.tap(find.text('App Language'));
-    await tester.pumpAndSettle();
-    await tester.tap(find.text('简体中文').last);
-    await tester.pumpAndSettle();
-    expect(find.text('我的'), findsWidgets);
-    await tester.drag(find.byType(ListView), const Offset(0, 700));
-    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('mine-language')), findsOneWidget);
     expect(find.byKey(const Key('mine-wallet')), findsOneWidget);
-    expect(find.text('首页'), findsOneWidget);
-    await tester.tap(find.text('发现'));
+
+    await tester.tap(find.byKey(const Key('tab-theater')));
     await tester.pumpAndSettle();
-    expect(find.text('推荐'), findsOneWidget);
+    expect(find.text('Theater'), findsWidgets);
   });
 
-  testWidgets(
-    'should_fit_compact_android_viewport_when_home_controls_are_shown',
-    (tester) async {
-      tester.view.physicalSize = const Size(360, 720);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-
-      await tester.pumpWidget(appUnderTest());
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-home')));
-      await tester.pumpAndSettle();
-      expect(find.text('The Signal'), findsOneWidget);
-      await tester.drag(find.byType(PageView), const Offset(0, -500));
-      await tester.pumpAndSettle();
-      expect(find.text('City Lights & Velvet Nights'), findsOneWidget);
-      await tester.tap(find.byKey(const Key('tab-discover')));
-      await tester.pumpAndSettle();
-      await tester.tap(
-        find.byKey(const Key('home-drama-card-city-lights-demo')),
-      );
-      await tester.pumpAndSettle();
-      expect(find.byType(Slider), findsOneWidget);
-      expect(tester.takeException(), isNull);
-    },
-  );
-
-  testWidgets(
-    'should_fit_compact_android_viewport_and_return_home_when_my_page_is_shown',
-    (tester) async {
-      tester.view.physicalSize = const Size(360, 720);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-
-      await tester.pumpWidget(appUnderTest());
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-my')));
-      await tester.pumpAndSettle();
-      expect(tester.takeException(), isNull);
-      expect(find.text('Vicky sheng'), findsOneWidget);
-      expect(find.text('Coins'), findsOneWidget);
-      expect(tester.takeException(), isNull);
-      await tester.tap(find.byKey(const Key('tab-home')));
-      await tester.pumpAndSettle();
-      expect(find.text('The Signal'), findsOneWidget);
-    },
-  );
-
-  testWidgets('should_fit_compact_dark_viewport_when_evening_theme_is_used', (
-    tester,
-  ) async {
-    tester.view.physicalSize = const Size(320, 568);
-    tester.view.devicePixelRatio = 1;
-    tester.platformDispatcher.platformBrightnessTestValue = Brightness.dark;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-    addTearDown(tester.platformDispatcher.clearPlatformBrightnessTestValue);
-
+  testWidgets('should_switch_app_language_from_mine_menu', (tester) async {
     await tester.pumpWidget(appUnderTest());
     await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('tab-home')));
+    await tester.tap(find.byKey(const Key('tab-mine')));
     await tester.pumpAndSettle();
-    expect(find.text('The Signal'), findsOneWidget);
-    expect(tester.takeException(), isNull);
 
-    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.drag(
+      find.byKey(const Key('mine-page-scroll')),
+      const Offset(0, -320),
+    );
     await tester.pumpAndSettle();
-    expect(find.text('Coins'), findsOneWidget);
-    expect(tester.takeException(), isNull);
+    await tester.tap(find.byKey(const Key('mine-language')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('mine-language-sheet')), findsOneWidget);
+    await tester.tap(find.byKey(const Key('mine-language-zh')));
+    await tester.pumpAndSettle();
+
+    expect(find.text('我的'), findsWidgets);
+    expect(find.text('语言'), findsOneWidget);
+    await tester.tap(find.byKey(const Key('tab-theater')));
+    await tester.pumpAndSettle();
+    expect(find.text('剧场'), findsWidgets);
   });
 
-  testWidgets(
-    'should_show_three_playable_dramas_and_one_pending_poster_when_discover_is_opened',
-    (tester) async {
-      tester.view.physicalSize = const Size(360, 720);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-
-      await tester.pumpWidget(appUnderTest());
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-discover')));
-      await tester.pumpAndSettle();
-
-      expect(find.text('Recommended'), findsOneWidget);
-      expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
-      expect(find.byKey(const Key('discover-profile')), findsOneWidget);
-      expect(
-        find.byKey(
-          const Key('home-drama-genre-city-lights-demo'),
-          skipOffstage: false,
-        ),
-        findsOneWidget,
-      );
-      expect(
-        find.byKey(
-          const Key('home-drama-genre-vengeance-demo'),
-          skipOffstage: false,
-        ),
-        findsOneWidget,
-      );
-      expect(find.byTooltip('Search'), findsOneWidget);
-      expect(tester.takeException(), isNull);
-
-      await tester.tap(find.byKey(const Key('tab-my')));
-      await tester.pumpAndSettle();
-      await tester.drag(find.byType(ListView), const Offset(0, -320));
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('mine-library-tab-1')));
-      await tester.pumpAndSettle();
-      expect(find.text('No shows here yet.'), findsOneWidget);
-      await tester.tap(find.byKey(const Key('tab-home')));
-      await tester.pumpAndSettle();
-      expect(find.text('The Signal'), findsOneWidget);
-    },
-  );
-
-  testWidgets('should_stay_on_one_route_when_bottom_tabs_are_used', (
+  testWidgets('should_fit_compact_viewport_when_player_is_opened', (
     tester,
   ) async {
-    tester.view.physicalSize = const Size(390, 844);
+    tester.view.physicalSize = const Size(360, 720);
     tester.view.devicePixelRatio = 1;
     addTearDown(tester.view.resetPhysicalSize);
     addTearDown(tester.view.resetDevicePixelRatio);
 
     await tester.pumpWidget(appUnderTest());
     await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('tab-discover')));
+    await _openTheaterPlayer(tester);
+
+    expect(find.byType(Slider), findsOneWidget);
+    await tester.drag(find.byType(PageView), const Offset(0, -500));
     await tester.pumpAndSettle();
+    expect(
+      tester.widget<Text>(find.byKey(const Key('player-episode-heading'))).data,
+      contains('Episode 2'),
+    );
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('should_render_theater_filters_and_grid_on_same_route_tab', (
+    tester,
+  ) async {
+    tester.view.physicalSize = const Size(360, 720);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.resetPhysicalSize);
+    addTearDown(tester.view.resetDevicePixelRatio);
+
+    await tester.pumpWidget(appUnderTest());
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('tab-theater')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('discover-search')), findsOneWidget);
+    expect(find.byKey(const Key('theater-category-chips')), findsOneWidget);
+    expect(find.byKey(const Key('theater-language-chips')), findsNothing);
     expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
-    expect(find.byTooltip('Search'), findsOneWidget);
-    expect(
-      Navigator.of(
-        tester.element(find.byKey(const Key('home-all-dramas-grid'))),
-      ).canPop(),
-      isFalse,
-    );
-
-    await tester.tap(find.byKey(const Key('tab-my')));
-    await tester.pumpAndSettle();
-    await tester.drag(find.byType(ListView), const Offset(0, -700));
-    await tester.pumpAndSettle();
-    expect(find.text('History'), findsWidgets);
-    expect(
-      Navigator.of(tester.element(find.text('History').first)).canPop(),
-      isFalse,
-    );
-    await tester.tap(find.byKey(const Key('mine-library-tab-1')));
-    await tester.pumpAndSettle();
-    expect(find.text('No shows here yet.'), findsOneWidget);
-
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
-    expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
-    expect(find.byTooltip('Search'), findsOneWidget);
-    expect(
-      Navigator.of(
-        tester.element(find.byKey(const Key('home-all-dramas-grid'))),
-      ).canPop(),
-      isFalse,
-    );
-    await tester.tap(find.byKey(const Key('tab-my')));
-    await tester.pumpAndSettle();
-    await tester.drag(find.byType(ListView), const Offset(0, -400));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('mine-library-tab-1')));
-    await tester.pumpAndSettle();
-    expect(find.text('No shows here yet.'), findsOneWidget);
-    await tester.tap(find.byKey(const Key('tab-home')));
-    await tester.pumpAndSettle();
-    expect(find.text('The Signal'), findsOneWidget);
-    expect(
-      Navigator.of(tester.element(find.text('The Signal'))).canPop(),
-      isFalse,
-    );
-  });
-
-  testWidgets(
-    'should_change_drama_on_home_swipe_and_episode_on_player_swipe_when_swiping',
-    (tester) async {
-      tester.view.physicalSize = const Size(390, 844);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-
-      await tester.pumpWidget(appUnderTest());
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-home')));
-      await tester.pumpAndSettle();
-      expect(find.text('The Signal'), findsOneWidget);
-
-      await tester.drag(find.byType(PageView), const Offset(0, -550));
-      await tester.pumpAndSettle();
-      expect(find.text('City Lights & Velvet Nights'), findsOneWidget);
-      expect(
-        tester
-            .widget<Text>(find.byKey(const Key('home-feed-episode-title')))
-            .data,
-        contains('Episode 1'),
-      );
-
-      await tester.tap(find.byKey(const Key('tab-discover')));
-      await tester.pumpAndSettle();
-      await tester.tap(
-        find.byKey(const Key('home-drama-card-city-lights-demo')),
-      );
-      await tester.pumpAndSettle();
-      expect(find.byType(Slider), findsOneWidget);
-      await tester.drag(find.byType(PageView), const Offset(0, -550));
-      await tester.pumpAndSettle();
-      expect(
-        tester.widget<Text>(find.byKey(const Key('player-title'))).data,
-        contains('Episode 2'),
-      );
-      expect(find.textContaining('City Lights & Velvet Nights'), findsWidgets);
-    },
-  );
-
-  testWidgets('should_hide_category_navigation_when_shorts_page_is_shown', (
-    tester,
-  ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-
-    await tester.pumpWidget(appUnderTest());
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('tab-home')));
-    await tester.pumpAndSettle();
-    expect(find.text('Following'), findsNothing);
-    expect(find.text('Animated'), findsNothing);
-    expect(find.text('Live Action'), findsNothing);
-    expect(find.text('Recommended'), findsNothing);
-    expect(find.text('The Signal'), findsOneWidget);
-    await tester.drag(find.byType(PageView), const Offset(0, -550));
-    await tester.pumpAndSettle();
-    expect(find.text('City Lights & Velvet Nights'), findsOneWidget);
     expect(tester.takeException(), isNull);
   });
-  testWidgets(
-    'should_save_comment_like_and_share_in_order_when_right_rail_is_used',
-    (tester) async {
-      tester.view.physicalSize = const Size(390, 844);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-      String? sharedText;
-      final interactions = FakeInteractionRepository();
-      final comments = FakeCommentRepository(pages: [const CommentPage()]);
-      const channel = MethodChannel('com.stormg.lumadrama/share');
-      tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(channel, (
-        call,
-      ) async {
-        sharedText = (call.arguments as Map)['text'] as String;
-        return null;
-      });
-      addTearDown(
-        () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
-          channel,
-          null,
-        ),
-      );
 
-      await tester.pumpWidget(
-        appUnderTest(
-          commentRepository: comments,
-          interactionRepository: interactions,
-        ),
-      );
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-home')));
-      await tester.pumpAndSettle();
-      final keys = [
-        const Key('rail-like'),
-        const Key('rail-comments'),
-        const Key('rail-share'),
-        const Key('rail-save'),
-      ];
-      final tops = keys
-          .map((key) => tester.getTopLeft(find.byKey(key)).dy)
-          .toList();
-      expect(tops, orderedEquals(tops.toList()..sort()));
+  testWidgets('should_save_comment_like_and_share_from_player_more', (
+    tester,
+  ) async {
+    String? sharedText;
+    final interactions = FakeInteractionRepository();
+    final comments = FakeCommentRepository(pages: [const CommentPage()]);
+    const channel = MethodChannel('com.stormg.lumadrama/share');
+    tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(channel, (
+      call,
+    ) async {
+      sharedText = (call.arguments as Map)['text'] as String;
+      return null;
+    });
+    addTearDown(
+      () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
+        channel,
+        null,
+      ),
+    );
 
-      await tester.tap(find.byKey(const Key('rail-save')));
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('rail-comments')));
-      await tester.pumpAndSettle();
-      expect(find.text('No comments yet.'), findsOneWidget);
-      await tester.enterText(
-        find.byKey(const Key('comment-input')),
-        'Nice demo',
-      );
-      await tester.tap(find.byKey(const Key('comment-post')));
-      await tester.pumpAndSettle();
-      expect(find.text('Nice demo'), findsOneWidget);
-      await tester.binding.handlePopRoute();
-      await tester.pumpAndSettle();
+    await tester.pumpWidget(
+      appUnderTest(
+        commentRepository: comments,
+        interactionRepository: interactions,
+      ),
+    );
+    await tester.pumpAndSettle();
+    await _openTheaterPlayer(tester);
 
-      await tester.tap(find.byKey(const Key('rail-like')));
-      await tester.pumpAndSettle();
-      expect(interactions.likeTargets, contains('DRAMA:the-signal-demo'));
-      await tester.tap(find.byKey(const Key('rail-share')));
-      await tester.pumpAndSettle();
-      expect(sharedText, contains('The Signal'));
-      expect(sharedText, contains('A demo series for vertical playback'));
-      expect(sharedText, contains('FruitShorts'));
-      expect(tester.takeException(), isNull);
-    },
-  );
+    await tester.tap(find.byKey(const Key('player-rail-comments')));
+    await tester.pumpAndSettle();
+    expect(find.text('No comments yet.'), findsOneWidget);
+    await tester.enterText(find.byKey(const Key('comment-input')), 'Nice demo');
+    await tester.tap(find.byKey(const Key('comment-post')));
+    await tester.pumpAndSettle();
+    expect(find.text('Nice demo'), findsOneWidget);
+    await tester.binding.handlePopRoute();
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const Key('player-rail-like')));
+    await tester.pumpAndSettle();
+    expect(interactions.likeTargets, contains('DRAMA:city-lights-demo'));
+
+    await tester.tap(find.byKey(const Key('player-rail-save')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('player-rail-share')));
+    await tester.pumpAndSettle();
+    expect(sharedText, contains('City Lights & Velvet Nights'));
+    expect(sharedText, contains('FruitShorts'));
+    expect(tester.takeException(), isNull);
+  });
 
   testWidgets('should_open_auth_gate_without_liking_when_signed_out', (
     tester,
   ) async {
-    tester.view.physicalSize = const Size(390, 844);
-    tester.view.devicePixelRatio = 1;
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-    seedSignedOutSession();
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.empty();
     final interactions = FakeInteractionRepository();
 
     await tester.pumpWidget(appUnderTest(interactionRepository: interactions));
     await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('tab-home')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('rail-like')));
+    await _openTheaterPlayer(tester);
+    await tester.tap(find.byKey(const Key('player-rail-like')));
     await tester.pumpAndSettle();
 
     expect(find.text('Sign in to continue'), findsOneWidget);
     expect(interactions.likeTargets, isEmpty);
   });
 
-  testWidgets('should_report_drama_from_detail_more_menu_when_submitted', (
-    tester,
-  ) async {
+  testWidgets('should_show_saved_player_drama_in_favorites', (tester) async {
     tester.view.physicalSize = const Size(390, 844);
     tester.view.devicePixelRatio = 1;
     addTearDown(tester.view.resetPhysicalSize);
     addTearDown(tester.view.resetDevicePixelRatio);
-    final interactions = FakeInteractionRepository();
 
-    await tester.pumpWidget(appUnderTest(interactionRepository: interactions));
+    await tester.pumpWidget(appUnderTest());
     await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('tab-discover')));
-    await tester.pumpAndSettle();
-    await tester.binding.handlePopRoute();
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('drawer-open-series')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('detail-more')));
-    await tester.pumpAndSettle();
-    await tester.tap(find.text('Report drama'));
-    await tester.pumpAndSettle();
-    await tester.tap(find.byKey(const Key('report-submit')));
+    await _openTheaterPlayer(tester);
+    await tester.tap(find.byKey(const Key('player-rail-save')));
     await tester.pumpAndSettle();
 
-    expect(interactions.reports.single.targetType, InteractionTargetType.drama);
-    expect(find.text('Report submitted. Thank you.'), findsOneWidget);
+    await tester.tap(find.byKey(const Key('player-back')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('tab-mine')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('mine-watchlist')));
+    await tester.pumpAndSettle();
+
+    expect(find.text('City Lights & Velvet Nights'), findsWidgets);
   });
+}
 
-  testWidgets(
-    'should_open_drawer_and_stay_on_home_when_system_back_is_pressed',
-    (tester) async {
-      tester.view.physicalSize = const Size(390, 844);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-      await tester.pumpWidget(appUnderTest());
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.byKey(const Key('tab-discover')));
-      await tester.pumpAndSettle();
-      expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
-      await tester.binding.handlePopRoute();
-      await tester.pumpAndSettle();
-      expect(find.text('Quick access'), findsOneWidget);
-      expect(find.byKey(const Key('home-tabs-bar')), findsOneWidget);
-      await tester.binding.handlePopRoute();
-      await tester.pumpAndSettle();
-      expect(find.text('Quick access'), findsNothing);
-      expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
-      expect(
-        Navigator.of(
-          tester.element(find.byKey(const Key('home-tabs-bar'))),
-        ).canPop(),
-        isFalse,
-      );
-    },
-  );
-
-  testWidgets(
-    'should_list_saved_dramas_across_home_feed_when_watchlist_is_opened',
-    (tester) async {
-      tester.view.physicalSize = const Size(390, 844);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-      // 收藏要求登录态：沿用本文件已有的"假登录"初始化
-      seedSignedInSession();
-      await tester.pumpWidget(appUnderTest());
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-home')));
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.byKey(const Key('rail-save')));
-      await tester.pumpAndSettle();
-      await tester.drag(find.byType(PageView), const Offset(0, -550));
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('rail-save')));
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-my')));
-      await tester.pumpAndSettle();
-      await tester.drag(find.byType(ListView), const Offset(0, -320));
-      await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('mine-library-tab-1')));
-      await tester.pumpAndSettle();
-      expect(find.text('The Signal'), findsOneWidget);
-      expect(find.text('City Lights & Velvet Nights'), findsWidgets);
-      await tester.tap(find.text('The Signal'));
-      await tester.pumpAndSettle();
-      expect(find.byKey(const Key('detail-cta')), findsOneWidget);
-    },
+Future<void> _openTheaterPlayer(WidgetTester tester) async {
+  await tester.tap(find.byKey(const Key('tab-theater')));
+  await tester.pumpAndSettle();
+  final card = find.byKey(const Key('home-drama-card-city-lights-demo'));
+  await tester.scrollUntilVisible(
+    card,
+    220,
+    scrollable: find
+        .descendant(
+          of: find.byKey(const Key('discover-refresh')),
+          matching: find.byType(Scrollable),
+        )
+        .first,
   );
+  await tester.ensureVisible(card);
+  await tester.pumpAndSettle();
+  await tester.tap(card);
+  await tester.pumpAndSettle();
 }
diff --git a/tools/publish-drama-assets.ps1 b/tools/publish-drama-assets.ps1
new file mode 100644
index 0000000..7324eb2
--- /dev/null
+++ b/tools/publish-drama-assets.ps1
@@ -0,0 +1,578 @@
+param(
+    [string]$BaseUrl = 'http://127.0.0.1:8080',
+    [string]$AppBaseUrl = 'http://127.0.0.1:8081',
+    [string]$AssetRoot = 'C:\work\drama_assets',
+    [string]$AdminUser = 'admin',
+    [string]$AdminPassword = 'admin123',
+    [string]$ProgressPath = 'C:/Users/Administrator/Desktop/ReelShorts/FruitServer/docs/plans/PROGRESS.md',
+    [string]$StatePath = 'C:/work/ReelShort/docs/plans/fruitshorts-publish-state.json',
+    [string]$ReportPath = 'C:/work/ReelShort/docs/plans/fruitshorts-publish-report.json',
+    [string]$DbContainer = 'fruitshorts-db',
+    [string]$DbUser = 'fruitshorts',
+    [string]$DbName = 'fruitshorts',
+    [string]$WorkerImage = 'fruitshorts/transcode-worker:latest',
+    [int]$TranscodeTimeoutMinutes = 120
+)
+
+$ErrorActionPreference = 'Stop'
+$script:Utf8 = [System.Text.UTF8Encoding]::new($false)
+[Console]::OutputEncoding = $script:Utf8
+$OutputEncoding = $script:Utf8
+Add-Type -AssemblyName System.Net.Http
+
+$script:BaseUrl = $BaseUrl.TrimEnd('/')
+$script:AppBaseUrl = $AppBaseUrl.TrimEnd('/')
+$script:AssetRoot = $AssetRoot.TrimEnd('\')
+$script:ProgressPath = [System.IO.Path]::GetFullPath($ProgressPath)
+$script:StatePath = [System.IO.Path]::GetFullPath($StatePath)
+$script:ReportPath = [System.IO.Path]::GetFullPath($ReportPath)
+$script:DbContainer = $DbContainer
+$script:DbUser = $DbUser
+$script:DbName = $DbName
+$script:WorkerImage = $WorkerImage
+
+$script:Handler = [System.Net.Http.HttpClientHandler]::new()
+$script:Http = [System.Net.Http.HttpClient]::new($script:Handler)
+$script:Http.Timeout = [TimeSpan]::FromMinutes(15)
+
+function Ensure-ParentDirectory {
+    param([string]$Path)
+    $parent = Split-Path -Parent $Path
+    if ($parent -and -not (Test-Path -LiteralPath $parent)) {
+        New-Item -ItemType Directory -Force -Path $parent | Out-Null
+    }
+}
+
+function Protect-Token {
+    param([string]$Raw)
+    if ([string]::IsNullOrEmpty($Raw)) { return $Raw }
+    return [regex]::Replace($Raw, '("token"\s*:\s*")[^"]+(")', '$1***$2')
+}
+
+function Write-ProgressLog {
+    param([string]$Step, [string]$CommandText, [string]$Raw, [string]$Interpretation)
+    $safeRaw = Protect-Token $Raw
+    $text = [System.Text.StringBuilder]::new()
+    [void]$text.AppendLine("")
+    [void]$text.AppendLine("### $([DateTime]::Now.ToString('yyyy-MM-dd HH:mm:ss')) - $Step")
+    [void]$text.AppendLine("Command:")
+    [void]$text.AppendLine('```powershell')
+    [void]$text.AppendLine($CommandText)
+    [void]$text.AppendLine('```')
+    [void]$text.AppendLine("Raw output:")
+    [void]$text.AppendLine('```json')
+    [void]$text.AppendLine($safeRaw)
+    [void]$text.AppendLine('```')
+    [void]$text.AppendLine("Interpretation: $Interpretation")
+    Ensure-ParentDirectory $script:ProgressPath
+    [System.IO.File]::AppendAllText($script:ProgressPath, $text.ToString(), $script:Utf8)
+}
+
+function Invoke-ApiRaw {
+    param([string]$Method, [string]$Url, [string]$Token, $Body = $null, $Content = $null, [hashtable]$Headers = @{})
+    $request = [System.Net.Http.HttpRequestMessage]::new([System.Net.Http.HttpMethod]::new($Method), $Url)
+    if ($Token) {
+        $request.Headers.Authorization = [System.Net.Http.Headers.AuthenticationHeaderValue]::new('Bearer', $Token)
+    }
+    foreach ($key in $Headers.Keys) {
+        [void]$request.Headers.TryAddWithoutValidation($key, [string]$Headers[$key])
+    }
+    if ($null -ne $Content) {
+        $request.Content = $Content
+    } elseif ($null -ne $Body) {
+        $json = $Body | ConvertTo-Json -Depth 20 -Compress
+        $request.Content = [System.Net.Http.StringContent]::new($json, $script:Utf8, 'application/json')
+    }
+    try {
+        $response = $script:Http.SendAsync($request).GetAwaiter().GetResult()
+        $raw = $response.Content.ReadAsStringAsync().GetAwaiter().GetResult()
+        if (-not $response.IsSuccessStatusCode) {
+            throw "HTTP $([int]$response.StatusCode) $($response.ReasonPhrase): $raw"
+        }
+        return $raw
+    } finally {
+        $request.Dispose()
+    }
+}
+
+function Invoke-Api {
+    param([string]$Method, [string]$Path, [string]$Token, $Body = $null, [string]$Step, [string]$CommandText, [string]$Interpretation, [string]$BaseOverride)
+    $base = if ($BaseOverride) { $BaseOverride } else { $script:BaseUrl }
+    $url = $base + $Path
+    if (-not $CommandText) {
+        $CommandText = "$Method $url"
+        if ($null -ne $Body) {
+            $CommandText += "`nBODY " + ($Body | ConvertTo-Json -Depth 20 -Compress)
+        }
+    }
+    $raw = Invoke-ApiRaw -Method $Method -Url $url -Token $Token -Body $Body
+    Write-ProgressLog -Step $Step -CommandText $CommandText -Raw $raw -Interpretation $Interpretation
+    $obj = $raw | ConvertFrom-Json
+    if ([int]$obj.code -ne 0) {
+        throw "API failed at '$Step': code=$($obj.code) message=$($obj.message)"
+    }
+    return $obj.data
+}
+function ConvertTo-HashtableDeep {
+    param($Value)
+    if ($null -eq $Value) { return $null }
+    if ($Value -is [System.Collections.IDictionary]) {
+        $result = @{}
+        foreach ($key in $Value.Keys) { $result[[string]$key] = ConvertTo-HashtableDeep $Value[$key] }
+        return $result
+    }
+    if ($Value -is [System.Management.Automation.PSCustomObject]) {
+        $result = @{}
+        foreach ($property in $Value.PSObject.Properties) { $result[$property.Name] = ConvertTo-HashtableDeep $property.Value }
+        return $result
+    }
+    return $Value
+}
+
+function Load-State {
+    if (Test-Path -LiteralPath $script:StatePath) {
+        $raw = [System.IO.File]::ReadAllText($script:StatePath, $script:Utf8)
+        if (-not [string]::IsNullOrWhiteSpace($raw)) {
+            return ConvertTo-HashtableDeep ($raw | ConvertFrom-Json)
+        }
+    }
+    return @{ runStartedAt = [DateTime]::Now.ToString('o'); dramas = @{} }
+}
+
+function Save-State {
+    Ensure-ParentDirectory $script:StatePath
+    $json = $script:State | ConvertTo-Json -Depth 30
+    [System.IO.File]::WriteAllText($script:StatePath, $json, $script:Utf8)
+}
+
+function Invoke-Psql {
+    param([string]$Sql, [string]$Step, [string]$Interpretation, [switch]$Log)
+    $commandText = "docker exec $script:DbContainer psql -U $script:DbUser -d $script:DbName -A -t -F `"`t`" -c `"$Sql`""
+    $output = @(& docker exec $script:DbContainer psql -U $script:DbUser -d $script:DbName -A -t -F "`t" -c $Sql)
+    $exitCode = $LASTEXITCODE
+    $raw = ($output | Out-String).TrimEnd()
+    if ($Log) {
+        Write-ProgressLog -Step $Step -CommandText $commandText -Raw $raw -Interpretation $Interpretation
+    }
+    if ($exitCode -ne 0) { throw "psql failed at '$Step': $raw" }
+    return [pscustomobject]@{ Raw = $raw; Lines = $output }
+}
+
+function Get-VideoDirectory {
+    $candidates = @(Get-ChildItem -LiteralPath $script:AssetRoot -Directory | Where-Object { $_.Name -notmatch '^\d{2}_' })
+    foreach ($candidate in $candidates) {
+        $firstMp4 = Get-ChildItem -LiteralPath $candidate.FullName -File -Filter '*.mp4' -ErrorAction SilentlyContinue | Select-Object -First 1
+        if ($firstMp4) { return $candidate }
+    }
+    throw "Video directory with mp4 files was not found under $script:AssetRoot"
+}
+
+function Get-DramaDirectories {
+    return @(Get-ChildItem -LiteralPath $script:AssetRoot -Directory | Where-Object { $_.Name -match '^\d{2}_' } | Sort-Object Name)
+}
+
+function Parse-DramaName {
+    param([string]$DirectoryName)
+    $match = [regex]::Match($DirectoryName, '^\d{2}_(?<slug>.+)_(?<zh>[^_]+)$')
+    if (-not $match.Success) { throw "Cannot parse drama directory name: $DirectoryName" }
+    $slug = $match.Groups['slug'].Value
+    $zh = $match.Groups['zh'].Value
+    $words = @($slug -split '_' | Where-Object { $_ })
+    $titleWords = @()
+    foreach ($word in $words) {
+        if ($word -cmatch '^[A-Z]{2,}$' -or $word -match '^(ceo|cto|cfo|coo|cio|ai|tv|vip|mvp)$') { $titleWords += $word.ToUpperInvariant() }
+        elseif ($word.Length -gt 0) { $titleWords += $word.Substring(0, 1).ToUpperInvariant() + $word.Substring(1) }
+    }
+    return [pscustomobject]@{ Title = ($titleWords -join ' '); Chinese = $zh }
+}
+
+function Get-VideoDurationMap {
+    param([System.IO.DirectoryInfo]$VideoDirectory)
+    $map = @{}
+    $shell = New-Object -ComObject Shell.Application
+    $folder = $shell.Namespace($VideoDirectory.FullName)
+    foreach ($file in Get-ChildItem -LiteralPath $VideoDirectory.FullName -File -Filter '*.mp4') {
+        $seconds = 0
+        try {
+            $item = $folder.ParseName($file.Name)
+            $durationText = [string]$folder.GetDetailsOf($item, 27)
+            $span = [TimeSpan]::Zero
+            if ([TimeSpan]::TryParse($durationText, [ref]$span)) { $seconds = [int][Math]::Round($span.TotalSeconds) }
+        } catch { $seconds = 0 }
+        $map[$file.Name] = $seconds
+    }
+    $raw = (($map.GetEnumerator() | Sort-Object Name | ForEach-Object { "$($_.Name)`t$($_.Value)" }) -join "`n")
+    Write-ProgressLog -Step 'probe video durations' -CommandText 'Windows Shell.Application media metadata (duration column)' -Raw $raw -Interpretation "Read durations for $($map.Count) mp4 files from Windows media metadata."
+    return $map
+}
+
+function Send-Chunk {
+    param([string]$UploadId, [int]$Index, [byte[]]$Bytes, [string]$Token, [string]$FileName)
+    $form = [System.Net.Http.MultipartFormDataContent]::new()
+    try {
+        $content = [System.Net.Http.ByteArrayContent]::new($Bytes)
+        $content.Headers.ContentType = [System.Net.Http.Headers.MediaTypeHeaderValue]::Parse('application/octet-stream')
+        $form.Add($content, 'file', $FileName)
+        $url = "$script:BaseUrl/admin/media/upload/chunk?uploadId=$([Uri]::EscapeDataString($UploadId))&index=$Index"
+        $raw = Invoke-ApiRaw -Method 'POST' -Url $url -Token $Token -Content $form
+        Write-ProgressLog -Step "upload chunk $($Index + 1)" -CommandText "POST $url (multipart file=$FileName, bytes=$($Bytes.Length))" -Raw $raw -Interpretation 'Chunk accepted by the upload session.'
+        $obj = $raw | ConvertFrom-Json
+        if ([int]$obj.code -ne 0) { throw "Chunk upload failed: $($obj.message)" }
+    } finally {
+        $form.Dispose()
+    }
+}
+
+function Upload-Media {
+    param([string]$FilePath, [string]$BizType, [string]$Token, [int]$DurationSec = 0)
+    $file = Get-Item -LiteralPath $FilePath
+    $initBody = @{ fileName = $file.Name; fileSize = $file.Length; bizType = $BizType; chunkSize = 5242880 }
+    $init = Invoke-Api -Method 'POST' -Path '/admin/media/upload/init' -Token $Token -Body $initBody -Step "init upload $($file.Name)" -Interpretation "Created upload session for $BizType file $($file.Name)."
+    $uploadId = [string]$init.uploadId
+    $chunkSize = [int]$init.chunkSize
+    $totalChunks = [int]$init.totalChunks
+    $stream = [System.IO.File]::OpenRead($FilePath)
+    try {
+        for ($index = 0; $index -lt $totalChunks; $index++) {
+            $remaining = [int64]$file.Length - [int64]$stream.Position
+            $length = [int][Math]::Min([int64]$chunkSize, $remaining)
+            if ($length -le 0) { throw "Unexpected empty chunk at index $index for $FilePath" }
+            $buffer = New-Object byte[] $length
+            $read = 0
+            while ($read -lt $length) {
+                $count = $stream.Read($buffer, $read, $length - $read)
+                if ($count -le 0) { break }
+                $read += $count
+            }
+            if ($read -ne $length) { throw "Short read at chunk $index for $FilePath ($read/$length)" }
+            Send-Chunk -UploadId $uploadId -Index $index -Bytes $buffer -Token $Token -FileName ("chunk_{0}.bin" -f $index)
+        }
+    } finally {
+        $stream.Dispose()
+    }
+    $completeBody = @{ uploadId = $uploadId; durationSec = $DurationSec }
+    $asset = Invoke-Api -Method 'POST' -Path '/admin/media/upload/complete' -Token $Token -Body $completeBody -Step "complete upload $($file.Name)" -Interpretation "Merged uploaded chunks into media asset $($file.Name)."
+    return $asset
+}
+
+function Find-ExistingDramas {
+    param([string]$Token)
+    $page = Invoke-Api -Method 'GET' -Path '/admin/dramas/page?pageIndex=1&pageSize=200' -Token $Token -Step 'list existing dramas' -Interpretation 'Loaded existing dramas for idempotent title matching.'
+    $map = @{}
+    foreach ($drama in @($page.list)) {
+        $title = [string]$drama.title
+        if (-not $map.ContainsKey($title)) { $map[$title] = $drama }
+    }
+    return $map
+}
+
+function Get-ExistingEpisodes {
+    param([string]$Token, [string]$DramaId)
+    $episodes = Invoke-Api -Method 'GET' -Path "/admin/episodes?dramaId=$DramaId" -Token $Token -Step "list episodes drama $DramaId" -Interpretation 'Loaded existing episodes for resume and duplicate prevention.'
+    $map = @{}
+    foreach ($episode in @($episodes)) { $map[[string]$episode.number] = $episode }
+    return $map
+}
+
+function Ensure-Published {
+    param([string]$Token, [string]$DramaId)
+    $drama = Invoke-Api -Method 'GET' -Path "/admin/dramas/$DramaId" -Token $Token -Step "read drama $DramaId status" -Interpretation 'Read current drama status before review transitions.'
+    $status = [string]$drama.status
+    if ($status -eq 'draft' -or $status -eq 'offline') {
+        Invoke-Api -Method 'POST' -Path "/admin/dramas/$DramaId/submit" -Token $Token -Body $null -Step "submit drama $DramaId" -Interpretation 'Drama submitted for review.' | Out-Null
+        $status = 'reviewing'
+    }
+    if ($status -eq 'reviewing') {
+        Invoke-Api -Method 'POST' -Path "/admin/dramas/$DramaId/approve" -Token $Token -Body $null -Step "approve drama $DramaId" -Interpretation 'Drama review approved.' | Out-Null
+        $status = 'approved'
+    }
+    if ($status -eq 'approved') {
+        Invoke-Api -Method 'POST' -Path "/admin/dramas/$DramaId/publish" -Token $Token -Body $null -Step "publish drama $DramaId" -Interpretation 'Drama published; draft episodes are promoted to published.' | Out-Null
+        $status = 'published'
+    }
+    if ($status -ne 'published') { throw "Drama $DramaId ended in unexpected status: $status" }
+    return $status
+}
+function Get-TranscodeSnapshot {
+    param([string[]]$AssetIds)
+    $inList = ($AssetIds | ForEach-Object { "'$_'" }) -join ','
+    $sql = "SELECT media_asset_id,status,retry_count,coalesce(error_msg,'') FROM transcode_task WHERE media_asset_id IN ($inList) ORDER BY media_asset_id;"
+    $result = Invoke-Psql -Sql $sql -Step 'transcode status snapshot' -Interpretation 'Read transcode_task status for all uploaded videos.' -Log
+    $rows = @()
+    foreach ($line in $result.Lines) {
+        if ([string]::IsNullOrWhiteSpace($line)) { continue }
+        $parts = $line -split "`t", 4
+        $rows += [pscustomobject]@{
+            AssetId = [string]$parts[0]
+            Status = [string]$parts[1]
+            RetryCount = if ($parts.Count -gt 2) { [string]$parts[2] } else { '' }
+            Error = if ($parts.Count -gt 3) { [string]$parts[3] } else { '' }
+        }
+    }
+    return [pscustomobject]@{ Rows = $rows; Raw = $result.Raw; Command = $sql }
+}
+
+function Wait-Transcode {
+    param([string[]]$AssetIds)
+    $deadline = [DateTime]::Now.AddMinutes($TranscodeTimeoutMinutes)
+    $lastKey = ''
+    $lastLogged = [DateTime]::MinValue
+    $retried = $false
+    while ($true) {
+        $snapshot = Get-TranscodeSnapshot -AssetIds $AssetIds
+        $rows = @($snapshot.Rows)
+        $queued = @($rows | Where-Object { $_.Status -eq 'QUEUED' }).Count
+        $running = @($rows | Where-Object { $_.Status -eq 'RUNNING' }).Count
+        $success = @($rows | Where-Object { $_.Status -eq 'SUCCESS' }).Count
+        $failedRows = @($rows | Where-Object { $_.Status -eq 'FAILED' })
+        $failed = $failedRows.Count
+        $foundIds = @($rows | ForEach-Object { $_.AssetId })
+        $missing = @($AssetIds | Where-Object { $_ -notin $foundIds })
+        $key = "queued=$queued;running=$running;success=$success;failed=$failed;missing=$($missing.Count)"
+        Write-Host "TRANSCODE $key"
+        if ($key -ne $lastKey -or ([DateTime]::Now - $lastLogged).TotalSeconds -ge 60) {
+            $interpretation = "Transcode progress: $success/$($AssetIds.Count) success, $running running, $queued queued, $failed failed, $($missing.Count) missing task rows."
+            Write-ProgressLog -Step 'wait for transcode' -CommandText "docker exec $script:DbContainer psql -U $script:DbUser -d $script:DbName -A -t -F `"`t`" -c `"$($snapshot.Command)`"" -Raw $snapshot.Raw -Interpretation $interpretation
+            $lastKey = $key
+            $lastLogged = [DateTime]::Now
+        }
+        if ($queued -eq 0 -and $running -eq 0) {
+            if ($failed -eq 0 -and $missing.Count -eq 0) { break }
+            if (-not $retried -and $failed -gt 0) {
+                $failedIds = @($failedRows | ForEach-Object { $_.AssetId })
+                $inList = ($failedIds | ForEach-Object { "'$_'" }) -join ','
+                $sql = "UPDATE transcode_task SET status='QUEUED', retry_count=0, error_msg='', started_at=NULL, finished_at=NULL WHERE media_asset_id IN ($inList);"
+                Invoke-Psql -Sql $sql -Step 'requeue failed transcode tasks' -Interpretation 'Requeued failed transcode tasks once for automatic recovery.' -Log | Out-Null
+                $retried = $true
+                Start-Sleep -Seconds 5
+                continue
+            }
+            break
+        }
+        if ([DateTime]::Now -gt $deadline) { throw "Transcode did not finish before timeout: $key" }
+        Start-Sleep -Seconds 10
+    }
+}
+
+function Backfill-Links {
+    param([object[]]$Mappings)
+    $builder = [System.Text.StringBuilder]::new()
+    foreach ($mapping in @($Mappings)) {
+        foreach ($value in @($mapping.AssetId, $mapping.DramaId, $mapping.EpisodeId)) {
+            if ([string]$value -notmatch '^\d+$') { throw "Unsafe numeric id: $value" }
+        }
+        [void]$builder.AppendLine("UPDATE transcode_task SET drama_id=$($mapping.DramaId), episode_id=$($mapping.EpisodeId) WHERE media_asset_id=$($mapping.AssetId);")
+        [void]$builder.AppendLine("UPDATE media_rendition SET drama_id=$($mapping.DramaId), episode_id=$($mapping.EpisodeId) WHERE media_asset_id=$($mapping.AssetId);")
+        [void]$builder.AppendLine("UPDATE drama_episode SET video_asset_id=$($mapping.AssetId), hls_url=(SELECT hls_url FROM media_asset WHERE id=$($mapping.AssetId)), duration_sec=(SELECT duration_sec FROM media_asset WHERE id=$($mapping.AssetId)) WHERE id=$($mapping.EpisodeId);")
+    }
+    if ($builder.Length -eq 0) {
+        Write-ProgressLog -Step 'backfill episode media links' -CommandText '(skipped)' -Raw '' -Interpretation 'No successful transcode mapping to backfill.'
+        return
+    }
+    Invoke-Psql -Sql $builder.ToString() -Step 'backfill episode media links' -Interpretation 'Linked successful HLS renditions and transcode tasks back to drama episodes for client playback.' -Log | Out-Null
+}
+
+function Get-HttpResource {
+    param([string]$Url, [hashtable]$Headers = @{})
+    $request = [System.Net.Http.HttpRequestMessage]::new([System.Net.Http.HttpMethod]::Get, $Url)
+    foreach ($key in $Headers.Keys) { [void]$request.Headers.TryAddWithoutValidation($key, [string]$Headers[$key]) }
+    try {
+        $response = $script:Http.SendAsync($request).GetAwaiter().GetResult()
+        $bytes = $response.Content.ReadAsByteArrayAsync().GetAwaiter().GetResult()
+        $contentType = if ($response.Content.Headers.ContentType) { $response.Content.Headers.ContentType.ToString() } else { '' }
+        return [pscustomobject]@{ Status = [int]$response.StatusCode; ContentType = $contentType; Bytes = $bytes; Text = [System.Text.Encoding]::UTF8.GetString($bytes) }
+    } finally {
+        $request.Dispose()
+    }
+}
+function Verify-Client {
+    param([object[]]$DramaRecords, [string[]]$ExpectedTitles)
+    $feedRaw = Invoke-ApiRaw -Method 'GET' -Url "$script:AppBaseUrl/app/home/feed"
+    $feed = $feedRaw | ConvertFrom-Json
+    $feedTitles = @()
+    foreach ($section in @($feed.data.sections)) {
+        foreach ($drama in @($section.dramas)) { $feedTitles += [string]$drama.title }
+    }
+    $feedTitles = @($feedTitles | Select-Object -Unique)
+    $missing = @($ExpectedTitles | Where-Object { $_ -notin $feedTitles })
+    Write-ProgressLog -Step 'client feed verification' -CommandText "GET $script:AppBaseUrl/app/home/feed" -Raw $feedRaw -Interpretation "Home feed contains $($feedTitles.Count) unique titles; missing expected titles: $(@($missing) -join ', ')."
+    if ($missing.Count -gt 0) { throw "Home feed missing dramas: $($missing -join ', ')" }
+
+    $sampleDrama = @($DramaRecords | Where-Object { $_.Episodes.Count -gt 0 })[0]
+    $sampleEpisode = @($sampleDrama.Episodes | Sort-Object Number)[0]
+    $playRaw = Invoke-ApiRaw -Method 'GET' -Url "$script:AppBaseUrl/app/episodes/$($sampleEpisode.Id)/play" -Headers @{ 'X-Device-Id' = 'codex-batch-verify' }
+    $play = $playRaw | ConvertFrom-Json
+    Write-ProgressLog -Step 'client play verification' -CommandText "GET $script:AppBaseUrl/app/episodes/$($sampleEpisode.Id)/play (X-Device-Id: codex-batch-verify)" -Raw $playRaw -Interpretation "Playback ticket for episode $($sampleEpisode.Id) of drama $($sampleDrama.Title)."
+    if ($play.data.accessible -ne $true) { throw "Episode $($sampleEpisode.Id) is not accessible." }
+    if ([string]::IsNullOrWhiteSpace([string]$play.data.playUrl)) { throw "Episode $($sampleEpisode.Id) returned an empty playUrl." }
+
+    $masterUrl = [string]$play.data.playUrl
+    if (-not $masterUrl.StartsWith('http')) { $masterUrl = $script:AppBaseUrl + $masterUrl }
+    $master = Get-HttpResource -Url $masterUrl
+    Write-ProgressLog -Step 'fetch HLS master playlist' -CommandText "GET $masterUrl" -Raw ("HTTP $($master.Status) $($master.ContentType)`n" + $master.Text) -Interpretation 'Fetched the signed HLS master playlist returned by the play API.'
+    if ($master.Status -ne 200) { throw "HLS master returned HTTP $($master.Status)." }
+
+    $variantPath = @($master.Text -split "`n" | ForEach-Object { $_.Trim() } | Where-Object { $_ -and -not $_.StartsWith('#') })[0]
+    $variantUrl = [Uri]::new([Uri]$masterUrl, $variantPath).AbsoluteUri
+    $variant = Get-HttpResource -Url $variantUrl
+    Write-ProgressLog -Step 'fetch HLS variant playlist' -CommandText "GET $variantUrl" -Raw ("HTTP $($variant.Status) $($variant.ContentType)`n" + $variant.Text) -Interpretation 'Fetched the first variant playlist referenced by the master playlist.'
+    if ($variant.Status -ne 200) { throw "HLS variant returned HTTP $($variant.Status)." }
+
+    $segmentPath = @($variant.Text -split "`n" | ForEach-Object { $_.Trim() } | Where-Object { $_ -and -not $_.StartsWith('#') })[0]
+    $segmentUrl = [Uri]::new([Uri]$variantUrl, $segmentPath).AbsoluteUri
+    $segment = Get-HttpResource -Url $segmentUrl -Headers @{ Range = 'bytes=0-1023' }
+    Write-ProgressLog -Step 'fetch HLS media segment' -CommandText "GET $segmentUrl (Range: bytes=0-1023)" -Raw ("HTTP $($segment.Status) $($segment.ContentType) bytes=$($segment.Bytes.Length)") -Interpretation 'Fetched the first media segment bytes, proving the HLS path is playable.'
+    if (($segment.Status -ne 200 -and $segment.Status -ne 206) -or $segment.Bytes.Length -eq 0) { throw "HLS segment returned HTTP $($segment.Status) with $($segment.Bytes.Length) bytes." }
+    return [pscustomobject]@{ EpisodeId = $sampleEpisode.Id; MasterUrl = $masterUrl; FeedTitleCount = $feedTitles.Count }
+}
+Ensure-ParentDirectory $script:ProgressPath
+Ensure-ParentDirectory $script:StatePath
+Ensure-ParentDirectory $script:ReportPath
+
+Write-ProgressLog -Step 'batch publish started' -CommandText "powershell -File $PSCommandPath" -Raw ("AssetRoot=$script:AssetRoot`nBaseUrl=$script:BaseUrl`nAppBaseUrl=$script:AppBaseUrl`nStatePath=$script:StatePath") -Interpretation 'Starting the full batch publish workflow.'
+
+$loginCommand = "POST $script:BaseUrl/admin/auth/login`nBODY {username:$AdminUser,password:***}"
+$loginRaw = Invoke-ApiRaw -Method 'POST' -Url "$script:BaseUrl/admin/auth/login" -Body @{ username = $AdminUser; password = $AdminPassword }
+Write-ProgressLog -Step 'admin login' -CommandText $loginCommand -Raw $loginRaw -Interpretation 'Authenticated as admin and received a bearer token.'
+$login = $loginRaw | ConvertFrom-Json
+if ([int]$login.code -ne 0) { throw "Login failed: $($login.message)" }
+$token = [string]$login.data.token
+if ([string]::IsNullOrWhiteSpace($token)) { throw 'Login returned an empty token.' }
+
+$script:State = Load-State
+$existingDramas = Find-ExistingDramas -Token $token
+$videoDirectory = Get-VideoDirectory
+$videoFiles = @(Get-ChildItem -LiteralPath $videoDirectory.FullName -File -Filter '*.mp4' | Sort-Object { [int]$_.BaseName })
+if ($videoFiles.Count -ne 45) { throw "Expected 45 mp4 files, found $($videoFiles.Count)." }
+$durationMap = Get-VideoDurationMap -VideoDirectory $videoDirectory
+$dramaDirectories = Get-DramaDirectories
+if ($dramaDirectories.Count -ne 10) { throw "Expected 10 drama directories, found $($dramaDirectories.Count)." }
+
+$episodeCounts = @(5, 4, 5, 4, 5, 4, 5, 4, 5, 4)
+$categoryPlan = @(
+    @{ CategoryId = 1; Genre = 'Urban Romance'; IsHot = $true },
+    @{ CategoryId = 4; Genre = 'Revenge Suspense'; IsHot = $true },
+    @{ CategoryId = 2; Genre = 'Rebirth Comeback'; IsHot = $true },
+    @{ CategoryId = 3; Genre = 'Sweet Romance'; IsHot = $false },
+    @{ CategoryId = 3; Genre = 'Sweet Romance'; IsHot = $false },
+    @{ CategoryId = 1; Genre = 'Urban Romance'; IsHot = $false },
+    @{ CategoryId = 2; Genre = 'Rebirth Comeback'; IsHot = $false },
+    @{ CategoryId = 1; Genre = 'Urban Romance'; IsHot = $false },
+    @{ CategoryId = 4; Genre = 'Revenge Suspense'; IsHot = $false },
+    @{ CategoryId = 3; Genre = 'Sweet Romance'; IsHot = $false }
+)
+
+$videoOffset = 0
+$dramaRecords = @()
+$successMappings = @()
+for ($dramaIndex = 0; $dramaIndex -lt $dramaDirectories.Count; $dramaIndex++) {
+    $directory = $dramaDirectories[$dramaIndex]
+    $parsed = Parse-DramaName -DirectoryName $directory.Name
+    $title = $parsed.Title
+    $chinese = $parsed.Chinese
+    $count = $episodeCounts[$dramaIndex]
+    $dramaVideos = @($videoFiles[$videoOffset..($videoOffset + $count - 1)])
+    $videoOffset += $count
+    Write-Host "DRAMA $($dramaIndex + 1)/10 $title ($count episodes)"
+
+    if (-not $script:State.dramas.ContainsKey($directory.Name)) {
+        $script:State.dramas[$directory.Name] = @{ title = $title; chinese = $chinese; coverUrl = ''; coverAssetId = ''; dramaId = ''; status = ''; episodes = @{} }
+    }
+    $record = $script:State.dramas[$directory.Name]
+
+    if ([string]::IsNullOrWhiteSpace([string]$record.coverUrl)) {
+        $coverFile = Get-ChildItem -LiteralPath $directory.FullName -File | Where-Object { $_.Name -like '*9x16*' } | Select-Object -First 1
+        if (-not $coverFile) { throw "Vertical 9x16 cover not found in $($directory.FullName)" }
+        $coverAsset = Upload-Media -FilePath $coverFile.FullName -BizType 'DRAMA_COVER' -Token $token
+        $record.coverUrl = [string]$coverAsset.url
+        $record.coverAssetId = [string]$coverAsset.id
+        Save-State
+    }
+
+    $episodeAssets = @()
+    for ($localIndex = 0; $localIndex -lt $dramaVideos.Count; $localIndex++) {
+        $number = $localIndex + 1
+        $videoFile = $dramaVideos[$localIndex]
+        $durationSec = 0
+        if ($durationMap.ContainsKey($videoFile.Name)) { $durationSec = [int]$durationMap[$videoFile.Name] }
+        $key = [string]$number
+        if (-not $record.episodes.ContainsKey($key) -or [string]::IsNullOrWhiteSpace([string]$record.episodes[$key].videoUrl)) {
+            Write-Host "  upload episode $number $($videoFile.Name)"
+            $asset = Upload-Media -FilePath $videoFile.FullName -BizType 'EPISODE' -Token $token -DurationSec $durationSec
+            $record.episodes[$key] = @{ number = $number; assetId = [string]$asset.id; videoUrl = [string]$asset.url; objectKey = [string]$asset.objectKey; durationSec = $durationSec; id = '' }
+            Save-State
+        }
+        $episodeAssets += [pscustomobject]@{ Number = $number; AssetId = [string]$record.episodes[$key].assetId; VideoUrl = [string]$record.episodes[$key].videoUrl; DurationSec = $durationSec; ObjectKey = [string]$record.episodes[$key].objectKey }
+    }
+    $existingDrama = $null
+    if ($existingDramas.ContainsKey($title)) { $existingDrama = $existingDramas[$title] }
+    if (-not [string]::IsNullOrWhiteSpace([string]$record.dramaId)) {
+        $dramaId = [string]$record.dramaId
+    } elseif ($existingDrama) {
+        $dramaId = [string]$existingDrama.id
+        $record.dramaId = $dramaId
+        $record.status = [string]$existingDrama.status
+        Save-State
+    } else {
+        $plan = $categoryPlan[$dramaIndex]
+        $createBody = @{ title = $title; subtitle = $chinese; categoryId = $plan.CategoryId; genre = $plan.Genre; description = $chinese; cover = [string]$record.coverUrl; language = 'id-ID'; freeEpisodes = $count; unlockCoin = 10; isHot = [bool]$plan.IsHot; sort = 100 - $dramaIndex }
+        $dramaId = [string](Invoke-Api -Method 'POST' -Path '/admin/dramas' -Token $token -Body $createBody -Step "create drama $title" -Interpretation "Created drama '$title' with Chinese synopsis '$chinese'.")
+        $record.dramaId = $dramaId
+        $record.status = 'draft'
+        $existingDramas[$title] = [pscustomobject]@{ id = $dramaId; title = $title; status = 'draft' }
+        Save-State
+    }
+
+    $currentDrama = Invoke-Api -Method 'GET' -Path "/admin/dramas/$dramaId" -Token $token -Step "read drama $dramaId before episodes" -Interpretation 'Read drama metadata before creating or updating episodes.'
+    $currentStatus = [string]$currentDrama.status
+    $existingEpisodes = Get-ExistingEpisodes -Token $token -DramaId $dramaId
+
+    foreach ($asset in $episodeAssets) {
+        $key = [string]$asset.Number
+        $episodeBody = @{ dramaId = $dramaId; number = $asset.Number; title = "Episode $($asset.Number)"; videoUrl = $asset.VideoUrl; durationSec = $asset.DurationSec; isFree = $true; unlockCoin = 10; sort = $asset.Number }
+        if ($currentStatus -eq 'published') { $episodeBody.status = 'published' }
+        if ($existingEpisodes.ContainsKey($key)) {
+            $episodeId = [string]$existingEpisodes[$key].id
+            Invoke-Api -Method 'PUT' -Path "/admin/episodes/$episodeId" -Token $token -Body $episodeBody -Step "update episode $episodeId" -Interpretation "Updated episode $($asset.Number) to free playback with unlockCoin=10." | Out-Null
+        } else {
+            $episodeId = [string](Invoke-Api -Method 'POST' -Path '/admin/episodes' -Token $token -Body $episodeBody -Step "create episode $($asset.Number) for $title" -Interpretation "Created episode $($asset.Number) for drama $title.")
+        }
+        $record.episodes[$key].id = $episodeId
+        $record.episodes[$key].durationSec = $asset.DurationSec
+        Save-State
+    }
+
+    $finalStatus = Ensure-Published -Token $token -DramaId $dramaId
+    $record.status = $finalStatus
+    Save-State
+
+    $episodeRecords = @()
+    foreach ($key in $record.episodes.Keys) {
+        $episode = $record.episodes[$key]
+        $episodeRecords += [pscustomobject]@{ Number = [int]$episode.number; Id = [string]$episode.id; AssetId = [string]$episode.assetId; VideoUrl = [string]$episode.videoUrl; DurationSec = [int]$episode.durationSec }
+    }
+    $episodeRecords = @($episodeRecords | Sort-Object Number)
+    $dramaRecords += [pscustomobject]@{ Directory = $directory.Name; Title = $title; Chinese = $chinese; DramaId = $dramaId; CoverUrl = [string]$record.coverUrl; Status = $finalStatus; Episodes = $episodeRecords }
+    foreach ($episode in $episodeRecords) {
+        $successMappings += [pscustomobject]@{ AssetId = $episode.AssetId; DramaId = $dramaId; EpisodeId = $episode.Id }
+    }
+}
+
+Save-State
+Write-Host "All 10 dramas published. Waiting for transcode..."
+$assetIds = @($successMappings | ForEach-Object { $_.AssetId })
+Wait-Transcode -AssetIds $assetIds
+Backfill-Links -Mappings $successMappings
+$verification = Verify-Client -DramaRecords $dramaRecords -ExpectedTitles @($dramaRecords | ForEach-Object { $_.Title })
+
+$idList = ($dramaRecords | ForEach-Object { "'$($_.DramaId)'" }) -join ','
+$summarySql = "SELECT d.id,d.title,d.status,count(e.id),count(*) FILTER (WHERE e.status='published'),count(*) FILTER (WHERE coalesce(e.hls_url,'')<>'') FROM drama d LEFT JOIN drama_episode e ON e.drama_id=d.id WHERE d.id IN ($idList) GROUP BY d.id,d.title,d.status ORDER BY d.title;"
+$summary = Invoke-Psql -Sql $summarySql -Step 'final database summary' -Interpretation 'Final counts of episodes, published episodes and HLS-linked episodes for the 10 imported dramas.' -Log
+Write-ProgressLog -Step 'final drama summary' -CommandText '(derived from state)' -Raw (($dramaRecords | ConvertTo-Json -Depth 20)) -Interpretation 'Final imported drama records including ids, covers, statuses and episode mappings.'
+
+$report = @{ finishedAt = [DateTime]::Now.ToString('o'); dramas = $dramaRecords; verification = $verification; databaseSummary = $summary.Raw; statePath = $script:StatePath }
+Ensure-ParentDirectory $script:ReportPath
+[System.IO.File]::WriteAllText($script:ReportPath, ($report | ConvertTo-Json -Depth 30), $script:Utf8)
+
+Write-ProgressLog -Step 'batch publish completed' -CommandText 'script end' -Raw ("dramas=$($dramaRecords.Count)`nepisodes=$($assetIds.Count)`nsampleEpisode=$($verification.EpisodeId)`nfeedTitleCount=$($verification.FeedTitleCount)") -Interpretation "All import steps completed; client feed and HLS playback verified. Report: $script:ReportPath"
+Write-Host "BATCH_PUBLISH_OK dramas=$($dramaRecords.Count) episodes=$($assetIds.Count) sampleEpisode=$($verification.EpisodeId)"