diff --git a/.editorconfig b/.editorconfig index 8d86e4518e450377768d1de80adafba87984a148..b0b3e1fe2543143896ee06ae7b9984f8bd038f73 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,5 +11,8 @@ 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/76.txt b/fastlane/metadata/android/en-US/changelogs/76.txt new file mode 100644 index 0000000000000000000000000000000000000000..65ba5e83570223adc45ccea599a3487b24b8a7dd --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/76.txt @@ -0,0 +1 @@ +Use flutter_custom_toolbox for common features. diff --git a/fastlane/metadata/android/fr-FR/changelogs/76.txt b/fastlane/metadata/android/fr-FR/changelogs/76.txt new file mode 100644 index 0000000000000000000000000000000000000000..258c624fb3898d91b6b70d7d99db2719c1bf0751 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/76.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 5f40e12f49a2ca755b041109d0fbf16019c7cf7d..00d8e20dd7e6853ab97ee9c5ffc3e994479d4623 100644 --- a/lib/config/default_game_settings.dart +++ b/lib/config/default_game_settings.dart @@ -1,4 +1,4 @@ -import 'package:sudoku/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 e115b4330b63330bbd7be962a4f3ee9eb7a3cc81..e1c7b20dc0c16ddce5697749fa7a2dcd3a02aa2a 100644 --- a/lib/config/default_global_settings.dart +++ b/lib/config/default_global_settings.dart @@ -1,4 +1,4 @@ -import 'package:sudoku/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 64fb1ac637edb15b3c81d8724e42e4064defd19c..d3c7f1e7c10b0b14424703e8f0b943119e776dd9 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:sudoku/ui/screens/page_about.dart'; import 'package:sudoku/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 1fca0d001544ca665042d18c350f522d767e0e91..0faf02ae65ea6778b03818cc739843f2a21bf6b7 100644 --- a/lib/cubit/game_cubit.dart +++ b/lib/cubit/game_cubit.dart @@ -1,11 +1,10 @@ import 'dart:async'; import 'dart:math'; -import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; -import 'package:hydrated_bloc/hydrated_bloc.dart'; -import 'package:sudoku/config/default_global_settings.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; +import 'package:sudoku/config/default_global_settings.dart'; import 'package:sudoku/models/game/cell.dart'; import 'package:sudoku/models/game/cell_location.dart'; import 'package:sudoku/models/game/game.dart'; diff --git a/lib/cubit/nav_cubit.dart b/lib/cubit/nav_cubit.dart index dda1a09275a96a6f78235db246ccf9a11739f78b..b224fae946671af23e7cbc8eb2f4b05fc8bf1448 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:sudoku/config/menu.dart'; diff --git a/lib/cubit/settings_game_cubit.dart b/lib/cubit/settings_game_cubit.dart index 2ac251742867c9975bcb28831881942aa226eb0e..65111b0ec024e045c6bf304db11b39d94effbe16 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:sudoku/config/default_game_settings.dart'; import 'package:sudoku/models/settings/settings_game.dart'; diff --git a/lib/cubit/settings_global_cubit.dart b/lib/cubit/settings_global_cubit.dart index f14c602e46a2afb8d0c85ad3d65013f9fd50ff22..e37f2e359bba20b5732b0d6cfcc09671cdb13d8e 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:sudoku/config/default_global_settings.dart'; import 'package:sudoku/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/main.dart b/lib/main.dart index c6929f767649ddf90915e9c7b5d7f20f34606c23..d6f6b9d14a5ea586fdfacb19c4050a7be687a110 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,15 +1,10 @@ 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:sudoku/config/default_global_settings.dart'; -import 'package:sudoku/config/theme.dart'; import 'package:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/cubit/nav_cubit.dart'; import 'package:sudoku/cubit/settings_game_cubit.dart'; diff --git a/lib/models/game/board.dart b/lib/models/game/board.dart index 852cc2195c2d58fe4f5517a50cb4de64d43eb309..aa6d6df2e24d5dfbd6770dc7681949931985fe22 100644 --- a/lib/models/game/board.dart +++ b/lib/models/game/board.dart @@ -1,9 +1,10 @@ import 'dart:math'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + import 'package:sudoku/models/game/cell.dart'; import 'package:sudoku/models/game/cell_location.dart'; import 'package:sudoku/models/game/types.dart'; -import 'package:sudoku/utils/tools.dart'; class Board { Board({ diff --git a/lib/models/game/cell.dart b/lib/models/game/cell.dart index 8da6e6a28db6151b55d799dc51b67ebdbf828cfb..ffd7e63567c15754eae955fe69404b34573e6228 100644 --- a/lib/models/game/cell.dart +++ b/lib/models/game/cell.dart @@ -1,5 +1,6 @@ +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + import 'package:sudoku/models/game/cell_location.dart'; -import 'package:sudoku/utils/tools.dart'; class Cell { const Cell({ diff --git a/lib/models/game/cell_location.dart b/lib/models/game/cell_location.dart index e3c14a8c27cc1368afb9fdd30d4683206c9df987..faab76a9b8941302457f763d3bb869f94944e850 100644 --- a/lib/models/game/cell_location.dart +++ b/lib/models/game/cell_location.dart @@ -1,4 +1,4 @@ -import 'package:sudoku/utils/tools.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; class CellLocation { final int col; diff --git a/lib/models/game/game.dart b/lib/models/game/game.dart index c59d00101f803503025531a00493b0521fa3fcf4..e8490ff8310dcaf57d9fe49f9a1e29e8a85a6808 100644 --- a/lib/models/game/game.dart +++ b/lib/models/game/game.dart @@ -1,5 +1,7 @@ import 'dart:math'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + import 'package:sudoku/config/default_global_settings.dart'; import 'package:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/data/game_data.dart'; @@ -9,7 +11,6 @@ import 'package:sudoku/models/game/cell_location.dart'; import 'package:sudoku/models/game/types.dart'; import 'package:sudoku/models/settings/settings_game.dart'; import 'package:sudoku/models/settings/settings_global.dart'; -import 'package:sudoku/utils/tools.dart'; class Game { Game({ diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart index 17380bd51c0851df263b635596666cb9f1bd17a7..5b7c005acb218c4874b7802dd37b42c28d1147b8 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:sudoku/config/default_game_settings.dart'; -import 'package:sudoku/utils/tools.dart'; class GameSettings { final String level; diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart index b96912020563dd4ace4494be96626d80f8da65d6..058d424d6549280f1da5febd88c11e4dba40bd99 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:sudoku/config/default_global_settings.dart'; -import 'package:sudoku/utils/tools.dart'; class GlobalSettings { String skin; diff --git a/lib/ui/game/game_bottom.dart b/lib/ui/game/game_bottom.dart index 954defbe05eb232d3bb9f068093795fe7dff31c3..e6e358d1a1a827ed3cb5d8838bec2772e992d5bf 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:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/game.dart'; diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart index 621336777cd00d8b893dbe3191373bc3b21c2f14..62f2bcddf89514b2b7104b74d4911165d5d904ab 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:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/game.dart'; diff --git a/lib/ui/game/game_top.dart b/lib/ui/game/game_top.dart index 5bac69a675b68fae7d3fc6f8ec8f45f37bf9e545..32aace448a3446ec553986c4168515e08bad2587 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:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/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 342eb310db85d9cf969b70003d514441d3794a11..0000000000000000000000000000000000000000 --- a/lib/ui/helpers/outlined_text_widget.dart +++ /dev/null @@ -1,51 +0,0 @@ -import 'package:flutter/material.dart'; - -import 'package:sudoku/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 c6102e762db803e22d3dcf5b8a3cd0d8a0d48525..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:sudoku/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 349f9c241d67edea6675543e659e97b473cef748..0798d0b8cca614dfb7b8036c91585c15efd46950 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:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/game.dart'; diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart index dcb46b68963859294745891612b9d9688ffa8df7..5a16634da4c2bdb932eea9129199f67ed6a123e1 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:sudoku/config/default_game_settings.dart'; import 'package:sudoku/config/default_global_settings.dart'; diff --git a/lib/ui/parameters/parameter_painter.dart b/lib/ui/parameters/parameter_painter.dart index 90757c182e7f6e3ddea577af5292a301209b44d8..e83e6fb1aa76a727141fb19bc2fb1e971f036579 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:sudoku/config/default_game_settings.dart'; import 'package:sudoku/models/settings/settings_game.dart'; import 'package:sudoku/models/settings/settings_global.dart'; -import 'package:sudoku/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 03d0d171b2a7df73373712a104c05a26a5d1c5fb..09eb967e7afd90a0fb2d4964368f2a193c4c573c 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:sudoku/config/default_game_settings.dart'; import 'package:sudoku/config/default_global_settings.dart'; import 'package:sudoku/models/settings/settings_game.dart'; import 'package:sudoku/models/settings/settings_global.dart'; -import 'package:sudoku/ui/helpers/styled_button.dart'; import 'package:sudoku/ui/parameters/parameter_painter.dart'; -import 'package:sudoku/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 f007546869db855ce8f714854307efd1b733fa7f..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:sudoku/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 e3a72cde236a4f017b9ab6a72abfce22ba0f03f0..cdd15d84e52574ecb5ccbe1e3fc50aa924044590 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:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/game.dart'; diff --git a/lib/ui/screens/page_settings.dart b/lib/ui/screens/page_settings.dart index 308e42063b987cc7a00b57f8da4a0d779289e66a..efd7fa5cf17d2564f1a97ce2324b82d3199e3ddf 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:sudoku/ui/helpers/app_titles.dart'; import 'package:sudoku/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 bbde015eed9d2a43e0c1fdc0f4cd24314805920e..6ee0f014747c6575e062a5a4887e76750f457bcb 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:sudoku/ui/settings/theme_card.dart'; diff --git a/lib/ui/settings/theme_card.dart b/lib/ui/settings/theme_card.dart index 39b3d6de49c7445a98b62c08a76948968d986643..6f39e8581bebe0383b4e04bd6d5b3773db251f19 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:sudoku/cubit/theme_cubit.dart'; diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart index dc4027b379ff137d67d1b97c423f212526d1b8e6..f235f48d501f7d2dd3a68d638cecbe6ea15acb32 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:sudoku/config/menu.dart'; import 'package:sudoku/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 dc9b55283975c8c98214b7e4bcd697693d8c0c8e..dea6d4fa92efb3a66d54eeeef0e2b0b01d729747 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:sudoku/cubit/game_cubit.dart'; -import 'package:sudoku/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 b3b7cfb34ced9c4968762389d1c59808aeeb0627..56d80c9e1c5f37faa5d44589e94bad2131a294ed 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:sudoku/cubit/game_cubit.dart'; -import 'package:sudoku/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 2b69947ee7a05ef45ee422eaeebc25ddd1591e4c..87ecf843e23c373f14a91bb044e8da4e586e9132 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:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/cubit/settings_game_cubit.dart'; import 'package:sudoku/cubit/settings_global_cubit.dart'; -import 'package:sudoku/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 0ab9f5b30e3328c47217746e34e3656e2d261471..3b45393a362cd63ed7d940aacf9f946c30e74580 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:sudoku/cubit/game_cubit.dart'; -import 'package:sudoku/ui/helpers/styled_button.dart'; class ResumeSavedGameButton extends StatelessWidget { const ResumeSavedGameButton({super.key}); diff --git a/lib/ui/widgets/game/bar_select_cell_value.dart b/lib/ui/widgets/game/bar_select_cell_value.dart index 875135122c80fa6765da1446e1eaf55451f556a4..be62f999868173b3f393cbef8af68b5c7e0d9a8f 100644 --- a/lib/ui/widgets/game/bar_select_cell_value.dart +++ b/lib/ui/widgets/game/bar_select_cell_value.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; import 'package:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/cell.dart'; diff --git a/lib/ui/widgets/game/button_show_conflicts.dart b/lib/ui/widgets/game/button_show_conflicts.dart index e077306aed958f14ac74eb0e171381536b4fa57a..0ba35cf38196892eeb74860135dd6867f891528e 100644 --- a/lib/ui/widgets/game/button_show_conflicts.dart +++ b/lib/ui/widgets/game/button_show_conflicts.dart @@ -1,9 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; import 'package:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/game.dart'; -import 'package:sudoku/ui/helpers/styled_button.dart'; class ButtonShowConflicts extends StatelessWidget { const ButtonShowConflicts({super.key}); diff --git a/lib/ui/widgets/game/button_show_tip.dart b/lib/ui/widgets/game/button_show_tip.dart index ce66b0ab380a8ac0141542410618cda149a50b8f..55dc9044a8c7e40f160b7a142eb1afcc23013bfb 100644 --- a/lib/ui/widgets/game/button_show_tip.dart +++ b/lib/ui/widgets/game/button_show_tip.dart @@ -1,11 +1,10 @@ import 'package:badges/badges.dart' as badges; import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; import 'package:sudoku/config/default_global_settings.dart'; import 'package:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/game.dart'; -import 'package:sudoku/ui/helpers/styled_button.dart'; class ButtonShowTip extends StatelessWidget { const ButtonShowTip({super.key}); diff --git a/lib/ui/widgets/game/cell.dart b/lib/ui/widgets/game/cell.dart index 2a7c4f9bf83217bbd82c7e042dc8b5e67c60e439..f85f9bbcfb8a45ea88e61c7199750736205b046f 100644 --- a/lib/ui/widgets/game/cell.dart +++ b/lib/ui/widgets/game/cell.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:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/cell.dart'; diff --git a/lib/ui/widgets/game/cell_update.dart b/lib/ui/widgets/game/cell_update.dart index 629829e3a4a4915a339bd7af9539874421fc8786..c4a09d41c6d5613d80762d3f9b2082cd2faa2a8c 100644 --- a/lib/ui/widgets/game/cell_update.dart +++ b/lib/ui/widgets/game/cell_update.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:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/cell.dart'; diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart index 559a6c07dd3474b2cecac00f08973e7259fae3bd..de98e555986df1a8255d277c93437e6a67402900 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:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/models/game/cell_location.dart'; diff --git a/lib/ui/widgets/global_app_bar.dart b/lib/ui/widgets/global_app_bar.dart index 2a168d0808db4a010593c103164a3c0c7b8e0894..d7b499bf0abe773ada40004a7a74ea9edb3ecc2d 100644 --- a/lib/ui/widgets/global_app_bar.dart +++ b/lib/ui/widgets/global_app_bar.dart @@ -1,11 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; import 'package:sudoku/config/menu.dart'; import 'package:sudoku/cubit/game_cubit.dart'; import 'package:sudoku/cubit/nav_cubit.dart'; import 'package:sudoku/models/game/game.dart'; -import 'package:sudoku/ui/helpers/styled_button.dart'; class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget { const GlobalAppBar({super.key}); @@ -38,7 +37,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 +48,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 +59,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/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 ab16f391c1fad53f4dd461ba19b69feed987136c..8f63352d983f27575ae3c78f86036c7f336d8dc9 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" @@ -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 @@ -217,13 +226,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: @@ -241,7 +250,7 @@ packages: source: hosted version: "1.9.0" path_provider: - dependency: "direct main" + dependency: transitive description: name: path_provider sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 @@ -292,10 +301,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: @@ -385,10 +394,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: @@ -409,12 +418,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 @@ -441,10 +450,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: @@ -454,5 +463,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 0edbd7d043ac41d813767f63d9f7ad2ea66a95ba..4fcb23ca46338cc8ef6436a7352675fb964093de 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: A sudoku game application. publish_to: "none" -version: 0.3.1+75 +version: 0.4.0+76 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 badges: ^3.1.2 @@ -35,15 +30,3 @@ flutter: - assets/skins/ - 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