Merge branch '36-use-activity-buttons-widgets-from-flutter_custom_toolbox' into 'master'

Resolve "Use activity buttons widgets from flutter_custom_toolbox"

Closes #36

See merge request !36

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

+Use activity buttons widgets from flutter_custom_toolbox.

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

+Utilisation des boutons d'activité à partir du package flutter_custom_toolbox.

lib/common/ui/nav/global_app_bar.dart

@@ -22,17 +22,12 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
             final List<Widget> menuActions = [];
 
             if (currentActivity.isRunning && !currentActivity.isFinished) {
-              menuActions.add(StyledButton(
-                color: Colors.red,
+              menuActions.add(ActivityButtonQuit(
                 onPressed: () {},
                 onLongPress: () {
                   BlocProvider.of<ActivityCubit>(context).quitActivity();
                   BlocProvider.of<NavCubitPage>(context).goToPageHome();
                 },
-                child: const Image(
-                  image: AssetImage('assets/ui/button_back.png'),
-                  fit: BoxFit.fill,
-                ),
               ));
             } else {
               if (pageIndex == Screen.indexActivity) {

lib/common/ui/pages/parameters.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
+import 'package:memory/common/cubit/nav/nav_cubit_pages.dart';
 import 'package:memory/common/ui/parameters/parameter_widget.dart';
 
 import 'package:memory/config/default_activity_settings.dart';
@@ -9,9 +10,6 @@ import 'package:memory/cubit/activity/activity_cubit.dart';
 import 'package:memory/cubit/settings/settings_activity_cubit.dart';
 import 'package:memory/cubit/settings/settings_global_cubit.dart';
 import 'package:memory/models/activity/activity.dart';
-import 'package:memory/ui/widgets/actions/button_delete_saved_game.dart';
-import 'package:memory/ui/widgets/actions/button_game_start_new.dart';
-import 'package:memory/ui/widgets/actions/button_resume_saved_game.dart';
 
 class PageParameters extends StatelessWidget {
   const PageParameters({super.key});
@@ -20,13 +18,17 @@ class PageParameters extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    return BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
+      builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
+        return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
+          builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
             return BlocBuilder<ActivityCubit, ActivityState>(
               builder: (BuildContext context, ActivityState activityState) {
                 final Activity currentActivity = activityState.currentActivity;
 
                 final List<Widget> lines = [];
 
-        // Game settings
+                // Activity settings
                 for (String code in DefaultActivitySettings.availableParameters) {
                   lines.add(Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -44,23 +46,40 @@ class PageParameters extends StatelessWidget {
                 ));
 
                 if (currentActivity.canBeResumed == false) {
-          // Start new game
+                  // Start new activity
                   lines.add(
-            const AspectRatio(
+                    AspectRatio(
                       aspectRatio: 3,
-              child: StartNewGameButton(),
+                      child: ActivityButtonStartNew(
+                        onPressed: () {
+                          BlocProvider.of<ActivityCubit>(context).startNewActivity(
+                            activitySettings: activitySettingsState.settings,
+                            globalSettings: globalSettingsState.settings,
+                          );
+                          BlocProvider.of<NavCubitPage>(context).goToPageGame();
+                        },
+                      ),
                     ),
                   );
                 } else {
-          // Resume game
-          lines.add(const AspectRatio(
+                  // Resume activity
+                  lines.add(AspectRatio(
                     aspectRatio: 3,
-            child: ResumeSavedGameButton(),
+                    child: ActivityButtonResumeSaved(
+                      onPressed: () {
+                        BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
+                        BlocProvider.of<NavCubitPage>(context).goToPageGame();
+                      },
+                    ),
                   ));
-          // Delete saved game
+                  // Delete saved activity
                   lines.add(SizedBox.square(
                     dimension: MediaQuery.of(context).size.width / 5,
-            child: const DeleteSavedGameButton(),
+                    child: ActivityButtonDeleteSaved(
+                      onPressed: () {
+                        BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
+                      },
+                    ),
                   ));
                 }
 
@@ -84,6 +103,10 @@ class PageParameters extends StatelessWidget {
                 );
               },
             );
+          },
+        );
+      },
+    );
   }
 
   List<Widget> buildParametersLine({

lib/main.dart

@@ -94,10 +94,6 @@ class MyApp extends StatelessWidget {
     final List<String> assets = [];
 
     const List<String> gameImages = [
-      'button_back',
-      'button_delete_saved_game',
-      'button_resume_game',
-      'button_start',
       'game_win',
       'placeholder',
     ];

lib/ui/widgets/actions/button_delete_saved_game.dart

-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:memory/cubit/activity/activity_cubit.dart';
-
-class DeleteSavedGameButton extends StatelessWidget {
-  const DeleteSavedGameButton({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return StyledButton(
-      color: Colors.grey,
-      onPressed: () {
-        BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
-      },
-      child: const Image(
-        image: AssetImage('assets/ui/button_delete_saved_game.png'),
-        fit: BoxFit.fill,
-      ),
-    );
-  }
-}