Normalize Activity application architecture

lib/cubit/game_state.dart → lib/cubit/activity/activity_state.dart

-part of 'game_cubit.dart';
+part of 'activity_cubit.dart';
 
 @immutable
-class GameState extends Equatable {
-  const GameState({
-    required this.currentGame,
+class ActivityState extends Equatable {
+  const ActivityState({
+    required this.currentActivity,
   });
 
-  final Game currentGame;
+  final Activity currentActivity;
 
   @override
   List<dynamic> get props => <dynamic>[
-        currentGame,
+        currentActivity,
       ];
 }

lib/cubit/settings_game_cubit.dart → lib/cubit/settings/settings_activity_cubit.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/config/default_game_settings.dart';
-import 'package:minehunter/models/settings/settings_game.dart';
+import 'package:minehunter/config/default_activity_settings.dart';
+import 'package:minehunter/models/settings/settings_activity.dart';
 
-part 'settings_game_state.dart';
+part 'settings_activity_state.dart';
 
-class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
-  GameSettingsCubit() : super(GameSettingsState(settings: GameSettings.createDefault()));
+class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
+  ActivitySettingsCubit()
+      : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
 
   void setValues({
     String? itemsCount,
     String? timerValue,
   }) {
     emit(
-      GameSettingsState(
-        settings: GameSettings(
+      ActivitySettingsState(
+        settings: ActivitySettings(
           level: itemsCount ?? state.settings.level,
           size: timerValue ?? state.settings.size,
         ),
@@ -25,22 +26,22 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
 
   String getParameterValue(String code) {
     switch (code) {
-      case DefaultGameSettings.parameterCodeLevel:
-        return GameSettings.getLevelValueFromUnsafe(state.settings.level);
-      case DefaultGameSettings.parameterCodeSize:
-        return GameSettings.getSizeValueFromUnsafe(state.settings.size);
+      case DefaultActivitySettings.parameterCodeLevel:
+        return ActivitySettings.getLevelValueFromUnsafe(state.settings.level);
+      case DefaultActivitySettings.parameterCodeSize:
+        return ActivitySettings.getSizeValueFromUnsafe(state.settings.size);
     }
 
     return '';
   }
 
   void setParameterValue(String code, String value) {
-    final String itemsCount = code == DefaultGameSettings.parameterCodeLevel
+    final String itemsCount = code == DefaultActivitySettings.parameterCodeLevel
         ? value
-        : getParameterValue(DefaultGameSettings.parameterCodeLevel);
-    final String timerValue = code == DefaultGameSettings.parameterCodeSize
+        : getParameterValue(DefaultActivitySettings.parameterCodeLevel);
+    final String timerValue = code == DefaultActivitySettings.parameterCodeSize
         ? value
-        : getParameterValue(DefaultGameSettings.parameterCodeSize);
+        : getParameterValue(DefaultActivitySettings.parameterCodeSize);
 
     setValues(
       itemsCount: itemsCount,
@@ -49,12 +50,12 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
   }
 
   @override
-  GameSettingsState? fromJson(Map<String, dynamic> json) {
-    final String itemsCount = json[DefaultGameSettings.parameterCodeLevel] as String;
-    final String timerValue = json[DefaultGameSettings.parameterCodeSize] as String;
+  ActivitySettingsState? fromJson(Map<String, dynamic> json) {
+    final String itemsCount = json[DefaultActivitySettings.parameterCodeLevel] as String;
+    final String timerValue = json[DefaultActivitySettings.parameterCodeSize] as String;
 
-    return GameSettingsState(
-      settings: GameSettings(
+    return ActivitySettingsState(
+      settings: ActivitySettings(
         level: itemsCount,
         size: timerValue,
       ),
@@ -62,10 +63,10 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
   }
 
   @override
-  Map<String, dynamic>? toJson(GameSettingsState state) {
+  Map<String, dynamic>? toJson(ActivitySettingsState state) {
     return <String, dynamic>{
-      DefaultGameSettings.parameterCodeLevel: state.settings.level,
-      DefaultGameSettings.parameterCodeSize: state.settings.size,
+      DefaultActivitySettings.parameterCodeLevel: state.settings.level,
+      DefaultActivitySettings.parameterCodeSize: state.settings.size,
     };
   }
 }

lib/cubit/settings_game_state.dart → lib/cubit/settings/settings_activity_state.dart

-part of 'settings_game_cubit.dart';
+part of 'settings_activity_cubit.dart';
 
 @immutable
-class GameSettingsState extends Equatable {
-  const GameSettingsState({
+class ActivitySettingsState extends Equatable {
+  const ActivitySettingsState({
     required this.settings,
   });
 
-  final GameSettings settings;
+  final ActivitySettings settings;
 
   @override
   List<dynamic> get props => <dynamic>[

lib/main.dart

@@ -4,11 +4,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
+import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:minehunter/config/application_config.dart';
 import 'package:minehunter/config/default_global_settings.dart';
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/cubit/nav_cubit.dart';
-import 'package:minehunter/cubit/settings_game_cubit.dart';
-import 'package:minehunter/cubit/settings_global_cubit.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/cubit/settings/settings_activity_cubit.dart';
+import 'package:minehunter/cubit/settings/settings_global_cubit.dart';
 import 'package:minehunter/ui/skeleton.dart';
 
 void main() async {
@@ -46,17 +49,30 @@ class MyApp extends StatelessWidget {
 
     return MultiBlocProvider(
       providers: [
-        BlocProvider<NavCubit>(create: (context) => NavCubit()),
+        // default providers
+        BlocProvider<NavCubitPage>(
+          create: (context) => NavCubitPage(),
+        ),
+        BlocProvider<NavCubitScreen>(
+          create: (context) => NavCubitScreen(),
+        ),
         BlocProvider<ApplicationThemeModeCubit>(
-            create: (context) => ApplicationThemeModeCubit()),
-        BlocProvider<GameCubit>(create: (context) => GameCubit()),
-        BlocProvider<GlobalSettingsCubit>(create: (context) => GlobalSettingsCubit()),
-        BlocProvider<GameSettingsCubit>(create: (context) => GameSettingsCubit()),
+          create: (context) => ApplicationThemeModeCubit(),
+        ),
+        BlocProvider<ActivityCubit>(
+          create: (context) => ActivityCubit(),
+        ),
+        BlocProvider<GlobalSettingsCubit>(
+          create: (context) => GlobalSettingsCubit(),
+        ),
+        BlocProvider<ActivitySettingsCubit>(
+          create: (context) => ActivitySettingsCubit(),
+        ),
       ],
       child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>(
         builder: (BuildContext context, ApplicationThemeModeState state) {
           return MaterialApp(
-            title: 'Minehunter',
+            title: ApplicationConfig.appTitle,
             home: const SkeletonScreen(),
 
             // Theme stuff

lib/models/game/game.dart → lib/models/activity/activity.dart

 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/config/default_game_settings.dart';
-import 'package:minehunter/models/game/cell.dart';
-import 'package:minehunter/models/settings/settings_game.dart';
+import 'package:minehunter/config/default_activity_settings.dart';
+import 'package:minehunter/models/activity/cell.dart';
+import 'package:minehunter/models/settings/settings_activity.dart';
 import 'package:minehunter/models/settings/settings_global.dart';
 import 'package:minehunter/models/types.dart';
 
-class Game {
-  Game({
+class Activity {
+  Activity({
     // Settings
-    required this.gameSettings,
+    required this.activitySettings,
     required this.globalSettings,
 
     // State
@@ -32,7 +32,7 @@ class Game {
   });
 
   // Settings
-  final GameSettings gameSettings;
+  final ActivitySettings activitySettings;
   final GlobalSettings globalSettings;
 
   // State
@@ -53,10 +53,10 @@ class Game {
   bool gameWin;
   bool gameFail;
 
-  factory Game.createEmpty() {
-    return Game(
+  factory Activity.createEmpty() {
+    return Activity(
       // Settings
-      gameSettings: GameSettings.createDefault(),
+      activitySettings: ActivitySettings.createDefault(),
       globalSettings: GlobalSettings.createDefault(),
       // Base data
       board: [],
@@ -65,15 +65,16 @@ class Game {
     );
   }
 
-  factory Game.createNew({
-    GameSettings? gameSettings,
+  factory Activity.createNew({
+    ActivitySettings? activitySettings,
     GlobalSettings? globalSettings,
   }) {
-    final GameSettings newGameSettings = gameSettings ?? GameSettings.createDefault();
+    final ActivitySettings newActivitySettings =
+        activitySettings ?? ActivitySettings.createDefault();
     final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
 
-    final int sizeHorizontal = int.parse(newGameSettings.size.split('x')[0]);
-    final int sizeVertical = int.parse(newGameSettings.size.split('x')[1]);
+    final int sizeHorizontal = int.parse(newActivitySettings.size.split('x')[0]);
+    final int sizeVertical = int.parse(newActivitySettings.size.split('x')[1]);
 
     // Create empty board (it will be mined after first hit)
     final Board board = [];
@@ -86,13 +87,13 @@ class Game {
     }
 
     final int minesCountRatio =
-        DefaultGameSettings.minesCountRatios[newGameSettings.level] ?? 1;
+        DefaultActivitySettings.minesCountRatios[newActivitySettings.level] ?? 1;
     final int minesCount = ((sizeHorizontal * sizeVertical) * minesCountRatio / 100).round();
     printlog('Mines count: $minesCount');
 
-    return Game(
+    return Activity(
       // Settings
-      gameSettings: newGameSettings,
+      activitySettings: newActivitySettings,
       globalSettings: newGlobalSettings,
       // State
       isRunning: true,
@@ -176,9 +177,9 @@ class Game {
     printlog('');
     printlog('## Current game dump:');
     printlog('');
-    printlog('$Game:');
+    printlog('$Activity:');
     printlog('  Settings');
-    gameSettings.dump();
+    activitySettings.dump();
     globalSettings.dump();
     printlog('  State');
     printlog('    isRunning: $isRunning');
@@ -240,13 +241,13 @@ class Game {
 
   @override
   String toString() {
-    return '$Game(${toJson()})';
+    return '$Activity(${toJson()})';
   }
 
   Map<String, dynamic>? toJson() {
     return <String, dynamic>{
       // Settings
-      'gameSettings': gameSettings.toJson(),
+      'activitySettings': activitySettings.toJson(),
       'globalSettings': globalSettings.toJson(),
       // State
       'isRunning': isRunning,

lib/models/settings/settings_game.dart → lib/models/settings/settings_activity.dart

 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/config/default_game_settings.dart';
+import 'package:minehunter/config/default_activity_settings.dart';
 
-class GameSettings {
+class ActivitySettings {
   final String level;
   final String size;
 
-  GameSettings({
+  ActivitySettings({
     required this.level,
     required this.size,
   });
 
   static String getLevelValueFromUnsafe(String level) {
-    if (DefaultGameSettings.allowedLevelValues.contains(level)) {
+    if (DefaultActivitySettings.allowedLevelValues.contains(level)) {
       return level;
     }
 
-    return DefaultGameSettings.defaultLevelValue;
+    return DefaultActivitySettings.defaultLevelValue;
   }
 
   static String getSizeValueFromUnsafe(String size) {
-    if (DefaultGameSettings.allowedSizeValues.contains(size)) {
+    if (DefaultActivitySettings.allowedSizeValues.contains(size)) {
       return size;
     }
 
-    return DefaultGameSettings.defaultSizeValue;
+    return DefaultActivitySettings.defaultSizeValue;
   }
 
-  factory GameSettings.createDefault() {
-    return GameSettings(
-      level: DefaultGameSettings.defaultLevelValue,
-      size: DefaultGameSettings.defaultSizeValue,
+  factory ActivitySettings.createDefault() {
+    return ActivitySettings(
+      level: DefaultActivitySettings.defaultLevelValue,
+      size: DefaultActivitySettings.defaultSizeValue,
     );
   }
 
   void dump() {
-    printlog('$GameSettings:');
-    printlog('  ${DefaultGameSettings.parameterCodeLevel}: $level');
-    printlog('  ${DefaultGameSettings.parameterCodeSize}: $size');
+    printlog('$ActivitySettings:');
+    printlog('  ${DefaultActivitySettings.parameterCodeLevel}: $level');
+    printlog('  ${DefaultActivitySettings.parameterCodeSize}: $size');
     printlog('');
   }
 
   @override
   String toString() {
-    return '$GameSettings(${toJson()})';
+    return '$ActivitySettings(${toJson()})';
   }
 
   Map<String, dynamic>? toJson() {
     return <String, dynamic>{
-      DefaultGameSettings.parameterCodeLevel: level,
-      DefaultGameSettings.parameterCodeSize: size,
+      DefaultActivitySettings.parameterCodeLevel: level,
+      DefaultActivitySettings.parameterCodeSize: size,
     };
   }
 }

lib/models/types.dart

-import 'package:minehunter/models/game/cell.dart';
+import 'package:minehunter/models/activity/cell.dart';
 
 typedef Board = List<List<Cell>>;
 typedef AnimatedBoard = List<List<bool>>;

lib/ui/game/game_bottom.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
 import 'package:minehunter/ui/widgets/game/mode_toggle.dart';
 
 class GameBottomWidget extends StatelessWidget {
@@ -10,11 +10,11 @@ class GameBottomWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
 
-        return !currentGame.isFinished ? const ToggleGameMode() : const SizedBox.shrink();
+        return !currentActivity.isFinished ? const ToggleGameMode() : const SizedBox.shrink();
       },
     );
   }

lib/ui/game/game_end.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
 import 'package:minehunter/ui/widgets/actions/button_game_quit.dart';
 
 class GameEndWidget extends StatelessWidget {
@@ -10,14 +10,14 @@ class GameEndWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
 
         final Image decorationImage = Image(
-          image: AssetImage(currentGame.gameWin
+          image: AssetImage(currentActivity.gameWin
               ? 'assets/ui/game_win.png'
-              : currentGame.gameFail
+              : currentActivity.gameFail
                   ? 'assets/ui/game_fail.png'
                   : ''),
           fit: BoxFit.fill,
@@ -37,7 +37,7 @@ class GameEndWidget extends StatelessWidget {
                   ),
                   Column(
                     children: [
-                      currentGame.animationInProgress
+                      currentActivity.animationInProgress
                           ? decorationImage
                           : const QuitGameButton()
                     ],

lib/ui/screens/page_game.dart

-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
-import 'package:minehunter/ui/layouts/game_layout.dart';
-import 'package:minehunter/ui/layouts/parameters_layout.dart';
-
-class PageGame extends StatelessWidget {
-  const PageGame({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
-
-        return currentGame.isRunning
-            ? const GameLayout()
-            : ParametersLayout(canResume: currentGame.canBeResumed);
-      },
-    );
-  }
-}

lib/ui/skeleton.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/config/menu.dart';
-import 'package:minehunter/cubit/nav_cubit.dart';
-import 'package:minehunter/ui/widgets/global_app_bar.dart';
+import 'package:minehunter/common/config/activity_page.dart';
+import 'package:minehunter/common/config/screen.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:minehunter/common/ui/nav/global_app_bar.dart';
+import 'package:minehunter/common/ui/nav/bottom_nav_bar.dart';
 
 class SkeletonScreen extends StatelessWidget {
   const SkeletonScreen({super.key});
 
   @override
   Widget build(BuildContext context) {
+    return BlocBuilder<NavCubitScreen, int>(
+      builder: (BuildContext context, int screenIndex) {
         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(
+            child: Padding(
               padding: const EdgeInsets.only(
                 top: 8,
                 left: 2,
                 right: 2,
               ),
-              child: Menu.getPageWidget(pageIndex),
-            );
-          },
+              child: Screen.getWidget(screenIndex),
             ),
           ),
           backgroundColor: Theme.of(context).colorScheme.surface,
+          bottomNavigationBar: ActivityPage.displayBottomNavBar ? const BottomNavBar() : null,
+        );
+      },
     );
   }
 }

lib/ui/widgets/actions/button_delete_saved_game.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/cubit/game_cubit.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
 
 class DeleteSavedGameButton extends StatelessWidget {
   const DeleteSavedGameButton({super.key});
@@ -11,7 +11,7 @@ class DeleteSavedGameButton extends StatelessWidget {
     return StyledButton(
       color: Colors.grey,
       onPressed: () {
-        BlocProvider.of<GameCubit>(context).deleteSavedGame();
+        BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
       },
       child: const Image(
         image: AssetImage('assets/ui/button_delete_saved_game.png'),

lib/ui/widgets/actions/button_game_quit.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/cubit/game_cubit.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
 
 class QuitGameButton extends StatelessWidget {
   const QuitGameButton({super.key});
@@ -11,7 +13,8 @@ class QuitGameButton extends StatelessWidget {
     return StyledButton(
       color: Colors.red,
       onPressed: () {
-        BlocProvider.of<GameCubit>(context).quitGame();
+        BlocProvider.of<ActivityCubit>(context).quitActivity();
+        BlocProvider.of<NavCubitPage>(context).goToPageHome();
       },
       child: const Image(
         image: AssetImage('assets/ui/button_back.png'),

lib/ui/widgets/actions/button_game_start_new.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/cubit/settings_game_cubit.dart';
-import 'package:minehunter/cubit/settings_global_cubit.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/cubit/settings/settings_activity_cubit.dart';
+import 'package:minehunter/cubit/settings/settings_global_cubit.dart';
 
 class StartNewGameButton extends StatelessWidget {
   const StartNewGameButton({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameSettingsCubit, GameSettingsState>(
-      builder: (BuildContext context, GameSettingsState gameSettingsState) {
+    return BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
+      builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
         return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
           builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
             return StyledButton(
               color: Colors.blue,
               onPressed: () {
-                BlocProvider.of<GameCubit>(context).startNewGame(
-                  gameSettings: gameSettingsState.settings,
+                BlocProvider.of<ActivityCubit>(context).startNewActivity(
+                  activitySettings: activitySettingsState.settings,
                   globalSettings: globalSettingsState.settings,
                 );
+                BlocProvider.of<NavCubitPage>(context).goToPageGame();
               },
               child: const Image(
                 image: AssetImage('assets/ui/button_start.png'),

lib/ui/widgets/actions/button_resume_saved_game.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/cubit/game_cubit.dart';
+import 'package:minehunter/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
 
 class ResumeSavedGameButton extends StatelessWidget {
   const ResumeSavedGameButton({super.key});
@@ -11,7 +13,8 @@ class ResumeSavedGameButton extends StatelessWidget {
     return StyledButton(
       color: Colors.blue,
       onPressed: () {
-        BlocProvider.of<GameCubit>(context).resumeSavedGame();
+        BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
+        BlocProvider.of<NavCubitPage>(context).goToPageGame();
       },
       child: const Image(
         image: AssetImage('assets/ui/button_resume_game.png'),

lib/ui/widgets/game/cell.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/cell.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/cell.dart';
+import 'package:minehunter/models/activity/activity.dart';
 import 'package:minehunter/utils/board_animate.dart';
 
 class CellWidget extends StatelessWidget {
@@ -20,20 +20,20 @@ class CellWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
-        final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
+        final ActivityCubit activityCubit = BlocProvider.of<ActivityCubit>(context);
 
         String imageAsset = getImageAssetName(
-          currentGame: currentGame,
+          currentActivity: currentActivity,
         );
 
         return Container(
           decoration: BoxDecoration(
-            color: getBackgroundColor(currentGame),
+            color: getBackgroundColor(currentActivity),
             border: getCellBorders(
-              currentGame: currentGame,
+              currentActivity: currentActivity,
               row: row,
               col: col,
             ),
@@ -52,28 +52,28 @@ class CellWidget extends StatelessWidget {
             ),
             onTap: () {
               // Set mines on board after first player try
-              if (!currentGame.isBoardMined) {
-                gameCubit.addMines(forbiddenRow: row, forbiddenCol: col);
+              if (!currentActivity.isBoardMined) {
+                activityCubit.addMines(forbiddenRow: row, forbiddenCol: col);
               }
 
-              if (!(currentGame.gameWin || currentGame.gameFail)) {
-                if (currentGame.reportMode) {
-                  gameCubit.reportCell(
+              if (!(currentActivity.gameWin || currentActivity.gameFail)) {
+                if (currentActivity.reportMode) {
+                  activityCubit.reportCell(
                     row: row,
                     col: col,
                   );
                 } else {
-                  gameCubit.walkOnCell(
+                  activityCubit.walkOnCell(
                     row: row,
                     col: col,
                   );
                 }
-                if (gameCubit.checkGameIsFinished()) {
-                  gameCubit.updateReportMode(false);
+                if (activityCubit.checkGameIsFinished()) {
+                  activityCubit.updateReportMode(false);
                   BoardAnimate.startAnimation(
-                    gameCubit: gameCubit,
-                    currentGame: currentGame,
-                    animationType: currentGame.gameWin ? 'win' : 'fail',
+                    activityCubit: activityCubit,
+                    currentActivity: currentActivity,
+                    animationType: currentActivity.gameWin ? 'win' : 'fail',
                   );
                 }
               }
@@ -88,13 +88,13 @@ class CellWidget extends StatelessWidget {
   * Compute image asset name, from skin and cell value/state
   */
   String getImageAssetName({
-    required Game currentGame,
+    required Activity currentActivity,
   }) {
-    final String skin = currentGame.globalSettings.skin;
+    final String skin = currentActivity.globalSettings.skin;
 
     String imageAsset = 'assets/skins/${skin}_tile_unknown.png';
 
-    bool showSolution = currentGame.gameWin || currentGame.gameFail;
+    bool showSolution = currentActivity.gameWin || currentActivity.gameFail;
     if (!showSolution) {
       // Running game
       if (cell.isExplored) {
@@ -131,11 +131,11 @@ class CellWidget extends StatelessWidget {
   }
 
   // Compute cell background color, from cell state
-  Color getBackgroundColor(currentGame) {
-    if (currentGame.gameWin) {
+  Color getBackgroundColor(Activity currentActivity) {
+    if (currentActivity.gameWin) {
       return cell.isAnimated ? Colors.green.shade400 : Colors.green.shade500;
     }
-    if (currentGame.gameFail) {
+    if (currentActivity.gameFail) {
       return cell.isAnimated ? Colors.pink.shade200 : Colors.pink.shade400;
     }
 
@@ -144,7 +144,7 @@ class CellWidget extends StatelessWidget {
 
   // Compute cell borders, from board size and cell state
   Border getCellBorders({
-    required Game currentGame,
+    required Activity currentActivity,
     required int row,
     required int col,
   }) {
@@ -152,7 +152,7 @@ class CellWidget extends StatelessWidget {
     double cellBorderWidth = 4;
 
     // Reduce cell border width on big boards
-    int boardSize = currentGame.sizeHorizontal;
+    int boardSize = currentActivity.sizeHorizontal;
     if (boardSize > 8) {
       cellBorderWidth = 2;
       if (boardSize > 10) {
@@ -160,9 +160,9 @@ class CellWidget extends StatelessWidget {
       }
     }
 
-    if (currentGame.gameWin) {
+    if (currentActivity.gameWin) {
       cellBorderColor = Colors.green.shade700;
-    } else if (currentGame.gameFail) {
+    } else if (currentActivity.gameFail) {
       cellBorderColor = Colors.pink.shade300;
     }
 

lib/ui/widgets/game/game_board.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:minehunter/cubit/game_cubit.dart';
-import 'package:minehunter/models/game/game.dart';
+import 'package:minehunter/cubit/activity/activity_cubit.dart';
+import 'package:minehunter/models/activity/activity.dart';
 import 'package:minehunter/models/types.dart';
 import 'package:minehunter/ui/widgets/game/cell.dart';
 
@@ -11,12 +11,12 @@ class GameBoardWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
 
-        final Board board = currentGame.board;
-        final Color borderColor = currentGame.reportMode ? Colors.blue : Colors.black;
+        final Board board = currentActivity.board;
+        final Color borderColor = currentActivity.reportMode ? Colors.blue : Colors.black;
 
         return Container(
           margin: const EdgeInsets.all(2),
@@ -35,10 +35,10 @@ class GameBoardWidget extends StatelessWidget {
                 child: Table(
                   defaultColumnWidth: const IntrinsicColumnWidth(),
                   children: [
-                    for (int row = 0; row < currentGame.sizeVertical; row++)
+                    for (int row = 0; row < currentActivity.sizeVertical; row++)
                       TableRow(
                         children: [
-                          for (int col = 0; col < currentGame.sizeHorizontal; col++)
+                          for (int col = 0; col < currentActivity.sizeHorizontal; col++)
                             Column(
                               children: [
                                 CellWidget(cell: board[row][col], row: row, col: col)