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

test/home/home_logic_test.dart

@@ -23,15 +23,17 @@ void main() {
   test('should_make_first_catalog_entry_current_when_catalog_loads', () {
     final logic = HomeLogic(dramas);
 
-    expect(logic.currentDrama.id, 'signal');
+    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);
+  test('should_allow_empty_catalog_for_startup_skeleton', () {
+    final logic = HomeLogic(const []);
+    expect(logic.currentDrama, isNull);
+    logic.dispose();
   });
 
   test('should_not_raise_request_counter_when_only_tab_switches', () {
@@ -109,7 +111,7 @@ void main() {
     final logic = HomeLogic(dramas);
 
     logic.onDramaChanged(dramas[1]);
-    expect(logic.currentDrama.id, 'city');
+    expect(logic.currentDrama?.id, 'city');
 
     logic.onImmersiveChanged(true);
     expect(logic.videoImmersive, isTrue);
@@ -143,7 +145,7 @@ void main() {
 
     expect(immediateNotifications, 0);
     expect(tester.takeException(), isNull);
-    expect(logic.currentDrama.id, 'city');
+    expect(logic.currentDrama?.id, 'city');
     await tester.pump();
     expect(notifications, 1);
     expect(tester.takeException(), isNull);

test/home/home_startup_splash_test.dart

@@ -4,10 +4,6 @@ import 'dart:async';
 
 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';
@@ -17,10 +13,8 @@ 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 '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';
@@ -42,80 +36,63 @@ void main() {
     AppConfig.ready = Future<void>.value();
   });
 
-  testWidgets('should_show_loading_without_flutter_splash_before_settles', (
+  testWidgets('should_show_home_shell_and_grid_skeleton_while_catalog_loads', (
     tester,
   ) async {
-    final controller = CatalogController(_EmptyCatalogRepository())
-      ..loading = true
-      ..settled = false;
-    addTearDown(controller.dispose);
-
-    await _pumpHomePage(tester, controller);
-
-    expect(find.byType(CircularProgressIndicator), findsOneWidget);
-    expect(find.byKey(const Key('startup-splash')), findsNothing);
-  });
-
-  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_after_loading_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(),
-      ),
-    );
+    final repository = _PendingCatalogRepository();
+    await _pumpApp(tester, repository);
     await tester.pump();
 
+    expect(find.byKey(const Key('home-tabs')), findsOneWidget);
+    expect(find.byKey(const Key('home-grid-header')), findsOneWidget);
+    expect(find.byKey(const Key('home-grid-skeleton')), findsOneWidget);
+    expect(find.byKey(const Key('home-tabs-bar')), findsOneWidget);
     expect(find.byKey(const Key('startup-splash')), findsNothing);
-    expect(find.byType(CircularProgressIndicator), findsOneWidget);
+    expect(find.byType(CircularProgressIndicator), findsNothing);
 
-    catalog.complete(_feed);
+    repository.complete(_feed);
     await tester.pumpAndSettle();
 
-    expect(find.byKey(const Key('startup-splash')), findsNothing);
+    expect(find.byKey(const Key('home-grid-skeleton')), findsNothing);
     expect(find.byKey(const Key('home-grid')), findsOneWidget);
   });
+
+  testWidgets('should_show_catalog_error_inside_grid_without_full_overlay', (
+    tester,
+  ) async {
+    await _pumpApp(tester, _FailingCatalogRepository());
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('home-grid-header')), findsOneWidget);
+    expect(find.byKey(const Key('home-grid-error')), findsOneWidget);
+    expect(find.byKey(const Key('home-tabs-bar')), findsOneWidget);
+    expect(find.byType(CircularProgressIndicator), findsNothing);
+  });
+
+  testWidgets('should_show_catalog_empty_state_inside_grid', (tester) async {
+    await _pumpApp(tester, _EmptyCatalogRepository());
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('home-grid-header')), findsOneWidget);
+    expect(find.byKey(const Key('home-grid-empty')), findsOneWidget);
+    expect(find.byKey(const Key('home-tabs-bar')), findsOneWidget);
+  });
 }
 
-Future<void> _pumpHomePage(
-  WidgetTester tester,
-  CatalogController controller,
-) async {
+Future<void> _pumpApp(WidgetTester tester, CatalogRepository repository) async {
+  final catalog = FakeCatalogRepository();
   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(),
-      ),
+    LumaDramaApp(
+      playerFactory: createWidgetPlayer,
+      catalogRepository: repository,
+      categoryRepository: FakeCategoryRepository(catalog: repository),
+      watchHistoryRepository: InMemoryWatchHistoryRepository(),
+      favoriteRepository: InMemoryFavoriteRepository(cards: catalog.dramas),
+      playbackRepository: FakePlaybackRepository(),
+      commentRepository: FakeCommentRepository(),
+      interactionRepository: FakeInteractionRepository(),
+      noticeRepository: FakeNoticeRepository(),
+      haptics: FakeHaptics(),
     ),
   );
   await tester.pump();
@@ -149,8 +126,6 @@ class _EmptyCatalogRepository implements CatalogRepository {
 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);
   }
@@ -172,3 +147,22 @@ class _PendingCatalogRepository implements CatalogRepository {
   @override
   Future<Drama> fetchDrama(String dramaId) async => _feed.dramas.first;
 }
+
+class _FailingCatalogRepository implements CatalogRepository {
+  @override
+  Future<HomeFeed> fetchHomeFeed() async => throw StateError('offline');
+
+  @override
+  Future<HomeFeed> fetchDiscoverFeed() async => throw StateError('offline');
+
+  @override
+  Future<FeedPage> fetchFeed({
+    List<String> types = const [],
+    String? categoryId,
+    String? cursor,
+    int size = 10,
+  }) async => throw StateError('offline');
+
+  @override
+  Future<Drama> fetchDrama(String dramaId) async => throw StateError('offline');
+}