From 614ca888909e77a271c6d4c9e018cd78cb3197bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Fri, 15 Nov 2024 15:37:00 +0100
Subject: [PATCH] Use ActivityParameters widgets from flutter_custom_toolbox
---
.../metadata/android/en-US/changelogs/28.txt | 1 +
.../metadata/android/fr-FR/changelogs/28.txt | 1 +
lib/common/config/activity_page.dart | 39 +++-
lib/common/ui/pages/parameters.dart | 171 ------------------
.../ui/parameters/parameter_painter.dart | 163 -----------------
.../ui/parameters/parameter_widget.dart | 106 -----------
lib/config/application_config.dart | 70 ++++++-
lib/config/default_activity_settings.dart | 34 ----
lib/config/default_global_settings.dart | 28 ---
lib/cubit/activity/activity_cubit.dart | 18 +-
.../settings/settings_activity_cubit.dart | 61 -------
.../settings/settings_activity_state.dart | 15 --
lib/cubit/settings/settings_global_cubit.dart | 59 ------
lib/cubit/settings/settings_global_state.dart | 15 --
lib/main.dart | 14 +-
lib/models/activity/activity.dart | 17 +-
lib/models/activity/board.dart | 5 +-
lib/models/settings/settings_activity.dart | 42 -----
lib/models/settings/settings_global.dart | 42 -----
lib/{common => }/ui/pages/game.dart | 0
.../parameters/parameter_painter_layout.dart | 107 +++++++++++
lib/ui/widgets/game/tile_widget.dart | 10 +-
pubspec.lock | 6 +-
pubspec.yaml | 4 +-
24 files changed, 240 insertions(+), 788 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/28.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/28.txt
delete mode 100644 lib/common/ui/pages/parameters.dart
delete mode 100644 lib/common/ui/parameters/parameter_painter.dart
delete mode 100644 lib/common/ui/parameters/parameter_widget.dart
delete mode 100644 lib/config/default_activity_settings.dart
delete mode 100644 lib/config/default_global_settings.dart
delete mode 100644 lib/cubit/settings/settings_activity_cubit.dart
delete mode 100644 lib/cubit/settings/settings_activity_state.dart
delete mode 100644 lib/cubit/settings/settings_global_cubit.dart
delete mode 100644 lib/cubit/settings/settings_global_state.dart
delete mode 100644 lib/models/settings/settings_activity.dart
delete mode 100644 lib/models/settings/settings_global.dart
rename lib/{common => }/ui/pages/game.dart (100%)
create mode 100644 lib/ui/parameters/parameter_painter_layout.dart
diff --git a/fastlane/metadata/android/en-US/changelogs/28.txt b/fastlane/metadata/android/en-US/changelogs/28.txt
new file mode 100644
index 0000000..c20ed39
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/28.txt
@@ -0,0 +1 @@
+Use ActivityParameters widgets from flutter_custom_toolbox.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/28.txt b/fastlane/metadata/android/fr-FR/changelogs/28.txt
new file mode 100644
index 0000000..f732ebd
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/28.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 db2308f..c453e96 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:solitaire/common/ui/pages/game.dart';
-import 'package:solitaire/common/ui/pages/parameters.dart';
+import 'package:solitaire/config/application_config.dart';
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/models/activity/activity.dart';
+import 'package:solitaire/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 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 72bfdb8..0000000
--- 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:solitaire/common/cubit/nav/nav_cubit_pages.dart';
-import 'package:solitaire/common/ui/parameters/parameter_widget.dart';
-
-import 'package:solitaire/config/default_activity_settings.dart';
-import 'package:solitaire/config/default_global_settings.dart';
-import 'package:solitaire/cubit/activity/activity_cubit.dart';
-import 'package:solitaire/cubit/settings/settings_activity_cubit.dart';
-import 'package:solitaire/cubit/settings/settings_global_cubit.dart';
-import 'package:solitaire/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 9518b6d..0000000
--- a/lib/common/ui/parameters/parameter_painter.dart
+++ /dev/null
@@ -1,163 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:solitaire/config/default_activity_settings.dart';
-import 'package:solitaire/models/settings/settings_activity.dart';
-import 'package:solitaire/models/settings/settings_global.dart';
-
-import 'package:solitaire/data/game_data.dart';
-import 'package:solitaire/models/activity/board.dart';
-import 'package:solitaire/models/activity/cell.dart';
-import 'package:solitaire/models/activity/cell_location.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.parameterCodeLayout:
- paintLayoutParameterItem(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 paintLayoutParameterItem(
- final Canvas canvas,
- final double size,
- ) {
- {
- Color gridBackgroundColor = Colors.grey;
-
- switch (value) {
- case DefaultActivitySettings.layoutValueFrench:
- gridBackgroundColor = Colors.green;
- break;
- case DefaultActivitySettings.layoutValueGerman:
- gridBackgroundColor = Colors.orange;
- break;
- case DefaultActivitySettings.layoutValueEnglish:
- gridBackgroundColor = Colors.red;
- break;
- case DefaultActivitySettings.layoutValueDiamond:
- gridBackgroundColor = Colors.purple;
- break;
- default:
- printlog('Wrong value for size parameter value: $value');
- }
-
- final paint = Paint();
- paint.strokeJoin = StrokeJoin.round;
- paint.strokeWidth = 3;
-
- // Mini grid
- final borderColor = Colors.grey.shade800;
-
- // Get board data from named templates
- final List<String>? template = GameData.templates[value];
- final BoardCells grid = [];
-
- int row = 0;
- template?.forEach((String line) {
- final List<Cell> gridLine = [];
- int col = 0;
- line.split("").forEach((String tileCode) {
- gridLine.add(tileCode == ' '
- ? Cell.none
- : Cell(
- location: CellLocation.go(row, col),
- hasHole: true,
- hasPeg: (tileCode == 'o'),
- ));
- col++;
- });
- row++;
- grid.add(gridLine);
- });
-
- final int gridWidth = grid.length;
- final int gridHeight = grid.first.length;
- paint.strokeWidth = 2;
-
- final double cellSize = (size * .9) / max(gridWidth, gridHeight);
- final double originX = (size - gridWidth * cellSize) / 2;
- final double originY = (size - gridHeight * cellSize) / 2;
-
- for (int row = 0; row < gridHeight; row++) {
- for (int col = 0; col < gridWidth; col++) {
- final Offset topLeft = Offset(originX + col * cellSize, originY + row * cellSize);
- final Offset bottomRight = topLeft + Offset(cellSize, cellSize);
-
- paint.color = Colors.white;
- paint.style = PaintingStyle.fill;
-
- if (grid[row][col].hasPeg) {
- paint.color = gridBackgroundColor;
- canvas.drawRect(Rect.fromPoints(topLeft, bottomRight), paint);
- }
- if (grid[row][col].hasHole) {
- 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 67990d6..0000000
--- a/lib/common/ui/parameters/parameter_widget.dart
+++ /dev/null
@@ -1,106 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:solitaire/common/ui/parameters/parameter_painter.dart';
-
-import 'package:solitaire/config/default_activity_settings.dart';
-import 'package:solitaire/config/default_global_settings.dart';
-import 'package:solitaire/models/settings/settings_activity.dart';
-import 'package:solitaire/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.parameterCodeLayout:
- content = getLayoutParameterItem();
- 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 getLayoutParameterItem() {
- Color backgroundColor = Colors.grey;
-
- 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 439169a..71a7cf7 100644
--- a/lib/config/application_config.dart
+++ b/lib/config/application_config.dart
@@ -1,3 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:solitaire/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/ui/parameters/parameter_painter_layout.dart';
+
class ApplicationConfig {
- static const String appTitle = 'Solitaire';
+ // skin
+ static const String parameterCodeSkin = 'global.skin';
+ static const String skinValueDefault = 'default';
+
+ // layout
+ static const String parameterCodeLayout = 'layout';
+ static const String layoutValueFrench = 'french';
+ static const String layoutValueGerman = 'german';
+ static const String layoutValueEnglish = 'english';
+ static const String layoutValueDiamond = 'diamond';
+
+ static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
+ appTitle: 'Solitaire',
+ activitySettings: [
+ // skin
+ ApplicationSettingsParameter(
+ code: parameterCodeSkin,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: skinValueDefault,
+ isDefault: true,
+ ),
+ ],
+ ),
+
+ // layout
+ ApplicationSettingsParameter(
+ code: parameterCodeLayout,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: layoutValueFrench,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: layoutValueGerman,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: layoutValueEnglish,
+ isDefault: true,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: layoutValueDiamond,
+ ),
+ ],
+ customPainter: (context, value) => ParameterPainterLayout(
+ 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();
+ },
+ );
}
diff --git a/lib/config/default_activity_settings.dart b/lib/config/default_activity_settings.dart
deleted file mode 100644
index 84c073c..0000000
--- a/lib/config/default_activity_settings.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultActivitySettings {
- // available game parameters codes
- static const String parameterCodeLayout = 'layout';
- static const List<String> availableParameters = [
- parameterCodeLayout,
- ];
-
- // layout: available values
- static const String layoutValueFrench = 'french';
- static const String layoutValueGerman = 'german';
- static const String layoutValueEnglish = 'english';
- static const String layoutValueDiamond = 'diamond';
- static const List<String> allowedLayoutValues = [
- layoutValueFrench,
- layoutValueGerman,
- layoutValueEnglish,
- layoutValueDiamond,
- ];
- // layout: default value
- static const String defaultLayoutValue = layoutValueEnglish;
-
- // available values from parameter code
- static List<String> getAvailableValues(String parameterCode) {
- switch (parameterCode) {
- case parameterCodeLayout:
- return DefaultActivitySettings.allowedLayoutValues;
- }
-
- 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 d92229c..0000000
--- 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 4e658b1..d8cd3d1 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:solitaire/models/activity/cell_location.dart';
import 'package:solitaire/models/activity/activity.dart';
-import 'package:solitaire/models/settings/settings_activity.dart';
-import 'package:solitaire/models/settings/settings_global.dart';
part 'activity_state.dart';
@@ -24,7 +22,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,
@@ -42,14 +39,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();
@@ -62,6 +58,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 c4e4037..0000000
--- a/lib/cubit/settings/settings_activity_cubit.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:solitaire/config/default_activity_settings.dart';
-import 'package:solitaire/models/settings/settings_activity.dart';
-
-part 'settings_activity_state.dart';
-
-class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
- ActivitySettingsCubit()
- : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
-
- void setValues({
- String? layout,
- }) {
- emit(
- ActivitySettingsState(
- settings: ActivitySettings(
- layout: layout ?? state.settings.layout,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultActivitySettings.parameterCodeLayout:
- return ActivitySettings.getLayoutValueFromUnsafe(state.settings.layout);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String layout = code == DefaultActivitySettings.parameterCodeLayout
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeLayout);
-
- setValues(
- layout: layout,
- );
- }
-
- @override
- ActivitySettingsState? fromJson(Map<String, dynamic> json) {
- final String layout = json[DefaultActivitySettings.parameterCodeLayout] as String;
-
- return ActivitySettingsState(
- settings: ActivitySettings(
- layout: layout,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(ActivitySettingsState state) {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeLayout: state.settings.layout,
- };
- }
-}
diff --git a/lib/cubit/settings/settings_activity_state.dart b/lib/cubit/settings/settings_activity_state.dart
deleted file mode 100644
index 2b2de42..0000000
--- 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 2ad66dd..0000000
--- 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:solitaire/config/default_global_settings.dart';
-import 'package:solitaire/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 ebcddd7..0000000
--- 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 a354e80..946cc01 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -8,10 +8,7 @@ import 'package:solitaire/common/cubit/nav/nav_cubit_pages.dart';
import 'package:solitaire/common/cubit/nav/nav_cubit_screens.dart';
import 'package:solitaire/config/application_config.dart';
-import 'package:solitaire/config/default_global_settings.dart';
import 'package:solitaire/cubit/activity/activity_cubit.dart';
-import 'package:solitaire/cubit/settings/settings_activity_cubit.dart';
-import 'package:solitaire/cubit/settings/settings_global_cubit.dart';
import 'package:solitaire/ui/skeleton.dart';
void main() async {
@@ -62,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
@@ -110,7 +104,9 @@ class MyApp extends StatelessWidget {
'peg',
];
- 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 47bf4ff..df6596f 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:solitaire/config/application_config.dart';
import 'package:solitaire/models/activity/board.dart';
import 'package:solitaire/models/activity/cell.dart';
-import 'package:solitaire/models/settings/settings_activity.dart';
-import 'package:solitaire/models/settings/settings_global.dart';
class Activity {
Activity({
// Settings
required this.activitySettings,
- required this.globalSettings,
// State
this.isRunning = false,
@@ -28,7 +26,6 @@ class Activity {
// Settings
final ActivitySettings activitySettings;
- final GlobalSettings globalSettings;
// State
bool isRunning;
@@ -47,8 +44,7 @@ class Activity {
factory Activity.createEmpty() {
return Activity(
// Settings
- activitySettings: ActivitySettings.createDefault(),
- globalSettings: GlobalSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(appConfig: ApplicationConfig.config),
// Base data
board: Board.createEmpty(),
);
@@ -56,16 +52,13 @@ 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);
return Activity(
// Settings
activitySettings: newActivitySettings,
- globalSettings: newGlobalSettings,
// State
isRunning: true,
// Base data
@@ -131,7 +124,6 @@ class Activity {
printlog('$Activity:');
printlog(' Settings');
activitySettings.dump();
- globalSettings.dump();
printlog(' State');
printlog(' isRunning: $isRunning');
printlog(' isStarted: $isStarted');
@@ -155,7 +147,6 @@ class Activity {
return <String, dynamic>{
// Settings
'activitySettings': activitySettings.toJson(),
- 'globalSettings': globalSettings.toJson(),
// State
'isRunning': isRunning,
'isStarted': isStarted,
diff --git a/lib/models/activity/board.dart b/lib/models/activity/board.dart
index a1486a7..30f81d2 100644
--- a/lib/models/activity/board.dart
+++ b/lib/models/activity/board.dart
@@ -1,9 +1,9 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:solitaire/config/application_config.dart';
import 'package:solitaire/data/game_data.dart';
import 'package:solitaire/models/activity/cell.dart';
import 'package:solitaire/models/activity/cell_location.dart';
-import 'package:solitaire/models/settings/settings_activity.dart';
typedef BoardCells = List<List<Cell>>;
@@ -23,7 +23,8 @@ class Board {
factory Board.createNew({
required ActivitySettings activitySettings,
}) {
- final List<String>? template = GameData.templates[activitySettings.layout];
+ final List<String>? template =
+ GameData.templates[activitySettings.get(ApplicationConfig.parameterCodeLayout)];
final BoardCells grid = [];
diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart
deleted file mode 100644
index 637c97d..0000000
--- a/lib/models/settings/settings_activity.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:solitaire/config/default_activity_settings.dart';
-
-class ActivitySettings {
- final String layout;
-
- ActivitySettings({
- required this.layout,
- });
-
- static String getLayoutValueFromUnsafe(String layout) {
- if (DefaultActivitySettings.allowedLayoutValues.contains(layout)) {
- return layout;
- }
-
- return DefaultActivitySettings.defaultLayoutValue;
- }
-
- factory ActivitySettings.createDefault() {
- return ActivitySettings(
- layout: DefaultActivitySettings.defaultLayoutValue,
- );
- }
-
- void dump() {
- printlog('$ActivitySettings:');
- printlog(' ${DefaultActivitySettings.parameterCodeLayout}: $layout');
- printlog('');
- }
-
- @override
- String toString() {
- return '$ActivitySettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeLayout: layout,
- };
- }
-}
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
deleted file mode 100644
index 1b52832..0000000
--- a/lib/models/settings/settings_global.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:solitaire/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_layout.dart b/lib/ui/parameters/parameter_painter_layout.dart
new file mode 100644
index 0000000..b0d9d49
--- /dev/null
+++ b/lib/ui/parameters/parameter_painter_layout.dart
@@ -0,0 +1,107 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:solitaire/config/application_config.dart';
+import 'package:solitaire/data/game_data.dart';
+import 'package:solitaire/models/activity/board.dart';
+import 'package:solitaire/models/activity/cell.dart';
+import 'package:solitaire/models/activity/cell_location.dart';
+
+class ParameterPainterLayout extends CustomPainter {
+ const ParameterPainterLayout({
+ 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);
+
+ Color gridBackgroundColor = Colors.grey;
+
+ switch (value) {
+ case ApplicationConfig.layoutValueFrench:
+ gridBackgroundColor = Colors.green;
+ break;
+ case ApplicationConfig.layoutValueGerman:
+ gridBackgroundColor = Colors.orange;
+ break;
+ case ApplicationConfig.layoutValueEnglish:
+ gridBackgroundColor = Colors.red;
+ break;
+ case ApplicationConfig.layoutValueDiamond:
+ gridBackgroundColor = Colors.purple;
+ break;
+ default:
+ printlog('Wrong value for size parameter value: $value');
+ }
+
+ final paint = Paint();
+ paint.strokeJoin = StrokeJoin.round;
+ paint.strokeWidth = 3;
+
+ // Mini grid
+ final borderColor = Colors.grey.shade800;
+
+ // Get board data from named templates
+ final List<String>? template = GameData.templates[value];
+ final BoardCells grid = [];
+
+ int row = 0;
+ template?.forEach((String line) {
+ final List<Cell> gridLine = [];
+ int col = 0;
+ line.split("").forEach((String tileCode) {
+ gridLine.add(tileCode == ' '
+ ? Cell.none
+ : Cell(
+ location: CellLocation.go(row, col),
+ hasHole: true,
+ hasPeg: (tileCode == 'o'),
+ ));
+ col++;
+ });
+ row++;
+ grid.add(gridLine);
+ });
+
+ final int gridWidth = grid.length;
+ final int gridHeight = grid.first.length;
+ paint.strokeWidth = 2;
+
+ final double cellSize = (canvasSize * .9) / max(gridWidth, gridHeight);
+ final double originX = (canvasSize - gridWidth * cellSize) / 2;
+ final double originY = (canvasSize - gridHeight * cellSize) / 2;
+
+ for (int row = 0; row < gridHeight; row++) {
+ for (int col = 0; col < gridWidth; col++) {
+ final Offset topLeft = Offset(originX + col * cellSize, originY + row * cellSize);
+ final Offset bottomRight = topLeft + Offset(cellSize, cellSize);
+
+ paint.color = Colors.white;
+ paint.style = PaintingStyle.fill;
+
+ if (grid[row][col].hasPeg) {
+ paint.color = gridBackgroundColor;
+ canvas.drawRect(Rect.fromPoints(topLeft, bottomRight), paint);
+ }
+ if (grid[row][col].hasHole) {
+ 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/tile_widget.dart b/lib/ui/widgets/game/tile_widget.dart
index 93ca8ee..7050ddd 100644
--- a/lib/ui/widgets/game/tile_widget.dart
+++ b/lib/ui/widgets/game/tile_widget.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:solitaire/config/application_config.dart';
import 'package:solitaire/cubit/activity/activity_cubit.dart';
import 'package:solitaire/models/activity/cell.dart';
@@ -28,7 +29,8 @@ class TileWidget extends StatelessWidget {
);
} else {
return Image(
- image: AssetImage('assets/skins/${currentActivity.globalSettings.skin}_board.png'),
+ image: AssetImage(
+ 'assets/skins/${currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin)}_board.png'),
width: tileSize,
height: tileSize,
fit: BoxFit.fill,
@@ -65,7 +67,8 @@ class TileWidget extends StatelessWidget {
required Activity currentActivity,
required ActivityCubit activityCubit,
}) {
- String image = 'assets/skins/${currentActivity.globalSettings.skin}_hole.png';
+ String image =
+ 'assets/skins/${currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin)}_hole.png';
return DragTarget<List<int>>(
builder: (
@@ -121,7 +124,8 @@ class TileWidget extends StatelessWidget {
Widget peg({
required Activity currentActivity,
}) {
- String image = 'assets/skins/${currentActivity.globalSettings.skin}_peg.png';
+ String image =
+ 'assets/skins/${currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin)}_peg.png';
return Image(
image: AssetImage(image),
diff --git a/pubspec.lock b/pubspec.lock
index 1896dfc..0d7744c 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 5faff9b..5307799 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Solitaire Game
publish_to: "none"
-version: 0.4.2+27
+version: 0.5.0+28
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)
--
GitLab