Skip to content
Snippets Groups Projects
Commit a02da08c authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '88-use-flutter_custom_toolbox-for-common-features' into 'master'

Resolve "Use flutter_custom_toolbox for common features"

Closes #88

See merge request !84
parents e69e0969 83a7b8f2
No related branches found
No related tags found
1 merge request!84Resolve "Use flutter_custom_toolbox for common features"
Pipeline #6561 passed
Showing
with 20 additions and 211 deletions
...@@ -11,5 +11,8 @@ insert_final_newline = true ...@@ -11,5 +11,8 @@ insert_final_newline = true
[*.json] [*.json]
indent_size = 2 indent_size = 2
[*.yaml]
indent_size = 2
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
.buildlog/ .buildlog/
.history .history
.svn/ .svn/
migrate_working_dir/
# IntelliJ related # IntelliJ related
*.iml *.iml
......
File deleted
File deleted
File deleted
File deleted
Use flutter_custom_toolbox for common features.
Utilisation de flutter_custom_toolbox pour les fonctionnalités communes.
import 'package:sudoku/utils/tools.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
class DefaultGameSettings { class DefaultGameSettings {
// available game parameters codes // available game parameters codes
......
import 'package:sudoku/utils/tools.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
class DefaultGlobalSettings { class DefaultGlobalSettings {
// available global parameters codes // available global parameters codes
......
import 'package:flutter/material.dart'; 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_about.dart';
import 'package:sudoku/ui/screens/page_game.dart'; import 'package:sudoku/ui/screens/page_game.dart';
......
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',
),
),
);
import 'dart:async'; import 'dart:async';
import 'dart:math'; import 'dart:math';
import 'package:equatable/equatable.dart';
import 'package:flutter/material.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/config/default_global_settings.dart';
import 'package:sudoku/models/game/cell.dart'; import 'package:sudoku/models/game/cell.dart';
import 'package:sudoku/models/game/cell_location.dart'; import 'package:sudoku/models/game/cell_location.dart';
import 'package:sudoku/models/game/game.dart'; import 'package:sudoku/models/game/game.dart';
......
import 'package:hydrated_bloc/hydrated_bloc.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:sudoku/config/menu.dart'; import 'package:sudoku/config/menu.dart';
......
import 'package:equatable/equatable.dart';
import 'package:flutter/material.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/config/default_game_settings.dart';
import 'package:sudoku/models/settings/settings_game.dart'; import 'package:sudoku/models/settings/settings_game.dart';
......
import 'package:equatable/equatable.dart';
import 'package:flutter/material.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/config/default_global_settings.dart';
import 'package:sudoku/models/settings/settings_global.dart'; import 'package:sudoku/models/settings/settings_global.dart';
......
import 'package:equatable/equatable.dart';
import 'package:flutter/material.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'; part 'theme_state.dart';
......
import 'dart:io'; import 'dart:io';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:hive/hive.dart';
import 'package:hydrated_bloc/hydrated_bloc.dart';
import 'package:path_provider/path_provider.dart';
import 'package:sudoku/config/default_global_settings.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/game_cubit.dart';
import 'package:sudoku/cubit/nav_cubit.dart'; import 'package:sudoku/cubit/nav_cubit.dart';
import 'package:sudoku/cubit/settings_game_cubit.dart'; import 'package:sudoku/cubit/settings_game_cubit.dart';
......
import 'dart:math'; import 'dart:math';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:sudoku/models/game/cell.dart'; import 'package:sudoku/models/game/cell.dart';
import 'package:sudoku/models/game/cell_location.dart'; import 'package:sudoku/models/game/cell_location.dart';
import 'package:sudoku/models/game/types.dart'; import 'package:sudoku/models/game/types.dart';
import 'package:sudoku/utils/tools.dart';
class Board { class Board {
Board({ Board({
......
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:sudoku/models/game/cell_location.dart'; import 'package:sudoku/models/game/cell_location.dart';
import 'package:sudoku/utils/tools.dart';
class Cell { class Cell {
const Cell({ const Cell({
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment