diff --git a/assets/translations/en.json b/assets/translations/en.json
index ea0863cfe20d575f0292684d30b16489e735793f..1b3459bd174747c360e57ebcf899af35616d50e0 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -1,6 +1,9 @@
{
"app_name": "Sort Game",
+ "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 69c7164b7d4de3fab203042a87de98d00e71d04d..31087aa7a511ef137b85a41e4374d7716f3f2ebd 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -1,6 +1,9 @@
{
"app_name": "Jeu de tri",
+ "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/34.txt b/fastlane/metadata/android/en-US/changelogs/34.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ac2c90e221caf3cf01ebba168fb16a8f31c0253a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/34.txt
@@ -0,0 +1 @@
+Normalize Activity application architecture.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/34.txt b/fastlane/metadata/android/fr-FR/changelogs/34.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1d6843d89ba84ea4147528bc3d62d9ecf1a4a762
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/34.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..9a1c8a95601b851448824993c61db0a5b18e061d
--- /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:sortgame/common/ui/pages/game.dart';
+import 'package:sortgame/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..61cf8c53ae84e5bb04abd071f26a5eb63493901f
--- /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:sortgame/common/ui/screens/about.dart';
+import 'package:sortgame/common/ui/screens/activity.dart';
+import 'package:sortgame/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..e33647d63dffd8766517d201bb89f200261993cb
--- /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:sortgame/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..0ac638e8b1e1131349edbe1522bb4cd57d378d84
--- /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:sortgame/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..511b6878555652fc16764532c706d92b7560de8e
--- /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:sortgame/common/config/activity_page.dart';
+import 'package:sortgame/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 53587818475551a7700dd3cad82a61488ae565c6..0304ea0e4478cbd1db1c5cab9c29f3fa35895f3a 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:sortgame/config/menu.dart';
-import 'package:sortgame/cubit/game_cubit.dart';
-import 'package:sortgame/cubit/nav_cubit.dart';
-import 'package:sortgame/models/game/game.dart';
+import 'package:sortgame/common/config/screen.dart';
+import 'package:sortgame/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:sortgame/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/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 64%
rename from lib/ui/layouts/game_layout.dart
rename to lib/common/ui/pages/game.dart
index d8d81a596042925880c7421f6a5606b91c0420b9..3e384b64fe1f20a16641cacef73a018c63a20733 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:sortgame/cubit/game_cubit.dart';
-import 'package:sortgame/models/game/game.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/models/activity/activity.dart';
import 'package:sortgame/ui/game/game_end.dart';
import 'package:sortgame/ui/game/game_top.dart';
import 'package:sortgame/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,
@@ -28,7 +28,7 @@ class GameLayout extends StatelessWidget {
const GameBoardWidget(),
const SizedBox(height: 8),
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..2d65c459713f66b807d31c2453f83f5c1ed64050
--- /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:sortgame/common/ui/parameters/parameter_widget.dart';
+
+import 'package:sortgame/config/default_activity_settings.dart';
+import 'package:sortgame/config/default_global_settings.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/cubit/settings/settings_activity_cubit.dart';
+import 'package:sortgame/cubit/settings/settings_global_cubit.dart';
+import 'package:sortgame/models/activity/activity.dart';
+import 'package:sortgame/ui/widgets/actions/button_delete_saved_game.dart';
+import 'package:sortgame/ui/widgets/actions/button_game_start_new.dart';
+import 'package:sortgame/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 67232f01ecc3257240efdbd335e6e45e2c21911e..3d24c238a8cd3caaaa0d9c7467e1dcf9f63eb5e1 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:sortgame/models/settings/settings_game.dart';
+import 'package:sortgame/models/settings/settings_activity.dart';
import 'package:sortgame/models/settings/settings_global.dart';
class ParameterPainter extends CustomPainter {
const ParameterPainter({
required this.code,
required this.value,
- required this.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 83%
rename from lib/ui/parameters/parameter_widget.dart
rename to lib/common/ui/parameters/parameter_widget.dart
index 7875d11e0c902f6040ff6d894c09b395ee07ef0e..b00ab5c2e97248230533a00ac49a0901eaabdafc 100644
--- a/lib/ui/parameters/parameter_widget.dart
+++ b/lib/common/ui/parameters/parameter_widget.dart
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:sortgame/config/default_game_settings.dart';
+import 'package:sortgame/config/default_activity_settings.dart';
import 'package:sortgame/config/default_global_settings.dart';
-import 'package:sortgame/models/settings/settings_game.dart';
+import 'package:sortgame/models/settings/settings_activity.dart';
import 'package:sortgame/models/settings/settings_global.dart';
class ParameterWidget extends StatelessWidget {
@@ -13,7 +13,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,
});
@@ -22,7 +22,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;
@@ -36,10 +36,10 @@ class ParameterWidget extends StatelessWidget {
Widget content = const SizedBox.shrink();
switch (code) {
- case DefaultGameSettings.parameterCodeItemsCount:
+ case DefaultActivitySettings.parameterCodeItemsCount:
content = getItemsCountParameterItem();
break;
- case DefaultGameSettings.parameterCodeThemeCode:
+ case DefaultActivitySettings.parameterCodeThemeCode:
content = getCodeThemeParameterItem();
break;
case DefaultGlobalSettings.parameterCodeSkin:
@@ -78,16 +78,16 @@ class ParameterWidget extends StatelessWidget {
Color backgroundColor = Colors.grey;
switch (value) {
- case DefaultGameSettings.itemsCountValueLow:
+ case DefaultActivitySettings.itemsCountValueLow:
backgroundColor = Colors.green;
break;
- case DefaultGameSettings.itemsCountValueMedium:
+ case DefaultActivitySettings.itemsCountValueMedium:
backgroundColor = Colors.orange;
break;
- case DefaultGameSettings.itemsCountValueHigh:
+ case DefaultActivitySettings.itemsCountValueHigh:
backgroundColor = Colors.red;
break;
- case DefaultGameSettings.itemsCountValueVeryHigh:
+ case DefaultActivitySettings.itemsCountValueVeryHigh:
backgroundColor = Colors.purple;
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..b878197c533fcef226c0296a5df3a5c520a9caca
--- /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:sortgame/common/config/activity_page.dart';
+import 'package:sortgame/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..480b435c6cdacf1f52af94ae7b716f14ada5be17
--- /dev/null
+++ b/lib/config/application_config.dart
@@ -0,0 +1,3 @@
+class ApplicationConfig {
+ static const String appTitle = 'SortGame';
+}
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 bc62accbd7069a9819432e15b93d86b71fc03bbf..4605501b80487974b1ccd5707599171e5325d5e4 100644
--- a/lib/config/default_game_settings.dart
+++ b/lib/config/default_activity_settings.dart
@@ -2,7 +2,7 @@ import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:sortgame/data/fetch_data_helper.dart';
-class DefaultGameSettings {
+class DefaultActivitySettings {
// available game parameters codes
static const String parameterCodeItemsCount = 'itemsCount';
static const String parameterCodeThemeCode = 'themeCode';
@@ -34,9 +34,9 @@ class DefaultGameSettings {
static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case parameterCodeItemsCount:
- return DefaultGameSettings.allowedItemsCountValues;
+ return DefaultActivitySettings.allowedItemsCountValues;
case parameterCodeThemeCode:
- return DefaultGameSettings.allowedThemeCodeValues;
+ return DefaultActivitySettings.allowedThemeCodeValues;
}
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 bcd00bfe6466a83cad1627d9561b5c4948ad53db..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:sortgame/ui/screens/page_about.dart';
-import 'package:sortgame/ui/screens/page_game.dart';
-import 'package:sortgame/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..d24764e1d4472d2bccb5d126c6dc5a23d6fb0295
--- /dev/null
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -0,0 +1,105 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:sortgame/models/activity/activity.dart';
+import 'package:sortgame/models/settings/settings_activity.dart';
+import 'package:sortgame/models/settings/settings_global.dart';
+
+part 'activity_state.dart';
+
+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
+ items: state.currentActivity.items,
+ // Game data
+ position: state.currentActivity.position,
+ score: state.currentActivity.score,
+ );
+ // game.dump();
+
+ updateState(activity);
+ }
+
+ void startNewActivity({
+ required ActivitySettings activitySettings,
+ required GlobalSettings globalSettings,
+ }) {
+ final Activity newActivity = Activity.createNew(
+ // Settings
+ 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;
+ state.currentActivity.isFinished = true;
+ refresh();
+ }
+
+ void increasePosition() {
+ state.currentActivity.isStarted = true;
+ if (state.currentActivity.position < state.currentActivity.items.length) {
+ state.currentActivity.increasePosition();
+ } else {
+ state.currentActivity.updateGameIsFinished(true);
+ }
+ refresh();
+ }
+
+ void increaseScore(int increment) {
+ state.currentActivity.increaseScore(increment);
+ 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,
+ };
+ }
+}
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 b46cfe9905c04e349529c320d208665f3a858865..0000000000000000000000000000000000000000
--- a/lib/cubit/game_cubit.dart
+++ /dev/null
@@ -1,105 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:sortgame/models/game/game.dart';
-import 'package:sortgame/models/settings/settings_game.dart';
-import 'package:sortgame/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
- items: state.currentGame.items,
- // Game data
- position: state.currentGame.position,
- score: state.currentGame.score,
- );
- // game.dump();
-
- updateState(game);
- }
-
- void startNewGame({
- required GameSettings gameSettings,
- required GlobalSettings globalSettings,
- }) {
- final Game newGame = Game.createNew(
- // Settings
- 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;
- state.currentGame.isFinished = true;
- refresh();
- }
-
- void increasePosition() {
- state.currentGame.isStarted = true;
- if (state.currentGame.position < state.currentGame.items.length) {
- state.currentGame.increasePosition();
- } else {
- state.currentGame.updateGameIsFinished(true);
- }
- refresh();
- }
-
- void increaseScore(int increment) {
- state.currentGame.increaseScore(increment);
- 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,
- };
- }
-}
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 5a3e6b65d818e29c941623d990b5f52c2760ccdf..0000000000000000000000000000000000000000
--- a/lib/cubit/nav_cubit.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:sortgame/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..2fba6c68a366cdf534487c1e484e957fce1820a1
--- /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:sortgame/config/default_activity_settings.dart';
+import 'package:sortgame/models/settings/settings_activity.dart';
+
+part 'settings_activity_state.dart';
+
+class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
+ ActivitySettingsCubit()
+ : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
+
+ void setValues({
+ String? itemsCount,
+ String? themeCode,
+ }) {
+ emit(
+ ActivitySettingsState(
+ settings: ActivitySettings(
+ itemsCount: itemsCount ?? state.settings.itemsCount,
+ themeCode: themeCode ?? state.settings.themeCode,
+ ),
+ ),
+ );
+ }
+
+ String getParameterValue(String code) {
+ switch (code) {
+ case DefaultActivitySettings.parameterCodeItemsCount:
+ return ActivitySettings.getItemsCountValueFromUnsafe(state.settings.itemsCount);
+ case DefaultActivitySettings.parameterCodeThemeCode:
+ return ActivitySettings.getThemeValueFromUnsafe(state.settings.themeCode);
+ }
+
+ return '';
+ }
+
+ void setParameterValue(String code, String value) {
+ final String itemsCount = code == DefaultActivitySettings.parameterCodeItemsCount
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeItemsCount);
+ final String themeCode = code == DefaultActivitySettings.parameterCodeThemeCode
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeThemeCode);
+
+ setValues(
+ itemsCount: itemsCount,
+ themeCode: themeCode,
+ );
+ }
+
+ @override
+ ActivitySettingsState? fromJson(Map<String, dynamic> json) {
+ final String itemsCount = json[DefaultActivitySettings.parameterCodeItemsCount] as String;
+ final String themeCode = json[DefaultActivitySettings.parameterCodeThemeCode] as String;
+
+ return ActivitySettingsState(
+ settings: ActivitySettings(
+ itemsCount: itemsCount,
+ themeCode: themeCode,
+ ),
+ );
+ }
+
+ @override
+ Map<String, dynamic>? toJson(ActivitySettingsState state) {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeItemsCount: state.settings.itemsCount,
+ DefaultActivitySettings.parameterCodeThemeCode: state.settings.themeCode,
+ };
+ }
+}
diff --git a/lib/cubit/settings/settings_activity_state.dart b/lib/cubit/settings/settings_activity_state.dart
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 708b46675528c99a19b7f53edd93cbaeab5a7ca6..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:sortgame/config/default_game_settings.dart';
-import 'package:sortgame/models/settings/settings_game.dart';
-
-part 'settings_game_state.dart';
-
-class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
- GameSettingsCubit() : super(GameSettingsState(settings: GameSettings.createDefault()));
-
- void setValues({
- String? itemsCount,
- String? themeCode,
- }) {
- emit(
- GameSettingsState(
- settings: GameSettings(
- itemsCount: itemsCount ?? state.settings.itemsCount,
- themeCode: themeCode ?? state.settings.themeCode,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultGameSettings.parameterCodeItemsCount:
- return GameSettings.getItemsCountValueFromUnsafe(state.settings.itemsCount);
- case DefaultGameSettings.parameterCodeThemeCode:
- return GameSettings.getThemeValueFromUnsafe(state.settings.themeCode);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String itemsCount = code == DefaultGameSettings.parameterCodeItemsCount
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeItemsCount);
- final String themeCode = code == DefaultGameSettings.parameterCodeThemeCode
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeThemeCode);
-
- setValues(
- itemsCount: itemsCount,
- themeCode: themeCode,
- );
- }
-
- @override
- GameSettingsState? fromJson(Map<String, dynamic> json) {
- final String itemsCount = json[DefaultGameSettings.parameterCodeItemsCount] as String;
- final String themeCode = json[DefaultGameSettings.parameterCodeThemeCode] as String;
-
- return GameSettingsState(
- settings: GameSettings(
- itemsCount: itemsCount,
- themeCode: themeCode,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameSettingsState state) {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeItemsCount: state.settings.itemsCount,
- DefaultGameSettings.parameterCodeThemeCode: state.settings.themeCode,
- };
- }
-}
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/data/fetch_data_helper.dart b/lib/data/fetch_data_helper.dart
index a2fbc022dfbe72e381d88c2418a5d47b2abc6124..e573a3b13015963c326124b981cc371db9e65913 100644
--- a/lib/data/fetch_data_helper.dart
+++ b/lib/data/fetch_data_helper.dart
@@ -5,7 +5,7 @@ import 'package:sortgame/models/data/category.dart';
import 'package:sortgame/models/data/game_item.dart';
import 'package:sortgame/models/data/game_theme.dart';
import 'package:sortgame/models/data/item.dart';
-import 'package:sortgame/models/settings/settings_game.dart';
+import 'package:sortgame/models/settings/settings_activity.dart';
class FetchDataHelper {
FetchDataHelper();
@@ -91,13 +91,13 @@ class FetchDataHelper {
}
}
- List<GameItem> getItems(GameSettings gameSettings) {
+ List<GameItem> getItems(ActivitySettings activitySettings) {
if (_mapping.isEmpty) {
init();
}
- final int count = int.parse(gameSettings.itemsCount);
- final String themeCode = gameSettings.themeCode;
+ final int count = int.parse(activitySettings.itemsCount);
+ final String themeCode = activitySettings.themeCode;
List<GameItem> items = _mapping;
diff --git a/lib/main.dart b/lib/main.dart
index 6fe4bd35704c87b6e7a076a45cece11b10e9c7f2..4d735350260edc6921df5eabde9c29e29dc40cec 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,10 +4,13 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:sortgame/cubit/game_cubit.dart';
-import 'package:sortgame/cubit/nav_cubit.dart';
-import 'package:sortgame/cubit/settings_game_cubit.dart';
-import 'package:sortgame/cubit/settings_global_cubit.dart';
+import 'package:sortgame/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:sortgame/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:sortgame/config/application_config.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/cubit/settings/settings_activity_cubit.dart';
+import 'package:sortgame/cubit/settings/settings_global_cubit.dart';
import 'package:sortgame/ui/skeleton.dart';
void main() async {
@@ -45,17 +48,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: 'SortGame',
+ title: ApplicationConfig.appTitle,
home: const SkeletonScreen(),
// Theme stuff
diff --git a/lib/models/game/game.dart b/lib/models/activity/activity.dart
similarity index 77%
rename from lib/models/game/game.dart
rename to lib/models/activity/activity.dart
index bd8b9d8b1878f48551153e7aeb131640d38ac89d..3122af03174d5311110f8a43333ed40b69495b48 100644
--- a/lib/models/game/game.dart
+++ b/lib/models/activity/activity.dart
@@ -2,13 +2,13 @@ import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:sortgame/data/fetch_data_helper.dart';
import 'package:sortgame/models/data/game_item.dart';
-import 'package:sortgame/models/settings/settings_game.dart';
+import 'package:sortgame/models/settings/settings_activity.dart';
import 'package:sortgame/models/settings/settings_global.dart';
-class Game {
- Game({
+class Activity {
+ Activity({
// Settings
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
// State
@@ -26,7 +26,7 @@ class Game {
});
// Settings
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
// State
@@ -42,28 +42,29 @@ class Game {
int position;
int score;
- factory Game.createEmpty() {
- return Game(
+ factory Activity.createEmpty() {
+ return Activity(
// Settings
- gameSettings: GameSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(),
globalSettings: GlobalSettings.createDefault(),
// Base data
items: [],
);
}
- 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 List<GameItem> items = FetchDataHelper().getItems(newGameSettings);
+ final List<GameItem> items = FetchDataHelper().getItems(newActivitySettings);
- return Game(
+ return Activity(
// Settings
- gameSettings: newGameSettings,
+ activitySettings: newActivitySettings,
globalSettings: newGlobalSettings,
// State
isRunning: true,
@@ -100,9 +101,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');
@@ -119,13 +120,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..0b6179f19aad09a1187c2477d8b4d679fcde0864
--- /dev/null
+++ b/lib/models/settings/settings_activity.dart
@@ -0,0 +1,57 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:sortgame/config/default_activity_settings.dart';
+
+class ActivitySettings {
+ final String itemsCount;
+ final String themeCode;
+
+ ActivitySettings({
+ required this.itemsCount,
+ required this.themeCode,
+ });
+
+ static String getItemsCountValueFromUnsafe(String itemsCount) {
+ if (DefaultActivitySettings.allowedItemsCountValues.contains(itemsCount)) {
+ return itemsCount;
+ }
+
+ return DefaultActivitySettings.defaultItemsCountValue;
+ }
+
+ static String getThemeValueFromUnsafe(String themeCode) {
+ if (DefaultActivitySettings.getAvailableValues(
+ DefaultActivitySettings.parameterCodeThemeCode)
+ .contains(themeCode)) {
+ return themeCode;
+ }
+
+ return DefaultActivitySettings.defaultThemeCodeValue;
+ }
+
+ factory ActivitySettings.createDefault() {
+ return ActivitySettings(
+ itemsCount: DefaultActivitySettings.defaultItemsCountValue,
+ themeCode: DefaultActivitySettings.defaultThemeCodeValue,
+ );
+ }
+
+ void dump() {
+ printlog('$ActivitySettings:');
+ printlog(' itemsCount: $itemsCount');
+ printlog(' themeCode: $themeCode');
+ printlog('');
+ }
+
+ @override
+ String toString() {
+ return '$ActivitySettings(${toJson()})';
+ }
+
+ Map<String, dynamic>? toJson() {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeItemsCount: itemsCount,
+ DefaultActivitySettings.parameterCodeThemeCode: themeCode,
+ };
+ }
+}
diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart
deleted file mode 100644
index d95280add731c0f3a5c5d0329cdc886e8b8c0e86..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_game.dart
+++ /dev/null
@@ -1,56 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:sortgame/config/default_game_settings.dart';
-
-class GameSettings {
- final String itemsCount;
- final String themeCode;
-
- GameSettings({
- required this.itemsCount,
- required this.themeCode,
- });
-
- static String getItemsCountValueFromUnsafe(String itemsCount) {
- if (DefaultGameSettings.allowedItemsCountValues.contains(itemsCount)) {
- return itemsCount;
- }
-
- return DefaultGameSettings.defaultItemsCountValue;
- }
-
- static String getThemeValueFromUnsafe(String themeCode) {
- if (DefaultGameSettings.getAvailableValues(DefaultGameSettings.parameterCodeThemeCode)
- .contains(themeCode)) {
- return themeCode;
- }
-
- return DefaultGameSettings.defaultThemeCodeValue;
- }
-
- factory GameSettings.createDefault() {
- return GameSettings(
- itemsCount: DefaultGameSettings.defaultItemsCountValue,
- themeCode: DefaultGameSettings.defaultThemeCodeValue,
- );
- }
-
- void dump() {
- printlog('$GameSettings:');
- printlog(' itemsCount: $itemsCount');
- printlog(' themeCode: $themeCode');
- printlog('');
- }
-
- @override
- String toString() {
- return '$GameSettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeItemsCount: itemsCount,
- DefaultGameSettings.parameterCodeThemeCode: themeCode,
- };
- }
-}
diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart
index 4c804851c7398e2e7e82b125b13c4809d63fd79c..5edc2fd56c4932abd93691ff76a615815064430d 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:sortgame/cubit/game_cubit.dart';
-import 'package:sortgame/models/game/game.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/models/activity/activity.dart';
import 'package:sortgame/ui/widgets/actions/button_game_quit.dart';
class GameEndWidget extends StatelessWidget {
@@ -10,12 +10,12 @@ 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('assets/ui/game_${currentGame.gameWon ? 'win' : 'fail'}.png'),
+ image: AssetImage('assets/ui/game_${currentActivity.gameWon ? 'win' : 'fail'}.png'),
fit: BoxFit.fill,
);
@@ -30,7 +30,9 @@ class GameEndWidget extends StatelessWidget {
),
Column(
children: [
- currentGame.animationInProgress ? decorationImage : const QuitGameButton()
+ currentActivity.animationInProgress
+ ? decorationImage
+ : const QuitGameButton()
],
),
Column(
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
deleted file mode 100644
index 8c1aed6d33dacac9f365081ac83910b1bc4edf3e..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:sortgame/config/default_game_settings.dart';
-import 'package:sortgame/config/default_global_settings.dart';
-import 'package:sortgame/cubit/settings_game_cubit.dart';
-import 'package:sortgame/cubit/settings_global_cubit.dart';
-import 'package:sortgame/ui/parameters/parameter_widget.dart';
-import 'package:sortgame/ui/widgets/actions/button_delete_saved_game.dart';
-import 'package:sortgame/ui/widgets/actions/button_game_start_new.dart';
-import 'package:sortgame/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 4614f77d3da85062208d0b8ba35991ecff6dafd3..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:sortgame/cubit/game_cubit.dart';
-import 'package:sortgame/models/game/game.dart';
-import 'package:sortgame/ui/layouts/game_layout.dart';
-import 'package:sortgame/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 6ca48329de3be619e7d552ac35c44daf2d98f98f..cb39a2011bece0a11d64803d57d841af3479cb4c 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:sortgame/config/menu.dart';
-import 'package:sortgame/cubit/nav_cubit.dart';
-import 'package:sortgame/ui/widgets/global_app_bar.dart';
+import 'package:sortgame/common/config/activity_page.dart';
+import 'package:sortgame/common/config/screen.dart';
+import 'package:sortgame/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:sortgame/common/ui/nav/global_app_bar.dart';
+import 'package:sortgame/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 279319a24b51687c539c698aadaffad69f378198..d784c9a95483ca6bb9a4b862f9cd229aca8e49cc 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:sortgame/cubit/game_cubit.dart';
+import 'package:sortgame/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 29a456033497894d197430c6f0b29178fe78be04..5b4a24e7fc0ee749efda0e06ab90911f2a6f24b7 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:sortgame/cubit/game_cubit.dart';
+import 'package:sortgame/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:sortgame/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 f87bdeecc20a4895ae51fa0aa18129f37cda8105..70ec855a6be89aa893addebb1afd21bce729bbd8 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:sortgame/cubit/game_cubit.dart';
-import 'package:sortgame/cubit/settings_game_cubit.dart';
-import 'package:sortgame/cubit/settings_global_cubit.dart';
+import 'package:sortgame/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/cubit/settings/settings_activity_cubit.dart';
+import 'package:sortgame/cubit/settings/settings_global_cubit.dart';
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 e0a8660c5beba29a6bebfb5e79c1d0e0d7a8d5d3..b3f66d0e4198cdac0c53f1fd981260ce85b72596 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:sortgame/cubit/game_cubit.dart';
+import 'package:sortgame/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:sortgame/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/buttons_yes_no.dart b/lib/ui/widgets/game/buttons_yes_no.dart
index 7ae81b65bc5d0e11e72f4fccb1cad0e177f7e78c..4eef46200032d941bf8edb504bb3504d0a19e59f 100644
--- a/lib/ui/widgets/game/buttons_yes_no.dart
+++ b/lib/ui/widgets/game/buttons_yes_no.dart
@@ -3,7 +3,7 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:sortgame/cubit/game_cubit.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
import 'package:sortgame/models/data/category.dart';
import 'package:sortgame/models/data/game_item.dart';
@@ -14,7 +14,7 @@ class GameButtonsYesNo extends StatelessWidget {
@override
Widget build(BuildContext context) {
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
+ final ActivityCubit activityCubit = BlocProvider.of<ActivityCubit>(context);
final bool pickInIsCategory = Random().nextBool();
@@ -42,9 +42,9 @@ class GameButtonsYesNo extends StatelessWidget {
iconSize: 80,
onPressed: () {
if (pickInIsCategory) {
- gameCubit.increaseScore(1);
+ activityCubit.increaseScore(1);
}
- gameCubit.increasePosition();
+ activityCubit.increasePosition();
},
icon: const Icon(UniconsLine.thumbs_up),
),
@@ -61,9 +61,9 @@ class GameButtonsYesNo extends StatelessWidget {
iconSize: 80,
onPressed: () {
if (!pickInIsCategory) {
- gameCubit.increaseScore(1);
+ activityCubit.increaseScore(1);
}
- gameCubit.increasePosition();
+ activityCubit.increasePosition();
},
icon: const Icon(UniconsLine.thumbs_down),
),
diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
index 54aaec3ed8f10f33b9da897c73c75250944e36a7..8dd87a9a2ba3cc47eb6e1ec026589373bcc2b1f1 100644
--- a/lib/ui/widgets/game/game_board.dart
+++ b/lib/ui/widgets/game/game_board.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:sortgame/cubit/game_cubit.dart';
-import 'package:sortgame/models/game/game.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/models/activity/activity.dart';
import 'package:sortgame/ui/widgets/game/game_question.dart';
class GameBoardWidget extends StatelessWidget {
@@ -11,11 +11,11 @@ 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;
- return !currentGame.isFinished
+ return !currentActivity.isFinished
? const GameQuestionWidget()
: const SizedBox.shrink();
},
diff --git a/lib/ui/widgets/game/game_question.dart b/lib/ui/widgets/game/game_question.dart
index 08320fb2dac28071dceb1cf15aba7196ae5c2689..948808cb09be34974e513e108042339adc364b15 100644
--- a/lib/ui/widgets/game/game_question.dart
+++ b/lib/ui/widgets/game/game_question.dart
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:sortgame/cubit/game_cubit.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
import 'package:sortgame/models/data/game_item.dart';
-import 'package:sortgame/models/game/game.dart';
+import 'package:sortgame/models/activity/activity.dart';
import 'package:sortgame/ui/widgets/game/buttons_yes_no.dart';
class GameQuestionWidget extends StatelessWidget {
@@ -11,11 +11,11 @@ class GameQuestionWidget 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 GameItem currentGameItem = currentGame.getCurrentGameItem();
+ final GameItem currentGameItem = currentActivity.getCurrentGameItem();
return Column(
children: [
diff --git a/lib/ui/widgets/indicators/indicator_position.dart b/lib/ui/widgets/indicators/indicator_position.dart
index 3ca500f60250b1af34c897a6fe3e9a16600aff4a..f59012bdef908955df74f7a86cf44bb7b3d0953e 100644
--- a/lib/ui/widgets/indicators/indicator_position.dart
+++ b/lib/ui/widgets/indicators/indicator_position.dart
@@ -1,21 +1,21 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:sortgame/cubit/game_cubit.dart';
-import 'package:sortgame/models/game/game.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
+import 'package:sortgame/models/activity/activity.dart';
class PositionIndicator extends StatelessWidget {
const PositionIndicator({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;
// Normalized [0..1] value
final double barValue =
- currentGame.position / int.parse(currentGame.gameSettings.itemsCount);
+ currentActivity.position / int.parse(currentActivity.activitySettings.itemsCount);
const Color baseColor = Color.fromARGB(255, 215, 1, 133);
@@ -34,7 +34,8 @@ class PositionIndicator extends StatelessWidget {
borderRadius: const BorderRadius.all(Radius.circular(barHeight / 4)),
),
OutlinedText(
- text: '${currentGame.position}/${currentGame.gameSettings.itemsCount}',
+ text:
+ '${currentActivity.position}/${currentActivity.activitySettings.itemsCount}',
fontSize: 0.9 * barHeight,
textColor: textColor,
outlineColor: outlineColor,
diff --git a/lib/ui/widgets/indicators/indicator_score.dart b/lib/ui/widgets/indicators/indicator_score.dart
index ae08419db4c8139282e5b078f364b5ca8a1ac91a..d4a61ddefb76d78fbd79890d299a8f2d561b512f 100644
--- a/lib/ui/widgets/indicators/indicator_score.dart
+++ b/lib/ui/widgets/indicators/indicator_score.dart
@@ -1,20 +1,20 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:sortgame/cubit/game_cubit.dart';
+import 'package:sortgame/cubit/activity/activity_cubit.dart';
class ScoreIndicator extends StatelessWidget {
const ScoreIndicator({super.key});
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
const Color baseColor = Color.fromARGB(255, 218, 218, 218);
final Color outlineColor = baseColor.darken();
return OutlinedText(
- text: '${gameState.currentGame.score}',
+ text: '${activityState.currentActivity.score}',
fontSize: 70,
textColor: baseColor,
outlineColor: outlineColor,
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 3c26d6f2f96c3ed4333afe036bb89c75226cdfcf..215c3d3c741750e425e6b44feacc7a424e10046c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A sorting game application.
publish_to: "none"
-version: 0.3.1+33
+version: 0.4.0+34
environment:
sdk: "^3.0.0"