diff --git a/fastlane/metadata/android/en-US/changelogs/74.txt b/fastlane/metadata/android/en-US/changelogs/74.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c20ed39173f1690cb6181457fe5d4c6cc0a061ab
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/74.txt
@@ -0,0 +1 @@
+Use ActivityParameters widgets from flutter_custom_toolbox.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/74.txt b/fastlane/metadata/android/fr-FR/changelogs/74.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f732ebd3738d66fdff72e28b0cf0bb4b0684e030
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/74.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 895d17101b3572637f8c67353ad552ecadb80e4a..49878098745b2aac7be9cbfe83892e39ce8d3333 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:wordguessing/common/ui/pages/game.dart';
-import 'package:wordguessing/common/ui/pages/parameters.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
+import 'package:wordguessing/config/application_config.dart';
+import 'package:wordguessing/models/activity/activity.dart';
+import 'package:wordguessing/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 51e4aa9b9f573a12208744824e0ea7dd899b39d6..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:wordguessing/common/cubit/nav/nav_cubit_pages.dart';
-import 'package:wordguessing/common/ui/parameters/parameter_widget.dart';
-
-import 'package:wordguessing/config/default_activity_settings.dart';
-import 'package:wordguessing/config/default_global_settings.dart';
-import 'package:wordguessing/cubit/activity/activity_cubit.dart';
-import 'package:wordguessing/cubit/settings/settings_activity_cubit.dart';
-import 'package:wordguessing/cubit/settings/settings_global_cubit.dart';
-import 'package:wordguessing/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 0d37a6d612c06662f586e07c6deb4b00e925fda0..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:wordguessing/models/settings/settings_activity.dart';
-import 'package:wordguessing/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 f4320d747ea0e4d9c21bfbc27de418f31cfe83aa..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_widget.dart
+++ /dev/null
@@ -1,114 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:wordguessing/config/default_activity_settings.dart';
-import 'package:wordguessing/models/settings/settings_activity.dart';
-import 'package:wordguessing/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.parameterCodeGameType:
- content = getGameTypeParameterItem();
- break;
- case DefaultActivitySettings.parameterCodeLangValue:
- content = getLangValueParameterItem();
- 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 getGameTypeParameterItem() {
- const Color backgroundColor = Colors.teal;
-
- return StyledButton(
- color: backgroundColor,
- onPressed: onPressed,
- child: Image(
- image: AssetImage(
- 'assets/ui/${DefaultActivitySettings.parameterCodeGameType}_$value.png'),
- fit: BoxFit.fill,
- ),
- );
- }
-
- Widget getLangValueParameterItem() {
- const Color backgroundColor = Colors.teal;
-
- String text = '';
-
- switch (value) {
- case DefaultActivitySettings.langValueFr:
- text = '🇫🇷';
- break;
- case DefaultActivitySettings.langValueEn:
- text = '🇬🇧';
- break;
- default:
- printlog('Wrong value for lang parameter value: $value');
- }
-
- return StyledButton(
- color: backgroundColor,
- onPressed: onPressed,
- child: Text(
- text,
- style: TextStyle(
- fontSize: 70,
- ),
- ),
- );
- }
-}
diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart
index 6cbf8d2f5a42969453f21dedb904b073e3e804e6..d07bd44f020883b558023d727be60f5e03855c98 100644
--- a/lib/config/application_config.dart
+++ b/lib/config/application_config.dart
@@ -1,3 +1,99 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:wordguessing/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
+
class ApplicationConfig {
- static const String appTitle = 'Words Game';
+ // game type
+ static const String parameterCodeGameType = 'type';
+ static const String gameTypeValuePickWord = 'pick-word';
+ static const String gameTypeValuePickImage = 'pick-image';
+
+ // language
+ static const String parameterCodeLangValue = 'lang';
+ static const String langValueFr = 'fr';
+ static const String langValueEn = 'en';
+
+ static const int itemsCount = 4;
+ static const int recentWordsCount = 20;
+
+ static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
+ appTitle: 'Words Game',
+ activitySettings: [
+ // game type
+ ApplicationSettingsParameter(
+ code: parameterCodeGameType,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: gameTypeValuePickWord,
+ isDefault: true,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: gameTypeValuePickImage,
+ ),
+ ],
+ builder: ({
+ required context,
+ required itemValue,
+ required onPressed,
+ required size,
+ }) =>
+ StyledButton(
+ color: Colors.teal,
+ onPressed: onPressed,
+ child: Image(
+ image: AssetImage('assets/ui/type_${itemValue.value}.png'),
+ fit: BoxFit.fill,
+ ),
+ ),
+ ),
+
+ // lang
+ ApplicationSettingsParameter(
+ code: parameterCodeLangValue,
+ values: [
+ ApplicationSettingsParameterItemValue(
+ value: langValueFr,
+ color: Colors.teal,
+ text: '🇫🇷',
+ isDefault: true,
+ ),
+ ApplicationSettingsParameterItemValue(
+ value: langValueEn,
+ color: Colors.teal,
+ text: '🇬🇧',
+ ),
+ ],
+ builder: ({
+ required context,
+ required itemValue,
+ required onPressed,
+ required size,
+ }) =>
+ StyledButton(
+ color: Colors.teal,
+ onPressed: onPressed,
+ child: Text(
+ itemValue.text ?? '',
+ style: TextStyle(
+ fontSize: 50,
+ ),
+ ),
+ ),
+ ),
+ ],
+ 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 4b1971a9ef4f2d1f514c390cd875ba634f363aad..0000000000000000000000000000000000000000
--- a/lib/config/default_activity_settings.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultActivitySettings {
- // available game parameters codes
- static const String parameterCodeGameType = 'type';
- static const String parameterCodeLangValue = 'lang';
- static const List<String> availableParameters = [
- parameterCodeGameType,
- parameterCodeLangValue,
- ];
-
- // game type: available values
- static const String gameTypeValuePickWord = 'pick-word';
- static const String gameTypeValuePickImage = 'pick-image';
- static const List<String> allowedGameTypeValues = [
- gameTypeValuePickWord,
- gameTypeValuePickImage,
- ];
- // game type: default value
- static const String defaultGameTypeValue = gameTypeValuePickWord;
-
- // lang: available values
- static const String langValueFr = 'fr';
- static const String langValueEn = 'en';
- static const List<String> allowedLangValues = [
- langValueFr,
- langValueEn,
- ];
- // lang: default value
- static const String defaultLangValue = langValueFr;
-
- // available values from parameter code
- static List<String> getAvailableValues(String parameterCode) {
- switch (parameterCode) {
- case parameterCodeGameType:
- return DefaultActivitySettings.allowedGameTypeValues;
- case parameterCodeLangValue:
- return DefaultActivitySettings.allowedLangValues;
- }
-
- printlog('Did not find any available value for game parameter "$parameterCode".');
- return [];
- }
-
- static const int itemsCount = 4;
- static const int recentWordsCount = 20;
-}
diff --git a/lib/config/default_global_settings.dart b/lib/config/default_global_settings.dart
deleted file mode 100644
index d92229c2e02064684ed4a2caeb272ff63325776a..0000000000000000000000000000000000000000
--- a/lib/config/default_global_settings.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultGlobalSettings {
- // available global parameters codes
- static const String parameterCodeSkin = 'skin';
- static const List<String> availableParameters = [
- parameterCodeSkin,
- ];
-
- // skin: available values
- static const String skinValueDefault = 'default';
- static const List<String> allowedSkinValues = [
- skinValueDefault,
- ];
- // skin: default value
- static const String defaultSkinValue = skinValueDefault;
-
- // available values from parameter code
- static List<String> getAvailableValues(String parameterCode) {
- switch (parameterCode) {
- case parameterCodeSkin:
- return DefaultGlobalSettings.allowedSkinValues;
- }
-
- printlog('Did not find any available value for global parameter "$parameterCode".');
- return [];
- }
-}
diff --git a/lib/cubit/activity/activity_cubit.dart b/lib/cubit/activity/activity_cubit.dart
index b0e6f6fd3f2fcd7dfbc2a62cf027a1585aefe021..b10c8cc651390984f32551b8de8ac84553e428cf 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:wordguessing/models/activity/activity.dart';
-import 'package:wordguessing/models/settings/settings_activity.dart';
-import 'package:wordguessing/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,
@@ -44,14 +41,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,
);
updateState(newActivity);
@@ -63,6 +59,10 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
refresh();
}
+ bool canBeResumed() {
+ return state.currentActivity.canBeResumed;
+ }
+
void quitActivity() {
state.currentActivity.isRunning = false;
refresh();
diff --git a/lib/cubit/settings/settings_activity_cubit.dart b/lib/cubit/settings/settings_activity_cubit.dart
deleted file mode 100644
index e6ebce1e5fd0c97cceb59c17f72a3c8ccb333aa2..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:wordguessing/config/default_activity_settings.dart';
-import 'package:wordguessing/models/settings/settings_activity.dart';
-
-part 'settings_activity_state.dart';
-
-class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
- ActivitySettingsCubit()
- : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
-
- void setValues({
- String? gameType,
- String? lang,
- }) {
- emit(
- ActivitySettingsState(
- settings: ActivitySettings(
- gameType: gameType ?? state.settings.gameType,
- lang: lang ?? state.settings.lang,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultActivitySettings.parameterCodeGameType:
- return ActivitySettings.getGameTypeValueFromUnsafe(state.settings.gameType);
- case DefaultActivitySettings.parameterCodeLangValue:
- return ActivitySettings.getLangValueFromUnsafe(state.settings.lang);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String gameType = code == DefaultActivitySettings.parameterCodeGameType
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeGameType);
- final String lang = code == DefaultActivitySettings.parameterCodeLangValue
- ? value
- : getParameterValue(DefaultActivitySettings.parameterCodeLangValue);
-
- setValues(
- gameType: gameType,
- lang: lang,
- );
- }
-
- @override
- ActivitySettingsState? fromJson(Map<String, dynamic> json) {
- final String gameType = json[DefaultActivitySettings.parameterCodeGameType] as String;
- final String lang = json[DefaultActivitySettings.parameterCodeLangValue] as String;
-
- return ActivitySettingsState(
- settings: ActivitySettings(
- gameType: gameType,
- lang: lang,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(ActivitySettingsState state) {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeGameType: state.settings.gameType,
- DefaultActivitySettings.parameterCodeLangValue: state.settings.lang,
- };
- }
-}
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 e3408cf4fbba375dfba41889ec29dd1ca12b098b..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:wordguessing/config/default_global_settings.dart';
-import 'package:wordguessing/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 8eccf096ed5496d16dcd9cd0f3792acc4cbef263..30c685e4b483a30519dbd5bd09ad6b214e4dc14e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -8,10 +8,7 @@ import 'package:wordguessing/common/cubit/nav/nav_cubit_pages.dart';
import 'package:wordguessing/common/cubit/nav/nav_cubit_screens.dart';
import 'package:wordguessing/config/application_config.dart';
-import 'package:wordguessing/config/default_activity_settings.dart';
import 'package:wordguessing/cubit/activity/activity_cubit.dart';
-import 'package:wordguessing/cubit/settings/settings_activity_cubit.dart';
-import 'package:wordguessing/cubit/settings/settings_global_cubit.dart';
import 'package:wordguessing/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
@@ -100,10 +94,6 @@ class MyApp extends StatelessWidget {
'placeholder',
];
- for (String gameType in DefaultActivitySettings.allowedGameTypeValues) {
- gameImages.add('${DefaultActivitySettings.parameterCodeGameType}_$gameType');
- }
-
for (String image in gameImages) {
assets.add('assets/ui/$image.png');
}
diff --git a/lib/models/activity/activity.dart b/lib/models/activity/activity.dart
index a28927fb00e60a2347554575eaa45d28b36c4187..2753fd0b9b52c3d41195ef1eedc5c7f3f2cb5603 100644
--- a/lib/models/activity/activity.dart
+++ b/lib/models/activity/activity.dart
@@ -1,16 +1,13 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/config/default_activity_settings.dart';
+import 'package:wordguessing/config/application_config.dart';
import 'package:wordguessing/data/fetch_data_helper.dart';
import 'package:wordguessing/models/data/word.dart';
-import 'package:wordguessing/models/settings/settings_activity.dart';
-import 'package:wordguessing/models/settings/settings_global.dart';
class Activity {
Activity({
// Settings
required this.activitySettings,
- required this.globalSettings,
// State
this.isRunning = false,
@@ -32,7 +29,6 @@ class Activity {
// Settings
final ActivitySettings activitySettings;
- final GlobalSettings globalSettings;
// State
bool isRunning;
@@ -54,8 +50,7 @@ class Activity {
factory Activity.createEmpty() {
return Activity(
// Settings
- activitySettings: ActivitySettings.createDefault(),
- globalSettings: GlobalSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(appConfig: ApplicationConfig.config),
// Base data
word: Word.createEmpty(),
otherWords: [],
@@ -67,16 +62,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
@@ -96,17 +88,16 @@ class Activity {
word = newWord;
if (newWord.key != '') {
recentWordsKeys.insert(0, newWord.key);
- recentWordsKeys =
- recentWordsKeys.take(DefaultActivitySettings.recentWordsCount).toList();
+ recentWordsKeys = recentWordsKeys.take(ApplicationConfig.recentWordsCount).toList();
}
}
void pickNewWord() {
- switch (activitySettings.gameType) {
- case DefaultActivitySettings.gameTypeValuePickImage:
+ switch (activitySettings.get(ApplicationConfig.parameterCodeGameType)) {
+ case ApplicationConfig.gameTypeValuePickImage:
pickDataForGamePickImage();
break;
- case DefaultActivitySettings.gameTypeValuePickWord:
+ case ApplicationConfig.gameTypeValuePickWord:
pickDataForGamePickWord();
break;
default:
@@ -125,14 +116,13 @@ class Activity {
int attempts = 0;
do {
final List<Word> words = FetchDataHelper().getWords(
- lang: activitySettings.lang,
- count: DefaultActivitySettings.itemsCount,
+ lang: activitySettings.get(ApplicationConfig.parameterCodeLangValue),
+ count: ApplicationConfig.itemsCount,
);
word = words.take(1).toList()[0];
- if ((words.length == DefaultActivitySettings.itemsCount) &&
- !isRecentlyPicked(word.key)) {
+ if ((words.length == ApplicationConfig.itemsCount) && !isRecentlyPicked(word.key)) {
updateWord(word);
final List<Word> pickedImages = [];
@@ -153,14 +143,13 @@ class Activity {
int attempts = 0;
do {
final List<Word> words = FetchDataHelper().getWords(
- lang: activitySettings.lang,
- count: DefaultActivitySettings.itemsCount,
+ lang: activitySettings.get(ApplicationConfig.parameterCodeLangValue),
+ count: ApplicationConfig.itemsCount,
);
word = words.take(1).toList()[0];
- if ((words.length >= DefaultActivitySettings.itemsCount) &&
- !isRecentlyPicked(word.key)) {
+ if ((words.length >= ApplicationConfig.itemsCount) && !isRecentlyPicked(word.key)) {
updateWord(word);
otherWords = words.skip(1).toList();
images = [word];
@@ -177,7 +166,6 @@ class Activity {
printlog('$Activity:');
printlog(' Settings');
activitySettings.dump();
- globalSettings.dump();
printlog(' State');
printlog(' isRunning: $isRunning');
printlog(' isStarted: $isStarted');
@@ -204,7 +192,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 876dc4a7f2267c151317537f78fd1319704cee1c..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_activity.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:wordguessing/config/default_activity_settings.dart';
-
-class ActivitySettings {
- final String gameType;
- final String lang;
-
- ActivitySettings({
- required this.gameType,
- required this.lang,
- });
-
- static String getGameTypeValueFromUnsafe(String gameType) {
- if (DefaultActivitySettings.allowedGameTypeValues.contains(gameType)) {
- return gameType;
- }
-
- return DefaultActivitySettings.defaultGameTypeValue;
- }
-
- static String getLangValueFromUnsafe(String lang) {
- if (DefaultActivitySettings.allowedLangValues.contains(lang)) {
- return lang;
- }
-
- return DefaultActivitySettings.defaultLangValue;
- }
-
- factory ActivitySettings.createDefault() {
- return ActivitySettings(
- gameType: DefaultActivitySettings.defaultGameTypeValue,
- lang: DefaultActivitySettings.defaultLangValue,
- );
- }
-
- void dump() {
- printlog('$ActivitySettings:');
- printlog(' ${DefaultActivitySettings.parameterCodeGameType}: $gameType');
- printlog(' ${DefaultActivitySettings.parameterCodeLangValue}: $lang');
- printlog('');
- }
-
- @override
- String toString() {
- return '$ActivitySettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultActivitySettings.parameterCodeGameType: gameType,
- DefaultActivitySettings.parameterCodeLangValue: lang,
- };
- }
-}
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
deleted file mode 100644
index 49bc9bc8b470eb23b27faf6f5bf30abe02ddb121..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_global.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:wordguessing/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/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
index 9f54b1adde864cc8dff2eefce3d40a05210f9662..b493ead3cdb36cd49447f7cbf0b0787c0dd183cf 100644
--- a/lib/ui/widgets/game/game_board.dart
+++ b/lib/ui/widgets/game/game_board.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/config/default_activity_settings.dart';
+import 'package:wordguessing/config/application_config.dart';
import 'package:wordguessing/cubit/activity/activity_cubit.dart';
import 'package:wordguessing/models/activity/activity.dart';
import 'package:wordguessing/ui/widgets/game/game_pick_image.dart';
@@ -17,10 +17,11 @@ class GameBoardWidget extends StatelessWidget {
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
- switch (currentActivity.activitySettings.gameType) {
- case DefaultActivitySettings.gameTypeValuePickImage:
+ switch (
+ currentActivity.activitySettings.get(ApplicationConfig.parameterCodeGameType)) {
+ case ApplicationConfig.gameTypeValuePickImage:
return const GamePickImagePage();
- case DefaultActivitySettings.gameTypeValuePickWord:
+ case ApplicationConfig.gameTypeValuePickWord:
return const GamePickWordPage();
default:
return const SizedBox.shrink();
diff --git a/lib/ui/widgets/game/pick_image_game_items.dart b/lib/ui/widgets/game/pick_image_game_items.dart
index 5d261b7315aa4fd73a35c3faffaa1c2102067755..a43f57d47c7830d74aef16892c4862793d64e2eb 100644
--- a/lib/ui/widgets/game/pick_image_game_items.dart
+++ b/lib/ui/widgets/game/pick_image_game_items.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/config/default_activity_settings.dart';
+import 'package:wordguessing/config/application_config.dart';
import 'package:wordguessing/cubit/activity/activity_cubit.dart';
import 'package:wordguessing/models/data/word.dart';
import 'package:wordguessing/models/activity/activity.dart';
@@ -17,7 +17,7 @@ class PickImageGameItemsContainer extends StatelessWidget {
final Activity currentActivity = activityState.currentActivity;
final List<Word> images = currentActivity.images;
- if (images.length != DefaultActivitySettings.itemsCount) {
+ if (images.length != ApplicationConfig.itemsCount) {
return const SizedBox.shrink();
}
diff --git a/lib/ui/widgets/game/pick_word_game_word_items.dart b/lib/ui/widgets/game/pick_word_game_word_items.dart
index f9ee2bfa234fdc4b11c7bc4eaafbbc8835c98ac8..60a788cdea2405d844e972b4067e55fbbad8c8ce 100644
--- a/lib/ui/widgets/game/pick_word_game_word_items.dart
+++ b/lib/ui/widgets/game/pick_word_game_word_items.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/config/default_activity_settings.dart';
+import 'package:wordguessing/config/application_config.dart';
import 'package:wordguessing/cubit/activity/activity_cubit.dart';
import 'package:wordguessing/models/data/word.dart';
import 'package:wordguessing/models/activity/activity.dart';
@@ -19,7 +19,7 @@ class PickWordGameWordItemsContainer extends StatelessWidget {
Word? word = currentActivity.word;
List<Word> otherWords = currentActivity.otherWords;
- if (otherWords.length != (DefaultActivitySettings.itemsCount - 1)) {
+ if (otherWords.length != (ApplicationConfig.itemsCount - 1)) {
return const Column();
}
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 ffe474b82c3216ca58ed8ed7882b3ad276dd0d48..06789a8e0b74087b645c9f1a730905b97050673c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A wordguessing game application.
publish_to: "none"
-version: 0.5.2+73
+version: 0.6.0+74
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)