diff --git a/fastlane/metadata/android/en-US/changelogs/37.txt b/fastlane/metadata/android/en-US/changelogs/37.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c20ed39173f1690cb6181457fe5d4c6cc0a061ab
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/37.txt
@@ -0,0 +1 @@
+Use ActivityParameters widgets from flutter_custom_toolbox.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/37.txt b/fastlane/metadata/android/fr-FR/changelogs/37.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f732ebd3738d66fdff72e28b0cf0bb4b0684e030
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/37.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 9a1c8a95601b851448824993c61db0a5b18e061d..8dc843a1f0991943a30a85a7d9bdfb79b23e89d1 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:sortgame/common/ui/pages/game.dart';
-import 'package:sortgame/common/ui/pages/parameters.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/config/application_config.dart';
+import 'package:sortgame/models/activity/activity.dart';
+import 'package:sortgame/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 b570778415af89cb54fd35b0d56fedae085b9c1c..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:sortgame/common/cubit/nav/nav_cubit_pages.dart';
-import 'package:sortgame/common/ui/parameters/parameter_widget.dart';
-
-import 'package:sortgame/config/default_activity_settings.dart';
-import 'package:sortgame/config/default_global_settings.dart';
-import 'package:sortgame/cubit/activity/activity_cubit.dart';
-import 'package:sortgame/cubit/settings/settings_activity_cubit.dart';
-import 'package:sortgame/cubit/settings/settings_global_cubit.dart';
-import 'package:sortgame/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 3d24c238a8cd3caaaa0d9c7467e1dcf9f63eb5e1..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_painter.dart
+++ /dev/null
@@ -1,71 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:sortgame/models/settings/settings_activity.dart';
-import 'package:sortgame/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) {
- 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,
- ),
- );
- }
-}
diff --git a/lib/common/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
deleted file mode 100644
index b00ab5c2e97248230533a00ac49a0901eaabdafc..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_widget.dart
+++ /dev/null
@@ -1,121 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:sortgame/config/default_activity_settings.dart';
-import 'package:sortgame/config/default_global_settings.dart';
-import 'package:sortgame/models/settings/settings_activity.dart';
-import 'package:sortgame/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.parameterCodeItemsCount:
- content = getItemsCountParameterItem();
- break;
- case DefaultActivitySettings.parameterCodeThemeCode:
- content = getCodeThemeParameterItem();
- 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 getItemsCountParameterItem() {
- Color backgroundColor = Colors.grey;
-
- switch (value) {
- case DefaultActivitySettings.itemsCountValueLow:
- backgroundColor = Colors.green;
- break;
- case DefaultActivitySettings.itemsCountValueMedium:
- backgroundColor = Colors.orange;
- break;
- case DefaultActivitySettings.itemsCountValueHigh:
- backgroundColor = Colors.red;
- break;
- case DefaultActivitySettings.itemsCountValueVeryHigh:
- backgroundColor = Colors.purple;
- break;
- default:
- printlog('Wrong value for itemsCount parameter value: $value');
- }
-
- return StyledButton.text(
- caption: value,
- color: backgroundColor,
- onPressed: onPressed,
- );
- }
-
- Widget getCodeThemeParameterItem() {
- final Color backgroundColor = Color((value.hashCode * 0xFFFFFF).toInt()).withOpacity(1.0);
-
- return StyledButton.text(
- caption: value,
- color: backgroundColor,
- onPressed: onPressed,
- );
- }
-
- Widget getSkinParameterItem() {
- return StyledButton.text(
- caption: '$code/$value',
- color: Colors.green.shade800,
- onPressed: onPressed,
- );
- }
-}
diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart
index 480b435c6cdacf1f52af94ae7b716f14ada5be17..12f59ff87f0cd18d43f6276d3fa1d90834ffb9a6 100644
--- a/lib/config/application_config.dart
+++ b/lib/config/application_config.dart
@@ -1,3 +1,77 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:sortgame/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/data/fetch_data_helper.dart';
+
class ApplicationConfig {
- static const String appTitle = 'SortGame';
+ static const String parameterCodeItemsCount = 'itemsCount';
+ static const String parameterCodeThemeCode = 'themeCode';
+
+ static const String itemsCountValueLow = '5';
+ static const String itemsCountValueMedium = '10';
+ static const String itemsCountValueHigh = '15';
+ static const String itemsCountValueVeryHigh = '20';
+
+ static List<ApplicationSettingsParameterItemValue> getThemeCodes() {
+ List<ApplicationSettingsParameterItemValue> list = [];
+
+ FetchDataHelper().getThemesCodes().forEach((String themeCode) {
+ list.add(ApplicationSettingsParameterItemValue(
+ value: themeCode,
+ color: Color((themeCode.hashCode * 0xFFFFFF).toInt()).withOpacity(1.0),
+ isDefault: true,
+ ));
+ });
+
+ return list;
+ }
+
+ static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
+ appTitle: 'SortGame',
+ activitySettings: [
+ // items count
+ ApplicationSettingsParameter(
+ code: parameterCodeItemsCount,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: itemsCountValueLow,
+ color: Colors.green,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: itemsCountValueMedium,
+ color: Colors.orange,
+ isDefault: true,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: itemsCountValueHigh,
+ color: Colors.red,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: itemsCountValueVeryHigh,
+ color: Colors.purple,
+ ),
+ ],
+ ),
+
+ // theme code
+ ApplicationSettingsParameter(
+ code: parameterCodeThemeCode,
+ values: getThemeCodes(),
+ ),
+ ],
+ 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 4605501b80487974b1ccd5707599171e5325d5e4..0000000000000000000000000000000000000000
--- a/lib/config/default_activity_settings.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:sortgame/data/fetch_data_helper.dart';
-
-class DefaultActivitySettings {
- // available game parameters codes
- static const String parameterCodeItemsCount = 'itemsCount';
- static const String parameterCodeThemeCode = 'themeCode';
- static const List<String> availableParameters = [
- parameterCodeItemsCount,
- parameterCodeThemeCode,
- ];
-
- // items count: available values
- static const String itemsCountValueLow = '5';
- static const String itemsCountValueMedium = '10';
- static const String itemsCountValueHigh = '15';
- static const String itemsCountValueVeryHigh = '20';
- static const List<String> allowedItemsCountValues = [
- itemsCountValueLow,
- itemsCountValueMedium,
- itemsCountValueHigh,
- itemsCountValueVeryHigh,
- ];
- // items count: default value
- static const String defaultItemsCountValue = itemsCountValueMedium;
-
- // theme code: available values
- static List<String> allowedThemeCodeValues = FetchDataHelper().getThemesCodes();
- // theme code: default value
- static const String defaultThemeCodeValue = '';
-
- // available values from parameter code
- static List<String> getAvailableValues(String parameterCode) {
- switch (parameterCode) {
- case parameterCodeItemsCount:
- return DefaultActivitySettings.allowedItemsCountValues;
- case parameterCodeThemeCode:
- return DefaultActivitySettings.allowedThemeCodeValues;
- }
-
- 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 d24764e1d4472d2bccb5d126c6dc5a23d6fb0295..229b1b549eb4528021ed435e7cb21544240bd29a 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:sortgame/models/activity/activity.dart';
-import 'package:sortgame/models/settings/settings_activity.dart';
-import 'package:sortgame/models/settings/settings_global.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,
@@ -40,14 +37,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();
@@ -56,6 +52,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 2fba6c68a366cdf534487c1e484e957fce1820a1..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_activity_cubit.dart
+++ /dev/null
@@ -1,72 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:sortgame/config/default_activity_settings.dart';
-import 'package:sortgame/models/settings/settings_activity.dart';
-
-part 'settings_activity_state.dart';
-
-class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
- ActivitySettingsCubit()
- : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
-
- void setValues({
- String? itemsCount,
- String? themeCode,
- }) {
- emit(
- ActivitySettingsState(
- settings: ActivitySettings(
- itemsCount: itemsCount ?? state.settings.itemsCount,
- themeCode: themeCode ?? state.settings.themeCode,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultActivitySettings.parameterCodeItemsCount:
- return ActivitySettings.getItemsCountValueFromUnsafe(state.settings.itemsCount);
- case DefaultActivitySettings.parameterCodeThemeCode:
- return ActivitySettings.getThemeValueFromUnsafe(state.settings.themeCode);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String itemsCount = code == DefaultActivitySettings.parameterCodeItemsCount
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeItemsCount);
- final String themeCode = code == DefaultActivitySettings.parameterCodeThemeCode
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeThemeCode);
-
- setValues(
- itemsCount: itemsCount,
- themeCode: themeCode,
- );
- }
-
- @override
- ActivitySettingsState? fromJson(Map<String, dynamic> json) {
- final String itemsCount = json[DefaultActivitySettings.parameterCodeItemsCount] as String;
- final String themeCode = json[DefaultActivitySettings.parameterCodeThemeCode] as String;
-
- return ActivitySettingsState(
- settings: ActivitySettings(
- itemsCount: itemsCount,
- themeCode: themeCode,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(ActivitySettingsState state) {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeItemsCount: state.settings.itemsCount,
- DefaultActivitySettings.parameterCodeThemeCode: state.settings.themeCode,
- };
- }
-}
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 ee834629bed4a5c5f47a9acf2c5648d91501e17e..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:sortgame/config/default_global_settings.dart';
-import 'package:sortgame/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/data/fetch_data_helper.dart b/lib/data/fetch_data_helper.dart
index e573a3b13015963c326124b981cc371db9e65913..e30249ff38a7e669bcd1cee5117967f36f8ee745 100644
--- a/lib/data/fetch_data_helper.dart
+++ b/lib/data/fetch_data_helper.dart
@@ -1,11 +1,11 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:sortgame/config/application_config.dart';
import 'package:sortgame/data/game_data.dart';
import 'package:sortgame/models/data/category.dart';
import 'package:sortgame/models/data/game_item.dart';
import 'package:sortgame/models/data/game_theme.dart';
import 'package:sortgame/models/data/item.dart';
-import 'package:sortgame/models/settings/settings_activity.dart';
class FetchDataHelper {
FetchDataHelper();
@@ -96,8 +96,9 @@ class FetchDataHelper {
init();
}
- final int count = int.parse(activitySettings.itemsCount);
- final String themeCode = activitySettings.themeCode;
+ final int count =
+ int.parse(activitySettings.get(ApplicationConfig.parameterCodeItemsCount));
+ final String themeCode = activitySettings.get(ApplicationConfig.parameterCodeThemeCode);
List<GameItem> items = _mapping;
diff --git a/lib/main.dart b/lib/main.dart
index f40113da27aa93092e00d437c85505ae318f7a5b..1f9168d84d7d0539e45d144ce709a7b478dd82ba 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -9,8 +9,6 @@ import 'package:sortgame/common/cubit/nav/nav_cubit_screens.dart';
import 'package:sortgame/config/application_config.dart';
import 'package:sortgame/cubit/activity/activity_cubit.dart';
-import 'package:sortgame/cubit/settings/settings_activity_cubit.dart';
-import 'package:sortgame/cubit/settings/settings_global_cubit.dart';
import 'package:sortgame/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 3122af03174d5311110f8a43333ed40b69495b48..b9577c5a7d7a3d4d4c9cc0e72c3ecc36d81a214c 100644
--- a/lib/models/activity/activity.dart
+++ b/lib/models/activity/activity.dart
@@ -1,15 +1,14 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:sortgame/config/application_config.dart';
+
import 'package:sortgame/data/fetch_data_helper.dart';
import 'package:sortgame/models/data/game_item.dart';
-import 'package:sortgame/models/settings/settings_activity.dart';
-import 'package:sortgame/models/settings/settings_global.dart';
class Activity {
Activity({
// Settings
required this.activitySettings,
- required this.globalSettings,
// State
this.isRunning = false,
@@ -27,7 +26,6 @@ class Activity {
// Settings
final ActivitySettings activitySettings;
- final GlobalSettings globalSettings;
// State
bool isRunning;
@@ -45,8 +43,7 @@ class Activity {
factory Activity.createEmpty() {
return Activity(
// Settings
- activitySettings: ActivitySettings.createDefault(),
- globalSettings: GlobalSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(appConfig: ApplicationConfig.config),
// Base data
items: [],
);
@@ -54,18 +51,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 List<GameItem> items = FetchDataHelper().getItems(newActivitySettings);
return Activity(
// Settings
activitySettings: newActivitySettings,
- globalSettings: newGlobalSettings,
// State
isRunning: true,
// Base data
@@ -104,7 +98,6 @@ class Activity {
printlog('$Activity:');
printlog(' Settings');
activitySettings.dump();
- globalSettings.dump();
printlog(' State');
printlog(' isRunning: $isRunning');
printlog(' isStarted: $isStarted');
@@ -127,7 +120,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 0b6179f19aad09a1187c2477d8b4d679fcde0864..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_activity.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:sortgame/config/default_activity_settings.dart';
-
-class ActivitySettings {
- final String itemsCount;
- final String themeCode;
-
- ActivitySettings({
- required this.itemsCount,
- required this.themeCode,
- });
-
- static String getItemsCountValueFromUnsafe(String itemsCount) {
- if (DefaultActivitySettings.allowedItemsCountValues.contains(itemsCount)) {
- return itemsCount;
- }
-
- return DefaultActivitySettings.defaultItemsCountValue;
- }
-
- static String getThemeValueFromUnsafe(String themeCode) {
- if (DefaultActivitySettings.getAvailableValues(
- DefaultActivitySettings.parameterCodeThemeCode)
- .contains(themeCode)) {
- return themeCode;
- }
-
- return DefaultActivitySettings.defaultThemeCodeValue;
- }
-
- factory ActivitySettings.createDefault() {
- return ActivitySettings(
- itemsCount: DefaultActivitySettings.defaultItemsCountValue,
- themeCode: DefaultActivitySettings.defaultThemeCodeValue,
- );
- }
-
- void dump() {
- printlog('$ActivitySettings:');
- printlog(' itemsCount: $itemsCount');
- printlog(' themeCode: $themeCode');
- printlog('');
- }
-
- @override
- String toString() {
- return '$ActivitySettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeItemsCount: itemsCount,
- DefaultActivitySettings.parameterCodeThemeCode: themeCode,
- };
- }
-}
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
deleted file mode 100644
index e588991923934d91b0b629a9524a9728ff691ba2..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_global.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:sortgame/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/widgets/indicators/indicator_position.dart b/lib/ui/widgets/indicators/indicator_position.dart
index f59012bdef908955df74f7a86cf44bb7b3d0953e..284455938bfea3b4208ce4a12d7ef4cc673c7dd8 100644
--- a/lib/ui/widgets/indicators/indicator_position.dart
+++ b/lib/ui/widgets/indicators/indicator_position.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:sortgame/config/application_config.dart';
import 'package:sortgame/cubit/activity/activity_cubit.dart';
import 'package:sortgame/models/activity/activity.dart';
@@ -14,8 +15,9 @@ class PositionIndicator extends StatelessWidget {
final Activity currentActivity = activityState.currentActivity;
// Normalized [0..1] value
- final double barValue =
- currentActivity.position / int.parse(currentActivity.activitySettings.itemsCount);
+ final double barValue = currentActivity.position /
+ int.parse(currentActivity.activitySettings
+ .get(ApplicationConfig.parameterCodeItemsCount));
const Color baseColor = Color.fromARGB(255, 215, 1, 133);
@@ -35,7 +37,7 @@ class PositionIndicator extends StatelessWidget {
),
OutlinedText(
text:
- '${currentActivity.position}/${currentActivity.activitySettings.itemsCount}',
+ '${currentActivity.position}/${currentActivity.activitySettings.get(ApplicationConfig.parameterCodeItemsCount)}',
fontSize: 0.9 * barHeight,
textColor: textColor,
outlineColor: outlineColor,
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 519402dfd7a2a06d1b189d00811d8f7b101407a2..a531895de0cfa39b89ab3c7776596a8f2533f40d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A sorting game application.
publish_to: "none"
-version: 0.4.2+36
+version: 0.5.0+37
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)