Merge branch '30-fix-all-categories-game' into 'master'

Resolve "Fix all categories game"

Closes #30

See merge request !28

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.1.0
-app.versionCode=27
+app.versionName=0.1.1
+app.versionCode=28

fastlane/metadata/android/en-US/changelogs/28.txt

+Fix "all" categories game theme.

fastlane/metadata/android/fr-FR/changelogs/28.txt

+Correction sur le jeu "toutes catégories".

lib/cubit/game_cubit.dart

@@ -100,7 +100,7 @@ class GameCubit extends HydratedCubit<GameState> {
   @override
   Map<String, dynamic>? toJson(GameState state) {
     return <String, dynamic>{
-      'currentGame': state.currentGame.toJson(),
+      'currentGame': state.currentGame,
     };
   }
 }

lib/data/fetch_data_helper.dart

@@ -101,8 +101,8 @@ class FetchDataHelper {
     List<GameItem> items = _mapping;
 
     // Remove unwanted categories if theme is selected
-    if (themeCode != '') {
     final GameTheme gameTheme = getTheme(code: themeCode);
+    if (gameTheme.categories.isNotEmpty) {
       for (GameItem item in items) {
         item.isCategory.removeWhere((Category category) =>
             (!gameTheme.categories.map((Category c) => c.key).contains(category.key)));

lib/models/data/game_item.dart

@@ -19,9 +19,9 @@ class GameItem {
 
   Map<String, dynamic>? toJson() {
     return <String, dynamic>{
-      'item': item.toJson(),
-      'isCategory': isCategory.toString(),
-      'isNotCategory': isNotCategory.toString(),
+      'item': item,
+      'isCategory': isCategory,
+      'isNotCategory': isNotCategory,
     };
   }
 }

lib/models/data/game_theme.dart

@@ -17,7 +17,7 @@ class GameTheme {
   Map<String, dynamic>? toJson() {
     return <String, dynamic>{
       'code': code,
-      'categories': categories.toString(),
+      'categories': categories,
     };
   }
 }

lib/ui/game/game_end.dart

@@ -15,15 +15,11 @@ class GameEndWidget extends StatelessWidget {
         final Game currentGame = gameState.currentGame;
 
         final Image decorationImage = Image(
-          image: AssetImage(
-              currentGame.gameWon ? 'assets/ui/game_win.png' : 'assets/ui/game_fail.png'),
+          image: AssetImage('assets/ui/game_${currentGame.gameWon ? 'win' : 'fail'}.png'),
           fit: BoxFit.fill,
         );
 
-        return Container(
-          margin: const EdgeInsets.all(2),
-          padding: const EdgeInsets.all(2),
-          child: Table(
+        return Table(
           defaultColumnWidth: const IntrinsicColumnWidth(),
           children: [
             TableRow(
@@ -33,9 +29,7 @@ class GameEndWidget extends StatelessWidget {
                 ),
                 Column(
                   children: [
-                      currentGame.animationInProgress == true
-                          ? decorationImage
-                          : const QuitGameButton()
+                    currentGame.animationInProgress ? decorationImage : const QuitGameButton()
                   ],
                 ),
                 Column(
@@ -44,7 +38,6 @@ class GameEndWidget extends StatelessWidget {
               ],
             ),
           ],
-          ),
         );
       },
     );

lib/ui/layouts/parameters_layout.dart

@@ -37,7 +37,7 @@ class ParametersLayout extends StatelessWidget {
 
     lines.add(SizedBox(height: separatorHeight));
 
-    if (canResume == false) {
+    if (!canResume) {
       // Start new game
       lines.add(const Expanded(
         child: StartNewGameButton(),

lib/ui/widgets/actions/button_game_quit.dart

@@ -8,7 +8,7 @@ class QuitGameButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return TextButton(
+    return ElevatedButton(
       child: const Image(
         image: AssetImage('assets/ui/button_back.png'),
         fit: BoxFit.fill,

lib/ui/widgets/indicators/indicator_score.dart

@@ -16,7 +16,7 @@ class ScoreIndicator extends StatelessWidget {
         final Color outlineColor = baseColor.darken();
 
         return OutlinedText(
-          text: gameState.currentGame.score.toString(),
+          text: '${gameState.currentGame.score}',
           fontSize: 70,
           textColor: baseColor,
           outlineColor: outlineColor,

pubspec.yaml

@@ -3,7 +3,7 @@ description: A sorting game application.
 
 publish_to: "none"
 
-version: 0.1.0+27
+version: 0.1.1+28
 
 environment:
   sdk: "^3.0.0"