diff --git a/assets/translations/en.json b/assets/translations/en.json
index 6113e5710d4add0e47421bb0bed53128766f3f47..a93bf3b116a4d65719f5019e926f47ddad33f5d1 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -1,6 +1,9 @@
{
"app_name": "Momomotus",
+ "page_home": "Home",
+ "page_game": "Game",
+
"settings_title": "Settings",
"settings_label_theme": "Theme mode",
diff --git a/assets/translations/fr.json b/assets/translations/fr.json
index 895aec46d8c2550016ce183422fb2e896860dade..498cbb1b91fcae883ea11bc6bca0681d3f59f71a 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -1,6 +1,9 @@
{
"app_name": "Momomotus",
+ "page_home": "Accueil",
+ "page_game": "Jeu",
+
"settings_title": "Réglages",
"settings_label_theme": "Thème de couleurs",
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..ac2c90e221caf3cf01ebba168fb16a8f31c0253a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/37.txt
@@ -0,0 +1 @@
+Normalize Activity application architecture.
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..1d6843d89ba84ea4147528bc3d62d9ecf1a4a762
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/37.txt
@@ -0,0 +1 @@
+Harmonisation des applications en Activity.
diff --git a/lib/common/config/activity_page.dart b/lib/common/config/activity_page.dart
new file mode 100644
index 0000000000000000000000000000000000000000..0c205d309a2a079da282c0adc2414e9c3863cc6a
--- /dev/null
+++ b/lib/common/config/activity_page.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/common/ui/pages/game.dart';
+import 'package:momomotus/common/ui/pages/parameters.dart';
+
+class ActivityPageItem {
+ final String code;
+ final Icon icon;
+ final Widget page;
+
+ const ActivityPageItem({
+ required this.code,
+ required this.icon,
+ required this.page,
+ });
+}
+
+class ActivityPage {
+ static const bool displayBottomNavBar = false;
+
+ static const indexHome = 0;
+ static const pageHome = ActivityPageItem(
+ code: 'page_home',
+ icon: Icon(UniconsLine.home),
+ page: PageParameters(),
+ );
+
+ static const indexGame = 1;
+ static const pageGame = ActivityPageItem(
+ code: 'page_game',
+ icon: Icon(UniconsLine.star),
+ page: PageGame(),
+ );
+
+ static const Map<int, ActivityPageItem> items = {
+ indexHome: pageHome,
+ indexGame: pageGame,
+ };
+
+ static int defaultPageIndex = indexHome;
+
+ static bool isIndexAllowed(int pageIndex) {
+ return items.keys.contains(pageIndex);
+ }
+
+ static Widget getWidget(int pageIndex) {
+ return items[pageIndex]?.page ?? pageHome.page;
+ }
+}
diff --git a/lib/common/config/screen.dart b/lib/common/config/screen.dart
new file mode 100644
index 0000000000000000000000000000000000000000..194e4688f7b911036b015f775e89a1b82d834933
--- /dev/null
+++ b/lib/common/config/screen.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/common/ui/screens/about.dart';
+import 'package:momomotus/common/ui/screens/activity.dart';
+import 'package:momomotus/common/ui/screens/settings.dart';
+
+class ScreenItem {
+ final String code;
+ final Icon icon;
+ final Widget screen;
+
+ const ScreenItem({
+ required this.code,
+ required this.icon,
+ required this.screen,
+ });
+}
+
+class Screen {
+ static const indexActivity = 0;
+ static const screenActivity = ScreenItem(
+ code: 'screen_activity',
+ icon: Icon(UniconsLine.home),
+ screen: ScreenActivity(),
+ );
+
+ static const indexSettings = 1;
+ static const screenSettings = ScreenItem(
+ code: 'screen_settings',
+ icon: Icon(UniconsLine.setting),
+ screen: ScreenSettings(),
+ );
+
+ static const indexAbout = 2;
+ static const screenAbout = ScreenItem(
+ code: 'screen_about',
+ icon: Icon(UniconsLine.info_circle),
+ screen: ScreenAbout(),
+ );
+
+ static Map<int, ScreenItem> items = {
+ indexActivity: screenActivity,
+ indexSettings: screenSettings,
+ indexAbout: screenAbout,
+ };
+
+ static bool isIndexAllowed(int screenIndex) {
+ return items.keys.contains(screenIndex);
+ }
+
+ static Widget getWidget(int screenIndex) {
+ return items[screenIndex]?.screen ?? screenActivity.screen;
+ }
+}
diff --git a/lib/common/cubit/nav/nav_cubit_pages.dart b/lib/common/cubit/nav/nav_cubit_pages.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6c428d043357e49ac940512813518ab46f4cb20b
--- /dev/null
+++ b/lib/common/cubit/nav/nav_cubit_pages.dart
@@ -0,0 +1,33 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/common/config/activity_page.dart';
+
+class NavCubitPage extends HydratedCubit<int> {
+ NavCubitPage() : super(0);
+
+ void updateIndex(int index) {
+ if (ActivityPage.isIndexAllowed(index)) {
+ emit(index);
+ } else {
+ emit(ActivityPage.indexHome);
+ }
+ }
+
+ void goToPageHome() {
+ updateIndex(ActivityPage.indexHome);
+ }
+
+ void goToPageGame() {
+ updateIndex(ActivityPage.indexGame);
+ }
+
+ @override
+ int fromJson(Map<String, dynamic> json) {
+ return ActivityPage.indexHome;
+ }
+
+ @override
+ Map<String, dynamic>? toJson(int state) {
+ return <String, int>{'index': state};
+ }
+}
diff --git a/lib/common/cubit/nav/nav_cubit_screens.dart b/lib/common/cubit/nav/nav_cubit_screens.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ce7ec74bd9557cf5a13b394c95e045fef2622828
--- /dev/null
+++ b/lib/common/cubit/nav/nav_cubit_screens.dart
@@ -0,0 +1,37 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/common/config/screen.dart';
+
+class NavCubitScreen extends HydratedCubit<int> {
+ NavCubitScreen() : super(0);
+
+ void updateIndex(int index) {
+ if (Screen.isIndexAllowed(index)) {
+ emit(index);
+ } else {
+ goToScreenActivity();
+ }
+ }
+
+ void goToScreenActivity() {
+ emit(Screen.indexActivity);
+ }
+
+ void goToScreenSettings() {
+ emit(Screen.indexSettings);
+ }
+
+ void goToScreenAbout() {
+ emit(Screen.indexAbout);
+ }
+
+ @override
+ int fromJson(Map<String, dynamic> json) {
+ return Screen.indexActivity;
+ }
+
+ @override
+ Map<String, dynamic>? toJson(int state) {
+ return <String, int>{'index': state};
+ }
+}
diff --git a/lib/common/ui/nav/bottom_nav_bar.dart b/lib/common/ui/nav/bottom_nav_bar.dart
new file mode 100644
index 0000000000000000000000000000000000000000..73921f9c104ab1f388b9ea9b422acc135ea627a4
--- /dev/null
+++ b/lib/common/ui/nav/bottom_nav_bar.dart
@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/common/config/activity_page.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_pages.dart';
+
+class BottomNavBar extends StatelessWidget {
+ const BottomNavBar({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return Card(
+ margin: const EdgeInsets.only(top: 1, right: 4, left: 4),
+ elevation: 4,
+ shadowColor: Theme.of(context).colorScheme.shadow,
+ color: Theme.of(context).colorScheme.surfaceContainerHighest,
+ shape: const RoundedRectangleBorder(
+ borderRadius: BorderRadius.only(
+ topLeft: Radius.circular(16),
+ topRight: Radius.circular(16),
+ ),
+ ),
+ child: BlocBuilder<NavCubitPage, int>(builder: (BuildContext context, int state) {
+ final List<BottomNavigationBarItem> items = [];
+
+ ActivityPage.items.forEach((int pageIndex, ActivityPageItem item) {
+ items.add(BottomNavigationBarItem(
+ icon: item.icon,
+ label: tr(item.code),
+ ));
+ });
+
+ return BottomNavigationBar(
+ currentIndex: state,
+ onTap: (int index) => BlocProvider.of<NavCubitPage>(context).updateIndex(index),
+ type: BottomNavigationBarType.fixed,
+ elevation: 0,
+ backgroundColor: Colors.transparent,
+ selectedItemColor: Theme.of(context).colorScheme.primary,
+ unselectedItemColor: Theme.of(context).textTheme.bodySmall!.color,
+ items: items,
+ );
+ }),
+ );
+ }
+}
diff --git a/lib/ui/widgets/global_app_bar.dart b/lib/common/ui/nav/global_app_bar.dart
similarity index 60%
rename from lib/ui/widgets/global_app_bar.dart
rename to lib/common/ui/nav/global_app_bar.dart
index c87cad726af73c0c9de8f020862434c573e5500e..415f011769db0caf6243b165c876554e778b1996 100644
--- a/lib/ui/widgets/global_app_bar.dart
+++ b/lib/common/ui/nav/global_app_bar.dart
@@ -1,30 +1,33 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/config/menu.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
-import 'package:momomotus/cubit/nav_cubit.dart';
-import 'package:momomotus/models/game/game.dart';
+import 'package:momomotus/common/config/screen.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
+import 'package:momomotus/models/activity/activity.dart';
class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
const GlobalAppBar({super.key});
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- return BlocBuilder<NavCubit, int>(
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ return BlocBuilder<NavCubitScreen, int>(
builder: (BuildContext context, int pageIndex) {
- final Game currentGame = gameState.currentGame;
+ final Activity currentActivity = activityState.currentActivity;
final List<Widget> menuActions = [];
- if (currentGame.isRunning && !currentGame.isFinished) {
+ if (currentActivity.isRunning && !currentActivity.isFinished) {
menuActions.add(StyledButton(
color: Colors.red,
onPressed: () {},
onLongPress: () {
- BlocProvider.of<GameCubit>(context).quitGame();
+ BlocProvider.of<ActivityCubit>(context).quitActivity();
+ BlocProvider.of<NavCubitPage>(context).goToPageHome();
},
child: const Image(
image: AssetImage('assets/ui/button_back.png'),
@@ -32,38 +35,38 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
),
));
} else {
- if (pageIndex == Menu.indexGame) {
+ if (pageIndex == Screen.indexActivity) {
// go to Settings page
menuActions.add(ElevatedButton(
onPressed: () {
- BlocProvider.of<NavCubit>(context).goToSettingsPage();
+ BlocProvider.of<NavCubitScreen>(context).goToScreenSettings();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
),
- child: Menu.menuItemSettings.icon,
+ child: Screen.screenSettings.icon,
));
// go to About page
menuActions.add(ElevatedButton(
onPressed: () {
- BlocProvider.of<NavCubit>(context).goToAboutPage();
+ BlocProvider.of<NavCubitScreen>(context).goToScreenAbout();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
),
- child: Menu.menuItemAbout.icon,
+ child: Screen.screenAbout.icon,
));
} else {
// back to Home page
menuActions.add(ElevatedButton(
onPressed: () {
- BlocProvider.of<NavCubit>(context).goToGamePage();
+ BlocProvider.of<NavCubitScreen>(context).goToScreenActivity();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
),
- child: Menu.menuItemGame.icon,
+ child: Screen.screenActivity.icon,
));
}
}
diff --git a/lib/ui/layouts/game_layout.dart b/lib/common/ui/pages/game.dart
similarity index 61%
rename from lib/ui/layouts/game_layout.dart
rename to lib/common/ui/pages/game.dart
index c5cd3b432e014ef6af48c6e553f111b577b9c518..8deac9c0fad2a777cd5e647632cf57cccf52ce9e 100644
--- a/lib/ui/layouts/game_layout.dart
+++ b/lib/common/ui/pages/game.dart
@@ -1,20 +1,20 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
-import 'package:momomotus/models/game/game.dart';
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
+import 'package:momomotus/models/activity/activity.dart';
import 'package:momomotus/ui/game/game_end.dart';
import 'package:momomotus/ui/widgets/game/game_board.dart';
import 'package:momomotus/ui/widgets/game/keyboard.dart';
-class GameLayout extends StatelessWidget {
- const GameLayout({super.key});
+class PageGame extends StatelessWidget {
+ const PageGame({super.key});
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
return Container(
alignment: AlignmentDirectional.topCenter,
@@ -25,7 +25,7 @@ class GameLayout extends StatelessWidget {
children: [
const GameBoardWidget(),
const Expanded(child: SizedBox.shrink()),
- currentGame.isFinished ? const GameEndWidget() : const KeyboardWidget(),
+ currentActivity.isFinished ? const GameEndWidget() : const KeyboardWidget(),
],
),
);
diff --git a/lib/common/ui/pages/parameters.dart b/lib/common/ui/pages/parameters.dart
new file mode 100644
index 0000000000000000000000000000000000000000..429051b81a5632a66cc08c02aaefeaf45a0a6319
--- /dev/null
+++ b/lib/common/ui/pages/parameters.dart
@@ -0,0 +1,148 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/common/ui/parameters/parameter_widget.dart';
+
+import 'package:momomotus/config/default_activity_settings.dart';
+import 'package:momomotus/config/default_global_settings.dart';
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
+import 'package:momomotus/cubit/settings/settings_activity_cubit.dart';
+import 'package:momomotus/cubit/settings/settings_global_cubit.dart';
+import 'package:momomotus/models/activity/activity.dart';
+import 'package:momomotus/ui/widgets/actions/button_delete_saved_game.dart';
+import 'package:momomotus/ui/widgets/actions/button_game_start_new.dart';
+import 'package:momomotus/ui/widgets/actions/button_resume_saved_game.dart';
+
+class PageParameters extends StatelessWidget {
+ const PageParameters({super.key});
+
+ final double separatorHeight = 8.0;
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
+
+ final List<Widget> lines = [];
+
+ // Game 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 game
+ lines.add(
+ const AspectRatio(
+ aspectRatio: 3,
+ child: StartNewGameButton(),
+ ),
+ );
+ } else {
+ // Resume game
+ lines.add(const AspectRatio(
+ aspectRatio: 3,
+ child: ResumeSavedGameButton(),
+ ));
+ // Delete saved game
+ lines.add(SizedBox.square(
+ dimension: MediaQuery.of(context).size.width / 5,
+ child: const DeleteSavedGameButton(),
+ ));
+ }
+
+ 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/ui/parameters/parameter_painter.dart b/lib/common/ui/parameters/parameter_painter.dart
similarity index 83%
rename from lib/ui/parameters/parameter_painter.dart
rename to lib/common/ui/parameters/parameter_painter.dart
index 3cb57daa8437cff3d0caf9438fc1b095be833e37..486bfaad3cfc5bb511125944f0f97034e0efc125 100644
--- a/lib/ui/parameters/parameter_painter.dart
+++ b/lib/common/ui/parameters/parameter_painter.dart
@@ -3,21 +3,21 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/config/default_game_settings.dart';
-import 'package:momomotus/models/settings/settings_game.dart';
+import 'package:momomotus/config/default_activity_settings.dart';
+import 'package:momomotus/models/settings/settings_activity.dart';
import 'package:momomotus/models/settings/settings_global.dart';
class ParameterPainter extends CustomPainter {
const ParameterPainter({
required this.code,
required this.value,
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
});
final String code;
final String value;
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
@override
@@ -27,13 +27,13 @@ class ParameterPainter extends CustomPainter {
// content
switch (code) {
- case DefaultGameSettings.parameterCodeLang:
+ case DefaultActivitySettings.parameterCodeLang:
paintLangParameterItem(canvas, canvasSize);
break;
- case DefaultGameSettings.parameterCodeLength:
+ case DefaultActivitySettings.parameterCodeLength:
paintLengthParameterItem(canvas, canvasSize);
break;
- case DefaultGameSettings.parameterCodeLevel:
+ case DefaultActivitySettings.parameterCodeLevel:
paintLevelParameterItem(canvas, canvasSize);
break;
default:
@@ -88,17 +88,17 @@ class ParameterPainter extends CustomPainter {
String text = '';
switch (value) {
- case DefaultGameSettings.lengthValue4:
+ case DefaultActivitySettings.lengthValue4:
text = '⭐';
break;
- case DefaultGameSettings.lengthValue5:
- text = itemCountEmoji + DefaultGameSettings.lengthValue5.toString();
+ case DefaultActivitySettings.lengthValue5:
+ text = itemCountEmoji + DefaultActivitySettings.lengthValue5.toString();
break;
- case DefaultGameSettings.lengthValue6:
- text = itemCountEmoji + DefaultGameSettings.lengthValue6.toString();
+ case DefaultActivitySettings.lengthValue6:
+ text = itemCountEmoji + DefaultActivitySettings.lengthValue6.toString();
break;
- case DefaultGameSettings.lengthValue7:
- text = itemCountEmoji + DefaultGameSettings.lengthValue7.toString();
+ case DefaultActivitySettings.lengthValue7:
+ text = itemCountEmoji + DefaultActivitySettings.lengthValue7.toString();
break;
default:
printlog('Wrong value for lang parameter value: $value');
@@ -176,10 +176,10 @@ class ParameterPainter extends CustomPainter {
String text = '';
switch (value) {
- case DefaultGameSettings.levelValueEasy:
+ case DefaultActivitySettings.levelValueEasy:
text = '🧒';
break;
- case DefaultGameSettings.levelValueNormal:
+ case DefaultActivitySettings.levelValueNormal:
text = '🤯';
break;
default:
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
similarity index 79%
rename from lib/ui/parameters/parameter_widget.dart
rename to lib/common/ui/parameters/parameter_widget.dart
index 99fa02f69539185397764156e45a81e56d3a51dd..1f743d28b01391da5702d9223c86c2df72081cd6 100644
--- a/lib/ui/parameters/parameter_widget.dart
+++ b/lib/common/ui/parameters/parameter_widget.dart
@@ -1,11 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/config/default_game_settings.dart';
+import 'package:momomotus/common/ui/parameters/parameter_painter.dart';
+
+import 'package:momomotus/config/default_activity_settings.dart';
import 'package:momomotus/config/default_global_settings.dart';
-import 'package:momomotus/models/settings/settings_game.dart';
+import 'package:momomotus/models/settings/settings_activity.dart';
import 'package:momomotus/models/settings/settings_global.dart';
-import 'package:momomotus/ui/parameters/parameter_painter.dart';
class ParameterWidget extends StatelessWidget {
const ParameterWidget({
@@ -14,7 +15,7 @@ class ParameterWidget extends StatelessWidget {
required this.value,
required this.isSelected,
required this.size,
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
required this.onPressed,
});
@@ -23,7 +24,7 @@ class ParameterWidget extends StatelessWidget {
final String value;
final bool isSelected;
final double size;
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
final VoidCallback onPressed;
@@ -37,13 +38,13 @@ class ParameterWidget extends StatelessWidget {
Widget content = const SizedBox.shrink();
switch (code) {
- case DefaultGameSettings.parameterCodeLang:
+ case DefaultActivitySettings.parameterCodeLang:
content = getLangParameterItem();
break;
- case DefaultGameSettings.parameterCodeLength:
+ case DefaultActivitySettings.parameterCodeLength:
content = getLengthParameterItem();
break;
- case DefaultGameSettings.parameterCodeLevel:
+ case DefaultActivitySettings.parameterCodeLevel:
content = getLevelParameterItem();
break;
case DefaultGlobalSettings.parameterCodeSkin:
@@ -82,16 +83,16 @@ class ParameterWidget extends StatelessWidget {
Color backgroundColor = Colors.grey;
switch (value) {
- case DefaultGameSettings.lengthValue4:
+ case DefaultActivitySettings.lengthValue4:
backgroundColor = Colors.grey;
break;
- case DefaultGameSettings.lengthValue5:
+ case DefaultActivitySettings.lengthValue5:
backgroundColor = Colors.green;
break;
- case DefaultGameSettings.lengthValue6:
+ case DefaultActivitySettings.lengthValue6:
backgroundColor = Colors.orange;
break;
- case DefaultGameSettings.lengthValue7:
+ case DefaultActivitySettings.lengthValue7:
backgroundColor = Colors.red;
break;
default:
@@ -107,7 +108,7 @@ class ParameterWidget extends StatelessWidget {
painter: ParameterPainter(
code: code,
value: value,
- gameSettings: gameSettings,
+ activitySettings: activitySettings,
globalSettings: globalSettings,
),
isComplex: true,
@@ -119,19 +120,19 @@ class ParameterWidget extends StatelessWidget {
Color backgroundColor = Colors.grey;
switch (value) {
- case DefaultGameSettings.lengthValue4:
+ case DefaultActivitySettings.lengthValue4:
backgroundColor = Colors.green;
break;
- case DefaultGameSettings.lengthValue5:
+ case DefaultActivitySettings.lengthValue5:
backgroundColor = Colors.yellow;
break;
- case DefaultGameSettings.lengthValue6:
+ case DefaultActivitySettings.lengthValue6:
backgroundColor = Colors.orange;
break;
- case DefaultGameSettings.lengthValue7:
+ case DefaultActivitySettings.lengthValue7:
backgroundColor = Colors.red;
break;
- case DefaultGameSettings.lengthValue8:
+ case DefaultActivitySettings.lengthValue8:
backgroundColor = Colors.purple;
break;
default:
@@ -147,7 +148,7 @@ class ParameterWidget extends StatelessWidget {
painter: ParameterPainter(
code: code,
value: value,
- gameSettings: gameSettings,
+ activitySettings: activitySettings,
globalSettings: globalSettings,
),
isComplex: true,
@@ -159,10 +160,10 @@ class ParameterWidget extends StatelessWidget {
Color backgroundColor = Colors.grey;
switch (value) {
- case DefaultGameSettings.levelValueEasy:
+ case DefaultActivitySettings.levelValueEasy:
backgroundColor = Colors.green;
break;
- case DefaultGameSettings.levelValueNormal:
+ case DefaultActivitySettings.levelValueNormal:
backgroundColor = Colors.orange;
break;
default:
@@ -178,7 +179,7 @@ class ParameterWidget extends StatelessWidget {
painter: ParameterPainter(
code: code,
value: value,
- gameSettings: gameSettings,
+ activitySettings: activitySettings,
globalSettings: globalSettings,
),
isComplex: true,
diff --git a/lib/ui/screens/page_about.dart b/lib/common/ui/screens/about.dart
similarity index 93%
rename from lib/ui/screens/page_about.dart
rename to lib/common/ui/screens/about.dart
index ab73e304b8138295f6669330b928e0d1d0263565..f7a14a9a7e574a7b6f9ed181f38d08ba8c2285fe 100644
--- a/lib/ui/screens/page_about.dart
+++ b/lib/common/ui/screens/about.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-class PageAbout extends StatelessWidget {
- const PageAbout({super.key});
+class ScreenAbout extends StatelessWidget {
+ const ScreenAbout({super.key});
@override
Widget build(BuildContext context) {
diff --git a/lib/common/ui/screens/activity.dart b/lib/common/ui/screens/activity.dart
new file mode 100644
index 0000000000000000000000000000000000000000..21316e734921c2bcfc2027c0bc1d00ffdd8dbb14
--- /dev/null
+++ b/lib/common/ui/screens/activity.dart
@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/common/config/activity_page.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_pages.dart';
+
+class ScreenActivity extends StatelessWidget {
+ const ScreenActivity({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<NavCubitPage, int>(
+ builder: (BuildContext context, int pageIndex) {
+ return ActivityPage.getWidget(pageIndex);
+ },
+ );
+ }
+}
diff --git a/lib/ui/screens/page_settings.dart b/lib/common/ui/screens/settings.dart
similarity index 87%
rename from lib/ui/screens/page_settings.dart
rename to lib/common/ui/screens/settings.dart
index 50964ef462b6e3e411347cab4e966afb0f505008..7981b1c6becc4f5b925c3058b05423750d80f62e 100644
--- a/lib/ui/screens/page_settings.dart
+++ b/lib/common/ui/screens/settings.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-class PageSettings extends StatelessWidget {
- const PageSettings({super.key});
+class ScreenSettings extends StatelessWidget {
+ const ScreenSettings({super.key});
@override
Widget build(BuildContext context) {
diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart
new file mode 100644
index 0000000000000000000000000000000000000000..154334c45f6cbc34be6b62f40f138947ee65dee8
--- /dev/null
+++ b/lib/config/application_config.dart
@@ -0,0 +1,3 @@
+class ApplicationConfig {
+ static const String appTitle = 'Momomotus';
+}
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_activity_settings.dart
similarity index 89%
rename from lib/config/default_game_settings.dart
rename to lib/config/default_activity_settings.dart
index 97b7e777ecfc012589bb75390fb6edf544e1a0aa..5aeefcb929e0a2d3f907f6bede58d5c31e0f3db1 100644
--- a/lib/config/default_game_settings.dart
+++ b/lib/config/default_activity_settings.dart
@@ -1,6 +1,6 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-class DefaultGameSettings {
+class DefaultActivitySettings {
// available game parameters codes
static const String parameterCodeLang = 'lang';
static const String parameterCodeLength = 'length';
@@ -49,11 +49,11 @@ class DefaultGameSettings {
static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case parameterCodeLang:
- return DefaultGameSettings.allowedLangValues;
+ return DefaultActivitySettings.allowedLangValues;
case parameterCodeLength:
- return DefaultGameSettings.allowedLengthValues;
+ return DefaultActivitySettings.allowedLengthValues;
case parameterCodeLevel:
- return DefaultGameSettings.allowedLevelValues;
+ return DefaultActivitySettings.allowedLevelValues;
}
printlog('Did not find any available value for game parameter "$parameterCode".');
diff --git a/lib/config/menu.dart b/lib/config/menu.dart
deleted file mode 100644
index c1d17b08d7a8cb87a319b8e82f1d0ee5dc0393da..0000000000000000000000000000000000000000
--- a/lib/config/menu.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:momomotus/ui/screens/page_about.dart';
-import 'package:momomotus/ui/screens/page_game.dart';
-import 'package:momomotus/ui/screens/page_settings.dart';
-
-class MenuItem {
- final Icon icon;
- final Widget page;
-
- const MenuItem({
- required this.icon,
- required this.page,
- });
-}
-
-class Menu {
- static const indexGame = 0;
- static const menuItemGame = MenuItem(
- icon: Icon(UniconsLine.home),
- page: PageGame(),
- );
-
- static const indexSettings = 1;
- static const menuItemSettings = MenuItem(
- icon: Icon(UniconsLine.setting),
- page: PageSettings(),
- );
-
- static const indexAbout = 2;
- static const menuItemAbout = MenuItem(
- icon: Icon(UniconsLine.info_circle),
- page: PageAbout(),
- );
-
- static Map<int, MenuItem> items = {
- indexGame: menuItemGame,
- indexSettings: menuItemSettings,
- indexAbout: menuItemAbout,
- };
-
- static bool isIndexAllowed(int pageIndex) {
- return items.keys.contains(pageIndex);
- }
-
- static Widget getPageWidget(int pageIndex) {
- return items[pageIndex]?.page ?? menuItemGame.page;
- }
-
- static int itemsCount = Menu.items.length;
-}
diff --git a/lib/cubit/activity/activity_cubit.dart b/lib/cubit/activity/activity_cubit.dart
new file mode 100644
index 0000000000000000000000000000000000000000..0970da610428431e78dad92dd446583120ff81e4
--- /dev/null
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -0,0 +1,185 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/models/activity/activity.dart';
+import 'package:momomotus/models/settings/settings_activity.dart';
+import 'package:momomotus/models/settings/settings_global.dart';
+
+part 'activity_state.dart';
+
+class ActivityCubit extends HydratedCubit<ActivityState> {
+ ActivityCubit()
+ : super(ActivityState(
+ currentActivity: Activity.createEmpty(),
+ ));
+
+ void updateState(Activity activity) {
+ emit(ActivityState(
+ currentActivity: activity,
+ ));
+ }
+
+ void refresh() {
+ final Activity activity = Activity(
+ // Settings
+ activitySettings: state.currentActivity.activitySettings,
+ globalSettings: state.currentActivity.globalSettings,
+ // State
+ isRunning: state.currentActivity.isRunning,
+ isStarted: state.currentActivity.isStarted,
+ animationInProgress: state.currentActivity.animationInProgress,
+ // Base data
+ word: state.currentActivity.word,
+ dictionary: state.currentActivity.dictionary,
+ // Game data
+ currentGuess: state.currentActivity.currentGuess,
+ foundLetters: state.currentActivity.foundLetters,
+ guesses: state.currentActivity.guesses,
+ foundWord: state.currentActivity.foundWord,
+ );
+ // game.dump();
+
+ updateState(activity);
+ }
+
+ void startNewActivity({
+ required ActivitySettings activitySettings,
+ required GlobalSettings globalSettings,
+ }) {
+ final Activity newActivity = Activity.createNew(
+ activitySettings: activitySettings,
+ globalSettings: globalSettings,
+ );
+
+ newActivity.dump();
+
+ updateState(newActivity);
+ refresh();
+ }
+
+ void quitActivity() {
+ state.currentActivity.isRunning = false;
+ refresh();
+ }
+
+ void resumeSavedActivity() {
+ state.currentActivity.isRunning = true;
+ refresh();
+ }
+
+ void deleteSavedActivity() {
+ state.currentActivity.isRunning = false;
+ updateState(Activity.createEmpty());
+ refresh();
+ }
+
+ void currentGuessAddLetter(String letter) {
+ if (state.currentActivity.currentGuess.length <
+ int.parse(state.currentActivity.activitySettings.length)) {
+ state.currentActivity.currentGuess = state.currentActivity.currentGuess + letter;
+ refresh();
+ }
+ }
+
+ void currentGuessRemoveLetter() {
+ if (state.currentActivity.currentGuess.isNotEmpty) {
+ state.currentActivity.currentGuess = state.currentActivity.currentGuess
+ .substring(0, state.currentActivity.currentGuess.length - 1);
+ refresh();
+ }
+ }
+
+ void currentGuessSubmitWord() {
+ state.currentActivity.isStarted = true;
+
+ if (state.currentActivity.currentGuess.length ==
+ int.parse(state.currentActivity.activitySettings.length)) {
+ if (state.currentActivity.currentGuess == state.currentActivity.word) {
+ printlog('Word found!');
+ state.currentActivity.foundWord = true;
+ }
+ addGuess(state.currentActivity.currentGuess);
+ refresh();
+ }
+ }
+
+ void currentGuessSubmitWrongWord() {
+ addGuess(state.currentActivity.currentGuess);
+ refresh();
+ }
+
+ void addFoundLetter(String letter, int i) {
+ state.currentActivity.foundLetters = state.currentActivity.foundLetters.substring(0, i) +
+ letter +
+ state.currentActivity.foundLetters.substring(i + 1);
+ }
+
+ void addGuess(String word) {
+ state.currentActivity.guesses.add(word);
+ state.currentActivity.currentGuess = '';
+ }
+
+ void submitWord() {
+ if (state.currentActivity.checkWordIsValid(state.currentActivity.currentGuess)) {
+ printlog('Ok word allowed: "${state.currentActivity.currentGuess}".');
+ currentGuessSubmitWord();
+ } else {
+ printlog('Unknown word: "${state.currentActivity.currentGuess}".');
+ currentGuessSubmitWrongWord();
+ }
+ }
+
+ List<String> getTips(String candidate) {
+ String word = state.currentActivity.word;
+ final int wordLength = int.parse(state.currentActivity.activitySettings.length);
+
+ final List<String> tips = List<String>.filled(wordLength, '', growable: false);
+
+ if ((!state.currentActivity.checkWordIsValid(candidate))) {
+ return List<String>.filled(wordLength, 'wrong', growable: false);
+ }
+
+ String replaceCharAt(String oldString, int index, String newChar) {
+ return oldString.substring(0, index) + newChar + oldString.substring(index + 1);
+ }
+
+ // Check correctly placed letters
+ for (int i = 0; i < wordLength; i++) {
+ if ((tips[i] == '') && (word[i] == candidate[i])) {
+ addFoundLetter(word[i], i);
+ word = replaceCharAt(word, i, ' ');
+ candidate = replaceCharAt(candidate, i, ' ');
+ tips[i] = 'good';
+ }
+ }
+
+ // Check misplaced letters
+ for (int i = 0; i < wordLength; i++) {
+ for (int j = 0; j < wordLength; j++) {
+ if ((candidate[j] != ' ') && (candidate[j] == word[i])) {
+ word = replaceCharAt(word, i, ' ');
+ candidate = replaceCharAt(candidate, j, ' ');
+ tips[j] = 'misplaced';
+ }
+ }
+ }
+
+ return tips;
+ }
+
+ @override
+ ActivityState? fromJson(Map<String, dynamic> json) {
+ final Activity currentActivity = json['currentActivity'] as Activity;
+
+ return ActivityState(
+ currentActivity: currentActivity,
+ );
+ }
+
+ @override
+ Map<String, dynamic>? toJson(ActivityState state) {
+ return <String, dynamic>{
+ 'currentActivity': state.currentActivity.toJson(),
+ };
+ }
+}
diff --git a/lib/cubit/activity/activity_state.dart b/lib/cubit/activity/activity_state.dart
new file mode 100644
index 0000000000000000000000000000000000000000..887b45e4255fd7de1cc7744569d82a38a66602f2
--- /dev/null
+++ b/lib/cubit/activity/activity_state.dart
@@ -0,0 +1,15 @@
+part of 'activity_cubit.dart';
+
+@immutable
+class ActivityState extends Equatable {
+ const ActivityState({
+ required this.currentActivity,
+ });
+
+ final Activity currentActivity;
+
+ @override
+ List<dynamic> get props => <dynamic>[
+ currentActivity,
+ ];
+}
diff --git a/lib/cubit/game_cubit.dart b/lib/cubit/game_cubit.dart
deleted file mode 100644
index 4c2980704f33bac7c15436a15218dad47e7e04ef..0000000000000000000000000000000000000000
--- a/lib/cubit/game_cubit.dart
+++ /dev/null
@@ -1,184 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:momomotus/models/game/game.dart';
-import 'package:momomotus/models/settings/settings_game.dart';
-import 'package:momomotus/models/settings/settings_global.dart';
-
-part 'game_state.dart';
-
-class GameCubit extends HydratedCubit<GameState> {
- GameCubit()
- : super(GameState(
- currentGame: Game.createEmpty(),
- ));
-
- void updateState(Game game) {
- emit(GameState(
- currentGame: game,
- ));
- }
-
- void refresh() {
- final Game game = Game(
- // Settings
- gameSettings: state.currentGame.gameSettings,
- globalSettings: state.currentGame.globalSettings,
- // State
- isRunning: state.currentGame.isRunning,
- isStarted: state.currentGame.isStarted,
- animationInProgress: state.currentGame.animationInProgress,
- // Base data
- word: state.currentGame.word,
- dictionary: state.currentGame.dictionary,
- // Game data
- currentGuess: state.currentGame.currentGuess,
- foundLetters: state.currentGame.foundLetters,
- guesses: state.currentGame.guesses,
- foundWord: state.currentGame.foundWord,
- );
- // game.dump();
-
- updateState(game);
- }
-
- void startNewGame({
- required GameSettings gameSettings,
- required GlobalSettings globalSettings,
- }) {
- final Game newGame = Game.createNew(
- gameSettings: gameSettings,
- globalSettings: globalSettings,
- );
-
- newGame.dump();
-
- updateState(newGame);
- refresh();
- }
-
- void quitGame() {
- state.currentGame.isRunning = false;
- refresh();
- }
-
- void resumeSavedGame() {
- state.currentGame.isRunning = true;
- refresh();
- }
-
- void deleteSavedGame() {
- state.currentGame.isRunning = false;
- refresh();
- }
-
- void currentGuessAddLetter(String letter) {
- if (state.currentGame.currentGuess.length <
- int.parse(state.currentGame.gameSettings.length)) {
- state.currentGame.currentGuess = state.currentGame.currentGuess + letter;
- refresh();
- }
- }
-
- void currentGuessRemoveLetter() {
- if (state.currentGame.currentGuess.isNotEmpty) {
- state.currentGame.currentGuess = state.currentGame.currentGuess
- .substring(0, state.currentGame.currentGuess.length - 1);
- refresh();
- }
- }
-
- void currentGuessSubmitWord() {
- state.currentGame.isStarted = true;
-
- if (state.currentGame.currentGuess.length ==
- int.parse(state.currentGame.gameSettings.length)) {
- if (state.currentGame.currentGuess == state.currentGame.word) {
- printlog('Word found!');
- state.currentGame.foundWord = true;
- }
- addGuess(state.currentGame.currentGuess);
- refresh();
- }
- }
-
- void currentGuessSubmitWrongWord() {
- addGuess(state.currentGame.currentGuess);
- refresh();
- }
-
- void addFoundLetter(String letter, int i) {
- state.currentGame.foundLetters = state.currentGame.foundLetters.substring(0, i) +
- letter +
- state.currentGame.foundLetters.substring(i + 1);
- }
-
- void addGuess(String word) {
- state.currentGame.guesses.add(word);
- state.currentGame.currentGuess = '';
- }
-
- void submitWord() {
- if (state.currentGame.checkWordIsValid(state.currentGame.currentGuess)) {
- printlog('Ok word allowed: "${state.currentGame.currentGuess}".');
- currentGuessSubmitWord();
- } else {
- printlog('Unknown word: "${state.currentGame.currentGuess}".');
- currentGuessSubmitWrongWord();
- }
- }
-
- List<String> getTips(String candidate) {
- String word = state.currentGame.word;
- final int wordLength = int.parse(state.currentGame.gameSettings.length);
-
- final List<String> tips = List<String>.filled(wordLength, '', growable: false);
-
- if ((!state.currentGame.checkWordIsValid(candidate))) {
- return List<String>.filled(wordLength, 'wrong', growable: false);
- }
-
- String replaceCharAt(String oldString, int index, String newChar) {
- return oldString.substring(0, index) + newChar + oldString.substring(index + 1);
- }
-
- // Check correctly placed letters
- for (int i = 0; i < wordLength; i++) {
- if ((tips[i] == '') && (word[i] == candidate[i])) {
- addFoundLetter(word[i], i);
- word = replaceCharAt(word, i, ' ');
- candidate = replaceCharAt(candidate, i, ' ');
- tips[i] = 'good';
- }
- }
-
- // Check misplaced letters
- for (int i = 0; i < wordLength; i++) {
- for (int j = 0; j < wordLength; j++) {
- if ((candidate[j] != ' ') && (candidate[j] == word[i])) {
- word = replaceCharAt(word, i, ' ');
- candidate = replaceCharAt(candidate, j, ' ');
- tips[j] = 'misplaced';
- }
- }
- }
-
- return tips;
- }
-
- @override
- GameState? fromJson(Map<String, dynamic> json) {
- final Game currentGame = json['currentGame'] as Game;
-
- return GameState(
- currentGame: currentGame,
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameState state) {
- return <String, dynamic>{
- 'currentGame': state.currentGame.toJson(),
- };
- }
-}
diff --git a/lib/cubit/game_state.dart b/lib/cubit/game_state.dart
deleted file mode 100644
index 00e211668c3269255926939324355792abd61c41..0000000000000000000000000000000000000000
--- a/lib/cubit/game_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'game_cubit.dart';
-
-@immutable
-class GameState extends Equatable {
- const GameState({
- required this.currentGame,
- });
-
- final Game currentGame;
-
- @override
- List<dynamic> get props => <dynamic>[
- currentGame,
- ];
-}
diff --git a/lib/cubit/nav_cubit.dart b/lib/cubit/nav_cubit.dart
deleted file mode 100644
index 9a0b9aa490d6f12ceb51c5faaf9736439c09200d..0000000000000000000000000000000000000000
--- a/lib/cubit/nav_cubit.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:momomotus/config/menu.dart';
-
-class NavCubit extends HydratedCubit<int> {
- NavCubit() : super(0);
-
- void updateIndex(int index) {
- if (Menu.isIndexAllowed(index)) {
- emit(index);
- } else {
- goToGamePage();
- }
- }
-
- void goToGamePage() {
- emit(Menu.indexGame);
- }
-
- void goToSettingsPage() {
- emit(Menu.indexSettings);
- }
-
- void goToAboutPage() {
- emit(Menu.indexAbout);
- }
-
- @override
- int fromJson(Map<String, dynamic> json) {
- return Menu.indexGame;
- }
-
- @override
- Map<String, dynamic>? toJson(int state) {
- return <String, int>{'pageIndex': state};
- }
-}
diff --git a/lib/cubit/settings/settings_activity_cubit.dart b/lib/cubit/settings/settings_activity_cubit.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e1d05be4acf0666299b0b87437c6e636d524db54
--- /dev/null
+++ b/lib/cubit/settings/settings_activity_cubit.dart
@@ -0,0 +1,83 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/config/default_activity_settings.dart';
+import 'package:momomotus/models/settings/settings_activity.dart';
+
+part 'settings_activity_state.dart';
+
+class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
+ ActivitySettingsCubit()
+ : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
+
+ void setValues({
+ String? lang,
+ String? length,
+ String? level,
+ }) {
+ emit(
+ ActivitySettingsState(
+ settings: ActivitySettings(
+ lang: lang ?? state.settings.lang,
+ length: length ?? state.settings.length,
+ level: level ?? state.settings.level,
+ ),
+ ),
+ );
+ }
+
+ String getParameterValue(String code) {
+ switch (code) {
+ case DefaultActivitySettings.parameterCodeLang:
+ return ActivitySettings.getLangValueFromUnsafe(state.settings.lang);
+ case DefaultActivitySettings.parameterCodeLength:
+ return ActivitySettings.getLengthValueFromUnsafe(state.settings.length);
+ case DefaultActivitySettings.parameterCodeLevel:
+ return ActivitySettings.getLevelValueFromUnsafe(state.settings.level);
+ }
+
+ return '';
+ }
+
+ void setParameterValue(String code, String value) {
+ final String lang = code == DefaultActivitySettings.parameterCodeLang
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeLang);
+ final String length = code == DefaultActivitySettings.parameterCodeLength
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeLength);
+ final String level = code == DefaultActivitySettings.parameterCodeLevel
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeLevel);
+
+ setValues(
+ lang: lang,
+ length: length,
+ level: level,
+ );
+ }
+
+ @override
+ ActivitySettingsState? fromJson(Map<String, dynamic> json) {
+ final String lang = json[DefaultActivitySettings.parameterCodeLang] as String;
+ final String length = json[DefaultActivitySettings.parameterCodeLength] as String;
+ final String level = json[DefaultActivitySettings.parameterCodeLevel] as String;
+
+ return ActivitySettingsState(
+ settings: ActivitySettings(
+ lang: lang,
+ length: length,
+ level: level,
+ ),
+ );
+ }
+
+ @override
+ Map<String, dynamic>? toJson(ActivitySettingsState state) {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeLang: state.settings.lang,
+ DefaultActivitySettings.parameterCodeLength: state.settings.length,
+ DefaultActivitySettings.parameterCodeLevel: state.settings.level,
+ };
+ }
+}
diff --git a/lib/cubit/settings/settings_activity_state.dart b/lib/cubit/settings/settings_activity_state.dart
new file mode 100644
index 0000000000000000000000000000000000000000..2b2de42011634e81ae9e6f8bcaa1577f239c778b
--- /dev/null
+++ b/lib/cubit/settings/settings_activity_state.dart
@@ -0,0 +1,15 @@
+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_global_cubit.dart b/lib/cubit/settings/settings_global_cubit.dart
similarity index 100%
rename from lib/cubit/settings_global_cubit.dart
rename to lib/cubit/settings/settings_global_cubit.dart
diff --git a/lib/cubit/settings_global_state.dart b/lib/cubit/settings/settings_global_state.dart
similarity index 100%
rename from lib/cubit/settings_global_state.dart
rename to lib/cubit/settings/settings_global_state.dart
diff --git a/lib/cubit/settings_game_cubit.dart b/lib/cubit/settings_game_cubit.dart
deleted file mode 100644
index da172d42df511fc2c1dc8b2c445bee1bfcbfe311..0000000000000000000000000000000000000000
--- a/lib/cubit/settings_game_cubit.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:momomotus/config/default_game_settings.dart';
-import 'package:momomotus/models/settings/settings_game.dart';
-
-part 'settings_game_state.dart';
-
-class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
- GameSettingsCubit() : super(GameSettingsState(settings: GameSettings.createDefault()));
-
- void setValues({
- String? lang,
- String? length,
- String? level,
- }) {
- emit(
- GameSettingsState(
- settings: GameSettings(
- lang: lang ?? state.settings.lang,
- length: length ?? state.settings.length,
- level: level ?? state.settings.level,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultGameSettings.parameterCodeLang:
- return GameSettings.getLangValueFromUnsafe(state.settings.lang);
- case DefaultGameSettings.parameterCodeLength:
- return GameSettings.getLengthValueFromUnsafe(state.settings.length);
- case DefaultGameSettings.parameterCodeLevel:
- return GameSettings.getLevelValueFromUnsafe(state.settings.level);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String lang = code == DefaultGameSettings.parameterCodeLang
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeLang);
- final String length = code == DefaultGameSettings.parameterCodeLength
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeLength);
- final String level = code == DefaultGameSettings.parameterCodeLevel
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeLevel);
-
- setValues(
- lang: lang,
- length: length,
- level: level,
- );
- }
-
- @override
- GameSettingsState? fromJson(Map<String, dynamic> json) {
- final String lang = json[DefaultGameSettings.parameterCodeLang] as String;
- final String length = json[DefaultGameSettings.parameterCodeLength] as String;
- final String level = json[DefaultGameSettings.parameterCodeLevel] as String;
-
- return GameSettingsState(
- settings: GameSettings(
- lang: lang,
- length: length,
- level: level,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameSettingsState state) {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeLang: state.settings.lang,
- DefaultGameSettings.parameterCodeLength: state.settings.length,
- DefaultGameSettings.parameterCodeLevel: state.settings.level,
- };
- }
-}
diff --git a/lib/cubit/settings_game_state.dart b/lib/cubit/settings_game_state.dart
deleted file mode 100644
index 5acd85b44ba541e1c5e9c26af1c4be26a385b9ed..0000000000000000000000000000000000000000
--- a/lib/cubit/settings_game_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'settings_game_cubit.dart';
-
-@immutable
-class GameSettingsState extends Equatable {
- const GameSettingsState({
- required this.settings,
- });
-
- final GameSettings settings;
-
- @override
- List<dynamic> get props => <dynamic>[
- settings,
- ];
-}
diff --git a/lib/main.dart b/lib/main.dart
index b7bb10d681f14e09657618d284d57556d62c74ed..e7543fa95794fc9c66e526e51e64b4873ce66ced 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,11 +4,14 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:momomotus/config/application_config.dart';
import 'package:momomotus/config/default_global_settings.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
-import 'package:momomotus/cubit/nav_cubit.dart';
-import 'package:momomotus/cubit/settings_game_cubit.dart';
-import 'package:momomotus/cubit/settings_global_cubit.dart';
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
+import 'package:momomotus/cubit/settings/settings_activity_cubit.dart';
+import 'package:momomotus/cubit/settings/settings_global_cubit.dart';
import 'package:momomotus/ui/skeleton.dart';
void main() async {
@@ -46,17 +49,30 @@ class MyApp extends StatelessWidget {
return MultiBlocProvider(
providers: [
- BlocProvider<NavCubit>(create: (context) => NavCubit()),
+ // default providers
+ BlocProvider<NavCubitPage>(
+ create: (context) => NavCubitPage(),
+ ),
+ BlocProvider<NavCubitScreen>(
+ create: (context) => NavCubitScreen(),
+ ),
BlocProvider<ApplicationThemeModeCubit>(
- create: (context) => ApplicationThemeModeCubit()),
- BlocProvider<GameCubit>(create: (context) => GameCubit()),
- BlocProvider<GlobalSettingsCubit>(create: (context) => GlobalSettingsCubit()),
- BlocProvider<GameSettingsCubit>(create: (context) => GameSettingsCubit()),
+ create: (context) => ApplicationThemeModeCubit(),
+ ),
+ BlocProvider<ActivityCubit>(
+ create: (context) => ActivityCubit(),
+ ),
+ BlocProvider<GlobalSettingsCubit>(
+ create: (context) => GlobalSettingsCubit(),
+ ),
+ BlocProvider<ActivitySettingsCubit>(
+ create: (context) => ActivitySettingsCubit(),
+ ),
],
child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>(
builder: (BuildContext context, ApplicationThemeModeState state) {
return MaterialApp(
- title: 'Momomotus',
+ title: ApplicationConfig.appTitle,
home: const SkeletonScreen(),
// Theme stuff
diff --git a/lib/models/game/game.dart b/lib/models/activity/activity.dart
similarity index 75%
rename from lib/models/game/game.dart
rename to lib/models/activity/activity.dart
index 860d30afaf467a153d88f63c6f01d387bd1f4843..51a298747e89e79d01300bdd5857ffdc9e81126b 100644
--- a/lib/models/game/game.dart
+++ b/lib/models/activity/activity.dart
@@ -1,14 +1,14 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/config/default_game_settings.dart';
+import 'package:momomotus/config/default_activity_settings.dart';
import 'package:momomotus/data/fetch_data_helper.dart';
-import 'package:momomotus/models/settings/settings_game.dart';
+import 'package:momomotus/models/settings/settings_activity.dart';
import 'package:momomotus/models/settings/settings_global.dart';
-class Game {
- Game({
+class Activity {
+ Activity({
// Settings
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
// State
@@ -28,7 +28,7 @@ class Game {
});
// Settings
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
// State
@@ -46,10 +46,10 @@ class Game {
List<String> guesses;
bool foundWord;
- factory Game.createEmpty() {
- return Game(
+ factory Activity.createEmpty() {
+ return Activity(
// Settings
- gameSettings: GameSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(),
globalSettings: GlobalSettings.createDefault(),
// Base data
word: '',
@@ -59,30 +59,31 @@ class Game {
);
}
- factory Game.createNew({
- GameSettings? gameSettings,
+ factory Activity.createNew({
+ ActivitySettings? activitySettings,
GlobalSettings? globalSettings,
}) {
- final GameSettings newGameSettings = gameSettings ?? GameSettings.createDefault();
+ final ActivitySettings newActivitySettings =
+ activitySettings ?? ActivitySettings.createDefault();
final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
final String pickedWord = FetchDataHelper().getRandomWord(
- lang: newGameSettings.lang,
- length: newGameSettings.length,
- level: newGameSettings.level,
+ lang: newActivitySettings.lang,
+ length: newActivitySettings.length,
+ level: newActivitySettings.level,
);
final List<String> dictionary = FetchDataHelper().getDictionary(
- lang: newGameSettings.lang,
- length: newGameSettings.length,
+ lang: newActivitySettings.lang,
+ length: newActivitySettings.length,
);
// Starts with first letter revealed
final String foundLetters = pickedWord.substring(0, 1).padRight(pickedWord.length, ' ');
- return Game(
+ return Activity(
// Settings
- gameSettings: newGameSettings,
+ activitySettings: newActivitySettings,
globalSettings: newGlobalSettings,
// State
isRunning: true,
@@ -98,7 +99,7 @@ class Game {
bool get canBeResumed => isStarted && !isFinished;
bool get gameWon => isRunning && isStarted && isFinished;
bool get isFinished {
- if (foundWord || (guesses.length >= DefaultGameSettings.maxGuessesCount)) {
+ if (foundWord || (guesses.length >= DefaultActivitySettings.maxGuessesCount)) {
return true;
}
@@ -106,7 +107,7 @@ class Game {
}
bool checkWordIsValid(String candidate) {
- final int length = int.parse(gameSettings.length);
+ final int length = int.parse(activitySettings.length);
return (word.length == length) &&
(candidate.length == length) &&
@@ -117,9 +118,9 @@ class Game {
printlog('');
printlog('## Current game dump:');
printlog('');
- printlog('$Game:');
+ printlog('$Activity:');
printlog(' Settings');
- gameSettings.dump();
+ activitySettings.dump();
globalSettings.dump();
printlog(' State');
printlog(' isRunning: $isRunning');
@@ -139,13 +140,13 @@ class Game {
@override
String toString() {
- return '$Game(${toJson()})';
+ return '$Activity(${toJson()})';
}
Map<String, dynamic>? toJson() {
return <String, dynamic>{
// Settings
- 'gameSettings': gameSettings.toJson(),
+ 'activitySettings': activitySettings.toJson(),
'globalSettings': globalSettings.toJson(),
// State
'isRunning': isRunning,
diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart
new file mode 100644
index 0000000000000000000000000000000000000000..eb9f6a85ba71503e2c9881426854575a54aa8d5c
--- /dev/null
+++ b/lib/models/settings/settings_activity.dart
@@ -0,0 +1,68 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:momomotus/config/default_activity_settings.dart';
+
+class ActivitySettings {
+ final String lang;
+ final String length;
+ final String level;
+
+ ActivitySettings({
+ required this.lang,
+ required this.length,
+ required this.level,
+ });
+
+ static String getLangValueFromUnsafe(String lang) {
+ if (DefaultActivitySettings.allowedLangValues.contains(lang)) {
+ return lang;
+ }
+
+ return DefaultActivitySettings.defaultLangValue;
+ }
+
+ static String getLengthValueFromUnsafe(String length) {
+ if (DefaultActivitySettings.allowedLengthValues.contains(length)) {
+ return length;
+ }
+
+ return DefaultActivitySettings.defaultLengthValue;
+ }
+
+ static String getLevelValueFromUnsafe(String level) {
+ if (DefaultActivitySettings.allowedLevelValues.contains(level)) {
+ return level;
+ }
+
+ return DefaultActivitySettings.defaultLevelValue;
+ }
+
+ factory ActivitySettings.createDefault() {
+ return ActivitySettings(
+ lang: DefaultActivitySettings.defaultLangValue,
+ length: DefaultActivitySettings.defaultLengthValue,
+ level: DefaultActivitySettings.defaultLevelValue,
+ );
+ }
+
+ void dump() {
+ printlog('$ActivitySettings:');
+ printlog(' ${DefaultActivitySettings.parameterCodeLang}: $lang');
+ printlog(' ${DefaultActivitySettings.parameterCodeLength}: $length');
+ printlog(' ${DefaultActivitySettings.parameterCodeLevel}: $level');
+ printlog('');
+ }
+
+ @override
+ String toString() {
+ return '$ActivitySettings(${toJson()})';
+ }
+
+ Map<String, dynamic>? toJson() {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeLang: lang,
+ DefaultActivitySettings.parameterCodeLength: length,
+ DefaultActivitySettings.parameterCodeLevel: level,
+ };
+ }
+}
diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart
deleted file mode 100644
index 204a85c29d3b548d74a7f47ef4257ec23567980a..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_game.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:momomotus/config/default_game_settings.dart';
-
-class GameSettings {
- final String lang;
- final String length;
- final String level;
-
- GameSettings({
- required this.lang,
- required this.length,
- required this.level,
- });
-
- static String getLangValueFromUnsafe(String lang) {
- if (DefaultGameSettings.allowedLangValues.contains(lang)) {
- return lang;
- }
-
- return DefaultGameSettings.defaultLangValue;
- }
-
- static String getLengthValueFromUnsafe(String length) {
- if (DefaultGameSettings.allowedLengthValues.contains(length)) {
- return length;
- }
-
- return DefaultGameSettings.defaultLengthValue;
- }
-
- static String getLevelValueFromUnsafe(String level) {
- if (DefaultGameSettings.allowedLevelValues.contains(level)) {
- return level;
- }
-
- return DefaultGameSettings.defaultLevelValue;
- }
-
- factory GameSettings.createDefault() {
- return GameSettings(
- lang: DefaultGameSettings.defaultLangValue,
- length: DefaultGameSettings.defaultLengthValue,
- level: DefaultGameSettings.defaultLevelValue,
- );
- }
-
- void dump() {
- printlog('$GameSettings:');
- printlog(' ${DefaultGameSettings.parameterCodeLang}: $lang');
- printlog(' ${DefaultGameSettings.parameterCodeLength}: $length');
- printlog(' ${DefaultGameSettings.parameterCodeLevel}: $level');
- printlog('');
- }
-
- @override
- String toString() {
- return '$GameSettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeLang: lang,
- DefaultGameSettings.parameterCodeLength: length,
- DefaultGameSettings.parameterCodeLevel: level,
- };
- }
-}
diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart
index fa51dfb636d3e3d2376c1bce96372af69e0b1a99..d611b5aeb2a2bee78ad91ca5a15e217ed481115f 100644
--- a/lib/ui/game/game_end.dart
+++ b/lib/ui/game/game_end.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
-import 'package:momomotus/models/game/game.dart';
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
+import 'package:momomotus/models/activity/activity.dart';
import 'package:momomotus/ui/widgets/actions/button_game_quit.dart';
class GameEndWidget extends StatelessWidget {
@@ -10,13 +10,13 @@ class GameEndWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
final Image decorationImage = Image(
image: AssetImage(
- currentGame.gameWon ? 'assets/ui/game_win.png' : 'assets/ui/game_fail.png'),
+ currentActivity.gameWon ? 'assets/ui/game_win.png' : 'assets/ui/game_fail.png'),
fit: BoxFit.fill,
);
@@ -31,7 +31,7 @@ class GameEndWidget extends StatelessWidget {
),
Column(
children: [
- currentGame.animationInProgress == true
+ currentActivity.animationInProgress == true
? decorationImage
: const QuitGameButton()
],
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
deleted file mode 100644
index ef9a97965a5b8da3d0a3c2d55cface643b7b11d2..0000000000000000000000000000000000000000
--- a/lib/ui/layouts/parameters_layout.dart
+++ /dev/null
@@ -1,141 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:momomotus/config/default_game_settings.dart';
-import 'package:momomotus/config/default_global_settings.dart';
-import 'package:momomotus/cubit/settings_game_cubit.dart';
-import 'package:momomotus/cubit/settings_global_cubit.dart';
-import 'package:momomotus/ui/parameters/parameter_widget.dart';
-import 'package:momomotus/ui/widgets/actions/button_delete_saved_game.dart';
-import 'package:momomotus/ui/widgets/actions/button_game_start_new.dart';
-import 'package:momomotus/ui/widgets/actions/button_resume_saved_game.dart';
-
-class ParametersLayout extends StatelessWidget {
- const ParametersLayout({super.key, required this.canResume});
-
- final bool canResume;
-
- final double separatorHeight = 8.0;
-
- @override
- Widget build(BuildContext context) {
- final List<Widget> lines = [];
-
- // Game settings
- for (String code in DefaultGameSettings.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 (canResume == false) {
- // Start new game
- lines.add(
- const AspectRatio(
- aspectRatio: 3,
- child: StartNewGameButton(),
- ),
- );
- } else {
- // Resume game
- lines.add(const AspectRatio(
- aspectRatio: 3,
- child: ResumeSavedGameButton(),
- ));
- // Delete saved game
- lines.add(SizedBox.square(
- dimension: MediaQuery.of(context).size.width / 5,
- child: const DeleteSavedGameButton(),
- ));
- }
-
- 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)
- : DefaultGameSettings.getAvailableValues(code);
-
- if (availableValues.length <= 1) {
- return [];
- }
-
- for (String value in availableValues) {
- final Widget parameterButton = BlocBuilder<GameSettingsCubit, GameSettingsState>(
- builder: (BuildContext context, GameSettingsState gameSettingsState) {
- return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
- builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
- final GameSettingsCubit gameSettingsCubit =
- BlocProvider.of<GameSettingsCubit>(context);
- final GlobalSettingsCubit globalSettingsCubit =
- BlocProvider.of<GlobalSettingsCubit>(context);
-
- final String currentValue = isGlobal
- ? globalSettingsCubit.getParameterValue(code)
- : gameSettingsCubit.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,
- gameSettings: gameSettingsState.settings,
- globalSettings: globalSettingsState.settings,
- onPressed: () {
- isGlobal
- ? globalSettingsCubit.setParameterValue(code, value)
- : gameSettingsCubit.setParameterValue(code, value);
- },
- ),
- );
- },
- );
- },
- );
-
- parameterButtons.add(parameterButton);
- }
-
- return parameterButtons;
- }
-}
diff --git a/lib/ui/screens/page_game.dart b/lib/ui/screens/page_game.dart
deleted file mode 100644
index e8895b062b9f54abd3ff2023e412a150733dc15a..0000000000000000000000000000000000000000
--- a/lib/ui/screens/page_game.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:momomotus/cubit/game_cubit.dart';
-import 'package:momomotus/models/game/game.dart';
-import 'package:momomotus/ui/layouts/game_layout.dart';
-import 'package:momomotus/ui/layouts/parameters_layout.dart';
-
-class PageGame extends StatelessWidget {
- const PageGame({super.key});
-
- @override
- Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
-
- return currentGame.isRunning
- ? const GameLayout()
- : ParametersLayout(canResume: currentGame.canBeResumed);
- },
- );
- }
-}
diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart
index f232cf1411274d16aa18ee830e22fc3cbb885318..31690291ed7486ff822b8c2d3a1de4ebae2663aa 100644
--- a/lib/ui/skeleton.dart
+++ b/lib/ui/skeleton.dart
@@ -1,34 +1,37 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/config/menu.dart';
-import 'package:momomotus/cubit/nav_cubit.dart';
-import 'package:momomotus/ui/widgets/global_app_bar.dart';
+import 'package:momomotus/common/config/activity_page.dart';
+import 'package:momomotus/common/config/screen.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:momomotus/common/ui/nav/global_app_bar.dart';
+import 'package:momomotus/common/ui/nav/bottom_nav_bar.dart';
class SkeletonScreen extends StatelessWidget {
const SkeletonScreen({super.key});
@override
Widget build(BuildContext context) {
- return Scaffold(
- appBar: const GlobalAppBar(),
- extendBodyBehindAppBar: false,
- body: Material(
- color: Theme.of(context).colorScheme.surface,
- child: BlocBuilder<NavCubit, int>(
- builder: (BuildContext context, int pageIndex) {
- return Padding(
+ return BlocBuilder<NavCubitScreen, int>(
+ builder: (BuildContext context, int screenIndex) {
+ return Scaffold(
+ appBar: const GlobalAppBar(),
+ extendBodyBehindAppBar: false,
+ body: Material(
+ color: Theme.of(context).colorScheme.surface,
+ child: Padding(
padding: const EdgeInsets.only(
top: 8,
left: 2,
right: 2,
),
- child: Menu.getPageWidget(pageIndex),
- );
- },
- ),
- ),
- backgroundColor: Theme.of(context).colorScheme.surface,
+ child: Screen.getWidget(screenIndex),
+ ),
+ ),
+ backgroundColor: Theme.of(context).colorScheme.surface,
+ bottomNavigationBar: ActivityPage.displayBottomNavBar ? const BottomNavBar() : null,
+ );
+ },
);
}
}
diff --git a/lib/ui/widgets/actions/button_delete_saved_game.dart b/lib/ui/widgets/actions/button_delete_saved_game.dart
index be5c02da1de3b327d5cafe915fdcec2c1913ca88..cf0a876fe44957284f006fbc50a31e4fd38d85a9 100644
--- a/lib/ui/widgets/actions/button_delete_saved_game.dart
+++ b/lib/ui/widgets/actions/button_delete_saved_game.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
class DeleteSavedGameButton extends StatelessWidget {
const DeleteSavedGameButton({super.key});
@@ -11,7 +11,7 @@ class DeleteSavedGameButton extends StatelessWidget {
return StyledButton(
color: Colors.grey,
onPressed: () {
- BlocProvider.of<GameCubit>(context).deleteSavedGame();
+ BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
},
child: const Image(
image: AssetImage('assets/ui/button_delete_saved_game.png'),
diff --git a/lib/ui/widgets/actions/button_game_quit.dart b/lib/ui/widgets/actions/button_game_quit.dart
index 6aed8155630401a914c6862382357afe23f0d083..524cde9f5ee789f3359fcecb2057e2a3b2687e15 100644
--- a/lib/ui/widgets/actions/button_game_quit.dart
+++ b/lib/ui/widgets/actions/button_game_quit.dart
@@ -1,7 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
class QuitGameButton extends StatelessWidget {
const QuitGameButton({super.key});
@@ -11,7 +13,8 @@ class QuitGameButton extends StatelessWidget {
return StyledButton(
color: Colors.red,
onPressed: () {
- BlocProvider.of<GameCubit>(context).quitGame();
+ BlocProvider.of<ActivityCubit>(context).quitActivity();
+ BlocProvider.of<NavCubitPage>(context).goToPageHome();
},
child: const Image(
image: AssetImage('assets/ui/button_back.png'),
diff --git a/lib/ui/widgets/actions/button_game_start_new.dart b/lib/ui/widgets/actions/button_game_start_new.dart
index 56acac40c67ae3c07224f27ef24c17737d986ebf..402883b8689598a4a3bc9ff857e4ec4ec1c800fa 100644
--- a/lib/ui/widgets/actions/button_game_start_new.dart
+++ b/lib/ui/widgets/actions/button_game_start_new.dart
@@ -1,26 +1,29 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
-import 'package:momomotus/cubit/settings_game_cubit.dart';
-import 'package:momomotus/cubit/settings_global_cubit.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
+import 'package:momomotus/cubit/settings/settings_activity_cubit.dart';
+import 'package:momomotus/cubit/settings/settings_global_cubit.dart';
class StartNewGameButton extends StatelessWidget {
const StartNewGameButton({super.key});
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameSettingsCubit, GameSettingsState>(
- builder: (BuildContext context, GameSettingsState gameSettingsState) {
+ return BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
+ builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
return StyledButton(
color: Colors.blue,
onPressed: () {
- BlocProvider.of<GameCubit>(context).startNewGame(
- gameSettings: gameSettingsState.settings,
+ BlocProvider.of<ActivityCubit>(context).startNewActivity(
+ activitySettings: activitySettingsState.settings,
globalSettings: globalSettingsState.settings,
);
+ BlocProvider.of<NavCubitPage>(context).goToPageGame();
},
child: const Image(
image: AssetImage('assets/ui/button_start.png'),
diff --git a/lib/ui/widgets/actions/button_resume_saved_game.dart b/lib/ui/widgets/actions/button_resume_saved_game.dart
index 694bc450bd366eee3517e7a3fc6ec6290d9334f7..c3868de518f65530705f8aeea5c70cbca411bde3 100644
--- a/lib/ui/widgets/actions/button_resume_saved_game.dart
+++ b/lib/ui/widgets/actions/button_resume_saved_game.dart
@@ -1,7 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
+import 'package:momomotus/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
class ResumeSavedGameButton extends StatelessWidget {
const ResumeSavedGameButton({super.key});
@@ -11,7 +13,8 @@ class ResumeSavedGameButton extends StatelessWidget {
return StyledButton(
color: Colors.blue,
onPressed: () {
- BlocProvider.of<GameCubit>(context).resumeSavedGame();
+ BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
+ BlocProvider.of<NavCubitPage>(context).goToPageGame();
},
child: const Image(
image: AssetImage('assets/ui/button_resume_game.png'),
diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
index d922839b0bbafc2a8e5674d1b697417be314ef4d..a7317c92f6da969833be07662ffb19beb6409729 100644
--- a/lib/ui/widgets/game/game_board.dart
+++ b/lib/ui/widgets/game/game_board.dart
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/config/default_game_settings.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
-import 'package:momomotus/models/game/game.dart';
+import 'package:momomotus/config/default_activity_settings.dart';
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
+import 'package:momomotus/models/activity/activity.dart';
import 'package:momomotus/ui/widgets/game/game_cell.dart';
class GameBoardWidget extends StatelessWidget {
@@ -11,15 +11,15 @@ class GameBoardWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
+ final ActivityCubit activityCubit = BlocProvider.of<ActivityCubit>(context);
- const int maxGuessesCount = DefaultGameSettings.maxGuessesCount;
- final int wordLength = int.parse(currentGame.gameSettings.length);
+ const int maxGuessesCount = DefaultActivitySettings.maxGuessesCount;
+ final int wordLength = int.parse(currentActivity.activitySettings.length);
- final List<String> guesses = currentGame.guesses;
+ final List<String> guesses = currentActivity.guesses;
List<TableRow> tableRows = [];
for (int lineIndex = 0; lineIndex < maxGuessesCount; lineIndex++) {
@@ -27,10 +27,10 @@ class GameBoardWidget extends StatelessWidget {
if (lineIndex < guesses.length) {
word = guesses[lineIndex];
} else if (lineIndex == guesses.length) {
- word = currentGame.currentGuess;
+ word = currentActivity.currentGuess;
}
- final List<String> tips = gameCubit.getTips(word);
+ final List<String> tips = activityCubit.getTips(word);
List<TableCell> tableCells = [];
for (int colIndex = 0; colIndex < wordLength; colIndex++) {
@@ -44,13 +44,13 @@ class GameBoardWidget extends StatelessWidget {
cellTip = tips[colIndex];
}
- final bool hasFocus = (!currentGame.foundWord) &&
+ final bool hasFocus = (!currentActivity.foundWord) &&
(lineIndex == guesses.length) &&
(colIndex == word.length);
final String foundLetter =
- ((!currentGame.foundWord) && (lineIndex == guesses.length))
- ? currentGame.foundLetters.substring(colIndex, colIndex + 1)
+ ((!currentActivity.foundWord) && (lineIndex == guesses.length))
+ ? currentActivity.foundLetters.substring(colIndex, colIndex + 1)
: ' ';
tableCells.add(TableCell(
@@ -86,9 +86,9 @@ class GameBoardWidget extends StatelessWidget {
}
// Failed -> show word
- if (currentGame.isFinished && !currentGame.gameWon) {
+ if (currentActivity.isFinished && !currentActivity.gameWon) {
gameBoard.add(Text(
- currentGame.word,
+ currentActivity.word,
style: const TextStyle(
fontSize: 40,
fontWeight: FontWeight.bold,
diff --git a/lib/ui/widgets/game/game_cell.dart b/lib/ui/widgets/game/game_cell.dart
index c00701c996aa563c55ab1a6717fc26bd5ddcd423..b9404ada4e63bf25576f35564f68cc34caa64faa 100644
--- a/lib/ui/widgets/game/game_cell.dart
+++ b/lib/ui/widgets/game/game_cell.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
-import 'package:momomotus/models/game/game.dart';
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
+import 'package:momomotus/models/activity/activity.dart';
class GameCellWidget extends StatelessWidget {
const GameCellWidget({
@@ -20,11 +20,11 @@ class GameCellWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
- final String skin = currentGame.globalSettings.skin;
+ final String skin = currentActivity.globalSettings.skin;
const Color textColor = Colors.white;
final Color focusBorderColor = Colors.yellow.shade700;
diff --git a/lib/ui/widgets/game/key.dart b/lib/ui/widgets/game/key.dart
index f93fb93b3e3a450f4b4f0b813a3c96527921c5aa..34a5c43f14766d229d508e3ac30b648de5680745 100644
--- a/lib/ui/widgets/game/key.dart
+++ b/lib/ui/widgets/game/key.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:momomotus/cubit/game_cubit.dart';
+import 'package:momomotus/cubit/activity/activity_cubit.dart';
class KeyWidget extends StatelessWidget {
const KeyWidget({
@@ -49,11 +49,11 @@ class KeyWidget extends StatelessWidget {
),
onPressed: () {
if (caption == '<') {
- BlocProvider.of<GameCubit>(context).currentGuessRemoveLetter();
+ BlocProvider.of<ActivityCubit>(context).currentGuessRemoveLetter();
} else if (caption == '!') {
- BlocProvider.of<GameCubit>(context).submitWord();
+ BlocProvider.of<ActivityCubit>(context).submitWord();
} else if (caption != ' ') {
- BlocProvider.of<GameCubit>(context).currentGuessAddLetter(caption);
+ BlocProvider.of<ActivityCubit>(context).currentGuessAddLetter(caption);
}
},
),
diff --git a/pubspec.lock b/pubspec.lock
index 011ee2e27741f0e29cbc4b4aac803190885ffbae..5f7d30f1d27f049d10d751142b1e10ef2a65d726 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -245,10 +245,10 @@ packages:
dependency: transitive
description:
name: path_provider
- sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+ sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
url: "https://pub.dev"
source: hosted
- version: "2.1.4"
+ version: "2.1.5"
path_provider_android:
dependency: transitive
description:
@@ -442,10 +442,10 @@ packages:
dependency: transitive
description:
name: win32
- sha256: "2735daae5150e8b1dfeb3eb0544b4d3af0061e9e82cef063adcd583bdae4306a"
+ sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454"
url: "https://pub.dev"
source: hosted
- version: "5.7.0"
+ version: "5.7.2"
xdg_directories:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index c2c74e3d57134a802ab23380ee1fc9a85d206c35..2eb6e9d94f1ae405dbf1230d30258489ac78cace 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A motus-like game application.
publish_to: "none"
-version: 0.3.1+36
+version: 0.4.0+37
environment:
sdk: "^3.0.0"