diff --git a/assets/translations/en.json b/assets/translations/en.json
index bee067fabfa853ccf17fe49031ee56c06a778293..0aa5e15bdf78b6ad3db5666f6f12ec178983c835 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -1,6 +1,9 @@
{
"app_name": "Word guess",
+ "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 51afd63375a5f83f8579342d6886dbaa186a196e..bee351151059edf98603d2664657ea9a1e22792c 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -1,6 +1,9 @@
{
"app_name": "Trouve le mot",
+ "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/71.txt b/fastlane/metadata/android/en-US/changelogs/71.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ac2c90e221caf3cf01ebba168fb16a8f31c0253a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/71.txt
@@ -0,0 +1 @@
+Normalize Activity application architecture.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/71.txt b/fastlane/metadata/android/fr-FR/changelogs/71.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1d6843d89ba84ea4147528bc3d62d9ecf1a4a762
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/71.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..895d17101b3572637f8c67353ad552ecadb80e4a
--- /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:wordguessing/common/ui/pages/game.dart';
+import 'package:wordguessing/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..b8ad8b289e91dab288071d56465ecfa1b6aee8d4
--- /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:wordguessing/common/ui/screens/about.dart';
+import 'package:wordguessing/common/ui/screens/activity.dart';
+import 'package:wordguessing/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..16d3115c183ab246b0a598cca486e5ca73df0b0c
--- /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:wordguessing/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..4baa98187a8c9eff28babec1ddcc80a573d5724b
--- /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:wordguessing/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..2f75ce621c7f284546e51228bcfe0d4b7173a734
--- /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:wordguessing/common/config/activity_page.dart';
+import 'package:wordguessing/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 6c7d515394f5316c5732def268da72f0c671549e..fb05e9507b2984d4fd9ee692d617f925181e0760 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:wordguessing/config/menu.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
-import 'package:wordguessing/cubit/nav_cubit.dart';
-import 'package:wordguessing/models/game/game.dart';
+import 'package:wordguessing/common/config/screen.dart';
+import 'package:wordguessing/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:wordguessing/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
+import 'package:wordguessing/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 63%
rename from lib/ui/layouts/game_layout.dart
rename to lib/common/ui/pages/game.dart
index 522251ecf4380d6c2a2e95fd22c33164cfaf6199..f9dbfc04520ea1b0f265a6766a64e7fe38ccd94b 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:wordguessing/cubit/game_cubit.dart';
-import 'package:wordguessing/models/game/game.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
+import 'package:wordguessing/models/activity/activity.dart';
import 'package:wordguessing/ui/game/game_end.dart';
import 'package:wordguessing/ui/game/game_top.dart';
import 'package:wordguessing/ui/widgets/game/game_board.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,
@@ -27,7 +27,7 @@ class GameLayout extends StatelessWidget {
const SizedBox(height: 8),
const GameBoardWidget(),
const Expanded(child: SizedBox.shrink()),
- currentGame.isFinished ? const GameEndWidget() : const SizedBox.shrink(),
+ currentActivity.isFinished ? const GameEndWidget() : const SizedBox.shrink(),
],
),
);
diff --git a/lib/common/ui/pages/parameters.dart b/lib/common/ui/pages/parameters.dart
new file mode 100644
index 0000000000000000000000000000000000000000..aba79a2d11e9009308d150b5ba3b8ee2fdd8a326
--- /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: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';
+import 'package:wordguessing/ui/widgets/actions/button_delete_saved_game.dart';
+import 'package:wordguessing/ui/widgets/actions/button_game_start_new.dart';
+import 'package:wordguessing/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 91%
rename from lib/ui/parameters/parameter_painter.dart
rename to lib/common/ui/parameters/parameter_painter.dart
index b93d97aa95057d98653330395d7fc5d70d457607..0d37a6d612c06662f586e07c6deb4b00e925fda0 100644
--- a/lib/ui/parameters/parameter_painter.dart
+++ b/lib/common/ui/parameters/parameter_painter.dart
@@ -3,20 +3,20 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/models/settings/settings_game.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.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
});
final String code;
final String value;
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
@override
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
similarity index 82%
rename from lib/ui/parameters/parameter_widget.dart
rename to lib/common/ui/parameters/parameter_widget.dart
index 88296f0cf44bf0795973c4f68542409e18190142..f4320d747ea0e4d9c21bfbc27de418f31cfe83aa 100644
--- a/lib/ui/parameters/parameter_widget.dart
+++ b/lib/common/ui/parameters/parameter_widget.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/config/default_game_settings.dart';
-import 'package:wordguessing/models/settings/settings_game.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 {
@@ -12,7 +12,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,
});
@@ -21,7 +21,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;
@@ -35,10 +35,10 @@ class ParameterWidget extends StatelessWidget {
Widget content = const SizedBox.shrink();
switch (code) {
- case DefaultGameSettings.parameterCodeGameType:
+ case DefaultActivitySettings.parameterCodeGameType:
content = getGameTypeParameterItem();
break;
- case DefaultGameSettings.parameterCodeLangValue:
+ case DefaultActivitySettings.parameterCodeLangValue:
content = getLangValueParameterItem();
break;
default:
@@ -77,7 +77,8 @@ class ParameterWidget extends StatelessWidget {
color: backgroundColor,
onPressed: onPressed,
child: Image(
- image: AssetImage('assets/ui/${DefaultGameSettings.parameterCodeGameType}_$value.png'),
+ image: AssetImage(
+ 'assets/ui/${DefaultActivitySettings.parameterCodeGameType}_$value.png'),
fit: BoxFit.fill,
),
);
@@ -89,10 +90,10 @@ class ParameterWidget extends StatelessWidget {
String text = '';
switch (value) {
- case DefaultGameSettings.langValueFr:
+ case DefaultActivitySettings.langValueFr:
text = '🇫🇷';
break;
- case DefaultGameSettings.langValueEn:
+ case DefaultActivitySettings.langValueEn:
text = '🇬🇧';
break;
default:
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..1201a62efe81a4035cd74901ba56a56457ec2fdb
--- /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:wordguessing/common/config/activity_page.dart';
+import 'package:wordguessing/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..6cbf8d2f5a42969453f21dedb904b073e3e804e6
--- /dev/null
+++ b/lib/config/application_config.dart
@@ -0,0 +1,3 @@
+class ApplicationConfig {
+ static const String appTitle = 'Words Game';
+}
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 1af4f4b60157ea1f1f4c5ea2acdd11682ccc16e5..4b1971a9ef4f2d1f514c390cd875ba634f363aad 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 parameterCodeGameType = 'type';
static const String parameterCodeLangValue = 'lang';
@@ -33,9 +33,9 @@ class DefaultGameSettings {
static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case parameterCodeGameType:
- return DefaultGameSettings.allowedGameTypeValues;
+ return DefaultActivitySettings.allowedGameTypeValues;
case parameterCodeLangValue:
- return DefaultGameSettings.allowedLangValues;
+ return DefaultActivitySettings.allowedLangValues;
}
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 68f9585c88a8413438e113dd8f261a5bc4d053dd..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:wordguessing/ui/screens/page_about.dart';
-import 'package:wordguessing/ui/screens/page_game.dart';
-import 'package:wordguessing/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..b0e6f6fd3f2fcd7dfbc2a62cf027a1585aefe021
--- /dev/null
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -0,0 +1,112 @@
+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';
+
+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,
+ isFinished: state.currentActivity.isFinished,
+ animationInProgress: state.currentActivity.animationInProgress,
+ // Base data
+ word: state.currentActivity.word,
+ otherWords: state.currentActivity.otherWords,
+ images: state.currentActivity.images,
+ // Game data
+ recentWordsKeys: state.currentActivity.recentWordsKeys,
+ questionsCount: state.currentActivity.questionsCount,
+ goodAnswers: state.currentActivity.goodAnswers,
+ wrongAnswers: state.currentActivity.wrongAnswers,
+ );
+ // game.dump();
+
+ updateState(activity);
+ }
+
+ void startNewActivity({
+ required ActivitySettings activitySettings,
+ required GlobalSettings globalSettings,
+ }) {
+ final Activity newActivity = Activity.createNew(
+ // Settings
+ activitySettings: activitySettings,
+ globalSettings: globalSettings,
+ );
+
+ updateState(newActivity);
+ nextWord();
+
+ 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;
+ state.currentActivity.isFinished = true;
+ refresh();
+ }
+
+ void nextWord() {
+ state.currentActivity.pickNewWord();
+ refresh();
+ }
+
+ void checkWord(word) {
+ if (state.currentActivity.word.key == word.key) {
+ state.currentActivity.goodAnswers++;
+ nextWord();
+ } else {
+ state.currentActivity.wrongAnswers++;
+ }
+ refresh();
+ }
+
+ @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 93ff331fc9d58f117bde1dc9e61e110a8c6318ca..0000000000000000000000000000000000000000
--- a/lib/cubit/game_cubit.dart
+++ /dev/null
@@ -1,112 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:wordguessing/models/game/game.dart';
-import 'package:wordguessing/models/settings/settings_game.dart';
-import 'package:wordguessing/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,
- isFinished: state.currentGame.isFinished,
- animationInProgress: state.currentGame.animationInProgress,
- // Base data
- word: state.currentGame.word,
- otherWords: state.currentGame.otherWords,
- images: state.currentGame.images,
- // Game data
- recentWordsKeys: state.currentGame.recentWordsKeys,
- questionsCount: state.currentGame.questionsCount,
- goodAnswers: state.currentGame.goodAnswers,
- wrongAnswers: state.currentGame.wrongAnswers,
- );
- // game.dump();
-
- updateState(game);
- }
-
- void startNewGame({
- required GameSettings gameSettings,
- required GlobalSettings globalSettings,
- }) {
- final Game newGame = Game.createNew(
- // Settings
- gameSettings: gameSettings,
- globalSettings: globalSettings,
- );
-
- updateState(newGame);
- nextWord();
-
- 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;
- state.currentGame.isFinished = true;
- refresh();
- }
-
- void nextWord() {
- state.currentGame.pickNewWord();
- refresh();
- }
-
- void checkWord(word) {
- if (state.currentGame.word.key == word.key) {
- state.currentGame.goodAnswers++;
- nextWord();
- } else {
- state.currentGame.wrongAnswers++;
- }
- refresh();
- }
-
- @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 192412fa1fe8c704edcc06e93dd56d7c4fc4dc51..0000000000000000000000000000000000000000
--- a/lib/cubit/nav_cubit.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:wordguessing/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..e6ebce1e5fd0c97cceb59c17f72a3c8ccb333aa2
--- /dev/null
+++ b/lib/cubit/settings/settings_activity_cubit.dart
@@ -0,0 +1,72 @@
+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
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 a3cb6c31cb5a8c94904633299de84d44fe50ce90..0000000000000000000000000000000000000000
--- a/lib/cubit/settings_game_cubit.dart
+++ /dev/null
@@ -1,71 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:wordguessing/config/default_game_settings.dart';
-import 'package:wordguessing/models/settings/settings_game.dart';
-
-part 'settings_game_state.dart';
-
-class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
- GameSettingsCubit() : super(GameSettingsState(settings: GameSettings.createDefault()));
-
- void setValues({
- String? gameType,
- String? lang,
- }) {
- emit(
- GameSettingsState(
- settings: GameSettings(
- gameType: gameType ?? state.settings.gameType,
- lang: lang ?? state.settings.lang,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultGameSettings.parameterCodeGameType:
- return GameSettings.getGameTypeValueFromUnsafe(state.settings.gameType);
- case DefaultGameSettings.parameterCodeLangValue:
- return GameSettings.getLangValueFromUnsafe(state.settings.lang);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String gameType = code == DefaultGameSettings.parameterCodeGameType
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeGameType);
- final String lang = code == DefaultGameSettings.parameterCodeLangValue
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeLangValue);
-
- setValues(
- gameType: gameType,
- lang: lang,
- );
- }
-
- @override
- GameSettingsState? fromJson(Map<String, dynamic> json) {
- final String gameType = json[DefaultGameSettings.parameterCodeGameType] as String;
- final String lang = json[DefaultGameSettings.parameterCodeLangValue] as String;
-
- return GameSettingsState(
- settings: GameSettings(
- gameType: gameType,
- lang: lang,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameSettingsState state) {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeGameType: state.settings.gameType,
- DefaultGameSettings.parameterCodeLangValue: state.settings.lang,
- };
- }
-}
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 6734473aba3399e2a55d2a00a5039b0ce57e0c75..674e392f859593cb64c61738d6f1193bbb34b419 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:wordguessing/config/default_game_settings.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
-import 'package:wordguessing/cubit/nav_cubit.dart';
-import 'package:wordguessing/cubit/settings_game_cubit.dart';
-import 'package:wordguessing/cubit/settings_global_cubit.dart';
+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 {
@@ -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: 'Jeux de mots et lettres',
+ title: ApplicationConfig.appTitle,
home: const SkeletonScreen(),
// Theme stuff
@@ -88,8 +104,8 @@ class MyApp extends StatelessWidget {
'placeholder',
];
- for (String gameType in DefaultGameSettings.allowedGameTypeValues) {
- gameImages.add('${DefaultGameSettings.parameterCodeGameType}_$gameType');
+ for (String gameType in DefaultActivitySettings.allowedGameTypeValues) {
+ gameImages.add('${DefaultActivitySettings.parameterCodeGameType}_$gameType');
}
for (String image in gameImages) {
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 cb55e14655d947d7783bbd3f413d65cb257650e2..a28927fb00e60a2347554575eaa45d28b36c4187 100644
--- a/lib/models/game/game.dart
+++ b/lib/models/activity/activity.dart
@@ -1,15 +1,15 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/config/default_game_settings.dart';
+import 'package:wordguessing/config/default_activity_settings.dart';
import 'package:wordguessing/data/fetch_data_helper.dart';
import 'package:wordguessing/models/data/word.dart';
-import 'package:wordguessing/models/settings/settings_game.dart';
+import 'package:wordguessing/models/settings/settings_activity.dart';
import 'package:wordguessing/models/settings/settings_global.dart';
-class Game {
- Game({
+class Activity {
+ Activity({
// Settings
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
// State
@@ -31,7 +31,7 @@ class Game {
});
// Settings
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
// State
@@ -51,10 +51,10 @@ class Game {
int goodAnswers;
int wrongAnswers;
- factory Game.createEmpty() {
- return Game(
+ factory Activity.createEmpty() {
+ return Activity(
// Settings
- gameSettings: GameSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(),
globalSettings: GlobalSettings.createDefault(),
// Base data
word: Word.createEmpty(),
@@ -65,16 +65,17 @@ 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();
- return Game(
+ return Activity(
// Settings
- gameSettings: newGameSettings,
+ activitySettings: newActivitySettings,
globalSettings: newGlobalSettings,
// State
isRunning: true,
@@ -95,16 +96,17 @@ class Game {
word = newWord;
if (newWord.key != '') {
recentWordsKeys.insert(0, newWord.key);
- recentWordsKeys = recentWordsKeys.take(DefaultGameSettings.recentWordsCount).toList();
+ recentWordsKeys =
+ recentWordsKeys.take(DefaultActivitySettings.recentWordsCount).toList();
}
}
void pickNewWord() {
- switch (gameSettings.gameType) {
- case DefaultGameSettings.gameTypeValuePickImage:
+ switch (activitySettings.gameType) {
+ case DefaultActivitySettings.gameTypeValuePickImage:
pickDataForGamePickImage();
break;
- case DefaultGameSettings.gameTypeValuePickWord:
+ case DefaultActivitySettings.gameTypeValuePickWord:
pickDataForGamePickWord();
break;
default:
@@ -123,13 +125,14 @@ class Game {
int attempts = 0;
do {
final List<Word> words = FetchDataHelper().getWords(
- lang: gameSettings.lang,
- count: DefaultGameSettings.itemsCount,
+ lang: activitySettings.lang,
+ count: DefaultActivitySettings.itemsCount,
);
word = words.take(1).toList()[0];
- if ((words.length == DefaultGameSettings.itemsCount) && !isRecentlyPicked(word.key)) {
+ if ((words.length == DefaultActivitySettings.itemsCount) &&
+ !isRecentlyPicked(word.key)) {
updateWord(word);
final List<Word> pickedImages = [];
@@ -150,13 +153,14 @@ class Game {
int attempts = 0;
do {
final List<Word> words = FetchDataHelper().getWords(
- lang: gameSettings.lang,
- count: DefaultGameSettings.itemsCount,
+ lang: activitySettings.lang,
+ count: DefaultActivitySettings.itemsCount,
);
word = words.take(1).toList()[0];
- if ((words.length >= DefaultGameSettings.itemsCount) && !isRecentlyPicked(word.key)) {
+ if ((words.length >= DefaultActivitySettings.itemsCount) &&
+ !isRecentlyPicked(word.key)) {
updateWord(word);
otherWords = words.skip(1).toList();
images = [word];
@@ -170,9 +174,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');
@@ -193,13 +197,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..876dc4a7f2267c151317537f78fd1319704cee1c
--- /dev/null
+++ b/lib/models/settings/settings_activity.dart
@@ -0,0 +1,55 @@
+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_game.dart b/lib/models/settings/settings_game.dart
deleted file mode 100644
index 94561be8c42133d267842c9d0235d50f3a9365ce..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_game.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:wordguessing/config/default_game_settings.dart';
-
-class GameSettings {
- final String gameType;
- final String lang;
-
- GameSettings({
- required this.gameType,
- required this.lang,
- });
-
- static String getGameTypeValueFromUnsafe(String gameType) {
- if (DefaultGameSettings.allowedGameTypeValues.contains(gameType)) {
- return gameType;
- }
-
- return DefaultGameSettings.defaultGameTypeValue;
- }
-
- static String getLangValueFromUnsafe(String lang) {
- if (DefaultGameSettings.allowedLangValues.contains(lang)) {
- return lang;
- }
-
- return DefaultGameSettings.defaultLangValue;
- }
-
- factory GameSettings.createDefault() {
- return GameSettings(
- gameType: DefaultGameSettings.defaultGameTypeValue,
- lang: DefaultGameSettings.defaultLangValue,
- );
- }
-
- void dump() {
- printlog('$GameSettings:');
- printlog(' ${DefaultGameSettings.parameterCodeGameType}: $gameType');
- printlog(' ${DefaultGameSettings.parameterCodeLangValue}: $lang');
- printlog('');
- }
-
- @override
- String toString() {
- return '$GameSettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeGameType: gameType,
- DefaultGameSettings.parameterCodeLangValue: lang,
- };
- }
-}
diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart
index 7250b06310c321bc2e37fed5ffae41cdf0c137bb..29af58e29871d77de80e794b1b19258524a69150 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:wordguessing/cubit/game_cubit.dart';
-import 'package:wordguessing/models/game/game.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
+import 'package:wordguessing/models/activity/activity.dart';
import 'package:wordguessing/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,
);
@@ -34,7 +34,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 6f1b2bd5531fb6d5e5a4f526cc601c1fdacafe6e..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:wordguessing/config/default_game_settings.dart';
-import 'package:wordguessing/config/default_global_settings.dart';
-import 'package:wordguessing/cubit/settings_game_cubit.dart';
-import 'package:wordguessing/cubit/settings_global_cubit.dart';
-import 'package:wordguessing/ui/parameters/parameter_widget.dart';
-import 'package:wordguessing/ui/widgets/actions/button_delete_saved_game.dart';
-import 'package:wordguessing/ui/widgets/actions/button_game_start_new.dart';
-import 'package:wordguessing/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 e0d9d023f7fd19ff2478c794cabb9730d203f5cc..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:wordguessing/cubit/game_cubit.dart';
-import 'package:wordguessing/models/game/game.dart';
-import 'package:wordguessing/ui/layouts/game_layout.dart';
-import 'package:wordguessing/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 46001b2f042c33c7fadbc9dd6b108bf7b7ca7cc7..7aee5a5a0cb78dd29926d7814fd96446b0713997 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:wordguessing/config/menu.dart';
-import 'package:wordguessing/cubit/nav_cubit.dart';
-import 'package:wordguessing/ui/widgets/global_app_bar.dart';
+import 'package:wordguessing/common/config/activity_page.dart';
+import 'package:wordguessing/common/config/screen.dart';
+import 'package:wordguessing/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:wordguessing/common/ui/nav/global_app_bar.dart';
+import 'package:wordguessing/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 0265777089677e04933e005440088f0b5a68e537..777beb10718e4b047fc06dc1eb86eac41030e247 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:wordguessing/cubit/game_cubit.dart';
+import 'package:wordguessing/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 ad14e1d93e061c6365a4e5ce70e78ee31aa07e01..51d76f9d5b917e8dc212dbfb383f7f5fc40d8faf 100644
--- a/lib/ui/widgets/actions/button_game_quit.dart
+++ b/lib/ui/widgets/actions/button_game_quit.dart
@@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
+import 'package:wordguessing/common/cubit/nav/nav_cubit_pages.dart';
class QuitGameButton extends StatelessWidget {
const QuitGameButton({super.key});
@@ -11,7 +12,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 378ce58ede30f8be18a6937f2dcc6a2a17c49e9a..85202edab6ced3ecebd4b427500a82716e7046c3 100644
--- a/lib/ui/widgets/actions/button_game_start_new.dart
+++ b/lib/ui/widgets/actions/button_game_start_new.dart
@@ -1,26 +1,28 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
-import 'package:wordguessing/cubit/settings_game_cubit.dart';
-import 'package:wordguessing/cubit/settings_global_cubit.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
+import 'package:wordguessing/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:wordguessing/cubit/settings/settings_activity_cubit.dart';
+import 'package:wordguessing/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 0d098e190984b1224cf2e0b54929f279b4647e53..8a1e0e755b46fabec0566beafd72b9c627e29a94 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:wordguessing/cubit/game_cubit.dart';
+import 'package:wordguessing/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:wordguessing/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 4eb6382768d6b49e415f13e8e8057e6126d8f79f..9f54b1adde864cc8dff2eefce3d40a05210f9662 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:wordguessing/config/default_game_settings.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
-import 'package:wordguessing/models/game/game.dart';
+import 'package:wordguessing/config/default_activity_settings.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';
import 'package:wordguessing/ui/widgets/game/game_pick_word.dart';
@@ -13,14 +13,14 @@ class GameBoardWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Center(
- child: BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
+ child: BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
- switch (currentGame.gameSettings.gameType) {
- case DefaultGameSettings.gameTypeValuePickImage:
+ switch (currentActivity.activitySettings.gameType) {
+ case DefaultActivitySettings.gameTypeValuePickImage:
return const GamePickImagePage();
- case DefaultGameSettings.gameTypeValuePickWord:
+ case DefaultActivitySettings.gameTypeValuePickWord:
return const GamePickWordPage();
default:
return const SizedBox.shrink();
diff --git a/lib/ui/widgets/game/pick_image_game_image.dart b/lib/ui/widgets/game/pick_image_game_image.dart
index 9f3c5d491de8f84cadef8f3b0cc6e2b38250d4cb..bea3bd020666c7d4f10fe7fe323e3ba7fcfc2384 100644
--- a/lib/ui/widgets/game/pick_image_game_image.dart
+++ b/lib/ui/widgets/game/pick_image_game_image.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
import 'package:wordguessing/models/data/word.dart';
class PickImageGameImageContainer extends StatelessWidget {
@@ -36,7 +36,7 @@ class PickImageGameImageContainer extends StatelessWidget {
),
),
onPressed: () {
- BlocProvider.of<GameCubit>(context).checkWord(word);
+ BlocProvider.of<ActivityCubit>(context).checkWord(word);
},
);
}
diff --git a/lib/ui/widgets/game/pick_image_game_items.dart b/lib/ui/widgets/game/pick_image_game_items.dart
index c4c80f183e07de05dace9dcd36df5d174100fa4a..5d261b7315aa4fd73a35c3faffaa1c2102067755 100644
--- a/lib/ui/widgets/game/pick_image_game_items.dart
+++ b/lib/ui/widgets/game/pick_image_game_items.dart
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/config/default_game_settings.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
+import 'package:wordguessing/config/default_activity_settings.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
import 'package:wordguessing/models/data/word.dart';
-import 'package:wordguessing/models/game/game.dart';
+import 'package:wordguessing/models/activity/activity.dart';
import 'package:wordguessing/ui/widgets/game/pick_image_game_image.dart';
class PickImageGameItemsContainer extends StatelessWidget {
@@ -12,12 +12,12 @@ class PickImageGameItemsContainer extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
- final List<Word> images = currentGame.images;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
+ final List<Word> images = currentActivity.images;
- if (images.length != DefaultGameSettings.itemsCount) {
+ if (images.length != DefaultActivitySettings.itemsCount) {
return const SizedBox.shrink();
}
diff --git a/lib/ui/widgets/game/pick_image_game_word.dart b/lib/ui/widgets/game/pick_image_game_word.dart
index 2d044d0689d3766851613e0ef9fdc23e1f404ccb..afa8a71556e8c18c3541ecfff7e8148a8ef8bad1 100644
--- a/lib/ui/widgets/game/pick_image_game_word.dart
+++ b/lib/ui/widgets/game/pick_image_game_word.dart
@@ -1,17 +1,17 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
-import 'package:wordguessing/models/game/game.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
+import 'package:wordguessing/models/activity/activity.dart';
class PickImageGameWordContainer extends StatelessWidget {
const PickImageGameWordContainer({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(
decoration: BoxDecoration(
@@ -25,7 +25,7 @@ class PickImageGameWordContainer extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.all(12),
child: Text(
- currentGame.word.text,
+ currentActivity.word.text,
style: const TextStyle(
fontSize: 30,
fontWeight: FontWeight.w600,
diff --git a/lib/ui/widgets/game/pick_word_game_image_items.dart b/lib/ui/widgets/game/pick_word_game_image_items.dart
index 18abc7a67dd5ce5de45fd7db2fcd21d18db71970..3cd97a89fdf34621777d7f7041627c36729733b6 100644
--- a/lib/ui/widgets/game/pick_word_game_image_items.dart
+++ b/lib/ui/widgets/game/pick_word_game_image_items.dart
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
import 'package:wordguessing/models/data/word.dart';
-import 'package:wordguessing/models/game/game.dart';
+import 'package:wordguessing/models/activity/activity.dart';
import 'package:wordguessing/ui/widgets/game/pick_word_game_image.dart';
class PickWordGameImageItemsContainer extends StatelessWidget {
@@ -11,15 +11,15 @@ class PickWordGameImageItemsContainer 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;
- if (currentGame.images.isEmpty) {
+ if (currentActivity.images.isEmpty) {
return const SizedBox.shrink();
}
- final Word word = currentGame.images[0];
+ final Word word = currentActivity.images[0];
return Column(
mainAxisSize: MainAxisSize.min,
diff --git a/lib/ui/widgets/game/pick_word_game_word.dart b/lib/ui/widgets/game/pick_word_game_word.dart
index ef4e8fdbf0d29df7480c50b25ad70de5877213c4..d80e1b230a60bd7823624a06640453c6e6161cbe 100644
--- a/lib/ui/widgets/game/pick_word_game_word.dart
+++ b/lib/ui/widgets/game/pick_word_game_word.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
import 'package:wordguessing/models/data/word.dart';
class PickWordGameWordContainer extends StatelessWidget {
@@ -34,7 +34,7 @@ class PickWordGameWordContainer extends StatelessWidget {
),
),
onPressed: () {
- BlocProvider.of<GameCubit>(context).checkWord(word);
+ BlocProvider.of<ActivityCubit>(context).checkWord(word);
},
),
);
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 3ac501ced8100330a13a267e971a0f600fa89e77..f9ee2bfa234fdc4b11c7bc4eaafbbc8835c98ac8 100644
--- a/lib/ui/widgets/game/pick_word_game_word_items.dart
+++ b/lib/ui/widgets/game/pick_word_game_word_items.dart
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/config/default_game_settings.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
+import 'package:wordguessing/config/default_activity_settings.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
import 'package:wordguessing/models/data/word.dart';
-import 'package:wordguessing/models/game/game.dart';
+import 'package:wordguessing/models/activity/activity.dart';
import 'package:wordguessing/ui/widgets/game/pick_word_game_word.dart';
class PickWordGameWordItemsContainer extends StatelessWidget {
@@ -12,14 +12,14 @@ class PickWordGameWordItemsContainer 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;
- Word? word = currentGame.word;
- List<Word> otherWords = currentGame.otherWords;
+ Word? word = currentActivity.word;
+ List<Word> otherWords = currentActivity.otherWords;
- if (otherWords.length != (DefaultGameSettings.itemsCount - 1)) {
+ if (otherWords.length != (DefaultActivitySettings.itemsCount - 1)) {
return const Column();
}
diff --git a/lib/ui/widgets/game/score_bar.dart b/lib/ui/widgets/game/score_bar.dart
index c43d95c9e3e59c988312181cd4fc38cb26b0792a..15e9362cf416ea5b8edd54eacd00ed35582050a8 100644
--- a/lib/ui/widgets/game/score_bar.dart
+++ b/lib/ui/widgets/game/score_bar.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:wordguessing/cubit/game_cubit.dart';
-import 'package:wordguessing/models/game/game.dart';
+import 'package:wordguessing/cubit/activity/activity_cubit.dart';
+import 'package:wordguessing/models/activity/activity.dart';
import 'package:wordguessing/ui/widgets/indicators/score_indicator.dart';
class ScoreBarWidget extends StatelessWidget {
@@ -10,14 +10,14 @@ class ScoreBarWidget 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 int count = currentGame.questionsCount - 1;
+ final int count = currentActivity.questionsCount - 1;
- final String goodAnswersString = '👍 ${currentGame.goodAnswers}/$count';
- final String wrongAnswersString = '🚩 ${currentGame.wrongAnswers}/$count';
+ final String goodAnswersString = '👍 ${currentActivity.goodAnswers}/$count';
+ final String wrongAnswersString = '🚩 ${currentActivity.wrongAnswers}/$count';
return Container(
padding: const EdgeInsets.all(5),
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 a49bfaf6fa2a2d40edd5eabc5788cb03bc46f747..6ccd2b9cc2f957754ffead6455ecc0d3af9365db 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A wordguessing game application.
publish_to: "none"
-version: 0.4.1+70
+version: 0.5.0+71
environment:
sdk: "^3.0.0"