From d755815e55e3bf8cb8e453f3308a7b41d58891ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Tue, 22 Oct 2024 23:55:56 +0200
Subject: [PATCH] Normalize Activity application architecture
---
assets/translations/en.json | 3 +
assets/translations/fr.json | 3 +
.../metadata/android/en-US/changelogs/25.txt | 1 +
.../metadata/android/fr-FR/changelogs/25.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 | 27 ++--
.../ui/parameters/parameter_widget.dart | 15 +-
.../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} | 4 +-
lib/config/menu.dart | 52 ------
lib/cubit/activity/activity_cubit.dart | 144 +++++++++++++++++
lib/cubit/activity/activity_state.dart | 15 ++
lib/cubit/game_cubit.dart | 144 -----------------
lib/cubit/game_state.dart | 15 --
lib/cubit/nav_cubit.dart | 37 -----
.../settings/settings_activity_cubit.dart | 61 ++++++++
.../settings/settings_activity_state.dart | 15 ++
.../{ => settings}/settings_global_cubit.dart | 0
.../{ => settings}/settings_global_state.dart | 0
lib/cubit/settings_game_cubit.dart | 60 -------
lib/cubit/settings_game_state.dart | 15 --
lib/main.dart | 36 +++--
.../game.dart => activity/activity.dart} | 41 ++---
lib/models/{game => activity}/board.dart | 10 +-
lib/models/{game => activity}/cell.dart | 2 +-
.../{game => activity}/cell_location.dart | 0
lib/models/settings/settings_activity.dart | 42 +++++
lib/models/settings/settings_game.dart | 42 -----
lib/ui/game/game_end.dart | 14 +-
lib/ui/game/game_top.dart | 14 +-
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/game_board.dart | 12 +-
lib/ui/widgets/game/tile_widget.dart | 50 +++---
pubspec.lock | 8 +-
pubspec.yaml | 2 +-
51 files changed, 876 insertions(+), 697 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/25.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/25.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} (64%)
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 (86%)
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} (91%)
delete mode 100644 lib/config/menu.dart
create mode 100644 lib/cubit/activity/activity_cubit.dart
create mode 100644 lib/cubit/activity/activity_state.dart
delete mode 100644 lib/cubit/game_cubit.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} (80%)
rename lib/models/{game => activity}/board.dart (93%)
rename lib/models/{game => activity}/cell.dart (92%)
rename lib/models/{game => activity}/cell_location.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 daff9b7..a7220f7 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -1,6 +1,9 @@
{
"app_name": "Solitaire",
+ "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 ebc19d9..190a545 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -1,6 +1,9 @@
{
"app_name": "Solitaire",
+ "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/25.txt b/fastlane/metadata/android/en-US/changelogs/25.txt
new file mode 100644
index 0000000..ac2c90e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/25.txt
@@ -0,0 +1 @@
+Normalize Activity application architecture.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/25.txt b/fastlane/metadata/android/fr-FR/changelogs/25.txt
new file mode 100644
index 0000000..1d6843d
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/25.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..db2308f
--- /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:solitaire/common/ui/pages/game.dart';
+import 'package:solitaire/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..676c2b8
--- /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:solitaire/common/ui/screens/about.dart';
+import 'package:solitaire/common/ui/screens/activity.dart';
+import 'package:solitaire/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..34a6337
--- /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:solitaire/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..706f53d
--- /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:solitaire/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..24ff3b3
--- /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:solitaire/common/config/activity_page.dart';
+import 'package:solitaire/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 d595722..6e11cd1 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:solitaire/config/menu.dart';
-import 'package:solitaire/cubit/game_cubit.dart';
-import 'package:solitaire/cubit/nav_cubit.dart';
-import 'package:solitaire/models/game/game.dart';
+import 'package:solitaire/common/config/screen.dart';
+import 'package:solitaire/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:solitaire/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/models/activity/activity.dart';
class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
const GlobalAppBar({super.key});
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- return BlocBuilder<NavCubit, int>(
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ return BlocBuilder<NavCubitScreen, int>(
builder: (BuildContext context, int pageIndex) {
- final Game currentGame = gameState.currentGame;
+ final Activity currentActivity = activityState.currentActivity;
final List<Widget> menuActions = [];
- if (currentGame.isRunning && !currentGame.isFinished) {
+ if (currentActivity.isRunning && !currentActivity.isFinished) {
menuActions.add(StyledButton(
color: Colors.red,
onPressed: () {},
onLongPress: () {
- BlocProvider.of<GameCubit>(context).quitGame();
+ BlocProvider.of<ActivityCubit>(context).quitActivity();
+ BlocProvider.of<NavCubitPage>(context).goToPageHome();
},
child: const Image(
image: AssetImage('assets/ui/button_back.png'),
@@ -32,38 +35,38 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
),
));
} else {
- if (pageIndex == Menu.indexGame) {
+ if (pageIndex == Screen.indexActivity) {
// go to Settings page
menuActions.add(ElevatedButton(
onPressed: () {
- BlocProvider.of<NavCubit>(context).goToSettingsPage();
+ BlocProvider.of<NavCubitScreen>(context).goToScreenSettings();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
),
- child: Menu.menuItemSettings.icon,
+ child: Screen.screenSettings.icon,
));
// go to About page
menuActions.add(ElevatedButton(
onPressed: () {
- BlocProvider.of<NavCubit>(context).goToAboutPage();
+ BlocProvider.of<NavCubitScreen>(context).goToScreenAbout();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
),
- child: Menu.menuItemAbout.icon,
+ child: Screen.screenAbout.icon,
));
} else {
// back to Home page
menuActions.add(ElevatedButton(
onPressed: () {
- BlocProvider.of<NavCubit>(context).goToGamePage();
+ BlocProvider.of<NavCubitScreen>(context).goToScreenActivity();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
),
- child: Menu.menuItemGame.icon,
+ child: Screen.screenActivity.icon,
));
}
}
diff --git a/lib/ui/layouts/game_layout.dart b/lib/common/ui/pages/game.dart
similarity index 64%
rename from lib/ui/layouts/game_layout.dart
rename to lib/common/ui/pages/game.dart
index fc248c7..3413b6a 100644
--- a/lib/ui/layouts/game_layout.dart
+++ b/lib/common/ui/pages/game.dart
@@ -1,20 +1,20 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:solitaire/cubit/game_cubit.dart';
-import 'package:solitaire/models/game/game.dart';
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/models/activity/activity.dart';
import 'package:solitaire/ui/game/game_end.dart';
import 'package:solitaire/ui/game/game_top.dart';
import 'package:solitaire/ui/widgets/game/game_board.dart';
-class GameLayout extends StatelessWidget {
- const GameLayout({super.key});
+class PageGame extends StatelessWidget {
+ const PageGame({super.key});
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
return Container(
alignment: AlignmentDirectional.topCenter,
@@ -28,7 +28,7 @@ class GameLayout extends StatelessWidget {
const GameBoardWidget(),
const SizedBox(height: 8),
const Expanded(child: SizedBox.shrink()),
- currentGame.isFinished ? const GameEndWidget() : const SizedBox.shrink(),
+ currentActivity.isFinished ? const GameEndWidget() : const SizedBox.shrink(),
],
),
);
diff --git a/lib/common/ui/pages/parameters.dart b/lib/common/ui/pages/parameters.dart
new file mode 100644
index 0000000..588bd8a
--- /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:solitaire/common/ui/parameters/parameter_widget.dart';
+
+import 'package:solitaire/config/default_activity_settings.dart';
+import 'package:solitaire/config/default_global_settings.dart';
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/cubit/settings/settings_activity_cubit.dart';
+import 'package:solitaire/cubit/settings/settings_global_cubit.dart';
+import 'package:solitaire/models/activity/activity.dart';
+import 'package:solitaire/ui/widgets/actions/button_delete_saved_game.dart';
+import 'package:solitaire/ui/widgets/actions/button_game_start_new.dart';
+import 'package:solitaire/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 e8a9960..9518b6d 100644
--- a/lib/ui/parameters/parameter_painter.dart
+++ b/lib/common/ui/parameters/parameter_painter.dart
@@ -3,25 +3,26 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:solitaire/config/default_game_settings.dart';
-import 'package:solitaire/data/game_data.dart';
-import 'package:solitaire/models/game/board.dart';
-import 'package:solitaire/models/game/cell.dart';
-import 'package:solitaire/models/game/cell_location.dart';
-import 'package:solitaire/models/settings/settings_game.dart';
+import 'package:solitaire/config/default_activity_settings.dart';
+import 'package:solitaire/models/settings/settings_activity.dart';
import 'package:solitaire/models/settings/settings_global.dart';
+import 'package:solitaire/data/game_data.dart';
+import 'package:solitaire/models/activity/board.dart';
+import 'package:solitaire/models/activity/cell.dart';
+import 'package:solitaire/models/activity/cell_location.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
@@ -31,7 +32,7 @@ class ParameterPainter extends CustomPainter {
// content
switch (code) {
- case DefaultGameSettings.parameterCodeLayout:
+ case DefaultActivitySettings.parameterCodeLayout:
paintLayoutParameterItem(canvas, canvasSize);
break;
default:
@@ -85,16 +86,16 @@ class ParameterPainter extends CustomPainter {
Color gridBackgroundColor = Colors.grey;
switch (value) {
- case DefaultGameSettings.layoutValueFrench:
+ case DefaultActivitySettings.layoutValueFrench:
gridBackgroundColor = Colors.green;
break;
- case DefaultGameSettings.layoutValueGerman:
+ case DefaultActivitySettings.layoutValueGerman:
gridBackgroundColor = Colors.orange;
break;
- case DefaultGameSettings.layoutValueEnglish:
+ case DefaultActivitySettings.layoutValueEnglish:
gridBackgroundColor = Colors.red;
break;
- case DefaultGameSettings.layoutValueDiamond:
+ case DefaultActivitySettings.layoutValueDiamond:
gridBackgroundColor = Colors.purple;
break;
default:
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
similarity index 86%
rename from lib/ui/parameters/parameter_widget.dart
rename to lib/common/ui/parameters/parameter_widget.dart
index a3d3762..67990d6 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:solitaire/config/default_game_settings.dart';
+import 'package:solitaire/common/ui/parameters/parameter_painter.dart';
+
+import 'package:solitaire/config/default_activity_settings.dart';
import 'package:solitaire/config/default_global_settings.dart';
-import 'package:solitaire/models/settings/settings_game.dart';
+import 'package:solitaire/models/settings/settings_activity.dart';
import 'package:solitaire/models/settings/settings_global.dart';
-import 'package:solitaire/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,7 +38,7 @@ class ParameterWidget extends StatelessWidget {
Widget content = const SizedBox.shrink();
switch (code) {
- case DefaultGameSettings.parameterCodeLayout:
+ case DefaultActivitySettings.parameterCodeLayout:
content = getLayoutParameterItem();
break;
case DefaultGlobalSettings.parameterCodeSkin:
@@ -84,7 +85,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..5302e2a
--- /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:solitaire/common/config/activity_page.dart';
+import 'package:solitaire/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..439169a
--- /dev/null
+++ b/lib/config/application_config.dart
@@ -0,0 +1,3 @@
+class ApplicationConfig {
+ static const String appTitle = 'Solitaire';
+}
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_activity_settings.dart
similarity index 91%
rename from lib/config/default_game_settings.dart
rename to lib/config/default_activity_settings.dart
index 35a0011..84c073c 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 parameterCodeLayout = 'layout';
static const List<String> availableParameters = [
@@ -25,7 +25,7 @@ class DefaultGameSettings {
static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case parameterCodeLayout:
- return DefaultGameSettings.allowedLayoutValues;
+ return DefaultActivitySettings.allowedLayoutValues;
}
printlog('Did not find any available value for game parameter "$parameterCode".');
diff --git a/lib/config/menu.dart b/lib/config/menu.dart
deleted file mode 100644
index e41d980..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:solitaire/ui/screens/page_about.dart';
-import 'package:solitaire/ui/screens/page_game.dart';
-import 'package:solitaire/ui/screens/page_settings.dart';
-
-class MenuItem {
- final Icon icon;
- final Widget page;
-
- const MenuItem({
- required this.icon,
- required this.page,
- });
-}
-
-class Menu {
- static const indexGame = 0;
- static const menuItemGame = MenuItem(
- icon: Icon(UniconsLine.home),
- page: PageGame(),
- );
-
- static const indexSettings = 1;
- static const menuItemSettings = MenuItem(
- icon: Icon(UniconsLine.setting),
- page: PageSettings(),
- );
-
- static const indexAbout = 2;
- static const menuItemAbout = MenuItem(
- icon: Icon(UniconsLine.info_circle),
- page: PageAbout(),
- );
-
- static Map<int, MenuItem> items = {
- indexGame: menuItemGame,
- indexSettings: menuItemSettings,
- indexAbout: menuItemAbout,
- };
-
- static bool isIndexAllowed(int pageIndex) {
- return items.keys.contains(pageIndex);
- }
-
- static Widget getPageWidget(int pageIndex) {
- return items[pageIndex]?.page ?? menuItemGame.page;
- }
-
- static int itemsCount = Menu.items.length;
-}
diff --git a/lib/cubit/activity/activity_cubit.dart b/lib/cubit/activity/activity_cubit.dart
new file mode 100644
index 0000000..4e658b1
--- /dev/null
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -0,0 +1,144 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:solitaire/models/activity/cell_location.dart';
+import 'package:solitaire/models/activity/activity.dart';
+import 'package:solitaire/models/settings/settings_activity.dart';
+import 'package:solitaire/models/settings/settings_global.dart';
+
+part 'activity_state.dart';
+
+class ActivityCubit extends HydratedCubit<ActivityState> {
+ ActivityCubit()
+ : super(ActivityState(
+ currentActivity: Activity.createEmpty(),
+ ));
+
+ void updateState(Activity activity) {
+ emit(ActivityState(
+ currentActivity: activity,
+ ));
+ }
+
+ void refresh() {
+ final Activity activity = Activity(
+ // Settings
+ activitySettings: state.currentActivity.activitySettings,
+ globalSettings: state.currentActivity.globalSettings,
+ // State
+ isRunning: state.currentActivity.isRunning,
+ isStarted: state.currentActivity.isStarted,
+ isFinished: state.currentActivity.isFinished,
+ animationInProgress: state.currentActivity.animationInProgress,
+ // Base data
+ board: state.currentActivity.board,
+ // Game data
+ movesCount: state.currentActivity.movesCount,
+ remainingPegsCount: state.currentActivity.remainingPegsCount,
+ allowedMovesCount: state.currentActivity.allowedMovesCount,
+ );
+ // game.dump();
+
+ updateState(activity);
+ }
+
+ void startNewActivity({
+ required ActivitySettings activitySettings,
+ required GlobalSettings globalSettings,
+ }) {
+ final Activity newActivity = Activity.createNew(
+ // Settings
+ activitySettings: activitySettings,
+ globalSettings: globalSettings,
+ );
+
+ newActivity.dump();
+
+ updateState(newActivity);
+
+ updateRemainingPegsCount(newActivity.countRemainingPegs());
+ updateAllowedMovesCount(newActivity.countAllowedMoves());
+
+ refresh();
+ }
+
+ void quitActivity() {
+ state.currentActivity.isRunning = false;
+ refresh();
+ }
+
+ void resumeSavedActivity() {
+ state.currentActivity.isRunning = true;
+ refresh();
+ }
+
+ void deleteSavedActivity() {
+ state.currentActivity.isRunning = false;
+ state.currentActivity.isFinished = true;
+ refresh();
+ }
+
+ void updatePegValue(CellLocation location, bool hasPeg) {
+ state.currentActivity.board.cells[location.row][location.col].hasPeg = hasPeg;
+ refresh();
+ }
+
+ void incrementMovesCount() {
+ state.currentActivity.isStarted = true;
+ state.currentActivity.movesCount++;
+ refresh();
+ }
+
+ void updateRemainingPegsCount(int count) {
+ state.currentActivity.remainingPegsCount = count;
+ refresh();
+ }
+
+ void updateAllowedMovesCount(int count) {
+ state.currentActivity.allowedMovesCount = count;
+ if (count == 0) {
+ state.currentActivity.isFinished = true;
+ }
+
+ refresh();
+ }
+
+ void move({
+ required Activity currentActivity,
+ required List<int> source,
+ required List<int> target,
+ }) {
+ printlog('Move from $source to $target');
+ final int sourceCol = source[0];
+ final int sourceRow = source[1];
+ final int targetCol = target[0];
+ final int targetRow = target[1];
+
+ final int middleRow = (sourceRow + ((targetRow - sourceRow) / 2)).round();
+ final int middleCol = (sourceCol + ((targetCol - sourceCol) / 2)).round();
+
+ updatePegValue(CellLocation.go(sourceRow, sourceCol), false);
+ updatePegValue(CellLocation.go(targetRow, targetCol), true);
+ updatePegValue(CellLocation.go(middleRow, middleCol), false);
+
+ incrementMovesCount();
+ updateRemainingPegsCount(currentActivity.countRemainingPegs());
+ updateAllowedMovesCount(currentActivity.countAllowedMoves());
+ }
+
+ @override
+ ActivityState? fromJson(Map<String, dynamic> json) {
+ final Activity currentActivity = json['currentActivity'] as Activity;
+
+ return ActivityState(
+ currentActivity: currentActivity,
+ );
+ }
+
+ @override
+ Map<String, dynamic>? toJson(ActivityState state) {
+ return <String, dynamic>{
+ 'currentActivity': state.currentActivity.toJson(),
+ };
+ }
+}
diff --git a/lib/cubit/activity/activity_state.dart b/lib/cubit/activity/activity_state.dart
new file mode 100644
index 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_cubit.dart b/lib/cubit/game_cubit.dart
deleted file mode 100644
index fe1f9ae..0000000
--- a/lib/cubit/game_cubit.dart
+++ /dev/null
@@ -1,144 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:solitaire/models/game/cell_location.dart';
-import 'package:solitaire/models/game/game.dart';
-import 'package:solitaire/models/settings/settings_game.dart';
-import 'package:solitaire/models/settings/settings_global.dart';
-
-part 'game_state.dart';
-
-class GameCubit extends HydratedCubit<GameState> {
- GameCubit()
- : super(GameState(
- currentGame: Game.createEmpty(),
- ));
-
- void updateState(Game game) {
- emit(GameState(
- currentGame: game,
- ));
- }
-
- void refresh() {
- final Game game = Game(
- // Settings
- gameSettings: state.currentGame.gameSettings,
- globalSettings: state.currentGame.globalSettings,
- // State
- isRunning: state.currentGame.isRunning,
- isStarted: state.currentGame.isStarted,
- isFinished: state.currentGame.isFinished,
- animationInProgress: state.currentGame.animationInProgress,
- // Base data
- board: state.currentGame.board,
- // Game data
- movesCount: state.currentGame.movesCount,
- remainingPegsCount: state.currentGame.remainingPegsCount,
- allowedMovesCount: state.currentGame.allowedMovesCount,
- );
- // game.dump();
-
- updateState(game);
- }
-
- void startNewGame({
- required GameSettings gameSettings,
- required GlobalSettings globalSettings,
- }) {
- final Game newGame = Game.createNew(
- // Settings
- gameSettings: gameSettings,
- globalSettings: globalSettings,
- );
-
- newGame.dump();
-
- updateState(newGame);
-
- updateRemainingPegsCount(newGame.countRemainingPegs());
- updateAllowedMovesCount(newGame.countAllowedMoves());
-
- refresh();
- }
-
- void quitGame() {
- state.currentGame.isRunning = false;
- refresh();
- }
-
- void resumeSavedGame() {
- state.currentGame.isRunning = true;
- refresh();
- }
-
- void deleteSavedGame() {
- state.currentGame.isRunning = false;
- state.currentGame.isFinished = true;
- refresh();
- }
-
- void updatePegValue(CellLocation location, bool hasPeg) {
- state.currentGame.board.cells[location.row][location.col].hasPeg = hasPeg;
- refresh();
- }
-
- void incrementMovesCount() {
- state.currentGame.isStarted = true;
- state.currentGame.movesCount++;
- refresh();
- }
-
- void updateRemainingPegsCount(int count) {
- state.currentGame.remainingPegsCount = count;
- refresh();
- }
-
- void updateAllowedMovesCount(int count) {
- state.currentGame.allowedMovesCount = count;
- if (count == 0) {
- state.currentGame.isFinished = true;
- }
-
- refresh();
- }
-
- void move({
- required Game currentGame,
- required List<int> source,
- required List<int> target,
- }) {
- printlog('Move from $source to $target');
- final int sourceCol = source[0];
- final int sourceRow = source[1];
- final int targetCol = target[0];
- final int targetRow = target[1];
-
- final int middleRow = (sourceRow + ((targetRow - sourceRow) / 2)).round();
- final int middleCol = (sourceCol + ((targetCol - sourceCol) / 2)).round();
-
- updatePegValue(CellLocation.go(sourceRow, sourceCol), false);
- updatePegValue(CellLocation.go(targetRow, targetCol), true);
- updatePegValue(CellLocation.go(middleRow, middleCol), false);
-
- incrementMovesCount();
- updateRemainingPegsCount(currentGame.countRemainingPegs());
- updateAllowedMovesCount(currentGame.countAllowedMoves());
- }
-
- @override
- GameState? fromJson(Map<String, dynamic> json) {
- final Game currentGame = json['currentGame'] as Game;
-
- return GameState(
- currentGame: currentGame,
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameState state) {
- return <String, dynamic>{
- 'currentGame': state.currentGame.toJson(),
- };
- }
-}
diff --git a/lib/cubit/game_state.dart b/lib/cubit/game_state.dart
deleted file mode 100644
index 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 55732ae..0000000
--- a/lib/cubit/nav_cubit.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:solitaire/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..c4e4037
--- /dev/null
+++ b/lib/cubit/settings/settings_activity_cubit.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:solitaire/config/default_activity_settings.dart';
+import 'package:solitaire/models/settings/settings_activity.dart';
+
+part 'settings_activity_state.dart';
+
+class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
+ ActivitySettingsCubit()
+ : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
+
+ void setValues({
+ String? layout,
+ }) {
+ emit(
+ ActivitySettingsState(
+ settings: ActivitySettings(
+ layout: layout ?? state.settings.layout,
+ ),
+ ),
+ );
+ }
+
+ String getParameterValue(String code) {
+ switch (code) {
+ case DefaultActivitySettings.parameterCodeLayout:
+ return ActivitySettings.getLayoutValueFromUnsafe(state.settings.layout);
+ }
+
+ return '';
+ }
+
+ void setParameterValue(String code, String value) {
+ final String layout = code == DefaultActivitySettings.parameterCodeLayout
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeLayout);
+
+ setValues(
+ layout: layout,
+ );
+ }
+
+ @override
+ ActivitySettingsState? fromJson(Map<String, dynamic> json) {
+ final String layout = json[DefaultActivitySettings.parameterCodeLayout] as String;
+
+ return ActivitySettingsState(
+ settings: ActivitySettings(
+ layout: layout,
+ ),
+ );
+ }
+
+ @override
+ Map<String, dynamic>? toJson(ActivitySettingsState state) {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeLayout: state.settings.layout,
+ };
+ }
+}
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 78c1564..0000000
--- a/lib/cubit/settings_game_cubit.dart
+++ /dev/null
@@ -1,60 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:solitaire/config/default_game_settings.dart';
-import 'package:solitaire/models/settings/settings_game.dart';
-
-part 'settings_game_state.dart';
-
-class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
- GameSettingsCubit() : super(GameSettingsState(settings: GameSettings.createDefault()));
-
- void setValues({
- String? layout,
- }) {
- emit(
- GameSettingsState(
- settings: GameSettings(
- layout: layout ?? state.settings.layout,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultGameSettings.parameterCodeLayout:
- return GameSettings.getLayoutValueFromUnsafe(state.settings.layout);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String layout = code == DefaultGameSettings.parameterCodeLayout
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeLayout);
-
- setValues(
- layout: layout,
- );
- }
-
- @override
- GameSettingsState? fromJson(Map<String, dynamic> json) {
- final String layout = json[DefaultGameSettings.parameterCodeLayout] as String;
-
- return GameSettingsState(
- settings: GameSettings(
- layout: layout,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameSettingsState state) {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeLayout: state.settings.layout,
- };
- }
-}
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 3e36829..34e83de 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:solitaire/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:solitaire/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:solitaire/config/application_config.dart';
import 'package:solitaire/config/default_global_settings.dart';
-import 'package:solitaire/cubit/game_cubit.dart';
-import 'package:solitaire/cubit/nav_cubit.dart';
-import 'package:solitaire/cubit/settings_game_cubit.dart';
-import 'package:solitaire/cubit/settings_global_cubit.dart';
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/cubit/settings/settings_activity_cubit.dart';
+import 'package:solitaire/cubit/settings/settings_global_cubit.dart';
import 'package:solitaire/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: 'Solitaire',
+ title: ApplicationConfig.appTitle,
home: const SkeletonScreen(),
// Theme stuff
diff --git a/lib/models/game/game.dart b/lib/models/activity/activity.dart
similarity index 80%
rename from lib/models/game/game.dart
rename to lib/models/activity/activity.dart
index bd87d48..47bf4ff 100644
--- a/lib/models/game/game.dart
+++ b/lib/models/activity/activity.dart
@@ -1,14 +1,14 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:solitaire/models/game/board.dart';
-import 'package:solitaire/models/game/cell.dart';
-import 'package:solitaire/models/settings/settings_game.dart';
+import 'package:solitaire/models/activity/board.dart';
+import 'package:solitaire/models/activity/cell.dart';
+import 'package:solitaire/models/settings/settings_activity.dart';
import 'package:solitaire/models/settings/settings_global.dart';
-class Game {
- Game({
+class Activity {
+ Activity({
// Settings
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
// State
@@ -27,7 +27,7 @@ class Game {
});
// Settings
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
// State
@@ -44,31 +44,32 @@ class Game {
int remainingPegsCount;
int allowedMovesCount;
- factory Game.createEmpty() {
- return Game(
+ factory Activity.createEmpty() {
+ return Activity(
// Settings
- gameSettings: GameSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(),
globalSettings: GlobalSettings.createDefault(),
// Base data
board: Board.createEmpty(),
);
}
- factory Game.createNew({
- GameSettings? gameSettings,
+ factory Activity.createNew({
+ ActivitySettings? activitySettings,
GlobalSettings? globalSettings,
}) {
- final GameSettings newGameSettings = gameSettings ?? GameSettings.createDefault();
+ final ActivitySettings newActivitySettings =
+ activitySettings ?? ActivitySettings.createDefault();
final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
- return Game(
+ return Activity(
// Settings
- gameSettings: newGameSettings,
+ activitySettings: newActivitySettings,
globalSettings: newGlobalSettings,
// State
isRunning: true,
// Base data
- board: Board.createNew(gameSettings: newGameSettings),
+ board: Board.createNew(activitySettings: newActivitySettings),
);
}
@@ -127,9 +128,9 @@ class Game {
void dump() {
printlog('');
printlog('## Current game dump:');
- printlog('$Game:');
+ printlog('$Activity:');
printlog(' Settings');
- gameSettings.dump();
+ activitySettings.dump();
globalSettings.dump();
printlog(' State');
printlog(' isRunning: $isRunning');
@@ -147,13 +148,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/board.dart b/lib/models/activity/board.dart
similarity index 93%
rename from lib/models/game/board.dart
rename to lib/models/activity/board.dart
index 39fb41f..d5ff68a 100644
--- a/lib/models/game/board.dart
+++ b/lib/models/activity/board.dart
@@ -1,9 +1,9 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:solitaire/data/game_data.dart';
-import 'package:solitaire/models/game/cell.dart';
-import 'package:solitaire/models/game/cell_location.dart';
-import 'package:solitaire/models/settings/settings_game.dart';
+import 'package:solitaire/models/activity/cell.dart';
+import 'package:solitaire/models/activity/cell_location.dart';
+import 'package:solitaire/models/settings/settings_activity.dart';
typedef BoardCells = List<List<Cell>>;
@@ -21,9 +21,9 @@ class Board {
}
factory Board.createNew({
- required GameSettings gameSettings,
+ required ActivitySettings activitySettings,
}) {
- final List<String>? template = GameData.templates[gameSettings.layout];
+ final List<String>? template = GameData.templates[activitySettings.layout];
final BoardCells grid = [];
diff --git a/lib/models/game/cell.dart b/lib/models/activity/cell.dart
similarity index 92%
rename from lib/models/game/cell.dart
rename to lib/models/activity/cell.dart
index 1bd34ce..1269b2a 100644
--- a/lib/models/game/cell.dart
+++ b/lib/models/activity/cell.dart
@@ -1,6 +1,6 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:solitaire/models/game/cell_location.dart';
+import 'package:solitaire/models/activity/cell_location.dart';
class Cell {
Cell({
diff --git a/lib/models/game/cell_location.dart b/lib/models/activity/cell_location.dart
similarity index 100%
rename from lib/models/game/cell_location.dart
rename to lib/models/activity/cell_location.dart
diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart
new file mode 100644
index 0000000..637c97d
--- /dev/null
+++ b/lib/models/settings/settings_activity.dart
@@ -0,0 +1,42 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:solitaire/config/default_activity_settings.dart';
+
+class ActivitySettings {
+ final String layout;
+
+ ActivitySettings({
+ required this.layout,
+ });
+
+ static String getLayoutValueFromUnsafe(String layout) {
+ if (DefaultActivitySettings.allowedLayoutValues.contains(layout)) {
+ return layout;
+ }
+
+ return DefaultActivitySettings.defaultLayoutValue;
+ }
+
+ factory ActivitySettings.createDefault() {
+ return ActivitySettings(
+ layout: DefaultActivitySettings.defaultLayoutValue,
+ );
+ }
+
+ void dump() {
+ printlog('$ActivitySettings:');
+ printlog(' ${DefaultActivitySettings.parameterCodeLayout}: $layout');
+ printlog('');
+ }
+
+ @override
+ String toString() {
+ return '$ActivitySettings(${toJson()})';
+ }
+
+ Map<String, dynamic>? toJson() {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeLayout: layout,
+ };
+ }
+}
diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart
deleted file mode 100644
index a4b9f94..0000000
--- a/lib/models/settings/settings_game.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:solitaire/config/default_game_settings.dart';
-
-class GameSettings {
- final String layout;
-
- GameSettings({
- required this.layout,
- });
-
- static String getLayoutValueFromUnsafe(String layout) {
- if (DefaultGameSettings.allowedLayoutValues.contains(layout)) {
- return layout;
- }
-
- return DefaultGameSettings.defaultLayoutValue;
- }
-
- factory GameSettings.createDefault() {
- return GameSettings(
- layout: DefaultGameSettings.defaultLayoutValue,
- );
- }
-
- void dump() {
- printlog('$GameSettings:');
- printlog(' ${DefaultGameSettings.parameterCodeLayout}: $layout');
- printlog('');
- }
-
- @override
- String toString() {
- return '$GameSettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeLayout: layout,
- };
- }
-}
diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart
index 34fdb14..9bc08ca 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:solitaire/cubit/game_cubit.dart';
-import 'package:solitaire/models/game/game.dart';
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/models/activity/activity.dart';
import 'package:solitaire/ui/widgets/actions/button_game_quit.dart';
class GameEndWidget extends StatelessWidget {
@@ -10,13 +10,13 @@ class GameEndWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
final Image decorationImage = Image(
image: AssetImage(
- currentGame.gameWon ? 'assets/ui/game_win.png' : 'assets/ui/game_fail.png'),
+ currentActivity.gameWon ? 'assets/ui/game_win.png' : 'assets/ui/game_fail.png'),
fit: BoxFit.fill,
);
@@ -34,7 +34,7 @@ class GameEndWidget extends StatelessWidget {
),
Column(
children: [
- currentGame.animationInProgress == true
+ currentActivity.animationInProgress == true
? decorationImage
: const QuitGameButton()
],
diff --git a/lib/ui/game/game_top.dart b/lib/ui/game/game_top.dart
index 0f0aa00..af3fcb6 100644
--- a/lib/ui/game/game_top.dart
+++ b/lib/ui/game/game_top.dart
@@ -1,17 +1,17 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:solitaire/cubit/game_cubit.dart';
-import 'package:solitaire/models/game/game.dart';
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/models/activity/activity.dart';
class GameTopWidget extends StatelessWidget {
const GameTopWidget({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 Table(
children: [
@@ -20,7 +20,7 @@ class GameTopWidget extends StatelessWidget {
Column(
children: [
Text(
- '♟️ ${currentGame.remainingPegsCount}',
+ '♟️ ${currentActivity.remainingPegsCount}',
style: const TextStyle(
fontSize: 40,
fontWeight: FontWeight.w600,
@@ -32,7 +32,7 @@ class GameTopWidget extends StatelessWidget {
Column(
children: [
Text(
- currentGame.allowedMovesCount.toString(),
+ currentActivity.allowedMovesCount.toString(),
style: const TextStyle(
fontSize: 20,
fontWeight: FontWeight.w600,
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
deleted file mode 100644
index 2b2e926..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:solitaire/config/default_game_settings.dart';
-import 'package:solitaire/config/default_global_settings.dart';
-import 'package:solitaire/cubit/settings_game_cubit.dart';
-import 'package:solitaire/cubit/settings_global_cubit.dart';
-import 'package:solitaire/ui/parameters/parameter_widget.dart';
-import 'package:solitaire/ui/widgets/actions/button_delete_saved_game.dart';
-import 'package:solitaire/ui/widgets/actions/button_game_start_new.dart';
-import 'package:solitaire/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 2c04a2d..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:solitaire/cubit/game_cubit.dart';
-import 'package:solitaire/models/game/game.dart';
-import 'package:solitaire/ui/layouts/game_layout.dart';
-import 'package:solitaire/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 4973958..0737b19 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:solitaire/config/menu.dart';
-import 'package:solitaire/cubit/nav_cubit.dart';
-import 'package:solitaire/ui/widgets/global_app_bar.dart';
+import 'package:solitaire/common/config/activity_page.dart';
+import 'package:solitaire/common/config/screen.dart';
+import 'package:solitaire/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:solitaire/common/ui/nav/global_app_bar.dart';
+import 'package:solitaire/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 57e2df4..256ed2c 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:solitaire/cubit/game_cubit.dart';
+import 'package:solitaire/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 21ef6fa..6dbf73b 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:solitaire/cubit/game_cubit.dart';
+import 'package:solitaire/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:solitaire/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 ad965d5..41fde54 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:solitaire/cubit/game_cubit.dart';
-import 'package:solitaire/cubit/settings_game_cubit.dart';
-import 'package:solitaire/cubit/settings_global_cubit.dart';
+import 'package:solitaire/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/cubit/settings/settings_activity_cubit.dart';
+import 'package:solitaire/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 31940af..5634391 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:solitaire/cubit/game_cubit.dart';
+import 'package:solitaire/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
class ResumeSavedGameButton extends StatelessWidget {
const ResumeSavedGameButton({super.key});
@@ -11,7 +13,8 @@ class ResumeSavedGameButton extends StatelessWidget {
return StyledButton(
color: Colors.blue,
onPressed: () {
- BlocProvider.of<GameCubit>(context).resumeSavedGame();
+ BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
+ BlocProvider.of<NavCubitPage>(context).goToPageGame();
},
child: const Image(
image: AssetImage('assets/ui/button_resume_game.png'),
diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
index d4ddeb3..c7f5a25 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:solitaire/cubit/game_cubit.dart';
-import 'package:solitaire/models/game/board.dart';
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/models/activity/board.dart';
import 'package:solitaire/ui/widgets/game/tile_widget.dart';
class GameBoardWidget extends StatelessWidget {
@@ -10,12 +10,12 @@ class GameBoardWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Board board = gameState.currentGame.board;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Board board = activityState.currentActivity.board;
final BoardCells cells = board.cells;
- final boardSize = gameState.currentGame.boardSize;
+ final boardSize = activityState.currentActivity.boardSize;
final double tileSize = (MediaQuery.of(context).size.width - 40) / boardSize;
return Column(
diff --git a/lib/ui/widgets/game/tile_widget.dart b/lib/ui/widgets/game/tile_widget.dart
index 2216687..93ca8ee 100644
--- a/lib/ui/widgets/game/tile_widget.dart
+++ b/lib/ui/widgets/game/tile_widget.dart
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:solitaire/cubit/game_cubit.dart';
-import 'package:solitaire/models/game/cell.dart';
-import 'package:solitaire/models/game/game.dart';
+import 'package:solitaire/cubit/activity/activity_cubit.dart';
+import 'package:solitaire/models/activity/cell.dart';
+import 'package:solitaire/models/activity/activity.dart';
class TileWidget extends StatelessWidget {
const TileWidget({
@@ -17,18 +17,18 @@ class TileWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
if (tile.hasHole) {
return render(
- currentGame: currentGame,
- gameCubit: BlocProvider.of<GameCubit>(context),
+ currentActivity: currentActivity,
+ activityCubit: BlocProvider.of<ActivityCubit>(context),
);
} else {
return Image(
- image: AssetImage('assets/skins/${currentGame.globalSettings.skin}_board.png'),
+ image: AssetImage('assets/skins/${currentActivity.globalSettings.skin}_board.png'),
width: tileSize,
height: tileSize,
fit: BoxFit.fill,
@@ -39,19 +39,19 @@ class TileWidget extends StatelessWidget {
}
Widget render({
- required Game currentGame,
- required GameCubit gameCubit,
+ required Activity currentActivity,
+ required ActivityCubit activityCubit,
}) {
List<Widget> stack = [
hole(
- currentGame: currentGame,
- gameCubit: gameCubit,
+ currentActivity: currentActivity,
+ activityCubit: activityCubit,
),
];
if (tile.hasPeg) {
stack.add(draggable(
- currentGame: currentGame,
+ currentActivity: currentActivity,
));
}
@@ -62,10 +62,10 @@ class TileWidget extends StatelessWidget {
}
Widget hole({
- required Game currentGame,
- required GameCubit gameCubit,
+ required Activity currentActivity,
+ required ActivityCubit activityCubit,
}) {
- String image = 'assets/skins/${currentGame.globalSettings.skin}_hole.png';
+ String image = 'assets/skins/${currentActivity.globalSettings.skin}_hole.png';
return DragTarget<List<int>>(
builder: (
@@ -83,12 +83,12 @@ class TileWidget extends StatelessWidget {
onAcceptWithDetails: (DragTargetDetails<List<int>> source) {
List<int> target = [tile.location.col, tile.location.row];
// printlog('(drag) Pick from ' + source.toString() + ' and drop on ' + target.toString());
- if (currentGame.board.isMoveAllowed(
+ if (currentActivity.board.isMoveAllowed(
source: source.data,
target: target,
)) {
- gameCubit.move(
- currentGame: currentGame,
+ activityCubit.move(
+ currentActivity: currentActivity,
source: source.data,
target: target,
);
@@ -98,14 +98,14 @@ class TileWidget extends StatelessWidget {
}
Widget draggable({
- required Game currentGame,
+ required Activity currentActivity,
}) {
return Draggable<List<int>>(
data: [tile.location.col, tile.location.row],
// Widget when draggable is being dragged
feedback: peg(
- currentGame: currentGame,
+ currentActivity: currentActivity,
),
// Widget to display on original place when being dragged
@@ -113,15 +113,15 @@ class TileWidget extends StatelessWidget {
// Widget when draggable is stationary
child: peg(
- currentGame: currentGame,
+ currentActivity: currentActivity,
),
);
}
Widget peg({
- required Game currentGame,
+ required Activity currentActivity,
}) {
- String image = 'assets/skins/${currentGame.globalSettings.skin}_peg.png';
+ String image = 'assets/skins/${currentActivity.globalSettings.skin}_peg.png';
return Image(
image: AssetImage(image),
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 4b40abd..d96664b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Solitaire Game
publish_to: "none"
-version: 0.3.1+24
+version: 0.4.0+25
environment:
sdk: "^3.0.0"
--
GitLab