Merge pull request #887 from tom-anders/supportHideRatingAfterPuzzle

fix: respect "hide rating" pref in puzzle solution screen
lichess-org · Jul 28, 2024 · 0419da2 · 0419da2
2 parents aa141fd + 2c1abc0
commit 0419da2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/lib/src/view/puzzle/puzzle_feedback_widget.dart b/lib/src/view/puzzle/puzzle_feedback_widget.dart
@@ -9,6 +9,7 @@ import 'package:lichess_mobile/src/model/settings/brightness.dart';
 import 'package:lichess_mobile/src/styles/styles.dart';
 import 'package:lichess_mobile/src/utils/l10n_context.dart';
 import 'package:lichess_mobile/src/utils/string.dart';
+import 'package:lichess_mobile/src/view/account/rating_pref_aware.dart';
 
 class PuzzleFeedbackWidget extends ConsumerWidget {
   const PuzzleFeedbackWidget({
@@ -61,7 +62,10 @@ class PuzzleFeedbackWidget extends ConsumerWidget {
                 ),
           subtitle: onStreak && state.result == PuzzleResult.lose
               ? null
-              : Text('$puzzleRating. $playedXTimes.'),
+              : RatingPrefAware(
+                  orElse: Text('$playedXTimes.'),
+                  child: Text('$puzzleRating. $playedXTimes.'),
+                ),
         );
       case PuzzleMode.load:
       case PuzzleMode.play:

diff --git a/test/view/puzzle/puzzle_screen_test.dart b/test/view/puzzle/puzzle_screen_test.dart
@@ -5,6 +5,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/testing.dart';
+import 'package:lichess_mobile/src/model/account/account_preferences.dart';
 import 'package:lichess_mobile/src/model/common/http.dart';
 import 'package:lichess_mobile/src/model/common/id.dart';
 import 'package:lichess_mobile/src/model/common/perf.dart';
@@ -13,6 +14,7 @@ import 'package:lichess_mobile/src/model/puzzle/puzzle_angle.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle_batch_storage.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle_storage.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle_theme.dart';
+import 'package:lichess_mobile/src/utils/string.dart';
 import 'package:lichess_mobile/src/view/puzzle/puzzle_screen.dart';
 import 'package:lichess_mobile/src/widgets/bottom_bar_button.dart';
 import 'package:mocktail/mocktail.dart';
@@ -249,10 +251,9 @@ void main() {
       },
     );
 
-    testWidgets(
-      'fails a puzzle',
-      variant: kPlatformVariant,
-      (tester) async {
+    for (final showRatings in [true, false]) {
+      testWidgets('fails a puzzle, (showRatings: $showRatings)',
+          variant: kPlatformVariant, (tester) async {
         final mockClient = MockClient((request) {
           if (request.url.path == '/api/puzzle/batch/mix') {
             return mockResponse(batchOf1, 200);
@@ -277,6 +278,9 @@ void main() {
               return mockBatchStorage;
             }),
             puzzleStorageProvider.overrideWith((ref) => mockHistoryStorage),
+            showRatingsPrefProvider.overrideWith((ref) {
+              return showRatings;
+            }),
           ],
         );
 
@@ -343,14 +347,24 @@ void main() {
           find.text('Puzzle complete!'),
           findsOneWidget,
         );
+        final expectedPlayedXTimes =
+            'Played ${puzzle2.puzzle.plays.toString().localizeNumbers()} times.';
+        expect(
+          find.text(
+            showRatings
+                ? 'Rating: ${puzzle2.puzzle.rating}. $expectedPlayedXTimes'
+                : expectedPlayedXTimes,
+          ),
+          findsOneWidget,
+        );
 
         // wait for move animation
         await tester.pumpAndSettle();
 
         // called once to save solution and once after fetching a new puzzle
         verify(saveDBReq).called(2);
-      },
-    );
+      });
+    }
 
     testWidgets(
       'view solution',