diff --git a/assets/translations/en.json b/assets/translations/en.json
index 83738f6c34524dd01113e8f896084aeab7f00612..a818cab4559ada273ddc2054234f78dbe4722725 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -1,6 +1,9 @@
{
"app_name": "Tetris dual",
+ "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 94b86c938fe2285a50df060d5869596324da81a9..c190bbb822b712e2f8948ab18ad63ed9870fa3b2 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -1,6 +1,9 @@
{
"app_name": "Tetris duel",
+ "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/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ac2c90e221caf3cf01ebba168fb16a8f31c0253a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/19.txt
@@ -0,0 +1 @@
+Normalize Activity application architecture.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/19.txt b/fastlane/metadata/android/fr-FR/changelogs/19.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1d6843d89ba84ea4147528bc3d62d9ecf1a4a762
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/19.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..cebb52bffec4de56e76632e5203f5ae7558937c3
--- /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:tetrisdual/common/ui/pages/game.dart';
+import 'package:tetrisdual/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..48201d19f40aec451842c619645059c49648d030
--- /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:tetrisdual/common/ui/screens/about.dart';
+import 'package:tetrisdual/common/ui/screens/activity.dart';
+import 'package:tetrisdual/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..7784a60bd699bcf55a5392d2d8d1e3fcca26bfe8
--- /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:tetrisdual/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..676de24449d112387a0332bdc1475ae72737d75e
--- /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:tetrisdual/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..4798977fed2f73362c66db3ffe0a8f10fc309bb2
--- /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:tetrisdual/common/config/activity_page.dart';
+import 'package:tetrisdual/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 d049f559721d55b7592292d27638c0d60bcadf71..52ae5fb3bbd3b05af40b5afb15b4f44cd4f5710f 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:tetrisdual/config/menu.dart';
-import 'package:tetrisdual/cubit/game_cubit.dart';
-import 'package:tetrisdual/cubit/nav_cubit.dart';
-import 'package:tetrisdual/models/game/game.dart';
+import 'package:tetrisdual/common/config/screen.dart';
+import 'package:tetrisdual/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:tetrisdual/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
+import 'package:tetrisdual/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 72%
rename from lib/ui/layouts/game_layout.dart
rename to lib/common/ui/pages/game.dart
index d49b3119d04bd0500e34ad003d100013b83ca2ea..8aa4607a986d63fcdaa7177b6002998e86115f38 100644
--- a/lib/ui/layouts/game_layout.dart
+++ b/lib/common/ui/pages/game.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:tetrisdual/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) {
diff --git a/lib/common/ui/pages/parameters.dart b/lib/common/ui/pages/parameters.dart
new file mode 100644
index 0000000000000000000000000000000000000000..fc79b63a58e20edbd1b0dcf28ea9f225854452fe
--- /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:tetrisdual/common/ui/parameters/parameter_widget.dart';
+
+import 'package:tetrisdual/config/default_activity_settings.dart';
+import 'package:tetrisdual/config/default_global_settings.dart';
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
+import 'package:tetrisdual/cubit/settings/settings_activity_cubit.dart';
+import 'package:tetrisdual/cubit/settings/settings_global_cubit.dart';
+import 'package:tetrisdual/models/activity/activity.dart';
+import 'package:tetrisdual/ui/widgets/actions/button_delete_saved_game.dart';
+import 'package:tetrisdual/ui/widgets/actions/button_game_start_new.dart';
+import 'package:tetrisdual/ui/widgets/actions/button_resume_saved_game.dart';
+
+class PageParameters extends StatelessWidget {
+ const PageParameters({super.key});
+
+ final double separatorHeight = 8.0;
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final Activity currentActivity = activityState.currentActivity;
+
+ final List<Widget> lines = [];
+
+ // Game settings
+ for (String code in DefaultActivitySettings.availableParameters) {
+ lines.add(Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: buildParametersLine(
+ code: code,
+ isGlobal: false,
+ ),
+ ));
+
+ lines.add(SizedBox(height: separatorHeight));
+ }
+
+ lines.add(Expanded(
+ child: SizedBox(height: separatorHeight),
+ ));
+
+ if (currentActivity.canBeResumed == false) {
+ // Start new game
+ lines.add(
+ const AspectRatio(
+ aspectRatio: 3,
+ child: StartNewGameButton(),
+ ),
+ );
+ } else {
+ // Resume game
+ lines.add(const AspectRatio(
+ aspectRatio: 3,
+ child: ResumeSavedGameButton(),
+ ));
+ // Delete saved game
+ lines.add(SizedBox.square(
+ dimension: MediaQuery.of(context).size.width / 5,
+ child: const DeleteSavedGameButton(),
+ ));
+ }
+
+ lines.add(SizedBox(height: separatorHeight));
+
+ // Global settings
+ for (String code in DefaultGlobalSettings.availableParameters) {
+ lines.add(Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: buildParametersLine(
+ code: code,
+ isGlobal: true,
+ ),
+ ));
+
+ lines.add(SizedBox(height: separatorHeight));
+ }
+
+ return Column(
+ children: lines,
+ );
+ },
+ );
+ }
+
+ List<Widget> buildParametersLine({
+ required String code,
+ required bool isGlobal,
+ }) {
+ final List<Widget> parameterButtons = [];
+
+ final List<String> availableValues = isGlobal
+ ? DefaultGlobalSettings.getAvailableValues(code)
+ : DefaultActivitySettings.getAvailableValues(code);
+
+ if (availableValues.length <= 1) {
+ return [];
+ }
+
+ for (String value in availableValues) {
+ final Widget parameterButton = BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
+ builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
+ return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
+ builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
+ final ActivitySettingsCubit activitySettingsCubit =
+ BlocProvider.of<ActivitySettingsCubit>(context);
+ final GlobalSettingsCubit globalSettingsCubit =
+ BlocProvider.of<GlobalSettingsCubit>(context);
+
+ final String currentValue = isGlobal
+ ? globalSettingsCubit.getParameterValue(code)
+ : activitySettingsCubit.getParameterValue(code);
+
+ final bool isSelected = (value == currentValue);
+
+ final double displayWidth = MediaQuery.of(context).size.width;
+ final double itemWidth = displayWidth / availableValues.length - 4;
+
+ return SizedBox.square(
+ dimension: itemWidth,
+ child: ParameterWidget(
+ code: code,
+ value: value,
+ isSelected: isSelected,
+ size: itemWidth,
+ activitySettings: activitySettingsState.settings,
+ globalSettings: globalSettingsState.settings,
+ onPressed: () {
+ isGlobal
+ ? globalSettingsCubit.setParameterValue(code, value)
+ : activitySettingsCubit.setParameterValue(code, value);
+ },
+ ),
+ );
+ },
+ );
+ },
+ );
+
+ parameterButtons.add(parameterButton);
+ }
+
+ return parameterButtons;
+ }
+}
diff --git a/lib/ui/parameters/parameter_painter.dart b/lib/common/ui/parameters/parameter_painter.dart
similarity index 91%
rename from lib/ui/parameters/parameter_painter.dart
rename to lib/common/ui/parameters/parameter_painter.dart
index 68cd4741a7dab203bc0480d36c48627a2f726463..11075487997501d0192195677f915c466424a43e 100644
--- a/lib/ui/parameters/parameter_painter.dart
+++ b/lib/common/ui/parameters/parameter_painter.dart
@@ -3,20 +3,20 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:tetrisdual/models/settings/settings_game.dart';
+import 'package:tetrisdual/models/settings/settings_activity.dart';
import 'package:tetrisdual/models/settings/settings_global.dart';
class ParameterPainter extends CustomPainter {
const ParameterPainter({
required this.code,
required this.value,
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
});
final String code;
final String value;
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
@override
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
similarity index 91%
rename from lib/ui/parameters/parameter_widget.dart
rename to lib/common/ui/parameters/parameter_widget.dart
index f50b0bfd1debe2d25f0e5098fd440c973d0e929f..bd4103b6ceae897b78c43fc874fc3589698b57c0 100644
--- a/lib/ui/parameters/parameter_widget.dart
+++ b/lib/common/ui/parameters/parameter_widget.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:tetrisdual/models/settings/settings_game.dart';
+import 'package:tetrisdual/models/settings/settings_activity.dart';
import 'package:tetrisdual/models/settings/settings_global.dart';
class ParameterWidget extends StatelessWidget {
@@ -11,7 +11,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,
});
@@ -20,7 +20,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;
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..99e0708e3339ea08e6d37af02ab294f1ebdeb420
--- /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:tetrisdual/common/config/activity_page.dart';
+import 'package:tetrisdual/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..1f26b167e9d7440971008ca4bf30216480fe29e2
--- /dev/null
+++ b/lib/config/application_config.dart
@@ -0,0 +1,3 @@
+class ApplicationConfig {
+ static const String appTitle = 'Tetris';
+}
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_activity_settings.dart
similarity index 89%
rename from lib/config/default_game_settings.dart
rename to lib/config/default_activity_settings.dart
index 2d71e572bab45268f8aba5c19deb0ec7a9e795fa..7df1347b54016bb7c81a864d5474f4c437813ce6 100644
--- a/lib/config/default_game_settings.dart
+++ b/lib/config/default_activity_settings.dart
@@ -1,6 +1,6 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-class DefaultGameSettings {
+class DefaultActivitySettings {
// available game parameters codes
static const String parameterCodeGameType = 'gameType';
static const List<String> availableParameters = [
@@ -19,7 +19,7 @@ class DefaultGameSettings {
static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case parameterCodeGameType:
- return DefaultGameSettings.allowedGameTypeValues;
+ return DefaultActivitySettings.allowedGameTypeValues;
}
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 ae7b7331f8dfa6fb601ccff9a391436f4b597c46..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:tetrisdual/ui/screens/page_about.dart';
-import 'package:tetrisdual/ui/screens/page_game.dart';
-import 'package:tetrisdual/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..2ebb6a4036bb7bdde626925210ef151c1688eca5
--- /dev/null
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -0,0 +1,126 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:tetrisdual/models/activity/activity.dart';
+import 'package:tetrisdual/models/activity/player.dart';
+import 'package:tetrisdual/models/settings/settings_activity.dart';
+import 'package:tetrisdual/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
+ players: state.currentActivity.players,
+ // 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);
+ enableRandomPlayer();
+ 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 toggleCurrentPlayer() {
+ state.currentActivity.isStarted = true;
+
+ // brand new game
+ if (state.currentActivity.currentPlayer == 0) {
+ state.currentActivity.currentPlayer = 1;
+ } else {
+ // Reset current player tetrimino
+ getCurrentPlayer().resetTetrimino();
+
+ // toggle: 1 -> 2 ; 2 -> 1
+ state.currentActivity.currentPlayer = 3 - state.currentActivity.currentPlayer;
+ }
+
+ // Pick new tetrimino
+ getCurrentPlayer().pickRandomTetrimino();
+
+ refresh();
+ }
+
+ void enableRandomPlayer() {
+ state.currentActivity.currentPlayer = Random().nextInt(2) + 1;
+ toggleCurrentPlayer();
+ }
+
+ Player getPlayer(int playerId) {
+ return state.currentActivity.players[playerId - 1];
+ }
+
+ Player getCurrentPlayer() {
+ return getPlayer(state.currentActivity.currentPlayer);
+ }
+
+ @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 6c19df9df6f422bdded6790791caa0910810f91c..0000000000000000000000000000000000000000
--- a/lib/cubit/game_cubit.dart
+++ /dev/null
@@ -1,126 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:tetrisdual/models/game/game.dart';
-import 'package:tetrisdual/models/game/player.dart';
-import 'package:tetrisdual/models/settings/settings_game.dart';
-import 'package:tetrisdual/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
- players: state.currentGame.players,
- // 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);
- enableRandomPlayer();
- 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 toggleCurrentPlayer() {
- state.currentGame.isStarted = true;
-
- // brand new game
- if (state.currentGame.currentPlayer == 0) {
- state.currentGame.currentPlayer = 1;
- } else {
- // Reset current player tetrimino
- getCurrentPlayer().resetTetrimino();
-
- // toggle: 1 -> 2 ; 2 -> 1
- state.currentGame.currentPlayer = 3 - state.currentGame.currentPlayer;
- }
-
- // Pick new tetrimino
- getCurrentPlayer().pickRandomTetrimino();
-
- refresh();
- }
-
- void enableRandomPlayer() {
- state.currentGame.currentPlayer = Random().nextInt(2) + 1;
- toggleCurrentPlayer();
- }
-
- Player getPlayer(int playerId) {
- return state.currentGame.players[playerId - 1];
- }
-
- Player getCurrentPlayer() {
- return getPlayer(state.currentGame.currentPlayer);
- }
-
- @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 35e71ab78c9f2189ba6317e7ffc3adafcfa01553..0000000000000000000000000000000000000000
--- a/lib/cubit/nav_cubit.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:tetrisdual/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..900c902330b0e24ced168eb04e56ddd5fbd23c12
--- /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:tetrisdual/config/default_activity_settings.dart';
+import 'package:tetrisdual/models/settings/settings_activity.dart';
+
+part 'settings_activity_state.dart';
+
+class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
+ ActivitySettingsCubit()
+ : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
+
+ void setValues({
+ String? gameType,
+ }) {
+ emit(
+ ActivitySettingsState(
+ settings: ActivitySettings(
+ gameType: gameType ?? state.settings.gameType,
+ ),
+ ),
+ );
+ }
+
+ String getParameterValue(String code) {
+ switch (code) {
+ case DefaultActivitySettings.parameterCodeGameType:
+ return ActivitySettings.getGameTypeValueFromUnsafe(state.settings.gameType);
+ }
+
+ return '';
+ }
+
+ void setParameterValue(String code, String value) {
+ final String gameType = code == DefaultActivitySettings.parameterCodeGameType
+ ? value
+ : getParameterValue(DefaultActivitySettings.parameterCodeGameType);
+
+ setValues(
+ gameType: gameType,
+ );
+ }
+
+ @override
+ ActivitySettingsState? fromJson(Map<String, dynamic> json) {
+ final String gameType = json[DefaultActivitySettings.parameterCodeGameType] as String;
+
+ return ActivitySettingsState(
+ settings: ActivitySettings(
+ gameType: gameType,
+ ),
+ );
+ }
+
+ @override
+ Map<String, dynamic>? toJson(ActivitySettingsState state) {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeGameType: state.settings.gameType,
+ };
+ }
+}
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 ed9188dbefb92c4066a653c5df30987adda979be..0000000000000000000000000000000000000000
--- 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:tetrisdual/config/default_game_settings.dart';
-import 'package:tetrisdual/models/settings/settings_game.dart';
-
-part 'settings_game_state.dart';
-
-class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
- GameSettingsCubit() : super(GameSettingsState(settings: GameSettings.createDefault()));
-
- void setValues({
- String? gameType,
- }) {
- emit(
- GameSettingsState(
- settings: GameSettings(
- gameType: gameType ?? state.settings.gameType,
- ),
- ),
- );
- }
-
- String getParameterValue(String code) {
- switch (code) {
- case DefaultGameSettings.parameterCodeGameType:
- return GameSettings.getGameTypeValueFromUnsafe(state.settings.gameType);
- }
-
- return '';
- }
-
- void setParameterValue(String code, String value) {
- final String gameType = code == DefaultGameSettings.parameterCodeGameType
- ? value
- : getParameterValue(DefaultGameSettings.parameterCodeGameType);
-
- setValues(
- gameType: gameType,
- );
- }
-
- @override
- GameSettingsState? fromJson(Map<String, dynamic> json) {
- final String gameType = json[DefaultGameSettings.parameterCodeGameType] as String;
-
- return GameSettingsState(
- settings: GameSettings(
- gameType: gameType,
- ),
- );
- }
-
- @override
- Map<String, dynamic>? toJson(GameSettingsState state) {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeGameType: state.settings.gameType,
- };
- }
-}
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 dae707309e90b89e80fa8b68013b115fccf07bc8..a7c7a4eee7aeee1ec53be7a8f3a7a8419fb5a174 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:tetrisdual/cubit/game_cubit.dart';
-import 'package:tetrisdual/cubit/nav_cubit.dart';
-import 'package:tetrisdual/cubit/settings_game_cubit.dart';
-import 'package:tetrisdual/cubit/settings_global_cubit.dart';
+import 'package:tetrisdual/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:tetrisdual/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:tetrisdual/config/application_config.dart';
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
+import 'package:tetrisdual/cubit/settings/settings_activity_cubit.dart';
+import 'package:tetrisdual/cubit/settings/settings_global_cubit.dart';
import 'package:tetrisdual/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: 'Tetris',
+ title: ApplicationConfig.appTitle,
home: const SkeletonScreen(),
// Theme stuff
diff --git a/lib/models/game/game.dart b/lib/models/activity/activity.dart
similarity index 74%
rename from lib/models/game/game.dart
rename to lib/models/activity/activity.dart
index f6466a07bb20a2154ca40d030ba31dba39efbb98..7f2dc43d57fd86c9bea0edfc09d4a2177344cf20 100644
--- a/lib/models/game/game.dart
+++ b/lib/models/activity/activity.dart
@@ -1,13 +1,13 @@
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:tetrisdual/models/game/player.dart';
-import 'package:tetrisdual/models/settings/settings_game.dart';
+import 'package:tetrisdual/models/activity/player.dart';
+import 'package:tetrisdual/models/settings/settings_activity.dart';
import 'package:tetrisdual/models/settings/settings_global.dart';
-class Game {
- Game({
+class Activity {
+ Activity({
// Settings
- required this.gameSettings,
+ required this.activitySettings,
required this.globalSettings,
// State
@@ -24,7 +24,7 @@ class Game {
});
// Settings
- final GameSettings gameSettings;
+ final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
// State
@@ -39,24 +39,25 @@ class Game {
// Game data
int currentPlayer;
- factory Game.createEmpty() {
- return Game(
+ factory Activity.createEmpty() {
+ return Activity(
// Settings
- gameSettings: GameSettings.createDefault(),
+ activitySettings: ActivitySettings.createDefault(),
globalSettings: GlobalSettings.createDefault(),
);
}
- 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,
@@ -76,9 +77,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');
@@ -94,13 +95,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/counter.dart b/lib/models/activity/counter.dart
similarity index 100%
rename from lib/models/game/counter.dart
rename to lib/models/activity/counter.dart
diff --git a/lib/models/game/player.dart b/lib/models/activity/player.dart
similarity index 93%
rename from lib/models/game/player.dart
rename to lib/models/activity/player.dart
index 4d5aed113bb74fab5d0b8dbb336082e168754656..458c023de5ea03378172085bc81971ae13c11a0c 100644
--- a/lib/models/game/player.dart
+++ b/lib/models/activity/player.dart
@@ -1,6 +1,6 @@
import 'dart:math';
-import 'package:tetrisdual/models/game/counter.dart';
+import 'package:tetrisdual/models/activity/counter.dart';
class Player {
Player(this.playerId);
diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bec71ea6080fc707005553e2834c0048803d641d
--- /dev/null
+++ b/lib/models/settings/settings_activity.dart
@@ -0,0 +1,42 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:tetrisdual/config/default_activity_settings.dart';
+
+class ActivitySettings {
+ final String gameType;
+
+ ActivitySettings({
+ required this.gameType,
+ });
+
+ static String getGameTypeValueFromUnsafe(String gameType) {
+ if (DefaultActivitySettings.allowedGameTypeValues.contains(gameType)) {
+ return gameType;
+ }
+
+ return DefaultActivitySettings.defaultGameTypeValue;
+ }
+
+ factory ActivitySettings.createDefault() {
+ return ActivitySettings(
+ gameType: DefaultActivitySettings.defaultGameTypeValue,
+ );
+ }
+
+ void dump() {
+ printlog('$ActivitySettings:');
+ printlog(' ${DefaultActivitySettings.parameterCodeGameType}: $gameType');
+ printlog('');
+ }
+
+ @override
+ String toString() {
+ return '$ActivitySettings(${toJson()})';
+ }
+
+ Map<String, dynamic>? toJson() {
+ return <String, dynamic>{
+ DefaultActivitySettings.parameterCodeGameType: gameType,
+ };
+ }
+}
diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart
deleted file mode 100644
index 5763e39c47dfe6ebd762b40a00d759268d6f491b..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_game.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:tetrisdual/config/default_game_settings.dart';
-
-class GameSettings {
- final String gameType;
-
- GameSettings({
- required this.gameType,
- });
-
- static String getGameTypeValueFromUnsafe(String gameType) {
- if (DefaultGameSettings.allowedGameTypeValues.contains(gameType)) {
- return gameType;
- }
-
- return DefaultGameSettings.defaultGameTypeValue;
- }
-
- factory GameSettings.createDefault() {
- return GameSettings(
- gameType: DefaultGameSettings.defaultGameTypeValue,
- );
- }
-
- void dump() {
- printlog('$GameSettings:');
- printlog(' ${DefaultGameSettings.parameterCodeGameType}: $gameType');
- printlog('');
- }
-
- @override
- String toString() {
- return '$GameSettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- DefaultGameSettings.parameterCodeGameType: gameType,
- };
- }
-}
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
deleted file mode 100644
index 961b132a04ad5043483dd46479dd891230cbe347..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:tetrisdual/config/default_game_settings.dart';
-import 'package:tetrisdual/config/default_global_settings.dart';
-import 'package:tetrisdual/cubit/settings_game_cubit.dart';
-import 'package:tetrisdual/cubit/settings_global_cubit.dart';
-import 'package:tetrisdual/ui/parameters/parameter_widget.dart';
-import 'package:tetrisdual/ui/widgets/actions/button_delete_saved_game.dart';
-import 'package:tetrisdual/ui/widgets/actions/button_game_start_new.dart';
-import 'package:tetrisdual/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 30121c15d1d893737d377c01bff6f90a8d0088b4..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:tetrisdual/cubit/game_cubit.dart';
-import 'package:tetrisdual/models/game/game.dart';
-import 'package:tetrisdual/ui/layouts/game_layout.dart';
-import 'package:tetrisdual/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 d9abeb4cf6a093c3b12d604d38ddd0a94ee79cb3..4dff2efcf5aa100c7f08ed51921643d38e736b2f 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:tetrisdual/config/menu.dart';
-import 'package:tetrisdual/cubit/nav_cubit.dart';
-import 'package:tetrisdual/ui/widgets/global_app_bar.dart';
+import 'package:tetrisdual/common/config/activity_page.dart';
+import 'package:tetrisdual/common/config/screen.dart';
+import 'package:tetrisdual/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:tetrisdual/common/ui/nav/global_app_bar.dart';
+import 'package:tetrisdual/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 bf51ea1884143bb8e479e8bbb24eb9c92b24de2c..f33c0e51e53b8256bc558ee07573ba9f980211fd 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:tetrisdual/cubit/game_cubit.dart';
+import 'package:tetrisdual/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 effed8bf578a04bce8f8f46f22c8cfaea51a8a5f..d6bf718805876b872709784f76fcebe09ab5ad09 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:tetrisdual/cubit/game_cubit.dart';
+import 'package:tetrisdual/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:tetrisdual/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 974f426522aca7581c22731d2b709b5e582c488d..176d46061bfcb805768113623f70c5ba74e1dd0f 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:tetrisdual/cubit/game_cubit.dart';
-import 'package:tetrisdual/cubit/settings_game_cubit.dart';
-import 'package:tetrisdual/cubit/settings_global_cubit.dart';
+import 'package:tetrisdual/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
+import 'package:tetrisdual/cubit/settings/settings_activity_cubit.dart';
+import 'package:tetrisdual/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 003d2e8b120d346a4de448412e285b67e8d2c5b1..d0e6d2e3a622c0340361bcd5ccec03f90f15cd0e 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:tetrisdual/cubit/game_cubit.dart';
+import 'package:tetrisdual/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:tetrisdual/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/counter.dart b/lib/ui/widgets/game/counter.dart
index 84d33ead6a90c72c7fbd14d040d7289c6e478e6e..8059d7d5c507e1700432a0b5459f3ec046b273dc 100644
--- a/lib/ui/widgets/game/counter.dart
+++ b/lib/ui/widgets/game/counter.dart
@@ -3,8 +3,8 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:tetrisdual/cubit/game_cubit.dart';
-import 'package:tetrisdual/models/game/counter.dart';
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
+import 'package:tetrisdual/models/activity/counter.dart';
class CounterWidget extends StatelessWidget {
const CounterWidget({super.key, required this.counter});
@@ -48,7 +48,7 @@ class CounterWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
+ final ActivityCubit activityCubit = BlocProvider.of<ActivityCubit>(context);
const spacer = TableRow(children: [
SizedBox(height: spacerHeight),
@@ -59,17 +59,17 @@ class CounterWidget extends StatelessWidget {
return Table(
children: [
- buildTouchWidget(gameCubit),
+ buildTouchWidget(activityCubit),
spacer,
- buildLinesWidget(gameCubit),
+ buildLinesWidget(activityCubit),
spacer,
- buildHolesWidget(gameCubit),
+ buildHolesWidget(activityCubit),
spacer,
],
);
}
- TableRow buildTouchWidget(GameCubit gameCubit) {
+ TableRow buildTouchWidget(ActivityCubit activityCubit) {
return TableRow(
children: [
iconTouchingColor,
@@ -82,7 +82,7 @@ class CounterWidget extends StatelessWidget {
icon: iconRemove,
onPressed: () {
counter.touch = false;
- gameCubit.refresh();
+ activityCubit.refresh();
},
),
Center(
@@ -101,14 +101,14 @@ class CounterWidget extends StatelessWidget {
icon: iconAdd,
onPressed: () {
counter.touch = true;
- gameCubit.refresh();
+ activityCubit.refresh();
},
),
],
);
}
- TableRow buildLinesWidget(GameCubit gameCubit) {
+ TableRow buildLinesWidget(ActivityCubit activityCubit) {
return TableRow(
children: [
iconRowsCount,
@@ -121,7 +121,7 @@ class CounterWidget extends StatelessWidget {
icon: iconRemove,
onPressed: () {
counter.lines = max(counter.lines - 1, 0);
- gameCubit.refresh();
+ activityCubit.refresh();
},
),
Center(
@@ -146,14 +146,14 @@ class CounterWidget extends StatelessWidget {
icon: iconAdd,
onPressed: () {
counter.lines = min(counter.lines + 1, 4);
- gameCubit.refresh();
+ activityCubit.refresh();
},
),
],
);
}
- TableRow buildHolesWidget(GameCubit gameCubit) {
+ TableRow buildHolesWidget(ActivityCubit activityCubit) {
return TableRow(
children: [
iconHolesCount,
@@ -166,7 +166,7 @@ class CounterWidget extends StatelessWidget {
icon: iconRemove,
onPressed: () {
counter.holes = max(counter.holes - 1, 0);
- gameCubit.refresh();
+ activityCubit.refresh();
},
),
Center(
@@ -191,7 +191,7 @@ class CounterWidget extends StatelessWidget {
icon: iconAdd,
onPressed: () {
counter.holes = min(counter.holes + 1, 9);
- gameCubit.refresh();
+ activityCubit.refresh();
},
),
],
diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
index 77491c910117f7875de3720c8348db01f9298426..ea9ad3f4641a99cd34dbdfaa73296c94858bc89b 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:tetrisdual/cubit/game_cubit.dart';
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
import 'package:tetrisdual/ui/widgets/game/player.dart';
import 'package:tetrisdual/ui/widgets/game/toggle_player.dart';
@@ -10,7 +10,7 @@ class GameBoardWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
+ final ActivityCubit activityCubit = BlocProvider.of<ActivityCubit>(context);
return Center(
child: Column(
@@ -20,12 +20,12 @@ class GameBoardWidget extends StatelessWidget {
RotatedBox(
quarterTurns: 2,
child: PlayerWidget(
- player: gameCubit.getPlayer(1),
+ player: activityCubit.getPlayer(1),
),
),
const TogglePlayerWidget(),
PlayerWidget(
- player: gameCubit.getPlayer(2),
+ player: activityCubit.getPlayer(2),
),
],
),
diff --git a/lib/ui/widgets/game/manager.dart b/lib/ui/widgets/game/manager.dart
index b1428d49bd51f67029662298cec2763943952101..1fe6506580581559310d5c21c6b4d91813c02b01 100644
--- a/lib/ui/widgets/game/manager.dart
+++ b/lib/ui/widgets/game/manager.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:tetrisdual/cubit/game_cubit.dart';
-import 'package:tetrisdual/models/game/player.dart';
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
+import 'package:tetrisdual/models/activity/player.dart';
import 'package:tetrisdual/ui/widgets/game/counter.dart';
import 'package:tetrisdual/ui/widgets/game/submit.dart';
@@ -13,15 +13,15 @@ class ManagerWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
return Expanded(
child: Container(
margin: const EdgeInsets.all(5),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
- children: gameState.currentGame.currentPlayer == player.playerId
+ children: activityState.currentActivity.currentPlayer == player.playerId
? [
CounterWidget(counter: player.counter),
SubmitWidget(player: player),
diff --git a/lib/ui/widgets/game/player.dart b/lib/ui/widgets/game/player.dart
index e7521deaa4e06c09e10866e585d5bd58da43ce4a..54400e06c22e2d78d91677eb1f583613035d447d 100644
--- a/lib/ui/widgets/game/player.dart
+++ b/lib/ui/widgets/game/player.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:tetrisdual/cubit/game_cubit.dart';
-import 'package:tetrisdual/models/game/player.dart';
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
+import 'package:tetrisdual/models/activity/player.dart';
import 'package:tetrisdual/ui/widgets/game/manager.dart';
import 'package:tetrisdual/ui/widgets/game/tetrimino.dart';
@@ -13,9 +13,9 @@ class PlayerWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final bool isActive = (gameState.currentGame.currentPlayer == player.playerId);
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ final bool isActive = (activityState.currentActivity.currentPlayer == player.playerId);
final double screenWidth = MediaQuery.of(context).size.width;
final double tetriminoBlockWidth = screenWidth / 2.3;
diff --git a/lib/ui/widgets/game/submit.dart b/lib/ui/widgets/game/submit.dart
index 24d3cba5940843e2a1405e5aa1d2b96c315b65e1..a9c7c2e164040f5a993afc661fc86a0a5eb29bf3 100644
--- a/lib/ui/widgets/game/submit.dart
+++ b/lib/ui/widgets/game/submit.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:tetrisdual/cubit/game_cubit.dart';
-import 'package:tetrisdual/models/game/player.dart';
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
+import 'package:tetrisdual/models/activity/player.dart';
class SubmitWidget extends StatelessWidget {
const SubmitWidget({super.key, required this.player});
@@ -62,7 +62,7 @@ class SubmitWidget extends StatelessWidget {
player.score = player.score + player.counter.computePoints();
player.counter.reset();
- BlocProvider.of<GameCubit>(context).toggleCurrentPlayer();
+ BlocProvider.of<ActivityCubit>(context).toggleCurrentPlayer();
},
),
const SizedBox(width: 10),
diff --git a/lib/ui/widgets/game/tetrimino.dart b/lib/ui/widgets/game/tetrimino.dart
index 169b97d7586a0811bb4bef7e6f14bd84a4851fe7..9a1bcc7ac5502c4d9c58805beef04caef05814cd 100644
--- a/lib/ui/widgets/game/tetrimino.dart
+++ b/lib/ui/widgets/game/tetrimino.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:tetrisdual/cubit/game_cubit.dart';
-import 'package:tetrisdual/models/game/player.dart';
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
+import 'package:tetrisdual/models/activity/player.dart';
import 'package:tetrisdual/ui/widgets/game/board_painter.dart';
class TetriminoWidget extends StatelessWidget {
@@ -12,14 +12,14 @@ class TetriminoWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
+ final ActivityCubit activityCubit = BlocProvider.of<ActivityCubit>(context);
final double width = MediaQuery.of(context).size.width;
return GestureDetector(
onTapUp: (details) {
- if (player.playerId == gameCubit.getCurrentPlayer().playerId) {
+ if (player.playerId == activityCubit.getCurrentPlayer().playerId) {
player.pickRandomTetrimino();
- gameCubit.refresh();
+ activityCubit.refresh();
}
},
child: CustomPaint(
diff --git a/lib/ui/widgets/game/toggle_player.dart b/lib/ui/widgets/game/toggle_player.dart
index 96f6cd627be80bc1b65313a3314d4aab75a128ea..5d7ead5d797535ae00c7822691792e798cc06a71 100644
--- a/lib/ui/widgets/game/toggle_player.dart
+++ b/lib/ui/widgets/game/toggle_player.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:tetrisdual/cubit/game_cubit.dart';
+import 'package:tetrisdual/cubit/activity/activity_cubit.dart';
class TogglePlayerWidget extends StatelessWidget {
const TogglePlayerWidget({super.key});
@@ -10,7 +10,7 @@ class TogglePlayerWidget extends StatelessWidget {
Widget build(BuildContext context) {
return GestureDetector(
onTapUp: (details) {
- BlocProvider.of<GameCubit>(context).toggleCurrentPlayer();
+ BlocProvider.of<ActivityCubit>(context).toggleCurrentPlayer();
},
child: const Text(
'🔄',
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 f1a013265a9536c185bf2129cfde0c3778541197..7cf8470ddf8b5aacd4a13c14edf11be87d32a320 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Tetris Dual Game
publish_to: "none"
-version: 0.3.1+18
+version: 0.4.0+19
environment:
sdk: "^3.0.0"