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

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

Resolve "Normalize Activity application architecture"

Closes #50

See merge request !47
parents d1356cf0 0469d769
No related branches found
No related tags found
1 merge request!47Resolve "Normalize Activity application architecture"
Pipeline #6791 passed
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:hangman/cubit/game_cubit.dart';
import 'package:hangman/models/game/game.dart';
import 'package:hangman/cubit/activity/activity_cubit.dart';
import 'package:hangman/models/activity/activity.dart';
import 'package:hangman/ui/widgets/game/game_virtual_keyboard_key.dart';
class GameVirtualKeyboardWidget extends StatelessWidget {
......@@ -10,9 +10,9 @@ class GameVirtualKeyboardWidget 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 List<List<String>> keys = [
['A', 'Z', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P'],
......@@ -27,7 +27,7 @@ class GameVirtualKeyboardWidget extends StatelessWidget {
tableCells.add(TableCell(
child: GameVirtualKeyboardKeyWidget(
caption: key,
enabled: !currentGame.usedLetters.contains(key),
enabled: !currentActivity.usedLetters.contains(key),
),
));
}
......
......@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:hangman/config/game_colors.dart';
import 'package:hangman/cubit/game_cubit.dart';
import 'package:hangman/cubit/activity/activity_cubit.dart';
class GameVirtualKeyboardKeyWidget extends StatelessWidget {
const GameVirtualKeyboardKeyWidget({
......@@ -42,7 +42,7 @@ class GameVirtualKeyboardKeyWidget extends StatelessWidget {
),
onPressed: () {
if (caption != ' ') {
BlocProvider.of<GameCubit>(context).submitLetter(caption);
BlocProvider.of<ActivityCubit>(context).submitLetter(caption);
}
},
),
......
......@@ -69,10 +69,10 @@ packages:
dependency: transitive
description:
name: csslib
sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
version: "1.0.2"
diacritic:
dependency: "direct main"
description:
......@@ -173,10 +173,10 @@ packages:
dependency: "direct main"
description:
name: html
sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
url: "https://pub.dev"
source: hosted
version: "0.15.4"
version: "0.15.5"
http:
dependency: "direct main"
description:
......@@ -269,10 +269,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:
......@@ -466,10 +466,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:
......
......@@ -3,7 +3,7 @@ description: Hangman game, have fun with words and letters!
publish_to: "none"
version: 1.4.1+34
version: 1.5.0+35
environment:
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