Merge branch '93-use-activityparameters-widgets-from-flutter_custom_toolbox' into 'master'

Resolve "Use ActivityParameters widgets from flutter_custom_toolbox"

Closes #93

See merge request !89

lib/ui/widgets/game/button_show_tip.dart

@@ -2,7 +2,7 @@ import 'package:badges/badges.dart' as badges;
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:sudoku/config/default_global_settings.dart';
+import 'package:sudoku/config/application_config.dart';
 import 'package:sudoku/cubit/activity/activity_cubit.dart';
 import 'package:sudoku/models/activity/activity.dart';
 
@@ -35,7 +35,7 @@ class ButtonShowTip extends StatelessWidget {
             child: Container(
               padding: EdgeInsets.all(10 *
                   currentActivity.buttonTipsCountdown /
-                  DefaultGlobalSettings.defaultTipCountDownValueInSeconds),
+                  ApplicationConfig.defaultTipCountDownValueInSeconds),
               child: const Image(
                 image: AssetImage('assets/ui/button_help.png'),
                 fit: BoxFit.fill,

lib/ui/widgets/game/cell.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:sudoku/config/application_config.dart';
 
 import 'package:sudoku/cubit/activity/activity_cubit.dart';
 import 'package:sudoku/models/activity/cell.dart';
@@ -57,7 +58,7 @@ class CellWidget extends StatelessWidget {
   String getImageAssetName(Activity activity) {
     if ((cell.value) > 0) {
       final int cellValue = activity.getTranslatedValueForDisplay(cell.value);
-      return 'assets/skins/${activity.globalSettings.skin}_$cellValue.png';
+      return 'assets/skins/${activity.activitySettings.get(ApplicationConfig.parameterCodeSkin)}_$cellValue.png';
     }
 
     return 'assets/ui/cell_empty.png';

lib/ui/widgets/game/cell_update.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:sudoku/config/application_config.dart';
 
 import 'package:sudoku/cubit/activity/activity_cubit.dart';
 import 'package:sudoku/models/activity/cell.dart';
@@ -65,7 +66,7 @@ class CellWidgetUpdate extends StatelessWidget {
   String getImageAssetName(Activity activity) {
     if ((cell?.value ?? 0) > 0) {
       final int cellValue = activity.getTranslatedValueForDisplay(cell?.value ?? 0);
-      return 'assets/skins/${activity.globalSettings.skin}_$cellValue.png';
+      return 'assets/skins/${activity.activitySettings.get(ApplicationConfig.parameterCodeSkin)}_$cellValue.png';
     }
 
     return 'assets/ui/cell_empty.png';

pubspec.lock

@@ -130,11 +130,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "0.4.0"
-      resolved-ref: eb9c090bd00d73324eab8737f74b3339cc24c9e8
+      ref: "0.5.0"
+      resolved-ref: b8164a50489ba981ea57d9f02e2334f09cb8c6a7
       url: "https://git.harrault.fr/android/flutter-toolbox.git"
     source: git
-    version: "0.4.0"
+    version: "0.5.0"
   flutter_lints:
     dependency: "direct dev"
     description:

pubspec.yaml

@@ -3,7 +3,7 @@ description: A sudoku game application.
 
 publish_to: "none"
 
-version: 0.5.2+80
+version: 0.6.0+81
 
 environment:
   sdk: "^3.0.0"
@@ -16,7 +16,7 @@ dependencies:
   flutter_custom_toolbox:
     git:
       url: https://git.harrault.fr/android/flutter-toolbox.git
-      ref: 0.4.0
+      ref: 0.5.0
 
   # specific
   badges: ^3.1.2