diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c20ed39173f1690cb6181457fe5d4c6cc0a061ab
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/22.txt
@@ -0,0 +1 @@
+Use ActivityParameters widgets from flutter_custom_toolbox.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/22.txt b/fastlane/metadata/android/fr-FR/changelogs/22.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f732ebd3738d66fdff72e28b0cf0bb4b0684e030
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/22.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 4c8959d1f5f042d09b73ee3cf5ab41ed886d07e2..a5f543e57045d31e9386f7b2ed290c4837518e21 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:calculus/common/ui/pages/game.dart';
-import 'package:calculus/common/ui/pages/parameters.dart';
+import 'package:calculus/config/application_config.dart';
+import 'package:calculus/cubit/activity/activity_cubit.dart';
+import 'package:calculus/models/activity/activity.dart';
+import 'package:calculus/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 5b5951816294ac22433d500fcbc949750bf46695..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:calculus/common/cubit/nav/nav_cubit_pages.dart';
-import 'package:calculus/common/ui/parameters/parameter_widget.dart';
-
-import 'package:calculus/config/default_activity_settings.dart';
-import 'package:calculus/config/default_global_settings.dart';
-import 'package:calculus/cubit/activity/activity_cubit.dart';
-import 'package:calculus/cubit/settings/settings_activity_cubit.dart';
-import 'package:calculus/cubit/settings/settings_global_cubit.dart';
-import 'package:calculus/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 4eb3c48d6dac17f94612c901fb8c75676fa4a979..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_painter.dart
+++ /dev/null
@@ -1,135 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:calculus/config/default_activity_settings.dart';
-import 'package:calculus/models/settings/settings_activity.dart';
-import 'package:calculus/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;
- 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,
- ),
- );
- }
- }
-}
diff --git a/lib/common/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
deleted file mode 100644
index 5a2561ad7082666883b59193b26f760dffe3a6b0..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_widget.dart
+++ /dev/null
@@ -1,123 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:calculus/common/ui/parameters/parameter_painter.dart';
-
-import 'package:calculus/config/default_activity_settings.dart';
-import 'package:calculus/config/default_global_settings.dart';
-import 'package:calculus/models/settings/settings_activity.dart';
-import 'package:calculus/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();
- 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 getLevelParameterItem() {
- 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 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 eed43e131f178a57ef61a621bb68d917c50d3bf2..7664fb2ddf7b81a5b0d16c5a7ccc6b94fd0c3450 100644
--- a/lib/config/application_config.dart
+++ b/lib/config/application_config.dart
@@ -1,3 +1,62 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:calculus/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:calculus/cubit/activity/activity_cubit.dart';
+import 'package:calculus/ui/parameters/parameter_painter_difficulty_level.dart';
+
class ApplicationConfig {
- static const String appTitle = 'Calculus';
+ // known parameters
+ static const String parameterCodeDifficultyLevel = 'activity.difficultyLevel';
+
+ // difficulty level values
+ static const String difficultyLevelValueEasy = 'easy';
+ static const String difficultyLevelValueMedium = 'medium';
+ static const String difficultyLevelValueHard = 'hard';
+ static const String difficultyLevelValueNightmare = 'nightmare';
+
+ static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
+ appTitle: 'Calculus',
+ activitySettings: [
+ // 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,
+ ),
+ ),
+ ],
+ 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 9c75e4aebdbab081a670ad2f68c358008d31b839..0000000000000000000000000000000000000000
--- 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 parameterCodeLevel = 'level';
- static const List<String> availableParameters = [
- parameterCodeLevel,
- ];
-
- // 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;
-
- // available values from parameter code
- static List<String> getAvailableValues(String parameterCode) {
- switch (parameterCode) {
- case parameterCodeLevel:
- return DefaultActivitySettings.allowedLevelValues;
- }
-
- 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 88e2274ae767dfb6a82c4109464705eb44b18df4..6858e8ab28e8009b3a22cd061ac96cc05d8a255e 100644
--- a/lib/cubit/activity/activity_cubit.dart
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:calculus/models/activity/activity.dart';
-import 'package:calculus/models/settings/settings_global.dart';
-import 'package:calculus/models/settings/settings_activity.dart';
part 'activity_state.dart';
@@ -23,7 +21,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,
@@ -37,14 +34,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();
@@ -53,6 +49,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 0ba6d3724cbc0bc4641228381e9961f213cc45f8..0000000000000000000000000000000000000000
--- 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:calculus/config/default_activity_settings.dart';
-import 'package:calculus/models/settings/settings_activity.dart';
-
-part 'settings_activity_state.dart';
-
-class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
- ActivitySettingsCubit()
- : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
-
- void setValues({
- String? level,
- }) {
- emit(
- ActivitySettingsState(
- settings: ActivitySettings(
- level: level ?? state.settings.level,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultActivitySettings.parameterCodeLevel:
- return ActivitySettings.getLevelValueFromUnsafe(state.settings.level);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String level = code == DefaultActivitySettings.parameterCodeLevel
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeLevel);
-
- setValues(
- level: level,
- );
- }
-
- @override
- ActivitySettingsState? fromJson(Map<String, dynamic> json) {
- final String level = json[DefaultActivitySettings.parameterCodeLevel] as String;
-
- return ActivitySettingsState(
- settings: ActivitySettings(
- level: level,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(ActivitySettingsState state) {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeLevel: state.settings.level,
- };
- }
-}
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 504af99fca499c6b618cd437de45f2b91fa9634d..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:calculus/config/default_global_settings.dart';
-import 'package:calculus/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 39102243b549206ed439108070804be444280d7f..69bfba82e0a353c1b1992d3ff24e63ba65fb21d1 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -9,8 +9,6 @@ import 'package:calculus/common/cubit/nav/nav_cubit_screens.dart';
import 'package:calculus/config/application_config.dart';
import 'package:calculus/cubit/activity/activity_cubit.dart';
-import 'package:calculus/cubit/settings/settings_activity_cubit.dart';
-import 'package:calculus/cubit/settings/settings_global_cubit.dart';
import 'package:calculus/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 18b4acff22622bc03b0bacae9341f3056b417395..88d70406300bb1c98d8301b520ccc4a57b7f65ec 100644
--- a/lib/models/activity/activity.dart
+++ b/lib/models/activity/activity.dart
@@ -1,13 +1,10 @@
+import 'package:calculus/config/application_config.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:calculus/models/settings/settings_activity.dart';
-import 'package:calculus/models/settings/settings_global.dart';
-
class Activity {
Activity({
// Settings
required this.activitySettings,
- required this.globalSettings,
// State
this.isRunning = false,
@@ -24,7 +21,6 @@ class Activity {
// Settings
final ActivitySettings activitySettings;
- final GlobalSettings globalSettings;
// State
bool isRunning;
@@ -40,24 +36,22 @@ class Activity {
factory Activity.createEmpty() {
return Activity(
- activitySettings: ActivitySettings.createDefault(),
- globalSettings: GlobalSettings.createDefault(),
+ // Settings
+ activitySettings: ActivitySettings.createDefault(appConfig: ApplicationConfig.config),
+ // Base data
items: [],
);
}
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
@@ -76,7 +70,6 @@ class Activity {
printlog('$Activity:');
printlog(' Settings');
activitySettings.dump();
- globalSettings.dump();
printlog(' State');
printlog(' isRunning: $isRunning');
printlog(' isStarted: $isStarted');
@@ -98,7 +91,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 42cc81d9c9805cd05c95576a68ef505aafc4c2da..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_activity.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:calculus/config/default_activity_settings.dart';
-
-class ActivitySettings {
- final String level;
-
- ActivitySettings({
- required this.level,
- });
-
- // Getters to convert String to int
- int get levelValue => int.parse(level);
-
- static String getLevelValueFromUnsafe(String level) {
- if (DefaultActivitySettings.allowedLevelValues.contains(level)) {
- return level;
- }
-
- return DefaultActivitySettings.defaultLevelValue;
- }
-
- factory ActivitySettings.createDefault() {
- return ActivitySettings(
- level: DefaultActivitySettings.defaultLevelValue,
- );
- }
-
- void dump() {
- printlog('$ActivitySettings:');
- printlog(' ${DefaultActivitySettings.parameterCodeLevel}: $level');
- printlog('');
- }
-
- @override
- String toString() {
- return '$ActivitySettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeLevel: level,
- };
- }
-}
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
deleted file mode 100644
index 4aac59c02c7daaa80ad4cebca0550eaedbfb5e28..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_global.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:calculus/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_difficulty_level.dart b/lib/ui/parameters/parameter_painter_difficulty_level.dart
new file mode 100644
index 0000000000000000000000000000000000000000..13924cf324e4a2d27f9a0d2c29cdc9e454d30388
--- /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:calculus/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/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 d5d364710c1fde2fd68672368c86884f50143c38..9f275b41fd24f8867f6885cfc94d085a7ebc5d1c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: calculus application
publish_to: "none"
-version: 0.4.2+21
+version: 0.5.0+22
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)