From 89a175f4bae9236778d96fe5a150ae5db0b79780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Tue, 22 Oct 2024 23:48:06 +0200
Subject: [PATCH] Normalize Activity application architecture
---
assets/translations/en.json | 3 +
assets/translations/fr.json | 3 +
.../metadata/android/en-US/changelogs/47.txt | 1 +
.../metadata/android/fr-FR/changelogs/47.txt | 1 +
lib/common/config/activity_page.dart | 50 ++++++
lib/common/config/screen.dart | 55 +++++++
lib/common/cubit/nav/nav_cubit_pages.dart | 33 ++++
lib/common/cubit/nav/nav_cubit_screens.dart | 37 +++++
lib/common/ui/nav/bottom_nav_bar.dart | 46 ++++++
.../ui/nav}/global_app_bar.dart | 37 +++--
.../ui/pages/game.dart} | 16 +-
lib/common/ui/pages/parameters.dart | 148 +++++++++++++++++
.../ui/parameters/parameter_painter.dart | 26 +--
.../ui/parameters/parameter_widget.dart | 33 ++--
.../ui/screens/about.dart} | 4 +-
lib/common/ui/screens/activity.dart | 18 +++
.../ui/screens/settings.dart} | 4 +-
lib/config/application_config.dart | 3 +
...gs.dart => default_activity_settings.dart} | 14 +-
lib/config/menu.dart | 52 ------
.../activity_cubit.dart} | 149 +++++++++---------
lib/cubit/activity/activity_state.dart | 15 ++
lib/cubit/game_state.dart | 15 --
lib/cubit/nav_cubit.dart | 37 -----
.../settings/settings_activity_cubit.dart | 72 +++++++++
.../settings/settings_activity_state.dart | 15 ++
.../{ => settings}/settings_global_cubit.dart | 0
.../{ => settings}/settings_global_state.dart | 0
lib/cubit/settings_game_cubit.dart | 71 ---------
lib/cubit/settings_game_state.dart | 15 --
lib/main.dart | 36 +++--
.../game.dart => activity/activity.dart} | 45 +++---
lib/models/{game => activity}/cell.dart | 0
lib/models/settings/settings_activity.dart | 55 +++++++
lib/models/settings/settings_game.dart | 55 -------
lib/models/types.dart | 2 +-
lib/ui/game/game_bottom.dart | 12 +-
lib/ui/game/game_end.dart | 16 +-
lib/ui/layouts/parameters_layout.dart | 141 -----------------
lib/ui/screens/page_game.dart | 24 ---
lib/ui/skeleton.dart | 37 +++--
.../actions/button_delete_saved_game.dart | 4 +-
lib/ui/widgets/actions/button_game_quit.dart | 7 +-
.../actions/button_game_start_new.dart | 17 +-
.../actions/button_resume_saved_game.dart | 7 +-
lib/ui/widgets/game/cell.dart | 62 ++++----
lib/ui/widgets/game/game_board.dart | 18 +--
lib/ui/widgets/game/mode_button_toggle.dart | 17 +-
.../widgets/game/mode_indicator_report.dart | 16 +-
lib/ui/widgets/game/mode_indicator_walk.dart | 16 +-
lib/ui/widgets/game/mode_toggle.dart | 12 +-
lib/ui/widgets/indicators/indicator_top.dart | 16 +-
lib/utils/board_animate.dart | 50 +++---
pubspec.lock | 8 +-
pubspec.yaml | 2 +-
55 files changed, 914 insertions(+), 734 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/47.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/47.txt
create mode 100644 lib/common/config/activity_page.dart
create mode 100644 lib/common/config/screen.dart
create mode 100644 lib/common/cubit/nav/nav_cubit_pages.dart
create mode 100644 lib/common/cubit/nav/nav_cubit_screens.dart
create mode 100644 lib/common/ui/nav/bottom_nav_bar.dart
rename lib/{ui/widgets => common/ui/nav}/global_app_bar.dart (60%)
rename lib/{ui/layouts/game_layout.dart => common/ui/pages/game.dart} (66%)
create mode 100644 lib/common/ui/pages/parameters.dart
rename lib/{ => common}/ui/parameters/parameter_painter.dart (86%)
rename lib/{ => common}/ui/parameters/parameter_widget.dart (81%)
rename lib/{ui/screens/page_about.dart => common/ui/screens/about.dart} (93%)
create mode 100644 lib/common/ui/screens/activity.dart
rename lib/{ui/screens/page_settings.dart => common/ui/screens/settings.dart} (87%)
create mode 100644 lib/config/application_config.dart
rename lib/config/{default_game_settings.dart => default_activity_settings.dart} (81%)
delete mode 100644 lib/config/menu.dart
rename lib/cubit/{game_cubit.dart => activity/activity_cubit.dart} (50%)
create mode 100644 lib/cubit/activity/activity_state.dart
delete mode 100644 lib/cubit/game_state.dart
delete mode 100644 lib/cubit/nav_cubit.dart
create mode 100644 lib/cubit/settings/settings_activity_cubit.dart
create mode 100644 lib/cubit/settings/settings_activity_state.dart
rename lib/cubit/{ => settings}/settings_global_cubit.dart (100%)
rename lib/cubit/{ => settings}/settings_global_state.dart (100%)
delete mode 100644 lib/cubit/settings_game_cubit.dart
delete mode 100644 lib/cubit/settings_game_state.dart
rename lib/models/{game/game.dart => activity/activity.dart} (86%)
rename lib/models/{game => activity}/cell.dart (100%)
create mode 100644 lib/models/settings/settings_activity.dart
delete mode 100644 lib/models/settings/settings_game.dart
delete mode 100644 lib/ui/layouts/parameters_layout.dart
delete mode 100644 lib/ui/screens/page_game.dart
diff --git a/assets/translations/en.json b/assets/translations/en.json
index 0348cd0..c60e966 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -1,6 +1,9 @@
{
"app_name": "Minehunter",
+ "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 0892367..7fe6662 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -1,6 +1,9 @@
{
"app_name": "Démineur",
+ "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/47.txt b/fastlane/metadata/android/en-US/changelogs/47.txt
new file mode 100644
index 0000000..ac2c90e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/47.txt
@@ -0,0 +1 @@
+Normalize Activity application architecture.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/47.txt b/fastlane/metadata/android/fr-FR/changelogs/47.txt
new file mode 100644
index 0000000..1d6843d
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/47.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 0000000..0753ae7
--- /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:minehunter/common/ui/pages/game.dart';
+import 'package:minehunter/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 0000000..26d293b
--- /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:minehunter/common/ui/screens/about.dart';
+import 'package:minehunter/common/ui/screens/activity.dart';
+import 'package:minehunter/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 0000000..6949c14
--- /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:minehunter/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 0000000..b8bdcf3
--- /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:minehunter/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 0000000..2aaf443
--- /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:minehunter/common/config/activity_page.dart';
+import 'package:minehunter/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 91c837e..183dfa6 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:minehunter/config/menu.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/cubit/nav_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/common/config/screen.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/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 66%
rename from lib/ui/layouts/game_layout.dart
rename to lib/common/ui/pages/game.dart
index e8f8d6b..1b1974a 100644
--- a/lib/ui/layouts/game_layout.dart
+++ b/lib/common/ui/pages/game.dart
@@ -1,21 +1,21 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
import 'package:minehunter/ui/game/game_bottom.dart';
import 'package:minehunter/ui/game/game_end.dart';
import 'package:minehunter/ui/game/game_top.dart';
import 'package:minehunter/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,
@@ -30,7 +30,7 @@ class GameLayout extends StatelessWidget {
const SizedBox(height: 8),
const GameBottomWidget(),
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 0000000..a9f3b36
--- /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:minehunter/common/ui/parameters/parameter_widget.dart';
+
+import 'package:minehunter/config/default_activity_settings.dart';
+import 'package:minehunter/config/default_global_settings.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/cubit/settings/settings_activity_cubit.dart';
+import 'package:minehunter/cubit/settings/settings_global_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
+import 'package:minehunter/ui/widgets/actions/button_delete_saved_game.dart';
+import 'package:minehunter/ui/widgets/actions/button_game_start_new.dart';
+import 'package:minehunter/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 86%
rename from lib/ui/parameters/parameter_painter.dart
rename to lib/common/ui/parameters/parameter_painter.dart
index ac52802..e2e8b23 100644
--- a/lib/ui/parameters/parameter_painter.dart
+++ b/lib/common/ui/parameters/parameter_painter.dart
@@ -3,21 +3,21 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/config/default_game_settings.dart';
-import 'package:minehunter/models/settings/settings_game.dart';
+import 'package:minehunter/config/default_activity_settings.dart';
+import 'package:minehunter/models/settings/settings_activity.dart';
import 'package:minehunter/models/settings/settings_global.dart';
class ParameterPainter extends CustomPainter {
const ParameterPainter({
required this.code,
required this.value,
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
});
final String code;
final String value;
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
@override
@@ -27,10 +27,10 @@ class ParameterPainter extends CustomPainter {
// content
switch (code) {
- case DefaultGameSettings.parameterCodeLevel:
+ case DefaultActivitySettings.parameterCodeLevel:
paintLevelParameterItem(canvas, canvasSize);
break;
- case DefaultGameSettings.parameterCodeSize:
+ case DefaultActivitySettings.parameterCodeSize:
paintSizeParameterItem(canvas, canvasSize);
break;
default:
@@ -83,19 +83,19 @@ class ParameterPainter extends CustomPainter {
final List<dynamic> stars = [];
switch (value) {
- case DefaultGameSettings.levelValueEasy:
+ case DefaultActivitySettings.levelValueEasy:
stars.add([0.5, 0.5]);
break;
- case DefaultGameSettings.levelValueMedium:
+ case DefaultActivitySettings.levelValueMedium:
stars.add([0.3, 0.5]);
stars.add([0.7, 0.5]);
break;
- case DefaultGameSettings.levelValueHard:
+ case DefaultActivitySettings.levelValueHard:
stars.add([0.3, 0.3]);
stars.add([0.7, 0.3]);
stars.add([0.5, 0.7]);
break;
- case DefaultGameSettings.levelValueNightmare:
+ case DefaultActivitySettings.levelValueNightmare:
stars.add([0.3, 0.3]);
stars.add([0.7, 0.3]);
stars.add([0.3, 0.7]);
@@ -143,13 +143,13 @@ class ParameterPainter extends CustomPainter {
int gridWidth = 1;
switch (value) {
- case DefaultGameSettings.sizeValueSmall:
+ case DefaultActivitySettings.sizeValueSmall:
gridWidth = 2;
break;
- case DefaultGameSettings.sizeValueMedium:
+ case DefaultActivitySettings.sizeValueMedium:
gridWidth = 3;
break;
- case DefaultGameSettings.sizeValueLarge:
+ case DefaultActivitySettings.sizeValueLarge:
gridWidth = 4;
break;
default:
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
similarity index 81%
rename from lib/ui/parameters/parameter_widget.dart
rename to lib/common/ui/parameters/parameter_widget.dart
index 40ca00e..264526c 100644
--- a/lib/ui/parameters/parameter_widget.dart
+++ b/lib/common/ui/parameters/parameter_widget.dart
@@ -1,11 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/config/default_game_settings.dart';
+import 'package:minehunter/common/ui/parameters/parameter_painter.dart';
+
+import 'package:minehunter/config/default_activity_settings.dart';
import 'package:minehunter/config/default_global_settings.dart';
-import 'package:minehunter/models/settings/settings_game.dart';
+import 'package:minehunter/models/settings/settings_activity.dart';
import 'package:minehunter/models/settings/settings_global.dart';
-import 'package:minehunter/ui/parameters/parameter_painter.dart';
class ParameterWidget extends StatelessWidget {
const ParameterWidget({
@@ -14,7 +15,7 @@ class ParameterWidget extends StatelessWidget {
required this.value,
required this.isSelected,
required this.size,
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
required this.onPressed,
});
@@ -23,7 +24,7 @@ class ParameterWidget extends StatelessWidget {
final String value;
final bool isSelected;
final double size;
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
final VoidCallback onPressed;
@@ -37,10 +38,10 @@ class ParameterWidget extends StatelessWidget {
Widget content = const SizedBox.shrink();
switch (code) {
- case DefaultGameSettings.parameterCodeLevel:
+ case DefaultActivitySettings.parameterCodeLevel:
content = getLevelParameterItem(value);
break;
- case DefaultGameSettings.parameterCodeSize:
+ case DefaultActivitySettings.parameterCodeSize:
content = getSizeParameterItem(value);
break;
case DefaultGlobalSettings.parameterCodeSkin:
@@ -79,16 +80,16 @@ class ParameterWidget extends StatelessWidget {
Color backgroundColor = Colors.grey;
switch (value) {
- case DefaultGameSettings.levelValueEasy:
+ case DefaultActivitySettings.levelValueEasy:
backgroundColor = Colors.green;
break;
- case DefaultGameSettings.levelValueMedium:
+ case DefaultActivitySettings.levelValueMedium:
backgroundColor = Colors.orange;
break;
- case DefaultGameSettings.levelValueHard:
+ case DefaultActivitySettings.levelValueHard:
backgroundColor = Colors.red;
break;
- case DefaultGameSettings.levelValueNightmare:
+ case DefaultActivitySettings.levelValueNightmare:
backgroundColor = Colors.purple;
break;
default:
@@ -104,7 +105,7 @@ class ParameterWidget extends StatelessWidget {
painter: ParameterPainter(
code: code,
value: value,
- gameSettings: gameSettings,
+ activitySettings: activitySettings,
globalSettings: globalSettings,
),
isComplex: true,
@@ -116,13 +117,13 @@ class ParameterWidget extends StatelessWidget {
Color backgroundColor = Colors.grey;
switch (value) {
- case DefaultGameSettings.sizeValueSmall:
+ case DefaultActivitySettings.sizeValueSmall:
backgroundColor = Colors.green;
break;
- case DefaultGameSettings.sizeValueMedium:
+ case DefaultActivitySettings.sizeValueMedium:
backgroundColor = Colors.orange;
break;
- case DefaultGameSettings.sizeValueLarge:
+ case DefaultActivitySettings.sizeValueLarge:
backgroundColor = Colors.red;
break;
default:
@@ -138,7 +139,7 @@ class ParameterWidget extends StatelessWidget {
painter: ParameterPainter(
code: code,
value: value,
- gameSettings: gameSettings,
+ activitySettings: activitySettings,
globalSettings: globalSettings,
),
isComplex: true,
diff --git a/lib/ui/screens/page_about.dart b/lib/common/ui/screens/about.dart
similarity index 93%
rename from lib/ui/screens/page_about.dart
rename to lib/common/ui/screens/about.dart
index ab73e30..f7a14a9 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 0000000..f7bb5f4
--- /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:minehunter/common/config/activity_page.dart';
+import 'package:minehunter/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 50964ef..7981b1c 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 0000000..48ab5a8
--- /dev/null
+++ b/lib/config/application_config.dart
@@ -0,0 +1,3 @@
+class ApplicationConfig {
+ static const String appTitle = 'Minehunter';
+}
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_activity_settings.dart
similarity index 81%
rename from lib/config/default_game_settings.dart
rename to lib/config/default_activity_settings.dart
index 33669a7..d8c7fee 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 parameterCodeLevel = 'level';
static const String parameterCodeSize = 'size';
@@ -39,9 +39,9 @@ class DefaultGameSettings {
static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case parameterCodeLevel:
- return DefaultGameSettings.allowedLevelValues;
+ return DefaultActivitySettings.allowedLevelValues;
case parameterCodeSize:
- return DefaultGameSettings.allowedSizeValues;
+ return DefaultActivitySettings.allowedSizeValues;
}
printlog('Did not find any available value for game parameter "$parameterCode".');
@@ -50,9 +50,9 @@ class DefaultGameSettings {
// how many mines? (per 100 tiles)
static const Map<String, int> minesCountRatios = {
- DefaultGameSettings.levelValueEasy: 5,
- DefaultGameSettings.levelValueMedium: 10,
- DefaultGameSettings.levelValueHard: 15,
- DefaultGameSettings.levelValueNightmare: 20,
+ DefaultActivitySettings.levelValueEasy: 5,
+ DefaultActivitySettings.levelValueMedium: 10,
+ DefaultActivitySettings.levelValueHard: 15,
+ DefaultActivitySettings.levelValueNightmare: 20,
};
}
diff --git a/lib/config/menu.dart b/lib/config/menu.dart
deleted file mode 100644
index 803e3e0..0000000
--- 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:minehunter/ui/screens/page_about.dart';
-import 'package:minehunter/ui/screens/page_game.dart';
-import 'package:minehunter/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/game_cubit.dart b/lib/cubit/activity/activity_cubit.dart
similarity index 50%
rename from lib/cubit/game_cubit.dart
rename to lib/cubit/activity/activity_cubit.dart
index c4b2752..4c8713d 100644
--- a/lib/cubit/game_cubit.dart
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -1,86 +1,86 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/models/game/cell.dart';
-import 'package:minehunter/models/game/game.dart';
-import 'package:minehunter/models/settings/settings_game.dart';
+import 'package:minehunter/models/activity/cell.dart';
+import 'package:minehunter/models/activity/activity.dart';
+import 'package:minehunter/models/settings/settings_activity.dart';
import 'package:minehunter/models/settings/settings_global.dart';
import 'package:minehunter/models/types.dart';
-part 'game_state.dart';
+part 'activity_state.dart';
-class GameCubit extends HydratedCubit<GameState> {
- GameCubit()
- : super(GameState(
- currentGame: Game.createEmpty(),
+class ActivityCubit extends HydratedCubit<ActivityState> {
+ ActivityCubit()
+ : super(ActivityState(
+ currentActivity: Activity.createEmpty(),
));
- void updateState(Game game) {
- emit(GameState(
- currentGame: game,
+ void updateState(Activity activity) {
+ emit(ActivityState(
+ currentActivity: activity,
));
}
void refresh() {
- final Game game = Game(
+ final Activity activity = Activity(
// Settings
- gameSettings: state.currentGame.gameSettings,
- globalSettings: state.currentGame.globalSettings,
+ activitySettings: state.currentActivity.activitySettings,
+ globalSettings: state.currentActivity.globalSettings,
// State
- isRunning: state.currentGame.isRunning,
- isStarted: state.currentGame.isStarted,
- isFinished: state.currentGame.isFinished,
- animationInProgress: state.currentGame.animationInProgress,
+ isRunning: state.currentActivity.isRunning,
+ isStarted: state.currentActivity.isStarted,
+ isFinished: state.currentActivity.isFinished,
+ animationInProgress: state.currentActivity.animationInProgress,
// Base data
- board: state.currentGame.board,
- sizeHorizontal: state.currentGame.sizeHorizontal,
- sizeVertical: state.currentGame.sizeVertical,
- isBoardMined: state.currentGame.isBoardMined,
+ board: state.currentActivity.board,
+ sizeHorizontal: state.currentActivity.sizeHorizontal,
+ sizeVertical: state.currentActivity.sizeVertical,
+ isBoardMined: state.currentActivity.isBoardMined,
// Game data
- minesCount: state.currentGame.minesCount,
- reportMode: state.currentGame.reportMode,
- gameWin: state.currentGame.gameWin,
- gameFail: state.currentGame.gameFail,
+ minesCount: state.currentActivity.minesCount,
+ reportMode: state.currentActivity.reportMode,
+ gameWin: state.currentActivity.gameWin,
+ gameFail: state.currentActivity.gameFail,
);
// game.dump();
- updateState(game);
+ updateState(activity);
}
- void startNewGame({
- required GameSettings gameSettings,
+ void startNewActivity({
+ required ActivitySettings activitySettings,
required GlobalSettings globalSettings,
}) {
- final Game newGame = Game.createNew(
+ final Activity newActivity = Activity.createNew(
// Settings
- gameSettings: gameSettings,
+ activitySettings: activitySettings,
globalSettings: globalSettings,
);
- newGame.dump();
+ newActivity.dump();
- updateState(newGame);
+ updateState(newActivity);
refresh();
}
- void quitGame() {
- state.currentGame.isRunning = false;
+ void quitActivity() {
+ state.currentActivity.isRunning = false;
refresh();
}
- void resumeSavedGame() {
- state.currentGame.isRunning = true;
+ void resumeSavedActivity() {
+ state.currentActivity.isRunning = true;
refresh();
}
- void deleteSavedGame() {
- state.currentGame.isRunning = false;
- state.currentGame.isFinished = true;
+ void deleteSavedActivity() {
+ state.currentActivity.isRunning = false;
+ state.currentActivity.isFinished = true;
refresh();
}
void updateBoard(Board board) {
- state.currentGame.board = board;
+ state.currentActivity.board = board;
refresh();
}
@@ -88,12 +88,12 @@ class GameCubit extends HydratedCubit<GameState> {
required int forbiddenRow,
required int forbiddenCol,
}) {
- state.currentGame.isStarted = true;
- state.currentGame.addMines(
+ state.currentActivity.isStarted = true;
+ state.currentActivity.addMines(
forbiddenRow: forbiddenRow,
forbiddenCol: forbiddenCol,
);
- state.currentGame.isBoardMined = true;
+ state.currentActivity.isBoardMined = true;
refresh();
}
@@ -101,7 +101,7 @@ class GameCubit extends HydratedCubit<GameState> {
required int row,
required int col,
}) {
- if (!state.currentGame.board[row][col].isExplored) {
+ if (!state.currentActivity.board[row][col].isExplored) {
toggleCellMark(row, col);
}
}
@@ -112,12 +112,12 @@ class GameCubit extends HydratedCubit<GameState> {
}) {
setCellAsExplored(row, col);
- if (state.currentGame.board[row][col].minesCountAround == 0) {
+ if (state.currentActivity.board[row][col].minesCountAround == 0) {
final List<List<int>> safeCells = getAllSafeCellsAround(row, col);
for (int safeCellIndex = 0; safeCellIndex < safeCells.length; safeCellIndex++) {
final int safeCellRow = safeCells[safeCellIndex][0];
final int safeCellCol = safeCells[safeCellIndex][1];
- if (!state.currentGame.board[safeCellRow][safeCellCol].isExplored) {
+ if (!state.currentActivity.board[safeCellRow][safeCellCol].isExplored) {
walkOnCell(
row: safeCellRow,
col: safeCellCol,
@@ -128,7 +128,7 @@ class GameCubit extends HydratedCubit<GameState> {
}
List<List<int>> getAllSafeCellsAround(int row, int col) {
- final List<List<Cell>> board = state.currentGame.board;
+ final List<List<Cell>> board = state.currentActivity.board;
final int sizeHorizontal = board.length;
final int sizeVertical = board[0].length;
@@ -152,36 +152,37 @@ class GameCubit extends HydratedCubit<GameState> {
}
void setCellAsExplored(int row, int col) {
- state.currentGame.board[row][col].isExplored = true;
- state.currentGame.board[row][col].isMarked = false;
+ state.currentActivity.board[row][col].isExplored = true;
+ state.currentActivity.board[row][col].isMarked = false;
// Boom?
- if (state.currentGame.board[row][col].isMined) {
+ if (state.currentActivity.board[row][col].isMined) {
// Boom!
- state.currentGame.board[row][col].isExploded = true;
+ state.currentActivity.board[row][col].isExploded = true;
}
refresh();
}
void toggleCellMark(int row, int col) {
- state.currentGame.board[row][col].isMarked = !state.currentGame.board[row][col].isMarked;
+ state.currentActivity.board[row][col].isMarked =
+ !state.currentActivity.board[row][col].isMarked;
refresh();
}
void updateReportMode(bool reportMode) {
- state.currentGame.reportMode = reportMode;
+ state.currentActivity.reportMode = reportMode;
refresh();
}
bool checkGameIsFinished() {
- final Game currentGame = state.currentGame;
+ final Activity currentActivity = state.currentActivity;
- final Board board = currentGame.board;
+ final Board board = currentActivity.board;
final int sizeHorizontal = board.length;
final int sizeVertical = board[0].length;
- currentGame.printGrid();
+ currentActivity.printGrid();
updateGameWin(false);
updateGameFail(false);
@@ -215,56 +216,56 @@ class GameCubit extends HydratedCubit<GameState> {
}
void updateGameWin(bool value) {
- state.currentGame.gameWin = value;
+ state.currentActivity.gameWin = value;
if (true == value) {
- state.currentGame.isFinished = true;
+ state.currentActivity.isFinished = true;
}
refresh();
}
void updateGameFail(bool value) {
- state.currentGame.gameFail = value;
+ state.currentActivity.gameFail = value;
if (true == value) {
- state.currentGame.isFinished = true;
+ state.currentActivity.isFinished = true;
}
refresh();
}
void updateAnimationInProgress(bool animationInProgress) {
- state.currentGame.animationInProgress = animationInProgress;
+ state.currentActivity.animationInProgress = animationInProgress;
refresh();
}
void setAnimatedBackground(List animatedCellsPattern) {
- for (int row = 0; row < state.currentGame.sizeVertical; row++) {
- for (int col = 0; col < state.currentGame.sizeHorizontal; col++) {
- state.currentGame.board[row][col].isAnimated = animatedCellsPattern[row][col];
+ for (int row = 0; row < state.currentActivity.sizeVertical; row++) {
+ for (int col = 0; col < state.currentActivity.sizeHorizontal; col++) {
+ state.currentActivity.board[row][col].isAnimated = animatedCellsPattern[row][col];
}
}
refresh();
}
void resetAnimatedBackground() {
- for (int row = 0; row < state.currentGame.sizeVertical; row++) {
- for (int col = 0; col < state.currentGame.sizeHorizontal; col++) {
- state.currentGame.board[row][col].isAnimated = false;
+ for (int row = 0; row < state.currentActivity.sizeVertical; row++) {
+ for (int col = 0; col < state.currentActivity.sizeHorizontal; col++) {
+ state.currentActivity.board[row][col].isAnimated = false;
}
}
}
@override
- GameState? fromJson(Map<String, dynamic> json) {
- final Game currentGame = json['currentGame'] as Game;
+ ActivityState? fromJson(Map<String, dynamic> json) {
+ final Activity currentActivity = json['currentActivity'] as Activity;
- return GameState(
- currentGame: currentGame,
+ return ActivityState(
+ currentActivity: currentActivity,
);
}
@override
- Map<String, dynamic>? toJson(GameState state) {
+ Map<String, dynamic>? toJson(ActivityState state) {
return <String, dynamic>{
- 'currentGame': state.currentGame.toJson(),
+ '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 0000000..887b45e
--- /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_state.dart b/lib/cubit/game_state.dart
deleted file mode 100644
index 00e2116..0000000
--- 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 8559bf8..0000000
--- a/lib/cubit/nav_cubit.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/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 0000000..290b1ba
--- /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:minehunter/config/default_activity_settings.dart';
+import 'package:minehunter/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? timerValue,
+ }) {
+ emit(
+ ActivitySettingsState(
+ settings: ActivitySettings(
+ level: itemsCount ?? state.settings.level,
+ size: timerValue ?? state.settings.size,
+ ),
+ ),
+ );
+ }
+
+ String getParameterValue(String code) {
+ switch (code) {
+ case DefaultActivitySettings.parameterCodeLevel:
+ return ActivitySettings.getLevelValueFromUnsafe(state.settings.level);
+ case DefaultActivitySettings.parameterCodeSize:
+ return ActivitySettings.getSizeValueFromUnsafe(state.settings.size);
+ }
+
+ return '';
+ }
+
+ void setParameterValue(String code, String value) {
+ final String itemsCount = code == DefaultActivitySettings.parameterCodeLevel
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeLevel);
+ final String timerValue = code == DefaultActivitySettings.parameterCodeSize
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeSize);
+
+ setValues(
+ itemsCount: itemsCount,
+ timerValue: timerValue,
+ );
+ }
+
+ @override
+ ActivitySettingsState? fromJson(Map<String, dynamic> json) {
+ final String itemsCount = json[DefaultActivitySettings.parameterCodeLevel] as String;
+ final String timerValue = json[DefaultActivitySettings.parameterCodeSize] as String;
+
+ return ActivitySettingsState(
+ settings: ActivitySettings(
+ level: itemsCount,
+ size: timerValue,
+ ),
+ );
+ }
+
+ @override
+ Map<String, dynamic>? toJson(ActivitySettingsState state) {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeLevel: state.settings.level,
+ DefaultActivitySettings.parameterCodeSize: state.settings.size,
+ };
+ }
+}
diff --git a/lib/cubit/settings/settings_activity_state.dart b/lib/cubit/settings/settings_activity_state.dart
new file mode 100644
index 0000000..2b2de42
--- /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 a52a742..0000000
--- 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:minehunter/config/default_game_settings.dart';
-import 'package:minehunter/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? timerValue,
- }) {
- emit(
- GameSettingsState(
- settings: GameSettings(
- level: itemsCount ?? state.settings.level,
- size: timerValue ?? state.settings.size,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultGameSettings.parameterCodeLevel:
- return GameSettings.getLevelValueFromUnsafe(state.settings.level);
- case DefaultGameSettings.parameterCodeSize:
- return GameSettings.getSizeValueFromUnsafe(state.settings.size);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String itemsCount = code == DefaultGameSettings.parameterCodeLevel
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeLevel);
- final String timerValue = code == DefaultGameSettings.parameterCodeSize
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeSize);
-
- setValues(
- itemsCount: itemsCount,
- timerValue: timerValue,
- );
- }
-
- @override
- GameSettingsState? fromJson(Map<String, dynamic> json) {
- final String itemsCount = json[DefaultGameSettings.parameterCodeLevel] as String;
- final String timerValue = json[DefaultGameSettings.parameterCodeSize] as String;
-
- return GameSettingsState(
- settings: GameSettings(
- level: itemsCount,
- size: timerValue,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameSettingsState state) {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeLevel: state.settings.level,
- DefaultGameSettings.parameterCodeSize: state.settings.size,
- };
- }
-}
diff --git a/lib/cubit/settings_game_state.dart b/lib/cubit/settings_game_state.dart
deleted file mode 100644
index 5acd85b..0000000
--- 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 9126207..c1fa5ee 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:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:minehunter/config/application_config.dart';
import 'package:minehunter/config/default_global_settings.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/cubit/nav_cubit.dart';
-import 'package:minehunter/cubit/settings_game_cubit.dart';
-import 'package:minehunter/cubit/settings_global_cubit.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/cubit/settings/settings_activity_cubit.dart';
+import 'package:minehunter/cubit/settings/settings_global_cubit.dart';
import 'package:minehunter/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: 'Minehunter',
+ title: ApplicationConfig.appTitle,
home: const SkeletonScreen(),
// Theme stuff
diff --git a/lib/models/game/game.dart b/lib/models/activity/activity.dart
similarity index 86%
rename from lib/models/game/game.dart
rename to lib/models/activity/activity.dart
index ae3b57c..323966b 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:minehunter/config/default_game_settings.dart';
-import 'package:minehunter/models/game/cell.dart';
-import 'package:minehunter/models/settings/settings_game.dart';
+import 'package:minehunter/config/default_activity_settings.dart';
+import 'package:minehunter/models/activity/cell.dart';
+import 'package:minehunter/models/settings/settings_activity.dart';
import 'package:minehunter/models/settings/settings_global.dart';
import 'package:minehunter/models/types.dart';
-class Game {
- Game({
+class Activity {
+ Activity({
// Settings
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
// State
@@ -32,7 +32,7 @@ class Game {
});
// Settings
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
// State
@@ -53,10 +53,10 @@ class Game {
bool gameWin;
bool gameFail;
- factory Game.createEmpty() {
- return Game(
+ factory Activity.createEmpty() {
+ return Activity(
// Settings
- gameSettings: GameSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(),
globalSettings: GlobalSettings.createDefault(),
// Base data
board: [],
@@ -65,15 +65,16 @@ class Game {
);
}
- factory Game.createNew({
- GameSettings? gameSettings,
+ factory Activity.createNew({
+ ActivitySettings? activitySettings,
GlobalSettings? globalSettings,
}) {
- final GameSettings newGameSettings = gameSettings ?? GameSettings.createDefault();
+ final ActivitySettings newActivitySettings =
+ activitySettings ?? ActivitySettings.createDefault();
final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
- final int sizeHorizontal = int.parse(newGameSettings.size.split('x')[0]);
- final int sizeVertical = int.parse(newGameSettings.size.split('x')[1]);
+ final int sizeHorizontal = int.parse(newActivitySettings.size.split('x')[0]);
+ final int sizeVertical = int.parse(newActivitySettings.size.split('x')[1]);
// Create empty board (it will be mined after first hit)
final Board board = [];
@@ -86,13 +87,13 @@ class Game {
}
final int minesCountRatio =
- DefaultGameSettings.minesCountRatios[newGameSettings.level] ?? 1;
+ DefaultActivitySettings.minesCountRatios[newActivitySettings.level] ?? 1;
final int minesCount = ((sizeHorizontal * sizeVertical) * minesCountRatio / 100).round();
printlog('Mines count: $minesCount');
- return Game(
+ return Activity(
// Settings
- gameSettings: newGameSettings,
+ activitySettings: newActivitySettings,
globalSettings: newGlobalSettings,
// State
isRunning: true,
@@ -176,9 +177,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');
@@ -240,13 +241,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/game/cell.dart b/lib/models/activity/cell.dart
similarity index 100%
rename from lib/models/game/cell.dart
rename to lib/models/activity/cell.dart
diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart
new file mode 100644
index 0000000..30ca647
--- /dev/null
+++ b/lib/models/settings/settings_activity.dart
@@ -0,0 +1,55 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:minehunter/config/default_activity_settings.dart';
+
+class ActivitySettings {
+ final String level;
+ final String size;
+
+ ActivitySettings({
+ required this.level,
+ required this.size,
+ });
+
+ static String getLevelValueFromUnsafe(String level) {
+ if (DefaultActivitySettings.allowedLevelValues.contains(level)) {
+ return level;
+ }
+
+ return DefaultActivitySettings.defaultLevelValue;
+ }
+
+ static String getSizeValueFromUnsafe(String size) {
+ if (DefaultActivitySettings.allowedSizeValues.contains(size)) {
+ return size;
+ }
+
+ return DefaultActivitySettings.defaultSizeValue;
+ }
+
+ factory ActivitySettings.createDefault() {
+ return ActivitySettings(
+ level: DefaultActivitySettings.defaultLevelValue,
+ size: DefaultActivitySettings.defaultSizeValue,
+ );
+ }
+
+ void dump() {
+ printlog('$ActivitySettings:');
+ printlog(' ${DefaultActivitySettings.parameterCodeLevel}: $level');
+ printlog(' ${DefaultActivitySettings.parameterCodeSize}: $size');
+ printlog('');
+ }
+
+ @override
+ String toString() {
+ return '$ActivitySettings(${toJson()})';
+ }
+
+ Map<String, dynamic>? toJson() {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeLevel: level,
+ DefaultActivitySettings.parameterCodeSize: size,
+ };
+ }
+}
diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart
deleted file mode 100644
index 97664ca..0000000
--- a/lib/models/settings/settings_game.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/config/default_game_settings.dart';
-
-class GameSettings {
- final String level;
- final String size;
-
- GameSettings({
- required this.level,
- required this.size,
- });
-
- static String getLevelValueFromUnsafe(String level) {
- if (DefaultGameSettings.allowedLevelValues.contains(level)) {
- return level;
- }
-
- return DefaultGameSettings.defaultLevelValue;
- }
-
- static String getSizeValueFromUnsafe(String size) {
- if (DefaultGameSettings.allowedSizeValues.contains(size)) {
- return size;
- }
-
- return DefaultGameSettings.defaultSizeValue;
- }
-
- factory GameSettings.createDefault() {
- return GameSettings(
- level: DefaultGameSettings.defaultLevelValue,
- size: DefaultGameSettings.defaultSizeValue,
- );
- }
-
- void dump() {
- printlog('$GameSettings:');
- printlog(' ${DefaultGameSettings.parameterCodeLevel}: $level');
- printlog(' ${DefaultGameSettings.parameterCodeSize}: $size');
- printlog('');
- }
-
- @override
- String toString() {
- return '$GameSettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeLevel: level,
- DefaultGameSettings.parameterCodeSize: size,
- };
- }
-}
diff --git a/lib/models/types.dart b/lib/models/types.dart
index 5b6aee1..afdaecb 100644
--- a/lib/models/types.dart
+++ b/lib/models/types.dart
@@ -1,4 +1,4 @@
-import 'package:minehunter/models/game/cell.dart';
+import 'package:minehunter/models/activity/cell.dart';
typedef Board = List<List<Cell>>;
typedef AnimatedBoard = List<List<bool>>;
diff --git a/lib/ui/game/game_bottom.dart b/lib/ui/game/game_bottom.dart
index 169ea23..eedd0be 100644
--- a/lib/ui/game/game_bottom.dart
+++ b/lib/ui/game/game_bottom.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
import 'package:minehunter/ui/widgets/game/mode_toggle.dart';
class GameBottomWidget extends StatelessWidget {
@@ -10,11 +10,11 @@ class GameBottomWidget 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;
- return !currentGame.isFinished ? const ToggleGameMode() : const SizedBox.shrink();
+ return !currentActivity.isFinished ? const ToggleGameMode() : const SizedBox.shrink();
},
);
}
diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart
index 86f2979..6809842 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:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
import 'package:minehunter/ui/widgets/actions/button_game_quit.dart';
class GameEndWidget extends StatelessWidget {
@@ -10,14 +10,14 @@ 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.gameWin
+ image: AssetImage(currentActivity.gameWin
? 'assets/ui/game_win.png'
- : currentGame.gameFail
+ : currentActivity.gameFail
? 'assets/ui/game_fail.png'
: ''),
fit: BoxFit.fill,
@@ -37,7 +37,7 @@ class GameEndWidget extends StatelessWidget {
),
Column(
children: [
- currentGame.animationInProgress
+ currentActivity.animationInProgress
? decorationImage
: const QuitGameButton()
],
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
deleted file mode 100644
index 2a0594c..0000000
--- 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:minehunter/config/default_game_settings.dart';
-import 'package:minehunter/config/default_global_settings.dart';
-import 'package:minehunter/cubit/settings_game_cubit.dart';
-import 'package:minehunter/cubit/settings_global_cubit.dart';
-import 'package:minehunter/ui/parameters/parameter_widget.dart';
-import 'package:minehunter/ui/widgets/actions/button_delete_saved_game.dart';
-import 'package:minehunter/ui/widgets/actions/button_game_start_new.dart';
-import 'package:minehunter/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 b2d265f..0000000
--- 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:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
-import 'package:minehunter/ui/layouts/game_layout.dart';
-import 'package:minehunter/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 4354234..019aebb 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:minehunter/config/menu.dart';
-import 'package:minehunter/cubit/nav_cubit.dart';
-import 'package:minehunter/ui/widgets/global_app_bar.dart';
+import 'package:minehunter/common/config/activity_page.dart';
+import 'package:minehunter/common/config/screen.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:minehunter/common/ui/nav/global_app_bar.dart';
+import 'package:minehunter/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 d9e7a8f..d1e4128 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:minehunter/cubit/game_cubit.dart';
+import 'package:minehunter/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 964b8dc..49bffae 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:minehunter/cubit/game_cubit.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:minehunter/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 b7bc0f3..094f095 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:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/cubit/settings_game_cubit.dart';
-import 'package:minehunter/cubit/settings_global_cubit.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/cubit/settings/settings_activity_cubit.dart';
+import 'package:minehunter/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 4c3b95d..902a948 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:minehunter/cubit/game_cubit.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:minehunter/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/cell.dart b/lib/ui/widgets/game/cell.dart
index f32eff1..cab827e 100644
--- a/lib/ui/widgets/game/cell.dart
+++ b/lib/ui/widgets/game/cell.dart
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/cell.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/cell.dart';
+import 'package:minehunter/models/activity/activity.dart';
import 'package:minehunter/utils/board_animate.dart';
class CellWidget extends StatelessWidget {
@@ -20,20 +20,20 @@ class CellWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
+ final ActivityCubit activityCubit = BlocProvider.of<ActivityCubit>(context);
String imageAsset = getImageAssetName(
- currentGame: currentGame,
+ currentActivity: currentActivity,
);
return Container(
decoration: BoxDecoration(
- color: getBackgroundColor(currentGame),
+ color: getBackgroundColor(currentActivity),
border: getCellBorders(
- currentGame: currentGame,
+ currentActivity: currentActivity,
row: row,
col: col,
),
@@ -52,28 +52,28 @@ class CellWidget extends StatelessWidget {
),
onTap: () {
// Set mines on board after first player try
- if (!currentGame.isBoardMined) {
- gameCubit.addMines(forbiddenRow: row, forbiddenCol: col);
+ if (!currentActivity.isBoardMined) {
+ activityCubit.addMines(forbiddenRow: row, forbiddenCol: col);
}
- if (!(currentGame.gameWin || currentGame.gameFail)) {
- if (currentGame.reportMode) {
- gameCubit.reportCell(
+ if (!(currentActivity.gameWin || currentActivity.gameFail)) {
+ if (currentActivity.reportMode) {
+ activityCubit.reportCell(
row: row,
col: col,
);
} else {
- gameCubit.walkOnCell(
+ activityCubit.walkOnCell(
row: row,
col: col,
);
}
- if (gameCubit.checkGameIsFinished()) {
- gameCubit.updateReportMode(false);
+ if (activityCubit.checkGameIsFinished()) {
+ activityCubit.updateReportMode(false);
BoardAnimate.startAnimation(
- gameCubit: gameCubit,
- currentGame: currentGame,
- animationType: currentGame.gameWin ? 'win' : 'fail',
+ activityCubit: activityCubit,
+ currentActivity: currentActivity,
+ animationType: currentActivity.gameWin ? 'win' : 'fail',
);
}
}
@@ -88,13 +88,13 @@ class CellWidget extends StatelessWidget {
* Compute image asset name, from skin and cell value/state
*/
String getImageAssetName({
- required Game currentGame,
+ required Activity currentActivity,
}) {
- final String skin = currentGame.globalSettings.skin;
+ final String skin = currentActivity.globalSettings.skin;
String imageAsset = 'assets/skins/${skin}_tile_unknown.png';
- bool showSolution = currentGame.gameWin || currentGame.gameFail;
+ bool showSolution = currentActivity.gameWin || currentActivity.gameFail;
if (!showSolution) {
// Running game
if (cell.isExplored) {
@@ -131,11 +131,11 @@ class CellWidget extends StatelessWidget {
}
// Compute cell background color, from cell state
- Color getBackgroundColor(currentGame) {
- if (currentGame.gameWin) {
+ Color getBackgroundColor(Activity currentActivity) {
+ if (currentActivity.gameWin) {
return cell.isAnimated ? Colors.green.shade400 : Colors.green.shade500;
}
- if (currentGame.gameFail) {
+ if (currentActivity.gameFail) {
return cell.isAnimated ? Colors.pink.shade200 : Colors.pink.shade400;
}
@@ -144,7 +144,7 @@ class CellWidget extends StatelessWidget {
// Compute cell borders, from board size and cell state
Border getCellBorders({
- required Game currentGame,
+ required Activity currentActivity,
required int row,
required int col,
}) {
@@ -152,7 +152,7 @@ class CellWidget extends StatelessWidget {
double cellBorderWidth = 4;
// Reduce cell border width on big boards
- int boardSize = currentGame.sizeHorizontal;
+ int boardSize = currentActivity.sizeHorizontal;
if (boardSize > 8) {
cellBorderWidth = 2;
if (boardSize > 10) {
@@ -160,9 +160,9 @@ class CellWidget extends StatelessWidget {
}
}
- if (currentGame.gameWin) {
+ if (currentActivity.gameWin) {
cellBorderColor = Colors.green.shade700;
- } else if (currentGame.gameFail) {
+ } else if (currentActivity.gameFail) {
cellBorderColor = Colors.pink.shade300;
}
diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
index 2e80e5c..e208415 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:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
import 'package:minehunter/models/types.dart';
import 'package:minehunter/ui/widgets/game/cell.dart';
@@ -11,12 +11,12 @@ class GameBoardWidget 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 Board board = currentGame.board;
- final Color borderColor = currentGame.reportMode ? Colors.blue : Colors.black;
+ final Board board = currentActivity.board;
+ final Color borderColor = currentActivity.reportMode ? Colors.blue : Colors.black;
return Container(
margin: const EdgeInsets.all(2),
@@ -35,10 +35,10 @@ class GameBoardWidget extends StatelessWidget {
child: Table(
defaultColumnWidth: const IntrinsicColumnWidth(),
children: [
- for (int row = 0; row < currentGame.sizeVertical; row++)
+ for (int row = 0; row < currentActivity.sizeVertical; row++)
TableRow(
children: [
- for (int col = 0; col < currentGame.sizeHorizontal; col++)
+ for (int col = 0; col < currentActivity.sizeHorizontal; col++)
Column(
children: [
CellWidget(cell: board[row][col], row: row, col: col)
diff --git a/lib/ui/widgets/game/mode_button_toggle.dart b/lib/ui/widgets/game/mode_button_toggle.dart
index a8f03cb..ad1b574 100644
--- a/lib/ui/widgets/game/mode_button_toggle.dart
+++ b/lib/ui/widgets/game/mode_button_toggle.dart
@@ -1,20 +1,20 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
class ToggleGameModeButton extends StatelessWidget {
const ToggleGameModeButton({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;
- final String skin = currentGame.globalSettings.skin;
- final String reportModeSuffix = currentGame.reportMode ? 'on' : 'off';
+ final String skin = currentActivity.globalSettings.skin;
+ final String reportModeSuffix = currentActivity.reportMode ? 'on' : 'off';
return TextButton(
child: Image(
@@ -22,7 +22,8 @@ class ToggleGameModeButton extends StatelessWidget {
fit: BoxFit.fill,
),
onPressed: () {
- BlocProvider.of<GameCubit>(context).updateReportMode(!currentGame.reportMode);
+ BlocProvider.of<ActivityCubit>(context)
+ .updateReportMode(!currentActivity.reportMode);
},
);
},
diff --git a/lib/ui/widgets/game/mode_indicator_report.dart b/lib/ui/widgets/game/mode_indicator_report.dart
index 910aa9a..492e643 100644
--- a/lib/ui/widgets/game/mode_indicator_report.dart
+++ b/lib/ui/widgets/game/mode_indicator_report.dart
@@ -1,20 +1,20 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
class GameModeIndicatorReport extends StatelessWidget {
const GameModeIndicatorReport({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;
- final String skin = currentGame.globalSettings.skin;
- final String reportModeSuffix = currentGame.reportMode ? 'on' : 'off';
+ final String skin = currentActivity.globalSettings.skin;
+ final String reportModeSuffix = currentActivity.reportMode ? 'on' : 'off';
return TextButton(
child: Image(
@@ -22,7 +22,7 @@ class GameModeIndicatorReport extends StatelessWidget {
fit: BoxFit.fill,
),
onPressed: () {
- BlocProvider.of<GameCubit>(context).updateReportMode(true);
+ BlocProvider.of<ActivityCubit>(context).updateReportMode(true);
},
);
},
diff --git a/lib/ui/widgets/game/mode_indicator_walk.dart b/lib/ui/widgets/game/mode_indicator_walk.dart
index b2a9012..6c40f04 100644
--- a/lib/ui/widgets/game/mode_indicator_walk.dart
+++ b/lib/ui/widgets/game/mode_indicator_walk.dart
@@ -1,20 +1,20 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
class GameModeIndicatorWalk extends StatelessWidget {
const GameModeIndicatorWalk({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;
- final String skin = currentGame.globalSettings.skin;
- final String reportModeSuffix = currentGame.reportMode ? 'off' : 'on';
+ final String skin = currentActivity.globalSettings.skin;
+ final String reportModeSuffix = currentActivity.reportMode ? 'off' : 'on';
return TextButton(
child: Image(
@@ -22,7 +22,7 @@ class GameModeIndicatorWalk extends StatelessWidget {
fit: BoxFit.fill,
),
onPressed: () {
- BlocProvider.of<GameCubit>(context).updateReportMode(false);
+ BlocProvider.of<ActivityCubit>(context).updateReportMode(false);
},
);
},
diff --git a/lib/ui/widgets/game/mode_toggle.dart b/lib/ui/widgets/game/mode_toggle.dart
index 7dbb9eb..8ea20c7 100644
--- a/lib/ui/widgets/game/mode_toggle.dart
+++ b/lib/ui/widgets/game/mode_toggle.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
import 'package:minehunter/ui/widgets/game/mode_button_toggle.dart';
import 'package:minehunter/ui/widgets/game/mode_indicator_report.dart';
import 'package:minehunter/ui/widgets/game/mode_indicator_walk.dart';
@@ -12,11 +12,11 @@ class ToggleGameMode extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
- final String skin = currentGame.globalSettings.skin;
+ final String skin = currentActivity.globalSettings.skin;
final Image paddingBlock = Image(
image: AssetImage('assets/skins/${skin}_empty.png'),
diff --git a/lib/ui/widgets/indicators/indicator_top.dart b/lib/ui/widgets/indicators/indicator_top.dart
index 0c95acc..04a14e8 100644
--- a/lib/ui/widgets/indicators/indicator_top.dart
+++ b/lib/ui/widgets/indicators/indicator_top.dart
@@ -1,22 +1,22 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
class TopIndicator extends StatelessWidget {
const TopIndicator({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;
- final String skin = currentGame.globalSettings.skin;
+ final String skin = currentActivity.globalSettings.skin;
- final int flaggedCellsCount = currentGame.countFlaggedCells();
- final int minesCount = currentGame.minesCount;
+ final int flaggedCellsCount = currentActivity.countFlaggedCells();
+ final int minesCount = currentActivity.minesCount;
const double blockSize = 40;
final Image flagIconBlock = Image(
diff --git a/lib/utils/board_animate.dart b/lib/utils/board_animate.dart
index 69a3fa4..d451654 100644
--- a/lib/utils/board_animate.dart
+++ b/lib/utils/board_animate.dart
@@ -1,20 +1,20 @@
import 'dart:async';
import 'dart:math';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
import 'package:minehunter/models/types.dart';
class BoardAnimate {
// Start game animation: blinking tiles
static AnimatedBoardSequence createStartGameAnimationPatterns({
- required Game currentGame,
+ required Activity currentActivity,
}) {
final AnimatedBoardSequence patterns = [];
const int patternsCount = 4;
- final int sizeHorizontal = currentGame.sizeHorizontal;
- final int sizeVertical = currentGame.sizeVertical;
+ final int sizeHorizontal = currentActivity.sizeHorizontal;
+ final int sizeVertical = currentActivity.sizeVertical;
for (int patternIndex = 0; patternIndex < patternsCount; patternIndex++) {
final AnimatedBoard pattern = [];
@@ -33,17 +33,17 @@ class BoardAnimate {
// Failed game animation: explosions blowing from exploded mines
static AnimatedBoardSequence createExplosionAnimationPatterns({
- required Game currentGame,
+ required Activity currentActivity,
}) {
final AnimatedBoardSequence patterns = [];
- final int sizeHorizontal = currentGame.sizeHorizontal;
- final int sizeVertical = currentGame.sizeVertical;
+ final int sizeHorizontal = currentActivity.sizeHorizontal;
+ final int sizeVertical = currentActivity.sizeVertical;
final List<List<int>> explodedMines = [];
for (int row = 0; row < sizeVertical; row++) {
for (int col = 0; col < sizeHorizontal; col++) {
- if (currentGame.board[row][col].isExploded) {
+ if (currentActivity.board[row][col].isExploded) {
explodedMines.add([row, col]);
}
}
@@ -77,13 +77,13 @@ class BoardAnimate {
// Win game animation: rotating rays from center
static AnimatedBoardSequence createWinGameAnimationPatterns({
- required Game currentGame,
+ required Activity currentActivity,
}) {
final AnimatedBoardSequence patterns = [];
const int patternsCount = 20;
- final int sizeHorizontal = currentGame.sizeHorizontal;
- final int sizeVertical = currentGame.sizeVertical;
+ final int sizeHorizontal = currentActivity.sizeHorizontal;
+ final int sizeVertical = currentActivity.sizeVertical;
for (int patternIndex = 0; patternIndex < patternsCount; patternIndex++) {
AnimatedBoard pattern = [];
@@ -103,13 +103,13 @@ class BoardAnimate {
// Default multi-purpose animation: sliding stripes, from top left to right bottom
static AnimatedBoardSequence createDefaultAnimationPatterns({
- required Game currentGame,
+ required Activity currentActivity,
}) {
final AnimatedBoardSequence patterns = [];
const int patternsCount = 16;
- final int sizeHorizontal = currentGame.sizeHorizontal;
- final int sizeVertical = currentGame.sizeVertical;
+ final int sizeHorizontal = currentActivity.sizeHorizontal;
+ final int sizeVertical = currentActivity.sizeVertical;
for (int patternIndex = 0; patternIndex < patternsCount; patternIndex++) {
final AnimatedBoard pattern = [];
@@ -127,8 +127,8 @@ class BoardAnimate {
}
static void startAnimation({
- required GameCubit gameCubit,
- required Game currentGame,
+ required ActivityCubit activityCubit,
+ required Activity currentActivity,
required String animationType,
}) {
AnimatedBoardSequence patterns = [];
@@ -136,28 +136,28 @@ class BoardAnimate {
switch (animationType) {
case 'start':
patterns = createStartGameAnimationPatterns(
- currentGame: currentGame,
+ currentActivity: currentActivity,
);
break;
case 'win':
patterns = createWinGameAnimationPatterns(
- currentGame: currentGame,
+ currentActivity: currentActivity,
);
break;
case 'fail':
patterns = createExplosionAnimationPatterns(
- currentGame: currentGame,
+ currentActivity: currentActivity,
);
break;
default:
patterns = createDefaultAnimationPatterns(
- currentGame: currentGame,
+ currentActivity: currentActivity,
);
}
int patternIndex = patterns.length;
- gameCubit.updateAnimationInProgress(true);
+ activityCubit.updateAnimationInProgress(true);
const interval = Duration(milliseconds: 200);
Timer.periodic(
@@ -165,11 +165,11 @@ class BoardAnimate {
(Timer timer) {
if (patternIndex == 0) {
timer.cancel();
- gameCubit.resetAnimatedBackground();
- gameCubit.updateAnimationInProgress(false);
+ activityCubit.resetAnimatedBackground();
+ activityCubit.updateAnimationInProgress(false);
} else {
patternIndex--;
- gameCubit.setAnimatedBackground(patterns[patternIndex]);
+ activityCubit.setAnimatedBackground(patterns[patternIndex]);
}
},
);
diff --git a/pubspec.lock b/pubspec.lock
index 011ee2e..5f7d30f 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 ea99240..b903537 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A minehunter game application.
publish_to: "none"
-version: 0.4.1+46
+version: 0.5.0+47
environment:
sdk: "^3.0.0"
--
GitLab