feat(app): 剧场页九宫格与极简我的页

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,62 +52,27 @@ 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);
     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', () {
     final logic = HomeLogic(dramas);
 
-    // Home is the launch tab; the first back press lands on Discover.
     logic.onSystemBack();
     expect(logic.tab, 1);
     logic.onSystemBack();
@@ -122,7 +82,6 @@ void main() {
     logic.select(0);
     logic.onSystemBack();
     expect(logic.tab, 1);
-    expect(logic.backRequest, 0);
 
     logic.select(0);
     logic.onImmersiveChanged(true);
@@ -181,6 +140,17 @@ 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, 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 +161,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();
-  });
 }

test/home/home_nav_ui_test.dart

@@ -95,9 +95,7 @@ void main() {
     );
   });
 
-  testWidgets('should_map_three_tabs_to_home_discover_and_me', (
-    tester,
-  ) async {
+  testWidgets('should_map_three_tabs_to_home_discover_and_me', (tester) async {
     await _pumpApp(tester);
 
     expect(find.byKey(const Key('tab-home')), findsOneWidget);
@@ -112,10 +110,9 @@ void main() {
     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,
-    );
+    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();
@@ -131,11 +128,11 @@ 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.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);
   });
 }