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/32.txt b/fastlane/metadata/android/en-US/changelogs/32.txt new file mode 100644 index 0000000000000000000000000000000000000000..65ba5e83570223adc45ccea599a3487b24b8a7dd --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/32.txt @@ -0,0 +1 @@ +Use flutter_custom_toolbox for common features. diff --git a/fastlane/metadata/android/fr-FR/changelogs/32.txt b/fastlane/metadata/android/fr-FR/changelogs/32.txt new file mode 100644 index 0000000000000000000000000000000000000000..258c624fb3898d91b6b70d7d99db2719c1bf0751 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/32.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 883510dc7919c30d4ca1d2a599f865ec38f2880b..bc62accbd7069a9819432e15b93d86b71fc03bbf 100644 --- a/lib/config/default_game_settings.dart +++ b/lib/config/default_game_settings.dart @@ -1,5 +1,6 @@ +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + import 'package:sortgame/data/fetch_data_helper.dart'; -import 'package:sortgame/utils/tools.dart'; class DefaultGameSettings { // available game parameters codes diff --git a/lib/config/default_global_settings.dart b/lib/config/default_global_settings.dart index 534a8a63dde0eca7b5fce3bba2d60090d1d0bac1..d92229c2e02064684ed4a2caeb272ff63325776a 100644 --- a/lib/config/default_global_settings.dart +++ b/lib/config/default_global_settings.dart @@ -1,4 +1,4 @@ -import 'package:sortgame/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 cdf36be74964b9efc008f8c7faaf3f0e51f14ff1..bcd00bfe6466a83cad1627d9561b5c4948ad53db 100644 --- a/lib/config/menu.dart +++ b/lib/config/menu.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + import 'package:sortgame/ui/screens/page_about.dart'; import 'package:sortgame/ui/screens/page_game.dart'; import 'package:sortgame/ui/screens/page_settings.dart'; -import 'package:unicons/unicons.dart'; class MenuItem { final Icon icon; 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 eba2fa632027ae24036baeaea0dee28faf47f1da..b46cfe9905c04e349529c320d208665f3a858865 100644 --- a/lib/cubit/game_cubit.dart +++ b/lib/cubit/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:sortgame/models/game/game.dart'; import 'package:sortgame/models/settings/settings_game.dart'; diff --git a/lib/cubit/nav_cubit.dart b/lib/cubit/nav_cubit.dart index fedff47b8f3d6c8d993935cd9c65000af7bc18d8..5a3e6b65d818e29c941623d990b5f52c2760ccdf 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:sortgame/config/menu.dart'; diff --git a/lib/cubit/settings_game_cubit.dart b/lib/cubit/settings_game_cubit.dart index 5278e899570395e9b1e9682341d9bc7e9c8d0b54..708b46675528c99a19b7f53edd93cbaeab5a7ca6 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:sortgame/config/default_game_settings.dart'; import 'package:sortgame/models/settings/settings_game.dart'; diff --git a/lib/cubit/settings_global_cubit.dart b/lib/cubit/settings_global_cubit.dart index 9a404fe2c8c5e7df4da059078c5b314271f116be..ee834629bed4a5c5f47a9acf2c5648d91501e17e 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:sortgame/config/default_global_settings.dart'; import 'package:sortgame/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 db8b430300bfeccf349eadc2d2b807262745160e..a2fbc022dfbe72e381d88c2418a5d47b2abc6124 100644 --- a/lib/data/fetch_data_helper.dart +++ b/lib/data/fetch_data_helper.dart @@ -1,10 +1,11 @@ +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + import 'package:sortgame/data/game_data.dart'; import 'package:sortgame/models/data/category.dart'; import 'package:sortgame/models/data/game_item.dart'; import 'package:sortgame/models/data/game_theme.dart'; import 'package:sortgame/models/data/item.dart'; import 'package:sortgame/models/settings/settings_game.dart'; -import 'package:sortgame/utils/tools.dart'; class FetchDataHelper { FetchDataHelper(); diff --git a/lib/main.dart b/lib/main.dart index 9f5c58297d53b53321ae63063c179800dd318c5b..e76b433fb2e40dea9ebe60a9318bcc36f45938eb 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:sortgame/config/theme.dart'; import 'package:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/cubit/nav_cubit.dart'; import 'package:sortgame/cubit/settings_game_cubit.dart'; diff --git a/lib/models/game/game.dart b/lib/models/game/game.dart index bada93d62b7d1c8c73911ccc3676ffd586add488..bd8b9d8b1878f48551153e7aeb131640d38ac89d 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:sortgame/data/fetch_data_helper.dart'; import 'package:sortgame/models/data/game_item.dart'; import 'package:sortgame/models/settings/settings_game.dart'; import 'package:sortgame/models/settings/settings_global.dart'; -import 'package:sortgame/utils/tools.dart'; class Game { Game({ diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart index c8eac0da0e73b18bd8f19fcae069ac021fd7da60..d95280add731c0f3a5c5d0329cdc886e8b8c0e86 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:sortgame/config/default_game_settings.dart'; -import 'package:sortgame/utils/tools.dart'; class GameSettings { final String itemsCount; diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart index 5442540ccc3b0ef40cc59e924b50d6a2578903db..e588991923934d91b0b629a9524a9728ff691ba2 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:sortgame/config/default_global_settings.dart'; -import 'package:sortgame/utils/tools.dart'; class GlobalSettings { String skin; diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart index 115fc349c99b3b23f73567ab5d875a7b7aa4de0e..4c804851c7398e2e7e82b125b13c4809d63fd79c 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:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/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 79644ac8dfdf8c2f5f0e202225f02f62645aa281..0000000000000000000000000000000000000000 --- a/lib/ui/helpers/outlined_text_widget.dart +++ /dev/null @@ -1,51 +0,0 @@ -import 'package:flutter/material.dart'; - -import 'package:sortgame/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 83fab2e7d529185c185b872728d8faf39966fb2a..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:sortgame/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 0f3d33b6a72762a79f26aee11f2c431f7852c7e1..d8d81a596042925880c7421f6a5606b91c0420b9 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:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/models/game/game.dart'; diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart index a85d2b027b8c48e84be17ab3b2de5e07eefd912a..8c1aed6d33dacac9f365081ac83910b1bc4edf3e 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:sortgame/config/default_game_settings.dart'; import 'package:sortgame/config/default_global_settings.dart'; diff --git a/lib/ui/parameters/parameter_painter.dart b/lib/ui/parameters/parameter_painter.dart index f794fff58b2f76f3a378827955e36f670d70837a..67232f01ecc3257240efdbd335e6e45e2c21911e 100644 --- a/lib/ui/parameters/parameter_painter.dart +++ b/lib/ui/parameters/parameter_painter.dart @@ -1,10 +1,10 @@ import 'dart:math'; import 'package:flutter/material.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; import 'package:sortgame/models/settings/settings_game.dart'; import 'package:sortgame/models/settings/settings_global.dart'; -import 'package:sortgame/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 9f222fb2722d56d6741f70473debba1fe50d8804..7875d11e0c902f6040ff6d894c09b395ee07ef0e 100644 --- a/lib/ui/parameters/parameter_widget.dart +++ b/lib/ui/parameters/parameter_widget.dart @@ -1,11 +1,10 @@ import 'package:flutter/material.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; import 'package:sortgame/config/default_game_settings.dart'; import 'package:sortgame/config/default_global_settings.dart'; import 'package:sortgame/models/settings/settings_game.dart'; import 'package:sortgame/models/settings/settings_global.dart'; -import 'package:sortgame/ui/helpers/styled_button.dart'; -import 'package:sortgame/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 080fcaf3c367e0698c8e9e6a37d5e975090c9a44..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:sortgame/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 059977016b565a490329b35f141ab08f19cb6cd7..4614f77d3da85062208d0b8ba35991ecff6dafd3 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:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/models/game/game.dart'; diff --git a/lib/ui/screens/page_settings.dart b/lib/ui/screens/page_settings.dart index 508116c08a9343a72cef7b617754d3a4f48b8979..046142cbc22ab1dfa7edeecc030af25e2e106b59 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:sortgame/ui/helpers/app_titles.dart'; import 'package:sortgame/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 b9871e42582bfbf0ad8b910420869effaa368e9f..779d742cf78284d18884fa52a8e13304c368a4e1 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:sortgame/ui/settings/theme_card.dart'; diff --git a/lib/ui/settings/theme_card.dart b/lib/ui/settings/theme_card.dart index 27cdb0efb746908fae23551cc10f8d6f25288a37..7b8181eab75d928e3bcc77dd27aff18739bb1374 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:sortgame/cubit/theme_cubit.dart'; diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart index 5f76b700c9e81f02334adad48255ba83d746a294..6ca48329de3be619e7d552ac35c44daf2d98f98f 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:sortgame/config/menu.dart'; import 'package:sortgame/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 5ef1ac0de00c770668e65d5813fbadcb5c6c1d35..279319a24b51687c539c698aadaffad69f378198 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:sortgame/cubit/game_cubit.dart'; -import 'package:sortgame/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 ab82262944ab48b7885fa1c45eacc7529381c8be..29a456033497894d197430c6f0b29178fe78be04 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:sortgame/cubit/game_cubit.dart'; -import 'package:sortgame/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 a640e4c997b2770fadc0a4a5352bf7e95994dab9..f87bdeecc20a4895ae51fa0aa18129f37cda8105 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:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/cubit/settings_game_cubit.dart'; import 'package:sortgame/cubit/settings_global_cubit.dart'; -import 'package:sortgame/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 e8ac05a296d19f9899a2856eb6267829b1b5a6c3..e0a8660c5beba29a6bebfb5e79c1d0e0d7a8d5d3 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:sortgame/cubit/game_cubit.dart'; -import 'package:sortgame/ui/helpers/styled_button.dart'; class ResumeSavedGameButton extends StatelessWidget { const ResumeSavedGameButton({super.key}); diff --git a/lib/ui/widgets/game/buttons_yes_no.dart b/lib/ui/widgets/game/buttons_yes_no.dart index 0a72653cc3e3efb2f08f366295166e7ff3031f6b..7ae81b65bc5d0e11e72f4fccb1cad0e177f7e78c 100644 --- a/lib/ui/widgets/game/buttons_yes_no.dart +++ b/lib/ui/widgets/game/buttons_yes_no.dart @@ -1,8 +1,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:unicons/unicons.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; import 'package:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/models/data/category.dart'; diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart index 97b206b951594ae7c49044a377286fed014a8756..54aaec3ed8f10f33b9da897c73c75250944e36a7 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:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/models/game/game.dart'; diff --git a/lib/ui/widgets/game/game_question.dart b/lib/ui/widgets/game/game_question.dart index c51c6e07fb2f323461511db3d6df072fdba005f3..08320fb2dac28071dceb1cf15aba7196ae5c2689 100644 --- a/lib/ui/widgets/game/game_question.dart +++ b/lib/ui/widgets/game/game_question.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:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/models/data/game_item.dart'; import 'package:sortgame/models/game/game.dart'; -import 'package:sortgame/ui/helpers/outlined_text_widget.dart'; import 'package:sortgame/ui/widgets/game/buttons_yes_no.dart'; class GameQuestionWidget extends StatelessWidget { diff --git a/lib/ui/widgets/global_app_bar.dart b/lib/ui/widgets/global_app_bar.dart index 2c70aa4d727a4757c55f08b0b4b590de501e3852..53587818475551a7700dd3cad82a61488ae565c6 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:sortgame/config/menu.dart'; import 'package:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/cubit/nav_cubit.dart'; import 'package:sortgame/models/game/game.dart'; -import 'package:sortgame/ui/helpers/app_titles.dart'; -import 'package:sortgame/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_position.dart b/lib/ui/widgets/indicators/indicator_position.dart index 3966dd034e354f543d4d0041433f9f38b216315a..3ca500f60250b1af34c897a6fe3e9a16600aff4a 100644 --- a/lib/ui/widgets/indicators/indicator_position.dart +++ b/lib/ui/widgets/indicators/indicator_position.dart @@ -1,10 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; import 'package:sortgame/cubit/game_cubit.dart'; import 'package:sortgame/models/game/game.dart'; -import 'package:sortgame/ui/helpers/outlined_text_widget.dart'; -import 'package:sortgame/utils/color_extensions.dart'; class PositionIndicator extends StatelessWidget { const PositionIndicator({super.key}); diff --git a/lib/ui/widgets/indicators/indicator_score.dart b/lib/ui/widgets/indicators/indicator_score.dart index d234ea78a9b5f8a7d4f8fcc5566380a434e23a1e..ae08419db4c8139282e5b078f364b5ca8a1ac91a 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:sortgame/cubit/game_cubit.dart'; -import 'package:sortgame/ui/helpers/outlined_text_widget.dart'; -import 'package:sortgame/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 229631c1f86719287b9acdfad6debc0e9f46254d..add98fbfa6f448021ae70f955575f581ab0753d9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,20 +5,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" @@ -61,12 +61,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 @@ -82,7 +82,7 @@ packages: source: hosted version: "0.0.2" equatable: - dependency: "direct main" + dependency: transitive description: name: equatable sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 @@ -111,13 +111,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: @@ -137,7 +146,7 @@ packages: source: sdk version: "0.0.0" hive: - dependency: "direct main" + dependency: transitive description: name: hive sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941" @@ -161,7 +170,7 @@ packages: source: hosted version: "4.0.2" hydrated_bloc: - dependency: "direct main" + dependency: transitive description: name: hydrated_bloc sha256: af35b357739fe41728df10bec03aad422cdc725a1e702e03af9d2a41ea05160c @@ -209,13 +218,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: @@ -233,7 +242,7 @@ packages: source: hosted version: "1.9.0" path_provider: - dependency: "direct main" + dependency: transitive description: name: path_provider sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 @@ -284,10 +293,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: @@ -377,10 +386,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: @@ -401,12 +410,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 @@ -433,10 +442,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: @@ -446,5 +455,5 @@ packages: source: hosted version: "1.1.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 95887662bcc976385a059139f4f52453a058c0de..eea1665e474a2f700025a6737a95ff235643b42a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: A sorting game application. publish_to: "none" -version: 0.2.1+31 +version: 0.3.0+32 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 # (none) @@ -34,15 +29,3 @@ flutter: assets: - 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