Merge remote-tracking branch 'origin/feat/player/bloc' into feat/play…

…er/bloc
VGVentures · Apr 15, 2024 · c9da461 · c9da461
2 parents 0ca5f21 + f40083e
commit c9da461
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 265 deletions.
diff --git a/lib/bottom_bar/view/bottom_bar.dart b/lib/bottom_bar/view/bottom_bar.dart
@@ -28,8 +28,6 @@ class BottomBarContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
-
-    final layout = IoLayout.of(context);
     final theme = Theme.of(context);
 
     return Align(
@@ -45,10 +43,7 @@ class BottomBarContent extends StatelessWidget {
               onPressed: () {}, // coverage:ignore-line
               child: Text(
                 l10n.submitScore,
-                style: switch (layout) {
-                  IoLayoutData.small => theme.textTheme.bodySmall,
-                  IoLayoutData.large => theme.textTheme.bodyMedium,
-                },
+                style: theme.textTheme.bodySmall,
               ),
             ),
             const SizedBox(width: 16),

diff --git a/lib/crossword/game/section_component/section_component.dart b/lib/crossword/game/section_component/section_component.dart
@@ -13,7 +13,7 @@ import 'package:io_crossword/crossword/extensions/characters_rectangle.dart';
 import 'package:io_crossword/crossword/extensions/extensions.dart';
 import 'package:io_crossword/crossword/game/section_component/models/models.dart';
 import 'package:io_crossword/word_selection/word_selection.dart'
-    show WordFocusedDesktopView;
+    show WordSelectionLargeView;
 
 part 'section_debug.dart';
 part 'section_keyboard_handler.dart';

diff --git a/lib/crossword/game/section_component/section_tap_controller.dart b/lib/crossword/game/section_component/section_tap_controller.dart
@@ -40,7 +40,7 @@ class SectionTapController extends PositionComponent
                   wordRect.left + wordRect.width / 2,
                   wordRect.top + wordRect.height / 2,
                 ).translated(
-                  viewportWidth * WordFocusedDesktopView.widthRatio / 2,
+                  viewportWidth * WordSelectionLargeView.widthRatio / 2,
                   0,
                 );
 

diff --git a/lib/word_selection/view/view.dart b/lib/word_selection/view/view.dart
@@ -1,4 +1,4 @@
-export 'word_focused_view.dart';
 export 'word_pre_solving_view.dart';
+export 'word_selection_view.dart';
 export 'word_solving_view.dart';
 export 'word_success_view.dart';
diff --git a/...ord_selection/view/word_focused_view.dart → ...d_selection/view/word_selection_view.dart b/...ord_selection/view/word_focused_view.dart → ...d_selection/view/word_selection_view.dart
@@ -9,34 +9,23 @@ class WordSelectionView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final layout = IoLayout.of(context);
-
-    return layout == IoLayoutData.large
-        ? const WordFocusedDesktopPage()
-        : const WordFocusedMobilePage();
-  }
-}
-
-@visibleForTesting
-class WordFocusedDesktopPage extends StatelessWidget {
-  @visibleForTesting
-  const WordFocusedDesktopPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final selectedWord = context.select(
-      (CrosswordBloc bloc) => bloc.state.selectedWord,
-    );
+    final selectedWord =
+        context.select((CrosswordBloc bloc) => bloc.state.selectedWord);
     if (selectedWord == null) {
       return const SizedBox.shrink();
     }
 
-    return WordFocusedDesktopView(selectedWord);
+    final layout = IoLayout.of(context);
+
+    return layout == IoLayoutData.large
+        ? WordSelectionLargeView(selectedWord)
+        : WordSelectionSmallView(selectedWord);
   }
 }
 
