diff --git a/fastlane/metadata/android/en-US/changelogs/71.txt b/fastlane/metadata/android/en-US/changelogs/71.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c20ed39173f1690cb6181457fe5d4c6cc0a061ab
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/71.txt
@@ -0,0 +1 @@
+Use ActivityParameters widgets from flutter_custom_toolbox.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/71.txt b/fastlane/metadata/android/fr-FR/changelogs/71.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f732ebd3738d66fdff72e28b0cf0bb4b0684e030
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/71.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 f27238f502b2b6a3d89f98a6d48ba1a30f540cf8..f6e0d8fde3c58c2cec8a90fba7700c33530432a9 100644
--- a/lib/common/config/activity_page.dart
+++ b/lib/common/config/activity_page.dart
@@ -1,18 +1,20 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:puzzlegame/common/ui/pages/game.dart';
-import 'package:puzzlegame/common/ui/pages/parameters.dart';
+import 'package:puzzlegame/cubit/activity/activity_cubit.dart';
+import 'package:puzzlegame/config/application_config.dart';
+import 'package:puzzlegame/models/activity/activity.dart';
+import 'package:puzzlegame/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 +22,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 +54,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 2a78f0fd1a9ae2782bc19f56c88189880a3a20a0..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:puzzlegame/common/cubit/nav/nav_cubit_pages.dart';
-import 'package:puzzlegame/common/ui/parameters/parameter_widget.dart';
-
-import 'package:puzzlegame/config/default_activity_settings.dart';
-import 'package:puzzlegame/config/default_global_settings.dart';
-import 'package:puzzlegame/cubit/activity/activity_cubit.dart';
-import 'package:puzzlegame/cubit/settings/settings_activity_cubit.dart';
-import 'package:puzzlegame/cubit/settings/settings_global_cubit.dart';
-import 'package:puzzlegame/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 015eb0143a693e88f5073123f9f332afcd6f172d..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_painter.dart
+++ /dev/null
@@ -1,111 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puzzlegame/config/default_activity_settings.dart';
-import 'package:puzzlegame/models/settings/settings_activity.dart';
-import 'package:puzzlegame/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.parameterCodeTilesetSize:
- paintTilesetSizeParameterItem(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 paintTilesetSizeParameterItem(
- final Canvas canvas,
- final double size,
- ) {
- final int gridSize = int.parse(value.split('x')[0]);
-
- final paint = Paint();
- paint.strokeJoin = StrokeJoin.round;
- paint.strokeWidth = 3;
-
- // Mini grid
- // TODO: add image
- final borderColor = Colors.grey.shade800;
-
- final drawSize = size * 0.7;
-
- final double cellSize = drawSize / gridSize;
- final double originX = (size - gridSize * cellSize) / 2;
- final double originY = (size - gridSize * cellSize) / 2;
-
- for (int row = 0; row < gridSize; row++) {
- for (int col = 0; col < gridSize; col++) {
- final Offset topLeft = Offset(originX + col * cellSize, originY + row * cellSize);
- final Offset bottomRight = topLeft + Offset(cellSize, cellSize);
-
- paint.color = Colors.grey.shade200;
- 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 0202092ed0679056b39cdfb4c12dc942e8363322..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_widget.dart
+++ /dev/null
@@ -1,120 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puzzlegame/common/ui/parameters/parameter_painter.dart';
-
-import 'package:puzzlegame/config/default_activity_settings.dart';
-import 'package:puzzlegame/config/default_global_settings.dart';
-import 'package:puzzlegame/models/settings/settings_activity.dart';
-import 'package:puzzlegame/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.parameterCodeTilesetSize:
- content = getTilesetSizeParameterItem();
- break;
- case DefaultGlobalSettings.parameterCodeSkin:
- content = getSkinParameterItem();
- break;
- default:
- printlog('Unknown parameter: $code/$value');
- content = getUnknownParameterItem();
- }
-
- 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() {
- return StyledButton.text(
- caption: '$code / $value',
- color: Colors.grey,
- onPressed: null,
- );
- }
-
- Widget getTilesetSizeParameterItem() {
- Color backgroundColor = Colors.grey;
-
- switch (value) {
- case DefaultActivitySettings.tilesetSizeValueSmall:
- backgroundColor = Colors.green;
- break;
- case DefaultActivitySettings.tilesetSizeValueMedium:
- backgroundColor = Colors.orange;
- break;
- case DefaultActivitySettings.tilesetSizeValueLarge:
- backgroundColor = Colors.red;
- break;
- default:
- printlog('Wrong value for size 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() {
- 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 c803b3cbd1ae639cae89be9cc5cc1848ba59cdb3..28ed0965ecd589fbebdc28ce2786b60d6d94b6e1 100644
--- a/lib/config/application_config.dart
+++ b/lib/config/application_config.dart
@@ -1,3 +1,70 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:puzzlegame/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:puzzlegame/cubit/activity/activity_cubit.dart';
+import 'package:puzzlegame/ui/parameters/parameter_painter_tileset_size.dart';
+
class ApplicationConfig {
- static const String appTitle = 'Puzzle';
+ static const String parameterCodeTilesetSize = 'activity.tilesetSize';
+ static const String parameterCodeImageName = 'activity.imageName';
+
+ static const String tilesetSizeValueSmall = '3x3';
+ static const String tilesetSizeValueMedium = '4x4';
+ static const String tilesetSizeValueLarge = '5x5';
+
+ static const String imageNameRandomlyPicked = 'random';
+
+ static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
+ appTitle: 'Puzzle',
+ activitySettings: [
+ // tileset size
+ ApplicationSettingsParameter(
+ code: parameterCodeTilesetSize,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: tilesetSizeValueSmall,
+ color: Colors.green,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: tilesetSizeValueMedium,
+ isDefault: true,
+ color: Colors.orange,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: tilesetSizeValueLarge,
+ color: Colors.red,
+ ),
+ ],
+ customPainter: (context, value) => ParameterPainterTilesetSize(
+ context: context,
+ value: value,
+ ),
+ intValueGetter: (value) => int.parse(value.split('x')[0]),
+ ),
+
+ // image name
+ ApplicationSettingsParameter(
+ code: parameterCodeImageName,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: imageNameRandomlyPicked,
+ isDefault: true,
+ ),
+ ],
+ ),
+ ],
+ 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();
+ },
+ );
}
diff --git a/lib/config/default_activity_settings.dart b/lib/config/default_activity_settings.dart
deleted file mode 100644
index f0c25632edadac6fd73a337b64aebcb91736e5be..0000000000000000000000000000000000000000
--- a/lib/config/default_activity_settings.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultActivitySettings {
- // available game parameters codes
- static const String parameterCodeTilesetSize = 'tilesetSize';
- static const String parameterCodeImageName = 'imageName';
- static const List<String> availableParameters = [
- parameterCodeTilesetSize,
- parameterCodeImageName,
- ];
-
- // tileset size: available values
- static const String tilesetSizeValueSmall = '3x3';
- static const String tilesetSizeValueMedium = '4x4';
- static const String tilesetSizeValueLarge = '5x5';
- static const List<String> allowedTilesetSizeValues = [
- tilesetSizeValueSmall,
- tilesetSizeValueMedium,
- tilesetSizeValueLarge,
- ];
- // tileset size: default value
- static const String defaultTilesetSizeValue = tilesetSizeValueMedium;
-
- // image name: available values
- static const String imageNameRandomlyPicked = 'random';
- static const List<String> allowedImageNameS = [
- imageNameRandomlyPicked,
- ];
- // image name: default value
- static const String defaultImageName = imageNameRandomlyPicked;
-
- // available values from parameter code
- static List<String> getAvailableValues(String parameterCode) {
- switch (parameterCode) {
- case parameterCodeTilesetSize:
- return DefaultActivitySettings.allowedTilesetSizeValues;
- case parameterCodeImageName:
- return DefaultActivitySettings.allowedImageNameS;
- }
-
- printlog('Did not find any available value for game parameter "$parameterCode".');
- return [];
- }
-}
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 f527ca9138a7453eb9b869cb08aa003570d5508d..ed883db3cc9236c4c165cef0eeee65502f364067 100644
--- a/lib/cubit/activity/activity_cubit.dart
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -7,10 +7,9 @@ import 'package:flutter/services.dart' show rootBundle;
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:image/image.dart' as imglib;
+import 'package:puzzlegame/config/application_config.dart';
import 'package:puzzlegame/models/activity/activity.dart';
import 'package:puzzlegame/models/activity/moving_tile.dart';
-import 'package:puzzlegame/models/settings/settings_activity.dart';
-import 'package:puzzlegame/models/settings/settings_global.dart';
part 'activity_state.dart';
@@ -30,7 +29,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,
@@ -50,14 +48,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();
@@ -74,6 +71,10 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
});
}
+ bool canBeResumed() {
+ return state.currentActivity.canBeResumed;
+ }
+
void quitActivity() {
state.currentActivity.isRunning = false;
refresh();
@@ -153,7 +154,8 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
final String imageAsset = 'assets/images/${state.currentActivity.image}.png';
final Uint8List imageData = (await rootBundle.load(imageAsset)).buffer.asUint8List();
- final int tilesCount = state.currentActivity.activitySettings.tilesetSizeValue;
+ final int tilesCount = state.currentActivity.activitySettings
+ .getAsInt(ApplicationConfig.parameterCodeTilesetSize);
final imglib.Image image = imglib.decodeImage(imageData) ??
imglib.Image.fromBytes(
diff --git a/lib/cubit/settings/settings_activity_cubit.dart b/lib/cubit/settings/settings_activity_cubit.dart
deleted file mode 100644
index 4ff017a5ec0fb85c63939ff760e60065b11ee74c..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_activity_cubit.dart
+++ /dev/null
@@ -1,73 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puzzlegame/config/default_activity_settings.dart';
-import 'package:puzzlegame/models/settings/settings_activity.dart';
-
-part 'settings_activity_state.dart';
-
-class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
- ActivitySettingsCubit()
- : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
-
- void setValues({
- String? tilesetSize,
- String? imageName,
- }) {
- emit(
- ActivitySettingsState(
- settings: ActivitySettings(
- tilesetSize: tilesetSize ?? state.settings.tilesetSize,
- imageName: imageName ?? state.settings.imageName,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultActivitySettings.parameterCodeTilesetSize:
- return ActivitySettings.getTilesetSizeValueFromUnsafe(state.settings.tilesetSize);
- case DefaultActivitySettings.parameterCodeImageName:
- return ActivitySettings.getImageNameFromUnsafe(state.settings.imageName);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String tilesetSize = code == DefaultActivitySettings.parameterCodeTilesetSize
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeTilesetSize);
- final String imageName = code == DefaultActivitySettings.parameterCodeImageName
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeImageName);
-
- setValues(
- tilesetSize: tilesetSize,
- imageName: imageName,
- );
- }
-
- @override
- ActivitySettingsState? fromJson(Map<String, dynamic> json) {
- final String tilesetSize =
- json[DefaultActivitySettings.parameterCodeTilesetSize] as String;
- final String imageName = json[DefaultActivitySettings.parameterCodeImageName] as String;
-
- return ActivitySettingsState(
- settings: ActivitySettings(
- tilesetSize: tilesetSize,
- imageName: imageName,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(ActivitySettingsState state) {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeTilesetSize: state.settings.tilesetSize,
- DefaultActivitySettings.parameterCodeImageName: state.settings.imageName,
- };
- }
-}
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 7f78d6223a23045a220bd4a9d58bba65d70a6d49..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:puzzlegame/config/default_global_settings.dart';
-import 'package:puzzlegame/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 f19960ec45c0ae0ee45100f4089c55e67a4aa995..2bef18bed2926e6a4f50f395c3e7bcecb8f106d3 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -9,8 +9,6 @@ import 'package:puzzlegame/common/cubit/nav/nav_cubit_screens.dart';
import 'package:puzzlegame/config/application_config.dart';
import 'package:puzzlegame/cubit/activity/activity_cubit.dart';
-import 'package:puzzlegame/cubit/settings/settings_activity_cubit.dart';
-import 'package:puzzlegame/cubit/settings/settings_global_cubit.dart';
import 'package:puzzlegame/ui/skeleton.dart';
void main() async {
@@ -61,17 +59,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
diff --git a/lib/models/activity/activity.dart b/lib/models/activity/activity.dart
index 5cb54ee0bd2a146a677acc6ce9eca680d9049cc0..8279f54193bc7ef5457e419ecd1a9641200376b4 100644
--- a/lib/models/activity/activity.dart
+++ b/lib/models/activity/activity.dart
@@ -1,15 +1,13 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:puzzlegame/config/application_config.dart';
import 'package:puzzlegame/data/fetch_data_helper.dart';
import 'package:puzzlegame/models/activity/moving_tile.dart';
-import 'package:puzzlegame/models/settings/settings_activity.dart';
-import 'package:puzzlegame/models/settings/settings_global.dart';
class Activity {
Activity({
// Settings
required this.activitySettings,
- required this.globalSettings,
// State
this.isRunning = false,
@@ -30,7 +28,6 @@ class Activity {
// Settings
final ActivitySettings activitySettings;
- final GlobalSettings globalSettings;
// State
bool isRunning;
@@ -50,8 +47,9 @@ class Activity {
factory Activity.createEmpty() {
return Activity(
- activitySettings: ActivitySettings.createDefault(),
- globalSettings: GlobalSettings.createDefault(),
+ // Settings
+ activitySettings: ActivitySettings.createDefault(appConfig: ApplicationConfig.config),
+ // Base data
image: '',
tiles: [],
);
@@ -59,18 +57,15 @@ 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 String image = FetchDataHelper().getRandomItem();
return Activity(
// Settings
activitySettings: newActivitySettings,
- globalSettings: newGlobalSettings,
// Base data
image: image,
);
@@ -85,7 +80,6 @@ class Activity {
printlog('$Activity:');
printlog(' Settings');
activitySettings.dump();
- globalSettings.dump();
printlog(' State');
printlog(' isRunning: $isRunning');
printlog(' isStarted: $isStarted');
@@ -110,7 +104,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 c825a3cf9f8691071cc708e44c8285a036b297ea..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_activity.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puzzlegame/config/default_activity_settings.dart';
-
-class ActivitySettings {
- final String tilesetSize;
- final String imageName;
-
- ActivitySettings({
- required this.tilesetSize,
- required this.imageName,
- });
-
- static String getTilesetSizeValueFromUnsafe(String tilesetSize) {
- if (DefaultActivitySettings.allowedTilesetSizeValues.contains(tilesetSize)) {
- return tilesetSize;
- }
-
- return DefaultActivitySettings.defaultTilesetSizeValue;
- }
-
- static String getImageNameFromUnsafe(String imageName) {
- if (DefaultActivitySettings.allowedImageNameS.contains(imageName)) {
- return imageName;
- }
-
- return DefaultActivitySettings.defaultImageName;
- }
-
- factory ActivitySettings.createDefault() {
- return ActivitySettings(
- tilesetSize: DefaultActivitySettings.defaultTilesetSizeValue,
- imageName: DefaultActivitySettings.defaultImageName,
- );
- }
-
- int get tilesetSizeValue => int.parse(tilesetSize.split('x')[0]);
-
- void dump() {
- printlog('$ActivitySettings:');
- printlog(' ${DefaultActivitySettings.parameterCodeTilesetSize}: $tilesetSize');
- printlog(' ${DefaultActivitySettings.parameterCodeImageName}: $imageName');
- printlog('');
- }
-
- @override
- String toString() {
- return '$ActivitySettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeTilesetSize: tilesetSize,
- DefaultActivitySettings.parameterCodeImageName: imageName,
- };
- }
-}
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
deleted file mode 100644
index 07af8d65f00e14093648abae6fc75d652017b1f9..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_global.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puzzlegame/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_tileset_size.dart b/lib/ui/parameters/parameter_painter_tileset_size.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d94e4f2d3c0802c1d1ed51112e8dcec8ad62dee0
--- /dev/null
+++ b/lib/ui/parameters/parameter_painter_tileset_size.dart
@@ -0,0 +1,55 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+
+class ParameterPainterTilesetSize extends CustomPainter {
+ const ParameterPainterTilesetSize({
+ 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 int gridSize = int.parse(value.split('x')[0]);
+
+ final paint = Paint();
+ paint.strokeJoin = StrokeJoin.round;
+ paint.strokeWidth = 3;
+
+ // Mini grid
+ // TODO: add image
+ final borderColor = Colors.grey.shade800;
+
+ final drawSize = canvasSize * 0.7;
+
+ final double cellSize = drawSize / gridSize;
+ final double originX = (canvasSize - gridSize * cellSize) / 2;
+ final double originY = (canvasSize - gridSize * cellSize) / 2;
+
+ for (int row = 0; row < gridSize; row++) {
+ for (int col = 0; col < gridSize; col++) {
+ final Offset topLeft = Offset(originX + col * cellSize, originY + row * cellSize);
+ final Offset bottomRight = topLeft + Offset(cellSize, cellSize);
+
+ paint.color = Colors.grey.shade200;
+ 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/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
index 288ae07909df8f92e1638c79707220425ed52646..d893958a66dc255a905ccca2b13f66bc73bba9d4 100644
--- a/lib/ui/widgets/game/game_board.dart
+++ b/lib/ui/widgets/game/game_board.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:puzzlegame/config/application_config.dart';
import 'package:puzzlegame/cubit/activity/activity_cubit.dart';
import 'package:puzzlegame/models/activity/activity.dart';
@@ -18,7 +19,8 @@ class GameBoardWidget extends StatelessWidget {
BlocProvider.of<ActivityCubit>(context).updateTileSize(
(MediaQuery.of(context).size.width - 60) /
- currentActivity.activitySettings.tilesetSizeValue);
+ currentActivity.activitySettings
+ .getAsInt(ApplicationConfig.parameterCodeTilesetSize));
if (currentActivity.shufflingInProgress) {
return const GameShufflingWidget();
diff --git a/lib/ui/widgets/game/game_tileset.dart b/lib/ui/widgets/game/game_tileset.dart
index 408d7c7e141c636b62a601678fabeaecb5eb0f3f..19c9566d0328e5e35bc4b2e183135a31b6cdb0e8 100644
--- a/lib/ui/widgets/game/game_tileset.dart
+++ b/lib/ui/widgets/game/game_tileset.dart
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:puzzlegame/config/application_config.dart';
+
import 'package:puzzlegame/cubit/activity/activity_cubit.dart';
import 'package:puzzlegame/models/activity/activity.dart';
import 'package:puzzlegame/models/activity/moving_tile.dart';
@@ -16,7 +18,8 @@ class GameTilesetwidget extends StatelessWidget {
final Activity currentActivity = activityState.currentActivity;
final Color borderColor = currentActivity.isFinished ? Colors.green : Colors.orange;
- final int tilesCount = currentActivity.activitySettings.tilesetSizeValue;
+ final int tilesCount = currentActivity.activitySettings
+ .getAsInt(ApplicationConfig.parameterCodeTilesetSize);
final List<MovingTile> tiles = currentActivity.tiles;
int tileIndex = 0;
diff --git a/pubspec.lock b/pubspec.lock
index 59645eafa1e752f26aebae0be555be5f8b1f8cc6..18484883682783776696b5d799af6603ff9222b8 100644
--- a/pubspec.lock
+++ b/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:
diff --git a/pubspec.yaml b/pubspec.yaml
index 069cc2fc00edd141147d437821d32bb0b9bff283..9e08fa9c7434f0cb7185806c076cb1d1b497a126 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A puzzle game application.
publish_to: "none"
-version: 0.4.2+70
+version: 0.5.0+71
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
image: ^4.1.3