diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..b0b3e1fe2543143896ee06ae7b9984f8bd038f73
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.json]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
index 361df94f91db934b411ea13244ac8db6f41f3888..54ae0222de3e722adfb2b48c14d77c4d074dafda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
.buildlog/
.history
.svn/
+migrate_working_dir/
# IntelliJ related
*.iml
diff --git a/assets/fonts/Nunito-Bold.ttf b/assets/fonts/Nunito-Bold.ttf
deleted file mode 100644
index 6519feb781449ebe0015cbc74dfd9e13110fbba9..0000000000000000000000000000000000000000
Binary files a/assets/fonts/Nunito-Bold.ttf and /dev/null differ
diff --git a/assets/fonts/Nunito-Light.ttf b/assets/fonts/Nunito-Light.ttf
deleted file mode 100644
index 8a0736c41cd6c2a1225d356bf274de1d0afc3497..0000000000000000000000000000000000000000
Binary files a/assets/fonts/Nunito-Light.ttf and /dev/null differ
diff --git a/assets/fonts/Nunito-Medium.ttf b/assets/fonts/Nunito-Medium.ttf
deleted file mode 100644
index 88fccdc0638b6f5d6ac49d9d269dc3d518618ad1..0000000000000000000000000000000000000000
Binary files a/assets/fonts/Nunito-Medium.ttf and /dev/null differ
diff --git a/assets/fonts/Nunito-Regular.ttf b/assets/fonts/Nunito-Regular.ttf
deleted file mode 100644
index e7b8375a896ef0cd8e06730a78c84532b377e784..0000000000000000000000000000000000000000
Binary files a/assets/fonts/Nunito-Regular.ttf and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/changelogs/66.txt b/fastlane/metadata/android/en-US/changelogs/66.txt
new file mode 100644
index 0000000000000000000000000000000000000000..65ba5e83570223adc45ccea599a3487b24b8a7dd
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/66.txt
@@ -0,0 +1 @@
+Use flutter_custom_toolbox for common features.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/66.txt b/fastlane/metadata/android/fr-FR/changelogs/66.txt
new file mode 100644
index 0000000000000000000000000000000000000000..258c624fb3898d91b6b70d7d99db2719c1bf0751
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/66.txt
@@ -0,0 +1 @@
+Utilisation de flutter_custom_toolbox pour les fonctionnalités communes.
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_game_settings.dart
index 7f9ba90c42705d8113fc3ee04f096d139f34c44f..46d85ed209a0741cebdde6f45555a0364727a9bf 100644
--- a/lib/config/default_game_settings.dart
+++ b/lib/config/default_game_settings.dart
@@ -1,4 +1,4 @@
-import 'package:puzzlegame/utils/tools.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
class DefaultGameSettings {
// available game parameters codes
diff --git a/lib/config/default_global_settings.dart b/lib/config/default_global_settings.dart
index 11e641bad9f4233d10dc6e8e888543199b4ed6ea..d92229c2e02064684ed4a2caeb272ff63325776a 100644
--- a/lib/config/default_global_settings.dart
+++ b/lib/config/default_global_settings.dart
@@ -1,4 +1,4 @@
-import 'package:puzzlegame/utils/tools.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
class DefaultGlobalSettings {
// available global parameters codes
diff --git a/lib/config/menu.dart b/lib/config/menu.dart
index b68e1deabe3b96fb41da4c28cc9b98f95228e576..93caa82c2242f177b38a6990764c01aa4621e174 100644
--- a/lib/config/menu.dart
+++ b/lib/config/menu.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:unicons/unicons.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/ui/screens/page_about.dart';
import 'package:puzzlegame/ui/screens/page_game.dart';
diff --git a/lib/config/theme.dart b/lib/config/theme.dart
deleted file mode 100644
index 74f532fd5abf693979118609564d29167e902009..0000000000000000000000000000000000000000
--- a/lib/config/theme.dart
+++ /dev/null
@@ -1,190 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// Colors from Tailwind CSS (v3.0) - June 2022
-///
-/// https://tailwindcss.com/docs/customizing-colors
-
-const int _primaryColor = 0xFF6366F1;
-const MaterialColor primarySwatch = MaterialColor(_primaryColor, <int, Color>{
- 50: Color(0xFFEEF2FF), // indigo-50
- 100: Color(0xFFE0E7FF), // indigo-100
- 200: Color(0xFFC7D2FE), // indigo-200
- 300: Color(0xFFA5B4FC), // indigo-300
- 400: Color(0xFF818CF8), // indigo-400
- 500: Color(_primaryColor), // indigo-500
- 600: Color(0xFF4F46E5), // indigo-600
- 700: Color(0xFF4338CA), // indigo-700
- 800: Color(0xFF3730A3), // indigo-800
- 900: Color(0xFF312E81), // indigo-900
-});
-
-const int _textColor = 0xFF64748B;
-const MaterialColor textSwatch = MaterialColor(_textColor, <int, Color>{
- 50: Color(0xFFF8FAFC), // slate-50
- 100: Color(0xFFF1F5F9), // slate-100
- 200: Color(0xFFE2E8F0), // slate-200
- 300: Color(0xFFCBD5E1), // slate-300
- 400: Color(0xFF94A3B8), // slate-400
- 500: Color(_textColor), // slate-500
- 600: Color(0xFF475569), // slate-600
- 700: Color(0xFF334155), // slate-700
- 800: Color(0xFF1E293B), // slate-800
- 900: Color(0xFF0F172A), // slate-900
-});
-
-const Color errorColor = Color(0xFFDC2626); // red-600
-
-final ColorScheme lightColorScheme = ColorScheme.light(
- primary: primarySwatch.shade500,
- secondary: primarySwatch.shade500,
- onSecondary: Colors.white,
- error: errorColor,
- onSurface: textSwatch.shade500,
- surface: textSwatch.shade50,
- surfaceContainerHighest: Colors.white,
- shadow: textSwatch.shade900.withOpacity(.1),
-);
-
-final ColorScheme darkColorScheme = ColorScheme.dark(
- primary: primarySwatch.shade500,
- secondary: primarySwatch.shade500,
- onSecondary: Colors.white,
- error: errorColor,
- onSurface: textSwatch.shade300,
- surface: const Color(0xFF262630),
- surfaceContainerHighest: const Color(0xFF282832),
- shadow: textSwatch.shade900.withOpacity(.2),
-);
-
-final ThemeData lightTheme = ThemeData(
- colorScheme: lightColorScheme,
- fontFamily: 'Nunito',
- textTheme: TextTheme(
- displayLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- displayMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- displaySmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- headlineLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- headlineMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- headlineSmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- titleLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- titleMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- titleSmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- bodyLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- bodyMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- bodySmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- labelLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- labelMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- labelSmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- ),
-);
-
-final ThemeData darkTheme = lightTheme.copyWith(
- colorScheme: darkColorScheme,
- textTheme: TextTheme(
- displayLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- displayMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- displaySmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- headlineLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- headlineMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- headlineSmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- titleLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- titleMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- titleSmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- bodyLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- bodyMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- bodySmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- labelLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- labelMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- labelSmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- ),
-);
diff --git a/lib/cubit/game_cubit.dart b/lib/cubit/game_cubit.dart
index 41f8b274a7c22fc3f23e6066740afce820629c4e..885595a2ef01f77c5be20678ad09c7f64ae6978b 100644
--- a/lib/cubit/game_cubit.dart
+++ b/lib/cubit/game_cubit.dart
@@ -2,10 +2,9 @@ import 'dart:async';
import 'dart:math';
import 'dart:typed_data';
-import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart' show rootBundle;
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:image/image.dart' as imglib;
import 'package:puzzlegame/models/game/game.dart';
diff --git a/lib/cubit/nav_cubit.dart b/lib/cubit/nav_cubit.dart
index 6f2839c50daad5736723a285304ad879ad995105..86c427025fe95b93fa4ae10962f2e011cc636ea8 100644
--- a/lib/cubit/nav_cubit.dart
+++ b/lib/cubit/nav_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/config/menu.dart';
diff --git a/lib/cubit/settings_game_cubit.dart b/lib/cubit/settings_game_cubit.dart
index 0cc90f3d61d60474f837324cb83d1a0038175f71..f3bbf6365c34aac864e1659a27423d33b92855aa 100644
--- a/lib/cubit/settings_game_cubit.dart
+++ b/lib/cubit/settings_game_cubit.dart
@@ -1,6 +1,5 @@
-import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/config/default_game_settings.dart';
import 'package:puzzlegame/models/settings/settings_game.dart';
diff --git a/lib/cubit/settings_global_cubit.dart b/lib/cubit/settings_global_cubit.dart
index aab5e8a44addc47c2426d229c866b62e35c6f47a..7f78d6223a23045a220bd4a9d58bba65d70a6d49 100644
--- a/lib/cubit/settings_global_cubit.dart
+++ b/lib/cubit/settings_global_cubit.dart
@@ -1,6 +1,5 @@
-import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/config/default_global_settings.dart';
import 'package:puzzlegame/models/settings/settings_global.dart';
diff --git a/lib/cubit/theme_cubit.dart b/lib/cubit/theme_cubit.dart
index b793e895dbb0c672d451cd403e0036c3d9ac9b42..1ecab6014c67a0393eabbf704b8b85c9e988705e 100644
--- a/lib/cubit/theme_cubit.dart
+++ b/lib/cubit/theme_cubit.dart
@@ -1,6 +1,5 @@
-import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
part 'theme_state.dart';
diff --git a/lib/data/fetch_data_helper.dart b/lib/data/fetch_data_helper.dart
index 33c50c0d6834b245fdd110f8bb0dee0b230f2f4a..449e65fd17613a2758592c158fd1992250754218 100644
--- a/lib/data/fetch_data_helper.dart
+++ b/lib/data/fetch_data_helper.dart
@@ -1,5 +1,6 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
import 'package:puzzlegame/data/game_data.dart';
-import 'package:puzzlegame/utils/tools.dart';
class FetchDataHelper {
FetchDataHelper();
diff --git a/lib/main.dart b/lib/main.dart
index 034c064ec7dcb7cac09f7d761ed54267f5174537..4ffe9093631b71940b0496fd1f44da80fe5c7f9d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,14 +1,9 @@
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';
-import 'package:path_provider/path_provider.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:puzzlegame/config/theme.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/cubit/nav_cubit.dart';
import 'package:puzzlegame/cubit/settings_game_cubit.dart';
diff --git a/lib/models/game/game.dart b/lib/models/game/game.dart
index 1d0dccef293089b1662b7f01aba54bf1203d8aa7..fd799649beaebeb34f9ab9c86372a97acedb974f 100644
--- a/lib/models/game/game.dart
+++ b/lib/models/game/game.dart
@@ -1,8 +1,9 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
import 'package:puzzlegame/data/fetch_data_helper.dart';
import 'package:puzzlegame/models/game/moving_tile.dart';
import 'package:puzzlegame/models/settings/settings_game.dart';
import 'package:puzzlegame/models/settings/settings_global.dart';
-import 'package:puzzlegame/utils/tools.dart';
class Game {
Game({
diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart
index 4ed699fb3f5119a6af2aabcdef7ad2b5836ff55f..989d6ab1e3d482c214ba0f81419ac35ef4b2df1a 100644
--- a/lib/models/settings/settings_game.dart
+++ b/lib/models/settings/settings_game.dart
@@ -1,5 +1,6 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
import 'package:puzzlegame/config/default_game_settings.dart';
-import 'package:puzzlegame/utils/tools.dart';
class GameSettings {
final String tilesetSize;
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
index 4c9879f16449d0786ae4b6396009c629cf1efbc9..07af8d65f00e14093648abae6fc75d652017b1f9 100644
--- a/lib/models/settings/settings_global.dart
+++ b/lib/models/settings/settings_global.dart
@@ -1,5 +1,6 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
import 'package:puzzlegame/config/default_global_settings.dart';
-import 'package:puzzlegame/utils/tools.dart';
class GlobalSettings {
String skin;
diff --git a/lib/ui/game/game_bottom.dart b/lib/ui/game/game_bottom.dart
index 3fb6d305abb6c129d9725fa7baa16662ef8e3708..4727a9fc8dded881e8c6f946bd3376f38272ce31 100644
--- a/lib/ui/game/game_bottom.dart
+++ b/lib/ui/game/game_bottom.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/models/game/game.dart';
diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart
index e2aeae76b6227ae8109cf036969362c98a6b53a0..e0a55fc754779ec0b1a0f987181b06cdd3c5961f 100644
--- a/lib/ui/game/game_end.dart
+++ b/lib/ui/game/game_end.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/models/game/game.dart';
diff --git a/lib/ui/game/game_top.dart b/lib/ui/game/game_top.dart
index 504e0a6164ac3c317c5c68d03b0e593f302f8f26..9554cae7fb9f2f7798893fe472048f29ad43d45f 100644
--- a/lib/ui/game/game_top.dart
+++ b/lib/ui/game/game_top.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/models/game/game.dart';
diff --git a/lib/ui/helpers/app_titles.dart b/lib/ui/helpers/app_titles.dart
deleted file mode 100644
index b98107b12fabc3114ebfbec994166b588abcf1ad..0000000000000000000000000000000000000000
--- a/lib/ui/helpers/app_titles.dart
+++ /dev/null
@@ -1,32 +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 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/helpers/outlined_text_widget.dart b/lib/ui/helpers/outlined_text_widget.dart
deleted file mode 100644
index 54ff6f748a4157ec8789a2039062901481d91861..0000000000000000000000000000000000000000
--- a/lib/ui/helpers/outlined_text_widget.dart
+++ /dev/null
@@ -1,51 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:puzzlegame/utils/color_extensions.dart';
-
-class OutlinedText extends StatelessWidget {
- const OutlinedText({
- super.key,
- required this.text,
- required this.fontSize,
- required this.textColor,
- this.outlineColor,
- });
-
- final String text;
- final double fontSize;
- final Color textColor;
- final Color? outlineColor;
-
- @override
- Widget build(BuildContext context) {
- final double delta = fontSize / 30;
-
- return Text(
- text,
- style: TextStyle(
- inherit: true,
- fontSize: fontSize,
- fontWeight: FontWeight.w600,
- color: textColor,
- shadows: [
- Shadow(
- offset: Offset(-delta, -delta),
- color: outlineColor ?? textColor.darken(),
- ),
- Shadow(
- offset: Offset(delta, -delta),
- color: outlineColor ?? textColor.darken(),
- ),
- Shadow(
- offset: Offset(delta, delta),
- color: outlineColor ?? textColor.darken(),
- ),
- Shadow(
- offset: Offset(-delta, delta),
- color: outlineColor ?? textColor.darken(),
- ),
- ],
- ),
- );
- }
-}
diff --git a/lib/ui/helpers/styled_button.dart b/lib/ui/helpers/styled_button.dart
deleted file mode 100644
index 2000604dbc518d210cb8d00ea1b9c20eceffbf59..0000000000000000000000000000000000000000
--- a/lib/ui/helpers/styled_button.dart
+++ /dev/null
@@ -1,210 +0,0 @@
-import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/material.dart';
-
-import 'package:puzzlegame/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/game_layout.dart b/lib/ui/layouts/game_layout.dart
index ed8f35329b799731dc7953379179e8db97cb7204..81c2ad4e221d08e2109ac60146c6aa3718ef72a4 100644
--- a/lib/ui/layouts/game_layout.dart
+++ b/lib/ui/layouts/game_layout.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/models/game/game.dart';
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
index c3bd214f82923ea5d9a195d1805dc11e9e3b8af1..554a08619c3158d6bc5b33eeab2c1e536f537485 100644
--- a/lib/ui/layouts/parameters_layout.dart
+++ b/lib/ui/layouts/parameters_layout.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/config/default_game_settings.dart';
import 'package:puzzlegame/config/default_global_settings.dart';
diff --git a/lib/ui/parameters/parameter_painter.dart b/lib/ui/parameters/parameter_painter.dart
index cdb2e8d5f5fc35bae9bd1855db83493a29d03967..abd8f42c4304e12c90ae6a05d103b8026ecccf87 100644
--- a/lib/ui/parameters/parameter_painter.dart
+++ b/lib/ui/parameters/parameter_painter.dart
@@ -1,11 +1,11 @@
import 'dart:math';
import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/config/default_game_settings.dart';
import 'package:puzzlegame/models/settings/settings_game.dart';
import 'package:puzzlegame/models/settings/settings_global.dart';
-import 'package:puzzlegame/utils/tools.dart';
class ParameterPainter extends CustomPainter {
const ParameterPainter({
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/ui/parameters/parameter_widget.dart
index 2eae5adb4b3b77dc2f0c29cdbc80f2413ddfec33..08c7afa63c92fe3fe9100df40a682fed694b537c 100644
--- a/lib/ui/parameters/parameter_widget.dart
+++ b/lib/ui/parameters/parameter_widget.dart
@@ -1,12 +1,11 @@
import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/config/default_game_settings.dart';
import 'package:puzzlegame/config/default_global_settings.dart';
import 'package:puzzlegame/models/settings/settings_game.dart';
import 'package:puzzlegame/models/settings/settings_global.dart';
-import 'package:puzzlegame/ui/helpers/styled_button.dart';
import 'package:puzzlegame/ui/parameters/parameter_painter.dart';
-import 'package:puzzlegame/utils/tools.dart';
class ParameterWidget extends StatelessWidget {
const ParameterWidget({
diff --git a/lib/ui/screens/page_about.dart b/lib/ui/screens/page_about.dart
index 6716b349eb595de1c62c24cc6713b44e379d0f7f..ab73e304b8138295f6669330b928e0d1d0263565 100644
--- a/lib/ui/screens/page_about.dart
+++ b/lib/ui/screens/page_about.dart
@@ -1,8 +1,5 @@
-import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-
-import 'package:puzzlegame/ui/helpers/app_titles.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
class PageAbout extends StatelessWidget {
const PageAbout({super.key});
diff --git a/lib/ui/screens/page_game.dart b/lib/ui/screens/page_game.dart
index d4661980dc22b9528ba990c0bed6552f12cf7864..6f280a9ede833433336c7b2422f23b5c731b074b 100644
--- a/lib/ui/screens/page_game.dart
+++ b/lib/ui/screens/page_game.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/models/game/game.dart';
diff --git a/lib/ui/screens/page_settings.dart b/lib/ui/screens/page_settings.dart
index abc6288e3d125c1db006de636b804b81eb9ee5ca..14160564e1ede7acd63d7aa2e8827140509f1e43 100644
--- a/lib/ui/screens/page_settings.dart
+++ b/lib/ui/screens/page_settings.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:puzzlegame/ui/helpers/app_titles.dart';
import 'package:puzzlegame/ui/settings/settings_form.dart';
class PageSettings extends StatelessWidget {
diff --git a/lib/ui/settings/settings_form.dart b/lib/ui/settings/settings_form.dart
index e4e513f0e67174394667df6b1384190f2941bdde..38fbe91b8c7e23afca02a43bc7c8a0a244a4e377 100644
--- a/lib/ui/settings/settings_form.dart
+++ b/lib/ui/settings/settings_form.dart
@@ -1,6 +1,5 @@
-import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
-import 'package:unicons/unicons.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/ui/settings/theme_card.dart';
diff --git a/lib/ui/settings/theme_card.dart b/lib/ui/settings/theme_card.dart
index 1f4402957890c05e9ba81736ecfdf5fc1b7b90e3..6e96a15883985017e391383a17079d5d8120f292 100644
--- a/lib/ui/settings/theme_card.dart
+++ b/lib/ui/settings/theme_card.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/theme_cubit.dart';
diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart
index 257ed0b335c25d4ccbdf786f2dab82a2f8f2fcec..bcb33b5bb5bd83f46985b6db74881092b75c45c6 100644
--- a/lib/ui/skeleton.dart
+++ b/lib/ui/skeleton.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/config/menu.dart';
import 'package:puzzlegame/cubit/nav_cubit.dart';
diff --git a/lib/ui/widgets/actions/button_delete_saved_game.dart b/lib/ui/widgets/actions/button_delete_saved_game.dart
index 053cfd3e8b8bad836797bbf20279c2a0e9d77c70..28c215635e52e06cf72bacb6b041eadeab0b9056 100644
--- a/lib/ui/widgets/actions/button_delete_saved_game.dart
+++ b/lib/ui/widgets/actions/button_delete_saved_game.dart
@@ -1,8 +1,7 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
-import 'package:puzzlegame/ui/helpers/styled_button.dart';
class DeleteSavedGameButton extends StatelessWidget {
const DeleteSavedGameButton({super.key});
diff --git a/lib/ui/widgets/actions/button_game_quit.dart b/lib/ui/widgets/actions/button_game_quit.dart
index 5a9f3f45ab10802d1fd532f5985b3cc37430f97d..9ef197ae16883cf6f3f1e95f78d77d97b75d4203 100644
--- a/lib/ui/widgets/actions/button_game_quit.dart
+++ b/lib/ui/widgets/actions/button_game_quit.dart
@@ -1,8 +1,7 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
-import 'package:puzzlegame/ui/helpers/styled_button.dart';
class QuitGameButton extends StatelessWidget {
const QuitGameButton({super.key});
diff --git a/lib/ui/widgets/actions/button_game_start_new.dart b/lib/ui/widgets/actions/button_game_start_new.dart
index 61a2fca9518edf2bdf9914817ca07950a5b0cecf..cc904c5c10b5340fc496f1c21e134a039a227316 100644
--- a/lib/ui/widgets/actions/button_game_start_new.dart
+++ b/lib/ui/widgets/actions/button_game_start_new.dart
@@ -1,10 +1,9 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/cubit/settings_game_cubit.dart';
import 'package:puzzlegame/cubit/settings_global_cubit.dart';
-import 'package:puzzlegame/ui/helpers/styled_button.dart';
class StartNewGameButton extends StatelessWidget {
const StartNewGameButton({super.key});
diff --git a/lib/ui/widgets/actions/button_resume_saved_game.dart b/lib/ui/widgets/actions/button_resume_saved_game.dart
index b23dabd6bae5ea17525004639561ffcfbd8a9fea..e3490118c253812f4b85092134a2656187ee59b8 100644
--- a/lib/ui/widgets/actions/button_resume_saved_game.dart
+++ b/lib/ui/widgets/actions/button_resume_saved_game.dart
@@ -1,8 +1,7 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
-import 'package:puzzlegame/ui/helpers/styled_button.dart';
class ResumeSavedGameButton extends StatelessWidget {
const ResumeSavedGameButton({super.key});
diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
index ea15c33e1f93f3a78325dbab33648ad993fe5820..8150970952a85e81f03d0bb00f5b4fb72884904b 100644
--- a/lib/ui/widgets/game/game_board.dart
+++ b/lib/ui/widgets/game/game_board.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/models/game/game.dart';
diff --git a/lib/ui/widgets/game/game_tile.dart b/lib/ui/widgets/game/game_tile.dart
index c3bf98c5ca8f271676b03e537d7b843d597ecbf7..92646344136dd1cd18046dca8dcf20e898668e53 100644
--- a/lib/ui/widgets/game/game_tile.dart
+++ b/lib/ui/widgets/game/game_tile.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/models/game/moving_tile.dart';
diff --git a/lib/ui/widgets/game/game_tileset.dart b/lib/ui/widgets/game/game_tileset.dart
index fdeeb9fb1c968135eee81aa03525830c34814d4b..b45b01adc9dc69e16a03a3e0bd24f41f0d1ae46a 100644
--- a/lib/ui/widgets/game/game_tileset.dart
+++ b/lib/ui/widgets/game/game_tileset.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/models/game/game.dart';
diff --git a/lib/ui/widgets/game/game_tip.dart b/lib/ui/widgets/game/game_tip.dart
index dc5a3d181931fc03a5f2ec8b0ecbb92cda4d5d5d..a27e14d0eff49b96e4ba08599718cf52ae651631 100644
--- a/lib/ui/widgets/game/game_tip.dart
+++ b/lib/ui/widgets/game/game_tip.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/models/game/game.dart';
diff --git a/lib/ui/widgets/global_app_bar.dart b/lib/ui/widgets/global_app_bar.dart
index be38f02e263ad19257844b521e3d340daefb1467..108b301d03e5eec02d914d2f1240dee85a441a76 100644
--- a/lib/ui/widgets/global_app_bar.dart
+++ b/lib/ui/widgets/global_app_bar.dart
@@ -1,12 +1,10 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/config/menu.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/cubit/nav_cubit.dart';
import 'package:puzzlegame/models/game/game.dart';
-import 'package:puzzlegame/ui/helpers/app_titles.dart';
-import 'package:puzzlegame/ui/helpers/styled_button.dart';
class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
const GlobalAppBar({super.key});
@@ -38,7 +36,7 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
// go to Settings page
menuActions.add(ElevatedButton(
onPressed: () {
- context.read<NavCubit>().goToSettingsPage();
+ BlocProvider.of<NavCubit>(context).goToSettingsPage();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
@@ -49,7 +47,7 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
// go to About page
menuActions.add(ElevatedButton(
onPressed: () {
- context.read<NavCubit>().goToAboutPage();
+ BlocProvider.of<NavCubit>(context).goToAboutPage();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
@@ -60,7 +58,7 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
// back to Home page
menuActions.add(ElevatedButton(
onPressed: () {
- context.read<NavCubit>().goToGamePage();
+ BlocProvider.of<NavCubit>(context).goToGamePage();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
diff --git a/lib/ui/widgets/indicators/indicator_score.dart b/lib/ui/widgets/indicators/indicator_score.dart
index 349f715b1e0990beeb38b224b1e1d3679a9cc7cc..b2692d4baa739c222e4a859698513c7c17361caf 100644
--- a/lib/ui/widgets/indicators/indicator_score.dart
+++ b/lib/ui/widgets/indicators/indicator_score.dart
@@ -1,9 +1,7 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:puzzlegame/cubit/game_cubit.dart';
-import 'package:puzzlegame/ui/helpers/outlined_text_widget.dart';
-import 'package:puzzlegame/utils/color_extensions.dart';
class ScoreIndicator extends StatelessWidget {
const ScoreIndicator({super.key});
diff --git a/lib/utils/color_extensions.dart b/lib/utils/color_extensions.dart
deleted file mode 100644
index 4e55e338f0d3ed98b233d1ef887b7b3e17e29d97..0000000000000000000000000000000000000000
--- a/lib/utils/color_extensions.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-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/lib/utils/tools.dart b/lib/utils/tools.dart
deleted file mode 100644
index fd48b2b009b80b22248d6e7f08a63e96c4065bd7..0000000000000000000000000000000000000000
--- a/lib/utils/tools.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'package:flutter/foundation.dart';
-
-void printlog(String message) {
- if (!kReleaseMode) {
- debugPrint(message);
- }
-}
diff --git a/pubspec.lock b/pubspec.lock
index c59382729c5b467f2ff0750b3c5b59d249bec57c..c5006ee6b8271559448e362d35660a41a518927b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -13,20 +13,20 @@ packages:
dependency: transitive
description:
name: args
- sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+ sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
url: "https://pub.dev"
source: hosted
- version: "2.5.0"
+ version: "2.6.0"
async:
dependency: transitive
description:
name: async
- sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+ sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev"
source: hosted
- version: "2.11.0"
+ version: "2.12.0"
auto_size_text:
- dependency: "direct main"
+ dependency: transitive
description:
name: auto_size_text
sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599"
@@ -69,12 +69,12 @@ packages:
dependency: transitive
description:
name: crypto
- sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
+ sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
url: "https://pub.dev"
source: hosted
- version: "3.0.5"
+ version: "3.0.6"
easy_localization:
- dependency: "direct main"
+ dependency: transitive
description:
name: easy_localization
sha256: fa59bcdbbb911a764aa6acf96bbb6fa7a5cf8234354fc45ec1a43a0349ef0201
@@ -90,7 +90,7 @@ packages:
source: hosted
version: "0.0.2"
equatable:
- dependency: "direct main"
+ dependency: transitive
description:
name: equatable
sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
@@ -119,13 +119,22 @@ packages:
source: sdk
version: "0.0.0"
flutter_bloc:
- dependency: "direct main"
+ dependency: transitive
description:
name: flutter_bloc
sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
url: "https://pub.dev"
source: hosted
version: "8.1.6"
+ flutter_custom_toolbox:
+ dependency: "direct main"
+ description:
+ path: "."
+ ref: "0.1.1"
+ resolved-ref: ba7137ca9edec7e503ed3dbfe7f6ede7e9cfbf4d
+ url: "https://git.harrault.fr/android/flutter-toolbox.git"
+ source: git
+ version: "0.1.1"
flutter_lints:
dependency: "direct dev"
description:
@@ -145,7 +154,7 @@ packages:
source: sdk
version: "0.0.0"
hive:
- dependency: "direct main"
+ dependency: transitive
description:
name: hive
sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941"
@@ -169,7 +178,7 @@ packages:
source: hosted
version: "4.0.2"
hydrated_bloc:
- dependency: "direct main"
+ dependency: transitive
description:
name: hydrated_bloc
sha256: af35b357739fe41728df10bec03aad422cdc725a1e702e03af9d2a41ea05160c
@@ -180,10 +189,10 @@ packages:
dependency: "direct main"
description:
name: image
- sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
+ sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
url: "https://pub.dev"
source: hosted
- version: "4.2.0"
+ version: "4.3.0"
intl:
dependency: transitive
description:
@@ -225,13 +234,13 @@ packages:
source: hosted
version: "1.0.0"
package_info_plus:
- dependency: "direct main"
+ dependency: transitive
description:
name: package_info_plus
- sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef"
+ sha256: df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998
url: "https://pub.dev"
source: hosted
- version: "8.0.3"
+ version: "8.1.0"
package_info_plus_platform_interface:
dependency: transitive
description:
@@ -249,7 +258,7 @@ packages:
source: hosted
version: "1.9.0"
path_provider:
- dependency: "direct main"
+ dependency: transitive
description:
name: path_provider
sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
@@ -308,10 +317,10 @@ packages:
dependency: transitive
description:
name: platform
- sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+ sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
url: "https://pub.dev"
source: hosted
- version: "3.1.5"
+ version: "3.1.6"
plugin_platform_interface:
dependency: transitive
description:
@@ -401,10 +410,10 @@ packages:
dependency: transitive
description:
name: string_scanner
- sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+ sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
url: "https://pub.dev"
source: hosted
- version: "1.3.0"
+ version: "1.4.0"
synchronized:
dependency: transitive
description:
@@ -425,12 +434,12 @@ packages:
dependency: transitive
description:
name: typed_data
- sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+ sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
url: "https://pub.dev"
source: hosted
- version: "1.3.2"
+ version: "1.4.0"
unicons:
- dependency: "direct main"
+ dependency: transitive
description:
name: unicons
sha256: f3eab9d87c226415ef857cfd2167e1d12ad81ea1f5783b46cf644224fea4eab7
@@ -457,10 +466,10 @@ packages:
dependency: transitive
description:
name: win32
- sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
+ sha256: "2735daae5150e8b1dfeb3eb0544b4d3af0061e9e82cef063adcd583bdae4306a"
url: "https://pub.dev"
source: hosted
- version: "5.5.5"
+ version: "5.7.0"
xdg_directories:
dependency: transitive
description:
@@ -478,5 +487,5 @@ packages:
source: hosted
version: "6.5.0"
sdks:
- dart: ">=3.5.0 <4.0.0"
+ dart: ">=3.5.3 <4.0.0"
flutter: ">=3.24.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 2c0eb8be33d6a51a629a1b6630c3d8b7e041ec57..e6b60b81fea31278fc088b69bb1b7ac162eb96f4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A puzzle game application.
publish_to: "none"
-version: 0.2.1+65
+version: 0.3.0+66
environment:
sdk: "^3.0.0"
@@ -13,15 +13,10 @@ dependencies:
sdk: flutter
# base
- auto_size_text: ^3.0.0
- easy_localization: ^3.0.1
- equatable: ^2.0.5
- flutter_bloc: ^8.1.1
- hive: ^2.2.3
- hydrated_bloc: ^9.0.0
- package_info_plus: ^8.0.0
- path_provider: ^2.0.11
- unicons: ^3.0.0
+ flutter_custom_toolbox:
+ git:
+ url: https://git.harrault.fr/android/flutter-toolbox.git
+ ref: 0.1.1
# specific
image: ^4.1.3
@@ -35,15 +30,3 @@ flutter:
- assets/images/
- assets/translations/
- assets/ui/
-
- fonts:
- - family: Nunito
- fonts:
- - asset: assets/fonts/Nunito-Bold.ttf
- weight: 700
- - asset: assets/fonts/Nunito-Medium.ttf
- weight: 500
- - asset: assets/fonts/Nunito-Regular.ttf
- weight: 400
- - asset: assets/fonts/Nunito-Light.ttf
- weight: 300