Merge branch 'main' into fix/hints-response

VGVentures · Apr 25, 2024 · eb8962c · eb8962c
2 parents 216d123 + 4326072
commit eb8962c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/lib/hint/bloc/hint_bloc.dart b/lib/hint/bloc/hint_bloc.dart
@@ -77,7 +77,7 @@ class HintBloc extends Bloc<HintEvent, HintState> {
     PreviousHintsRequested event,
     Emitter<HintState> emit,
   ) async {
-    final isHintsEnabled = await _boardInfoRepository.isHintsEnabled().last;
+    final isHintsEnabled = await _boardInfoRepository.isHintsEnabled().first;
     if (state.hints.isEmpty && isHintsEnabled) {
       final (hints, maxHints) =
           await _hintResource.getHints(wordId: event.wordId);

diff --git a/lib/word_selection/view/word_solving_view.dart b/lib/word_selection/view/word_solving_view.dart
@@ -58,10 +58,6 @@ class WordSolvingLargeView extends StatelessWidget {
                 textAlign: TextAlign.center,
               ),
               const SizedBox(height: 32),
-              if (isHintsEnabled) ...[
-                const HintsTitle(),
-                const SizedBox(height: 32),
-              ],
               Flexible(
                 child: BlocSelector<WordSelectionBloc, WordSelectionState,
                     WordSelectionStatus>(
@@ -78,7 +74,11 @@ class WordSolvingLargeView extends StatelessWidget {
             ],
           ),
         ),
-        const SizedBox(height: 16),
+        const SizedBox(height: 24),
+        if (isHintsEnabled) ...[
+          const HintsTitle(),
+          const SizedBox(height: 32),
+        ],
         const BottomPanel(),
       ],
     );
@@ -128,10 +128,6 @@ class _WordSolvingSmallViewState extends State<WordSolvingSmallView> {
           textAlign: TextAlign.center,
         ),
         const SizedBox(height: 32),
-        if (isHintsEnabled) ...[
-          const HintsTitle(),
-          const SizedBox(height: 32),
-        ],
         Expanded(
           child: BlocSelector<WordSelectionBloc, WordSelectionState,
               WordSelectionStatus>(
@@ -148,7 +144,11 @@ class _WordSolvingSmallViewState extends State<WordSolvingSmallView> {
             },
           ),
         ),
-        const SizedBox(height: 16),
+        const SizedBox(height: 24),
+        if (isHintsEnabled) ...[
+          const HintsTitle(),
+          const SizedBox(height: 32),
+        ],
         const BottomPanel(),
       ],
     );

diff --git a/test/hint/bloc/hint_bloc_test.dart b/test/hint/bloc/hint_bloc_test.dart
@@ -250,7 +250,7 @@ void main() {
       'does not emit state when hints are disabled',
       setUp: () {
         when(() => boardInfoRepository.isHintsEnabled()).thenAnswer(
-          (_) => Stream.fromIterable([true, false]),
+          (_) => Stream.value(false),
         );
       },
       build: () => HintBloc(