Skip to content
Snippets Groups Projects
Commit 442250fb authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '23-normalize-activity-application-architecture' into 'master'

Resolve "Normalize Activity application architecture"

Closes #23

See merge request !20
parents 982507c3 ecf1b256
No related branches found
No related tags found
1 merge request!20Resolve "Normalize Activity application architecture"
Pipeline #6777 passed
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.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/models/game/player.dart'; import 'package:tetrisdual/models/activity/player.dart';
class SubmitWidget extends StatelessWidget { class SubmitWidget extends StatelessWidget {
const SubmitWidget({super.key, required this.player}); const SubmitWidget({super.key, required this.player});
...@@ -62,7 +62,7 @@ class SubmitWidget extends StatelessWidget { ...@@ -62,7 +62,7 @@ class SubmitWidget extends StatelessWidget {
player.score = player.score + player.counter.computePoints(); player.score = player.score + player.counter.computePoints();
player.counter.reset(); player.counter.reset();
BlocProvider.of<GameCubit>(context).toggleCurrentPlayer(); BlocProvider.of<ActivityCubit>(context).toggleCurrentPlayer();
}, },
), ),
const SizedBox(width: 10), const SizedBox(width: 10),
......
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.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/models/game/player.dart'; import 'package:tetrisdual/models/activity/player.dart';
import 'package:tetrisdual/ui/widgets/game/board_painter.dart'; import 'package:tetrisdual/ui/widgets/game/board_painter.dart';
class TetriminoWidget extends StatelessWidget { class TetriminoWidget extends StatelessWidget {
...@@ -12,14 +12,14 @@ class TetriminoWidget extends StatelessWidget { ...@@ -12,14 +12,14 @@ class TetriminoWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { 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; final double width = MediaQuery.of(context).size.width;
return GestureDetector( return GestureDetector(
onTapUp: (details) { onTapUp: (details) {
if (player.playerId == gameCubit.getCurrentPlayer().playerId) { if (player.playerId == activityCubit.getCurrentPlayer().playerId) {
player.pickRandomTetrimino(); player.pickRandomTetrimino();
gameCubit.refresh(); activityCubit.refresh();
} }
}, },
child: CustomPaint( child: CustomPaint(
......
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.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 { class TogglePlayerWidget extends StatelessWidget {
const TogglePlayerWidget({super.key}); const TogglePlayerWidget({super.key});
...@@ -10,7 +10,7 @@ class TogglePlayerWidget extends StatelessWidget { ...@@ -10,7 +10,7 @@ class TogglePlayerWidget extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
onTapUp: (details) { onTapUp: (details) {
BlocProvider.of<GameCubit>(context).toggleCurrentPlayer(); BlocProvider.of<ActivityCubit>(context).toggleCurrentPlayer();
}, },
child: const Text( child: const Text(
'🔄', '🔄',
......
...@@ -245,10 +245,10 @@ packages: ...@@ -245,10 +245,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path_provider name: path_provider
sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.4" version: "2.1.5"
path_provider_android: path_provider_android:
dependency: transitive dependency: transitive
description: description:
...@@ -442,10 +442,10 @@ packages: ...@@ -442,10 +442,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: win32 name: win32
sha256: "2735daae5150e8b1dfeb3eb0544b4d3af0061e9e82cef063adcd583bdae4306a" sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.7.0" version: "5.7.2"
xdg_directories: xdg_directories:
dependency: transitive dependency: transitive
description: description:
......
...@@ -3,7 +3,7 @@ description: Tetris Dual Game ...@@ -3,7 +3,7 @@ description: Tetris Dual Game
publish_to: "none" publish_to: "none"
version: 0.3.1+18 version: 0.4.0+19
environment: environment:
sdk: "^3.0.0" sdk: "^3.0.0"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment