diff --git a/fastlane/metadata/android/en-US/changelogs/51.txt b/fastlane/metadata/android/en-US/changelogs/51.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c20ed39173f1690cb6181457fe5d4c6cc0a061ab
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/51.txt
@@ -0,0 +1 @@
+Use ActivityParameters widgets from flutter_custom_toolbox.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/51.txt b/fastlane/metadata/android/fr-FR/changelogs/51.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f732ebd3738d66fdff72e28b0cf0bb4b0684e030
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/51.txt
@@ -0,0 +1 @@
+Utilisation des widgets ActivityParameters de flutter_custom_toolbox.
diff --git a/lib/common/config/activity_page.dart b/lib/common/config/activity_page.dart
index 0753ae755bc074329278068eafd155ed40cd955e..29bf395455e714f6139e55f3c1ccd18188d76748 100644
--- a/lib/common/config/activity_page.dart
+++ b/lib/common/config/activity_page.dart
@@ -1,18 +1,21 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/common/ui/pages/game.dart';
-import 'package:minehunter/common/ui/pages/parameters.dart';
+
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/config/application_config.dart';
+import 'package:minehunter/models/activity/activity.dart';
+import 'package:minehunter/ui/pages/game.dart';
class ActivityPageItem {
final String code;
final Icon icon;
- final Widget page;
+ final Widget Function({required Activity currentActivity})? builder;
const ActivityPageItem({
required this.code,
required this.icon,
- required this.page,
+ required this.builder,
});
}
@@ -20,20 +23,27 @@ class ActivityPage {
static const bool displayBottomNavBar = false;
static const indexHome = 0;
- static const pageHome = ActivityPageItem(
+ static final ActivityPageItem pageHome = ActivityPageItem(
code: 'page_home',
icon: Icon(UniconsLine.home),
- page: PageParameters(),
+ builder: ({required Activity currentActivity}) {
+ return PageParameters(
+ config: ApplicationConfig.config,
+ canBeResumed: currentActivity.canBeResumed,
+ );
+ },
);
static const indexGame = 1;
- static const pageGame = ActivityPageItem(
+ static final ActivityPageItem pageGame = ActivityPageItem(
code: 'page_game',
icon: Icon(UniconsLine.star),
- page: PageGame(),
+ builder: ({required Activity currentActivity}) {
+ return PageGame();
+ },
);
- static const Map<int, ActivityPageItem> items = {
+ static final Map<int, ActivityPageItem> items = {
indexHome: pageHome,
indexGame: pageGame,
};
@@ -45,6 +55,16 @@ class ActivityPage {
}
static Widget getWidget(int pageIndex) {
- return items[pageIndex]?.page ?? pageHome.page;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
+
+ if (items.keys.contains(pageIndex)) {
+ return items[pageIndex]?.builder!(currentActivity: currentActivity) ?? Text('oups');
+ } else {
+ return getWidget(defaultPageIndex);
+ }
+ },
+ );
}
}
diff --git a/lib/common/ui/pages/parameters.dart b/lib/common/ui/pages/parameters.dart
deleted file mode 100644
index eae0da063ff65c22183cb3ed6fbbeee29cf86242..0000000000000000000000000000000000000000
--- a/lib/common/ui/pages/parameters.dart
+++ /dev/null
@@ -1,171 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
-import 'package:minehunter/common/ui/parameters/parameter_widget.dart';
-
-import 'package:minehunter/config/default_activity_settings.dart';
-import 'package:minehunter/config/default_global_settings.dart';
-import 'package:minehunter/cubit/activity/activity_cubit.dart';
-import 'package:minehunter/cubit/settings/settings_activity_cubit.dart';
-import 'package:minehunter/cubit/settings/settings_global_cubit.dart';
-import 'package:minehunter/models/activity/activity.dart';
-
-class PageParameters extends StatelessWidget {
- const PageParameters({super.key});
-
- final double separatorHeight = 8.0;
-
- @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 = [];
-
- // Activity settings
- for (String code in DefaultActivitySettings.availableParameters) {
- lines.add(Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: buildParametersLine(
- code: code,
- isGlobal: false,
- ),
- ));
-
- lines.add(SizedBox(height: separatorHeight));
- }
-
- lines.add(Expanded(
- child: SizedBox(height: separatorHeight),
- ));
-
- if (currentActivity.canBeResumed == false) {
- // Start new activity
- lines.add(
- AspectRatio(
- aspectRatio: 3,
- child: ActivityButtonStartNew(
- onPressed: () {
- BlocProvider.of<ActivityCubit>(context).startNewActivity(
- activitySettings: activitySettingsState.settings,
- globalSettings: globalSettingsState.settings,
- );
- BlocProvider.of<NavCubitPage>(context).goToPageGame();
- },
- ),
- ),
- );
- } else {
- // Resume activity
- lines.add(AspectRatio(
- aspectRatio: 3,
- child: ActivityButtonResumeSaved(
- onPressed: () {
- BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
- BlocProvider.of<NavCubitPage>(context).goToPageGame();
- },
- ),
- ));
- // Delete saved activity
- lines.add(SizedBox.square(
- dimension: MediaQuery.of(context).size.width / 5,
- child: ActivityButtonDeleteSaved(
- onPressed: () {
- BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
- },
- ),
- ));
- }
-
- lines.add(SizedBox(height: separatorHeight));
-
- // Global settings
- for (String code in DefaultGlobalSettings.availableParameters) {
- lines.add(Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: buildParametersLine(
- code: code,
- isGlobal: true,
- ),
- ));
-
- lines.add(SizedBox(height: separatorHeight));
- }
-
- return Column(
- children: lines,
- );
- },
- );
- },
- );
- },
- );
- }
-
- List<Widget> buildParametersLine({
- required String code,
- required bool isGlobal,
- }) {
- final List<Widget> parameterButtons = [];
-
- final List<String> availableValues = isGlobal
- ? DefaultGlobalSettings.getAvailableValues(code)
- : DefaultActivitySettings.getAvailableValues(code);
-
- if (availableValues.length <= 1) {
- return [];
- }
-
- for (String value in availableValues) {
- final Widget parameterButton = BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
- builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
- return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
- builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
- final ActivitySettingsCubit activitySettingsCubit =
- BlocProvider.of<ActivitySettingsCubit>(context);
- final GlobalSettingsCubit globalSettingsCubit =
- BlocProvider.of<GlobalSettingsCubit>(context);
-
- final String currentValue = isGlobal
- ? globalSettingsCubit.getParameterValue(code)
- : activitySettingsCubit.getParameterValue(code);
-
- final bool isSelected = (value == currentValue);
-
- final double displayWidth = MediaQuery.of(context).size.width;
- final double itemWidth = displayWidth / availableValues.length - 4;
-
- return SizedBox.square(
- dimension: itemWidth,
- child: ParameterWidget(
- code: code,
- value: value,
- isSelected: isSelected,
- size: itemWidth,
- activitySettings: activitySettingsState.settings,
- globalSettings: globalSettingsState.settings,
- onPressed: () {
- isGlobal
- ? globalSettingsCubit.setParameterValue(code, value)
- : activitySettingsCubit.setParameterValue(code, value);
- },
- ),
- );
- },
- );
- },
- );
-
- parameterButtons.add(parameterButton);
- }
-
- return parameterButtons;
- }
-}
diff --git a/lib/common/ui/parameters/parameter_painter.dart b/lib/common/ui/parameters/parameter_painter.dart
deleted file mode 100644
index e2e8b230d845531c22108bea8cc71a839823edd8..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_painter.dart
+++ /dev/null
@@ -1,185 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/config/default_activity_settings.dart';
-import 'package:minehunter/models/settings/settings_activity.dart';
-import 'package:minehunter/models/settings/settings_global.dart';
-
-class ParameterPainter extends CustomPainter {
- const ParameterPainter({
- required this.code,
- required this.value,
- required this.activitySettings,
- required this.globalSettings,
- });
-
- final String code;
- final String value;
- final ActivitySettings activitySettings;
- final GlobalSettings globalSettings;
-
- @override
- void paint(Canvas canvas, Size size) {
- // force square
- final double canvasSize = min(size.width, size.height);
-
- // content
- switch (code) {
- case DefaultActivitySettings.parameterCodeLevel:
- paintLevelParameterItem(canvas, canvasSize);
- break;
- case DefaultActivitySettings.parameterCodeSize:
- paintSizeParameterItem(canvas, canvasSize);
- break;
- default:
- printlog('Unknown parameter: $code/$value');
- paintUnknownParameterItem(canvas, canvasSize);
- }
- }
-
- @override
- bool shouldRepaint(CustomPainter oldDelegate) {
- return false;
- }
-
- // "unknown" parameter -> simple block with text
- void paintUnknownParameterItem(
- final Canvas canvas,
- final double size,
- ) {
- final paint = Paint();
- paint.strokeJoin = StrokeJoin.round;
- paint.strokeWidth = 3;
-
- final textSpan = TextSpan(
- text: '$code\n$value',
- style: const TextStyle(
- color: Colors.black,
- fontSize: 18,
- fontWeight: FontWeight.bold,
- ),
- );
- final textPainter = TextPainter(
- text: textSpan,
- textDirection: TextDirection.ltr,
- textAlign: TextAlign.center,
- );
- textPainter.layout();
- textPainter.paint(
- canvas,
- Offset(
- (size - textPainter.width) * 0.5,
- (size - textPainter.height) * 0.5,
- ),
- );
- }
-
- void paintLevelParameterItem(
- final Canvas canvas,
- final double size,
- ) {
- final List<dynamic> stars = [];
-
- switch (value) {
- case DefaultActivitySettings.levelValueEasy:
- stars.add([0.5, 0.5]);
- break;
- case DefaultActivitySettings.levelValueMedium:
- stars.add([0.3, 0.5]);
- stars.add([0.7, 0.5]);
- break;
- case DefaultActivitySettings.levelValueHard:
- stars.add([0.3, 0.3]);
- stars.add([0.7, 0.3]);
- stars.add([0.5, 0.7]);
- break;
- case DefaultActivitySettings.levelValueNightmare:
- stars.add([0.3, 0.3]);
- stars.add([0.7, 0.3]);
- stars.add([0.3, 0.7]);
- stars.add([0.7, 0.7]);
- break;
- default:
- printlog('Wrong value for level parameter value: $value');
- }
-
- final paint = Paint();
- paint.strokeJoin = StrokeJoin.round;
- paint.strokeWidth = 3 / 100 * size;
-
- // Stars
- final textSpan = TextSpan(
- text: '⭐',
- style: TextStyle(
- color: Colors.black,
- fontSize: size / 3,
- fontWeight: FontWeight.bold,
- ),
- );
- final textPainter = TextPainter(
- text: textSpan,
- textDirection: TextDirection.ltr,
- textAlign: TextAlign.center,
- );
- textPainter.layout();
-
- for (var center in stars) {
- textPainter.paint(
- canvas,
- Offset(
- size * center[0] - textPainter.width * 0.5,
- size * center[1] - textPainter.height * 0.5,
- ),
- );
- }
- }
-
- void paintSizeParameterItem(
- final Canvas canvas,
- final double size,
- ) {
- int gridWidth = 1;
-
- switch (value) {
- case DefaultActivitySettings.sizeValueSmall:
- gridWidth = 2;
- break;
- case DefaultActivitySettings.sizeValueMedium:
- gridWidth = 3;
- break;
- case DefaultActivitySettings.sizeValueLarge:
- gridWidth = 4;
- break;
- default:
- printlog('Wrong value for boardSize parameter value: $value');
- }
-
- final paint = Paint();
- paint.strokeJoin = StrokeJoin.round;
- paint.strokeWidth = 3 / 100 * size;
-
- // Mini grid
- final squareColor = Colors.grey.shade200;
- final borderColor = Colors.grey.shade800;
-
- final double cellSize = size / 7;
- final double origin = (size - gridWidth * cellSize) / 2;
-
- for (int row = 0; row < gridWidth; row++) {
- for (int col = 0; col < gridWidth; col++) {
- final Offset topLeft = Offset(origin + col * cellSize, origin + row * cellSize);
- final Offset bottomRight = topLeft + Offset(cellSize, cellSize);
-
- paint.color = squareColor;
- paint.style = PaintingStyle.fill;
- canvas.drawRect(Rect.fromPoints(topLeft, bottomRight), paint);
-
- paint.color = borderColor;
- paint.style = PaintingStyle.stroke;
- canvas.drawRect(Rect.fromPoints(topLeft, bottomRight), paint);
- }
- }
- }
-}
diff --git a/lib/common/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
deleted file mode 100644
index 264526c3f50a9bcf31ce84f0b7718f5c4fd5ef20..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_widget.dart
+++ /dev/null
@@ -1,162 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/common/ui/parameters/parameter_painter.dart';
-
-import 'package:minehunter/config/default_activity_settings.dart';
-import 'package:minehunter/config/default_global_settings.dart';
-import 'package:minehunter/models/settings/settings_activity.dart';
-import 'package:minehunter/models/settings/settings_global.dart';
-
-class ParameterWidget extends StatelessWidget {
- const ParameterWidget({
- super.key,
- required this.code,
- required this.value,
- required this.isSelected,
- required this.size,
- required this.activitySettings,
- required this.globalSettings,
- required this.onPressed,
- });
-
- final String code;
- final String value;
- final bool isSelected;
- final double size;
- final ActivitySettings activitySettings;
- final GlobalSettings globalSettings;
- final VoidCallback onPressed;
-
- static const Color buttonColorActive = Colors.blue;
- static const Color buttonColorInactive = Colors.white;
- static const double buttonBorderWidth = 4.0;
- static const double buttonBorderRadius = 12.0;
-
- @override
- Widget build(BuildContext context) {
- Widget content = const SizedBox.shrink();
-
- switch (code) {
- case DefaultActivitySettings.parameterCodeLevel:
- content = getLevelParameterItem(value);
- break;
- case DefaultActivitySettings.parameterCodeSize:
- content = getSizeParameterItem(value);
- break;
- case DefaultGlobalSettings.parameterCodeSkin:
- content = getSkinParameterItem(value);
- break;
- default:
- printlog('Unknown parameter: $code/$value');
- content = getUnknownParameterItem(value);
- }
-
- final Color buttonColor = isSelected ? buttonColorActive : buttonColorInactive;
-
- return Container(
- decoration: BoxDecoration(
- color: buttonColor,
- borderRadius: BorderRadius.circular(buttonBorderRadius),
- border: Border.all(
- color: buttonColor,
- width: buttonBorderWidth,
- ),
- ),
- child: content,
- );
- }
-
- // "unknown" parameter -> simple block with text
- Widget getUnknownParameterItem(final String value) {
- return StyledButton.text(
- caption: '$code / $value',
- color: Colors.grey,
- onPressed: null,
- );
- }
-
- Widget getLevelParameterItem(final String value) {
- Color backgroundColor = Colors.grey;
-
- switch (value) {
- case DefaultActivitySettings.levelValueEasy:
- backgroundColor = Colors.green;
- break;
- case DefaultActivitySettings.levelValueMedium:
- backgroundColor = Colors.orange;
- break;
- case DefaultActivitySettings.levelValueHard:
- backgroundColor = Colors.red;
- break;
- case DefaultActivitySettings.levelValueNightmare:
- backgroundColor = Colors.purple;
- break;
- default:
- printlog('Wrong value for level parameter value: $value');
- }
-
- return StyledButton(
- color: backgroundColor,
- onPressed: onPressed,
- child: CustomPaint(
- size: Size(size, size),
- willChange: false,
- painter: ParameterPainter(
- code: code,
- value: value,
- activitySettings: activitySettings,
- globalSettings: globalSettings,
- ),
- isComplex: true,
- ),
- );
- }
-
- Widget getSizeParameterItem(final String value) {
- Color backgroundColor = Colors.grey;
-
- switch (value) {
- case DefaultActivitySettings.sizeValueSmall:
- backgroundColor = Colors.green;
- break;
- case DefaultActivitySettings.sizeValueMedium:
- backgroundColor = Colors.orange;
- break;
- case DefaultActivitySettings.sizeValueLarge:
- backgroundColor = Colors.red;
- break;
- default:
- printlog('Wrong value for boardSize parameter value: $value');
- }
-
- return StyledButton(
- color: backgroundColor,
- onPressed: onPressed,
- child: CustomPaint(
- size: Size(size, size),
- willChange: false,
- painter: ParameterPainter(
- code: code,
- value: value,
- activitySettings: activitySettings,
- globalSettings: globalSettings,
- ),
- isComplex: true,
- ),
- );
- }
-
- Widget getSkinParameterItem(
- final String value,
- ) {
- return StyledButton(
- color: Colors.green.shade800,
- onPressed: onPressed,
- child: Image(
- image: AssetImage('assets/ui/${DefaultGlobalSettings.parameterCodeSkin}_$value.png'),
- fit: BoxFit.fill,
- ),
- );
- }
-}
diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart
index 48ab5a8a1e4404377d2674be1f4462417c044674..5563a21cee27c2d920240502f21544a5fcb40ed3 100644
--- a/lib/config/application_config.dart
+++ b/lib/config/application_config.dart
@@ -1,3 +1,117 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/ui/parameters/parameter_painter_board_size.dart';
+import 'package:minehunter/ui/parameters/parameter_painter_difficulty_level.dart';
+
class ApplicationConfig {
- static const String appTitle = 'Minehunter';
+ static const String parameterCodeSkin = 'global.skin';
+ static const String parameterCodeDifficultyLevel = 'level';
+ static const String parameterCodeBoardSize = 'size';
+
+ static const String skinValueDefault = 'default';
+
+ static const String difficultyLevelValueEasy = 'easy';
+ static const String difficultyLevelValueMedium = 'medium';
+ static const String difficultyLevelValueHard = 'hard';
+ static const String difficultyLevelValueNightmare = 'nightmare';
+
+ static const String boardSizeValueSmall = '10x10';
+ static const String boardSizeValueMedium = '15x15';
+ static const String boardSizeValueLarge = '20x20';
+ static const String boardSizeValueExtraLarge = '25x25';
+
+ static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
+ appTitle: 'Minehunter',
+ activitySettings: [
+ // skin
+ ApplicationSettingsParameter(
+ code: parameterCodeSkin,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: skinValueDefault,
+ isDefault: true,
+ ),
+ ],
+ ),
+
+ // difficulty level
+ ApplicationSettingsParameter(
+ code: parameterCodeDifficultyLevel,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: difficultyLevelValueEasy,
+ color: Colors.green,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: difficultyLevelValueMedium,
+ color: Colors.orange,
+ isDefault: true,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: difficultyLevelValueHard,
+ color: Colors.red,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: difficultyLevelValueNightmare,
+ color: Colors.purple,
+ ),
+ ],
+ customPainter: (context, value) => ParameterPainterDifficultyLevel(
+ context: context,
+ value: value,
+ ),
+ ),
+
+ // board size
+ ApplicationSettingsParameter(
+ code: parameterCodeBoardSize,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: boardSizeValueSmall,
+ color: Colors.green,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: boardSizeValueMedium,
+ color: Colors.orange,
+ isDefault: true,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: boardSizeValueLarge,
+ color: Colors.red,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: boardSizeValueExtraLarge,
+ color: Colors.purple,
+ ),
+ ],
+ customPainter: (context, value) => ParameterPainterBoardSize(
+ context: context,
+ value: value,
+ ),
+ ),
+ ],
+ startNewActivity: (BuildContext context) {
+ BlocProvider.of<ActivityCubit>(context).startNewActivity(context);
+ BlocProvider.of<NavCubitPage>(context).goToPageGame();
+ },
+ deleteCurrentActivity: (BuildContext context) {
+ BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
+ },
+ resumeActivity: (BuildContext context) {
+ BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
+ BlocProvider.of<NavCubitPage>(context).goToPageGame();
+ },
+ );
+
+ // how many mines? (per 100 tiles)
+ static const Map<String, int> minesCountRatios = {
+ ApplicationConfig.difficultyLevelValueEasy: 5,
+ ApplicationConfig.difficultyLevelValueMedium: 10,
+ ApplicationConfig.difficultyLevelValueHard: 15,
+ ApplicationConfig.difficultyLevelValueNightmare: 20,
+ };
}
diff --git a/lib/config/default_activity_settings.dart b/lib/config/default_activity_settings.dart
deleted file mode 100644
index d8c7fee35703dd4f264642ef6cb22e88fc47f259..0000000000000000000000000000000000000000
--- a/lib/config/default_activity_settings.dart
+++ /dev/null
@@ -1,58 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultActivitySettings {
- // available game parameters codes
- static const String parameterCodeLevel = 'level';
- static const String parameterCodeSize = 'size';
- static const List<String> availableParameters = [
- parameterCodeLevel,
- parameterCodeSize,
- ];
-
- // level: available values
- static const String levelValueEasy = 'easy';
- static const String levelValueMedium = 'medium';
- static const String levelValueHard = 'hard';
- static const String levelValueNightmare = 'nightmare';
- static const List<String> allowedLevelValues = [
- levelValueEasy,
- levelValueMedium,
- levelValueHard,
- levelValueNightmare,
- ];
- // level: default value
- static const String defaultLevelValue = levelValueMedium;
-
- // size: available values
- static const String sizeValueSmall = '10x10';
- static const String sizeValueMedium = '15x15';
- static const String sizeValueLarge = '20x20';
- static const List<String> allowedSizeValues = [
- sizeValueSmall,
- sizeValueMedium,
- sizeValueLarge,
- ];
- // size: default value
- static const String defaultSizeValue = sizeValueMedium;
-
- // available values from parameter code
- static List<String> getAvailableValues(String parameterCode) {
- switch (parameterCode) {
- case parameterCodeLevel:
- return DefaultActivitySettings.allowedLevelValues;
- case parameterCodeSize:
- return DefaultActivitySettings.allowedSizeValues;
- }
-
- printlog('Did not find any available value for game parameter "$parameterCode".');
- return [];
- }
-
- // how many mines? (per 100 tiles)
- static const Map<String, int> minesCountRatios = {
- DefaultActivitySettings.levelValueEasy: 5,
- DefaultActivitySettings.levelValueMedium: 10,
- DefaultActivitySettings.levelValueHard: 15,
- DefaultActivitySettings.levelValueNightmare: 20,
- };
-}
diff --git a/lib/config/default_global_settings.dart b/lib/config/default_global_settings.dart
deleted file mode 100644
index d92229c2e02064684ed4a2caeb272ff63325776a..0000000000000000000000000000000000000000
--- a/lib/config/default_global_settings.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultGlobalSettings {
- // available global parameters codes
- static const String parameterCodeSkin = 'skin';
- static const List<String> availableParameters = [
- parameterCodeSkin,
- ];
-
- // skin: available values
- static const String skinValueDefault = 'default';
- static const List<String> allowedSkinValues = [
- skinValueDefault,
- ];
- // skin: default value
- static const String defaultSkinValue = skinValueDefault;
-
- // available values from parameter code
- static List<String> getAvailableValues(String parameterCode) {
- switch (parameterCode) {
- case parameterCodeSkin:
- return DefaultGlobalSettings.allowedSkinValues;
- }
-
- printlog('Did not find any available value for global parameter "$parameterCode".');
- return [];
- }
-}
diff --git a/lib/cubit/activity/activity_cubit.dart b/lib/cubit/activity/activity_cubit.dart
index 4c8713dfe0be4e31fe1056a809b3a1c53672946b..d7478b9fac95bd9f7fe4f43c52d3e8f31b1aec97 100644
--- a/lib/cubit/activity/activity_cubit.dart
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -3,8 +3,6 @@ import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:minehunter/models/activity/cell.dart';
import 'package:minehunter/models/activity/activity.dart';
-import 'package:minehunter/models/settings/settings_activity.dart';
-import 'package:minehunter/models/settings/settings_global.dart';
import 'package:minehunter/models/types.dart';
part 'activity_state.dart';
@@ -25,7 +23,6 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
final Activity activity = Activity(
// Settings
activitySettings: state.currentActivity.activitySettings,
- globalSettings: state.currentActivity.globalSettings,
// State
isRunning: state.currentActivity.isRunning,
isStarted: state.currentActivity.isStarted,
@@ -47,14 +44,13 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
updateState(activity);
}
- void startNewActivity({
- required ActivitySettings activitySettings,
- required GlobalSettings globalSettings,
- }) {
+ void startNewActivity(BuildContext context) {
+ final ActivitySettingsCubit activitySettingsCubit =
+ BlocProvider.of<ActivitySettingsCubit>(context);
+
final Activity newActivity = Activity.createNew(
// Settings
- activitySettings: activitySettings,
- globalSettings: globalSettings,
+ activitySettings: activitySettingsCubit.state.settings,
);
newActivity.dump();
@@ -63,6 +59,10 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
refresh();
}
+ bool canBeResumed() {
+ return state.currentActivity.canBeResumed;
+ }
+
void quitActivity() {
state.currentActivity.isRunning = false;
refresh();
diff --git a/lib/cubit/settings/settings_activity_cubit.dart b/lib/cubit/settings/settings_activity_cubit.dart
deleted file mode 100644
index 290b1bad267c0084bb5123d035a291cf27a4f842..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_activity_cubit.dart
+++ /dev/null
@@ -1,72 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/config/default_activity_settings.dart';
-import 'package:minehunter/models/settings/settings_activity.dart';
-
-part 'settings_activity_state.dart';
-
-class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
- ActivitySettingsCubit()
- : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
-
- void setValues({
- String? itemsCount,
- String? timerValue,
- }) {
- emit(
- ActivitySettingsState(
- settings: ActivitySettings(
- level: itemsCount ?? state.settings.level,
- size: timerValue ?? state.settings.size,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultActivitySettings.parameterCodeLevel:
- return ActivitySettings.getLevelValueFromUnsafe(state.settings.level);
- case DefaultActivitySettings.parameterCodeSize:
- return ActivitySettings.getSizeValueFromUnsafe(state.settings.size);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String itemsCount = code == DefaultActivitySettings.parameterCodeLevel
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeLevel);
- final String timerValue = code == DefaultActivitySettings.parameterCodeSize
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeSize);
-
- setValues(
- itemsCount: itemsCount,
- timerValue: timerValue,
- );
- }
-
- @override
- ActivitySettingsState? fromJson(Map<String, dynamic> json) {
- final String itemsCount = json[DefaultActivitySettings.parameterCodeLevel] as String;
- final String timerValue = json[DefaultActivitySettings.parameterCodeSize] as String;
-
- return ActivitySettingsState(
- settings: ActivitySettings(
- level: itemsCount,
- size: timerValue,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(ActivitySettingsState state) {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeLevel: state.settings.level,
- DefaultActivitySettings.parameterCodeSize: state.settings.size,
- };
- }
-}
diff --git a/lib/cubit/settings/settings_activity_state.dart b/lib/cubit/settings/settings_activity_state.dart
deleted file mode 100644
index 2b2de42011634e81ae9e6f8bcaa1577f239c778b..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_activity_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'settings_activity_cubit.dart';
-
-@immutable
-class ActivitySettingsState extends Equatable {
- const ActivitySettingsState({
- required this.settings,
- });
-
- final ActivitySettings settings;
-
- @override
- List<dynamic> get props => <dynamic>[
- settings,
- ];
-}
diff --git a/lib/cubit/settings/settings_global_cubit.dart b/lib/cubit/settings/settings_global_cubit.dart
deleted file mode 100644
index 09650074f4fab8f33a144c49547915cd60bbf7d7..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_global_cubit.dart
+++ /dev/null
@@ -1,59 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/config/default_global_settings.dart';
-import 'package:minehunter/models/settings/settings_global.dart';
-
-part 'settings_global_state.dart';
-
-class GlobalSettingsCubit extends HydratedCubit<GlobalSettingsState> {
- GlobalSettingsCubit() : super(GlobalSettingsState(settings: GlobalSettings.createDefault()));
-
- void setValues({
- String? skin,
- }) {
- emit(
- GlobalSettingsState(
- settings: GlobalSettings(
- skin: skin ?? state.settings.skin,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultGlobalSettings.parameterCodeSkin:
- return GlobalSettings.getSkinValueFromUnsafe(state.settings.skin);
- }
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String skin = (code == DefaultGlobalSettings.parameterCodeSkin)
- ? value
- : getParameterValue(DefaultGlobalSettings.parameterCodeSkin);
-
- setValues(
- skin: skin,
- );
- }
-
- @override
- GlobalSettingsState? fromJson(Map<String, dynamic> json) {
- final String skin = json[DefaultGlobalSettings.parameterCodeSkin] as String;
-
- return GlobalSettingsState(
- settings: GlobalSettings(
- skin: skin,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GlobalSettingsState state) {
- return <String, dynamic>{
- DefaultGlobalSettings.parameterCodeSkin: state.settings.skin,
- };
- }
-}
diff --git a/lib/cubit/settings/settings_global_state.dart b/lib/cubit/settings/settings_global_state.dart
deleted file mode 100644
index ebcddd700f252257223ca8e16c85202b04f3ff24..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_global_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'settings_global_cubit.dart';
-
-@immutable
-class GlobalSettingsState extends Equatable {
- const GlobalSettingsState({
- required this.settings,
- });
-
- final GlobalSettings settings;
-
- @override
- List<dynamic> get props => <dynamic>[
- settings,
- ];
-}
diff --git a/lib/main.dart b/lib/main.dart
index b70cf5fdf7598e62411151dd01813ee7673ae4b9..10c5a89d535615059185f83ccd0df75b3d883b8e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,14 +4,12 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
import 'package:minehunter/common/cubit/nav/nav_cubit_screens.dart';
import 'package:minehunter/config/application_config.dart';
-import 'package:minehunter/config/default_global_settings.dart';
import 'package:minehunter/cubit/activity/activity_cubit.dart';
-import 'package:minehunter/cubit/settings/settings_activity_cubit.dart';
-import 'package:minehunter/cubit/settings/settings_global_cubit.dart';
import 'package:minehunter/ui/skeleton.dart';
void main() async {
@@ -62,17 +60,14 @@ class MyApp extends StatelessWidget {
BlocProvider<ActivityCubit>(
create: (context) => ActivityCubit(),
),
- BlocProvider<GlobalSettingsCubit>(
- create: (context) => GlobalSettingsCubit(),
- ),
BlocProvider<ActivitySettingsCubit>(
- create: (context) => ActivitySettingsCubit(),
+ create: (context) => ActivitySettingsCubit(appConfig: ApplicationConfig.config),
),
],
child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>(
builder: (BuildContext context, ApplicationThemeModeState state) {
return MaterialApp(
- title: ApplicationConfig.appTitle,
+ title: ApplicationConfig.config.appTitle,
home: const SkeletonScreen(),
// Theme stuff
@@ -123,7 +118,9 @@ class MyApp extends StatelessWidget {
skinImages.add('tile_$value');
}
- for (String skin in DefaultGlobalSettings.allowedSkinValues) {
+ for (String skin in ApplicationConfig.config
+ .getFromCode(ApplicationConfig.parameterCodeSkin)
+ .allowedValues) {
for (String image in skinImages) {
assets.add('assets/skins/${skin}_$image.png');
}
diff --git a/lib/models/activity/activity.dart b/lib/models/activity/activity.dart
index 323966bcfd15527c94fae6024c99584ffb3bee8c..8f3bab170143673eebd369dd9feec00e20f9cebf 100644
--- a/lib/models/activity/activity.dart
+++ b/lib/models/activity/activity.dart
@@ -1,16 +1,14 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/config/default_activity_settings.dart';
+import 'package:minehunter/config/application_config.dart';
+
import 'package:minehunter/models/activity/cell.dart';
-import 'package:minehunter/models/settings/settings_activity.dart';
-import 'package:minehunter/models/settings/settings_global.dart';
import 'package:minehunter/models/types.dart';
class Activity {
Activity({
// Settings
required this.activitySettings,
- required this.globalSettings,
// State
this.isRunning = false,
@@ -33,7 +31,6 @@ class Activity {
// Settings
final ActivitySettings activitySettings;
- final GlobalSettings globalSettings;
// State
bool isRunning;
@@ -56,8 +53,7 @@ class Activity {
factory Activity.createEmpty() {
return Activity(
// Settings
- activitySettings: ActivitySettings.createDefault(),
- globalSettings: GlobalSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(appConfig: ApplicationConfig.config),
// Base data
board: [],
sizeHorizontal: 0,
@@ -67,14 +63,14 @@ class Activity {
factory Activity.createNew({
ActivitySettings? activitySettings,
- GlobalSettings? globalSettings,
}) {
- final ActivitySettings newActivitySettings =
- activitySettings ?? ActivitySettings.createDefault();
- final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
+ final ActivitySettings newActivitySettings = activitySettings ??
+ ActivitySettings.createDefault(appConfig: ApplicationConfig.config);
- final int sizeHorizontal = int.parse(newActivitySettings.size.split('x')[0]);
- final int sizeVertical = int.parse(newActivitySettings.size.split('x')[1]);
+ final int sizeHorizontal = int.parse(
+ newActivitySettings.get(ApplicationConfig.parameterCodeBoardSize).split('x')[0]);
+ final int sizeVertical = int.parse(
+ newActivitySettings.get(ApplicationConfig.parameterCodeBoardSize).split('x')[1]);
// Create empty board (it will be mined after first hit)
final Board board = [];
@@ -86,15 +82,15 @@ class Activity {
board.add(row);
}
- final int minesCountRatio =
- DefaultActivitySettings.minesCountRatios[newActivitySettings.level] ?? 1;
+ final int minesCountRatio = ApplicationConfig.minesCountRatios[
+ newActivitySettings.get(ApplicationConfig.parameterCodeDifficultyLevel)] ??
+ 1;
final int minesCount = ((sizeHorizontal * sizeVertical) * minesCountRatio / 100).round();
printlog('Mines count: $minesCount');
return Activity(
// Settings
activitySettings: newActivitySettings,
- globalSettings: newGlobalSettings,
// State
isRunning: true,
// Base data
@@ -180,7 +176,6 @@ class Activity {
printlog('$Activity:');
printlog(' Settings');
activitySettings.dump();
- globalSettings.dump();
printlog(' State');
printlog(' isRunning: $isRunning');
printlog(' isStarted: $isStarted');
@@ -248,7 +243,6 @@ class Activity {
return <String, dynamic>{
// Settings
'activitySettings': activitySettings.toJson(),
- 'globalSettings': globalSettings.toJson(),
// State
'isRunning': isRunning,
'isStarted': isStarted,
diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart
deleted file mode 100644
index 30ca647f369e9ad61ea19d258713c9b2553bea5b..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_activity.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/config/default_activity_settings.dart';
-
-class ActivitySettings {
- final String level;
- final String size;
-
- ActivitySettings({
- required this.level,
- required this.size,
- });
-
- static String getLevelValueFromUnsafe(String level) {
- if (DefaultActivitySettings.allowedLevelValues.contains(level)) {
- return level;
- }
-
- return DefaultActivitySettings.defaultLevelValue;
- }
-
- static String getSizeValueFromUnsafe(String size) {
- if (DefaultActivitySettings.allowedSizeValues.contains(size)) {
- return size;
- }
-
- return DefaultActivitySettings.defaultSizeValue;
- }
-
- factory ActivitySettings.createDefault() {
- return ActivitySettings(
- level: DefaultActivitySettings.defaultLevelValue,
- size: DefaultActivitySettings.defaultSizeValue,
- );
- }
-
- void dump() {
- printlog('$ActivitySettings:');
- printlog(' ${DefaultActivitySettings.parameterCodeLevel}: $level');
- printlog(' ${DefaultActivitySettings.parameterCodeSize}: $size');
- printlog('');
- }
-
- @override
- String toString() {
- return '$ActivitySettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeLevel: level,
- DefaultActivitySettings.parameterCodeSize: size,
- };
- }
-}
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
deleted file mode 100644
index 493e2cea3fb0259a90dd75dd0ed8d95d4b73f42e..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_global.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/config/default_global_settings.dart';
-
-class GlobalSettings {
- String skin;
-
- GlobalSettings({
- required this.skin,
- });
-
- static String getSkinValueFromUnsafe(String skin) {
- if (DefaultGlobalSettings.allowedSkinValues.contains(skin)) {
- return skin;
- }
-
- return DefaultGlobalSettings.defaultSkinValue;
- }
-
- factory GlobalSettings.createDefault() {
- return GlobalSettings(
- skin: DefaultGlobalSettings.defaultSkinValue,
- );
- }
-
- void dump() {
- printlog('$GlobalSettings:');
- printlog(' ${DefaultGlobalSettings.parameterCodeSkin}: $skin');
- printlog('');
- }
-
- @override
- String toString() {
- return '$GlobalSettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultGlobalSettings.parameterCodeSkin: skin,
- };
- }
-}
diff --git a/lib/common/ui/pages/game.dart b/lib/ui/pages/game.dart
similarity index 100%
rename from lib/common/ui/pages/game.dart
rename to lib/ui/pages/game.dart
diff --git a/lib/ui/parameters/parameter_painter_board_size.dart b/lib/ui/parameters/parameter_painter_board_size.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ac60921ec074c839c15ca26389fd396d6a1517c6
--- /dev/null
+++ b/lib/ui/parameters/parameter_painter_board_size.dart
@@ -0,0 +1,72 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:minehunter/config/application_config.dart';
+
+class ParameterPainterBoardSize extends CustomPainter {
+ const ParameterPainterBoardSize({
+ required this.context,
+ required this.value,
+ });
+
+ final BuildContext context;
+ final String value;
+
+ @override
+ void paint(Canvas canvas, Size size) {
+ // force square
+ final double canvasSize = min(size.width, size.height);
+
+ int gridWidth = 1;
+
+ switch (value) {
+ case ApplicationConfig.boardSizeValueSmall:
+ gridWidth = 2;
+ break;
+ case ApplicationConfig.boardSizeValueMedium:
+ gridWidth = 3;
+ break;
+ case ApplicationConfig.boardSizeValueLarge:
+ gridWidth = 4;
+ break;
+ case ApplicationConfig.boardSizeValueExtraLarge:
+ gridWidth = 5;
+ break;
+ default:
+ printlog('Wrong value for boardSize parameter value: $value');
+ }
+
+ final paint = Paint();
+ paint.strokeJoin = StrokeJoin.round;
+ paint.strokeWidth = 3 / 100 * canvasSize;
+
+ // Mini grid
+ final squareColor = Colors.grey.shade200;
+ final borderColor = Colors.grey.shade800;
+
+ final double cellSize = canvasSize / 7;
+ final double origin = (canvasSize - gridWidth * cellSize) / 2;
+
+ for (int row = 0; row < gridWidth; row++) {
+ for (int col = 0; col < gridWidth; col++) {
+ final Offset topLeft = Offset(origin + col * cellSize, origin + row * cellSize);
+ final Offset bottomRight = topLeft + Offset(cellSize, cellSize);
+
+ paint.color = squareColor;
+ paint.style = PaintingStyle.fill;
+ canvas.drawRect(Rect.fromPoints(topLeft, bottomRight), paint);
+
+ paint.color = borderColor;
+ paint.style = PaintingStyle.stroke;
+ canvas.drawRect(Rect.fromPoints(topLeft, bottomRight), paint);
+ }
+ }
+ }
+
+ @override
+ bool shouldRepaint(CustomPainter oldDelegate) {
+ return false;
+ }
+}
diff --git a/lib/ui/parameters/parameter_painter_difficulty_level.dart b/lib/ui/parameters/parameter_painter_difficulty_level.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6acc08c6b40431ba968aae08036c818d6352f1a1
--- /dev/null
+++ b/lib/ui/parameters/parameter_painter_difficulty_level.dart
@@ -0,0 +1,82 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:minehunter/config/application_config.dart';
+
+class ParameterPainterDifficultyLevel extends CustomPainter {
+ const ParameterPainterDifficultyLevel({
+ required this.context,
+ required this.value,
+ });
+
+ final BuildContext context;
+ final String value;
+
+ @override
+ void paint(Canvas canvas, Size size) {
+ // force square
+ final double canvasSize = min(size.width, size.height);
+
+ final List<dynamic> stars = [];
+
+ switch (value) {
+ case ApplicationConfig.difficultyLevelValueEasy:
+ stars.add([0.5, 0.5]);
+ break;
+ case ApplicationConfig.difficultyLevelValueMedium:
+ stars.add([0.3, 0.5]);
+ stars.add([0.7, 0.5]);
+ break;
+ case ApplicationConfig.difficultyLevelValueHard:
+ stars.add([0.3, 0.3]);
+ stars.add([0.7, 0.3]);
+ stars.add([0.5, 0.7]);
+ break;
+ case ApplicationConfig.difficultyLevelValueNightmare:
+ stars.add([0.3, 0.3]);
+ stars.add([0.7, 0.3]);
+ stars.add([0.3, 0.7]);
+ stars.add([0.7, 0.7]);
+ break;
+ default:
+ printlog('Wrong value for level parameter value: $value');
+ }
+
+ final paint = Paint();
+ paint.strokeJoin = StrokeJoin.round;
+ paint.strokeWidth = 3 / 100 * canvasSize;
+
+ // Stars
+ final textSpan = TextSpan(
+ text: '⭐',
+ style: TextStyle(
+ color: Colors.black,
+ fontSize: canvasSize / 3,
+ fontWeight: FontWeight.bold,
+ ),
+ );
+ final textPainter = TextPainter(
+ text: textSpan,
+ textDirection: TextDirection.ltr,
+ textAlign: TextAlign.center,
+ );
+ textPainter.layout();
+
+ for (var center in stars) {
+ textPainter.paint(
+ canvas,
+ Offset(
+ canvasSize * center[0] - textPainter.width * 0.5,
+ canvasSize * center[1] - textPainter.height * 0.5,
+ ),
+ );
+ }
+ }
+
+ @override
+ bool shouldRepaint(CustomPainter oldDelegate) {
+ return false;
+ }
+}
diff --git a/lib/ui/widgets/game/cell.dart b/lib/ui/widgets/game/cell.dart
index cab827ef7de2ac3cfdb5c7e12225e6935db838ff..d4f7f3477536f69cfbc139c9c6e1f6916e21bbe4 100644
--- a/lib/ui/widgets/game/cell.dart
+++ b/lib/ui/widgets/game/cell.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:minehunter/config/application_config.dart';
import 'package:minehunter/cubit/activity/activity_cubit.dart';
import 'package:minehunter/models/activity/cell.dart';
@@ -90,7 +91,8 @@ class CellWidget extends StatelessWidget {
String getImageAssetName({
required Activity currentActivity,
}) {
- final String skin = currentActivity.globalSettings.skin;
+ final String skin =
+ currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin);
String imageAsset = 'assets/skins/${skin}_tile_unknown.png';
diff --git a/lib/ui/widgets/game/mode_button_toggle.dart b/lib/ui/widgets/game/mode_button_toggle.dart
index ad1b574fc09d65343d700e0e0ebb2593014ad7a1..6448d1b876ff4d74f560ef2ab2a0e6e37862b12c 100644
--- a/lib/ui/widgets/game/mode_button_toggle.dart
+++ b/lib/ui/widgets/game/mode_button_toggle.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:minehunter/config/application_config.dart';
import 'package:minehunter/cubit/activity/activity_cubit.dart';
import 'package:minehunter/models/activity/activity.dart';
@@ -13,7 +14,8 @@ class ToggleGameModeButton extends StatelessWidget {
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
- final String skin = currentActivity.globalSettings.skin;
+ final String skin =
+ currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin);
final String reportModeSuffix = currentActivity.reportMode ? 'on' : 'off';
return TextButton(
diff --git a/lib/ui/widgets/game/mode_indicator_report.dart b/lib/ui/widgets/game/mode_indicator_report.dart
index d9744d0578a79bd5b94c55f31b307dc8295b9f44..a03ad7ea2db2a30cf4d2178d67a3df170e9cb5e7 100644
--- a/lib/ui/widgets/game/mode_indicator_report.dart
+++ b/lib/ui/widgets/game/mode_indicator_report.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:minehunter/config/application_config.dart';
import 'package:minehunter/cubit/activity/activity_cubit.dart';
import 'package:minehunter/models/activity/activity.dart';
@@ -13,7 +14,8 @@ class GameModeIndicatorReport extends StatelessWidget {
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
- final String skin = currentActivity.globalSettings.skin;
+ final String skin =
+ currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin);
final String reportModeSuffix = currentActivity.reportMode ? 'on' : 'off';
final Color buttonColor = currentActivity.reportMode ? Colors.amber : Colors.grey;
diff --git a/lib/ui/widgets/game/mode_indicator_walk.dart b/lib/ui/widgets/game/mode_indicator_walk.dart
index 1b966e9b80145f5ce9341dadd21a2a54df52ad56..252ae70daa7ae7a4b790f8ef836f6c04a53a51e6 100644
--- a/lib/ui/widgets/game/mode_indicator_walk.dart
+++ b/lib/ui/widgets/game/mode_indicator_walk.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:minehunter/config/application_config.dart';
import 'package:minehunter/cubit/activity/activity_cubit.dart';
import 'package:minehunter/models/activity/activity.dart';
@@ -13,7 +14,8 @@ class GameModeIndicatorWalk extends StatelessWidget {
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
- final String skin = currentActivity.globalSettings.skin;
+ final String skin =
+ currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin);
final String reportModeSuffix = currentActivity.reportMode ? 'off' : 'on';
final Color buttonColor = currentActivity.reportMode ? Colors.grey : Colors.amber;
diff --git a/lib/ui/widgets/game/mode_toggle.dart b/lib/ui/widgets/game/mode_toggle.dart
index 1d4003251b4fb1451cc659a3055ced47a2876d4b..d1c997efa8d383f2640625bc6ee05f5fe6ed6ec2 100644
--- a/lib/ui/widgets/game/mode_toggle.dart
+++ b/lib/ui/widgets/game/mode_toggle.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:minehunter/config/application_config.dart';
import 'package:minehunter/cubit/activity/activity_cubit.dart';
import 'package:minehunter/models/activity/activity.dart';
@@ -16,7 +17,8 @@ class ToggleGameMode extends StatelessWidget {
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
- final String skin = currentActivity.globalSettings.skin;
+ final String skin =
+ currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin);
final Image paddingBlock = Image(
image: AssetImage('assets/skins/${skin}_empty.png'),
diff --git a/lib/ui/widgets/indicators/indicator_top.dart b/lib/ui/widgets/indicators/indicator_top.dart
index 1f1bc4f5fed8a1a0e8b5b2172591257ef3deb341..b70b543c65a9cfa14e231d1f9d060ed20abc5d3a 100644
--- a/lib/ui/widgets/indicators/indicator_top.dart
+++ b/lib/ui/widgets/indicators/indicator_top.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:minehunter/config/application_config.dart';
import 'package:minehunter/cubit/activity/activity_cubit.dart';
import 'package:minehunter/models/activity/activity.dart';
@@ -13,7 +14,8 @@ class TopIndicator extends StatelessWidget {
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
- final String skin = currentActivity.globalSettings.skin;
+ final String skin =
+ currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin);
final int flaggedCellsCount = currentActivity.countFlaggedCells();
final int minesCount = currentActivity.minesCount;
diff --git a/pubspec.lock b/pubspec.lock
index 1896dfc3582bc30a9743cfeb6b5a0e3e3b46fcd3..0d7744cbc920c4c2cb00c639e11ef7197325b30e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -122,11 +122,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:
diff --git a/pubspec.yaml b/pubspec.yaml
index b4118e7c1f11b48bedb75035788ed1f040e014dd..519c5ec98c89c116bf25dba7470522dcff36aca2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A minehunter game application.
publish_to: "none"
-version: 0.5.3+50
+version: 0.6.0+51
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
# (none)