diff --git a/android/gradle.properties b/android/gradle.properties
index 665a788976fb2089dd4081239421cf8ed502b6fa..e3b4d8ad9f9464360347d07cf2be826db048af75 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
-app.versionName=1.2.33
-app.versionCode=39
+app.versionName=1.3.0
+app.versionCode=40
diff --git a/assets/translations/en.json b/assets/translations/en.json
index d7aedb9d32ff97311a3194d1b7f6637a8e060cd6..393e6ef520c3662df782c3f53651c239fba59bc4 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -1,12 +1,8 @@
{
"app_name": "Categories",
- "bottom_nav_home": "Game",
- "bottom_nav_settings": "Settings",
- "bottom_nav_about": "About",
-
"settings_title": "Settings",
- "settings_label_theme":"Theme mode",
+ "settings_label_theme": "Theme mode",
"about_title": "Informations",
"about_content": "Categories",
diff --git a/assets/translations/fr.json b/assets/translations/fr.json
index d40e253fdb69dc3bbdd41580d2d9a396ecf713bb..3088da52e73a6b3026e2d7b97843ea31c0be3bb8 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -1,12 +1,8 @@
{
"app_name": "Petit Bac",
- "bottom_nav_home": "Jeu",
- "bottom_nav_settings": "Réglages",
- "bottom_nav_about": "Infos",
-
"settings_title": "Réglages",
- "settings_label_theme":"Thème de couleurs",
+ "settings_label_theme": "Thème de couleurs",
"about_title": "Informations",
"about_content": "Petit Bac.",
diff --git a/assets/icons/button_back.png b/assets/ui/button_back.png
similarity index 100%
rename from assets/icons/button_back.png
rename to assets/ui/button_back.png
diff --git a/assets/ui/button_delete_saved_game.png b/assets/ui/button_delete_saved_game.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e4f217689b11e444b7163557d7e5d68f3bbfe7d
Binary files /dev/null and b/assets/ui/button_delete_saved_game.png differ
diff --git a/assets/ui/button_resume_game.png b/assets/ui/button_resume_game.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2ea0a02d05e42377eb551a4b51428b511a32f5d
Binary files /dev/null and b/assets/ui/button_resume_game.png differ
diff --git a/assets/icons/button_start.png b/assets/ui/button_start.png
similarity index 100%
rename from assets/icons/button_start.png
rename to assets/ui/button_start.png
diff --git a/assets/ui/game_end.png b/assets/ui/game_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..876334279c1711b349a62131a33607eecf924eb6
Binary files /dev/null and b/assets/ui/game_end.png differ
diff --git a/assets/icons/placeholder.png b/assets/ui/placeholder.png
similarity index 100%
rename from assets/icons/placeholder.png
rename to assets/ui/placeholder.png
diff --git a/fastlane/metadata/android/en-US/changelogs/40.txt b/fastlane/metadata/android/en-US/changelogs/40.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d4afd512e55b3fd8ffbfd795adb9b00832e5aaef
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40.txt
@@ -0,0 +1 @@
+Improve/normalize game architecture.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40.txt b/fastlane/metadata/android/fr-FR/changelogs/40.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6a9871a5eb8eb3c6e9106520f1cbf1f39f9e5ef7
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40.txt
@@ -0,0 +1 @@
+Amélioration/normalisation de l'architecture du jeu.
diff --git a/icons/build_game_icons.sh b/icons/build_game_icons.sh
deleted file mode 100755
index 7368dc4543ff5b92568d683f3d0fb144364bbe04..0000000000000000000000000000000000000000
--- a/icons/build_game_icons.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/bash
-
-# Check dependencies
-command -v inkscape >/dev/null 2>&1 || { echo >&2 "I require inkscape but it's not installed. Aborting."; exit 1; }
-command -v scour >/dev/null 2>&1 || { echo >&2 "I require scour but it's not installed. Aborting."; exit 1; }
-command -v optipng >/dev/null 2>&1 || { echo >&2 "I require optipng but it's not installed. Aborting."; exit 1; }
-
-CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-BASE_DIR="$(dirname "${CURRENT_DIR}")"
-ASSETS_DIR="${BASE_DIR}/assets"
-
-OPTIPNG_OPTIONS="-preserve -quiet -o7"
-ICON_SIZE=192
-
-#######################################################
-
-# Game images
-AVAILABLE_GAME_IMAGES="
- button_back
- button_start
- placeholder
-"
-
-#######################################################
-
-# optimize svg
-function optimize_svg() {
- SOURCE="$1"
-
- cp ${SOURCE} ${SOURCE}.tmp
- scour \
- --remove-descriptive-elements \
- --enable-id-stripping \
- --enable-viewboxing \
- --enable-comment-stripping \
- --nindent=4 \
- --quiet \
- -i ${SOURCE}.tmp \
- -o ${SOURCE}
- rm ${SOURCE}.tmp
-}
-
-# build icons
-function build_icon() {
- SOURCE="$1"
- TARGET="$2"
-
- echo "Building ${TARGET}"
-
- if [ ! -f "${SOURCE}" ]; then
- echo "Missing file: ${SOURCE}"
- exit 1
- fi
-
- optimize_svg "${SOURCE}"
-
- inkscape \
- --export-width=${ICON_SIZE} \
- --export-height=${ICON_SIZE} \
- --export-filename=${TARGET} \
- ${SOURCE}
-
- optipng ${OPTIPNG_OPTIONS} ${TARGET}
-}
-
-#######################################################
-
-# Create output folders
-mkdir -p ${ASSETS_DIR}/icons
-
-# Delete existing generated images
-find ${ASSETS_DIR}/icons -type f -name "*.png" -delete
-
-# build game images
-for GAME_IMAGE in ${AVAILABLE_GAME_IMAGES}
-do
- build_icon ${CURRENT_DIR}/${GAME_IMAGE}.svg ${ASSETS_DIR}/icons/${GAME_IMAGE}.png
-done
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_game_settings.dart
index a1556efb7d05ba21cf3e365a3a067c8c66dd9428..68fbb4e2255326a4931c385a4d97483519785aa9 100644
--- a/lib/config/default_game_settings.dart
+++ b/lib/config/default_game_settings.dart
@@ -10,42 +10,70 @@ class DefaultGameSettings {
];
// items count: available values
- static const int itemsCountValueNoLimit = 0;
- static const int itemsCountValueShort = 5;
- static const int itemsCountValueMedium = 10;
- static const int itemsCountValueLong = 20;
- static const List<int> allowedItemsCountValues = [
+ 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 int defaultItemsCountValue = itemsCountValueMedium;
+ static const String defaultItemsCountValue = itemsCountValueMedium;
// timer value: available values
- static const int timerValueNoTimer = 0;
- static const int timerValueLow = 10;
- static const int timerValueMedium = 30;
- static const int timerValueHigh = 60;
- static const List<int> allowedTimerValues = [
+ 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 int defaultTimerValue = timerValueMedium;
+ static const String defaultTimerValue = timerValueMedium;
- static List<int> getAvailableValues(String parameterCode) {
+ // available values from parameter code
+ static List<String> getAvailableValues(String parameterCode) {
switch (parameterCode) {
- case 'itemsCount':
+ case parameterCodeItemsCount:
return DefaultGameSettings.allowedItemsCountValues;
- case 'timerValue':
+ case parameterCodeTimerValue:
return DefaultGameSettings.allowedTimerValues;
}
printlog('Did not find any available value for game parameter "$parameterCode".');
return [];
}
+
+ static int getItemsCountValueFromCode(String itemsCountParameterValue) {
+ const Map<String, int> values = {
+ DefaultGameSettings.itemsCountValueNoLimit: 0,
+ DefaultGameSettings.itemsCountValueShort: 5,
+ DefaultGameSettings.itemsCountValueMedium: 10,
+ DefaultGameSettings.itemsCountValueLong: 20,
+ };
+ return values[itemsCountParameterValue] ??
+ getItemsCountValueFromCode(DefaultGameSettings.defaultItemsCountValue);
+ }
+
+ static int getTimerValueFromCode(String timerValueParameterValue) {
+ const Map<String, int> values = {
+ timerValueNoTimer: 0,
+ timerValueLow: 5,
+ timerValueMedium: 30,
+ timerValueHigh: 90,
+ };
+ return values[timerValueParameterValue] ??
+ getTimerValueFromCode(DefaultGameSettings.defaultTimerValue);
+ }
+
+ // parameters displayed with assets (instead of painter)
+ static List<String> displayedWithAssets = [
+ //
+ ];
}
diff --git a/lib/config/default_global_settings.dart b/lib/config/default_global_settings.dart
index 363c2a181a8a2c4799f4235145e072f7cae8153d..5201cc641075451dcb67abad2702be567cb63a96 100644
--- a/lib/config/default_global_settings.dart
+++ b/lib/config/default_global_settings.dart
@@ -1,10 +1,33 @@
import 'package:petitbac/utils/tools.dart';
class DefaultGlobalSettings {
- static const List<String> availableParameters = [];
+ // 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;
+ }
- static List<int> getAvailableValues(String parameterCode) {
printlog('Did not find any available value for global parameter "$parameterCode".');
return [];
}
+
+ // parameters displayed with assets (instead of painter)
+ static List<String> displayedWithAssets = [
+ //
+ ];
}
diff --git a/lib/config/menu.dart b/lib/config/menu.dart
index d875b6bb588512633fe1f389f17bec8fb35db1e4..437003f840f5d12e1db01980a90b7f9fdbb0b8a4 100644
--- a/lib/config/menu.dart
+++ b/lib/config/menu.dart
@@ -6,12 +6,10 @@ import 'package:petitbac/ui/screens/page_game.dart';
import 'package:petitbac/ui/screens/page_settings.dart';
class MenuItem {
- final String code;
final Icon icon;
final Widget page;
const MenuItem({
- required this.code,
required this.icon,
required this.page,
});
@@ -20,21 +18,18 @@ class MenuItem {
class Menu {
static const indexGame = 0;
static const menuItemGame = MenuItem(
- code: 'bottom_nav_game',
icon: Icon(UniconsLine.home),
page: PageGame(),
);
static const indexSettings = 1;
static const menuItemSettings = MenuItem(
- code: 'bottom_nav_settings',
icon: Icon(UniconsLine.setting),
page: PageSettings(),
);
static const indexAbout = 2;
static const menuItemAbout = MenuItem(
- code: 'bottom_nav_about',
icon: Icon(UniconsLine.info_circle),
page: PageAbout(),
);
diff --git a/lib/config/theme.dart b/lib/config/theme.dart
index be390348c7868e7c63387df13e13c46de43f8a23..74f532fd5abf693979118609564d29167e902009 100644
--- a/lib/config/theme.dart
+++ b/lib/config/theme.dart
@@ -39,11 +39,9 @@ final ColorScheme lightColorScheme = ColorScheme.light(
secondary: primarySwatch.shade500,
onSecondary: Colors.white,
error: errorColor,
- background: textSwatch.shade200,
- onBackground: textSwatch.shade500,
onSurface: textSwatch.shade500,
surface: textSwatch.shade50,
- surfaceVariant: Colors.white,
+ surfaceContainerHighest: Colors.white,
shadow: textSwatch.shade900.withOpacity(.1),
);
@@ -52,11 +50,9 @@ final ColorScheme darkColorScheme = ColorScheme.dark(
secondary: primarySwatch.shade500,
onSecondary: Colors.white,
error: errorColor,
- background: const Color(0xFF171724),
- onBackground: textSwatch.shade400,
onSurface: textSwatch.shade300,
surface: const Color(0xFF262630),
- surfaceVariant: const Color(0xFF282832),
+ surfaceContainerHighest: const Color(0xFF282832),
shadow: textSwatch.shade900.withOpacity(.2),
);
@@ -192,5 +188,3 @@ final ThemeData darkTheme = lightTheme.copyWith(
),
),
);
-
-final ThemeData appTheme = darkTheme;
diff --git a/lib/cubit/game_cubit.dart b/lib/cubit/game_cubit.dart
index d310d36a3d885a2d6299b55f755db9a59de02b8a..13f74601e3922fcc270c353d2f2ef2e63f21c30a 100644
--- a/lib/cubit/game_cubit.dart
+++ b/lib/cubit/game_cubit.dart
@@ -6,17 +6,17 @@ import 'package:flutter/material.dart';
import 'package:hydrated_bloc/hydrated_bloc.dart';
import 'package:petitbac/data/fetch_data_helper.dart';
-import 'package:petitbac/models/data/game_item.dart';
-import 'package:petitbac/models/game.dart';
-import 'package:petitbac/models/settings_game.dart';
-import 'package:petitbac/models/settings_global.dart';
+import 'package:petitbac/models/game/game.dart';
+import 'package:petitbac/models/game/game_item.dart';
+import 'package:petitbac/models/settings/settings_game.dart';
+import 'package:petitbac/models/settings/settings_global.dart';
part 'game_state.dart';
class GameCubit extends HydratedCubit<GameState> {
GameCubit()
: super(GameState(
- currentGame: Game.createNull(),
+ currentGame: Game.createEmpty(),
));
void updateState(Game game) {
@@ -27,13 +27,19 @@ class GameCubit extends HydratedCubit<GameState> {
void refresh() {
final Game game = Game(
+ // Settings
gameSettings: state.currentGame.gameSettings,
globalSettings: state.currentGame.globalSettings,
- items: state.currentGame.items,
+ // State
isRunning: state.currentGame.isRunning,
+ isStarted: state.currentGame.isStarted,
isFinished: state.currentGame.isFinished,
- countdown: state.currentGame.countdown,
+ animationInProgress: state.currentGame.animationInProgress,
+ // Base data
+ items: state.currentGame.items,
+ // Game data
position: state.currentGame.position,
+ countdown: state.currentGame.countdown,
);
// game.dump();
@@ -44,7 +50,8 @@ class GameCubit extends HydratedCubit<GameState> {
required GameSettings gameSettings,
required GlobalSettings globalSettings,
}) {
- Game newGame = Game.createNew(
+ final Game newGame = Game.createNew(
+ // Settings
gameSettings: gameSettings,
globalSettings: globalSettings,
);
@@ -60,8 +67,19 @@ class GameCubit extends HydratedCubit<GameState> {
refresh();
}
+ void resumeSavedGame() {
+ state.currentGame.isRunning = true;
+ refresh();
+ }
+
+ void deleteSavedGame() {
+ state.currentGame.isRunning = false;
+ state.currentGame.isFinished = true;
+ refresh();
+ }
+
void next() {
- if (state.currentGame.position < (state.currentGame.gameSettings.itemsCount - 1)) {
+ if (state.currentGame.position < (state.currentGame.gameSettings.itemsCountValue - 1)) {
state.currentGame.position++;
startTimer();
} else {
@@ -71,7 +89,7 @@ class GameCubit extends HydratedCubit<GameState> {
}
void startTimer() {
- int timerValue = state.currentGame.gameSettings.timerValue;
+ int timerValue = state.currentGame.gameSettings.timerCountValue;
if (timerValue != 0) {
state.currentGame.countdown = timerValue;
@@ -88,7 +106,7 @@ class GameCubit extends HydratedCubit<GameState> {
if (state.currentGame.countdown == 0) {
timer.cancel();
if (state.currentGame.position ==
- (state.currentGame.gameSettings.itemsCount - 1)) {
+ (state.currentGame.gameSettings.itemsCountValue - 1)) {
state.currentGame.isFinished = true;
}
}
@@ -97,7 +115,7 @@ class GameCubit extends HydratedCubit<GameState> {
},
);
} else {
- if (state.currentGame.position == (state.currentGame.gameSettings.itemsCount - 1)) {
+ if (state.currentGame.position == (state.currentGame.gameSettings.itemsCountValue - 1)) {
state.currentGame.isFinished = true;
}
}
@@ -132,7 +150,7 @@ class GameCubit extends HydratedCubit<GameState> {
@override
GameState? fromJson(Map<String, dynamic> json) {
- Game currentGame = json['currentGame'] as Game;
+ final Game currentGame = json['currentGame'] as Game;
return GameState(
currentGame: currentGame,
diff --git a/lib/cubit/game_state.dart b/lib/cubit/game_state.dart
index 8581d72fe5cae6d6b78362f118af54090f443499..00e211668c3269255926939324355792abd61c41 100644
--- a/lib/cubit/game_state.dart
+++ b/lib/cubit/game_state.dart
@@ -9,7 +9,7 @@ class GameState extends Equatable {
final Game currentGame;
@override
- List<Object?> get props => <Object?>[
+ List<dynamic> get props => <dynamic>[
currentGame,
];
}
diff --git a/lib/cubit/settings_game_cubit.dart b/lib/cubit/settings_game_cubit.dart
index b31cae31818e04e1e456a6977e9647e0e7dc3fea..677c18ce00ad2fdb1c65ef3fd388041c7eb06d07 100644
--- a/lib/cubit/settings_game_cubit.dart
+++ b/lib/cubit/settings_game_cubit.dart
@@ -2,8 +2,8 @@ import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import 'package:hydrated_bloc/hydrated_bloc.dart';
-import 'package:petitbac/models/settings_game.dart';
-import 'package:petitbac/utils/tools.dart';
+import 'package:petitbac/config/default_game_settings.dart';
+import 'package:petitbac/models/settings/settings_game.dart';
part 'settings_game_state.dart';
@@ -11,8 +11,8 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
GameSettingsCubit() : super(GameSettingsState(settings: GameSettings.createDefault()));
void setValues({
- int? itemsCount,
- int? timerValue,
+ String? itemsCount,
+ String? timerValue,
}) {
emit(
GameSettingsState(
@@ -24,22 +24,24 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
);
}
- int getParameterValue(String code) {
+ String getParameterValue(String code) {
switch (code) {
- case 'itemsCount':
+ case DefaultGameSettings.parameterCodeItemsCount:
return GameSettings.getItemsCountValueFromUnsafe(state.settings.itemsCount);
- case 'timerValue':
+ case DefaultGameSettings.parameterCodeTimerValue:
return GameSettings.getTimerValueFromUnsafe(state.settings.timerValue);
}
- return 0;
- }
- void setParameterValue(String code, int value) {
- printlog('GameSettingsCubit.setParameterValue');
- printlog('code: $code / value: $value');
+ return '';
+ }
- int itemsCount = code == 'itemsCount' ? value : getParameterValue('itemsCount');
- int timerValue = code == 'timerValue' ? value : getParameterValue('timerValue');
+ void setParameterValue(String code, String value) {
+ final String itemsCount = code == DefaultGameSettings.parameterCodeItemsCount
+ ? value
+ : getParameterValue(DefaultGameSettings.parameterCodeItemsCount);
+ final String timerValue = code == DefaultGameSettings.parameterCodeTimerValue
+ ? value
+ : getParameterValue(DefaultGameSettings.parameterCodeTimerValue);
setValues(
itemsCount: itemsCount,
@@ -49,8 +51,8 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
@override
GameSettingsState? fromJson(Map<String, dynamic> json) {
- int itemsCount = json['itemsCount'] as int;
- int timerValue = json['timerValue'] as int;
+ final String itemsCount = json[DefaultGameSettings.parameterCodeItemsCount] as String;
+ final String timerValue = json[DefaultGameSettings.parameterCodeTimerValue] as String;
return GameSettingsState(
settings: GameSettings(
@@ -63,8 +65,8 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
@override
Map<String, dynamic>? toJson(GameSettingsState state) {
return <String, dynamic>{
- 'itemsCount': state.settings.itemsCount,
- 'timerValue': state.settings.timerValue,
+ DefaultGameSettings.parameterCodeItemsCount: state.settings.itemsCount,
+ DefaultGameSettings.parameterCodeTimerValue: state.settings.timerValue,
};
}
}
diff --git a/lib/cubit/settings_game_state.dart b/lib/cubit/settings_game_state.dart
index b773dc69be12673b158e880e2d7e6e7bec465506..5acd85b44ba541e1c5e9c26af1c4be26a385b9ed 100644
--- a/lib/cubit/settings_game_state.dart
+++ b/lib/cubit/settings_game_state.dart
@@ -12,8 +12,4 @@ class GameSettingsState extends Equatable {
List<dynamic> get props => <dynamic>[
settings,
];
-
- Map<String, dynamic> get values => <String, dynamic>{
- 'settings': settings,
- };
}
diff --git a/lib/cubit/settings_global_cubit.dart b/lib/cubit/settings_global_cubit.dart
index 43f64fe3934d1fd79ea5c53b156aaf22b26d2846..c4bfba2b297dce9d36556a90f4b200036b654807 100644
--- a/lib/cubit/settings_global_cubit.dart
+++ b/lib/cubit/settings_global_cubit.dart
@@ -2,43 +2,59 @@ import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import 'package:hydrated_bloc/hydrated_bloc.dart';
-import 'package:petitbac/models/settings_global.dart';
-import 'package:petitbac/utils/tools.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() {
+ void setValues({
+ String? skin,
+ }) {
emit(
GlobalSettingsState(
- settings: GlobalSettings(),
+ settings: GlobalSettings(
+ skin: skin ?? state.settings.skin,
+ ),
),
);
}
- int getParameterValue(String code) {
- switch (code) {}
- return 0;
+ String getParameterValue(String code) {
+ switch (code) {
+ case DefaultGlobalSettings.parameterCodeSkin:
+ return GlobalSettings.getSkinValueFromUnsafe(state.settings.skin);
+ }
+ return '';
}
- void setParameterValue(String code, int value) {
- printlog('GlobalSettingsCubit.setParameterValue');
- printlog('code: $code / value: $value');
+ void setParameterValue(String code, String value) {
+ final String skin = (code == DefaultGlobalSettings.parameterCodeSkin)
+ ? value
+ : getParameterValue(DefaultGlobalSettings.parameterCodeSkin);
- setValues();
+ setValues(
+ skin: skin,
+ );
}
@override
GlobalSettingsState? fromJson(Map<String, dynamic> json) {
+ final String skin = json[DefaultGlobalSettings.parameterCodeSkin] as String;
+
return GlobalSettingsState(
- settings: GlobalSettings(),
+ settings: GlobalSettings(
+ skin: skin,
+ ),
);
}
@override
Map<String, dynamic>? toJson(GlobalSettingsState state) {
- return <String, dynamic>{};
+ return <String, dynamic>{
+ DefaultGlobalSettings.parameterCodeSkin: state.settings.skin,
+ };
}
}
diff --git a/lib/cubit/settings_global_state.dart b/lib/cubit/settings_global_state.dart
index 4e4fbdf707b4e805f2092d0ca6a68a2de1c957c6..ebcddd700f252257223ca8e16c85202b04f3ff24 100644
--- a/lib/cubit/settings_global_state.dart
+++ b/lib/cubit/settings_global_state.dart
@@ -12,8 +12,4 @@ class GlobalSettingsState extends Equatable {
List<dynamic> get props => <dynamic>[
settings,
];
-
- Map<String, dynamic> get values => <String, dynamic>{
- 'settings': settings,
- };
}
diff --git a/lib/data/fetch_data_helper.dart b/lib/data/fetch_data_helper.dart
index dc7964825955f90b546bf6ab813af29309f327fe..f93d5830f760e070755ff183ed22e6b4b0097640 100644
--- a/lib/data/fetch_data_helper.dart
+++ b/lib/data/fetch_data_helper.dart
@@ -2,8 +2,8 @@ import 'dart:math';
import 'package:petitbac/data/game_data.dart';
import 'package:petitbac/models/data/category.dart';
-import 'package:petitbac/models/data/game_item.dart';
import 'package:petitbac/models/data/letter.dart';
+import 'package:petitbac/models/game/game_item.dart';
import 'package:petitbac/utils/tools.dart';
class FetchDataHelper {
diff --git a/lib/main.dart b/lib/main.dart
index 4c088e7566c889ebbe109cee71def46769267f0b..0519f0f5a78d61a23760bd2f5002619ebe648c8d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hive/hive.dart';
import 'package:hydrated_bloc/hydrated_bloc.dart';
@@ -25,18 +26,17 @@ void main() async {
storageDirectory: tmpDir,
);
- runApp(
- EasyLocalization(
- path: 'assets/translations',
- supportedLocales: const <Locale>[
- Locale('en'),
- Locale('fr'),
- ],
- fallbackLocale: const Locale('en'),
- useFallbackTranslations: true,
- child: const MyApp(),
- ),
- );
+ SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp])
+ .then((value) => runApp(EasyLocalization(
+ path: 'assets/translations',
+ supportedLocales: const <Locale>[
+ Locale('en'),
+ Locale('fr'),
+ ],
+ fallbackLocale: const Locale('en'),
+ useFallbackTranslations: true,
+ child: const MyApp(),
+ )));
}
class MyApp extends StatelessWidget {
@@ -44,6 +44,11 @@ class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
+ final List<String> assets = getImagesAssets();
+ for (String asset in assets) {
+ precacheImage(AssetImage(asset), context);
+ }
+
return MultiBlocProvider(
providers: [
BlocProvider<NavCubit>(create: (context) => NavCubit()),
@@ -73,4 +78,23 @@ class MyApp extends StatelessWidget {
),
);
}
+
+ List<String> getImagesAssets() {
+ final List<String> assets = [];
+
+ const List<String> gameImages = [
+ 'button_back',
+ 'button_delete_saved_game',
+ 'button_resume_game',
+ 'button_start',
+ 'game_end',
+ 'placeholder',
+ ];
+
+ for (String image in gameImages) {
+ assets.add('assets/ui/$image.png');
+ }
+
+ return assets;
+ }
}
diff --git a/lib/models/game.dart b/lib/models/game.dart
deleted file mode 100644
index 9cdb1756b505d6ce5a8b64d05938a8205834d9e3..0000000000000000000000000000000000000000
--- a/lib/models/game.dart
+++ /dev/null
@@ -1,100 +0,0 @@
-import 'package:petitbac/data/fetch_data_helper.dart';
-import 'package:petitbac/models/data/category.dart';
-import 'package:petitbac/models/data/game_item.dart';
-import 'package:petitbac/models/data/letter.dart';
-import 'package:petitbac/models/settings_game.dart';
-import 'package:petitbac/models/settings_global.dart';
-import 'package:petitbac/utils/tools.dart';
-
-class Game {
- final List<GameItem> items;
- final GameSettings gameSettings;
- final GlobalSettings globalSettings;
- int countdown = 0;
- int position = 0;
- bool isRunning = false;
- bool isFinished = false;
-
- Game({
- required this.items,
- required this.gameSettings,
- required this.globalSettings,
- required this.countdown,
- required this.position,
- this.isRunning = false,
- this.isFinished = false,
- });
-
- factory Game.createNull() {
- return Game(
- items: [],
- gameSettings: GameSettings.createDefault(),
- globalSettings: GlobalSettings.createDefault(),
- countdown: 0,
- position: 0,
- );
- }
-
- factory Game.createNew({
- GameSettings? gameSettings,
- GlobalSettings? globalSettings,
- }) {
- GameSettings newGameSettings = gameSettings ?? GameSettings.createDefault();
- GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
-
- List<GameItem> items = FetchDataHelper().getRandomItems(newGameSettings.itemsCount);
-
- return Game(
- items: items,
- gameSettings: newGameSettings,
- globalSettings: newGlobalSettings,
- countdown: 0,
- position: 0,
- isRunning: true,
- isFinished: false,
- );
- }
-
- void stop() {
- isRunning = false;
- }
-
- GameItem get item => items[position];
- Category get category => item.category;
- Letter get letter => item.letter;
-
- void dump() {
- printlog('');
- printlog('## Current game dump:');
- printlog('');
- gameSettings.dump();
- globalSettings.dump();
- printlog('');
- printlog('items:');
- printlog(items.toString());
- printlog('');
- printlog('Game: ');
- printlog(' isRunning: $isRunning');
- printlog(' isFinished: $isFinished');
- printlog(' position: $position');
- printlog(' countdown: $countdown');
- printlog('');
- }
-
- @override
- String toString() {
- return '$Game(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{
- 'items': items,
- 'gameSettings': gameSettings,
- 'globalSettings': globalSettings,
- 'countdown': countdown,
- 'position': position,
- 'isRunning': isRunning,
- 'isFinished': isFinished,
- };
- }
-}
diff --git a/lib/models/game/game.dart b/lib/models/game/game.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d9c4f878654e4fba490a041aad955bdb4b0f8c84
--- /dev/null
+++ b/lib/models/game/game.dart
@@ -0,0 +1,125 @@
+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/game/game_item.dart';
+import 'package:petitbac/models/settings/settings_game.dart';
+import 'package:petitbac/models/settings/settings_global.dart';
+import 'package:petitbac/utils/tools.dart';
+
+class Game {
+ Game({
+ // Settings
+ required this.gameSettings,
+ required this.globalSettings,
+
+ // State
+ this.isRunning = false,
+ this.isStarted = false,
+ this.isFinished = false,
+ this.animationInProgress = false,
+
+ // Base data
+ required this.items,
+
+ // Game data
+ this.position = 0,
+ this.countdown = 0,
+ });
+
+ // Settings
+ final GameSettings gameSettings;
+ final GlobalSettings globalSettings;
+
+ // State
+ bool isRunning;
+ bool isStarted;
+ bool isFinished;
+ bool animationInProgress;
+
+ // Base data
+ final List<GameItem> items;
+
+ // Game data
+ int position;
+ int countdown;
+
+ factory Game.createEmpty() {
+ return Game(
+ gameSettings: GameSettings.createDefault(),
+ globalSettings: GlobalSettings.createDefault(),
+ items: [],
+ );
+ }
+
+ factory Game.createNew({
+ GameSettings? gameSettings,
+ GlobalSettings? globalSettings,
+ }) {
+ final GameSettings newGameSettings = gameSettings ?? GameSettings.createDefault();
+ final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
+
+ final List<GameItem> items =
+ FetchDataHelper().getRandomItems(newGameSettings.itemsCountValue);
+
+ return Game(
+ // Settings
+ gameSettings: newGameSettings,
+ globalSettings: newGlobalSettings,
+ // State
+ isRunning: true,
+ isStarted: true,
+ // Base data
+ items: items,
+ );
+ }
+
+ bool get canBeResumed => isStarted && !isFinished;
+
+ GameItem get item => items[position];
+ Category get category => item.category;
+ Letter get letter => item.letter;
+
+ void dump() {
+ printlog('');
+ printlog('## Current game dump:');
+ printlog('');
+ printlog('$Game:');
+ printlog(' Settings');
+ gameSettings.dump();
+ globalSettings.dump();
+ printlog(' State');
+ printlog(' isRunning: $isRunning');
+ printlog(' isStarted: $isStarted');
+ printlog(' isFinished: $isFinished');
+ printlog(' animationInProgress: $animationInProgress');
+ printlog(' Base data');
+ printlog(' items: $items');
+ printlog(' Game data');
+ printlog(' position: $position');
+ printlog(' countdown: $countdown');
+ printlog('');
+ }
+
+ @override
+ String toString() {
+ return '$Game(${toJson()})';
+ }
+
+ Map<String, dynamic>? toJson() {
+ return <String, dynamic>{
+ // Settings
+ 'gameSettings': gameSettings.toJson(),
+ 'globalSettings': globalSettings.toJson(),
+ // State
+ 'isRunning': isRunning,
+ 'isStarted': isStarted,
+ 'isFinished': isFinished,
+ 'animationInProgress': animationInProgress,
+ // Base data
+ 'items': items,
+ // Game data
+ 'position': position,
+ 'countdown': countdown,
+ };
+ }
+}
diff --git a/lib/models/data/game_item.dart b/lib/models/game/game_item.dart
similarity index 100%
rename from lib/models/data/game_item.dart
rename to lib/models/game/game_item.dart
diff --git a/lib/models/settings_game.dart b/lib/models/settings/settings_game.dart
similarity index 57%
rename from lib/models/settings_game.dart
rename to lib/models/settings/settings_game.dart
index 526254604c88d699e27895b779b157741cf68f31..fe3d610793d55252dba09016b91d57e3e792b80b 100644
--- a/lib/models/settings_game.dart
+++ b/lib/models/settings/settings_game.dart
@@ -2,15 +2,18 @@ import 'package:petitbac/config/default_game_settings.dart';
import 'package:petitbac/utils/tools.dart';
class GameSettings {
- final int itemsCount;
- final int timerValue;
+ final String itemsCount;
+ final String timerValue;
GameSettings({
required this.itemsCount,
required this.timerValue,
});
- static int getItemsCountValueFromUnsafe(int itemsCount) {
+ int get itemsCountValue => DefaultGameSettings.getItemsCountValueFromCode(itemsCount);
+ int get timerCountValue => DefaultGameSettings.getTimerValueFromCode(timerValue);
+
+ static String getItemsCountValueFromUnsafe(String itemsCount) {
if (DefaultGameSettings.allowedItemsCountValues.contains(itemsCount)) {
return itemsCount;
}
@@ -18,7 +21,7 @@ class GameSettings {
return DefaultGameSettings.defaultItemsCountValue;
}
- static int getTimerValueFromUnsafe(int timerValue) {
+ static String getTimerValueFromUnsafe(String timerValue) {
if (DefaultGameSettings.allowedTimerValues.contains(timerValue)) {
return timerValue;
}
@@ -34,9 +37,10 @@ class GameSettings {
}
void dump() {
- printlog('Game settings: ');
- printlog(' itemsCount: $itemsCount');
- printlog(' timerValue: $timerValue');
+ printlog('$GameSettings:');
+ printlog(' ${DefaultGameSettings.parameterCodeItemsCount}: $itemsCount');
+ printlog(' ${DefaultGameSettings.parameterCodeTimerValue}: $timerValue');
+ printlog('');
}
@override
@@ -46,8 +50,8 @@ class GameSettings {
Map<String, dynamic>? toJson() {
return <String, dynamic>{
- 'itemsCount': itemsCount,
- 'timerValue': timerValue,
+ DefaultGameSettings.parameterCodeItemsCount: itemsCount,
+ DefaultGameSettings.parameterCodeTimerValue: timerValue,
};
}
}
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6ac348a73b47d356560a1fa1235e36219b1fcdb5
--- /dev/null
+++ b/lib/models/settings/settings_global.dart
@@ -0,0 +1,41 @@
+import 'package:petitbac/config/default_global_settings.dart';
+import 'package:petitbac/utils/tools.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,
+ };
+ }
+}
diff --git a/lib/models/settings_global.dart b/lib/models/settings_global.dart
deleted file mode 100644
index 2448620a1be496b829a29f0f1f3a81f9bb554769..0000000000000000000000000000000000000000
--- a/lib/models/settings_global.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'package:petitbac/utils/tools.dart';
-
-class GlobalSettings {
- GlobalSettings();
-
- factory GlobalSettings.createDefault() {
- return GlobalSettings();
- }
-
- void dump() {
- printlog('Global settings: ');
- printlog(' (none)');
- }
-
- @override
- String toString() {
- return '$GlobalSettings(${toJson()})';
- }
-
- Map<String, dynamic>? toJson() {
- return <String, dynamic>{};
- }
-}
diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart
new file mode 100644
index 0000000000000000000000000000000000000000..045c4d8e1f0a8bbaf99e71b6594017ac0220e22e
--- /dev/null
+++ b/lib/ui/game/game_end.dart
@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import 'package:petitbac/cubit/game_cubit.dart';
+import 'package:petitbac/models/game/game.dart';
+import 'package:petitbac/ui/widgets/actions/button_game_quit.dart';
+
+class GameEndWidget extends StatelessWidget {
+ const GameEndWidget({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<GameCubit, GameState>(
+ builder: (BuildContext context, GameState gameState) {
+ final Game currentGame = gameState.currentGame;
+
+ const Image decorationImage = Image(
+ image: AssetImage('assets/ui/game_end.png'),
+ fit: BoxFit.fill,
+ );
+
+ return Container(
+ margin: const EdgeInsets.all(2),
+ padding: const EdgeInsets.all(2),
+ child: Table(
+ defaultColumnWidth: const IntrinsicColumnWidth(),
+ children: [
+ TableRow(
+ children: [
+ const Column(
+ children: [decorationImage],
+ ),
+ const Column(
+ children: [decorationImage],
+ ),
+ Column(
+ children: [
+ currentGame.animationInProgress == true
+ ? decorationImage
+ : const QuitGameButton()
+ ],
+ ),
+ const Column(
+ children: [decorationImage],
+ ),
+ const Column(
+ children: [decorationImage],
+ ),
+ ],
+ ),
+ ],
+ ),
+ );
+ },
+ );
+ }
+}
diff --git a/lib/ui/game/game_top.dart b/lib/ui/game/game_top.dart
new file mode 100644
index 0000000000000000000000000000000000000000..2f7e2c7824b6923fc9598479473702819e77cba8
--- /dev/null
+++ b/lib/ui/game/game_top.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import 'package:petitbac/cubit/game_cubit.dart';
+import 'package:petitbac/models/game/game.dart';
+import 'package:petitbac/ui/widgets/game/game_position_indicator.dart';
+
+class GameTopWidget extends StatelessWidget {
+ const GameTopWidget({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<GameCubit, GameState>(
+ builder: (BuildContext context, GameState gameState) {
+ final Game currentGame = gameState.currentGame;
+
+ return currentGame.gameSettings.itemsCountValue != 0
+ ? const GamePositionIndicator()
+ : const SizedBox.shrink();
+ },
+ );
+ }
+}
diff --git a/lib/ui/helpers/app_titles.dart b/lib/ui/helpers/app_titles.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b98107b12fabc3114ebfbec994166b588abcf1ad
--- /dev/null
+++ b/lib/ui/helpers/app_titles.dart
@@ -0,0 +1,32 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+class AppHeader extends StatelessWidget {
+ const AppHeader({super.key, required this.text});
+
+ final String text;
+
+ @override
+ Widget build(BuildContext context) {
+ return Text(
+ tr(text),
+ textAlign: TextAlign.start,
+ style: Theme.of(context).textTheme.headlineMedium!.apply(fontWeightDelta: 2),
+ );
+ }
+}
+
+class AppTitle extends StatelessWidget {
+ const AppTitle({super.key, required this.text});
+
+ final String text;
+
+ @override
+ Widget build(BuildContext context) {
+ return Text(
+ tr(text),
+ textAlign: TextAlign.start,
+ style: Theme.of(context).textTheme.titleLarge!.apply(fontWeightDelta: 2),
+ );
+ }
+}
diff --git a/lib/ui/widgets/helpers/outlined_text_widget.dart b/lib/ui/helpers/outlined_text_widget.dart
similarity index 100%
rename from lib/ui/widgets/helpers/outlined_text_widget.dart
rename to lib/ui/helpers/outlined_text_widget.dart
diff --git a/lib/ui/layouts/game_layout.dart b/lib/ui/layouts/game_layout.dart
new file mode 100644
index 0000000000000000000000000000000000000000..27aaafcc27877228988c6b68d493c2bb1713bfc2
--- /dev/null
+++ b/lib/ui/layouts/game_layout.dart
@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import 'package:petitbac/cubit/game_cubit.dart';
+import 'package:petitbac/models/game/game.dart';
+import 'package:petitbac/ui/game/game_end.dart';
+import 'package:petitbac/ui/game/game_top.dart';
+import 'package:petitbac/ui/widgets/game/game_board.dart';
+
+class GameLayout extends StatelessWidget {
+ const GameLayout({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<GameCubit, GameState>(
+ builder: (BuildContext context, GameState gameState) {
+ final Game currentGame = gameState.currentGame;
+
+ return Container(
+ alignment: AlignmentDirectional.topCenter,
+ padding: const EdgeInsets.all(4),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ const GameTopWidget(),
+ const SizedBox(height: 8),
+ const GameBoardWidget(),
+ const SizedBox(height: 8),
+ const Expanded(child: SizedBox.shrink()),
+ currentGame.isFinished ? const GameEndWidget() : const SizedBox.shrink(),
+ ],
+ ),
+ );
+ },
+ );
+ }
+}
diff --git a/lib/ui/widgets/parameters.dart b/lib/ui/layouts/parameters_layout.dart
similarity index 52%
rename from lib/ui/widgets/parameters.dart
rename to lib/ui/layouts/parameters_layout.dart
index c13ccba6ded4cd33dac45559bc412b583392eb35..0751974d2e1ad9d590e5b6894dcb3dfa90e1858e 100644
--- a/lib/ui/widgets/parameters.dart
+++ b/lib/ui/layouts/parameters_layout.dart
@@ -5,11 +5,16 @@ import 'package:petitbac/config/default_game_settings.dart';
import 'package:petitbac/config/default_global_settings.dart';
import 'package:petitbac/cubit/settings_game_cubit.dart';
import 'package:petitbac/cubit/settings_global_cubit.dart';
-import 'package:petitbac/ui/painters/parameter_painter.dart';
-import 'package:petitbac/ui/widgets/button_game_start_new.dart';
+import 'package:petitbac/ui/parameters/parameter_image.dart';
+import 'package:petitbac/ui/parameters/parameter_painter.dart';
+import 'package:petitbac/ui/widgets/actions/button_delete_saved_game.dart';
+import 'package:petitbac/ui/widgets/actions/button_game_start_new.dart';
+import 'package:petitbac/ui/widgets/actions/button_resume_saved_game.dart';
-class Parameters extends StatelessWidget {
- const Parameters({super.key});
+class ParametersLayout extends StatelessWidget {
+ const ParametersLayout({super.key, required this.canResume});
+
+ final bool canResume;
final double separatorHeight = 8.0;
@@ -31,7 +36,24 @@ class Parameters extends StatelessWidget {
}
lines.add(SizedBox(height: separatorHeight));
- lines.add(const Expanded(child: StartNewGameButton()));
+
+ if (canResume == false) {
+ // Start new game
+ lines.add(const Expanded(
+ child: StartNewGameButton(),
+ ));
+ } else {
+ // Resume game
+ lines.add(const Expanded(
+ child: ResumeSavedGameButton(),
+ ));
+ // Delete saved game
+ lines.add(SizedBox.square(
+ dimension: MediaQuery.of(context).size.width / 4,
+ child: const DeleteSavedGameButton(),
+ ));
+ }
+
lines.add(SizedBox(height: separatorHeight));
// Global settings
@@ -58,7 +80,7 @@ class Parameters extends StatelessWidget {
}) {
final List<Widget> parameterButtons = [];
- final List<int> availableValues = isGlobal
+ final List<String> availableValues = isGlobal
? DefaultGlobalSettings.getAvailableValues(code)
: DefaultGameSettings.getAvailableValues(code);
@@ -66,7 +88,7 @@ class Parameters extends StatelessWidget {
return [];
}
- for (int value in availableValues) {
+ for (String value in availableValues) {
final Widget parameterButton = BlocBuilder<GameSettingsCubit, GameSettingsState>(
builder: (BuildContext context, GameSettingsState gameSettingsState) {
return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
@@ -76,7 +98,7 @@ class Parameters extends StatelessWidget {
final GlobalSettingsCubit globalSettingsCubit =
BlocProvider.of<GlobalSettingsCubit>(context);
- final int currentValue = isGlobal
+ final String currentValue = isGlobal
? globalSettingsCubit.getParameterValue(code)
: gameSettingsCubit.getParameterValue(code);
@@ -85,22 +107,39 @@ class Parameters extends StatelessWidget {
final double displayWidth = MediaQuery.of(context).size.width;
final double itemWidth = displayWidth / availableValues.length - 26;
+ final bool displayedWithAssets =
+ DefaultGlobalSettings.displayedWithAssets.contains(code) ||
+ DefaultGameSettings.displayedWithAssets.contains(code);
+
return TextButton(
- child: CustomPaint(
- size: Size(itemWidth, itemWidth),
- willChange: false,
- painter: ParameterPainter(
- code: code,
- value: value,
- isSelected: isActive,
- gameSettings: gameSettingsState.settings,
- globalSettings: globalSettingsState.settings,
- ),
- isComplex: true,
+ child: Container(
+ child: displayedWithAssets
+ ? SizedBox.square(
+ dimension: itemWidth,
+ child: ParameterImage(
+ code: code,
+ value: value,
+ isSelected: isActive,
+ ),
+ )
+ : CustomPaint(
+ size: Size(itemWidth, itemWidth),
+ willChange: false,
+ painter: ParameterPainter(
+ code: code,
+ value: value,
+ isSelected: isActive,
+ gameSettings: gameSettingsState.settings,
+ globalSettings: globalSettingsState.settings,
+ ),
+ isComplex: true,
+ ),
),
- onPressed: () => isGlobal
- ? globalSettingsCubit.setParameterValue(code, value)
- : gameSettingsCubit.setParameterValue(code, value),
+ onPressed: () {
+ isGlobal
+ ? globalSettingsCubit.setParameterValue(code, value)
+ : gameSettingsCubit.setParameterValue(code, value);
+ },
);
},
);
diff --git a/lib/ui/parameters/parameter_image.dart b/lib/ui/parameters/parameter_image.dart
new file mode 100644
index 0000000000000000000000000000000000000000..fc4b576f85b01158b74548400d11a4d027c57fbe
--- /dev/null
+++ b/lib/ui/parameters/parameter_image.dart
@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+
+class ParameterImage extends StatelessWidget {
+ const ParameterImage({
+ super.key,
+ required this.code,
+ required this.value,
+ required this.isSelected,
+ });
+
+ final String code;
+ final String value;
+ final bool isSelected;
+
+ static const Color buttonBackgroundColor = Colors.white;
+ static const Color buttonBorderColorActive = Colors.blue;
+ static const Color buttonBorderColorInactive = Colors.white;
+ static const double buttonBorderWidth = 8.0;
+ static const double buttonBorderRadius = 8.0;
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ decoration: BoxDecoration(
+ color: buttonBackgroundColor,
+ borderRadius: BorderRadius.circular(buttonBorderRadius),
+ border: Border.all(
+ color: isSelected ? buttonBorderColorActive : buttonBorderColorInactive,
+ width: buttonBorderWidth,
+ ),
+ ),
+ child: Image(
+ image: AssetImage('assets/ui/${code}_$value.png'),
+ fit: BoxFit.fill,
+ ),
+ );
+ }
+}
diff --git a/lib/ui/painters/parameter_painter.dart b/lib/ui/parameters/parameter_painter.dart
similarity index 87%
rename from lib/ui/painters/parameter_painter.dart
rename to lib/ui/parameters/parameter_painter.dart
index 2509c75aa44f0d7557ea02a1ac08394b76fb7d8c..49e5190d745363e4203123ab0e7ec6430f7e42b7 100644
--- a/lib/ui/painters/parameter_painter.dart
+++ b/lib/ui/parameters/parameter_painter.dart
@@ -3,8 +3,8 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:petitbac/config/default_game_settings.dart';
-import 'package:petitbac/models/settings_game.dart';
-import 'package:petitbac/models/settings_global.dart';
+import 'package:petitbac/models/settings/settings_game.dart';
+import 'package:petitbac/models/settings/settings_global.dart';
import 'package:petitbac/utils/tools.dart';
class ParameterPainter extends CustomPainter {
@@ -17,7 +17,7 @@ class ParameterPainter extends CustomPainter {
});
final String code;
- final int value;
+ final String value;
final bool isSelected;
final GameSettings gameSettings;
final GlobalSettings globalSettings;
@@ -60,7 +60,7 @@ class ParameterPainter extends CustomPainter {
// "unknown" parameter -> simple block with text
void paintUnknownParameterItem(
- final int value,
+ final String value,
final Canvas canvas,
final double size,
) {
@@ -96,14 +96,14 @@ class ParameterPainter extends CustomPainter {
}
void paintItemsCountParameterItem(
- final int value,
+ final String value,
final Canvas canvas,
final double size,
) {
- const itemCountEmoji = '💬\n';
+ const itemCountEmoji = '💬';
Color backgroundColor = Colors.grey;
- String text = '';
+ String text = '$itemCountEmoji\n${DefaultGameSettings.getItemsCountValueFromCode(value)}';
switch (value) {
case DefaultGameSettings.itemsCountValueNoLimit:
@@ -112,15 +112,12 @@ class ParameterPainter extends CustomPainter {
break;
case DefaultGameSettings.itemsCountValueShort:
backgroundColor = Colors.green;
- text = itemCountEmoji + DefaultGameSettings.itemsCountValueShort.toString();
break;
case DefaultGameSettings.itemsCountValueMedium:
backgroundColor = Colors.orange;
- text = itemCountEmoji + DefaultGameSettings.itemsCountValueMedium.toString();
break;
case DefaultGameSettings.itemsCountValueLong:
backgroundColor = Colors.red;
- text = itemCountEmoji + DefaultGameSettings.itemsCountValueLong.toString();
break;
default:
printlog('Wrong value for itemsCount parameter value: $value');
@@ -160,14 +157,14 @@ class ParameterPainter extends CustomPainter {
}
void paintTimerParameterItem(
- final int value,
+ final String value,
final Canvas canvas,
final double size,
) {
- const timerEmoji = '⏲️\n';
+ const timerEmoji = '⏲️';
Color backgroundColor = Colors.grey;
- String text = '';
+ String text = '$timerEmoji\n${DefaultGameSettings.getTimerValueFromCode(value)}"';
switch (value) {
case DefaultGameSettings.timerValueNoTimer:
@@ -176,15 +173,12 @@ class ParameterPainter extends CustomPainter {
break;
case DefaultGameSettings.timerValueLow:
backgroundColor = Colors.green;
- text = '$timerEmoji${DefaultGameSettings.timerValueLow}"';
break;
case DefaultGameSettings.timerValueMedium:
backgroundColor = Colors.orange;
- text = '$timerEmoji${DefaultGameSettings.timerValueMedium}"';
break;
case DefaultGameSettings.timerValueHigh:
backgroundColor = Colors.red;
- text = '$timerEmoji${DefaultGameSettings.timerValueHigh}"';
break;
default:
printlog('Wrong value for itemsCount parameter value: $value');
@@ -192,7 +186,7 @@ class ParameterPainter extends CustomPainter {
final paint = Paint();
paint.strokeJoin = StrokeJoin.round;
- paint.strokeWidth = 3 / 100 * size;
+ paint.strokeWidth = 3;
// Colored background
paint.color = backgroundColor;
diff --git a/lib/ui/screens/page_about.dart b/lib/ui/screens/page_about.dart
index 1720556b5c6125b00a97fef989e3d2d98fb26d63..8f2a3d68e82063c1a895a2b8d46110f81f75d006 100644
--- a/lib/ui/screens/page_about.dart
+++ b/lib/ui/screens/page_about.dart
@@ -2,36 +2,40 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart';
-import 'package:petitbac/ui/widgets/helpers/app_header.dart';
+import 'package:petitbac/ui/helpers/app_titles.dart';
class PageAbout extends StatelessWidget {
const PageAbout({super.key});
@override
Widget build(BuildContext context) {
- return Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisSize: MainAxisSize.max,
- children: <Widget>[
- const AppHeader(text: 'about_title'),
- const Text('about_content').tr(),
- FutureBuilder<PackageInfo>(
- future: PackageInfo.fromPlatform(),
- builder: (context, snapshot) {
- switch (snapshot.connectionState) {
- case ConnectionState.done:
- return const Text('about_version').tr(
- namedArgs: {
- 'version': snapshot.data!.version,
- },
- );
- default:
- return const SizedBox();
- }
- },
- ),
- ],
+ return Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 8),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisSize: MainAxisSize.max,
+ children: <Widget>[
+ const SizedBox(height: 8),
+ const AppTitle(text: 'about_title'),
+ const Text('about_content').tr(),
+ FutureBuilder<PackageInfo>(
+ future: PackageInfo.fromPlatform(),
+ builder: (context, snapshot) {
+ switch (snapshot.connectionState) {
+ case ConnectionState.done:
+ return const Text('about_version').tr(
+ namedArgs: {
+ 'version': snapshot.data!.version,
+ },
+ );
+ default:
+ return const SizedBox();
+ }
+ },
+ ),
+ ],
+ ),
);
}
}
diff --git a/lib/ui/screens/page_game.dart b/lib/ui/screens/page_game.dart
index 933478a77bf2eb739ebed011d2e855cdd0d3d4f5..fd6bfec721c1319ba162257b8009a1785e7d4030 100644
--- a/lib/ui/screens/page_game.dart
+++ b/lib/ui/screens/page_game.dart
@@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:petitbac/cubit/game_cubit.dart';
-import 'package:petitbac/ui/widgets/game/game.dart';
-import 'package:petitbac/ui/widgets/parameters.dart';
+import 'package:petitbac/models/game/game.dart';
+import 'package:petitbac/ui/layouts/game_layout.dart';
+import 'package:petitbac/ui/layouts/parameters_layout.dart';
class PageGame extends StatelessWidget {
const PageGame({super.key});
@@ -11,8 +12,13 @@ class PageGame extends StatelessWidget {
@override
Widget build(BuildContext context) {
return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- return gameState.currentGame.isRunning ? const GameWidget() : const Parameters();
- });
+ builder: (BuildContext context, GameState gameState) {
+ final Game currentGame = gameState.currentGame;
+
+ return currentGame.isRunning
+ ? const GameLayout()
+ : ParametersLayout(canResume: currentGame.canBeResumed);
+ },
+ );
}
}
diff --git a/lib/ui/screens/page_settings.dart b/lib/ui/screens/page_settings.dart
index d8690b98187e8df9d7286a92dda66a194b2600c6..433f4dce11b912f571dfef53274e8f56fd8ede5d 100644
--- a/lib/ui/screens/page_settings.dart
+++ b/lib/ui/screens/page_settings.dart
@@ -1,22 +1,26 @@
import 'package:flutter/material.dart';
-import 'package:petitbac/ui/widgets/helpers/app_header.dart';
-import 'package:petitbac/ui/widgets/settings/settings_form.dart';
+import 'package:petitbac/ui/helpers/app_titles.dart';
+import 'package:petitbac/ui/settings/settings_form.dart';
class PageSettings extends StatelessWidget {
const PageSettings({super.key});
@override
Widget build(BuildContext context) {
- return const Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisSize: MainAxisSize.max,
- children: <Widget>[
- AppHeader(text: 'settings_title'),
- SizedBox(height: 8),
- SettingsForm(),
- ],
+ return const Padding(
+ padding: EdgeInsets.symmetric(horizontal: 8),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisSize: MainAxisSize.max,
+ children: <Widget>[
+ SizedBox(height: 8),
+ AppTitle(text: 'settings_title'),
+ SizedBox(height: 8),
+ SettingsForm(),
+ ],
+ ),
);
}
}
diff --git a/lib/ui/widgets/settings/settings_form.dart b/lib/ui/settings/settings_form.dart
similarity index 96%
rename from lib/ui/widgets/settings/settings_form.dart
rename to lib/ui/settings/settings_form.dart
index eef343a0381e08ef03bc704a5012c583f6fe0aa2..f51c716e185ecf9ce8c72ba189b9ff7da3ab177a 100644
--- a/lib/ui/widgets/settings/settings_form.dart
+++ b/lib/ui/settings/settings_form.dart
@@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:unicons/unicons.dart';
-import 'package:petitbac/ui/widgets/settings/theme_card.dart';
+import 'package:petitbac/ui/settings/theme_card.dart';
class SettingsForm extends StatefulWidget {
const SettingsForm({super.key});
diff --git a/lib/ui/widgets/settings/theme_card.dart b/lib/ui/settings/theme_card.dart
similarity index 100%
rename from lib/ui/widgets/settings/theme_card.dart
rename to lib/ui/settings/theme_card.dart
diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart
index 789d18b9fa29c47b66fa8dde8c51078b94a591a3..bd4614bb3f8706247a3ec0be862a1cea9d2b3504 100644
--- a/lib/ui/skeleton.dart
+++ b/lib/ui/skeleton.dart
@@ -14,7 +14,7 @@ class SkeletonScreen extends StatelessWidget {
appBar: const GlobalAppBar(),
extendBodyBehindAppBar: false,
body: Material(
- color: Theme.of(context).colorScheme.background,
+ color: Theme.of(context).colorScheme.surface,
child: BlocBuilder<NavCubit, int>(
builder: (BuildContext context, int pageIndex) {
return Padding(
@@ -28,7 +28,7 @@ class SkeletonScreen extends StatelessWidget {
},
),
),
- backgroundColor: Theme.of(context).colorScheme.background,
+ backgroundColor: Theme.of(context).colorScheme.surface,
);
}
}
diff --git a/lib/ui/widgets/actions/button_delete_saved_game.dart b/lib/ui/widgets/actions/button_delete_saved_game.dart
new file mode 100644
index 0000000000000000000000000000000000000000..611b2378a3190b664fd8f122ba7f1fe5c7e43321
--- /dev/null
+++ b/lib/ui/widgets/actions/button_delete_saved_game.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import 'package:petitbac/cubit/game_cubit.dart';
+
+class DeleteSavedGameButton extends StatelessWidget {
+ const DeleteSavedGameButton({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return TextButton(
+ child: const Image(
+ image: AssetImage('assets/ui/button_delete_saved_game.png'),
+ fit: BoxFit.fill,
+ ),
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).deleteSavedGame();
+ },
+ );
+ }
+}
diff --git a/lib/ui/widgets/actions/button_game_quit.dart b/lib/ui/widgets/actions/button_game_quit.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b4691adbc1294bee3745482de23deece8af78098
--- /dev/null
+++ b/lib/ui/widgets/actions/button_game_quit.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import 'package:petitbac/cubit/game_cubit.dart';
+
+class QuitGameButton extends StatelessWidget {
+ const QuitGameButton({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return TextButton(
+ child: const Image(
+ image: AssetImage('assets/ui/button_back.png'),
+ fit: BoxFit.fill,
+ ),
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).quitGame();
+ },
+ );
+ }
+}
diff --git a/lib/ui/widgets/button_game_start_new.dart b/lib/ui/widgets/actions/button_game_start_new.dart
similarity index 72%
rename from lib/ui/widgets/button_game_start_new.dart
rename to lib/ui/widgets/actions/button_game_start_new.dart
index 2b0ca95a3d3087cd2d00073bad066810ab2806da..067a2d391f685641027a454716b9f3141d8de826 100644
--- a/lib/ui/widgets/button_game_start_new.dart
+++ b/lib/ui/widgets/actions/button_game_start_new.dart
@@ -14,17 +14,17 @@ class StartNewGameButton extends StatelessWidget {
builder: (BuildContext context, GameSettingsState gameSettingsState) {
return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
-
return TextButton(
child: const Image(
- image: AssetImage('assets/icons/button_start.png'),
+ image: AssetImage('assets/ui/button_start.png'),
fit: BoxFit.fill,
),
- onPressed: () => gameCubit.startNewGame(
- gameSettings: gameSettingsState.settings,
- globalSettings: globalSettingsState.settings,
- ),
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).startNewGame(
+ gameSettings: gameSettingsState.settings,
+ globalSettings: globalSettingsState.settings,
+ );
+ },
);
},
);
diff --git a/lib/ui/widgets/actions/button_resume_saved_game.dart b/lib/ui/widgets/actions/button_resume_saved_game.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6119772eef76d79d5b855b1c255e9e35ba832a51
--- /dev/null
+++ b/lib/ui/widgets/actions/button_resume_saved_game.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import 'package:petitbac/cubit/game_cubit.dart';
+
+class ResumeSavedGameButton extends StatelessWidget {
+ const ResumeSavedGameButton({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return TextButton(
+ child: const Image(
+ image: AssetImage('assets/ui/button_resume_game.png'),
+ fit: BoxFit.fill,
+ ),
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).resumeSavedGame();
+ },
+ );
+ }
+}
diff --git a/lib/ui/widgets/game/game.dart b/lib/ui/widgets/game/game.dart
deleted file mode 100644
index b7384eb42fd6190bf62c9202762bc0ac4bd07440..0000000000000000000000000000000000000000
--- a/lib/ui/widgets/game/game.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import 'package:petitbac/cubit/game_cubit.dart';
-import 'package:petitbac/models/game.dart';
-import 'package:petitbac/ui/widgets/game/game_countdown.dart';
-import 'package:petitbac/ui/widgets/game/game_position_indicator.dart';
-import 'package:petitbac/ui/widgets/game/widget_category.dart';
-import 'package:petitbac/ui/widgets/game/widget_letter.dart';
-
-class GameWidget extends StatelessWidget {
- const GameWidget({super.key});
-
- @override
- Widget build(BuildContext context) {
- return BlocBuilder<GameCubit, GameState>(
- builder: (BuildContext context, GameState gameState) {
- final Game currentGame = gameState.currentGame;
-
- return Center(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- currentGame.gameSettings.itemsCount != 0
- ? const GamePositionIndicator()
- : const SizedBox.shrink(),
- const WidgetLetter(),
- const GameButtonNextWithCountdown(),
- const WidgetCategory(),
- ],
- ),
- );
- },
- );
- }
-}
diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a3bc232c83c3840eaa41de79f3a52854d185f6cd
--- /dev/null
+++ b/lib/ui/widgets/game/game_board.dart
@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+
+import 'package:petitbac/ui/widgets/game/game_countdown.dart';
+import 'package:petitbac/ui/widgets/game/widget_category.dart';
+import 'package:petitbac/ui/widgets/game/widget_letter.dart';
+
+class GameBoardWidget extends StatelessWidget {
+ const GameBoardWidget({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return const Column(
+ mainAxisAlignment: MainAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ WidgetLetter(),
+ GameButtonNextWithCountdown(),
+ WidgetCategory(),
+ ],
+ );
+ }
+}
diff --git a/lib/ui/widgets/game/game_countdown.dart b/lib/ui/widgets/game/game_countdown.dart
index fdbd0f4b1c8dc479a669ef6eb3dbe65eda2bb26d..8e4510ab496e68d8a8abc974c8e8e087da27ad34 100644
--- a/lib/ui/widgets/game/game_countdown.dart
+++ b/lib/ui/widgets/game/game_countdown.dart
@@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:petitbac/cubit/game_cubit.dart';
import 'package:petitbac/cubit/settings_game_cubit.dart';
-import 'package:petitbac/models/game.dart';
+import 'package:petitbac/models/game/game.dart';
import 'package:petitbac/utils/color_extensions.dart';
class GameButtonNextWithCountdown extends StatelessWidget {
@@ -48,7 +48,7 @@ class GameButtonNextWithCountdown extends StatelessWidget {
if (currentGame.isFinished) {
gameCubit.quitGame();
} else {
- if (currentGame.gameSettings.itemsCount == 0) {
+ if (currentGame.gameSettings.itemsCountValue == 0) {
gameCubit.pickNewItem();
gameCubit.startTimer();
} else {
diff --git a/lib/ui/widgets/game/game_position_indicator.dart b/lib/ui/widgets/game/game_position_indicator.dart
index 2d850baf39c62be5b571ec7fdbe2da8d364be94a..5298b454403a674a0a80a190d116d724438c865f 100644
--- a/lib/ui/widgets/game/game_position_indicator.dart
+++ b/lib/ui/widgets/game/game_position_indicator.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:petitbac/cubit/game_cubit.dart';
-import 'package:petitbac/models/game.dart';
-import 'package:petitbac/ui/widgets/helpers/outlined_text_widget.dart';
+import 'package:petitbac/models/game/game.dart';
+import 'package:petitbac/ui/helpers/outlined_text_widget.dart';
import 'package:petitbac/utils/color_extensions.dart';
class GamePositionIndicator extends StatelessWidget {
@@ -16,7 +16,7 @@ class GamePositionIndicator extends StatelessWidget {
final Game currentGame = gameState.currentGame;
final int currentPosition = currentGame.position + 1;
- final int maxPosition = currentGame.gameSettings.itemsCount;
+ final int maxPosition = currentGame.gameSettings.itemsCountValue;
// Normalized [0..1] value
final double barValue = currentPosition / maxPosition;
diff --git a/lib/ui/widgets/game/widget_category.dart b/lib/ui/widgets/game/widget_category.dart
index 61d41ea077409f849eecdcb3b40f755290e05fb6..c86fd3d4cbec0710d989de46ce44f7df43d4f269 100644
--- a/lib/ui/widgets/game/widget_category.dart
+++ b/lib/ui/widgets/game/widget_category.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:petitbac/cubit/game_cubit.dart';
-import 'package:petitbac/models/game.dart';
+import 'package:petitbac/models/game/game.dart';
import 'package:petitbac/utils/color_extensions.dart';
class WidgetCategory extends StatelessWidget {
@@ -35,8 +35,7 @@ class WidgetCategory extends StatelessWidget {
height: 180,
child: TextButton(
onPressed: () {
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
- gameCubit.pickNewCategory();
+ BlocProvider.of<GameCubit>(context).pickNewCategory();
},
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
diff --git a/lib/ui/widgets/game/widget_letter.dart b/lib/ui/widgets/game/widget_letter.dart
index dbdea5ffad944f7004f564aff0d50388a66623fd..df1db43eb8a20e920e067dedb06c55ed1276484e 100644
--- a/lib/ui/widgets/game/widget_letter.dart
+++ b/lib/ui/widgets/game/widget_letter.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:petitbac/cubit/game_cubit.dart';
-import 'package:petitbac/models/game.dart';
-import 'package:petitbac/ui/widgets/helpers/outlined_text_widget.dart';
+import 'package:petitbac/models/game/game.dart';
+import 'package:petitbac/ui/helpers/outlined_text_widget.dart';
import 'package:petitbac/utils/color_extensions.dart';
class WidgetLetter extends StatelessWidget {
@@ -36,8 +36,7 @@ class WidgetLetter extends StatelessWidget {
height: 100,
child: TextButton(
onPressed: () {
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
- gameCubit.pickNewLetter();
+ BlocProvider.of<GameCubit>(context).pickNewLetter();
},
child: OutlinedText(
text: currentGame.letter.text,
diff --git a/lib/ui/widgets/global_app_bar.dart b/lib/ui/widgets/global_app_bar.dart
index 512717ac62b4b6e828fbafb35625a64a1ba047ba..e64acbd7de7ed0bf708b340f20ea14cf8047ee38 100644
--- a/lib/ui/widgets/global_app_bar.dart
+++ b/lib/ui/widgets/global_app_bar.dart
@@ -4,8 +4,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:petitbac/config/menu.dart';
import 'package:petitbac/cubit/game_cubit.dart';
import 'package:petitbac/cubit/nav_cubit.dart';
-import 'package:petitbac/models/game.dart';
-import 'package:petitbac/ui/widgets/helpers/app_title.dart';
+import 'package:petitbac/models/game/game.dart';
+import 'package:petitbac/ui/helpers/app_titles.dart';
class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
const GlobalAppBar({super.key});
@@ -20,16 +20,15 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
final List<Widget> menuActions = [];
- if (currentGame.isRunning) {
+ if (currentGame.isRunning && !currentGame.isFinished) {
menuActions.add(TextButton(
child: const Image(
- image: AssetImage('assets/icons/button_back.png'),
+ image: AssetImage('assets/ui/button_back.png'),
fit: BoxFit.fill,
),
onPressed: () {},
onLongPress: () {
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
- gameCubit.quitGame();
+ BlocProvider.of<GameCubit>(context).quitGame();
},
));
} else {
@@ -70,7 +69,7 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
}
return AppBar(
- title: const AppTitle(text: 'app_name'),
+ title: const AppHeader(text: 'app_name'),
actions: menuActions,
);
},
diff --git a/lib/ui/widgets/helpers/app_header.dart b/lib/ui/widgets/helpers/app_header.dart
deleted file mode 100644
index b5c5be05f6636cf488dcdb5bbc4d6f049b98de11..0000000000000000000000000000000000000000
--- a/lib/ui/widgets/helpers/app_header.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-
-class AppHeader extends StatelessWidget {
- const AppHeader({super.key, required this.text});
-
- final String text;
-
- @override
- Widget build(BuildContext context) {
- return Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- tr(text),
- textAlign: TextAlign.start,
- style: Theme.of(context).textTheme.headlineSmall!.apply(fontWeightDelta: 2),
- ),
- const SizedBox(height: 8),
- ],
- );
- }
-}
diff --git a/lib/ui/widgets/helpers/app_title.dart b/lib/ui/widgets/helpers/app_title.dart
deleted file mode 100644
index 7cbbb2030419047b3dcf093a2195a498bd8e8ce9..0000000000000000000000000000000000000000
--- a/lib/ui/widgets/helpers/app_title.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-
-class AppTitle extends StatelessWidget {
- const AppTitle({super.key, required this.text});
-
- final String text;
-
- @override
- Widget build(BuildContext context) {
- return Text(
- tr(text),
- textAlign: TextAlign.start,
- style: Theme.of(context).textTheme.headlineLarge!.apply(fontWeightDelta: 2),
- );
- }
-}
diff --git a/pubspec.lock b/pubspec.lock
index bdba0ef12aaa5e28404023f4cff3d604ec53b942..e0ab96ebb656b1260018d45af586d9ec14ba4a7e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -106,10 +106,10 @@ packages:
dependency: "direct main"
description:
name: flutter_bloc
- sha256: f0ecf6e6eb955193ca60af2d5ca39565a86b8a142452c5b24d96fb477428f4d2
+ sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
url: "https://pub.dev"
source: hosted
- version: "8.1.5"
+ version: "8.1.6"
flutter_lints:
dependency: "direct dev"
description:
@@ -164,10 +164,10 @@ packages:
dependency: transitive
description:
name: intl
- sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+ sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
url: "https://pub.dev"
source: hosted
- version: "0.18.1"
+ version: "0.19.0"
lints:
dependency: transitive
description:
@@ -188,10 +188,10 @@ packages:
dependency: transitive
description:
name: meta
- sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+ sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
- version: "1.11.0"
+ version: "1.12.0"
nested:
dependency: transitive
description:
@@ -236,10 +236,10 @@ packages:
dependency: transitive
description:
name: path_provider_android
- sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
+ sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
url: "https://pub.dev"
source: hosted
- version: "2.2.4"
+ version: "2.2.5"
path_provider_foundation:
dependency: transitive
description:
@@ -276,10 +276,10 @@ packages:
dependency: transitive
description:
name: platform
- sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+ sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
url: "https://pub.dev"
source: hosted
- version: "3.1.4"
+ version: "3.1.5"
plugin_platform_interface:
dependency: transitive
description:
@@ -308,10 +308,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_android
- sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
+ sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
url: "https://pub.dev"
source: hosted
- version: "2.2.2"
+ version: "2.2.3"
shared_preferences_foundation:
dependency: transitive
description:
@@ -425,10 +425,10 @@ packages:
dependency: transitive
description:
name: win32
- sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+ sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
url: "https://pub.dev"
source: hosted
- version: "5.5.0"
+ version: "5.5.1"
xdg_directories:
dependency: transitive
description:
@@ -438,5 +438,5 @@ packages:
source: hosted
version: "1.0.4"
sdks:
- dart: ">=3.3.0 <4.0.0"
- flutter: ">=3.19.0"
+ dart: ">=3.4.0 <4.0.0"
+ flutter: ">=3.22.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 7a18da72002911db110db2edfaa75dedbb8afccc..00f81f9622301dd6cb1291ceb126d0256b194849 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A PetitBac game application.
publish_to: "none"
-version: 1.2.33+39
+version: 1.3.0+40
environment:
sdk: "^3.0.0"
@@ -12,6 +12,7 @@ dependencies:
flutter:
sdk: flutter
+ # base
easy_localization: ^3.0.1
equatable: ^2.0.5
flutter_bloc: ^8.1.1
@@ -21,13 +22,16 @@ dependencies:
path_provider: ^2.0.11
unicons: ^2.1.1
+ # specific
+ # (none)
+
dev_dependencies:
flutter_lints: ^4.0.0
flutter:
uses-material-design: true
assets:
- - assets/icons/
+ - assets/ui/
- assets/translations/
fonts:
@@ -41,3 +45,4 @@ flutter:
weight: 400
- asset: assets/fonts/Nunito-Light.ttf
weight: 300
+
diff --git a/icons/build_application_icons.sh b/resources/app/build_application_resources.sh
similarity index 98%
rename from icons/build_application_icons.sh
rename to resources/app/build_application_resources.sh
index 27dbe2647fe4e6d562fbd99451716d1b7d448570..6d67b8f4f9eca701d1aed7331ef41dfb0bd44f20 100755
--- a/icons/build_application_icons.sh
+++ b/resources/app/build_application_resources.sh
@@ -6,7 +6,7 @@ command -v scour >/dev/null 2>&1 || { echo >&2 "I require scour but it's not ins
command -v optipng >/dev/null 2>&1 || { echo >&2 "I require optipng but it's not installed. Aborting."; exit 1; }
CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-BASE_DIR="$(dirname "${CURRENT_DIR}")"
+BASE_DIR="$(dirname "$(dirname "${CURRENT_DIR}")")"
SOURCE_ICON="${CURRENT_DIR}/icon.svg"
SOURCE_FASTLANE="${CURRENT_DIR}/featureGraphic.svg"
diff --git a/icons/featureGraphic.svg b/resources/app/featureGraphic.svg
similarity index 100%
rename from icons/featureGraphic.svg
rename to resources/app/featureGraphic.svg
diff --git a/icons/icon.svg b/resources/app/icon.svg
similarity index 100%
rename from icons/icon.svg
rename to resources/app/icon.svg
diff --git a/resources/build_resources.sh b/resources/build_resources.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6b80eb996c217f3761e1f6e24c6120315275a46a
--- /dev/null
+++ b/resources/build_resources.sh
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+
+${CURRENT_DIR}/app/build_application_resources.sh
+${CURRENT_DIR}/ui/build_ui_resources.sh
+
+${CURRENT_DIR}/data/build_categories_list.sh
diff --git a/scripts/build_categories_list.sh b/resources/data/build_categories_list.sh
similarity index 98%
rename from scripts/build_categories_list.sh
rename to resources/data/build_categories_list.sh
index 8453c9eb8558486fcefbb08752e4b418d2bd9dc3..ff4459af44508e9ba860ded657f1bedcc171634f 100755
--- a/scripts/build_categories_list.sh
+++ b/resources/data/build_categories_list.sh
@@ -3,7 +3,7 @@
command -v jq >/dev/null 2>&1 || { echo >&2 "I require jq (json parser) but it's not installed. Aborting."; exit 1; }
CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-BASE_DIR="$(dirname "${CURRENT_DIR}")"
+BASE_DIR="$(dirname "$(dirname "${CURRENT_DIR}")")"
# CSV source file for categories
SOURCE_CATEGORIES_CSV_FILE="${CURRENT_DIR}/categories.csv"
diff --git a/scripts/categories.csv b/resources/data/categories.csv
similarity index 100%
rename from scripts/categories.csv
rename to resources/data/categories.csv
diff --git a/resources/ui/build_ui_resources.sh b/resources/ui/build_ui_resources.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4f365ede7d83140ce6309a3083580f2662b30990
--- /dev/null
+++ b/resources/ui/build_ui_resources.sh
@@ -0,0 +1,110 @@
+#! /bin/bash
+
+# Check dependencies
+command -v inkscape >/dev/null 2>&1 || { echo >&2 "I require inkscape but it's not installed. Aborting."; exit 1; }
+command -v scour >/dev/null 2>&1 || { echo >&2 "I require scour but it's not installed. Aborting."; exit 1; }
+command -v optipng >/dev/null 2>&1 || { echo >&2 "I require optipng but it's not installed. Aborting."; exit 1; }
+
+CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+BASE_DIR="$(dirname "$(dirname "${CURRENT_DIR}")")"
+ASSETS_DIR="${BASE_DIR}/assets"
+
+OPTIPNG_OPTIONS="-preserve -quiet -o7"
+ICON_SIZE=192
+
+#######################################################
+
+# Game images (svg files found in `images` folder)
+AVAILABLE_GAME_IMAGES=""
+if [ -d "${CURRENT_DIR}/images" ]; then
+ AVAILABLE_GAME_IMAGES="$(find "${CURRENT_DIR}/images" -type f -name "*.svg" | awk -F/ '{print $NF}' | cut -d"." -f1 | sort)"
+fi
+
+# Skins (subfolders found in `skins` folder)
+AVAILABLE_SKINS=""
+if [ -d "${CURRENT_DIR}/skins" ]; then
+ AVAILABLE_SKINS="$(find "${CURRENT_DIR}/skins" -mindepth 1 -type d | awk -F/ '{print $NF}')"
+fi
+
+# Images per skin (svg files found recursively in `skins` folder and subfolders)
+SKIN_IMAGES=""
+if [ -d "${CURRENT_DIR}/skins" ]; then
+ SKIN_IMAGES="$(find "${CURRENT_DIR}/skins" -type f -name "*.svg" | awk -F/ '{print $NF}' | cut -d"." -f1 | sort | uniq)"
+fi
+
+#######################################################
+
+# optimize svg
+function optimize_svg() {
+ SOURCE="$1"
+
+ cp ${SOURCE} ${SOURCE}.tmp
+ scour \
+ --remove-descriptive-elements \
+ --enable-id-stripping \
+ --enable-viewboxing \
+ --enable-comment-stripping \
+ --nindent=4 \
+ --quiet \
+ -i ${SOURCE}.tmp \
+ -o ${SOURCE}
+ rm ${SOURCE}.tmp
+}
+
+# build icons
+function build_image() {
+ SOURCE="$1"
+ TARGET="$2"
+
+ echo "Building ${TARGET}"
+
+ if [ ! -f "${SOURCE}" ]; then
+ echo "Missing file: ${SOURCE}"
+ exit 1
+ fi
+
+ optimize_svg "${SOURCE}"
+
+ mkdir -p "$(dirname "${TARGET}")"
+
+ inkscape \
+ --export-width=${ICON_SIZE} \
+ --export-height=${ICON_SIZE} \
+ --export-filename=${TARGET} \
+ "${SOURCE}"
+
+ optipng ${OPTIPNG_OPTIONS} "${TARGET}"
+}
+
+function build_image_for_skin() {
+ SKIN_CODE="$1"
+
+ # skin images
+ for SKIN_IMAGE in ${SKIN_IMAGES}
+ do
+ build_image ${CURRENT_DIR}/skins/${SKIN_CODE}/${SKIN_IMAGE}.svg ${ASSETS_DIR}/skins/${SKIN_CODE}_${SKIN_IMAGE}.png
+ done
+}
+
+#######################################################
+
+# Delete existing generated images
+if [ -d "${ASSETS_DIR}/ui" ]; then
+ find ${ASSETS_DIR}/ui -type f -name "*.png" -delete
+fi
+if [ -d "${ASSETS_DIR}/skins" ]; then
+ find ${ASSETS_DIR}/skins -type f -name "*.png" -delete
+fi
+
+# build game images
+for GAME_IMAGE in ${AVAILABLE_GAME_IMAGES}
+do
+ build_image ${CURRENT_DIR}/images/${GAME_IMAGE}.svg ${ASSETS_DIR}/ui/${GAME_IMAGE}.png
+done
+
+# build skins images
+for SKIN in ${AVAILABLE_SKINS}
+do
+ build_image_for_skin "${SKIN}"
+done
+
diff --git a/icons/button_back.svg b/resources/ui/images/button_back.svg
similarity index 100%
rename from icons/button_back.svg
rename to resources/ui/images/button_back.svg
diff --git a/resources/ui/images/button_delete_saved_game.svg b/resources/ui/images/button_delete_saved_game.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ac7eefef476f761903fe781b8c86d0c94323550a
--- /dev/null
+++ b/resources/ui/images/button_delete_saved_game.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x=".44662" y=".89101" width="92.772" height="91.894" ry="11.689" fill="#ee7d49" stroke="#fff" stroke-width=".238"/><path d="m61.07 35.601-1.7399 27.837c-0.13442 2.1535-1.9205 3.8312-4.0781 3.8312h-16.84c-2.1576 0-3.9437-1.6777-4.0781-3.8312l-1.7399-27.837h-2.6176c-0.84621 0-1.5323-0.68613-1.5323-1.5323 0-0.84655 0.68613-1.5323 1.5323-1.5323h33.711c0.84621 0 1.5323 0.68578 1.5323 1.5323 0 0.84621-0.68613 1.5323-1.5323 1.5323zm-3.2617 0h-21.953l1.4715 26.674c0.05985 1.0829 0.95531 1.9305 2.0403 1.9305h14.929c1.085 0 1.9804-0.84757 2.0403-1.9305zm-10.977 3.0647c0.78977 0 1.4301 0.6403 1.4301 1.4301v19.614c0 0.78977-0.6403 1.4301-1.4301 1.4301s-1.4301-0.6403-1.4301-1.4301v-19.614c0-0.78977 0.6403-1.4301 1.4301-1.4301zm-6.1293 0c0.80004 0 1.4588 0.62935 1.495 1.4286l0.89647 19.719c0.03182 0.70016-0.50998 1.2933-1.2101 1.3255-0.01915 7.02e-4 -0.03831 1e-3 -0.05781 1e-3 -0.74462 0-1.3596-0.58215-1.4003-1.3261l-1.0757-19.719c-0.0407-0.74701 0.53188-1.3852 1.2786-1.4259 0.02462-0.0014 0.04926-2e-3 0.07388-2e-3zm12.259 0c0.74804 0 1.3541 0.60609 1.3541 1.3541 0 0.02462-3.28e-4 0.04926-0.0017 0.07388l-1.0703 19.618c-0.04379 0.80106-0.70597 1.4281-1.5081 1.4281-0.74804 0-1.3541-0.60609-1.3541-1.3541 0-0.02462 3.49e-4 -0.04925 0.0017-0.07388l1.0703-19.618c0.04379-0.80106 0.70597-1.4281 1.5081-1.4281zm-10.216-12.259h8.1728c2.2567 0 4.086 1.8293 4.086 4.086v2.0433h-16.344v-2.0433c0-2.2567 1.8293-4.086 4.086-4.086zm0.20453 3.0647c-0.67725 0-1.2259 0.54863-1.2259 1.2259v1.8388h10.215v-1.8388c0-0.67725-0.54863-1.2259-1.2259-1.2259z" fill="#fff" fill-rule="evenodd" stroke="#bd4812" stroke-width=".75383"/></svg>
diff --git a/resources/ui/images/button_resume_game.svg b/resources/ui/images/button_resume_game.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6ad8b64202d0e70f898c16c520e756fe8a934add
--- /dev/null
+++ b/resources/ui/images/button_resume_game.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x=".44662" y=".89101" width="92.772" height="91.894" ry="11.689" fill="#49a1ee" stroke="#fff" stroke-width=".238"/><path d="m39.211 31.236c-0.84086-0.84489-2.9911-0.84489-2.9911 0v34.329c0 0.84594 2.1554 0.84594 2.9993 0l28.178-15.637c0.84392-0.84086 0.85812-2.2091 0.01623-3.053z" fill="#fefeff" stroke="#105ca1" stroke-linecap="round" stroke-linejoin="round" stroke-width="6.1726"/><path d="m40.355 33.714c-0.71948-0.72294-2.5594-0.72294-2.5594 0v29.373c0 0.72383 1.8442 0.72383 2.5663 0l24.11-13.38c0.7221-0.71948 0.73426-1.8902 0.01389-2.6124z" fill="#fefeff" stroke="#feffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.225"/><path d="m28.369 66.919v-37.591" fill="#105ca2" stroke="#105ca2" stroke-linecap="round" stroke-width="4.0337"/></svg>
diff --git a/icons/button_start.svg b/resources/ui/images/button_start.svg
similarity index 100%
rename from icons/button_start.svg
rename to resources/ui/images/button_start.svg
diff --git a/resources/ui/images/game_end.svg b/resources/ui/images/game_end.svg
new file mode 100644
index 0000000000000000000000000000000000000000..fe20923864d0c5d39168eced03038b65106a596b
--- /dev/null
+++ b/resources/ui/images/game_end.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.17604 0 0 .17604 7.9341 1.7716)"><path d="m101.92 496.35c-1.8555 0-3.7109-0.69532-5.1484-2.0898-2.9297-2.8438-3-7.5234-0.15234-10.453l9.1875-9.4648c2.8438-2.9297 7.5234-3 10.453-0.15625s3 7.5234 0.15625 10.453l-9.1914 9.4648c-1.4492 1.4961-3.375 2.2461-5.3047 2.2461z" fill="#ff4e61"/><path d="m201.65 133.26c-1.8516 0-3.7109-0.69531-5.1445-2.0898-2.9297-2.8438-3-7.5234-0.15625-10.449l9.1914-9.4688c2.8438-2.9297 7.5195-3 10.449-0.15625s3 7.5234 0.15625 10.453l-9.1914 9.4688c-1.4492 1.4922-3.375 2.2422-5.3047 2.2422z" fill="#ff4e61"/><path d="m413.8 100.39c-1.8555 0-3.7109-0.69141-5.1484-2.0859-2.9297-2.8438-3-7.5234-0.15625-10.453l9.1914-9.4688c2.8438-2.9258 7.5234-2.9961 10.453-0.15234 2.9297 2.8398 3 7.5234 0.15625 10.449l-9.1914 9.4688c-1.4492 1.4922-3.375 2.2422-5.3047 2.2422z" fill="#5c73bc"/><path d="m413.8 463.77c-1.8555 0-3.7109-0.69532-5.1484-2.0859-2.9297-2.8438-3-7.5234-0.15625-10.453l9.1914-9.4688c2.8438-2.9258 7.5234-3 10.453-0.15625s3 7.5234 0.15625 10.453l-9.1914 9.4688c-1.4492 1.4922-3.375 2.2422-5.3047 2.2422z" fill="#fa0"/><path d="m63.07 112.91c-1.8516 0-3.7109-0.69141-5.1445-2.0859-2.9297-2.8438-3-7.5234-0.15625-10.453l9.1914-9.4687c2.8438-2.9258 7.5234-2.9961 10.453-0.15234 2.9258 2.8438 2.9961 7.5234 0.15234 10.449l-9.1914 9.4688c-1.4492 1.4922-3.375 2.2422-5.3047 2.2422z" fill="#fa0"/><path d="m12.309 278.82c-1.8516 0-3.7109-0.69141-5.1445-2.0859-2.9297-2.8438-3-7.5234-0.15625-10.453l9.1875-9.4688c2.8438-2.9297 7.5234-3 10.453-0.15625 2.9297 2.8438 3 7.5234 0.15625 10.453l-9.1914 9.4688c-1.4453 1.4922-3.375 2.2422-5.3047 2.2422z" fill="#2dc471"/><path d="m216.29 278.49-23.996 12.996c-6.2226 3.3711-13.496-2.0742-12.309-9.2148l4.582-27.523c0.47266-2.8359-0.4375-5.7266-2.4375-7.7344l-19.414-19.496c-5.0352-5.0547-2.2578-13.863 4.7031-14.906l26.824-4.0156c2.7656-0.41407 5.1524-2.1992 6.3867-4.7812l12-25.043c3.1133-6.4922 12.102-6.4922 15.215 0l11.996 25.043c1.2383 2.582 3.625 4.3672 6.3867 4.7812l26.828 4.0156c6.957 1.043 9.7344 9.8516 4.6992 14.906l-19.41 19.496c-2 2.0078-2.9141 4.8984-2.4414 7.7344l4.582 27.523c1.1914 7.1406-6.082 12.586-12.305 9.2148l-23.996-12.996c-2.4727-1.3398-5.4258-1.3398-7.8945 0z" fill="#ffd02f"/><path d="m220.24 512c-4.082 0-7.3906-3.3086-7.3906-7.3906v-115.59c0-4.082 3.3086-7.3945 7.3906-7.3945s7.3906 3.3125 7.3906 7.3945v115.59c0 4.082-3.3086 7.3906-7.3906 7.3906z" fill="#5c73bc"/><path d="m220.3 357.42h-0.11328c-4.082 0-7.3945-3.3125-7.3945-7.3945s3.3086-7.3906 7.3945-7.3906h0.11328c4.082 0 7.3906 3.3086 7.3906 7.3906s-3.3086 7.3945-7.3906 7.3945z" fill="#5c73bc"/><path d="m220.3 332h-0.14838c-4.082-0.0156-7.375-3.3398-7.3594-7.4219 0.0195-4.0742 3.3242-7.3594 7.3906-7.3594h0.14848c4.082 0.0156 7.375 3.3398 7.3594 7.4219-0.0156 4.0703-3.3242 7.3594-7.3906 7.3594z" fill="#fa0"/><path d="m87.234 230.89c-1.9297 0-3.8555-0.75-5.3047-2.2422l-79.34-81.738c-2.8438-2.9297-2.7773-7.6094 0.15234-10.449 2.9297-2.8438 7.6094-2.7734 10.453 0.15235l79.344 81.738c2.8438 2.9258 2.7734 7.6094-0.15625 10.449-1.4375 1.3945-3.293 2.0898-5.1484 2.0898z" fill="#ff4e61"/><path d="m113.95 258.5c-1.8633 0-3.7266-0.69922-5.1641-2.1055-2.9219-2.8516-2.9766-7.5312-0.125-10.453l0.082-0.082c2.8516-2.918 7.5312-2.9766 10.453-0.12109 2.9219 2.8516 2.9766 7.5312 0.12109 10.453l-0.0781 0.082c-1.4492 1.4805-3.3672 2.2266-5.2891 2.2266z" fill="#fa0"/><path d="m131.4 276.48c-1.8555 0-3.7109-0.69531-5.1484-2.0898-2.9258-2.8438-2.9961-7.5234-0.15235-10.449l0.0781-0.0859c2.8476-2.9297 7.5273-2.9961 10.453-0.15235 2.9297 2.8438 3 7.5234 0.15625 10.453l-0.082 0.082c-1.4492 1.4922-3.375 2.2422-5.3047 2.2422z" fill="#5c73bc"/><path d="m353.24 227.99c-1.8555 0-3.7109-0.69141-5.1445-2.0859-2.9297-2.8438-3-7.5234-0.15625-10.453l79.34-81.734c2.8438-2.9297 7.5234-3 10.453-0.15625 2.9297 2.8438 3 7.5234 0.15625 10.453l-79.344 81.734c-1.4492 1.4922-3.375 2.2422-5.3047 2.2422z" fill="#fa0"/><path d="m326.52 255.6c-1.9141 0-3.8242-0.73828-5.2695-2.2109l-0.082-0.082c-2.8633-2.9141-2.8203-7.5938 0.0899-10.453 2.9141-2.8633 7.5938-2.8203 10.453 0.0898l0.082 0.082c2.8594 2.9141 2.8203 7.5938-0.0937 10.453-1.4375 1.4141-3.3086 2.1211-5.1797 2.1211z" fill="#ff4e61"/><path d="m309.07 273.58c-1.9297 0-3.8555-0.75-5.3047-2.2422l-0.082-0.082c-2.8398-2.9297-2.7734-7.6094 0.15625-10.453s7.6094-2.7734 10.453 0.15234l0.082 0.082c2.8398 2.9297 2.7734 7.6094-0.15625 10.453-1.4375 1.3945-3.293 2.0898-5.1484 2.0898z" fill="#fa0"/><path d="m300.65 116.69c-1.2422 0-2.5-0.3125-3.6523-0.97266-3.5469-2.0234-4.7812-6.5391-2.7578-10.082l56.863-99.652c2.0234-3.543 6.5352-4.7773 10.082-2.7539 3.5469 2.0234 4.7812 6.5391 2.7578 10.082l-56.863 99.652c-1.3633 2.3867-3.8594 3.7266-6.4297 3.7266z" fill="#62d38f"/><path d="m281.52 150.33c-1.293 0-2.5977-0.33593-3.7891-1.0469l-0.0976-0.0586c-3.5-2.0938-4.6445-6.6328-2.5469-10.137 2.0938-3.5078 6.6328-4.6445 10.137-2.5508l0.0977 0.0586c3.5039 2.0938 4.6445 6.6328 2.5508 10.137-1.3867 2.3164-3.8359 3.5976-6.3516 3.5976z" fill="#fa0"/><path d="m269.02 172.25c-1.3008 0-2.6172-0.34375-3.8086-1.0625l-0.0977-0.0586c-3.4961-2.1094-4.6211-6.6523-2.5156-10.148 2.1094-3.4961 6.6523-4.6172 10.148-2.5117l0.0976 0.0586c3.4961 2.1094 4.6211 6.6523 2.5117 10.148-1.3867 2.3008-3.832 3.5742-6.3359 3.5742z" fill="#2dc471"/><path d="m139.96 116.69c-2.5703 0-5.0664-1.3398-6.4297-3.7305l-56.863-99.648c-2.0234-3.5469-0.78906-8.0586 2.7539-10.082 3.5469-2.0234 8.0625-0.79297 10.086 2.7539l56.863 99.648c2.0234 3.5469 0.78906 8.0625-2.7539 10.086-1.1562 0.66016-2.4141 0.97266-3.6562 0.97266z" fill="#5c73bc"/><path d="m159.09 150.33c-2.5078 0-4.957-1.2773-6.3438-3.582-2.1016-3.5-0.96875-8.043 2.5273-10.145l0.10157-0.0586c3.5-2.1016 8.0391-0.97266 10.141 2.5273 2.1055 3.5 0.97266 8.0391-2.5273 10.145l-0.0977 0.0586c-1.1914 0.71484-2.5039 1.0547-3.8008 1.0547z" fill="#ff4e61"/><path d="m171.6 172.25c-2.5 0-4.9375-1.2656-6.3281-3.5625-2.1172-3.4922-1-8.0352 2.4883-10.152l0.0977-0.0586c3.4961-2.1133 8.0391-1 10.156 2.4922 2.1133 3.4922 1 8.0352-2.4922 10.152l-0.0977 0.0586c-1.1992 0.72656-2.5195 1.0703-3.8242 1.0703z" fill="#fa0"/><path d="m402.14 357.28-15.523 11.602c-4.0234 3.0117-9.6523-0.043-9.5234-5.1641l0.5039-19.75c0.0508-2.0352-0.87109-3.9648-2.4688-5.1641l-15.508-11.621c-4.0234-3.0156-2.9453-9.4726 1.8242-10.93l18.391-5.6094c1.8906-0.57812 3.3906-2.082 4-4.0156l5.9375-18.785c1.5391-4.875 7.8359-5.8125 10.652-1.5898l10.863 16.285c1.1211 1.6758 2.9688 2.6797 4.9414 2.6797l19.18 0.0117c4.9766 4e-3 7.7891 5.8828 4.7578 9.9492l-11.676 15.672c-1.2031 1.6172-1.5586 3.7383-0.94922 5.6719l5.918 18.797c1.5312 4.875-3.0273 9.4453-7.7148 7.7344l-18.078-6.5977c-1.8594-0.67969-3.9258-0.37109-5.5273 0.82422z" fill="#ffd02f"/><path d="m261.51 512c-4.082 0-7.3906-3.3086-7.3906-7.3906 0-57.23 22.832-95.922 41.984-118.3 20.828-24.332 41.613-35.023 42.488-35.469 3.6406-1.8477 8.0898-0.39063 9.9336 3.2539 1.8438 3.6367 0.39453 8.0781-3.2422 9.9297-0.3125 0.16016-19.5 10.164-38.367 32.395-25.227 29.719-38.016 66.121-38.016 108.2 0 4.082-3.3086 7.3906-7.3906 7.3906z" fill="#ff4e61"/><path d="m102.86 397.35 11.766 15.605c3.0547 4.0469 9.2852 2.7305 10.547-2.2266l4.8633-19.113c0.5-1.9648 1.9102-3.5547 3.7695-4.2461l18.039-6.707c4.6797-1.7383 5.3906-8.25 1.207-11.016l-16.141-10.672c-1.6602-1.1016-2.6914-2.9726-2.7578-5.0039l-0.61719-19.75c-0.15625-5.1211-5.9492-7.832-9.7969-4.5859l-14.84 12.516c-1.5312 1.2891-3.5781 1.7227-5.4726 1.1562l-18.422-5.5c-4.7773-1.4258-9.0703 3.4102-7.2617 8.1836l6.9688 18.41c0.71875 1.8945 0.48438 4.0352-0.625 5.7188l-10.77 16.348c-2.793 4.2422 0.34375 9.9375 5.3125 9.6445l19.145-1.1406c1.9727-0.11719 3.875 0.77343 5.0859 2.3789z" fill="#ffd02f"/><path d="m179.02 512c-4.082 0-7.3906-3.3086-7.3906-7.3906 0-30.059-6.6797-57.559-19.852-81.734-1.9531-3.5859-0.62891-8.0742 2.957-10.027 3.5859-1.9531 8.0742-0.62891 10.027 2.9531 14.363 26.375 21.648 56.254 21.648 88.809 0 4.082-3.3086 7.3906-7.3906 7.3906z" fill="#fa0"/><path d="m268.93 55.898c0-11.285-8.8828-20.434-19.836-20.434-10.957 0-19.836 9.1484-19.836 20.434 0 11.285 8.8789 20.438 19.836 20.438 10.953 0 19.836-9.1523 19.836-20.438z" fill="#ffd02f"/><path d="m373.08 446.81c0-11.285-8.8789-20.434-19.832-20.434-10.957 0-19.836 9.1484-19.836 20.434s8.8789 20.434 19.836 20.434c10.953 0 19.832-9.1484 19.832-20.434z" fill="#5c73bc"/><path d="m44.129 450.86c0-9.0508-7.1211-16.387-15.91-16.387-8.7852 0-15.906 7.3359-15.906 16.387 0 9.0547 7.1211 16.391 15.906 16.391 8.7891 0 15.91-7.3359 15.91-16.391z" fill="#62d38f"/><path d="m88.172 288.35c0-9.0508-7.1211-16.387-15.91-16.387-8.7852 0-15.906 7.3359-15.906 16.387s7.1211 16.391 15.906 16.391c8.7891 0 15.91-7.3398 15.91-16.391z" fill="#5c73bc"/><g fill="#ff4e61"><path d="m210.84 16.391c0-9.0547-7.1211-16.391-15.906-16.391-8.7891 0-15.91 7.3359-15.91 16.391 0 9.0508 7.1211 16.387 15.91 16.387 8.7852 0 15.906-7.3359 15.906-16.387z"/><path d="m365.23 152.88c0-9.0508-7.125-16.391-15.91-16.391-8.7852 0-15.91 7.3398-15.91 16.391s7.125 16.387 15.91 16.387c8.7852 0 15.91-7.3359 15.91-16.387z"/><path d="m139.96 32.746c-1.8555 0-3.7109-0.69141-5.1484-2.0898-2.9297-2.8438-3-7.5195-0.15625-10.449l9.1914-9.4688c2.8438-2.9297 7.5234-3 10.449-0.15625 2.9297 2.8438 3 7.5234 0.15625 10.453l-9.1875 9.4688c-1.4492 1.4922-3.3789 2.2422-5.3047 2.2422z"/></g></g></svg>
diff --git a/icons/placeholder.svg b/resources/ui/images/placeholder.svg
similarity index 100%
rename from icons/placeholder.svg
rename to resources/ui/images/placeholder.svg