diff --git a/android/gradle.properties b/android/gradle.properties
index 5a36ab8c92338284725018aa8f109700499c74fd..2aa2a7ba9299223d13e7b0c4ff3bd3f735ebca5e 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.0.24
-app.versionCode=25
+app.versionName=1.0.25
+app.versionCode=26
diff --git a/assets/skins/default_1.png b/assets/skins/default_1.png
index f70fb48c9e55426dc42d463707921dde73e01fe2..e92d4d663a58024c777b7fb86a25c797dc5a356c 100644
Binary files a/assets/skins/default_1.png and b/assets/skins/default_1.png differ
diff --git a/assets/skins/default_2.png b/assets/skins/default_2.png
index efaa4c31b5369ef7c3cfa8b8780c59baa7cb84a7..e293ba5fab0089cf74ba7da16c582fc7dd19fe1b 100644
Binary files a/assets/skins/default_2.png and b/assets/skins/default_2.png differ
diff --git a/assets/skins/default_3.png b/assets/skins/default_3.png
index f1bc08a740f3730f0e271da822690ce58e76b680..431aeeefa47b2baced4680f5dde8db2a0ce73741 100644
Binary files a/assets/skins/default_3.png and b/assets/skins/default_3.png differ
diff --git a/assets/skins/default_4.png b/assets/skins/default_4.png
index a85d64975b4163738a0eaf0ab8556d3635a57e0a..b2110ad7dfd8399b73ee017726532ad17887afad 100644
Binary files a/assets/skins/default_4.png and b/assets/skins/default_4.png differ
diff --git a/assets/skins/default_5.png b/assets/skins/default_5.png
index 5df1fcacaa34604e4fa2b9a98d2752f759457899..7b3402b9888bec3ebd000a949b4714f8010b1918 100644
Binary files a/assets/skins/default_5.png and b/assets/skins/default_5.png differ
diff --git a/assets/skins/default_6.png b/assets/skins/default_6.png
index e3fce3136d15cf3e3d52defc4c6045afe1a0ddd2..2ee706bc49c5735dc99658d4e5daf4a031b6bfb9 100644
Binary files a/assets/skins/default_6.png and b/assets/skins/default_6.png differ
diff --git a/assets/skins/default_7.png b/assets/skins/default_7.png
index c05d6220224fc47be49dd817f7233ed76809fdf5..af693fafcdb5484ec362083648fbae45d021caf0 100644
Binary files a/assets/skins/default_7.png and b/assets/skins/default_7.png differ
diff --git a/assets/skins/default_8.png b/assets/skins/default_8.png
index 51f88c97d6abed86814077b038e419a2d97fcdb6..6511ecff09e4a8234808a0ab24b33bc7f5591cfa 100644
Binary files a/assets/skins/default_8.png and b/assets/skins/default_8.png differ
diff --git a/assets/skins/default_found.png b/assets/skins/default_found.png
index 5cfd6fdb0dd0ead2245f2aa3f0088675dc913517..ca489181cba1a58025a110ec3b789656a6a9af48 100644
Binary files a/assets/skins/default_found.png and b/assets/skins/default_found.png differ
diff --git a/assets/skins/default_unknown.png b/assets/skins/default_unknown.png
index 7659dce10aaf9741d8287a241c25385b8830b18f..a25fcf5c8f68c96ba07b0a7c24c0d8f3589f13a4 100644
Binary files a/assets/skins/default_unknown.png and b/assets/skins/default_unknown.png differ
diff --git a/assets/ui/button_back.png b/assets/ui/button_back.png
index cc48ffb1dbb653d9a996f139dfbe02969724bfa5..51d7a01d171f7d7f047ecf9dee2d7ceee23b310d 100644
Binary files a/assets/ui/button_back.png and b/assets/ui/button_back.png differ
diff --git a/assets/ui/button_delete_saved_game.png b/assets/ui/button_delete_saved_game.png
index 5e4f217689b11e444b7163557d7e5d68f3bbfe7d..4ca5b749c208c4b7eac2a4b141a1bd918d7cb98f 100644
Binary files a/assets/ui/button_delete_saved_game.png 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
index b2ea0a02d05e42377eb551a4b51428b511a32f5d..2fe433b7d18a39880a14e3f0af18cb75c4ccbaed 100644
Binary files a/assets/ui/button_resume_game.png and b/assets/ui/button_resume_game.png differ
diff --git a/assets/ui/button_start.png b/assets/ui/button_start.png
index 6845e2f5c21598ab61f1684d2075aeec0334bf23..23c7a4f670de19ffac455d6c510c3c53653a048b 100644
Binary files a/assets/ui/button_start.png and b/assets/ui/button_start.png differ
diff --git a/fastlane/metadata/android/en-US/changelogs/26.txt b/fastlane/metadata/android/en-US/changelogs/26.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5482b7fa40ca24a8240ec8e571116215a31f6f61
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/26.txt
@@ -0,0 +1 @@
+Clean / improve / update code and UI.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/26.txt b/fastlane/metadata/android/fr-FR/changelogs/26.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8e88019e5d88c4e6e123ad73c0c1c0dce6e4ff70
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/26.txt
@@ -0,0 +1 @@
+Nettoyage / amélioration / mise à jour de code et de l'interface.
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_game_settings.dart
index 7174df5aad46ab241e6cb117d876c8a91b434601..2737e4731a90f81d909790f4d7d1441dd3f1963a 100644
--- a/lib/config/default_game_settings.dart
+++ b/lib/config/default_game_settings.dart
@@ -25,9 +25,4 @@ class DefaultGameSettings {
printlog('Did not find any available value for game parameter "$parameterCode".');
return [];
}
-
- // 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 9736282da0316a5e9da3974b7f65d22995c5de6e..b44f6871b81f4536dd89425553658531b68e3fa6 100644
--- a/lib/config/default_global_settings.dart
+++ b/lib/config/default_global_settings.dart
@@ -25,9 +25,4 @@ class DefaultGlobalSettings {
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/ui/helpers/styled_button.dart b/lib/ui/helpers/styled_button.dart
new file mode 100644
index 0000000000000000000000000000000000000000..1798ef22715307929315c6762cae1cfd7cbab8f5
--- /dev/null
+++ b/lib/ui/helpers/styled_button.dart
@@ -0,0 +1,210 @@
+import 'package:auto_size_text/auto_size_text.dart';
+import 'package:flutter/material.dart';
+
+import 'package:memory/utils/color_extensions.dart';
+
+class StyledButton extends StatelessWidget {
+ const StyledButton({
+ super.key,
+ required this.color,
+ required this.onPressed,
+ this.onLongPress,
+ required this.child,
+ });
+
+ final Color color;
+ final VoidCallback? onPressed;
+ final VoidCallback? onLongPress;
+ final Widget child;
+
+ factory StyledButton.text({
+ Key? key,
+ required VoidCallback? onPressed,
+ VoidCallback? onLongPress,
+ required String caption,
+ required Color color,
+ }) {
+ final Widget captionWidget = AutoSizeText(
+ caption,
+ maxLines: 1,
+ style: TextStyle(
+ inherit: true,
+ fontWeight: FontWeight.w900,
+ color: color.darken(60),
+ shadows: [
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(2, 2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(2, -2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(-2, 2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(-2, -2),
+ ),
+ ],
+ ),
+ );
+
+ return StyledButton(
+ color: color,
+ onPressed: onPressed,
+ onLongPress: onLongPress,
+ child: captionWidget,
+ );
+ }
+
+ factory StyledButton.icon({
+ Key? key,
+ required VoidCallback? onPressed,
+ VoidCallback? onLongPress,
+ required Icon icon,
+ required Color color,
+ required double iconSize,
+ }) {
+ return StyledButton(
+ color: color,
+ onPressed: onPressed,
+ onLongPress: onLongPress,
+ child: Icon(
+ icon.icon,
+ color: icon.color ?? color.darken(60),
+ size: iconSize,
+ shadows: [
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(2, 2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(2, -2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(-2, 2),
+ ),
+ Shadow(
+ blurRadius: 5.0,
+ color: color.lighten(60),
+ offset: const Offset(-2, -2),
+ ),
+ ],
+ ),
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ const double borderWidth = 4;
+ final Color borderColor = color.darken(40);
+ const double borderRadius = 10;
+
+ return Container(
+ margin: const EdgeInsets.all(2),
+ padding: const EdgeInsets.all(2),
+ decoration: BoxDecoration(
+ color: color,
+ border: Border.all(
+ color: borderColor,
+ width: borderWidth,
+ ),
+ borderRadius: BorderRadius.circular(borderRadius),
+ ),
+ child: CustomPaint(
+ painter: StyledButtonPainter(
+ baseColor: color,
+ ),
+ child: MaterialButton(
+ onPressed: onPressed,
+ onLongPress: onLongPress,
+ padding: const EdgeInsets.all(8),
+ materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+ minWidth: 40,
+ child: child,
+ ),
+ ),
+ );
+ }
+}
+
+class StyledButtonPainter extends CustomPainter {
+ StyledButtonPainter({
+ required this.baseColor,
+ });
+
+ final Color baseColor;
+
+ @override
+ void paint(Canvas canvas, Size size) {
+ final Color lightColor = baseColor.lighten(20);
+ final Color darkColor = baseColor.darken(20);
+
+ final Paint paint = Paint()..style = PaintingStyle.fill;
+
+ const double cornerRadius = 6;
+
+ Path topPath = Path()
+ ..moveTo(cornerRadius, 0)
+ ..lineTo(size.width - cornerRadius, 0)
+ ..arcToPoint(
+ Offset(size.width, cornerRadius),
+ radius: const Radius.circular(cornerRadius),
+ )
+ ..lineTo(size.width, size.height * .35)
+ ..quadraticBezierTo(
+ size.width * .4,
+ size.height * .1,
+ 0,
+ size.height * .3,
+ )
+ ..lineTo(0, cornerRadius)
+ ..arcToPoint(
+ const Offset(cornerRadius, 0),
+ radius: const Radius.circular(cornerRadius),
+ );
+
+ Path bottomPath = Path()
+ ..moveTo(cornerRadius, size.height)
+ ..lineTo(size.width - cornerRadius, size.height)
+ ..arcToPoint(
+ Offset(size.width, size.height - cornerRadius),
+ radius: const Radius.circular(cornerRadius),
+ clockwise: false,
+ )
+ ..lineTo(size.width, size.height * .7)
+ ..quadraticBezierTo(
+ size.width * .6,
+ size.height * .9,
+ 0,
+ size.height * .7,
+ )
+ ..lineTo(0, size.height - cornerRadius)
+ ..arcToPoint(
+ Offset(cornerRadius, size.height),
+ radius: const Radius.circular(cornerRadius),
+ clockwise: false,
+ );
+
+ paint.color = lightColor;
+ canvas.drawPath(topPath, paint);
+
+ paint.color = darkColor;
+ canvas.drawPath(bottomPath, paint);
+ }
+
+ @override
+ bool shouldRepaint(CustomPainter oldDelegate) => false;
+}
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
index e3dea0393c82bd040cdc1405b33470caca75033e..339a2e09c89d6f4317c73b52b38e4b80a1e3c3e6 100644
--- a/lib/ui/layouts/parameters_layout.dart
+++ b/lib/ui/layouts/parameters_layout.dart
@@ -5,11 +5,10 @@ import 'package:memory/config/default_game_settings.dart';
import 'package:memory/config/default_global_settings.dart';
import 'package:memory/cubit/settings_game_cubit.dart';
import 'package:memory/cubit/settings_global_cubit.dart';
-import 'package:memory/ui/parameters/parameter_painter.dart';
+import 'package:memory/ui/parameters/parameter_widget.dart';
import 'package:memory/ui/widgets/actions/button_delete_saved_game.dart';
import 'package:memory/ui/widgets/actions/button_game_start_new.dart';
import 'package:memory/ui/widgets/actions/button_resume_saved_game.dart';
-import 'package:memory/ui/parameters/parameter_image.dart';
class ParametersLayout extends StatelessWidget {
const ParametersLayout({super.key, required this.canResume});
@@ -35,21 +34,27 @@ class ParametersLayout extends StatelessWidget {
lines.add(SizedBox(height: separatorHeight));
}
- lines.add(SizedBox(height: separatorHeight));
+ lines.add(Expanded(
+ child: SizedBox(height: separatorHeight),
+ ));
if (canResume == false) {
// Start new game
- lines.add(const Expanded(
- child: StartNewGameButton(),
- ));
+ lines.add(
+ const AspectRatio(
+ aspectRatio: 3,
+ child: StartNewGameButton(),
+ ),
+ );
} else {
// Resume game
- lines.add(const Expanded(
+ lines.add(const AspectRatio(
+ aspectRatio: 3,
child: ResumeSavedGameButton(),
));
// Delete saved game
lines.add(SizedBox.square(
- dimension: MediaQuery.of(context).size.width / 4,
+ dimension: MediaQuery.of(context).size.width / 5,
child: const DeleteSavedGameButton(),
));
}
@@ -102,44 +107,26 @@ class ParametersLayout extends StatelessWidget {
? globalSettingsCubit.getParameterValue(code)
: gameSettingsCubit.getParameterValue(code);
- final bool isActive = (value == currentValue);
+ final bool isSelected = (value == currentValue);
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: 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,
- ),
+ final double itemWidth = displayWidth / availableValues.length - 4;
+
+ return SizedBox.square(
+ dimension: itemWidth,
+ child: ParameterWidget(
+ code: code,
+ value: value,
+ isSelected: isSelected,
+ size: itemWidth,
+ gameSettings: gameSettingsState.settings,
+ globalSettings: globalSettingsState.settings,
+ 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
deleted file mode 100644
index fc4b576f85b01158b74548400d11a4d027c57fbe..0000000000000000000000000000000000000000
--- a/lib/ui/parameters/parameter_image.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-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/parameters/parameter_painter.dart b/lib/ui/parameters/parameter_painter.dart
index bbff56abbebd17b61c52dee26ed8ad58e71910ee..37cc69a58d7abb254cf8ec8866593718031566e3 100644
--- a/lib/ui/parameters/parameter_painter.dart
+++ b/lib/ui/parameters/parameter_painter.dart
@@ -10,14 +10,12 @@ class ParameterPainter extends CustomPainter {
const ParameterPainter({
required this.code,
required this.value,
- required this.isSelected,
required this.gameSettings,
required this.globalSettings,
});
final String code;
final String value;
- final bool isSelected;
final GameSettings gameSettings;
final GlobalSettings globalSettings;
@@ -26,23 +24,11 @@ class ParameterPainter extends CustomPainter {
// force square
final double canvasSize = min(size.width, size.height);
- const Color borderColorEnabled = Colors.blue;
- const Color borderColorDisabled = Colors.white;
-
- // "enabled/disabled" border
- final paint = Paint();
- paint.style = PaintingStyle.stroke;
- paint.color = isSelected ? borderColorEnabled : borderColorDisabled;
- paint.strokeJoin = StrokeJoin.round;
- paint.strokeWidth = 10;
- canvas.drawRect(
- Rect.fromPoints(const Offset(0, 0), Offset(canvasSize, canvasSize)), paint);
-
// content
switch (code) {
default:
printlog('Unknown parameter: $code/$value');
- paintUnknownParameterItem(value, canvas, canvasSize);
+ paintUnknownParameterItem(canvas, canvasSize);
}
}
@@ -53,7 +39,6 @@ class ParameterPainter extends CustomPainter {
// "unknown" parameter -> simple block with text
void paintUnknownParameterItem(
- final String value,
final Canvas canvas,
final double size,
) {
@@ -61,12 +46,8 @@ class ParameterPainter extends CustomPainter {
paint.strokeJoin = StrokeJoin.round;
paint.strokeWidth = 3;
- paint.color = Colors.grey;
- paint.style = PaintingStyle.fill;
- canvas.drawRect(Rect.fromPoints(const Offset(0, 0), Offset(size, size)), paint);
-
final textSpan = TextSpan(
- text: '?\n$value',
+ text: '$code\n$value',
style: const TextStyle(
color: Colors.black,
fontSize: 18,
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/ui/parameters/parameter_widget.dart
new file mode 100644
index 0000000000000000000000000000000000000000..1d4f25e5816cea8fa89d2bdd4c66e9d5c6320689
--- /dev/null
+++ b/lib/ui/parameters/parameter_widget.dart
@@ -0,0 +1,114 @@
+import 'package:flutter/material.dart';
+
+import 'package:memory/config/default_game_settings.dart';
+import 'package:memory/config/default_global_settings.dart';
+import 'package:memory/models/settings/settings_game.dart';
+import 'package:memory/models/settings/settings_global.dart';
+import 'package:memory/ui/helpers/styled_button.dart';
+import 'package:memory/ui/parameters/parameter_painter.dart';
+import 'package:memory/utils/tools.dart';
+
+class ParameterWidget extends StatelessWidget {
+ const ParameterWidget({
+ super.key,
+ required this.code,
+ required this.value,
+ required this.isSelected,
+ required this.size,
+ required this.gameSettings,
+ required this.globalSettings,
+ required this.onPressed,
+ });
+
+ final String code;
+ final String value;
+ final bool isSelected;
+ final double size;
+ final GameSettings gameSettings;
+ 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 DefaultGameSettings.parameterCodeLevel:
+ content = getLevelParameterItem();
+ break;
+ case DefaultGlobalSettings.parameterCodeSkin:
+ content = getSkinParameterItem();
+ break;
+ default:
+ printlog('Unknown parameter: $code/$value');
+ content = getUnknownParameterItem();
+ }
+
+ 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() {
+ return StyledButton.text(
+ caption: '$code / $value',
+ color: Colors.grey,
+ onPressed: null,
+ );
+ }
+
+ Widget getLevelParameterItem() {
+ Color backgroundColor = Colors.grey;
+
+ switch (value) {
+ case DefaultGameSettings.levelValueMedium:
+ backgroundColor = Colors.green;
+ break;
+ default:
+ printlog('Wrong value for level parameter value: $value');
+ }
+
+ return StyledButton(
+ color: backgroundColor,
+ onPressed: onPressed,
+ child: CustomPaint(
+ size: Size(size, size),
+ willChange: false,
+ painter: ParameterPainter(
+ code: code,
+ value: value,
+ gameSettings: gameSettings,
+ globalSettings: globalSettings,
+ ),
+ isComplex: true,
+ ),
+ );
+ }
+
+ Widget getSkinParameterItem() {
+ return StyledButton(
+ color: Colors.green.shade800,
+ onPressed: onPressed,
+ child: Image(
+ image: AssetImage('assets/ui/${DefaultGlobalSettings.parameterCodeSkin}_$value.png'),
+ fit: BoxFit.fill,
+ ),
+ );
+ }
+}
diff --git a/lib/ui/widgets/actions/button_delete_saved_game.dart b/lib/ui/widgets/actions/button_delete_saved_game.dart
index 34255fc3561d63c29f3dab6df123aaf9ee1a654a..4925ad9b25a14317ef47b9e7b8ad9777dad47292 100644
--- a/lib/ui/widgets/actions/button_delete_saved_game.dart
+++ b/lib/ui/widgets/actions/button_delete_saved_game.dart
@@ -2,20 +2,22 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:memory/cubit/game_cubit.dart';
+import 'package:memory/ui/helpers/styled_button.dart';
class DeleteSavedGameButton extends StatelessWidget {
const DeleteSavedGameButton({super.key});
@override
Widget build(BuildContext context) {
- return TextButton(
+ return StyledButton(
+ color: Colors.grey,
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).deleteSavedGame();
+ },
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
index fd33ec09bc3cf41885e045481d5be54b3cea518f..c6231f1d4d8da52b9b2a63ea6b0982caa3728399 100644
--- a/lib/ui/widgets/actions/button_game_quit.dart
+++ b/lib/ui/widgets/actions/button_game_quit.dart
@@ -2,20 +2,22 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:memory/cubit/game_cubit.dart';
+import 'package:memory/ui/helpers/styled_button.dart';
class QuitGameButton extends StatelessWidget {
const QuitGameButton({super.key});
@override
Widget build(BuildContext context) {
- return ElevatedButton(
+ return StyledButton(
+ color: Colors.red,
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).quitGame();
+ },
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/actions/button_game_start_new.dart b/lib/ui/widgets/actions/button_game_start_new.dart
index db7acc67129b6ffd6a4568ac37979da66939efca..9429850867c26005ae548ade2e2fe4d9b550abfd 100644
--- a/lib/ui/widgets/actions/button_game_start_new.dart
+++ b/lib/ui/widgets/actions/button_game_start_new.dart
@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:memory/cubit/game_cubit.dart';
import 'package:memory/cubit/settings_game_cubit.dart';
import 'package:memory/cubit/settings_global_cubit.dart';
+import 'package:memory/ui/helpers/styled_button.dart';
class StartNewGameButton extends StatelessWidget {
const StartNewGameButton({super.key});
@@ -14,17 +15,18 @@ class StartNewGameButton extends StatelessWidget {
builder: (BuildContext context, GameSettingsState gameSettingsState) {
return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
- return TextButton(
- child: const Image(
- image: AssetImage('assets/ui/button_start.png'),
- fit: BoxFit.fill,
- ),
+ return StyledButton(
+ color: Colors.blue,
onPressed: () {
BlocProvider.of<GameCubit>(context).startNewGame(
gameSettings: gameSettingsState.settings,
globalSettings: globalSettingsState.settings,
);
},
+ child: const Image(
+ image: AssetImage('assets/ui/button_start.png'),
+ fit: BoxFit.fill,
+ ),
);
},
);
diff --git a/lib/ui/widgets/actions/button_resume_saved_game.dart b/lib/ui/widgets/actions/button_resume_saved_game.dart
index 69c13b32ec79fea30117029dd32547cb4645f912..f571db6b2f734a94ea7a2825b62369d931e6c088 100644
--- a/lib/ui/widgets/actions/button_resume_saved_game.dart
+++ b/lib/ui/widgets/actions/button_resume_saved_game.dart
@@ -2,20 +2,22 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:memory/cubit/game_cubit.dart';
+import 'package:memory/ui/helpers/styled_button.dart';
class ResumeSavedGameButton extends StatelessWidget {
const ResumeSavedGameButton({super.key});
@override
Widget build(BuildContext context) {
- return TextButton(
+ return StyledButton(
+ color: Colors.blue,
+ onPressed: () {
+ BlocProvider.of<GameCubit>(context).resumeSavedGame();
+ },
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_end.dart b/lib/ui/widgets/game/game_end.dart
index 2792ac29d29c95bef52e7fdac102ab86b9ae3b7c..f01f61ed92c073582c97a219785ead7798c32d62 100644
--- a/lib/ui/widgets/game/game_end.dart
+++ b/lib/ui/widgets/game/game_end.dart
@@ -25,6 +25,7 @@ class GameEndWidget extends StatelessWidget {
padding: const EdgeInsets.all(2),
child: Table(
defaultColumnWidth: const IntrinsicColumnWidth(),
+ defaultVerticalAlignment: TableCellVerticalAlignment.bottom,
children: [
TableRow(
children: [
diff --git a/lib/ui/widgets/global_app_bar.dart b/lib/ui/widgets/global_app_bar.dart
index 80bea7319d88e844c0d0c54f1c515ee4cfe714d4..8340c6a1f018788640c257e606533ca907a77fef 100644
--- a/lib/ui/widgets/global_app_bar.dart
+++ b/lib/ui/widgets/global_app_bar.dart
@@ -6,6 +6,7 @@ import 'package:memory/cubit/game_cubit.dart';
import 'package:memory/cubit/nav_cubit.dart';
import 'package:memory/models/game/game.dart';
import 'package:memory/ui/helpers/app_titles.dart';
+import 'package:memory/ui/helpers/styled_button.dart';
class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
const GlobalAppBar({super.key});
@@ -21,16 +22,16 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
final List<Widget> menuActions = [];
if (currentGame.isRunning && !currentGame.isFinished) {
- menuActions.add(TextButton(
+ menuActions.add(StyledButton(
+ color: Colors.red,
+ onPressed: () {},
+ onLongPress: () {
+ BlocProvider.of<GameCubit>(context).quitGame();
+ },
child: const Image(
image: AssetImage('assets/ui/button_back.png'),
fit: BoxFit.fill,
),
- onPressed: () {},
- onLongPress: () {
- final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
- gameCubit.quitGame();
- },
));
} else {
if (pageIndex == Menu.indexGame) {
diff --git a/lib/utils/color_extensions.dart b/lib/utils/color_extensions.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4e55e338f0d3ed98b233d1ef887b7b3e17e29d97
--- /dev/null
+++ b/lib/utils/color_extensions.dart
@@ -0,0 +1,33 @@
+import 'dart:ui';
+
+extension ColorExtension on Color {
+ Color darken([int percent = 40]) {
+ assert(1 <= percent && percent <= 100);
+ final value = 1 - percent / 100;
+ return Color.fromARGB(
+ alpha,
+ (red * value).round(),
+ (green * value).round(),
+ (blue * value).round(),
+ );
+ }
+
+ Color lighten([int percent = 40]) {
+ assert(1 <= percent && percent <= 100);
+ final value = percent / 100;
+ return Color.fromARGB(
+ alpha,
+ (red + ((255 - red) * value)).round(),
+ (green + ((255 - green) * value)).round(),
+ (blue + ((255 - blue) * value)).round(),
+ );
+ }
+
+ Color avg(Color other) {
+ final red = (this.red + other.red) ~/ 2;
+ final green = (this.green + other.green) ~/ 2;
+ final blue = (this.blue + other.blue) ~/ 2;
+ final alpha = (this.alpha + other.alpha) ~/ 2;
+ return Color.fromARGB(alpha, red, green, blue);
+ }
+}
diff --git a/pubspec.lock b/pubspec.lock
index 06b3c37b49a03ed4ad9af4eb9a25c9d7d53bdc59..229631c1f86719287b9acdfad6debc0e9f46254d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -17,6 +17,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.11.0"
+ auto_size_text:
+ dependency: "direct main"
+ description:
+ name: auto_size_text
+ sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.0"
bloc:
dependency: transitive
description:
@@ -57,14 +65,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.5"
- cupertino_icons:
- dependency: "direct main"
- description:
- name: cupertino_icons
- sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
- url: "https://pub.dev"
- source: hosted
- version: "1.0.8"
easy_localization:
dependency: "direct main"
description:
@@ -101,10 +101,10 @@ packages:
dependency: transitive
description:
name: file
- sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+ sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
url: "https://pub.dev"
source: hosted
- version: "7.0.0"
+ version: "7.0.1"
flutter:
dependency: "direct main"
description: flutter
@@ -122,10 +122,10 @@ packages:
dependency: "direct dev"
description:
name: flutter_lints
- sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+ sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
url: "https://pub.dev"
source: hosted
- version: "4.0.0"
+ version: "5.0.0"
flutter_localizations:
dependency: transitive
description: flutter
@@ -180,10 +180,10 @@ packages:
dependency: transitive
description:
name: lints
- sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+ sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
url: "https://pub.dev"
source: hosted
- version: "4.0.0"
+ version: "5.0.0"
material_color_utilities:
dependency: transitive
description:
@@ -212,10 +212,10 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
- sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918
+ sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef"
url: "https://pub.dev"
source: hosted
- version: "8.0.2"
+ version: "8.0.3"
package_info_plus_platform_interface:
dependency: transitive
description:
@@ -244,10 +244,10 @@ packages:
dependency: transitive
description:
name: path_provider_android
- sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
+ sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
url: "https://pub.dev"
source: hosted
- version: "2.2.10"
+ version: "2.2.12"
path_provider_foundation:
dependency: transitive
description:
@@ -316,18 +316,18 @@ packages:
dependency: transitive
description:
name: shared_preferences_android
- sha256: a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974
+ sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
url: "https://pub.dev"
source: hosted
- version: "2.3.1"
+ version: "2.3.3"
shared_preferences_foundation:
dependency: transitive
description:
name: shared_preferences_foundation
- sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f
+ sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
url: "https://pub.dev"
source: hosted
- version: "2.5.2"
+ version: "2.5.3"
shared_preferences_linux:
dependency: transitive
description:
@@ -385,10 +385,10 @@ packages:
dependency: transitive
description:
name: synchronized
- sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255
+ sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
url: "https://pub.dev"
source: hosted
- version: "3.2.0"
+ version: "3.3.0+3"
term_glyph:
dependency: transitive
description:
@@ -409,10 +409,10 @@ packages:
dependency: "direct main"
description:
name: unicons
- sha256: "1cca7462df18ff191b7e41b52f747d08854916531d1d7ab7cec0552095995206"
+ sha256: f3eab9d87c226415ef857cfd2167e1d12ad81ea1f5783b46cf644224fea4eab7
url: "https://pub.dev"
source: hosted
- version: "2.1.2"
+ version: "3.0.0"
vector_math:
dependency: transitive
description:
@@ -425,26 +425,26 @@ packages:
dependency: transitive
description:
name: web
- sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+ sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
url: "https://pub.dev"
source: hosted
- version: "1.0.0"
+ version: "1.1.0"
win32:
dependency: transitive
description:
name: win32
- sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
+ sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
url: "https://pub.dev"
source: hosted
- version: "5.5.4"
+ version: "5.5.5"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
- sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+ sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
url: "https://pub.dev"
source: hosted
- version: "1.0.4"
+ version: "1.1.0"
sdks:
dart: ">=3.5.0 <4.0.0"
- flutter: ">=3.22.0"
+ flutter: ">=3.24.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 5aed35a13cc8474182bc2cc56401d612449f9afc..48cbb36de7f7f7289844c8ff7b01c89f43633dd5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A simple and classic memory game.
publish_to: "none"
-version: 1.0.24+25
+version: 1.0.25+26
environment:
sdk: "^3.0.0"
@@ -13,6 +13,7 @@ dependencies:
sdk: flutter
# base
+ auto_size_text: ^3.0.0
easy_localization: ^3.0.1
equatable: ^2.0.5
flutter_bloc: ^8.1.1
@@ -20,23 +21,20 @@ dependencies:
hydrated_bloc: ^9.0.0
package_info_plus: ^8.0.0
path_provider: ^2.0.11
- unicons: ^2.1.1
-
- # to remove
- cupertino_icons: ^1.0.6
+ unicons: ^3.0.0
# specific
# (none)
dev_dependencies:
- flutter_lints: ^4.0.0
+ flutter_lints: ^5.0.0
flutter:
uses-material-design: true
assets:
- assets/skins/
- - assets/ui/
- assets/translations/
+ - assets/ui/
fonts:
- family: Nunito
@@ -49,4 +47,3 @@ flutter:
weight: 400
- asset: assets/fonts/Nunito-Light.ttf
weight: 300
-
diff --git a/resources/app/build_application_resources.sh b/resources/app/build_application_resources.sh
index 6d67b8f4f9eca701d1aed7331ef41dfb0bd44f20..1ace90d0e0029bf1704122d2b60bced59d5ed348 100755
--- a/resources/app/build_application_resources.sh
+++ b/resources/app/build_application_resources.sh
@@ -1,9 +1,18 @@
#! /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; }
+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}")")"
@@ -31,14 +40,14 @@ function optimize_svg() {
cp ${SVG} ${SVG}.tmp
scour \
- --remove-descriptive-elements \
- --enable-id-stripping \
- --enable-viewboxing \
- --enable-comment-stripping \
- --nindent=4 \
- --quiet \
- -i ${SVG}.tmp \
- -o ${SVG}
+ --remove-descriptive-elements \
+ --enable-id-stripping \
+ --enable-viewboxing \
+ --enable-comment-stripping \
+ --nindent=4 \
+ --quiet \
+ -i ${SVG}.tmp \
+ -o ${SVG}
rm ${SVG}.tmp
}
@@ -57,10 +66,10 @@ function build_application_icon() {
TARGET_PNG="${TARGET}.png"
inkscape \
- --export-width=${ICON_SIZE} \
- --export-height=${ICON_SIZE} \
- --export-filename=${TARGET_PNG} \
- ${SOURCE_ICON}
+ --export-width=${ICON_SIZE} \
+ --export-height=${ICON_SIZE} \
+ --export-filename=${TARGET_PNG} \
+ ${SOURCE_ICON}
optipng ${OPTIPNG_OPTIONS} ${TARGET_PNG}
}
@@ -76,10 +85,10 @@ function build_fastlane_image() {
TARGET_PNG="${TARGET}.png"
inkscape \
- --export-width=${WIDTH} \
- --export-height=${HEIGHT} \
- --export-filename=${TARGET_PNG} \
- ${SOURCE_FASTLANE}
+ --export-width=${WIDTH} \
+ --export-height=${HEIGHT} \
+ --export-filename=${TARGET_PNG} \
+ ${SOURCE_FASTLANE}
optipng ${OPTIPNG_OPTIONS} ${TARGET_PNG}
}
@@ -94,24 +103,24 @@ function build_launch_image() {
TARGET_PNG="${TARGET}.png"
inkscape \
- --export-width=${ICON_SIZE} \
- --export-height=${ICON_SIZE} \
- --export-filename=${TARGET_PNG} \
- ${SOURCE_LAUNCH_IMAGE}
+ --export-width=${ICON_SIZE} \
+ --export-height=${ICON_SIZE} \
+ --export-filename=${TARGET_PNG} \
+ ${SOURCE_LAUNCH_IMAGE}
optipng ${OPTIPNG_OPTIONS} ${TARGET_PNG}
}
-build_application_icon 72 ${BASE_DIR}/android/app/src/main/res/mipmap-hdpi/ic_launcher
-build_application_icon 48 ${BASE_DIR}/android/app/src/main/res/mipmap-mdpi/ic_launcher
-build_application_icon 96 ${BASE_DIR}/android/app/src/main/res/mipmap-xhdpi/ic_launcher
+build_application_icon 72 ${BASE_DIR}/android/app/src/main/res/mipmap-hdpi/ic_launcher
+build_application_icon 48 ${BASE_DIR}/android/app/src/main/res/mipmap-mdpi/ic_launcher
+build_application_icon 96 ${BASE_DIR}/android/app/src/main/res/mipmap-xhdpi/ic_launcher
build_application_icon 144 ${BASE_DIR}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher
build_application_icon 192 ${BASE_DIR}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher
build_application_icon 512 ${BASE_DIR}/fastlane/metadata/android/en-US/images/icon
-build_launch_image 72 ${BASE_DIR}/android/app/src/main/res/mipmap-hdpi/launch_image
-build_launch_image 48 ${BASE_DIR}/android/app/src/main/res/mipmap-mdpi/launch_image
-build_launch_image 96 ${BASE_DIR}/android/app/src/main/res/mipmap-xhdpi/launch_image
+build_launch_image 72 ${BASE_DIR}/android/app/src/main/res/mipmap-hdpi/launch_image
+build_launch_image 48 ${BASE_DIR}/android/app/src/main/res/mipmap-mdpi/launch_image
+build_launch_image 96 ${BASE_DIR}/android/app/src/main/res/mipmap-xhdpi/launch_image
build_launch_image 144 ${BASE_DIR}/android/app/src/main/res/mipmap-xxhdpi/launch_image
build_launch_image 192 ${BASE_DIR}/android/app/src/main/res/mipmap-xxxhdpi/launch_image
diff --git a/resources/build_resources.sh b/resources/build_resources.sh
index 659697a1c043cfe1c7654635cfaec3e4a0ff8a1a..774953c5b885aae73f710aaa9d8b55a0d8dcc2c0 100755
--- a/resources/build_resources.sh
+++ b/resources/build_resources.sh
@@ -4,4 +4,3 @@ 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
-
diff --git a/resources/ui/build_ui_resources.sh b/resources/ui/build_ui_resources.sh
index 2375593637ee4aa2198bceffffa4ba668358dc05..f6c3f33201ae81b1f43cf677bb76c91e04727f33 100755
--- a/resources/ui/build_ui_resources.sh
+++ b/resources/ui/build_ui_resources.sh
@@ -1,9 +1,18 @@
#! /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; }
+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}")")"
@@ -44,14 +53,14 @@ function optimize_svg() {
cp ${SOURCE} ${SOURCE}.tmp
scour \
- --remove-descriptive-elements \
- --enable-id-stripping \
- --enable-viewboxing \
- --enable-comment-stripping \
- --nindent=4 \
- --quiet \
- -i ${SOURCE}.tmp \
- -o ${SOURCE}
+ --remove-descriptive-elements \
+ --enable-id-stripping \
+ --enable-viewboxing \
+ --enable-comment-stripping \
+ --nindent=4 \
+ --quiet \
+ -i ${SOURCE}.tmp \
+ -o ${SOURCE}
rm ${SOURCE}.tmp
}
@@ -72,10 +81,10 @@ function build_svg_image() {
mkdir -p "$(dirname "${TARGET}")"
inkscape \
- --export-width=${IMAGE_SIZE} \
- --export-height=${IMAGE_SIZE} \
- --export-filename=${TARGET} \
- "${SOURCE}"
+ --export-width=${IMAGE_SIZE} \
+ --export-height=${IMAGE_SIZE} \
+ --export-filename=${TARGET} \
+ "${SOURCE}"
optipng ${OPTIPNG_OPTIONS} "${TARGET}"
}
@@ -103,12 +112,10 @@ function build_images_for_skin() {
SKIN_CODE="$1"
# skin images
- for SKIN_SVG_IMAGE in ${SKIN_SVG_IMAGES}
- do
+ for SKIN_SVG_IMAGE in ${SKIN_SVG_IMAGES}; do
build_svg_image ${CURRENT_DIR}/skins/${SKIN_CODE}/${SKIN_SVG_IMAGE}.svg ${ASSETS_DIR}/skins/${SKIN_CODE}_${SKIN_SVG_IMAGE}.png
done
- for SKIN_PNG_IMAGE in ${SKIN_PNG_IMAGES}
- do
+ for SKIN_PNG_IMAGE in ${SKIN_PNG_IMAGES}; do
build_png_image ${CURRENT_DIR}/skins/${SKIN_CODE}/${SKIN_PNG_IMAGE}.png ${ASSETS_DIR}/skins/${SKIN_CODE}_${SKIN_PNG_IMAGE}.png
done
}
@@ -124,18 +131,14 @@ if [ -d "${ASSETS_DIR}/skins" ]; then
fi
# build game images
-for GAME_SVG_IMAGE in ${AVAILABLE_GAME_SVG_IMAGES}
-do
+for GAME_SVG_IMAGE in ${AVAILABLE_GAME_SVG_IMAGES}; do
build_svg_image ${CURRENT_DIR}/images/${GAME_SVG_IMAGE}.svg ${ASSETS_DIR}/ui/${GAME_SVG_IMAGE}.png
done
-for GAME_PNG_IMAGE in ${AVAILABLE_GAME_PNG_IMAGES}
-do
+for GAME_PNG_IMAGE in ${AVAILABLE_GAME_PNG_IMAGES}; do
build_png_image ${CURRENT_DIR}/images/${GAME_PNG_IMAGE}.png ${ASSETS_DIR}/ui/${GAME_PNG_IMAGE}.png
done
# build skins images
-for SKIN in ${AVAILABLE_SKINS}
-do
+for SKIN in ${AVAILABLE_SKINS}; do
build_images_for_skin "${SKIN}"
done
-
diff --git a/resources/ui/images/button_back.svg b/resources/ui/images/button_back.svg
index 2622a578dba53ce582afabfc587c2a85a1fb6eaa..018d8b734d2932028fbfce1643c4e888ff1b45b1 100644
--- a/resources/ui/images/button_back.svg
+++ b/resources/ui/images/button_back.svg
@@ -1,2 +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="#e41578" stroke="#fff" stroke-width=".238"/><path d="m59.387 71.362c1.1248 1.1302 4.0012 1.1302 4.0012 0v-45.921c0-1.1316-2.8832-1.1316-4.0121 0l-37.693 20.918c-1.1289 1.1248-1.1479 2.9551-0.02171 4.084z" fill="#fefeff" stroke="#930e4e" stroke-linecap="round" stroke-linejoin="round" stroke-width="8.257"/><path d="m57.857 68.048c0.96243 0.96706 3.4236 0.96706 3.4236 0v-39.292c0-0.96825-2.467-0.96825-3.4329 0l-32.252 17.898c-0.96594 0.96243-0.9822 2.5285-0.01858 3.4945z" fill="#fefeff" stroke="#feffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.314"/></svg>
+<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"><path transform="matrix(1.3783 .61747 -.61747 1.3783 45.198 93.762)" d="m11.645-14.603-44.77-4.6003 26.369-36.472z" fill="#fff" stroke="#950e4f" stroke-linecap="round" stroke-linejoin="round" stroke-width="7.2832"/></svg>
diff --git a/resources/ui/images/button_delete_saved_game.svg b/resources/ui/images/button_delete_saved_game.svg
index ac7eefef476f761903fe781b8c86d0c94323550a..c3f872e434052a6b4e7036b530ced8e6233508e4 100644
--- a/resources/ui/images/button_delete_saved_game.svg
+++ b/resources/ui/images/button_delete_saved_game.svg
@@ -1,2 +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>
+<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"><path d="m76.652 23.303-3.6441 58.302c-0.28153 4.5103-4.0223 8.0241-8.5413 8.0241h-35.27c-4.5189 0-8.2598-3.5138-8.5413-8.0241l-3.6441-58.302h-5.4824c-1.7723 0-3.2093-1.437-3.2093-3.2093 0-1.773 1.437-3.2093 3.2093-3.2093h70.605c1.7723 0 3.2093 1.4363 3.2093 3.2093 0 1.7723-1.437 3.2093-3.2093 3.2093zm-6.8314 0h-45.979l3.0819 55.867c0.12535 2.268 2.0008 4.0433 4.2732 4.0433h31.268c2.2724 0 4.1478-1.7752 4.2732-4.0433zm-22.99 6.4188c1.6541 0 2.9952 1.3411 2.9952 2.9952v41.08c0 1.6541-1.3411 2.9952-2.9952 2.9952-1.6542 0-2.9952-1.3411-2.9952-2.9952v-41.08c0-1.6541 1.3411-2.9952 2.9952-2.9952zm-12.837 0c1.6756 0 3.0553 1.3181 3.1312 2.9921l1.8776 41.3c0.06665 1.4664-1.0681 2.7087-2.5345 2.7762-0.04011 0.0015-0.08024 0.0021-0.12108 0.0021-1.5595 0-2.8476-1.2193-2.9328-2.7774l-2.253-41.3c-0.08524-1.5646 1.114-2.9012 2.6779-2.9864 0.05157-0.0029 0.10317-0.0042 0.15474-0.0042zm25.675 0c1.5667 0 2.8361 1.2694 2.8361 2.8361 0 0.05156-6.87e-4 0.10317-0.0036 0.15474l-2.2416 41.088c-0.09171 1.6778-1.4786 2.991-3.1586 2.991-1.5667 0-2.8361-1.2694-2.8361-2.8361 0-0.05156 7.31e-4 -0.10315 0.0036-0.15474l2.2417-41.088c0.09172-1.6778 1.4786-2.991 3.1586-2.991zm-21.397-25.675h17.117c4.7265 0 8.5578 3.8313 8.5578 8.5578v4.2795h-34.231v-4.2795c0-4.7265 3.8313-8.5578 8.5578-8.5578zm0.42837 6.4188c-1.4184 0-2.5675 1.1491-2.5675 2.5675v3.8512h21.394v-3.8512c0-1.4184-1.1491-2.5675-2.5675-2.5675z" fill="#fff" fill-rule="evenodd" stroke="#050200"/></svg>
diff --git a/resources/ui/images/button_resume_game.svg b/resources/ui/images/button_resume_game.svg
index 6ad8b64202d0e70f898c16c520e756fe8a934add..2bf973276aefa564ecff7d6149899298344819f9 100644
--- a/resources/ui/images/button_resume_game.svg
+++ b/resources/ui/images/button_resume_game.svg
@@ -1,2 +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>
+<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="translate(-5.618)" fill="#fff" stroke="#105ea2" stroke-linecap="round" stroke-linejoin="round"><path transform="matrix(-1.3783 -.61747 .61747 -1.3783 55.567 -.086035)" d="m11.645-14.603-44.77-4.6003 26.369-36.472z" stroke-width="7.2832"/><path d="m15.535 12.852 2e-3 67.973z" stroke-width="11"/></g></svg>
diff --git a/resources/ui/images/button_start.svg b/resources/ui/images/button_start.svg
index e9d49d2172b9a0305db82779971e3c1e12f34a70..4d7634a9f3fb559e590ee965e1341ae2634bf80f 100644
--- a/resources/ui/images/button_start.svg
+++ b/resources/ui/images/button_start.svg
@@ -1,2 +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="m34.852 25.44c-1.1248-1.1302-4.0012-1.1302-4.0012 0v45.921c0 1.1316 2.8832 1.1316 4.0121 0l37.693-20.918c1.1289-1.1248 1.1479-2.9551 0.02171-4.084z" fill="#fefeff" stroke="#105ca1" stroke-linecap="round" stroke-linejoin="round" stroke-width="8.257"/><path d="m36.382 28.754c-0.96243-0.96706-3.4236-0.96706-3.4236 0v39.292c0 0.96825 2.467 0.96825 3.4329 0l32.252-17.898c0.96594-0.96243 0.9822-2.5285 0.01858-3.4945z" fill="#fefeff" stroke="#feffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.314"/></svg>
+<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"><path transform="matrix(-1.3783 -.61747 .61747 -1.3783 46.954 -.086035)" d="m11.645-14.603-44.77-4.6003 26.369-36.472z" fill="#fff" stroke="#105ea2" stroke-linecap="round" stroke-linejoin="round" stroke-width="7.2832"/></svg>