-class WordFocusedDesktopView extends StatelessWidget {
-  const WordFocusedDesktopView(this.selectedWord, {super.key});
+class WordSelectionLargeView extends StatelessWidget {
+  @visibleForTesting
+  const WordSelectionLargeView(this.selectedWord, {super.key});
 
   final WordSelection selectedWord;
 
@@ -77,25 +66,9 @@ class WordFocusedDesktopView extends StatelessWidget {
 }
 
 @visibleForTesting
-class WordFocusedMobilePage extends StatelessWidget {
+class WordSelectionSmallView extends StatelessWidget {
   @visibleForTesting
-  const WordFocusedMobilePage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final selectedWord = context.select(
-      (CrosswordBloc bloc) => bloc.state.selectedWord,
-    );
-    if (selectedWord == null) {
-      return const SizedBox.shrink();
-    }
-
-    return WordFocusedMobileView(selectedWord);
-  }
-}
-
-class WordFocusedMobileView extends StatelessWidget {
-  const WordFocusedMobileView(this.selectedWord, {super.key});
+  const WordSelectionSmallView(this.selectedWord, {super.key});
 
   final WordSelection selectedWord;
 

diff --git a/test/crossword/game/crossword_game_test.dart b/test/crossword/game/crossword_game_test.dart
@@ -233,7 +233,7 @@ void main() {
               targetWord.height / 2,
         ).translated(
           game.camera.visibleWorldRect.size.width *
-              WordFocusedDesktopView.widthRatio /
+              WordSelectionLargeView.widthRatio /
               2,
           0,
         );

diff --git a/test/crossword/view/crossword_page_test.dart b/test/crossword/view/crossword_page_test.dart
@@ -116,83 +116,8 @@ void main() {
     });
 
     testWidgets(
-      'renders $WordFocusedDesktopPage when is loaded with desktop size',
+      'renders $WordSelectionView when loaded',
       (tester) async {
-        tester.setDisplaySize(Size(IoCrosswordBreakpoints.medium, 800));
-
-        when(() => crosswordBloc.state).thenReturn(
-          CrosswordState(
-            status: CrosswordStatus.success,
-            sectionSize: 40,
-            sections: {
-              (0, 0): _FakeBoardSection(),
-            },
-          ),
-        );
-
-        await tester.pumpSubject(
-          CrosswordView(),
-          crosswordBloc: crosswordBloc,
-        );
-
-        expect(find.byType(WordFocusedDesktopPage), findsOneWidget);
-      },
-    );
-
-    testWidgets(
-      'does not render $WordFocusedDesktopPage when is loaded with mobile size',
-      (tester) async {
-        tester.setDisplaySize(Size(IoCrosswordBreakpoints.medium - 1, 800));
-
-        when(() => crosswordBloc.state).thenReturn(
-          CrosswordState(
-            status: CrosswordStatus.success,
-            sectionSize: 40,
-            sections: {
-              (0, 0): _FakeBoardSection(),
-            },
-          ),
-        );
-
-        await tester.pumpSubject(
-          CrosswordView(),
-          crosswordBloc: crosswordBloc,
-        );
-
-        expect(find.byType(WordFocusedDesktopPage), findsNothing);
-      },
-    );
-
-    testWidgets(
-      'renders $WordFocusedMobilePage when game is loaded with mobile size',
-      (tester) async {
-        tester.setDisplaySize(Size(IoCrosswordBreakpoints.medium - 1, 800));
-
-        when(() => crosswordBloc.state).thenReturn(
-          CrosswordState(
-            status: CrosswordStatus.success,
-            sectionSize: 40,
-            sections: {
-              (0, 0): _FakeBoardSection(),
-            },
-          ),
-        );
-
-        await tester.pumpSubject(
-          CrosswordView(),
-          crosswordBloc: crosswordBloc,
-        );
-
-        expect(find.byType(WordFocusedMobilePage), findsOneWidget);
-      },
-    );
-
-    testWidgets(
-      'does not render $WordFocusedMobilePage when game is loaded with '
-      'desktop size',
-      (tester) async {
-        tester.setDisplaySize(Size(IoCrosswordBreakpoints.medium, 800));
-
         when(() => crosswordBloc.state).thenReturn(
           CrosswordState(
             status: CrosswordStatus.success,
@@ -208,7 +133,7 @@ void main() {
           crosswordBloc: crosswordBloc,
         );
 
-        expect(find.byType(WordFocusedMobilePage), findsNothing);
+        expect(find.byType(WordSelectionView), findsOneWidget);
       },
     );