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

Merge branch '50-use-activityparameters-widgets-from-flutter_custom_toolbox' into 'master'

Resolve "Use ActivityParameters widgets from flutter_custom_toolbox"

Closes #50

See merge request !45
parents 38a5bc82 2d2b7889
No related branches found
No related tags found
1 merge request!45Resolve "Use ActivityParameters widgets from flutter_custom_toolbox"
Pipeline #7117 passed
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:momomotus/config/default_activity_settings.dart';
import 'package:momomotus/config/application_config.dart';
import 'package:momomotus/cubit/activity/activity_cubit.dart';
import 'package:momomotus/models/activity/activity.dart';
import 'package:momomotus/ui/widgets/game/game_cell.dart';
......@@ -16,8 +16,9 @@ class GameBoardWidget extends StatelessWidget {
final Activity currentActivity = activityState.currentActivity;
final ActivityCubit activityCubit = BlocProvider.of<ActivityCubit>(context);
const int maxGuessesCount = DefaultActivitySettings.maxGuessesCount;
final int wordLength = int.parse(currentActivity.activitySettings.length);
const int maxGuessesCount = ApplicationConfig.maxGuessesCount;
final int wordLength = int.parse(
currentActivity.activitySettings.get(ApplicationConfig.parameterCodeWordLength));
final List<String> guesses = currentActivity.guesses;
......
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:momomotus/config/application_config.dart';
import 'package:momomotus/cubit/activity/activity_cubit.dart';
import 'package:momomotus/models/activity/activity.dart';
......@@ -24,7 +25,8 @@ class GameCellWidget extends StatelessWidget {
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
final String skin = currentActivity.globalSettings.skin;
final String skin =
currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin);
const Color textColor = Colors.white;
final Color focusBorderColor = Colors.yellow.shade700;
......
......@@ -122,11 +122,11 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "0.4.0"
resolved-ref: eb9c090bd00d73324eab8737f74b3339cc24c9e8
ref: "0.5.0"
resolved-ref: b8164a50489ba981ea57d9f02e2334f09cb8c6a7
url: "https://git.harrault.fr/android/flutter-toolbox.git"
source: git
version: "0.4.0"
version: "0.5.0"
flutter_lints:
dependency: "direct dev"
description:
......
......@@ -3,7 +3,7 @@ description: A motus-like game application.
publish_to: "none"
version: 0.4.2+39
version: 0.5.0+40
environment:
sdk: "^3.0.0"
......@@ -16,7 +16,7 @@ dependencies:
flutter_custom_toolbox:
git:
url: https://git.harrault.fr/android/flutter-toolbox.git
ref: 0.4.0
ref: 0.5.0
# specific
# (none)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment