diff --git a/lib/pages/discover/discover_view.dart b/lib/pages/discover/discover_view.dart index abf62df..0dc2d53 100644 --- a/lib/pages/discover/discover_view.dart +++ b/lib/pages/discover/discover_view.dart @@ -270,7 +270,7 @@ class _DiscoverPageState extends State { Widget _categories(AppLocalizations l10n, CategoryController categories) { final choices = <({String code, String label})>[ - (code: CategoryController.allCode, label: l10n.forYou), + (code: CategoryController.allCode, label: l10n.all), (code: CategoryController.hotCode, label: l10n.hot), (code: CategoryController.newCode, label: l10n.newest), for (final category in categories.categories) diff --git a/lib/pages/discover/widgets/home_drama_grid.dart b/lib/pages/discover/widgets/home_drama_grid.dart index 8ee80e3..fa1e345 100644 --- a/lib/pages/discover/widgets/home_drama_grid.dart +++ b/lib/pages/discover/widgets/home_drama_grid.dart @@ -68,9 +68,9 @@ class _HomeDramaGrid extends StatelessWidget { sliver: SliverGrid( key: const Key('home-all-dramas-grid'), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - mainAxisSpacing: 16, - crossAxisSpacing: 12, + crossAxisCount: 3, + mainAxisSpacing: 14, + crossAxisSpacing: 10, childAspectRatio: 2 / 3, ), delegate: SliverChildBuilderDelegate( diff --git a/test/discover/home_all_dramas_grid_test.dart b/test/discover/home_all_dramas_grid_test.dart index e724439..90652be 100644 --- a/test/discover/home_all_dramas_grid_test.dart +++ b/test/discover/home_all_dramas_grid_test.dart @@ -25,7 +25,7 @@ void main() { }); testWidgets( - 'should_show_all_dramas_in_two_column_sliver_grid_without_continue_watching', + 'should_show_all_dramas_in_three_column_sliver_grid_without_continue_watching', (tester) async { tester.view.physicalSize = const Size(390, 844); tester.view.devicePixelRatio = 1; @@ -38,15 +38,21 @@ void main() { expect(find.text('Continue Watching'), findsNothing); expect(find.text('All Dramas'), findsOneWidget); + expect(find.text('All'), findsOneWidget); + expect(find.text('For You'), findsNothing); + expect( + tester.getCenter(find.text('All')).dx, + lessThan(tester.getCenter(find.text('Hot')).dx), + ); final grid = tester.widget( find.byKey(const Key('home-all-dramas-grid')), ); final delegate = grid.gridDelegate as SliverGridDelegateWithFixedCrossAxisCount; - expect(delegate.crossAxisCount, 2); - expect(delegate.crossAxisSpacing, 12); - expect(delegate.mainAxisSpacing, 16); + expect(delegate.crossAxisCount, 3); + expect(delegate.crossAxisSpacing, 10); + expect(delegate.mainAxisSpacing, 14); expect(delegate.childAspectRatio, closeTo(2 / 3, 0.001)); expect( tester @@ -154,7 +160,7 @@ void main() { expect(find.byKey(const Key('home-all-dramas-grid')), findsNothing); }); - testWidgets('should_fit_two_column_grid_on_compact_screen', (tester) async { + testWidgets('should_fit_three_column_grid_on_compact_screen', (tester) async { tester.view.physicalSize = const Size(320, 568); tester.view.devicePixelRatio = 1; addTearDown(tester.view.resetPhysicalSize); diff --git a/test/widget_test.dart b/test/widget_test.dart index 6f86ddf..93d3eaf 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -225,7 +225,7 @@ void main() { expect(find.text('首页'), findsOneWidget); await tester.tap(find.text('首页')); await tester.pumpAndSettle(); - expect(find.text('为你推荐'), findsOneWidget); + expect(find.text('全部'), findsOneWidget); expect(find.text('热门'), findsOneWidget); }); @@ -312,7 +312,7 @@ void main() { await tester.tap(find.text('Home')); await tester.pumpAndSettle(); - expect(find.text('For You'), findsOneWidget); + expect(find.text('All'), findsOneWidget); expect(find.text('All Dramas'), findsOneWidget); expect(find.text('Rewards'), findsOneWidget); expect(find.text(r'$ 0'), findsOneWidget);