Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • android/org.benoitharrault.sudoku
1 result
Select Git revision
Show changes
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 441 additions and 369 deletions
lib/main.dart
View file @ aa0e5f50
...@@ -3,16 +3,18 @@ import 'package:flutter/services.dart'; ...@@ -3,16 +3,18 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:overlay_support/overlay_support.dart'; import 'package:overlay_support/overlay_support.dart';
import 'provider/data.dart'; import 'package:sudoku/provider/data.dart';
import 'screens/home.dart'; import 'package:sudoku/screens/home.dart';
void main() { void main() {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]) SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp])
.then((value) => runApp(MyApp())); .then((value) => runApp(const MyApp()));
} }
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
const MyApp({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ChangeNotifierProvider( return ChangeNotifierProvider(
...@@ -22,12 +24,11 @@ class MyApp extends StatelessWidget { ...@@ -22,12 +24,11 @@ class MyApp extends StatelessWidget {
child: MaterialApp( child: MaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: ThemeData( theme: ThemeData(
primaryColor: Colors.blue,
visualDensity: VisualDensity.adaptivePlatformDensity, visualDensity: VisualDensity.adaptivePlatformDensity,
), ),
home: Home(), home: const Home(),
routes: { routes: {
Home.id: (context) => Home(), Home.id: (context) => const Home(),
}, },
), ),
); );
......
lib/provider/data.dart
View file @ aa0e5f50
...@@ -3,27 +3,30 @@ import 'dart:convert'; ...@@ -3,27 +3,30 @@ import 'dart:convert';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:sudoku/entities/cell.dart';
import 'package:sudoku/utils/tools.dart';
class Data extends ChangeNotifier { class Data extends ChangeNotifier {
// Configuration available values // Configuration available values
List _availableParameters = ['level', 'size', 'skin']; final List<String> _availableParameters = ['level', 'size', 'skin'];
List _availableLevelValues = ['easy', 'medium', 'hard', 'nightmare']; final List<String> _availableLevelValues = ['easy', 'medium', 'hard', 'nightmare'];
List _availableSizeValues = ['2x2', '3x2', '3x3', '4x4']; final List<String> _availableSizeValues = ['2x2', '3x2', '3x3', '4x4'];
List _availableSkinValues = ['default', 'food', 'nature', 'monsters']; final List<String> _availableSkinValues = ['default', 'food', 'nature', 'monsters'];
List _shufflableSkins = ['food', 'nature', 'monsters']; final List<String> _shufflableSkins = ['food', 'nature', 'monsters'];
List get availableParameters => _availableParameters; List<String> get availableParameters => _availableParameters;
List get availableLevelValues => _availableLevelValues; List<String> get availableLevelValues => _availableLevelValues;
List get availableSizeValues => _availableSizeValues; List<String> get availableSizeValues => _availableSizeValues;
List get availableSkinValues => _availableSkinValues; List<String> get availableSkinValues => _availableSkinValues;
// Application default configuration // Application default configuration
String _parameterLevel = ''; String _parameterLevel = '';
String _parameterLevelDefault = 'medium'; final String _parameterLevelDefault = 'medium';
String _parameterSize = ''; String _parameterSize = '';
String _parameterSizeDefault = '3x3'; final String _parameterSizeDefault = '3x3';
String _parameterSkin = ''; String _parameterSkin = '';
String _parameterSkinDefault = 'default'; final String _parameterSkinDefault = 'default';
// Application current configuration // Application current configuration
String get parameterLevel => _parameterLevel; String get parameterLevel => _parameterLevel;
...@@ -36,9 +39,9 @@ class Data extends ChangeNotifier { ...@@ -36,9 +39,9 @@ class Data extends ChangeNotifier {
bool _animationInProgress = false; bool _animationInProgress = false;
int _blockSizeVertical = 0; int _blockSizeVertical = 0;
int _blockSizeHorizontal = 0; int _blockSizeHorizontal = 0;
List _cells = []; List<List<Cell>> _cells = [];
List _cellsSolved = []; List<List<Cell>> _cellsSolved = [];
List _shuffledCellValues = []; List<int> _shuffledCellValues = [];
int? _currentCellCol; int? _currentCellCol;
int? _currentCellRow; int? _currentCellRow;
int? _currentCellValue; int? _currentCellValue;
...@@ -77,7 +80,7 @@ class Data extends ChangeNotifier { ...@@ -77,7 +80,7 @@ class Data extends ChangeNotifier {
return ''; return '';
} }
List getParameterAvailableValues(String parameterCode) { List<String> getParameterAvailableValues(String parameterCode) {
switch (parameterCode) { switch (parameterCode) {
case 'level': case 'level':
return _availableLevelValues; return _availableLevelValues;
...@@ -116,15 +119,15 @@ class Data extends ChangeNotifier { ...@@ -116,15 +119,15 @@ class Data extends ChangeNotifier {
String computeCurrentGameState() { String computeCurrentGameState() {
String cellsValues = ''; String cellsValues = '';
String stringValues = '0123456789ABCDEFG'; const String stringValues = '0123456789ABCDEFG';
for (var rowIndex = 0; rowIndex < _cells.length; rowIndex++) { for (int rowIndex = 0; rowIndex < _cells.length; rowIndex++) {
for (var colIndex = 0; colIndex < _cells[rowIndex].length; colIndex++) { for (int colIndex = 0; colIndex < _cells[rowIndex].length; colIndex++) {
cellsValues += stringValues[_cells[rowIndex][colIndex].value]; cellsValues += stringValues[_cells[rowIndex][colIndex].value];
cellsValues += _cells[rowIndex][colIndex].isFixed ? 'x' : ' '; cellsValues += _cells[rowIndex][colIndex].isFixed ? 'x' : ' ';
} }
} }
var currentState = { return json.encode({
'level': _parameterLevel, 'level': _parameterLevel,
'size': _parameterSize, 'size': _parameterSize,
'skin': _parameterSkin, 'skin': _parameterSkin,
...@@ -132,9 +135,7 @@ class Data extends ChangeNotifier { ...@@ -132,9 +135,7 @@ class Data extends ChangeNotifier {
'showConflicts': _showConflicts, 'showConflicts': _showConflicts,
'boardValues': cellsValues, 'boardValues': cellsValues,
'shuffledCellValues': _shuffledCellValues, 'shuffledCellValues': _shuffledCellValues,
}; });
return json.encode(currentState);
} }
void saveCurrentGameState() async { void saveCurrentGameState() async {
...@@ -186,30 +187,30 @@ class Data extends ChangeNotifier { ...@@ -186,30 +187,30 @@ class Data extends ChangeNotifier {
_assetsPreloaded = assetsPreloaded; _assetsPreloaded = assetsPreloaded;
} }
List get cells => _cells; List<List<Cell>> get cells => _cells;
void updateCells(List cells) { void updateCells(List<List<Cell>> cells) {
_cells = cells; _cells = cells;
notifyListeners(); notifyListeners();
} }
List get cellsSolved => _cellsSolved; List<List<Cell>> get cellsSolved => _cellsSolved;
void updateCellsSolved(List cells) { void updateCellsSolved(List<List<Cell>> cells) {
_cellsSolved = cells; _cellsSolved = cells;
} }
void shuffleCellValues() { void shuffleCellValues() {
int maxCellValue = 16; const int maxCellValue = 16;
List values = new List<int>.generate(maxCellValue, (i) => i + 1); final List<int> values = List<int>.generate(maxCellValue, (i) => i + 1);
if (_shufflableSkins.contains(_parameterSkin)) { if (_shufflableSkins.contains(_parameterSkin)) {
values.shuffle(); values.shuffle();
print('Shuffled tiles values: ' + values.toString()); printlog('Shuffled tiles values: $values');
} }
_shuffledCellValues = values; _shuffledCellValues = values;
} }
void setShuffleCellValues(List values) { void setShuffleCellValues(List<int> values) {
_shuffledCellValues = values; _shuffledCellValues = values;
} }
...@@ -292,9 +293,9 @@ class Data extends ChangeNotifier { ...@@ -292,9 +293,9 @@ class Data extends ChangeNotifier {
} }
void setAnimatedBackground(List animatedCellsPattern) { void setAnimatedBackground(List animatedCellsPattern) {
int boardSideLength = _blockSizeHorizontal * _blockSizeVertical; final int boardSideLength = _blockSizeHorizontal * _blockSizeVertical;
for (var row = 0; row < boardSideLength; row++) { for (int row = 0; row < boardSideLength; row++) {
for (var col = 0; col < boardSideLength; col++) { for (int col = 0; col < boardSideLength; col++) {
_cells[row][col].isAnimated = animatedCellsPattern[row][col]; _cells[row][col].isAnimated = animatedCellsPattern[row][col];
} }
} }
...@@ -302,9 +303,9 @@ class Data extends ChangeNotifier { ...@@ -302,9 +303,9 @@ class Data extends ChangeNotifier {
} }
void resetAnimatedBackground() { void resetAnimatedBackground() {
int boardSideLength = _blockSizeHorizontal * _blockSizeVertical; final int boardSideLength = _blockSizeHorizontal * _blockSizeVertical;
for (var row = 0; row < boardSideLength; row++) { for (int row = 0; row < boardSideLength; row++) {
for (var col = 0; col < boardSideLength; col++) { for (int col = 0; col < boardSideLength; col++) {
_cells[row][col].isAnimated = false; _cells[row][col].isAnimated = false;
} }
} }
......
lib/screens/home.dart
View file @ aa0e5f50
...@@ -3,19 +3,21 @@ import 'package:provider/provider.dart'; ...@@ -3,19 +3,21 @@ import 'package:provider/provider.dart';
import 'package:badges/badges.dart' as badges; import 'package:badges/badges.dart' as badges;
import 'package:overlay_support/overlay_support.dart'; import 'package:overlay_support/overlay_support.dart';
import '../layout/game.dart'; import 'package:sudoku/layout/game.dart';
import '../layout/parameters.dart'; import 'package:sudoku/layout/parameters.dart';
import '../provider/data.dart'; import 'package:sudoku/provider/data.dart';
import '../utils/game_utils.dart'; import 'package:sudoku/utils/game_utils.dart';
class Home extends StatefulWidget { class Home extends StatefulWidget {
static const String id = 'home'; static const String id = 'home';
const Home({super.key});
@override @override
_HomeState createState() => _HomeState(); HomeState createState() => HomeState();
} }
class _HomeState extends State<Home> { class HomeState extends State<Home> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
...@@ -25,10 +27,10 @@ class _HomeState extends State<Home> { ...@@ -25,10 +27,10 @@ class _HomeState extends State<Home> {
myProvider.loadCurrentSavedState(); myProvider.loadCurrentSavedState();
} }
List getImagesAssets(Data myProvider) { List<String> getImagesAssets(Data myProvider) {
List assets = []; final List<String> assets = [];
List gameImages = [ final List<String> gameImages = [
'button_back', 'button_back',
'button_help', 'button_help',
'button_show_conflicts', 'button_show_conflicts',
...@@ -37,61 +39,71 @@ class _HomeState extends State<Home> { ...@@ -37,61 +39,71 @@ class _HomeState extends State<Home> {
'placeholder', 'placeholder',
'cell_empty' 'cell_empty'
]; ];
myProvider.availableLevelValues.forEach((level) => gameImages.add('level_' + level)); for (String level in myProvider.availableLevelValues) {
myProvider.availableSizeValues.forEach((size) => gameImages.add('size_' + size)); gameImages.add('level_$level');
}
for (String size in myProvider.availableSizeValues) {
gameImages.add('size_$size');
}
gameImages.forEach((image) => assets.add('assets/icons/' + image + '.png')); for (String image in gameImages) {
assets.add('${'assets/icons/$image'}.png');
}
List skinImages = []; List<String> skinImages = [];
for (int value = 1; value <= 16; value++) { for (int value = 1; value <= 16; value++) {
skinImages.add(value.toString()); skinImages.add(value.toString());
} }
myProvider.availableSkinValues.forEach((skin) => skinImages for (String skin in myProvider.availableSkinValues) {
.forEach((image) => assets.add('assets/skins/' + skin + '_' + image + '.png'))); for (String image in skinImages) {
assets.add('${'${'assets/skins/$skin'}_$image'}.png');
}
}
return assets; return assets;
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Data myProvider = Provider.of<Data>(context); final Data myProvider = Provider.of<Data>(context);
if (!myProvider.assetsPreloaded) { if (!myProvider.assetsPreloaded) {
List assets = getImagesAssets(myProvider); List<String> assets = getImagesAssets(myProvider);
assets.forEach((asset) => precacheImage(AssetImage(asset), context)); for (String asset in assets) {
precacheImage(AssetImage(asset), context);
}
myProvider.updateAssetsPreloaded(true); myProvider.updateAssetsPreloaded(true);
} }
List<Widget> menuActions = []; final List<Widget> menuActions = [];
if (myProvider.gameIsRunning) { if (myProvider.gameIsRunning) {
menuActions = [ menuActions.add(TextButton(
TextButton(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4), borderRadius: BorderRadius.circular(4),
border: Border.all( border: Border.all(
color: Colors.blue, color: Colors.white,
width: 4, width: 3,
), ),
), ),
child: Image( child: const Image(
image: AssetImage('assets/icons/button_back.png'), image: AssetImage('assets/icons/button_back.png'),
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
), ),
onPressed: () => toast('Long press to quit game...'), onPressed: () => toast('Long press to quit game...'),
onLongPress: () => GameUtils.quitGame(myProvider), onLongPress: () => GameUtils.quitGame(myProvider),
), ));
Spacer(flex: 6), menuActions.add(const Spacer(flex: 6));
TextButton( menuActions.add(TextButton(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4), borderRadius: BorderRadius.circular(4),
border: Border.all( border: Border.all(
color: Colors.blue, color: Colors.white,
width: 4, width: 3,
), ),
), ),
child: badges.Badge( child: badges.Badge(
...@@ -105,27 +117,27 @@ class _HomeState extends State<Home> { ...@@ -105,27 +117,27 @@ class _HomeState extends State<Home> {
), ),
badgeContent: Text( badgeContent: Text(
myProvider.givenTipsCount == 0 ? '' : myProvider.givenTipsCount.toString(), myProvider.givenTipsCount == 0 ? '' : myProvider.givenTipsCount.toString(),
style: TextStyle(color: Colors.white), style: const TextStyle(color: Colors.white),
), ),
child: Image( child: const Image(
image: AssetImage('assets/icons/button_help.png'), image: AssetImage('assets/icons/button_help.png'),
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
), ),
), ),
onPressed: () => GameUtils.showTip(myProvider), onPressed: () => GameUtils.showTip(myProvider),
), ));
Spacer(), menuActions.add(const Spacer());
TextButton( menuActions.add(TextButton(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4), borderRadius: BorderRadius.circular(4),
border: Border.all( border: Border.all(
color: myProvider.showConflicts ? Colors.white : Colors.blue, color: myProvider.showConflicts ? Colors.blue : Colors.white,
width: 4, width: 3,
), ),
), ),
child: Image( child: const Image(
image: AssetImage('assets/icons/button_show_conflicts.png'), image: AssetImage('assets/icons/button_show_conflicts.png'),
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
...@@ -133,8 +145,7 @@ class _HomeState extends State<Home> { ...@@ -133,8 +145,7 @@ class _HomeState extends State<Home> {
onPressed: () { onPressed: () {
myProvider.toggleShowConflicts(); myProvider.toggleShowConflicts();
}, },
), ));
];
} }
return Scaffold( return Scaffold(
......
lib/utils/board_animate.dart
View file @ aa0e5f50
import 'dart:async'; import 'dart:async';
import '../provider/data.dart'; import 'package:sudoku/provider/data.dart';
class BoardAnimate { class BoardAnimate {
// Start game animation: blinking tiles // Start game animation: blinking tiles
static List createStartGameAnimationPatterns(Data myProvider) { static List<List<List<bool>>> createStartGameAnimationPatterns(Data myProvider) {
List<List> patterns = []; List<List<List<bool>>> patterns = [];
int patternsCount = 3; int patternsCount = 3;
int boardSideLength = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical; int boardSideLength = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;
for (var patternIndex = 0; patternIndex < patternsCount; patternIndex++) { for (int patternIndex = 0; patternIndex < patternsCount; patternIndex++) {
List<List> pattern = []; List<List<bool>> pattern = [];
for (var row = 0; row < boardSideLength; row++) { for (int row = 0; row < boardSideLength; row++) {
List<bool> patternRow = []; List<bool> patternRow = [];
for (var col = 0; col < boardSideLength; col++) { for (int col = 0; col < boardSideLength; col++) {
patternRow.add(((patternIndex + row + col) % 2 == 0)); patternRow.add(((patternIndex + row + col) % 2 == 0));
} }
pattern.add(patternRow); pattern.add(patternRow);
...@@ -26,17 +26,17 @@ class BoardAnimate { ...@@ -26,17 +26,17 @@ class BoardAnimate {
} }
// Win game animation: fill board with colored rows, from bottom to top // Win game animation: fill board with colored rows, from bottom to top
static List createWinGameAnimationPatterns(Data myProvider) { static List<List<List<bool>>> createWinGameAnimationPatterns(Data myProvider) {
List<List> patterns = []; List<List<List<bool>>> patterns = [];
int boardSideLength = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical; int boardSideLength = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;
int patternsCount = boardSideLength + 6; int patternsCount = boardSideLength + 6;
for (var patternIndex = 0; patternIndex < patternsCount; patternIndex++) { for (int patternIndex = 0; patternIndex < patternsCount; patternIndex++) {
List<List> pattern = []; List<List<bool>> pattern = [];
for (var row = 0; row < boardSideLength; row++) { for (int row = 0; row < boardSideLength; row++) {
List<bool> patternRow = []; List<bool> patternRow = [];
for (var col = 0; col < boardSideLength; col++) { for (int col = 0; col < boardSideLength; col++) {
patternRow.add(row > (patternIndex - 4)); patternRow.add(row > (patternIndex - 4));
} }
pattern.add(patternRow); pattern.add(patternRow);
...@@ -48,17 +48,17 @@ class BoardAnimate { ...@@ -48,17 +48,17 @@ class BoardAnimate {
} }
// Default multi-purpose animation: sliding stripes, from top left to right bottom // Default multi-purpose animation: sliding stripes, from top left to right bottom
static List createDefaultAnimationPatterns(Data myProvider) { static List<List<List<bool>>> createDefaultAnimationPatterns(Data myProvider) {
List<List> patterns = []; List<List<List<bool>>> patterns = [];
int boardSideLength = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical; int boardSideLength = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;
int patternsCount = boardSideLength; int patternsCount = boardSideLength;
for (var patternIndex = 0; patternIndex < patternsCount; patternIndex++) { for (int patternIndex = 0; patternIndex < patternsCount; patternIndex++) {
List<List> pattern = []; List<List<bool>> pattern = [];
for (var row = 0; row < boardSideLength; row++) { for (int row = 0; row < boardSideLength; row++) {
List<bool> patternRow = []; List<bool> patternRow = [];
for (var col = 0; col < boardSideLength; col++) { for (int col = 0; col < boardSideLength; col++) {
patternRow.add(((patternIndex + row + col) % 4 == 0)); patternRow.add(((patternIndex + row + col) % 4 == 0));
} }
pattern.add(patternRow); pattern.add(patternRow);
...@@ -70,7 +70,7 @@ class BoardAnimate { ...@@ -70,7 +70,7 @@ class BoardAnimate {
} }
static void startAnimation(Data myProvider, String animationType) { static void startAnimation(Data myProvider, String animationType) {
List patterns = []; List<List<List<bool>>> patterns = [];
switch (animationType) { switch (animationType) {
case 'start': case 'start':
...@@ -83,21 +83,21 @@ class BoardAnimate { ...@@ -83,21 +83,21 @@ class BoardAnimate {
patterns = createDefaultAnimationPatterns(myProvider); patterns = createDefaultAnimationPatterns(myProvider);
} }
int _patternIndex = patterns.length; int patternIndex = patterns.length;
myProvider.updateAnimationInProgress(true); myProvider.updateAnimationInProgress(true);
const interval = const Duration(milliseconds: 200); const interval = Duration(milliseconds: 200);
new Timer.periodic( Timer.periodic(
interval, interval,
(Timer timer) { (Timer timer) {
if (_patternIndex == 0) { if (patternIndex == 0) {
timer.cancel(); timer.cancel();
myProvider.resetAnimatedBackground(); myProvider.resetAnimatedBackground();
myProvider.updateAnimationInProgress(false); myProvider.updateAnimationInProgress(false);
} else { } else {
_patternIndex--; patternIndex--;
myProvider.setAnimatedBackground(patterns[_patternIndex]); myProvider.setAnimatedBackground(patterns[patternIndex]);
} }
}, },
); );
......
lib/utils/board_utils.dart
View file @ aa0e5f50
This diff is collapsed.
lib/utils/game_utils.dart
View file @ aa0e5f50
import '../provider/data.dart'; import 'package:sudoku/entities/cell.dart';
import '../utils/board_animate.dart'; import 'package:sudoku/provider/data.dart';
import '../utils/board_utils.dart'; import 'package:sudoku/utils/board_animate.dart';
import 'package:sudoku/utils/board_utils.dart';
import 'package:sudoku/utils/tools.dart';
class GameUtils { class GameUtils {
static Future<void> quitGame(Data myProvider) async { static Future<void> quitGame(Data myProvider) async {
...@@ -26,7 +28,7 @@ class GameUtils { ...@@ -26,7 +28,7 @@ class GameUtils {
} }
static void resumeSavedGame(Data myProvider) { static void resumeSavedGame(Data myProvider) {
Map<String, dynamic> savedState = myProvider.getCurrentSavedState(); final Map<String, dynamic> savedState = myProvider.getCurrentSavedState();
if (savedState.isNotEmpty) { if (savedState.isNotEmpty) {
try { try {
myProvider.setParameterValue('level', savedState['level']); myProvider.setParameterValue('level', savedState['level']);
...@@ -42,7 +44,7 @@ class GameUtils { ...@@ -42,7 +44,7 @@ class GameUtils {
BoardUtils.createBoardFromSavedState(myProvider, savedState['boardValues'])); BoardUtils.createBoardFromSavedState(myProvider, savedState['boardValues']));
myProvider.updateGameIsRunning(true); myProvider.updateGameIsRunning(true);
} catch (e) { } catch (e) {
print('Failed to resume game. Will start new one instead.'); printlog('Failed to resume game. Will start new one instead.');
myProvider.resetCurrentSavedState(); myProvider.resetCurrentSavedState();
myProvider.initParametersValues(); myProvider.initParametersValues();
startNewGame(myProvider); startNewGame(myProvider);
...@@ -66,56 +68,66 @@ class GameUtils { ...@@ -66,56 +68,66 @@ class GameUtils {
} }
static void helpSelectCell(Data myProvider) { static void helpSelectCell(Data myProvider) {
List cells = myProvider.cells; final List<List<Cell>> cells = myProvider.cells;
int blockSizeHorizontal = myProvider.blockSizeHorizontal; final int blockSizeHorizontal = myProvider.blockSizeHorizontal;
int blockSizeVertical = myProvider.blockSizeVertical; final int blockSizeVertical = myProvider.blockSizeVertical;
// pick one of wrong value cells, if found // pick one of wrong value cells, if found
List wrongValueCells = BoardUtils.getCellsWithWrongValue( final List<List<int>> wrongValueCells = BoardUtils.getCellsWithWrongValue(
cells, myProvider.cellsSolved, blockSizeHorizontal, blockSizeVertical); cells,
if (wrongValueCells.length != 0) { myProvider.cellsSolved,
blockSizeHorizontal,
blockSizeVertical,
);
if (wrongValueCells.isNotEmpty) {
GameUtils.pickRandomFromList(myProvider, wrongValueCells); GameUtils.pickRandomFromList(myProvider, wrongValueCells);
return; return;
} }
// pick one of conflicting cells, if found // pick one of conflicting cells, if found
List conflictingCells = BoardUtils.getCellsWithUniqueAvailableValue( final List<List<int>> conflictingCells = BoardUtils.getCellsWithUniqueAvailableValue(
cells, blockSizeHorizontal, blockSizeVertical); cells,
if (conflictingCells.length != 0) { blockSizeHorizontal,
blockSizeVertical,
);
if (conflictingCells.isNotEmpty) {
GameUtils.pickRandomFromList(myProvider, conflictingCells); GameUtils.pickRandomFromList(myProvider, conflictingCells);
return; return;
} }
// pick one form cells with unique non-conflicting candidate value // pick one form cells with unique non-conflicting candidate value
List candidateCells = BoardUtils.getCellsWithUniqueAvailableValue( final List<List<int>> candidateCells = BoardUtils.getCellsWithUniqueAvailableValue(
cells, blockSizeHorizontal, blockSizeVertical); cells,
if (candidateCells.length != 0) { blockSizeHorizontal,
blockSizeVertical,
);
if (candidateCells.isNotEmpty) {
GameUtils.pickRandomFromList(myProvider, candidateCells); GameUtils.pickRandomFromList(myProvider, candidateCells);
return; return;
} }
} }
static void pickRandomFromList(Data myProvider, List cellsCoordinates) { static void pickRandomFromList(Data myProvider, List<List<int>> cellsCoordinates) {
if (cellsCoordinates.length > 0) { if (cellsCoordinates.isNotEmpty) {
cellsCoordinates.shuffle(); cellsCoordinates.shuffle();
List cell = cellsCoordinates[0]; List<int> cell = cellsCoordinates[0];
myProvider.selectCell(cell[0], cell[1]); myProvider.selectCell(cell[0], cell[1]);
} }
} }
static void helpFillCell(Data myProvider) { static void helpFillCell(Data myProvider) {
List cells = myProvider.cells; final List<List<Cell>> cells = myProvider.cells;
int blockSizeHorizontal = myProvider.blockSizeHorizontal; final int blockSizeHorizontal = myProvider.blockSizeHorizontal;
int blockSizeVertical = myProvider.blockSizeVertical; final int blockSizeVertical = myProvider.blockSizeVertical;
int boardSize = blockSizeHorizontal * blockSizeVertical; final int boardSize = blockSizeHorizontal * blockSizeVertical;
// Will clean cell if no eligible value found // Will clean cell if no eligible value found
int eligibleValue = 0; int eligibleValue = 0;
// ensure there is only one eligible value for this cell // ensure there is only one eligible value for this cell
int allowedValuesCount = 0; int allowedValuesCount = 0;
for (var value = 1; value <= boardSize; value++) { for (int value = 1; value <= boardSize; value++) {
if (BoardUtils.isValueAllowed(cells, blockSizeHorizontal, blockSizeVertical, if (BoardUtils.isValueAllowed(cells, blockSizeHorizontal, blockSizeVertical,
myProvider.currentCellCol, myProvider.currentCellRow, value)) { myProvider.currentCellCol, myProvider.currentCellRow, value)) {
allowedValuesCount++; allowedValuesCount++;
......
lib/utils/random_pick_grid.dart
View file @ aa0e5f50
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:sudoku/utils/tools.dart';
class RandomPickGrid { class RandomPickGrid {
RandomPickGrid(); RandomPickGrid();
...@@ -19,12 +22,12 @@ class RandomPickGrid { ...@@ -19,12 +22,12 @@ class RandomPickGrid {
final jsonResponse = await json.decode(jsonString); final jsonResponse = await json.decode(jsonString);
grids = jsonResponse['templates'][size][level]; grids = jsonResponse['templates'][size][level];
} catch (e) { } catch (e) {
print("$e"); printlog("$e");
} }
// Check we have enough grids // Check we have enough grids
if (grids.length < 1) { if (grids.isEmpty) {
print('Not enough grids [' + size + ', ' + level + '] in templates.'); printlog('Not enough grids [$size, $level] in templates.');
} }
// Randomize grids list // Randomize grids list
......
lib/utils/tools.dart 0 → 100644
View file @ aa0e5f50
import 'package:flutter/foundation.dart';
void printlog(String message) {
if (!kReleaseMode) {
debugPrint(message);
}
}
pubspec.lock
View file @ aa0e5f50
...@@ -29,52 +29,68 @@ packages: ...@@ -29,52 +29,68 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.17.2" version: "1.18.0"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
name: ffi name: ffi
sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.0" version: "2.1.2"
file: file:
dependency: transitive dependency: transitive
description: description:
name: file name: file
sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.1.4" version: "7.0.0"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_lints:
dependency: "direct dev"
description:
name: flutter_lints
sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
url: "https://pub.dev"
source: hosted
version: "3.0.1"
flutter_web_plugins: flutter_web_plugins:
dependency: transitive dependency: transitive
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
lints:
dependency: transitive
description:
name: lints
sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
url: "https://pub.dev"
source: hosted
version: "3.0.0"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.5.0" version: "0.8.0"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.1" version: "1.11.0"
nested: nested:
dependency: transitive dependency: transitive
description: description:
...@@ -95,10 +111,10 @@ packages: ...@@ -95,10 +111,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.8.3" version: "1.9.0"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
...@@ -111,10 +127,10 @@ packages: ...@@ -111,10 +127,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path_provider_platform_interface name: path_provider_platform_interface
sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.1" version: "2.1.2"
path_provider_windows: path_provider_windows:
dependency: transitive dependency: transitive
description: description:
...@@ -127,34 +143,34 @@ packages: ...@@ -127,34 +143,34 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: platform name: platform
sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.2" version: "3.1.4"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: plugin_platform_interface name: plugin_platform_interface
sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.6" version: "2.1.8"
provider: provider:
dependency: "direct main" dependency: "direct main"
description: description:
name: provider name: provider
sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.0.5" version: "6.1.2"
shared_preferences: shared_preferences:
dependency: "direct main" dependency: "direct main"
description: description:
name: shared_preferences name: shared_preferences
sha256: b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.1" version: "2.2.2"
shared_preferences_android: shared_preferences_android:
dependency: transitive dependency: transitive
description: description:
...@@ -167,42 +183,42 @@ packages: ...@@ -167,42 +183,42 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_foundation name: shared_preferences_foundation
sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7" sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.3.4" version: "2.3.5"
shared_preferences_linux: shared_preferences_linux:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_linux name: shared_preferences_linux
sha256: c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.3.1" version: "2.3.2"
shared_preferences_platform_interface: shared_preferences_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_platform_interface name: shared_preferences_platform_interface
sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.3.1" version: "2.3.2"
shared_preferences_web: shared_preferences_web:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_web name: shared_preferences_web
sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.1" version: "2.3.0"
shared_preferences_windows: shared_preferences_windows:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_windows name: shared_preferences_windows
sha256: f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.3.1" version: "2.3.2"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
...@@ -220,26 +236,26 @@ packages: ...@@ -220,26 +236,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: web name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.1.4-beta" version: "0.5.0"
win32: win32:
dependency: transitive dependency: transitive
description: description:
name: win32 name: win32
sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.0.9" version: "5.2.0"
xdg_directories: xdg_directories:
dependency: transitive dependency: transitive
description: description:
name: xdg_directories name: xdg_directories
sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.3" version: "1.0.4"
sdks: sdks:
dart: ">=3.1.0-185.0.dev <4.0.0" dart: ">=3.3.0 <4.0.0"
flutter: ">=3.7.0" flutter: ">=3.19.0"
pubspec.yaml
View file @ aa0e5f50
name: sudoku name: sudoku
description: A sudoku game application. description: A sudoku game application.
publish_to: 'none' publish_to: 'none'
version: 1.0.0+1 version: 0.1.16+65
environment: environment:
sdk: '^3.0.0' sdk: '^3.0.0'
...@@ -14,6 +14,9 @@ dependencies: ...@@ -14,6 +14,9 @@ dependencies:
shared_preferences: ^2.2.1 shared_preferences: ^2.2.1
overlay_support: ^2.1.0 overlay_support: ^2.1.0
dev_dependencies:
flutter_lints: ^3.0.1
flutter: flutter:
uses-material-design: true uses-material-design: true
assets: assets:
......