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

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

Resolve "Use ActivityParameters widgets from flutter_custom_toolbox"

Closes #53

See merge request android/petitbac!54
parents baee2d13 6fac224e
No related branches found
No related tags found
1 merge request!54Resolve "Use ActivityParameters widgets from flutter_custom_toolbox"
Pipeline #7126 passed
Stage: build-debug
Show whitespace changes
Inline Side-by-side
Showing
with 178 additions and 926 deletions
fastlane/metadata/android/en-US/changelogs/49.txt 0 → 100644
+ 1
− 0
View file @ 5ab88b02
Use ActivityParameters widgets from flutter_custom_toolbox.
fastlane/metadata/android/fr-FR/changelogs/49.txt 0 → 100644
+ 1
− 0
View file @ 5ab88b02
Utilisation des widgets ActivityParameters de flutter_custom_toolbox.
lib/common/config/activity_page.dart
+ 32
− 11
View file @ 5ab88b02
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/common/ui/pages/game.dart';
import 'package:petitbac/common/ui/pages/parameters.dart';
import 'package:petitbac/config/application_config.dart';
import 'package:petitbac/cubit/activity/activity_cubit.dart';
import 'package:petitbac/models/activity/activity.dart';
import 'package:petitbac/ui/pages/game.dart';
class ActivityPageItem {
final String code;
final Icon icon;
final Widget page;
final Widget Function({required Activity currentActivity})? builder;
const ActivityPageItem({
required this.code,
required this.icon,
required this.page,
required this.builder,
});
}
......@@ -20,20 +22,27 @@ class ActivityPage {
static const bool displayBottomNavBar = false;
static const indexHome = 0;
static const pageHome = ActivityPageItem(
static final ActivityPageItem pageHome = ActivityPageItem(
code: 'page_home',
icon: Icon(UniconsLine.home),
page: PageParameters(),
builder: ({required Activity currentActivity}) {
return PageParameters(
config: ApplicationConfig.config,
canBeResumed: currentActivity.canBeResumed,
);
},
);
static const indexGame = 1;
static const pageGame = ActivityPageItem(
static final pageGame = ActivityPageItem(
code: 'page_game',
icon: Icon(UniconsLine.star),
page: PageGame(),
builder: ({required Activity currentActivity}) {
return PageGame();
},
);
static const Map<int, ActivityPageItem> items = {
static final Map<int, ActivityPageItem> items = {
indexHome: pageHome,
indexGame: pageGame,
};
......@@ -44,7 +53,19 @@ class ActivityPage {
return items.keys.contains(pageIndex);
}
static Widget getWidget(int pageIndex) {
return items[pageIndex]?.page ?? pageHome.page;
static Widget getWidget(
int pageIndex,
) {
return BlocBuilder<ActivityCubit, ActivityState>(
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
if (items.keys.contains(pageIndex)) {
return items[pageIndex]?.builder!(currentActivity: currentActivity) ?? Text('oups');
} else {
return getWidget(defaultPageIndex);
}
},
);
}
}
lib/common/ui/pages/parameters.dart deleted 100644 → 0
+ 0
− 171
View file @ baee2d13
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/common/cubit/nav/nav_cubit_pages.dart';
import 'package:petitbac/common/ui/parameters/parameter_widget.dart';
import 'package:petitbac/config/default_activity_settings.dart';
import 'package:petitbac/config/default_global_settings.dart';
import 'package:petitbac/cubit/activity/activity_cubit.dart';
import 'package:petitbac/cubit/settings/settings_activity_cubit.dart';
import 'package:petitbac/cubit/settings/settings_global_cubit.dart';
import 'package:petitbac/models/activity/activity.dart';
class PageParameters extends StatelessWidget {
const PageParameters({super.key});
final double separatorHeight = 8.0;
@override
Widget build(BuildContext context) {
return BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
return BlocBuilder<ActivityCubit, ActivityState>(
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
final List<Widget> lines = [];
// Activity 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 activity
lines.add(
AspectRatio(
aspectRatio: 3,
child: ActivityButtonStartNew(
onPressed: () {
BlocProvider.of<ActivityCubit>(context).startNewActivity(
activitySettings: activitySettingsState.settings,
globalSettings: globalSettingsState.settings,
);
BlocProvider.of<NavCubitPage>(context).goToPageGame();
},
),
),
);
} else {
// Resume activity
lines.add(AspectRatio(
aspectRatio: 3,
child: ActivityButtonResumeSaved(
onPressed: () {
BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
BlocProvider.of<NavCubitPage>(context).goToPageGame();
},
),
));
// Delete saved activity
lines.add(SizedBox.square(
dimension: MediaQuery.of(context).size.width / 5,
child: ActivityButtonDeleteSaved(
onPressed: () {
BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
},
),
));
}
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;
}
}
lib/common/ui/parameters/parameter_painter.dart deleted 100644 → 0
+ 0
− 179
View file @ baee2d13
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/config/default_activity_settings.dart';
import 'package:petitbac/models/settings/settings_activity.dart';
import 'package:petitbac/models/settings/settings_global.dart';
class ParameterPainter extends CustomPainter {
const ParameterPainter({
required this.code,
required this.value,
required this.activitySettings,
required this.globalSettings,
});
final String code;
final String value;
final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
@override
void paint(Canvas canvas, Size size) {
// force square
final double canvasSize = min(size.width, size.height);
// content
switch (code) {
case DefaultActivitySettings.parameterCodeItemsCount:
paintItemsCountParameterItem(canvas, canvasSize);
break;
case DefaultActivitySettings.parameterCodeTimerValue:
paintTimerParameterItem(canvas, canvasSize);
break;
default:
printlog('Unknown parameter: $code/$value');
paintUnknownParameterItem(canvas, canvasSize);
}
}
@override
bool shouldRepaint(CustomPainter oldDelegate) {
return false;
}
// "unknown" parameter -> simple block with text
void paintUnknownParameterItem(
final Canvas canvas,
final double size,
) {
final paint = Paint();
paint.strokeJoin = StrokeJoin.round;
paint.strokeWidth = 3;
final textSpan = TextSpan(
text: '$code\n$value',
style: const TextStyle(
color: Colors.black,
fontSize: 18,
fontWeight: FontWeight.bold,
),
);
final textPainter = TextPainter(
text: textSpan,
textDirection: TextDirection.ltr,
textAlign: TextAlign.center,
);
textPainter.layout();
textPainter.paint(
canvas,
Offset(
(size - textPainter.width) * 0.5,
(size - textPainter.height) * 0.5,
),
);
}
void paintItemsCountParameterItem(
final Canvas canvas,
final double size,
) {
const itemCountEmoji = '💬';
String text =
'$itemCountEmoji\n${DefaultActivitySettings.getItemsCountValueFromCode(value)}';
switch (value) {
case DefaultActivitySettings.itemsCountValueNoLimit:
text = '⭐';
break;
case DefaultActivitySettings.itemsCountValueShort:
break;
case DefaultActivitySettings.itemsCountValueMedium:
break;
case DefaultActivitySettings.itemsCountValueLong:
break;
default:
printlog('Wrong value for itemsCount parameter value: $value');
}
final paint = Paint();
paint.strokeJoin = StrokeJoin.round;
paint.strokeWidth = 3 / 100 * size;
// centered text value
final textSpan = TextSpan(
text: text,
style: TextStyle(
color: Colors.black,
fontSize: size / 2.6,
fontWeight: FontWeight.bold,
),
);
final textPainter = TextPainter(
text: textSpan,
textDirection: TextDirection.ltr,
textAlign: TextAlign.center,
);
textPainter.layout();
textPainter.paint(
canvas,
Offset(
(size - textPainter.width) * 0.5,
(size - textPainter.height) * 0.5,
),
);
}
void paintTimerParameterItem(
final Canvas canvas,
final double size,
) {
const timerEmoji = '⏲️';
String text = '$timerEmoji\n${DefaultActivitySettings.getTimerValueFromCode(value)}"';
switch (value) {
case DefaultActivitySettings.timerValueNoTimer:
text = '⭐';
break;
case DefaultActivitySettings.timerValueLow:
break;
case DefaultActivitySettings.timerValueMedium:
break;
case DefaultActivitySettings.timerValueHigh:
break;
default:
printlog('Wrong value for itemsCount parameter value: $value');
}
final paint = Paint();
paint.strokeJoin = StrokeJoin.round;
paint.strokeWidth = 3;
// centered text value
final textSpan = TextSpan(
text: text,
style: TextStyle(
color: Colors.black,
fontSize: size / 2.6,
fontWeight: FontWeight.bold,
),
);
final textPainter = TextPainter(
text: textSpan,
textDirection: TextDirection.ltr,
textAlign: TextAlign.center,
);
textPainter.layout();
textPainter.paint(
canvas,
Offset(
(size - textPainter.width) * 0.5,
(size - textPainter.height) * 0.5,
),
);
}
}
lib/common/ui/parameters/parameter_widget.dart deleted 100644 → 0
+ 0
− 165
View file @ baee2d13
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/common/ui/parameters/parameter_painter.dart';
import 'package:petitbac/config/default_activity_settings.dart';
import 'package:petitbac/config/default_global_settings.dart';
import 'package:petitbac/models/settings/settings_activity.dart';
import 'package:petitbac/models/settings/settings_global.dart';
class ParameterWidget extends StatelessWidget {
const ParameterWidget({
super.key,
required this.code,
required this.value,
required this.isSelected,
required this.size,
required this.activitySettings,
required this.globalSettings,
required this.onPressed,
});
final String code;
final String value;
final bool isSelected;
final double size;
final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
final VoidCallback onPressed;
static const Color buttonColorActive = Colors.blue;
static const Color buttonColorInactive = Colors.white;
static const double buttonBorderWidth = 4.0;
static const double buttonBorderRadius = 12.0;
@override
Widget build(BuildContext context) {
Widget content = const SizedBox.shrink();
switch (code) {
case DefaultActivitySettings.parameterCodeItemsCount:
content = getItemsCountParameterItem(value);
break;
case DefaultActivitySettings.parameterCodeTimerValue:
content = getTimerValueParameterItem(value);
break;
case DefaultGlobalSettings.parameterCodeSkin:
content = getSkinParameterItem(value);
break;
default:
printlog('Unknown parameter: $code/$value');
content = getUnknownParameterItem(value);
}
final Color buttonColor = isSelected ? buttonColorActive : buttonColorInactive;
return Container(
decoration: BoxDecoration(
color: buttonColor,
borderRadius: BorderRadius.circular(buttonBorderRadius),
border: Border.all(
color: buttonColor,
width: buttonBorderWidth,
),
),
child: content,
);
}
// "unknown" parameter -> simple block with text
Widget getUnknownParameterItem(final String value) {
return StyledButton.text(
caption: '$code / $value',
color: Colors.grey,
onPressed: null,
);
}
Widget getItemsCountParameterItem(final String value) {
Color backgroundColor = Colors.grey;
switch (value) {
case DefaultActivitySettings.itemsCountValueNoLimit:
backgroundColor = Colors.grey;
break;
case DefaultActivitySettings.itemsCountValueShort:
backgroundColor = Colors.green;
break;
case DefaultActivitySettings.itemsCountValueMedium:
backgroundColor = Colors.orange;
break;
case DefaultActivitySettings.itemsCountValueLong:
backgroundColor = Colors.red;
break;
default:
printlog('Wrong value for itemsCount parameter value: $value');
}
return StyledButton(
color: backgroundColor,
onPressed: onPressed,
child: CustomPaint(
size: Size(size, size),
willChange: false,
painter: ParameterPainter(
code: code,
value: value,
activitySettings: activitySettings,
globalSettings: globalSettings,
),
isComplex: true,
),
);
}
Widget getTimerValueParameterItem(final String value) {
Color backgroundColor = Colors.grey;
switch (value) {
case DefaultActivitySettings.timerValueNoTimer:
backgroundColor = Colors.grey;
break;
case DefaultActivitySettings.timerValueLow:
backgroundColor = Colors.green;
break;
case DefaultActivitySettings.timerValueMedium:
backgroundColor = Colors.orange;
break;
case DefaultActivitySettings.timerValueHigh:
backgroundColor = Colors.red;
break;
default:
printlog('Wrong value for itemsCount parameter value: $value');
}
return StyledButton(
color: backgroundColor,
onPressed: onPressed,
child: CustomPaint(
size: Size(size, size),
willChange: false,
painter: ParameterPainter(
code: code,
value: value,
activitySettings: activitySettings,
globalSettings: globalSettings,
),
isComplex: true,
),
);
}
Widget getSkinParameterItem(
final String value,
) {
return StyledButton(
color: Colors.green.shade800,
onPressed: onPressed,
child: Image(
image: AssetImage('assets/ui/${DefaultGlobalSettings.parameterCodeSkin}_$value.png'),
fit: BoxFit.fill,
),
);
}
}
lib/config/application_config.dart
+ 109
− 1
View file @ 5ab88b02
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/common/cubit/nav/nav_cubit_pages.dart';
import 'package:petitbac/cubit/activity/activity_cubit.dart';
class ApplicationConfig {
static const String appTitle = 'Petit Bac';
static const String parameterCodeItemsCount = 'activity.itemsCount';
static const String parameterCodeTimerValue = 'activity.timerValue';
static const String itemsCountValueNoLimit = 'nolimit';
static const String itemsCountValueShort = 'short';
static const String itemsCountValueMedium = 'medium';
static const String itemsCountValueLong = 'long';
static const String timerValueNoTimer = 'nolimit';
static const String timerValueLow = 'low';
static const String timerValueMedium = 'medium';
static const String timerValueHigh = 'high';
static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
appTitle: 'Petit Bac',
activitySettings: [
// items count
ApplicationSettingsParameter(
code: parameterCodeItemsCount,
values: [
ApplicationSettingsParameterItemValue(
value: itemsCountValueNoLimit,
color: Colors.grey,
text: '⭐',
),
ApplicationSettingsParameterItemValue(
value: itemsCountValueShort,
color: Colors.green,
text: '💬 5',
),
ApplicationSettingsParameterItemValue(
value: itemsCountValueMedium,
color: Colors.orange,
text: '💬 10',
isDefault: true,
),
ApplicationSettingsParameterItemValue(
value: itemsCountValueLong,
color: Colors.red,
text: '💬 20',
),
],
intValueGetter: (value) {
const Map<String, int> intValues = {
ApplicationConfig.itemsCountValueNoLimit: 0,
ApplicationConfig.itemsCountValueShort: 5,
ApplicationConfig.itemsCountValueMedium: 10,
ApplicationConfig.itemsCountValueLong: 20,
};
return intValues[parameterCodeItemsCount] ?? 0;
},
),
// timer value
ApplicationSettingsParameter(
code: parameterCodeTimerValue,
values: [
ApplicationSettingsParameterItemValue(
value: timerValueNoTimer,
color: Colors.grey,
text: '⭐',
),
ApplicationSettingsParameterItemValue(
value: timerValueLow,
color: Colors.green,
text: '⏲️ 5',
),
ApplicationSettingsParameterItemValue(
value: timerValueMedium,
color: Colors.orange,
text: '⏲️ 30',
isDefault: true,
),
ApplicationSettingsParameterItemValue(
value: timerValueHigh,
color: Colors.red,
text: '⏲️ 90',
),
],
intValueGetter: (value) {
const Map<String, int> intValues = {
timerValueNoTimer: 0,
timerValueLow: 5,
timerValueMedium: 30,
timerValueHigh: 90,
};
return intValues[parameterCodeTimerValue] ?? 0;
},
),
],
startNewActivity: (BuildContext context) {
BlocProvider.of<ActivityCubit>(context).startNewActivity(context);
BlocProvider.of<NavCubitPage>(context).goToPageGame();
},
deleteCurrentActivity: (BuildContext context) {
BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
},
resumeActivity: (BuildContext context) {
BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
BlocProvider.of<NavCubitPage>(context).goToPageGame();
},
);
}
lib/config/default_activity_settings.dart deleted 100644 → 0
+ 0
− 74
View file @ baee2d13
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
class DefaultActivitySettings {
// available game parameters codes
static const String parameterCodeItemsCount = 'itemsCount';
static const String parameterCodeTimerValue = 'timerValue';
static const List<String> availableParameters = [
parameterCodeItemsCount,
parameterCodeTimerValue,
];
// items count: available values
static const String itemsCountValueNoLimit = 'nolimit';
static const String itemsCountValueShort = 'short';
static const String itemsCountValueMedium = 'medium';
static const String itemsCountValueLong = 'long';
static const List<String> allowedItemsCountValues = [
itemsCountValueNoLimit,
itemsCountValueShort,
itemsCountValueMedium,
itemsCountValueLong,
];
// items count: default value
static const String defaultItemsCountValue = itemsCountValueMedium;
// timer value: available values
static const String timerValueNoTimer = 'nolimit';
static const String timerValueLow = 'low';
static const String timerValueMedium = 'medium';
static const String timerValueHigh = 'high';
static const List<String> allowedTimerValues = [
timerValueNoTimer,
timerValueLow,
timerValueMedium,
timerValueHigh,
];
// timer value: default value
static const String defaultTimerValue = timerValueMedium;
// available values from parameter code
static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case parameterCodeItemsCount:
return DefaultActivitySettings.allowedItemsCountValues;
case parameterCodeTimerValue:
return DefaultActivitySettings.allowedTimerValues;
}
printlog('Did not find any available value for game parameter "$parameterCode".');
return [];
}
static int getItemsCountValueFromCode(String itemsCountParameterValue) {
const Map<String, int> values = {
DefaultActivitySettings.itemsCountValueNoLimit: 0,
DefaultActivitySettings.itemsCountValueShort: 5,
DefaultActivitySettings.itemsCountValueMedium: 10,
DefaultActivitySettings.itemsCountValueLong: 20,
};
return values[itemsCountParameterValue] ??
getItemsCountValueFromCode(DefaultActivitySettings.defaultItemsCountValue);
}
static int getTimerValueFromCode(String timerValueParameterValue) {
const Map<String, int> values = {
timerValueNoTimer: 0,
timerValueLow: 5,
timerValueMedium: 30,
timerValueHigh: 90,
};
return values[timerValueParameterValue] ??
getTimerValueFromCode(DefaultActivitySettings.defaultTimerValue);
}
}
lib/config/default_global_settings.dart deleted 100644 → 0
+ 0
− 28
View file @ baee2d13
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
class DefaultGlobalSettings {
// available global parameters codes
static const String parameterCodeSkin = 'skin';
static const List<String> availableParameters = [
parameterCodeSkin,
];
// skin: available values
static const String skinValueDefault = 'default';
static const List<String> allowedSkinValues = [
skinValueDefault,
];
// skin: default value
static const String defaultSkinValue = skinValueDefault;
// available values from parameter code
static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case parameterCodeSkin:
return DefaultGlobalSettings.allowedSkinValues;
}
printlog('Did not find any available value for global parameter "$parameterCode".');
return [];
}
}
lib/cubit/activity/activity_cubit.dart
+ 21
− 13
View file @ 5ab88b02
......@@ -4,11 +4,10 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/config/application_config.dart';
import 'package:petitbac/data/fetch_data_helper.dart';
import 'package:petitbac/models/activity/activity.dart';
import 'package:petitbac/models/activity/game_item.dart';
import 'package:petitbac/models/settings/settings_activity.dart';
import 'package:petitbac/models/settings/settings_global.dart';
part 'activity_state.dart';
......@@ -28,7 +27,6 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
final Activity activity = Activity(
// Settings
activitySettings: state.currentActivity.activitySettings,
globalSettings: state.currentActivity.globalSettings,
// State
isRunning: state.currentActivity.isRunning,
isStarted: state.currentActivity.isStarted,
......@@ -45,14 +43,13 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
updateState(activity);
}
void startNewActivity({
required ActivitySettings activitySettings,
required GlobalSettings globalSettings,
}) {
void startNewActivity(BuildContext context) {
final ActivitySettingsCubit activitySettingsCubit =
BlocProvider.of<ActivitySettingsCubit>(context);
final Activity newActivity = Activity.createNew(
// Settings
activitySettings: activitySettings,
globalSettings: globalSettings,
activitySettings: activitySettingsCubit.state.settings,
);
newActivity.dump();
......@@ -61,6 +58,10 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
startTimer();
}
bool canBeResumed() {
return state.currentActivity.canBeResumed;
}
void quitActivity() {
state.currentActivity.isRunning = false;
refresh();
......@@ -79,7 +80,9 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
void next() {
if (state.currentActivity.position <
(state.currentActivity.activitySettings.itemsCountValue - 1)) {
(state.currentActivity.activitySettings
.getAsInt(ApplicationConfig.parameterCodeItemsCount) -
1)) {
state.currentActivity.position++;
startTimer();
} else {
......@@ -89,7 +92,8 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
}
void startTimer() {
int timerValue = state.currentActivity.activitySettings.timerCountValue;
int timerValue = state.currentActivity.activitySettings
.getAsInt(ApplicationConfig.parameterCodeTimerValue);
if (timerValue != 0) {
state.currentActivity.countdown = timerValue;
......@@ -106,7 +110,9 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
if (state.currentActivity.countdown == 0) {
timer.cancel();
if (state.currentActivity.position ==
(state.currentActivity.activitySettings.itemsCountValue - 1)) {
(state.currentActivity.activitySettings
.getAsInt(ApplicationConfig.parameterCodeItemsCount) -
1)) {
state.currentActivity.isFinished = true;
}
}
......@@ -116,7 +122,9 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
);
} else {
if (state.currentActivity.position ==
(state.currentActivity.activitySettings.itemsCountValue - 1)) {
(state.currentActivity.activitySettings
.getAsInt(ApplicationConfig.parameterCodeItemsCount) -
1)) {
state.currentActivity.isFinished = true;
}
}
......
lib/cubit/settings/settings_activity_cubit.dart deleted 100644 → 0
+ 0
− 72
View file @ baee2d13
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/config/default_activity_settings.dart';
import 'package:petitbac/models/settings/settings_activity.dart';
part 'settings_activity_state.dart';
class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
ActivitySettingsCubit()
: super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
void setValues({
String? itemsCount,
String? timerValue,
}) {
emit(
ActivitySettingsState(
settings: ActivitySettings(
itemsCount: itemsCount ?? state.settings.itemsCount,
timerValue: timerValue ?? state.settings.timerValue,
),
),
);
}
String getParameterValue(String code) {
switch (code) {
case DefaultActivitySettings.parameterCodeItemsCount:
return ActivitySettings.getItemsCountValueFromUnsafe(state.settings.itemsCount);
case DefaultActivitySettings.parameterCodeTimerValue:
return ActivitySettings.getTimerValueFromUnsafe(state.settings.timerValue);
}
return '';
}
void setParameterValue(String code, String value) {
final String itemsCount = code == DefaultActivitySettings.parameterCodeItemsCount
? value
: getParameterValue(DefaultActivitySettings.parameterCodeItemsCount);
final String timerValue = code == DefaultActivitySettings.parameterCodeTimerValue
? value
: getParameterValue(DefaultActivitySettings.parameterCodeTimerValue);
setValues(
itemsCount: itemsCount,
timerValue: timerValue,
);
}
@override
ActivitySettingsState? fromJson(Map<String, dynamic> json) {
final String itemsCount = json[DefaultActivitySettings.parameterCodeItemsCount] as String;
final String timerValue = json[DefaultActivitySettings.parameterCodeTimerValue] as String;
return ActivitySettingsState(
settings: ActivitySettings(
itemsCount: itemsCount,
timerValue: timerValue,
),
);
}
@override
Map<String, dynamic>? toJson(ActivitySettingsState state) {
return <String, dynamic>{
DefaultActivitySettings.parameterCodeItemsCount: state.settings.itemsCount,
DefaultActivitySettings.parameterCodeTimerValue: state.settings.timerValue,
};
}
}
lib/cubit/settings/settings_activity_state.dart deleted 100644 → 0
+ 0
− 15
View file @ baee2d13
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,
];
}
lib/cubit/settings/settings_global_cubit.dart deleted 100644 → 0
+ 0
− 59
View file @ baee2d13
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/config/default_global_settings.dart';
import 'package:petitbac/models/settings/settings_global.dart';
part 'settings_global_state.dart';
class GlobalSettingsCubit extends HydratedCubit<GlobalSettingsState> {
GlobalSettingsCubit() : super(GlobalSettingsState(settings: GlobalSettings.createDefault()));
void setValues({
String? skin,
}) {
emit(
GlobalSettingsState(
settings: GlobalSettings(
skin: skin ?? state.settings.skin,
),
),
);
}
String getParameterValue(String code) {
switch (code) {
case DefaultGlobalSettings.parameterCodeSkin:
return GlobalSettings.getSkinValueFromUnsafe(state.settings.skin);
}
return '';
}
void setParameterValue(String code, String value) {
final String skin = (code == DefaultGlobalSettings.parameterCodeSkin)
? value
: getParameterValue(DefaultGlobalSettings.parameterCodeSkin);
setValues(
skin: skin,
);
}
@override
GlobalSettingsState? fromJson(Map<String, dynamic> json) {
final String skin = json[DefaultGlobalSettings.parameterCodeSkin] as String;
return GlobalSettingsState(
settings: GlobalSettings(
skin: skin,
),
);
}
@override
Map<String, dynamic>? toJson(GlobalSettingsState state) {
return <String, dynamic>{
DefaultGlobalSettings.parameterCodeSkin: state.settings.skin,
};
}
}
lib/cubit/settings/settings_global_state.dart deleted 100644 → 0
+ 0
− 15
View file @ baee2d13
part of 'settings_global_cubit.dart';
@immutable
class GlobalSettingsState extends Equatable {
const GlobalSettingsState({
required this.settings,
});
final GlobalSettings settings;
@override
List<dynamic> get props => <dynamic>[
settings,
];
}
lib/main.dart
+ 2
− 7
View file @ 5ab88b02
......@@ -9,8 +9,6 @@ import 'package:petitbac/common/cubit/nav/nav_cubit_screens.dart';
import 'package:petitbac/config/application_config.dart';
import 'package:petitbac/cubit/activity/activity_cubit.dart';
import 'package:petitbac/cubit/settings/settings_activity_cubit.dart';
import 'package:petitbac/cubit/settings/settings_global_cubit.dart';
import 'package:petitbac/ui/skeleton.dart';
void main() async {
......@@ -61,17 +59,14 @@ class MyApp extends StatelessWidget {
BlocProvider<ActivityCubit>(
create: (context) => ActivityCubit(),
),
BlocProvider<GlobalSettingsCubit>(
create: (context) => GlobalSettingsCubit(),
),
BlocProvider<ActivitySettingsCubit>(
create: (context) => ActivitySettingsCubit(),
create: (context) => ActivitySettingsCubit(appConfig: ApplicationConfig.config),
),
],
child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>(
builder: (BuildContext context, ApplicationThemeModeState state) {
return MaterialApp(
title: ApplicationConfig.appTitle,
title: ApplicationConfig.config.appTitle,
home: const SkeletonScreen(),
// Theme stuff
......
lib/models/activity/activity.dart
+ 8
− 15
View file @ 5ab88b02
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/config/application_config.dart';
import 'package:petitbac/data/fetch_data_helper.dart';
import 'package:petitbac/models/data/category.dart';
import 'package:petitbac/models/data/letter.dart';
import 'package:petitbac/models/activity/game_item.dart';
import 'package:petitbac/models/settings/settings_activity.dart';
import 'package:petitbac/models/settings/settings_global.dart';
class Activity {
Activity({
// Settings
required this.activitySettings,
required this.globalSettings,
// State
this.isRunning = false,
......@@ -29,7 +27,6 @@ class Activity {
// Settings
final ActivitySettings activitySettings;
final GlobalSettings globalSettings;
// State
bool isRunning;
......@@ -46,27 +43,25 @@ class Activity {
factory Activity.createEmpty() {
return Activity(
activitySettings: ActivitySettings.createDefault(),
globalSettings: GlobalSettings.createDefault(),
// Settings
activitySettings: ActivitySettings.createDefault(appConfig: ApplicationConfig.config),
// Base data
items: [],
);
}
factory Activity.createNew({
ActivitySettings? activitySettings,
GlobalSettings? globalSettings,
}) {
final ActivitySettings newActivitySettings =
activitySettings ?? ActivitySettings.createDefault();
final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
final ActivitySettings newActivitySettings = activitySettings ??
ActivitySettings.createDefault(appConfig: ApplicationConfig.config);
final List<GameItem> items =
FetchDataHelper().getRandomItems(newActivitySettings.itemsCountValue);
final List<GameItem> items = FetchDataHelper().getRandomItems(
newActivitySettings.getAsInt(ApplicationConfig.parameterCodeItemsCount));
return Activity(
// Settings
activitySettings: newActivitySettings,
globalSettings: newGlobalSettings,
// State
isRunning: true,
isStarted: true,
......@@ -88,7 +83,6 @@ class Activity {
printlog('$Activity:');
printlog(' Settings');
activitySettings.dump();
globalSettings.dump();
printlog(' State');
printlog(' isRunning: $isRunning');
printlog(' isStarted: $isStarted');
......@@ -111,7 +105,6 @@ class Activity {
return <String, dynamic>{
// Settings
'activitySettings': activitySettings.toJson(),
'globalSettings': globalSettings.toJson(),
// State
'isRunning': isRunning,
'isStarted': isStarted,
......
lib/models/settings/settings_activity.dart deleted 100644 → 0
+ 0
− 58
View file @ baee2d13
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/config/default_activity_settings.dart';
class ActivitySettings {
final String itemsCount;
final String timerValue;
ActivitySettings({
required this.itemsCount,
required this.timerValue,
});
int get itemsCountValue => DefaultActivitySettings.getItemsCountValueFromCode(itemsCount);
int get timerCountValue => DefaultActivitySettings.getTimerValueFromCode(timerValue);
static String getItemsCountValueFromUnsafe(String itemsCount) {
if (DefaultActivitySettings.allowedItemsCountValues.contains(itemsCount)) {
return itemsCount;
}
return DefaultActivitySettings.defaultItemsCountValue;
}
static String getTimerValueFromUnsafe(String timerValue) {
if (DefaultActivitySettings.allowedTimerValues.contains(timerValue)) {
return timerValue;
}
return DefaultActivitySettings.defaultTimerValue;
}
factory ActivitySettings.createDefault() {
return ActivitySettings(
itemsCount: DefaultActivitySettings.defaultItemsCountValue,
timerValue: DefaultActivitySettings.defaultTimerValue,
);
}
void dump() {
printlog('$ActivitySettings:');
printlog(' ${DefaultActivitySettings.parameterCodeItemsCount}: $itemsCount');
printlog(' ${DefaultActivitySettings.parameterCodeTimerValue}: $timerValue');
printlog('');
}
@override
String toString() {
return '$ActivitySettings(${toJson()})';
}
Map<String, dynamic>? toJson() {
return <String, dynamic>{
DefaultActivitySettings.parameterCodeItemsCount: itemsCount,
DefaultActivitySettings.parameterCodeTimerValue: timerValue,
};
}
}
lib/models/settings/settings_global.dart deleted 100644 → 0
+ 0
− 42
View file @ baee2d13
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/config/default_global_settings.dart';
class GlobalSettings {
String skin;
GlobalSettings({
required this.skin,
});
static String getSkinValueFromUnsafe(String skin) {
if (DefaultGlobalSettings.allowedSkinValues.contains(skin)) {
return skin;
}
return DefaultGlobalSettings.defaultSkinValue;
}
factory GlobalSettings.createDefault() {
return GlobalSettings(
skin: DefaultGlobalSettings.defaultSkinValue,
);
}
void dump() {
printlog('$GlobalSettings:');
printlog(' ${DefaultGlobalSettings.parameterCodeSkin}: $skin');
printlog('');
}
@override
String toString() {
return '$GlobalSettings(${toJson()})';
}
Map<String, dynamic>? toJson() {
return <String, dynamic>{
DefaultGlobalSettings.parameterCodeSkin: skin,
};
}
}
lib/ui/game/game_top.dart
+ 4
− 1
View file @ 5ab88b02
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:petitbac/config/application_config.dart';
import 'package:petitbac/cubit/activity/activity_cubit.dart';
import 'package:petitbac/models/activity/activity.dart';
......@@ -14,7 +15,9 @@ class GameTopWidget extends StatelessWidget {
builder: (BuildContext context, ActivityState activityState) {
final Activity currentActivity = activityState.currentActivity;
return currentActivity.activitySettings.itemsCountValue != 0
return currentActivity.activitySettings
.getAsInt(ApplicationConfig.parameterCodeItemsCount) !=
0
? const GamePositionIndicator()
: const SizedBox.shrink();
},
......
lib/common/ui/pages/game.dart → lib/ui/pages/game.dart
+ 0
− 0
View file @ 5ab88b02
File moved
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment