diff --git a/assets/translations/en.json b/assets/translations/en.json
index 82d188f9bd55d92364d62f560e2214d7dc6d60d8..39213cc88784601282d021123850207aeadf017c 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -1,6 +1,9 @@
{
"app_name": "4 in a row",
+ "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 472a7d93f1e3017f5df6cd229c5a1f4a8b34ad12..fbee3d7c251286df9c6b409b3716fd20f8671f09 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -1,6 +1,9 @@
{
"app_name": "Puissance 4",
+ "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/28.txt b/fastlane/metadata/android/en-US/changelogs/28.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ac2c90e221caf3cf01ebba168fb16a8f31c0253a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/28.txt
@@ -0,0 +1 @@
+Normalize Activity application architecture.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/28.txt b/fastlane/metadata/android/fr-FR/changelogs/28.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1d6843d89ba84ea4147528bc3d62d9ecf1a4a762
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/28.txt
@@ -0,0 +1 @@
+Harmonisation des applications en Activity.
diff --git a/lib/common/config/activity_page.dart b/lib/common/config/activity_page.dart
new file mode 100644
index 0000000000000000000000000000000000000000..87017773d2a5d116ed288ea7966541c3c719086f
--- /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:puissance4/common/ui/pages/game.dart';
+import 'package:puissance4/common/ui/pages/parameters.dart';
+
+class ActivityPageItem {
+ final String code;
+ final Icon icon;
+ final Widget page;
+
+ const ActivityPageItem({
+ required this.code,
+ required this.icon,
+ required this.page,
+ });
+}
+
+class ActivityPage {
+ static const bool displayBottomNavBar = false;
+
+ static const indexHome = 0;
+ static const pageHome = ActivityPageItem(
+ code: 'page_home',
+ icon: Icon(UniconsLine.home),
+ page: PageParameters(),
+ );
+
+ static const indexGame = 1;
+ static const pageGame = ActivityPageItem(
+ code: 'page_game',
+ icon: Icon(UniconsLine.star),
+ page: PageGame(),
+ );
+
+ static const Map<int, ActivityPageItem> items = {
+ indexHome: pageHome,
+ indexGame: pageGame,
+ };
+
+ static int defaultPageIndex = indexHome;
+
+ static bool isIndexAllowed(int pageIndex) {
+ return items.keys.contains(pageIndex);
+ }
+
+ static Widget getWidget(int pageIndex) {
+ return items[pageIndex]?.page ?? pageHome.page;
+ }
+}
diff --git a/lib/common/config/screen.dart b/lib/common/config/screen.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ee3c5a0a2cdb53a82ad055703febd1b2e4b23057
--- /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:puissance4/common/ui/screens/about.dart';
+import 'package:puissance4/common/ui/screens/activity.dart';
+import 'package:puissance4/common/ui/screens/settings.dart';
+
+class ScreenItem {
+ final String code;
+ final Icon icon;
+ final Widget screen;
+
+ const ScreenItem({
+ required this.code,
+ required this.icon,
+ required this.screen,
+ });
+}
+
+class Screen {
+ static const indexActivity = 0;
+ static const screenActivity = ScreenItem(
+ code: 'screen_activity',
+ icon: Icon(UniconsLine.home),
+ screen: ScreenActivity(),
+ );
+
+ static const indexSettings = 1;
+ static const screenSettings = ScreenItem(
+ code: 'screen_settings',
+ icon: Icon(UniconsLine.setting),
+ screen: ScreenSettings(),
+ );
+
+ static const indexAbout = 2;
+ static const screenAbout = ScreenItem(
+ code: 'screen_about',
+ icon: Icon(UniconsLine.info_circle),
+ screen: ScreenAbout(),
+ );
+
+ static Map<int, ScreenItem> items = {
+ indexActivity: screenActivity,
+ indexSettings: screenSettings,
+ indexAbout: screenAbout,
+ };
+
+ static bool isIndexAllowed(int screenIndex) {
+ return items.keys.contains(screenIndex);
+ }
+
+ static Widget getWidget(int screenIndex) {
+ return items[screenIndex]?.screen ?? screenActivity.screen;
+ }
+}
diff --git a/lib/common/cubit/nav/nav_cubit_pages.dart b/lib/common/cubit/nav/nav_cubit_pages.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b24c3b96a671e667a5ecf5137496f169591f9da5
--- /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:puissance4/common/config/activity_page.dart';
+
+class NavCubitPage extends HydratedCubit<int> {
+ NavCubitPage() : super(0);
+
+ void updateIndex(int index) {
+ if (ActivityPage.isIndexAllowed(index)) {
+ emit(index);
+ } else {
+ emit(ActivityPage.indexHome);
+ }
+ }
+
+ void goToPageHome() {
+ updateIndex(ActivityPage.indexHome);
+ }
+
+ void goToPageGame() {
+ updateIndex(ActivityPage.indexGame);
+ }
+
+ @override
+ int fromJson(Map<String, dynamic> json) {
+ return ActivityPage.indexHome;
+ }
+
+ @override
+ Map<String, dynamic>? toJson(int state) {
+ return <String, int>{'index': state};
+ }
+}
diff --git a/lib/common/cubit/nav/nav_cubit_screens.dart b/lib/common/cubit/nav/nav_cubit_screens.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ada848e3e68df96a290b7efa9a0bf3e9418539fb
--- /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:puissance4/common/config/screen.dart';
+
+class NavCubitScreen extends HydratedCubit<int> {
+ NavCubitScreen() : super(0);
+
+ void updateIndex(int index) {
+ if (Screen.isIndexAllowed(index)) {
+ emit(index);
+ } else {
+ goToScreenActivity();
+ }
+ }
+
+ void goToScreenActivity() {
+ emit(Screen.indexActivity);
+ }
+
+ void goToScreenSettings() {
+ emit(Screen.indexSettings);
+ }
+
+ void goToScreenAbout() {
+ emit(Screen.indexAbout);
+ }
+
+ @override
+ int fromJson(Map<String, dynamic> json) {
+ return Screen.indexActivity;
+ }
+
+ @override
+ Map<String, dynamic>? toJson(int state) {
+ return <String, int>{'index': state};
+ }
+}
diff --git a/lib/common/ui/nav/bottom_nav_bar.dart b/lib/common/ui/nav/bottom_nav_bar.dart
new file mode 100644
index 0000000000000000000000000000000000000000..116a284fe176bfe2075fd8e0e9e5748ae6eba0b2
--- /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:puissance4/common/config/activity_page.dart';
+import 'package:puissance4/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 917f88fd4d168a57cdbacc10fc82bd98dab1ab25..9f5be6cbcc67727a9caca0e98d2ad450c1650f21 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:puissance4/config/menu.dart';
-import 'package:puissance4/cubit/game_cubit.dart';
-import 'package:puissance4/cubit/nav_cubit.dart';
-import 'package:puissance4/models/game/game.dart';
+import 'package:puissance4/common/config/screen.dart';
+import 'package:puissance4/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:puissance4/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:puissance4/cubit/activity/activity_cubit.dart';
+import 'package:puissance4/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 65%
rename from lib/ui/layouts/game_layout.dart
rename to lib/common/ui/pages/game.dart
index df31c4ec9699ea6f4b3459c84e822566455b9d5d..3b18a75029df590c3a4f31f532f3eaef15a6725f 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:puissance4/cubit/game_cubit.dart';
-import 'package:puissance4/models/game/game.dart';
+import 'package:puissance4/cubit/activity/activity_cubit.dart';
+import 'package:puissance4/models/activity/activity.dart';
import 'package:puissance4/ui/widgets/game/game_board.dart';
import 'package:puissance4/ui/widgets/game/game_bottom.dart';
import 'package:puissance4/ui/widgets/game/game_end.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 SizedBox(height: 16),
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 0000000000000000000000000000000000000000..a7d0f6b252498506efc297e815971ad23b012358
--- /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:puissance4/common/ui/parameters/parameter_widget.dart';
+
+import 'package:puissance4/config/default_activity_settings.dart';
+import 'package:puissance4/config/default_global_settings.dart';
+import 'package:puissance4/cubit/activity/activity_cubit.dart';
+import 'package:puissance4/cubit/settings/settings_activity_cubit.dart';
+import 'package:puissance4/cubit/settings/settings_global_cubit.dart';
+import 'package:puissance4/models/activity/activity.dart';
+import 'package:puissance4/ui/widgets/actions/button_delete_saved_game.dart';
+import 'package:puissance4/ui/widgets/actions/button_game_start_new.dart';
+import 'package:puissance4/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 89%
rename from lib/ui/parameters/parameter_painter.dart
rename to lib/common/ui/parameters/parameter_painter.dart
index 922291c192965acb93c2b1da8239dc696c6e0d82..7a5f365ade232277863d3cfe66132d9f4c6a97ab 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:puissance4/config/default_game_settings.dart';
-import 'package:puissance4/models/settings/settings_game.dart';
+import 'package:puissance4/config/default_activity_settings.dart';
+import 'package:puissance4/models/settings/settings_activity.dart';
import 'package:puissance4/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,7 +27,7 @@ class ParameterPainter extends CustomPainter {
// content
switch (code) {
- case DefaultGameSettings.parameterCodeSize:
+ case DefaultActivitySettings.parameterCodeSize:
paintSizeParameterItem(canvas, canvasSize);
break;
default:
@@ -80,7 +80,7 @@ class ParameterPainter extends CustomPainter {
int gridWidth = 1;
switch (value) {
- case DefaultGameSettings.sizeValueMedium:
+ case DefaultActivitySettings.sizeValueMedium:
gridWidth = 3;
break;
default:
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
similarity index 80%
rename from lib/ui/parameters/parameter_widget.dart
rename to lib/common/ui/parameters/parameter_widget.dart
index f64e5ec9bd8fa0054f0cdea41c6e589c52d78d67..3983e6279502f52eb4854c4bce8bbc957cf77046 100644
--- a/lib/ui/parameters/parameter_widget.dart
+++ b/lib/common/ui/parameters/parameter_widget.dart
@@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:puissance4/config/default_game_settings.dart';
-import 'package:puissance4/models/settings/settings_game.dart';
+import 'package:puissance4/common/ui/parameters/parameter_painter.dart';
+
+import 'package:puissance4/config/default_activity_settings.dart';
+import 'package:puissance4/models/settings/settings_activity.dart';
import 'package:puissance4/models/settings/settings_global.dart';
-import 'package:puissance4/ui/parameters/parameter_painter.dart';
class ParameterWidget extends StatelessWidget {
const ParameterWidget({
@@ -13,7 +14,7 @@ class ParameterWidget extends StatelessWidget {
required this.value,
required this.isSelected,
required this.size,
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
required this.onPressed,
});
@@ -22,7 +23,7 @@ class ParameterWidget extends StatelessWidget {
final String value;
final bool isSelected;
final double size;
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
final VoidCallback onPressed;
@@ -36,10 +37,10 @@ class ParameterWidget extends StatelessWidget {
Widget content = const SizedBox.shrink();
switch (code) {
- case DefaultGameSettings.parameterCodeGameMode:
+ case DefaultActivitySettings.parameterCodeGameMode:
content = getGameModeParameterItem();
break;
- case DefaultGameSettings.parameterCodeSize:
+ case DefaultActivitySettings.parameterCodeSize:
content = getSizeParameterItem(value);
break;
default:
@@ -76,19 +77,19 @@ class ParameterWidget extends StatelessWidget {
Color baseColor = Colors.grey;
switch (value) {
- case DefaultGameSettings.gameModeHumanVsHuman:
+ case DefaultActivitySettings.gameModeHumanVsHuman:
text = '🧑 🧑';
baseColor = Colors.green;
break;
- case DefaultGameSettings.gameModeHumanVsRobot:
+ case DefaultActivitySettings.gameModeHumanVsRobot:
text = '🧑 🤖';
baseColor = Colors.pink;
break;
- case DefaultGameSettings.gameModeRobotVsHuman:
+ case DefaultActivitySettings.gameModeRobotVsHuman:
text = '🤖 🧑';
baseColor = Colors.pink;
break;
- case DefaultGameSettings.gameModeRobotVsRobot:
+ case DefaultActivitySettings.gameModeRobotVsRobot:
text = '🤖 🤖';
baseColor = Colors.brown;
break;
@@ -106,7 +107,7 @@ class ParameterWidget extends StatelessWidget {
Color backgroundColor = Colors.grey;
switch (value) {
- case DefaultGameSettings.sizeValueMedium:
+ case DefaultActivitySettings.sizeValueMedium:
backgroundColor = Colors.orange;
break;
default:
@@ -122,7 +123,7 @@ class ParameterWidget extends StatelessWidget {
painter: ParameterPainter(
code: code,
value: value,
- gameSettings: gameSettings,
+ activitySettings: activitySettings,
globalSettings: globalSettings,
),
isComplex: true,
diff --git a/lib/ui/screens/page_about.dart b/lib/common/ui/screens/about.dart
similarity index 93%
rename from lib/ui/screens/page_about.dart
rename to lib/common/ui/screens/about.dart
index ab73e304b8138295f6669330b928e0d1d0263565..f7a14a9a7e574a7b6f9ed181f38d08ba8c2285fe 100644
--- a/lib/ui/screens/page_about.dart
+++ b/lib/common/ui/screens/about.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-class PageAbout extends StatelessWidget {
- const PageAbout({super.key});
+class ScreenAbout extends StatelessWidget {
+ const ScreenAbout({super.key});
@override
Widget build(BuildContext context) {
diff --git a/lib/common/ui/screens/activity.dart b/lib/common/ui/screens/activity.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c409f19333bad9e32e20e4a18f985130b8cf99c6
--- /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:puissance4/common/config/activity_page.dart';
+import 'package:puissance4/common/cubit/nav/nav_cubit_pages.dart';
+
+class ScreenActivity extends StatelessWidget {
+ const ScreenActivity({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<NavCubitPage, int>(
+ builder: (BuildContext context, int pageIndex) {
+ return ActivityPage.getWidget(pageIndex);
+ },
+ );
+ }
+}
diff --git a/lib/ui/screens/page_settings.dart b/lib/common/ui/screens/settings.dart
similarity index 87%
rename from lib/ui/screens/page_settings.dart
rename to lib/common/ui/screens/settings.dart
index 50964ef462b6e3e411347cab4e966afb0f505008..7981b1c6becc4f5b925c3058b05423750d80f62e 100644
--- a/lib/ui/screens/page_settings.dart
+++ b/lib/common/ui/screens/settings.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-class PageSettings extends StatelessWidget {
- const PageSettings({super.key});
+class ScreenSettings extends StatelessWidget {
+ const ScreenSettings({super.key});
@override
Widget build(BuildContext context) {
diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart
new file mode 100644
index 0000000000000000000000000000000000000000..5fe9dc4dc8e6f341ac8d648a6e0b182eaefcb7fd
--- /dev/null
+++ b/lib/config/application_config.dart
@@ -0,0 +1,3 @@
+class ApplicationConfig {
+ static const String appTitle = 'Puissance4';
+}
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_activity_settings.dart
similarity index 90%
rename from lib/config/default_game_settings.dart
rename to lib/config/default_activity_settings.dart
index 72145900e6f71d6e2e1efc4738df455f6d59f1aa..6097ba947e0697eac4162287b7d5099ff5ab5f8e 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 parameterCodeGameMode = 'gameMode';
static const String parameterCodeSize = 'size';
@@ -35,9 +35,9 @@ class DefaultGameSettings {
static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case parameterCodeGameMode:
- return DefaultGameSettings.allowedGameModeValues;
+ return DefaultActivitySettings.allowedGameModeValues;
case parameterCodeSize:
- return DefaultGameSettings.allowedSizeValues;
+ return DefaultActivitySettings.allowedSizeValues;
}
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 f66eb027a5bf6db818f93e2550eb9558dad5a95e..0000000000000000000000000000000000000000
--- a/lib/config/menu.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puissance4/ui/screens/page_about.dart';
-import 'package:puissance4/ui/screens/page_game.dart';
-import 'package:puissance4/ui/screens/page_settings.dart';
-
-class MenuItem {
- final Icon icon;
- final Widget page;
-
- const MenuItem({
- required this.icon,
- required this.page,
- });
-}
-
-class Menu {
- static const indexGame = 0;
- static const menuItemGame = MenuItem(
- icon: Icon(UniconsLine.home),
- page: PageGame(),
- );
-
- static const indexSettings = 1;
- static const menuItemSettings = MenuItem(
- icon: Icon(UniconsLine.setting),
- page: PageSettings(),
- );
-
- static const indexAbout = 2;
- static const menuItemAbout = MenuItem(
- icon: Icon(UniconsLine.info_circle),
- page: PageAbout(),
- );
-
- static Map<int, MenuItem> items = {
- indexGame: menuItemGame,
- indexSettings: menuItemSettings,
- indexAbout: menuItemAbout,
- };
-
- static bool isIndexAllowed(int pageIndex) {
- return items.keys.contains(pageIndex);
- }
-
- static Widget getPageWidget(int pageIndex) {
- return items[pageIndex]?.page ?? menuItemGame.page;
- }
-
- static int itemsCount = Menu.items.length;
-}
diff --git a/lib/cubit/activity/activity_cubit.dart b/lib/cubit/activity/activity_cubit.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c20751fba99dc8ae223f20edf3a5c94bfd6dd46c
--- /dev/null
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -0,0 +1,175 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:puissance4/models/activity/activity.dart';
+import 'package:puissance4/models/settings/settings_activity.dart';
+import 'package:puissance4/models/settings/settings_global.dart';
+import 'package:puissance4/robot/robot_player.dart';
+
+part 'activity_state.dart';
+
+class ActivityCubit extends HydratedCubit<ActivityState> {
+ ActivityCubit()
+ : super(ActivityState(
+ currentActivity: Activity.createNull(),
+ ));
+
+ 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,
+ sizeHorizontal: state.currentActivity.sizeHorizontal,
+ sizeVertical: state.currentActivity.sizeVertical,
+ // Game data
+ currentPlayer: state.currentActivity.currentPlayer,
+ );
+ // game.dump();
+
+ updateState(activity);
+ }
+
+ void startNewActivity({
+ required ActivitySettings activitySettings,
+ required GlobalSettings globalSettings,
+ }) {
+ final Activity newActivity = Activity.createNew(
+ // Settings
+ activitySettings: activitySettings,
+ globalSettings: globalSettings,
+ );
+
+ newActivity.dump();
+
+ updateState(newActivity);
+ refresh();
+
+ robotPlay();
+ }
+
+ 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 toggleCurrentPlayer() {
+ state.currentActivity.currentPlayer = 3 - state.currentActivity.currentPlayer;
+ refresh();
+
+ robotPlay();
+ }
+
+ void robotPlay() async {
+ if (!state.currentActivity.isFinished && !state.currentActivity.isCurrentPlayerHuman()) {
+ final int? pickedCell = RobotPlayer.pickColumn(state.currentActivity);
+ await Future.delayed(const Duration(milliseconds: 500));
+
+ if (pickedCell != null) {
+ tapOnColumn(col: pickedCell);
+ }
+ }
+ }
+
+ void tapOnColumn({required int col}) async {
+ printlog('tap on column: $col');
+
+ if (!state.currentActivity.isMoveAllowed(col: col)) {
+ printlog('not allowed');
+ return;
+ }
+
+ state.currentActivity.animationInProgress = true;
+ refresh();
+
+ await dropCoin(col: col);
+
+ if (state.currentActivity.connected4()) {
+ printlog('user connected 4');
+ state.currentActivity.isFinished = true;
+ refresh();
+ }
+ if (!state.currentActivity.canPlay()) {
+ printlog('user has no more move to play');
+ state.currentActivity.isFinished = true;
+ refresh();
+ }
+
+ state.currentActivity.animationInProgress = false;
+ if (state.currentActivity.isFinished == false) {
+ toggleCurrentPlayer();
+ }
+
+ refresh();
+ }
+
+ // put coin on top cell
+ // and make it fall until bottom or other coin
+ Future<void> dropCoin({required int col}) async {
+ int currentRow = 0;
+
+ do {
+ if (currentRow > 0) {
+ state.currentActivity.board.setCellValue(
+ row: currentRow - 1,
+ col: col,
+ value: 0,
+ );
+ }
+ state.currentActivity.board.setCellValue(
+ row: currentRow++,
+ col: col,
+ value: state.currentActivity.currentPlayer,
+ );
+ refresh();
+
+ await Future.delayed(const Duration(milliseconds: 50));
+ } while (currentRow < state.currentActivity.sizeVertical &&
+ state.currentActivity.board.getCellValue(
+ row: currentRow,
+ col: col,
+ ) ==
+ 0);
+
+ refresh();
+ }
+
+ @override
+ ActivityState? fromJson(Map<String, dynamic> json) {
+ final Activity currentActivity = json['currentActivity'] as Activity;
+
+ return ActivityState(
+ currentActivity: currentActivity,
+ );
+ }
+
+ @override
+ Map<String, dynamic>? toJson(ActivityState state) {
+ return <String, dynamic>{
+ 'currentActivity': state.currentActivity.toJson(),
+ };
+ }
+}
diff --git a/lib/cubit/activity/activity_state.dart b/lib/cubit/activity/activity_state.dart
new file mode 100644
index 0000000000000000000000000000000000000000..887b45e4255fd7de1cc7744569d82a38a66602f2
--- /dev/null
+++ b/lib/cubit/activity/activity_state.dart
@@ -0,0 +1,15 @@
+part of 'activity_cubit.dart';
+
+@immutable
+class ActivityState extends Equatable {
+ const ActivityState({
+ required this.currentActivity,
+ });
+
+ final Activity currentActivity;
+
+ @override
+ List<dynamic> get props => <dynamic>[
+ currentActivity,
+ ];
+}
diff --git a/lib/cubit/game_cubit.dart b/lib/cubit/game_cubit.dart
deleted file mode 100644
index cd3590d3e66682a237f880351a4cdf460b7547db..0000000000000000000000000000000000000000
--- a/lib/cubit/game_cubit.dart
+++ /dev/null
@@ -1,175 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puissance4/models/game/game.dart';
-import 'package:puissance4/models/settings/settings_game.dart';
-import 'package:puissance4/models/settings/settings_global.dart';
-import 'package:puissance4/robot/robot_player.dart';
-
-part 'game_state.dart';
-
-class GameCubit extends HydratedCubit<GameState> {
- GameCubit()
- : super(GameState(
- currentGame: Game.createNull(),
- ));
-
- 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,
- sizeHorizontal: state.currentGame.sizeHorizontal,
- sizeVertical: state.currentGame.sizeVertical,
- // Game data
- currentPlayer: state.currentGame.currentPlayer,
- );
- // game.dump();
-
- updateState(game);
- }
-
- void startNewGame({
- required GameSettings gameSettings,
- required GlobalSettings globalSettings,
- }) {
- final Game newGame = Game.createNew(
- // Settings
- gameSettings: gameSettings,
- globalSettings: globalSettings,
- );
-
- newGame.dump();
-
- updateState(newGame);
- refresh();
-
- robotPlay();
- }
-
- 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 toggleCurrentPlayer() {
- state.currentGame.currentPlayer = 3 - state.currentGame.currentPlayer;
- refresh();
-
- robotPlay();
- }
-
- void robotPlay() async {
- if (!state.currentGame.isFinished && !state.currentGame.isCurrentPlayerHuman()) {
- final int? pickedCell = RobotPlayer.pickColumn(state.currentGame);
- await Future.delayed(const Duration(milliseconds: 500));
-
- if (pickedCell != null) {
- tapOnColumn(col: pickedCell);
- }
- }
- }
-
- void tapOnColumn({required int col}) async {
- printlog('tap on column: $col');
-
- if (!state.currentGame.isMoveAllowed(col: col)) {
- printlog('not allowed');
- return;
- }
-
- state.currentGame.animationInProgress = true;
- refresh();
-
- await dropCoin(col: col);
-
- if (state.currentGame.connected4()) {
- printlog('user connected 4');
- state.currentGame.isFinished = true;
- refresh();
- }
- if (!state.currentGame.canPlay()) {
- printlog('user has no more move to play');
- state.currentGame.isFinished = true;
- refresh();
- }
-
- state.currentGame.animationInProgress = false;
- if (state.currentGame.isFinished == false) {
- toggleCurrentPlayer();
- }
-
- refresh();
- }
-
- // put coin on top cell
- // and make it fall until bottom or other coin
- Future<void> dropCoin({required int col}) async {
- int currentRow = 0;
-
- do {
- if (currentRow > 0) {
- state.currentGame.board.setCellValue(
- row: currentRow - 1,
- col: col,
- value: 0,
- );
- }
- state.currentGame.board.setCellValue(
- row: currentRow++,
- col: col,
- value: state.currentGame.currentPlayer,
- );
- refresh();
-
- await Future.delayed(const Duration(milliseconds: 50));
- } while (currentRow < state.currentGame.sizeVertical &&
- state.currentGame.board.getCellValue(
- row: currentRow,
- col: col,
- ) ==
- 0);
-
- refresh();
- }
-
- @override
- GameState? fromJson(Map<String, dynamic> json) {
- final Game currentGame = json['currentGame'] as Game;
-
- return GameState(
- currentGame: currentGame,
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameState state) {
- return <String, dynamic>{
- 'currentGame': state.currentGame.toJson(),
- };
- }
-}
diff --git a/lib/cubit/game_state.dart b/lib/cubit/game_state.dart
deleted file mode 100644
index 00e211668c3269255926939324355792abd61c41..0000000000000000000000000000000000000000
--- a/lib/cubit/game_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'game_cubit.dart';
-
-@immutable
-class GameState extends Equatable {
- const GameState({
- required this.currentGame,
- });
-
- final Game currentGame;
-
- @override
- List<dynamic> get props => <dynamic>[
- currentGame,
- ];
-}
diff --git a/lib/cubit/nav_cubit.dart b/lib/cubit/nav_cubit.dart
deleted file mode 100644
index 61666ccb891e2d420e4e234615beec84eafee874..0000000000000000000000000000000000000000
--- a/lib/cubit/nav_cubit.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puissance4/config/menu.dart';
-
-class NavCubit extends HydratedCubit<int> {
- NavCubit() : super(0);
-
- void updateIndex(int index) {
- if (Menu.isIndexAllowed(index)) {
- emit(index);
- } else {
- goToGamePage();
- }
- }
-
- void goToGamePage() {
- emit(Menu.indexGame);
- }
-
- void goToSettingsPage() {
- emit(Menu.indexSettings);
- }
-
- void goToAboutPage() {
- emit(Menu.indexAbout);
- }
-
- @override
- int fromJson(Map<String, dynamic> json) {
- return Menu.indexGame;
- }
-
- @override
- Map<String, dynamic>? toJson(int state) {
- return <String, int>{'pageIndex': state};
- }
-}
diff --git a/lib/cubit/settings/settings_activity_cubit.dart b/lib/cubit/settings/settings_activity_cubit.dart
new file mode 100644
index 0000000000000000000000000000000000000000..dc7eba81cae8e8c4fb33a8d27abe9a72dfe7ad29
--- /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:puissance4/config/default_activity_settings.dart';
+import 'package:puissance4/models/settings/settings_activity.dart';
+
+part 'settings_activity_state.dart';
+
+class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
+ ActivitySettingsCubit()
+ : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
+
+ void setValues({
+ String? gameMode,
+ String? size,
+ }) {
+ emit(
+ ActivitySettingsState(
+ settings: ActivitySettings(
+ gameMode: gameMode ?? state.settings.gameMode,
+ size: size ?? state.settings.size,
+ ),
+ ),
+ );
+ }
+
+ String getParameterValue(String code) {
+ switch (code) {
+ case DefaultActivitySettings.parameterCodeGameMode:
+ return ActivitySettings.getGameModeValueFromUnsafe(state.settings.gameMode);
+ case DefaultActivitySettings.parameterCodeSize:
+ return ActivitySettings.getSizeValueFromUnsafe(state.settings.size);
+ }
+
+ return '';
+ }
+
+ void setParameterValue(String code, String value) {
+ final String gameMode = code == DefaultActivitySettings.parameterCodeGameMode
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeGameMode);
+ final String size = code == DefaultActivitySettings.parameterCodeSize
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeSize);
+
+ setValues(
+ gameMode: gameMode,
+ size: size,
+ );
+ }
+
+ @override
+ ActivitySettingsState? fromJson(Map<String, dynamic> json) {
+ final String gameMode = json[DefaultActivitySettings.parameterCodeGameMode] as String;
+ final String size = json[DefaultActivitySettings.parameterCodeSize] as String;
+
+ return ActivitySettingsState(
+ settings: ActivitySettings(
+ gameMode: gameMode,
+ size: size,
+ ),
+ );
+ }
+
+ @override
+ Map<String, dynamic>? toJson(ActivitySettingsState state) {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeGameMode: state.settings.gameMode,
+ 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 0000000000000000000000000000000000000000..2b2de42011634e81ae9e6f8bcaa1577f239c778b
--- /dev/null
+++ b/lib/cubit/settings/settings_activity_state.dart
@@ -0,0 +1,15 @@
+part of 'settings_activity_cubit.dart';
+
+@immutable
+class ActivitySettingsState extends Equatable {
+ const ActivitySettingsState({
+ required this.settings,
+ });
+
+ final ActivitySettings settings;
+
+ @override
+ List<dynamic> get props => <dynamic>[
+ settings,
+ ];
+}
diff --git a/lib/cubit/settings_global_cubit.dart b/lib/cubit/settings/settings_global_cubit.dart
similarity index 100%
rename from lib/cubit/settings_global_cubit.dart
rename to lib/cubit/settings/settings_global_cubit.dart
diff --git a/lib/cubit/settings_global_state.dart b/lib/cubit/settings/settings_global_state.dart
similarity index 100%
rename from lib/cubit/settings_global_state.dart
rename to lib/cubit/settings/settings_global_state.dart
diff --git a/lib/cubit/settings_game_cubit.dart b/lib/cubit/settings_game_cubit.dart
deleted file mode 100644
index f42a2f902b40463e09ad8c4d1bc974ef02eaedb1..0000000000000000000000000000000000000000
--- a/lib/cubit/settings_game_cubit.dart
+++ /dev/null
@@ -1,71 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puissance4/config/default_game_settings.dart';
-import 'package:puissance4/models/settings/settings_game.dart';
-
-part 'settings_game_state.dart';
-
-class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
- GameSettingsCubit() : super(GameSettingsState(settings: GameSettings.createDefault()));
-
- void setValues({
- String? gameMode,
- String? size,
- }) {
- emit(
- GameSettingsState(
- settings: GameSettings(
- gameMode: gameMode ?? state.settings.gameMode,
- size: size ?? state.settings.size,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultGameSettings.parameterCodeGameMode:
- return GameSettings.getGameModeValueFromUnsafe(state.settings.gameMode);
- case DefaultGameSettings.parameterCodeSize:
- return GameSettings.getSizeValueFromUnsafe(state.settings.size);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String gameMode = code == DefaultGameSettings.parameterCodeGameMode
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeGameMode);
- final String size = code == DefaultGameSettings.parameterCodeSize
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeSize);
-
- setValues(
- gameMode: gameMode,
- size: size,
- );
- }
-
- @override
- GameSettingsState? fromJson(Map<String, dynamic> json) {
- final String gameMode = json[DefaultGameSettings.parameterCodeGameMode] as String;
- final String size = json[DefaultGameSettings.parameterCodeSize] as String;
-
- return GameSettingsState(
- settings: GameSettings(
- gameMode: gameMode,
- size: size,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameSettingsState state) {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeGameMode: state.settings.gameMode,
- 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 5acd85b44ba541e1c5e9c26af1c4be26a385b9ed..0000000000000000000000000000000000000000
--- a/lib/cubit/settings_game_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'settings_game_cubit.dart';
-
-@immutable
-class GameSettingsState extends Equatable {
- const GameSettingsState({
- required this.settings,
- });
-
- final GameSettings settings;
-
- @override
- List<dynamic> get props => <dynamic>[
- settings,
- ];
-}
diff --git a/lib/main.dart b/lib/main.dart
index 85ece077609650602ab7dd300c0fa8499b2923e3..f9cd76d7559739ed1ead054f5e9c804c1860d62c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,10 +4,13 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:puissance4/cubit/game_cubit.dart';
-import 'package:puissance4/cubit/nav_cubit.dart';
-import 'package:puissance4/cubit/settings_game_cubit.dart';
-import 'package:puissance4/cubit/settings_global_cubit.dart';
+import 'package:puissance4/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:puissance4/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:puissance4/config/application_config.dart';
+import 'package:puissance4/cubit/activity/activity_cubit.dart';
+import 'package:puissance4/cubit/settings/settings_activity_cubit.dart';
+import 'package:puissance4/cubit/settings/settings_global_cubit.dart';
import 'package:puissance4/ui/skeleton.dart';
void main() async {
@@ -45,17 +48,30 @@ class MyApp extends StatelessWidget {
return MultiBlocProvider(
providers: [
- BlocProvider<NavCubit>(create: (context) => NavCubit()),
+ // default providers
+ BlocProvider<NavCubitPage>(
+ create: (context) => NavCubitPage(),
+ ),
+ BlocProvider<NavCubitScreen>(
+ create: (context) => NavCubitScreen(),
+ ),
BlocProvider<ApplicationThemeModeCubit>(
- create: (context) => ApplicationThemeModeCubit()),
- BlocProvider<GameCubit>(create: (context) => GameCubit()),
- BlocProvider<GlobalSettingsCubit>(create: (context) => GlobalSettingsCubit()),
- BlocProvider<GameSettingsCubit>(create: (context) => GameSettingsCubit()),
+ create: (context) => ApplicationThemeModeCubit(),
+ ),
+ BlocProvider<ActivityCubit>(
+ create: (context) => ActivityCubit(),
+ ),
+ BlocProvider<GlobalSettingsCubit>(
+ create: (context) => GlobalSettingsCubit(),
+ ),
+ BlocProvider<ActivitySettingsCubit>(
+ create: (context) => ActivitySettingsCubit(),
+ ),
],
child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>(
builder: (BuildContext context, ApplicationThemeModeState state) {
return MaterialApp(
- title: 'Puissance4',
+ title: ApplicationConfig.appTitle,
home: const SkeletonScreen(),
// Theme stuff
diff --git a/lib/models/game/game.dart b/lib/models/activity/activity.dart
similarity index 81%
rename from lib/models/game/game.dart
rename to lib/models/activity/activity.dart
index 886ef974c8000fde816bf9007353c6202cd36152..3b8c2355d2438a90c4ce73f7ddf2af3ead1e3c2e 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:puissance4/config/default_game_settings.dart';
-import 'package:puissance4/models/game/board.dart';
-import 'package:puissance4/models/settings/settings_game.dart';
+import 'package:puissance4/config/default_activity_settings.dart';
+import 'package:puissance4/models/activity/board.dart';
+import 'package:puissance4/models/settings/settings_activity.dart';
import 'package:puissance4/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,10 +44,10 @@ class Game {
// Game data
int currentPlayer;
- factory Game.createNull() {
- return Game(
+ factory Activity.createNull() {
+ return Activity(
// Settings
- gameSettings: GameSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(),
globalSettings: GlobalSettings.createDefault(),
// Base data
board: Board.createNull(),
@@ -58,15 +58,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 BoardCells board = [];
@@ -78,9 +79,9 @@ class Game {
board.add(row);
}
- return Game(
+ return Activity(
// Settings
- gameSettings: newGameSettings,
+ activitySettings: newActivitySettings,
globalSettings: newGlobalSettings,
// State
isRunning: true,
@@ -166,14 +167,14 @@ class Game {
}
bool isPlayerHuman(int playerIndex) {
- switch (gameSettings.gameMode) {
- case DefaultGameSettings.gameModeHumanVsHuman:
+ switch (activitySettings.gameMode) {
+ case DefaultActivitySettings.gameModeHumanVsHuman:
return true;
- case DefaultGameSettings.gameModeHumanVsRobot:
+ case DefaultActivitySettings.gameModeHumanVsRobot:
return (playerIndex == 1);
- case DefaultGameSettings.gameModeRobotVsHuman:
+ case DefaultActivitySettings.gameModeRobotVsHuman:
return (playerIndex == 2);
- case DefaultGameSettings.gameModeRobotVsRobot:
+ case DefaultActivitySettings.gameModeRobotVsRobot:
return false;
default:
}
@@ -188,9 +189,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');
@@ -205,13 +206,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 100%
rename from lib/models/game/board.dart
rename to lib/models/activity/board.dart
diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7550504992d5245231bd9b3f6fa5904f9bb73e41
--- /dev/null
+++ b/lib/models/settings/settings_activity.dart
@@ -0,0 +1,55 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:puissance4/config/default_activity_settings.dart';
+
+class ActivitySettings {
+ final String gameMode;
+ final String size;
+
+ ActivitySettings({
+ required this.gameMode,
+ required this.size,
+ });
+
+ static String getGameModeValueFromUnsafe(String gameMode) {
+ if (DefaultActivitySettings.allowedGameModeValues.contains(gameMode)) {
+ return gameMode;
+ }
+
+ return DefaultActivitySettings.defaultGameModeValue;
+ }
+
+ static String getSizeValueFromUnsafe(String size) {
+ if (DefaultActivitySettings.allowedSizeValues.contains(size)) {
+ return size;
+ }
+
+ return DefaultActivitySettings.defaultSizeValue;
+ }
+
+ factory ActivitySettings.createDefault() {
+ return ActivitySettings(
+ gameMode: DefaultActivitySettings.defaultGameModeValue,
+ size: DefaultActivitySettings.defaultSizeValue,
+ );
+ }
+
+ void dump() {
+ printlog('$ActivitySettings:');
+ printlog(' ${DefaultActivitySettings.parameterCodeGameMode}: $gameMode');
+ printlog(' ${DefaultActivitySettings.parameterCodeSize}: $size');
+ printlog('');
+ }
+
+ @override
+ String toString() {
+ return '$ActivitySettings(${toJson()})';
+ }
+
+ Map<String, dynamic>? toJson() {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeGameMode: gameMode,
+ DefaultActivitySettings.parameterCodeSize: size,
+ };
+ }
+}
diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart
deleted file mode 100644
index 24930b38c0151d5defb02937072bfdef4bc7645b..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_game.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puissance4/config/default_game_settings.dart';
-
-class GameSettings {
- final String gameMode;
- final String size;
-
- GameSettings({
- required this.gameMode,
- required this.size,
- });
-
- static String getGameModeValueFromUnsafe(String gameMode) {
- if (DefaultGameSettings.allowedGameModeValues.contains(gameMode)) {
- return gameMode;
- }
-
- return DefaultGameSettings.defaultGameModeValue;
- }
-
- static String getSizeValueFromUnsafe(String size) {
- if (DefaultGameSettings.allowedSizeValues.contains(size)) {
- return size;
- }
-
- return DefaultGameSettings.defaultSizeValue;
- }
-
- factory GameSettings.createDefault() {
- return GameSettings(
- gameMode: DefaultGameSettings.defaultGameModeValue,
- size: DefaultGameSettings.defaultSizeValue,
- );
- }
-
- void dump() {
- printlog('$GameSettings:');
- printlog(' ${DefaultGameSettings.parameterCodeGameMode}: $gameMode');
- printlog(' ${DefaultGameSettings.parameterCodeSize}: $size');
- printlog('');
- }
-
- @override
- String toString() {
- return '$GameSettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeGameMode: gameMode,
- DefaultGameSettings.parameterCodeSize: size,
- };
- }
-}
diff --git a/lib/robot/robot_player.dart b/lib/robot/robot_player.dart
index 89fdc61e42d61ea7a10b941d5d057dbeb3615a3f..8f6ff5135e7990482c8af22516dcb47bad466a31 100644
--- a/lib/robot/robot_player.dart
+++ b/lib/robot/robot_player.dart
@@ -1,11 +1,11 @@
-import 'package:puissance4/models/game/game.dart';
+import 'package:puissance4/models/activity/activity.dart';
class RobotPlayer {
- static int? pickColumn(Game currentGame) {
+ static int? pickColumn(Activity currentActivity) {
List<int> allowedColumns = [];
- for (int columnIndex = 0; columnIndex < currentGame.sizeHorizontal; columnIndex++) {
- if (currentGame.isMoveAllowed(col: columnIndex)) {
+ for (int columnIndex = 0; columnIndex < currentActivity.sizeHorizontal; columnIndex++) {
+ if (currentActivity.isMoveAllowed(col: columnIndex)) {
allowedColumns.add(columnIndex);
}
}
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
deleted file mode 100644
index 7de767c02453496b4f6b0d0483d8eb8f00fe9f6b..0000000000000000000000000000000000000000
--- a/lib/ui/layouts/parameters_layout.dart
+++ /dev/null
@@ -1,141 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puissance4/config/default_game_settings.dart';
-import 'package:puissance4/config/default_global_settings.dart';
-import 'package:puissance4/cubit/settings_game_cubit.dart';
-import 'package:puissance4/cubit/settings_global_cubit.dart';
-import 'package:puissance4/ui/parameters/parameter_widget.dart';
-import 'package:puissance4/ui/widgets/actions/button_delete_saved_game.dart';
-import 'package:puissance4/ui/widgets/actions/button_game_start_new.dart';
-import 'package:puissance4/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 2b50d66591a917bc60e1552d36966e267a843ce9..0000000000000000000000000000000000000000
--- a/lib/ui/screens/page_game.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puissance4/cubit/game_cubit.dart';
-import 'package:puissance4/models/game/game.dart';
-import 'package:puissance4/ui/layouts/parameters_layout.dart';
-import 'package:puissance4/ui/layouts/game_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 017bab4daf0b78b58e30ccde840a4e0111ef0582..dcc1dacc83e91bc3188ade88b978cd91725e287d 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:puissance4/config/menu.dart';
-import 'package:puissance4/cubit/nav_cubit.dart';
-import 'package:puissance4/ui/widgets/global_app_bar.dart';
+import 'package:puissance4/common/config/activity_page.dart';
+import 'package:puissance4/common/config/screen.dart';
+import 'package:puissance4/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:puissance4/common/ui/nav/global_app_bar.dart';
+import 'package:puissance4/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 0c493afbd9ca858c8eba1b6111d26a04d222e6ed..a8069961007304c9377dfb69888180d5dd8dccda 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:puissance4/cubit/game_cubit.dart';
+import 'package:puissance4/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 06304e4e35f3da157060e728e9473e1473eb33cf..6a2ccf966a654c6e4d312d10acf56abd1c4f1227 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:puissance4/cubit/game_cubit.dart';
+import 'package:puissance4/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:puissance4/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 428e00e42cd4a455348eadfd0a22cede16237e88..fecbbe36fc927498a60872ae9ce1ed5b6d423a7d 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:puissance4/cubit/game_cubit.dart';
-import 'package:puissance4/cubit/settings_game_cubit.dart';
-import 'package:puissance4/cubit/settings_global_cubit.dart';
+import 'package:puissance4/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:puissance4/cubit/activity/activity_cubit.dart';
+import 'package:puissance4/cubit/settings/settings_activity_cubit.dart';
+import 'package:puissance4/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 ef22002513cca8e9ffb451aadf0f3cda4b20ebee..995aee9830809caaadd5c18b3e0115b766bcda6f 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:puissance4/cubit/game_cubit.dart';
+import 'package:puissance4/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:puissance4/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 f52ea4ad5c10875ae8fe8475cdbf66c92765421b..0aeb71a45dd719ceba1e07745094c7ada71e2bae 100644
--- a/lib/ui/widgets/game/game_board.dart
+++ b/lib/ui/widgets/game/game_board.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:puissance4/cubit/game_cubit.dart';
+import 'package:puissance4/cubit/activity/activity_cubit.dart';
class GameBoardWidget extends StatelessWidget {
const GameBoardWidget({super.key});
@@ -9,12 +9,13 @@ class GameBoardWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Center(
- child: BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
+ child: BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
final Color borderColor = Theme.of(context).colorScheme.onSurface;
Widget cellContent({required int row, required int col}) {
- final cellValue = gameState.currentGame.board.getCellValue(row: row, col: col);
+ final cellValue =
+ activityState.currentActivity.board.getCellValue(row: row, col: col);
final Color color =
cellValue == 0 ? Colors.grey : (cellValue == 1 ? Colors.yellow : Colors.red);
@@ -23,7 +24,7 @@ class GameBoardWidget extends StatelessWidget {
child: StyledButton(
color: color,
onPressed: () {
- BlocProvider.of<GameCubit>(context).tapOnColumn(col: col);
+ BlocProvider.of<ActivityCubit>(context).tapOnColumn(col: col);
},
child: SizedBox.shrink(),
),
@@ -44,10 +45,12 @@ class GameBoardWidget extends StatelessWidget {
child: Table(
defaultColumnWidth: const IntrinsicColumnWidth(),
children: [
- for (int row = 0; row < gameState.currentGame.sizeVertical; row++)
+ for (int row = 0; row < activityState.currentActivity.sizeVertical; row++)
TableRow(
children: [
- for (int col = 0; col < gameState.currentGame.sizeHorizontal; col++)
+ for (int col = 0;
+ col < activityState.currentActivity.sizeHorizontal;
+ col++)
Column(
children: [cellContent(row: row, col: col)],
),
diff --git a/lib/ui/widgets/game/game_bottom.dart b/lib/ui/widgets/game/game_bottom.dart
index 06ebc2057f40291dd6c30bfec1543c9a380974d1..736a431e1dec676a89a5ccdd69917a9dde344b25 100644
--- a/lib/ui/widgets/game/game_bottom.dart
+++ b/lib/ui/widgets/game/game_bottom.dart
@@ -1,21 +1,21 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:puissance4/cubit/game_cubit.dart';
-import 'package:puissance4/models/game/game.dart';
+import 'package:puissance4/cubit/activity/activity_cubit.dart';
+import 'package:puissance4/models/activity/activity.dart';
class GameBottomWidget extends StatelessWidget {
const GameBottomWidget({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 Color color = currentGame.currentPlayer == 0
+ final Color color = currentActivity.currentPlayer == 0
? Colors.grey
- : (currentGame.currentPlayer == 1 ? Colors.yellow : Colors.red);
+ : (currentActivity.currentPlayer == 1 ? Colors.yellow : Colors.red);
return StyledButton(
color: color,
diff --git a/lib/ui/widgets/game/game_end.dart b/lib/ui/widgets/game/game_end.dart
index 8a500a66fa61b9ddef1f4ede54cbbb5161a2334c..6808b4659e49d9e6572c4f0b59bc4d426d40bf86 100644
--- a/lib/ui/widgets/game/game_end.dart
+++ b/lib/ui/widgets/game/game_end.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:puissance4/cubit/game_cubit.dart';
-import 'package:puissance4/models/game/game.dart';
+import 'package:puissance4/cubit/activity/activity_cubit.dart';
+import 'package:puissance4/models/activity/activity.dart';
import 'package:puissance4/ui/widgets/actions/button_game_quit.dart';
class GameEndWidget extends StatelessWidget {
@@ -10,20 +10,20 @@ 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 bool connected4 = currentGame.connected4();
+ final bool connected4 = currentActivity.connected4();
- final String player1ImageAsset = (currentGame.currentPlayer == 1 && connected4)
+ final String player1ImageAsset = (currentActivity.currentPlayer == 1 && connected4)
? 'assets/ui/game_win.png'
- : (currentGame.currentPlayer == 2 && connected4)
+ : (currentActivity.currentPlayer == 2 && connected4)
? 'assets/ui/game_fail.png'
: 'assets/ui/game_draw.png';
- final String player2ImageAsset = (currentGame.currentPlayer == 2 && connected4)
+ final String player2ImageAsset = (currentActivity.currentPlayer == 2 && connected4)
? 'assets/ui/game_win.png'
- : (currentGame.currentPlayer == 1 && connected4)
+ : (currentActivity.currentPlayer == 1 && connected4)
? 'assets/ui/game_fail.png'
: 'assets/ui/game_draw.png';
@@ -50,7 +50,7 @@ class GameEndWidget extends StatelessWidget {
Column(children: [player1Image]),
Column(
children: [
- currentGame.animationInProgress
+ currentActivity.animationInProgress
? Image(
image: const AssetImage('assets/ui/placeholder.png'),
fit: BoxFit.fill,
diff --git a/pubspec.lock b/pubspec.lock
index 011ee2e27741f0e29cbc4b4aac803190885ffbae..5f7d30f1d27f049d10d751142b1e10ef2a65d726 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -245,10 +245,10 @@ packages:
dependency: transitive
description:
name: path_provider
- sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+ sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
url: "https://pub.dev"
source: hosted
- version: "2.1.4"
+ version: "2.1.5"
path_provider_android:
dependency: transitive
description:
@@ -442,10 +442,10 @@ packages:
dependency: transitive
description:
name: win32
- sha256: "2735daae5150e8b1dfeb3eb0544b4d3af0061e9e82cef063adcd583bdae4306a"
+ sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454"
url: "https://pub.dev"
source: hosted
- version: "5.7.0"
+ version: "5.7.2"
xdg_directories:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 2760099aabd05840881bd80cf1b47b98ecfd732d..78e0cd6152d6511ca8c309cacd43cc233373101a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: puissance4
publish_to: "none"
-version: 1.3.1+27
+version: 1.4.0+28
environment:
sdk: "^3.0.0"