feat(nav): 底部导航改为首页推荐追剧我的

lib/core/theme/app_colors.dart

@@ -69,6 +69,11 @@ abstract final class AppColors {
   /// 底部导航底色。
   static const bar = ink;
 
+  /// 底部导航专用：纯黑背景、选中白、未选中灰与轻分割线。
+  static const navBackground = Color(0xFF000000);
+  static const navSelected = Color(0xFFFFFFFF);
+  static const navDivider = Color(0xFF1C1C1E);
+
   /// 卡片阴影（深色几乎不用阴影）。
   static const cardShadow = Color(0x00000000);
 
@@ -121,7 +126,7 @@ abstract final class AppColors {
   static const badgeBeige = raised;
 
   /// 导航未选中。
-  static const navUnselected = muted;
+  static const navUnselected = Color(0xFF8A8A8E);
 
   /// 播放器次要文字。
   static const playerMuted = Color(0xA3FFFFFF);

lib/core/theme/app_dimens.dart

@@ -36,7 +36,7 @@ abstract final class AppDimens {
   static const double previewCardTitle = 13;
   static const double previewSectionTitle = 14;
   static const double chipFont = 10;
-  static const double navLabel = 12;
+  static const double navLabel = 11;
 
   static const double buttonHeight = 48;
   static const double primaryButtonHeight = 52;

lib/core/theme/app_theme.dart

@@ -193,8 +193,8 @@ abstract final class AppTheme {
         ),
       ),
       bottomNavigationBarTheme: const BottomNavigationBarThemeData(
-        backgroundColor: AppColors.bar,
-        selectedItemColor: AppColors.blue,
+        backgroundColor: AppColors.navBackground,
+        selectedItemColor: AppColors.navSelected,
         unselectedItemColor: AppColors.navUnselected,
         elevation: 0,
         type: BottomNavigationBarType.fixed,

lib/core/widgets/app_bottom_nav.dart

@@ -1,7 +1,5 @@
 // Author: fruit.com.cn
 
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 
 import '../theme/app_colors.dart';
@@ -26,12 +24,12 @@ class AppBottomNavItem {
   final bool selected;
 }
 
-/// 四槽底部导航：所有页面统一深色底与浅色图标。
+/// 四槽底部导航：纯黑背景，白色选中态，灰色未选中态。
 class AppBottomNav extends StatelessWidget {
   const AppBottomNav({
     super.key,
     required this.items,
-    this.backgroundColor = AppColors.bar,
+    this.backgroundColor = AppColors.navBackground,
     this.barKey,
     this.dark = false,
   });
@@ -47,8 +45,10 @@ class AppBottomNav extends StatelessWidget {
       key: barKey,
       height: AppDimens.navHeight,
       decoration: BoxDecoration(
-        color: dark ? AppColors.bar : backgroundColor.withValues(alpha: 0.96),
-        border: const Border(top: BorderSide(color: AppColors.border)),
+        color: dark ? AppColors.navBackground : backgroundColor,
+        border: const Border(
+          top: BorderSide(color: AppColors.navDivider, width: 0.5),
+        ),
       ),
       child: Row(
         children: [
@@ -60,17 +60,9 @@ class AppBottomNav extends StatelessWidget {
         ],
       ),
     );
-    if (dark) {
-      return ColoredBox(
-        color: AppColors.bar,
-        child: SafeArea(top: false, child: bar),
-      );
-    }
-    return ClipRect(
-      child: BackdropFilter(
-        filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
-        child: SafeArea(top: false, child: bar),
-      ),
+    return ColoredBox(
+      color: AppColors.navBackground,
+      child: SafeArea(top: false, child: bar),
     );
   }
 }
@@ -102,7 +94,9 @@ class _NavDestination extends StatelessWidget {
                 child: Icon(
                   item.selected ? item.selectedIcon : item.icon,
                   size: AppDimens.navIcon,
-                  color: item.selected ? AppColors.blue : unselectedColor,
+                  color: item.selected
+                      ? AppColors.navSelected
+                      : unselectedColor,
                 ),
               ),
               const SizedBox(height: 3),
@@ -112,8 +106,10 @@ class _NavDestination extends StatelessWidget {
                 overflow: TextOverflow.ellipsis,
                 style: TextStyle(
                   fontSize: AppDimens.navLabel,
-                  fontWeight: item.selected ? FontWeight.w700 : FontWeight.w500,
-                  color: item.selected ? AppColors.blue : unselectedColor,
+                  fontWeight: item.selected ? FontWeight.w600 : FontWeight.w400,
+                  color: item.selected
+                      ? AppColors.navSelected
+                      : unselectedColor,
                   letterSpacing: 0,
                 ),
               ),

lib/core/widgets/app_root_tab.dart

@@ -0,0 +1,38 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../l10n/app_localizations.dart';
+
+/// 客户端根导航的固定顺序。
+enum AppRootTab { home, recommend, following, mine }
+
+extension AppRootTabUi on AppRootTab {
+  Key get tabKey => switch (this) {
+    AppRootTab.home => const Key('tab-home'),
+    AppRootTab.recommend => const Key('tab-recommend'),
+    AppRootTab.following => const Key('tab-follow'),
+    AppRootTab.mine => const Key('tab-mine'),
+  };
+
+  IconData get icon => switch (this) {
+    AppRootTab.home => Icons.home_outlined,
+    AppRootTab.recommend => Icons.smart_display_outlined,
+    AppRootTab.following => Icons.bookmark_border_rounded,
+    AppRootTab.mine => Icons.person_outline_rounded,
+  };
+
+  IconData get selectedIcon => switch (this) {
+    AppRootTab.home => Icons.home_rounded,
+    AppRootTab.recommend => Icons.smart_display_rounded,
+    AppRootTab.following => Icons.bookmark_rounded,
+    AppRootTab.mine => Icons.person_rounded,
+  };
+
+  String label(AppLocalizations l10n) => switch (this) {
+    AppRootTab.home => l10n.homeTab,
+    AppRootTab.recommend => l10n.recommendedTab,
+    AppRootTab.following => l10n.followingTab,
+    AppRootTab.mine => l10n.myTab,
+  };
+}

lib/core/widgets/subpage_header.dart

@@ -120,6 +120,7 @@ class AppSubpageHeader extends StatelessWidget {
     this.actions,
     this.onBack,
     this.dark = false,
+    this.showBack = true,
   });
 
   final String title;
@@ -128,6 +129,7 @@ class AppSubpageHeader extends StatelessWidget {
   final Widget? actions;
   final VoidCallback? onBack;
   final bool dark;
+  final bool showBack;
 
   @override
   Widget build(BuildContext context) {
@@ -140,8 +142,14 @@ class AppSubpageHeader extends StatelessWidget {
         padding: const EdgeInsets.symmetric(horizontal: _horizontal),
         child: Row(
           children: [
-            AppSubpageBackButton(backKey: backKey, dark: dark, onBack: onBack),
-            const SizedBox(width: _backGap),
+            if (showBack) ...[
+              AppSubpageBackButton(
+                backKey: backKey,
+                dark: dark,
+                onBack: onBack,
+              ),
+              const SizedBox(width: _backGap),
+            ],
             Expanded(
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,

lib/l10n/app_en.arb

@@ -162,7 +162,7 @@
   "preferences": "Preferences",
   "followingTab": "Following",
   "animatedTab": "Animated",
-  "recommendedTab": "Recommended",
+  "recommendedTab": "Recommend",
   "noCategoryDramas": "No dramas in this category yet.",
   "allDramas": "All Dramas",
   "allLanguages": "All languages",

lib/l10n/app_id.arb

@@ -139,7 +139,7 @@
   "completed": "Selesai",
   "noSavedShows": "Belum ada tontonan di sini.",
   "preferences": "Preferensi",
-  "followingTab": "Mengikuti",
+  "followingTab": "Daftar Tonton",
   "animatedTab": "Animasi",
   "recommendedTab": "Rekomendasi",
   "noCategoryDramas": "Belum ada drama di kategori ini.",

lib/l10n/app_localizations.dart

@@ -685,7 +685,7 @@ abstract class AppLocalizations {
   /// No description provided for @recommendedTab.
   ///
   /// In en, this message translates to:
-  /// **'Recommended'**
+  /// **'Recommend'**
   String get recommendedTab;
 
   /// No description provided for @noCategoryDramas.

lib/l10n/app_localizations_en.dart

@@ -329,7 +329,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get animatedTab => 'Animated';
 
   @override
-  String get recommendedTab => 'Recommended';
+  String get recommendedTab => 'Recommend';
 
   @override
   String get noCategoryDramas => 'No dramas in this category yet.';

lib/l10n/app_localizations_id.dart

@@ -323,7 +323,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get preferences => 'Preferensi';
 
   @override
-  String get followingTab => 'Mengikuti';
+  String get followingTab => 'Daftar Tonton';
 
   @override
   String get animatedTab => 'Animasi';

lib/l10n/app_localizations_zh.dart

@@ -318,7 +318,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get preferences => '偏好设置';
 
   @override
-  String get followingTab => '关注';
+  String get followingTab => '追剧';
 
   @override
   String get animatedTab => '漫剧';

lib/l10n/app_zh.arb

@@ -139,7 +139,7 @@
   "completed": "已看完",
   "noSavedShows": "这里还没有剧集。",
   "preferences": "偏好设置",
-  "followingTab": "关注",
+  "followingTab": "追剧",
   "animatedTab": "漫剧",
   "recommendedTab": "推荐",
   "noCategoryDramas": "这个分类暂时没有剧集。",

lib/pages/discover/discover_types.dart

@@ -4,8 +4,8 @@ import 'package:flutter/foundation.dart';
 
 import '../../core/data/models/drama.dart';
 
-/// 剧场页与根导航之间的动作。
-enum DiscoverPageAction { home, create, my }
+/// 推荐页与根导航之间的动作。
+enum DiscoverPageAction { home, recommend, following, mine }
 
 /// 剧场页导航回调；没有 `onAction` 时按独立页面处理。
 class DiscoverPageCallbacks {

lib/pages/discover/discover_view.dart

@@ -19,6 +19,7 @@ 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/app_root_tab.dart';
 import '../../core/widgets/catalog_debug_info.dart';
 import '../../core/widgets/catalog_endpoint_editor.dart';
 import '../../core/widgets/empty_state.dart';
@@ -149,7 +150,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
       key: const Key('theater-page-surface'),
       color: AppColors.ink,
       child: SafeArea(
-        bottom: !embedded,
+        bottom: false,
         child: Column(
           children: [
             DiscoverHeader(
@@ -613,37 +614,26 @@ class _DiscoverPageState extends State<DiscoverPage> {
 
   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),
-      ),
+      for (final tab in AppRootTab.values)
+        AppBottomNavItem(
+          tabKey: tab.tabKey,
+          icon: tab.icon,
+          selectedIcon: tab.selectedIcon,
+          label: tab.label(l10n),
+          selected: tab == AppRootTab.recommend,
+          onTap: tab == AppRootTab.recommend
+              ? () {}
+              : () => _act(_actionOf(tab)),
+        ),
     ],
   );
+
+  DiscoverPageAction _actionOf(AppRootTab tab) => switch (tab) {
+    AppRootTab.home => DiscoverPageAction.home,
+    AppRootTab.recommend => DiscoverPageAction.recommend,
+    AppRootTab.following => DiscoverPageAction.following,
+    AppRootTab.mine => DiscoverPageAction.mine,
+  };
 }
 
 /// 分类 tab 的弧形选中线。

lib/pages/favorites/favorites_page.dart

@@ -44,14 +44,33 @@ const double _loadMoreThreshold = 240;
 final RegExp _tagSplitter = RegExp(r'[,/、·]');
 
 /// 独立我的收藏页。
-class FavoritesPage extends StatefulWidget {
+class FavoritesPage extends StatelessWidget {
   const FavoritesPage({super.key});
 
   @override
-  State<FavoritesPage> createState() => _FavoritesPageState();
+  Widget build(BuildContext context) {
+    return Theme(
+      data: AppTheme.dark(),
+      child: Scaffold(
+        key: const Key('favorites-page'),
+        backgroundColor: AppColors.ink,
+        body: const SafeArea(child: FavoritesContent()),
+      ),
+    );
+  }
 }
 
-class _FavoritesPageState extends State<FavoritesPage> {
+/// 收藏列表主体；可独立使用，也可直接嵌入根导航。
+class FavoritesContent extends StatefulWidget {
+  const FavoritesContent({super.key, this.showBack = true});
+
+  final bool showBack;
+
+  @override
+  State<FavoritesContent> createState() => _FavoritesContentState();
+}
+
+class _FavoritesContentState extends State<FavoritesContent> {
   bool _requested = false;
 
   @override
@@ -74,28 +93,21 @@ class _FavoritesPageState extends State<FavoritesPage> {
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     final signedIn = context.watch<AuthController>().isSignedIn;
-    return Theme(
-      data: AppTheme.dark(),
-      child: Scaffold(
-        key: const Key('favorites-page'),
-        backgroundColor: AppColors.ink,
-        body: SafeArea(
-          child: Column(
-            children: [
-              AppSubpageHeader(
-                title: l10n.myFavorites,
-                backKey: const Key('favorites-back'),
-              ),
-              Expanded(
-                child: signedIn
-                    ? _FavoritesBody(
-                        favorites: context.watch<FavoriteController>(),
-                      )
-                    : const AuthGatePanel(),
-              ),
-            ],
+    return SafeArea(
+      bottom: false,
+      child: Column(
+        children: [
+          AppSubpageHeader(
+            title: l10n.myFavorites,
+            backKey: const Key('favorites-back'),
+            showBack: widget.showBack,
           ),
-        ),
+          Expanded(
+            child: signedIn
+                ? _FavoritesBody(favorites: context.watch<FavoriteController>())
+                : const AuthGatePanel(),
+          ),
+        ],
       ),
     );
   }

lib/pages/home/home_logic.dart

@@ -79,9 +79,11 @@ class HomeLogic extends ChangeNotifier {
     switch (action) {
       case DiscoverPageAction.home:
         select(0);
-      case DiscoverPageAction.create:
+      case DiscoverPageAction.recommend:
+        select(1, search: true);
+      case DiscoverPageAction.following:
         select(2);
-      case DiscoverPageAction.my:
+      case DiscoverPageAction.mine:
         select(3);
     }
   }
@@ -102,10 +104,12 @@ class HomeLogic extends ChangeNotifier {
     switch (action) {
       case MyPageAction.home:
         select(0);
-      case MyPageAction.discover:
+      case MyPageAction.recommend:
         select(1, search: true);
-      case MyPageAction.create:
+      case MyPageAction.following:
         select(2);
+      case MyPageAction.mine:
+        select(3);
       case MyPageAction.resume:
         select(0, resume: true);
     }

lib/pages/home/home_view.dart

@@ -17,13 +17,14 @@ 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/app_root_tab.dart';
 import '../../core/widgets/catalog_debug_info.dart';
 import '../../core/widgets/catalog_endpoint_editor.dart';
 import '../../core/widgets/empty_state.dart';
 import '../../l10n/app_localizations.dart';
 import '../discover/discover_types.dart';
 import '../discover/discover_view.dart';
-import '../create/create_view.dart';
+import '../favorites/favorites_page.dart';
 import '../mine/mine_types.dart';
 import '../player/widgets/home_feed_header.dart';
 import '../player/player_view.dart';
@@ -295,7 +296,7 @@ class _HomeTabsState extends State<_HomeTabs> {
       children: [
         _home(context),
         _discover(context),
-        const CreatePage(),
+        const FavoritesContent(key: Key('favorites-page'), showBack: false),
         _my(context),
       ],
     );
@@ -455,10 +456,10 @@ class _HomeTabsState extends State<_HomeTabs> {
       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),
+        _navItem(context, l10n, AppRootTab.home),
+        _navItem(context, l10n, AppRootTab.recommend),
+        _navItem(context, l10n, AppRootTab.following),
+        _navItem(context, l10n, AppRootTab.mine),
       ],
     );
   }
@@ -466,43 +467,16 @@ class _HomeTabsState extends State<_HomeTabs> {
   AppBottomNavItem _navItem(
     BuildContext context,
     AppLocalizations l10n,
-    int index,
+    AppRootTab tab,
   ) {
-    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),
-      ),
-    };
+    return AppBottomNavItem(
+      tabKey: tab.tabKey,
+      icon: tab.icon,
+      selectedIcon: tab.selectedIcon,
+      label: tab.label(l10n),
+      selected: logic.tab == tab.index,
+      onTap: () => _selectTab(context, tab.index),
+    );
   }
 
   void _selectTab(BuildContext context, int tab) {

lib/pages/mine/mine_types.dart

@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import '../../core/data/models/drama.dart';
 
 /// 「我的」页与根导航之间的返回动作。
-enum MyPageAction { home, discover, create, resume }
+enum MyPageAction { home, recommend, following, mine, resume }
 
 /// 「我的」页可进入的功能目的地。
 enum MineDestination {

lib/pages/mine/mine_view.dart

@@ -13,6 +13,7 @@ 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_root_tab.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/plain_page_scaffold.dart';
 import '../../l10n/app_localizations.dart';
@@ -81,7 +82,7 @@ class _MyPageState extends State<MyPage> {
   Widget _page(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     final content = SafeArea(
-      bottom: !embedded,
+      bottom: false,
       child: Column(
         children: [
           _topBar(l10n),
@@ -240,39 +241,26 @@ class _MyPageState extends State<MyPage> {
   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),
-        ),
-        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: () {},
-        ),
+        for (final tab in AppRootTab.values)
+          AppBottomNavItem(
+            tabKey: tab.tabKey,
+            icon: tab.icon,
+            selectedIcon: tab.selectedIcon,
+            label: tab.label(l10n),
+            selected: tab == AppRootTab.mine,
+            onTap: tab == AppRootTab.mine ? () {} : () => _act(_actionOf(tab)),
+          ),
       ],
     );
   }
 
+  MyPageAction _actionOf(AppRootTab tab) => switch (tab) {
+    AppRootTab.home => MyPageAction.home,
+    AppRootTab.recommend => MyPageAction.recommend,
+    AppRootTab.following => MyPageAction.following,
+    AppRootTab.mine => MyPageAction.mine,
+  };
+
   void _act(MyPageAction action) {
     logic.act(
       context,

lib/pages/player/player_logic.dart

@@ -1085,7 +1085,7 @@ class PlayerLogic extends ChangeNotifier {
       context,
     ).push<MyPageAction>(MaterialPageRoute(builder: (_) => const MyPage()));
     if (!context.mounted) return;
-    if (action == MyPageAction.discover) {
+    if (action == MyPageAction.recommend) {
       await showDiscover(context);
     } else {
       session.setRouteVisible(true);
@@ -1117,7 +1117,7 @@ class PlayerLogic extends ChangeNotifier {
       MaterialPageRoute(builder: (_) => DiscoverPage(focusSearch: focusSearch)),
     );
     if (!context.mounted) return;
-    if (action == DiscoverPageAction.my) {
+    if (action == DiscoverPageAction.mine) {
       await showMy(context);
     } else {
       session.setRouteVisible(true);