feat(ui): 重做三 Tab 首页与发现页

test/discover/home_all_dramas_grid_test.dart

@@ -7,6 +7,7 @@ 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';
@@ -25,7 +26,7 @@ void main() {
   });
 
   testWidgets(
-    'should_show_all_dramas_in_three_column_sliver_grid_without_continue_watching',
+    'should_show_all_dramas_in_two_column_sliver_grid_without_continue_watching',
     (tester) async {
       tester.view.physicalSize = const Size(390, 844);
       tester.view.devicePixelRatio = 1;
@@ -44,27 +45,15 @@ void main() {
         tester.getCenter(find.text('All')).dx,
         lessThan(tester.getCenter(find.text('Hot')).dx),
       );
-      expect(
-        tester
-                .getTopLeft(
-                  find.byKey(const Key('home-drama-card-the-signal-demo')),
-                )
-                .dy -
-            tester
-                .getBottomLeft(find.byKey(const Key('home-category-chips')))
-                .dy,
-        closeTo(14, 0.1),
-      );
-
       final grid = tester.widget<SliverGrid>(
         find.byKey(const Key('home-all-dramas-grid')),
       );
       final delegate =
           grid.gridDelegate as SliverGridDelegateWithFixedCrossAxisCount;
-      expect(delegate.crossAxisCount, 3);
-      expect(delegate.crossAxisSpacing, 10);
+      expect(delegate.crossAxisCount, 2);
+      expect(delegate.crossAxisSpacing, 12);
       expect(delegate.mainAxisSpacing, 14);
-      expect(delegate.childAspectRatio, closeTo(2 / 3, 0.001));
+      expect(delegate.childAspectRatio, closeTo(0.55, 0.001));
       expect(
         tester
             .widget<SliverPadding>(
@@ -80,7 +69,7 @@ void main() {
       final cover = tester.widget<AspectRatio>(
         find.byKey(const Key('home-drama-cover-city-lights-demo')),
       );
-      expect(cover.aspectRatio, closeTo(2 / 3, 0.001));
+      expect(cover.aspectRatio, closeTo(3 / 4.2, 0.001));
       expect(
         tester
             .widget<Text>(
@@ -148,15 +137,7 @@ void main() {
 
     expect(find.byKey(const Key('home-all-dramas-title')), findsNothing);
     expect(find.text('No matching dramas.'), findsOneWidget);
-    final content = tester.getCenter(
-      find.byKey(const Key('empty-state-content')),
-    );
-    final chipsBottom = tester
-        .getBottomLeft(find.byKey(const Key('home-category-chips')))
-        .dy;
-    final feed = tester.getRect(find.byType(CustomScrollView));
-    expect(content.dx, closeTo(feed.center.dx, 1));
-    expect(content.dy, closeTo((chipsBottom + feed.bottom) / 2, 36));
+    expect(find.byKey(const Key('empty-state-content')), findsOneWidget);
 
     await tester.tap(find.text('Romance'));
     await tester.pumpAndSettle();
@@ -184,7 +165,7 @@ void main() {
     expect(find.byKey(const Key('home-all-dramas-grid')), findsNothing);
   });
 
-  testWidgets('should_fit_three_column_grid_on_compact_screen', (tester) async {
+  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);
@@ -204,11 +185,87 @@ void main() {
     expect(find.text('City Lights & Velvet Nights'), findsOneWidget);
     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('home-drama-card-the-signal-demo')),
+      findsOneWidget,
+    );
+    expect(
+      find.byKey(const Key('home-drama-card-city-lights-demo')),
+      findsOneWidget,
+    );
+
+    await tester.enterText(find.byKey(const Key('discover-search')), 'velvet');
+    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_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);
+
+    await _pumpApp(
+      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),
+          ),
+        ],
+      ),
+    );
+    await tester.tap(find.byKey(const Key('tab-discover')));
+    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);
+  });
 }
 
 Future<void> _pumpApp(
   WidgetTester tester, {
   required CategoryRepository categoryRepository,
+  WatchHistoryRepository? history,
 }) async {
   final catalog = FakeCatalogRepository();
   await tester.pumpWidget(
@@ -216,7 +273,7 @@ Future<void> _pumpApp(
       playerFactory: createWidgetPlayer,
       catalogRepository: catalog,
       categoryRepository: categoryRepository,
-      watchHistoryRepository: InMemoryWatchHistoryRepository(),
+      watchHistoryRepository: history ?? InMemoryWatchHistoryRepository(),
       favoriteRepository: InMemoryFavoriteRepository(),
       playbackRepository: FakePlaybackRepository(),
       commentRepository: FakeCommentRepository(),

test/discover/home_banner_source_test.dart

@@ -21,7 +21,7 @@ import '../support/widget_player.dart';
 
 void main() {
   testWidgets(
-    'should_render_home_feed_banners_when_discover_banners_are_empty',
+    'should_not_mount_carousel_on_discover_even_when_home_banners_exist',
     (tester) async {
       SharedPreferencesAsyncPlatform.instance =
           InMemorySharedPreferencesAsync.empty();
@@ -43,26 +43,11 @@ void main() {
       await tester.tap(find.byKey(const Key('tab-discover')));
       await tester.pumpAndSettle();
 
-      expect(find.byType(CoverCarousel), findsOneWidget);
-      expect(find.byKey(const Key('carousel-dot-0')), findsOneWidget);
-      expect(find.byKey(const Key('carousel-dot-1')), findsOneWidget);
-      expect(
-        find.descendant(
-          of: find.byType(CoverCarousel),
-          matching: find.text('The Signal'),
-        ),
-        findsOneWidget,
-      );
-
-      await tester.pump(const Duration(milliseconds: 4500));
-      await tester.pump(const Duration(milliseconds: 500));
-      expect(
-        find.descendant(
-          of: find.byType(CoverCarousel),
-          matching: find.text('City Lights & Velvet Nights'),
-        ),
-        findsOneWidget,
-      );
+      expect(find.byType(CoverCarousel), findsNothing);
+      expect(find.byKey(const Key('discover-search')), findsOneWidget);
+      expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
+      expect(find.byKey(const Key('discover-quick-filter')), findsOneWidget);
+      expect(find.text('The Signal'), findsWidgets);
       await tester.pumpWidget(const SizedBox.shrink());
     },
   );

test/home/home_logic_test.dart

@@ -18,17 +18,20 @@ 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_the_current_drama_when_catalog_loads',
+    () {
+      final logic = HomeLogic(dramas);
 
-    expect(logic.currentDrama.id, 'signal');
-    expect(logic.tab, 1);
-    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.mySection, 0);
+      expect(logic.drawerOpen, isFalse);
+      expect(logic.profile, isFalse);
+      expect(logic.videoImmersive, isFalse);
+      logic.dispose();
+    },
+  );
 
   test('should_not_build_shell_when_catalog_is_empty', () {
     expect(() => HomeLogic(const []), throwsStateError);
@@ -82,33 +85,38 @@ void main() {
     logic.dispose();
   });
 
-  test('should_differ_on_profile_flag_when_open_profile_and_open_library_are_used', () {
-    final logic = HomeLogic(dramas);
+  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.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(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();
-  });
+      logic.openLibrary();
+      expect(logic.profile, isFalse);
+      expect(logic.mySection, 1);
+      expect(logic.sectionRequest, 3);
+      logic.dispose();
+    },
+  );
 
   test('should_return_home_and_open_drawer_when_system_back_is_pressed', () {
     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.drawerOpen, isTrue);
-    expect(logic.tab, 1);
     expect(logic.backRequest, 0);
     logic.onDrawerChanged(false);
 
@@ -190,7 +198,9 @@ void main() {
     expect(notifications, 0);
   });
 
-  testWidgets('should_map_onto_root_tabs_when_discover_actions_fire', (tester) async {
+  testWidgets('should_map_onto_root_tabs_when_discover_actions_fire', (
+    tester,
+  ) async {
     final logic = HomeLogic(dramas);
     late BuildContext context;
     await tester.pumpWidget(

test/home/home_nav_ui_test.dart

@@ -18,9 +18,8 @@ import '../support/widget_player.dart';
 
 const _keys = [
   Key('home-tabs-bar'),
-  Key('tab-discover'),
   Key('tab-home'),
-  Key('tab-my-list'),
+  Key('tab-discover'),
   Key('tab-my'),
 ];
 
@@ -34,7 +33,7 @@ void main() {
         });
   });
 
-  testWidgets('should_theme_four_tabs_and_switch_selected_state_when_tapped', (
+  testWidgets('should_theme_three_tabs_and_switch_selected_state_when_tapped', (
     tester,
   ) async {
     final haptics = FakeHaptics();
@@ -52,10 +51,9 @@ void main() {
     final bar = tester.widget<Container>(barFinder);
     final decoration = bar.decoration as BoxDecoration;
     final border = decoration.border as Border;
-    final context = tester.element(barFinder);
-    expect(decoration.color, AppColors.bar);
-    expect(border.top.color, Theme.of(context).colorScheme.outlineVariant);
-    expect(border.top.color.computeLuminance(), lessThan(0.2));
+    expect(decoration.color, AppColors.bar.withValues(alpha: 0.95));
+    expect(border.top.color, AppColors.border);
+    expect(border.top.color.a, lessThan(0.2));
     expect(border.top.color, isNot(Colors.white));
     expect(
       tester
@@ -71,7 +69,7 @@ void main() {
     expect(
       find.descendant(
         of: find.byKey(const Key('tab-home')),
-        matching: find.byIcon(Icons.movie_rounded),
+        matching: find.byIcon(Icons.home_rounded),
       ),
       findsOneWidget,
     );
@@ -85,14 +83,14 @@ void main() {
     expect(
       find.descendant(
         of: find.byKey(const Key('tab-discover')),
-        matching: find.byIcon(Icons.home_rounded),
+        matching: find.byIcon(Icons.explore_rounded),
       ),
       findsOneWidget,
     );
     expect(
       find.descendant(
         of: find.byKey(const Key('tab-home')),
-        matching: find.byIcon(Icons.movie_outlined),
+        matching: find.byIcon(Icons.home_outlined),
       ),
       findsOneWidget,
     );
@@ -110,6 +108,32 @@ void main() {
     }
   });
 
+  testWidgets('should_map_three_tabs_to_home_discover_and_me', (tester) async {
+    await _pumpApp(tester);
+
+    expect(find.byKey(const Key('tab-my-list')), findsNothing);
+    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);
+
+    await tester.tap(find.byKey(const Key('tab-discover')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.pumpAndSettle();
+    expect(find.text('Viewer'), findsOneWidget);
+    expect(
+      find.byKey(const Key('mine-library-tab-0'), skipOffstage: false),
+      findsOneWidget,
+    );
+
+    await tester.tap(find.byKey(const Key('tab-home')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('home-feed-info-card')), findsOneWidget);
+  });
+
   testWidgets('should_not_haptic_when_ordinary_list_item_is_opened', (
     tester,
   ) async {
@@ -119,6 +143,8 @@ void main() {
     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.pumpAndSettle();
 

test/widget_test.dart

@@ -117,7 +117,12 @@ void main() {
     expect(find.text('Following'), findsNothing);
     expect(find.byTooltip('Episodes'), findsWidgets);
     expect(find.byTooltip('Clear screen'), findsOneWidget);
-    expect(find.byTooltip('Picture in picture'), findsOneWidget);
+    expect(find.byTooltip('Picture in picture'), findsNothing);
+    await tester.tap(find.byTooltip('More'));
+    await tester.pumpAndSettle();
+    expect(find.text('Picture in picture'), findsOneWidget);
+    await tester.binding.handlePopRoute();
+    await tester.pumpAndSettle();
     expect(find.text('Watch Full'), findsNothing);
     expect(find.byTooltip('Explore series'), findsNothing);
   });
@@ -155,6 +160,8 @@ void main() {
 
       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();
@@ -217,15 +224,18 @@ void main() {
     await tester.pumpAndSettle();
     expect(find.text('Vicky sheng'), findsOneWidget);
     expect(find.text('Coins'), findsOneWidget);
-    expect(find.text('PREFERENCES'), 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.text('我的账户'), findsOneWidget);
     expect(find.text('首页'), findsOneWidget);
-    await tester.tap(find.text('首页'));
+    await tester.tap(find.text('找剧'));
     await tester.pumpAndSettle();
     expect(find.text('全部'), findsOneWidget);
     expect(find.text('热门'), findsOneWidget);
@@ -272,7 +282,7 @@ void main() {
       expect(find.text('Vicky sheng'), findsOneWidget);
       expect(find.text('Coins'), findsOneWidget);
       expect(tester.takeException(), isNull);
-      await tester.tap(find.text('Shorts'));
+      await tester.tap(find.byKey(const Key('tab-home')));
       await tester.pumpAndSettle();
       expect(find.text('The Signal'), findsOneWidget);
     },
@@ -311,25 +321,39 @@ void main() {
 
       await tester.pumpWidget(appUnderTest());
       await tester.pumpAndSettle();
-      await tester.tap(find.text('Home'));
+      await tester.tap(find.byKey(const Key('tab-discover')));
       await tester.pumpAndSettle();
 
       expect(find.text('All'), findsOneWidget);
       expect(find.byKey(const Key('home-all-dramas-grid')), findsOneWidget);
-      expect(find.text('Rewards'), findsOneWidget);
-      expect(find.text(r'$ 0'), findsOneWidget);
-      expect(find.text('Urban Romance', skipOffstage: false), findsOneWidget);
+      expect(find.byKey(const Key('discover-profile')), findsOneWidget);
       expect(
-        find.text('Action · Thriller', skipOffstage: false),
+        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'), findsNothing);
       expect(tester.takeException(), isNull);
 
-      await tester.tap(find.byKey(const Key('tab-my-list')));
+      await tester.tap(find.byKey(const Key('tab-my')));
+      await tester.pumpAndSettle();
+      await tester.scrollUntilVisible(
+        find.byKey(const Key('mine-library-tab-1')),
+        260,
+      );
+      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.text('Shorts'));
+      await tester.tap(find.byKey(const Key('tab-home')));
       await tester.pumpAndSettle();
       expect(find.text('The Signal'), findsOneWidget);
     },
@@ -345,7 +369,7 @@ void main() {
 
     await tester.pumpWidget(appUnderTest());
     await tester.pumpAndSettle();
-    await tester.tap(find.text('Home'));
+    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'), findsNothing);
@@ -356,14 +380,16 @@ void main() {
       isFalse,
     );
 
-    await tester.tap(find.byKey(const Key('tab-my-list')));
+    await tester.tap(find.byKey(const Key('tab-my')));
     await tester.pumpAndSettle();
-    expect(find.text('History'), findsOneWidget);
+    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'))).canPop(),
+      Navigator.of(tester.element(find.text('History').first)).canPop(),
       isFalse,
     );
-    await tester.tap(find.text('Watchlist'));
+    await tester.tap(find.byKey(const Key('mine-library-tab-1')));
     await tester.pumpAndSettle();
     expect(find.text('No shows here yet.'), findsOneWidget);
 
@@ -377,7 +403,11 @@ void main() {
       ).canPop(),
       isFalse,
     );
-    await tester.tap(find.byKey(const Key('tab-my-list')));
+    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')));
@@ -545,6 +575,8 @@ void main() {
 
     await tester.pumpWidget(appUnderTest(interactionRepository: interactions));
     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')));
@@ -570,6 +602,8 @@ void main() {
       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();
@@ -608,9 +642,13 @@ void main() {
       await tester.pumpAndSettle();
       await tester.tap(find.byKey(const Key('rail-save')));
       await tester.pumpAndSettle();
-      await tester.tap(find.byKey(const Key('tab-my-list')));
+      await tester.tap(find.byKey(const Key('tab-my')));
       await tester.pumpAndSettle();
-      await tester.tap(find.text('Watchlist'));
+      await tester.scrollUntilVisible(
+        find.byKey(const Key('mine-library-tab-1')),
+        300,
+      );
+      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);