6e72411850a321c2d0264cb67a11a350bdbc739b to dc80ed17b14f5573f91138509d1dc096bc8a4f71 · android / org.benoitharrault.sudoku

Some changes are not shown.

For a faster browsing experience, only 98 of 107 files are shown. Download one of the files below to see all changes.

android/app/src/main/res/mipmap-hdpi/ic_launcher.png

(1.79 KiB)

1.79 KiB

android/app/src/main/res/mipmap-mdpi/ic_launcher.png

(1.15 KiB)

1.15 KiB

android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

+41 B (2.43 KiB)

2.39 KiB

2.43 KiB

android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

+60 B (3.79 KiB)

3.73 KiB

3.79 KiB

android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

+80 B (5.2 KiB)

5.12 KiB

5.20 KiB

android/gradle.properties

+2 −2

Original line number	Original line	Diff line number	Diff line
	org.gradle.jvmargs=-Xmx1536M		org.gradle.jvmargs=-Xmx1536M
	android.useAndroidX=true		android.useAndroidX=true
	android.enableJetifier=true		android.enableJetifier=true
	app.versionName=0.1.6		app.versionName=0.1.7
	app.versionCode=55		app.versionCode=56

assets/icons/button_back.png

+27 B (3.68 KiB)

3.66 KiB

3.68 KiB

assets/icons/button_help.png

+53 B (5.95 KiB)

5.90 KiB

5.95 KiB

assets/icons/button_show_conflicts.png

+47 B (3.93 KiB)

3.89 KiB

3.93 KiB

assets/icons/button_start.png

+30 B (3.91 KiB)

3.88 KiB

3.91 KiB

assets/skins/empty.png→assets/icons/cell_empty.png

(170 B)

170 B

assets/icons/game_win.png

+31 B (7.75 KiB)

7.72 KiB

7.75 KiB

assets/icons/difficulty_easy.png→assets/icons/level_easy.png

(2.98 KiB)

File moved.

View file

assets/icons/difficulty_hard.png→assets/icons/level_hard.png

(7.14 KiB)

File moved.

View file

assets/icons/difficulty_medium.png→assets/icons/level_medium.png

(5.04 KiB)

File moved.

View file

assets/icons/difficulty_nightmare.png→assets/icons/level_nightmare.png

(8.88 KiB)

File moved.

View file

assets/icons/placeholder.png

0 → 100644

+170 B

170 B

assets/skins/default_1.png

(1.17 KiB)

1.17 KiB

assets/skins/default_10.png

(2.6 KiB)

2.60 KiB

assets/skins/default_11.png

(2.15 KiB)

2.15 KiB

assets/skins/default_12.png

(2.85 KiB)

2.85 KiB

assets/skins/default_13.png

(2.1 KiB)

2.10 KiB

assets/skins/default_14.png

(365 B)

365 B

assets/skins/default_15.png

(422 B)

422 B

assets/skins/default_16.png

(2.84 KiB)

2.84 KiB

assets/skins/default_2.png

(2.6 KiB)

2.60 KiB

assets/skins/default_3.png

(2.96 KiB)

2.96 KiB

assets/skins/default_4.png

(1.58 KiB)

1.58 KiB

assets/skins/default_5.png

(2.75 KiB)

2.75 KiB

assets/skins/default_6.png

(3.14 KiB)

3.14 KiB

assets/skins/default_7.png

(1.87 KiB)

1.87 KiB

assets/skins/default_8.png

(3.13 KiB)

3.13 KiB

assets/skins/default_9.png

(3.14 KiB)

3.14 KiB

assets/skins/food_1.png

+166 B (4.81 KiB)

4.65 KiB

4.81 KiB

assets/skins/food_10.png

+174 B (6.68 KiB)

6.51 KiB

6.68 KiB

assets/skins/food_11.png

+88 B (5.48 KiB)

5.40 KiB

5.48 KiB

assets/skins/food_12.png

+143 B (8.2 KiB)

8.06 KiB

8.20 KiB

assets/skins/food_13.png

+25 B (5.96 KiB)

5.93 KiB

5.96 KiB

assets/skins/food_14.png

+57 B (5.39 KiB)

5.33 KiB

5.39 KiB

assets/skins/food_15.png

+88 B (5.51 KiB)

5.42 KiB

5.51 KiB

assets/skins/food_16.png

+150 B (5.16 KiB)

5.02 KiB

5.16 KiB

assets/skins/food_2.png

+140 B (6.22 KiB)

6.09 KiB

6.22 KiB

assets/skins/food_3.png

+159 B (5.31 KiB)

5.16 KiB

5.31 KiB

assets/skins/food_4.png

+96 B (7.75 KiB)

7.66 KiB

7.75 KiB

assets/skins/food_5.png

+106 B (6.48 KiB)

6.38 KiB

6.48 KiB

assets/skins/food_6.png

+183 B (4.71 KiB)

4.53 KiB

4.71 KiB

assets/skins/food_7.png

+87 B (7.14 KiB)

7.06 KiB

7.14 KiB

assets/skins/food_8.png

+87 B (6.63 KiB)

6.54 KiB

6.63 KiB

assets/skins/food_9.png

+165 B (6.37 KiB)

6.21 KiB

6.37 KiB

assets/skins/monsters_1.png

+249 B (9.93 KiB)

9.68 KiB

9.93 KiB

assets/skins/monsters_10.png

+233 B (9.15 KiB)

8.92 KiB

9.15 KiB

assets/skins/monsters_11.png

+163 B (10.5 KiB)

10.33 KiB

10.49 KiB

assets/skins/monsters_12.png

+161 B (8.29 KiB)

8.13 KiB

8.29 KiB

assets/skins/monsters_13.png

+173 B (9.7 KiB)

9.53 KiB

9.70 KiB

assets/skins/monsters_14.png

+158 B (8.43 KiB)

8.28 KiB

8.43 KiB

assets/skins/monsters_15.png

+198 B (9.09 KiB)

8.90 KiB

9.09 KiB

assets/skins/monsters_16.png

+179 B (9.73 KiB)

9.56 KiB

9.73 KiB

assets/skins/monsters_2.png

+185 B (8.71 KiB)

8.53 KiB

8.71 KiB

assets/skins/monsters_3.png

+103 B (10.9 KiB)

10.82 KiB

10.92 KiB

assets/skins/monsters_4.png

+236 B (9.73 KiB)

9.50 KiB

9.73 KiB

assets/skins/monsters_5.png

+175 B (8.6 KiB)

8.43 KiB

8.60 KiB

assets/skins/monsters_6.png

+243 B (9.26 KiB)

9.03 KiB

9.26 KiB

assets/skins/monsters_7.png

+168 B (8.37 KiB)

8.21 KiB

8.37 KiB

assets/skins/monsters_8.png

+189 B (9.31 KiB)

9.12 KiB

9.31 KiB

assets/skins/monsters_9.png

+191 B (8.2 KiB)

8.01 KiB

8.20 KiB

assets/skins/nature_1.png

+125 B (10.8 KiB)

10.66 KiB

10.78 KiB

assets/skins/nature_10.png

+84 B (8.08 KiB)

8.00 KiB

8.08 KiB

assets/skins/nature_11.png

+184 B (10.5 KiB)

10.31 KiB

10.49 KiB

assets/skins/nature_12.png

+132 B (8.83 KiB)

8.70 KiB

8.83 KiB

assets/skins/nature_13.png

+191 B (9.22 KiB)

9.03 KiB

9.22 KiB

assets/skins/nature_14.png

+140 B (5.6 KiB)

5.46 KiB

5.60 KiB

assets/skins/nature_15.png

+142 B (8.81 KiB)

8.67 KiB

8.81 KiB

assets/skins/nature_16.png

+107 B (5.9 KiB)

5.80 KiB

5.90 KiB

assets/skins/nature_2.png

+64 B (7.04 KiB)

6.98 KiB

7.04 KiB

assets/skins/nature_3.png

+115 B (10.9 KiB)

10.79 KiB

10.90 KiB

assets/skins/nature_4.png

+142 B (9.63 KiB)

9.49 KiB

9.63 KiB

assets/skins/nature_5.png

+126 B (11.6 KiB)

11.52 KiB

11.64 KiB

assets/skins/nature_6.png

+192 B (7.37 KiB)

7.18 KiB

7.37 KiB

assets/skins/nature_7.png

+203 B (10.2 KiB)

10.04 KiB

10.24 KiB

assets/skins/nature_8.png

+183 B (9.59 KiB)

9.41 KiB

9.59 KiB

assets/skins/nature_9.png

+130 B (10.6 KiB)

10.50 KiB

10.63 KiB

fastlane/metadata/android/en-US/changelogs/56.txt

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			Upgrade flutter framework and dependencies, clean / update some code

fastlane/metadata/android/en-US/images/icon.png

+169 B (16.9 KiB)

16.71 KiB

16.87 KiB

fastlane/metadata/android/fr-FR/changelogs/56.txt

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			Mise à jour du framework Flutter et de ses dépendances, améliorations / corrections de code

icons/build_application_icons.sh

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,8 +9,18 @@ CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
	BASE_DIR="$(dirname "${CURRENT_DIR}")"		BASE_DIR="$(dirname "${CURRENT_DIR}")"

	SOURCE="${CURRENT_DIR}/icon.svg"		SOURCE="${CURRENT_DIR}/icon.svg"
			SOURCE_FASTLANE="${CURRENT_DIR}/featureGraphic.svg"

	OPTIPNG_OPTIONS="-preserve -quiet -o7"		OPTIPNG_OPTIONS="-preserve -quiet -o7"

			if [ ! -f "${SOURCE}" ]; then
			echo "Missing file: ${SOURCE}"
			fi

			if [ ! -f "${SOURCE_FASTLANE}" ]; then
			echo "Missing file: ${SOURCE_FASTLANE}"
			fi

	# optimize svg		# optimize svg
	cp ${SOURCE} ${SOURCE}.tmp		cp ${SOURCE} ${SOURCE}.tmp
	scour \		scour \
	@@ -19,6 +29,7 @@ scour \
	--enable-viewboxing \		--enable-viewboxing \
	--enable-comment-stripping \		--enable-comment-stripping \
	--nindent=4 \		--nindent=4 \
			--quiet \
	-i ${SOURCE}.tmp \		-i ${SOURCE}.tmp \
	-o ${SOURCE}		-o ${SOURCE}
	rm ${SOURCE}.tmp		rm ${SOURCE}.tmp
	@@ -28,6 +39,8 @@ function build_icon() {
	ICON_SIZE="$1"		ICON_SIZE="$1"
	TARGET="$2"		TARGET="$2"

			echo "Building ${TARGET}"

	TARGET_PNG="${TARGET}.png"		TARGET_PNG="${TARGET}.png"

	inkscape \		inkscape \
	@@ -45,7 +58,7 @@ function build_fastlane_image() {
	HEIGHT="$2"		HEIGHT="$2"
	TARGET="$3"		TARGET="$3"

	SOURCE_FASTLANE="${CURRENT_DIR}/featureGraphic.svg"		echo "Building ${TARGET}"

	cp ${SOURCE_FASTLANE} ${SOURCE_FASTLANE}.tmp		cp ${SOURCE_FASTLANE} ${SOURCE_FASTLANE}.tmp
	scour \		scour \
	@@ -54,6 +67,7 @@ function build_fastlane_image() {
	--enable-viewboxing \		--enable-viewboxing \
	--enable-comment-stripping \		--enable-comment-stripping \
	--nindent=4 \		--nindent=4 \
			--quiet \
	-i ${SOURCE_FASTLANE}.tmp \		-i ${SOURCE_FASTLANE}.tmp \
	-o ${SOURCE_FASTLANE}		-o ${SOURCE_FASTLANE}
	rm ${SOURCE_FASTLANE}.tmp		rm ${SOURCE_FASTLANE}.tmp

icons/build_game_icons.sh

+104 −26

Original line number	Original line	Diff line number	Diff line
	@@ -7,8 +7,59 @@ command -v optipng >/dev/null 2>&1 \|\| { echo >&2 "I require optipng but it's not

	CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"		CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
	BASE_DIR="$(dirname "${CURRENT_DIR}")"		BASE_DIR="$(dirname "${CURRENT_DIR}")"
			ASSETS_DIR="${BASE_DIR}/assets"

	OPTIPNG_OPTIONS="-preserve -quiet -o7"		OPTIPNG_OPTIONS="-preserve -quiet -o7"
			ICON_SIZE=192

			#######################################################

			# Game images
			AVAILABLE_GAME_IMAGES="
			button_back
			button_start
			button_help
			button_show_conflicts
			game_win
			placeholder
			cell_empty
			"

			# Settings images
			AVAILABLES_GAME_SETTINGS="
			level:easy,medium,hard,nightmare
			size:2x2,3x2,3x3,4x4
			"

			# Skins
			AVAILABLE_SKINS="
			default
			food
			monsters
			nature
			"

			# Images per skin
			SKIN_IMAGES="
			1
			2
			3
			4
			5
			6
			7
			8
			9
			10
			11
			12
			13
			14
			15
			16
			"

			#######################################################

	# optimize svg		# optimize svg
	function optimize_svg() {		function optimize_svg() {
	@@ -21,6 +72,7 @@ function optimize_svg() {
	--enable-viewboxing \		--enable-viewboxing \
	--enable-comment-stripping \		--enable-comment-stripping \
	--nindent=4 \		--nindent=4 \
			--quiet \
	-i ${SOURCE}.tmp \		-i ${SOURCE}.tmp \
	-o ${SOURCE}		-o ${SOURCE}
	rm ${SOURCE}.tmp		rm ${SOURCE}.tmp
	@@ -28,10 +80,16 @@ function optimize_svg() {

	# build icons		# build icons
	function build_icon() {		function build_icon() {
	ICON_SIZE=192
	SOURCE="$1"		SOURCE="$1"
	TARGET="$2"		TARGET="$2"

			echo "Building ${TARGET}"

			if [ ! -f "${SOURCE}" ]; then
			echo "Missing file: ${SOURCE}"
			exit 1
			fi

	optimize_svg "${SOURCE}"		optimize_svg "${SOURCE}"

	inkscape \		inkscape \
	@@ -43,36 +101,56 @@ function build_icon() {
	optipng ${OPTIPNG_OPTIONS} ${TARGET}		optipng ${OPTIPNG_OPTIONS} ${TARGET}
	}		}

			function build_settings_icons() {
			INPUT_STRING="$1"

			SETTING_NAME="$(echo "${INPUT_STRING}" \| cut -d":" -f1)"
			SETTING_VALUES="$(echo "${INPUT_STRING}" \| cut -d":" -f2 \| tr "," " ")"

			for SETTING_VALUE in ${SETTING_VALUES}
			do
			SETTING_CODE="${SETTING_NAME}_${SETTING_VALUE}"
			build_icon ${CURRENT_DIR}/${SETTING_CODE}.svg ${ASSETS_DIR}/icons/${SETTING_CODE}.png
			done
			}

	function build_icon_for_skin() {		function build_icon_for_skin() {
	SKIN_CODE="$1"		SKIN_CODE="$1"

	build_icon ${CURRENT_DIR}/skin_${SKIN_CODE}.svg ${BASE_DIR}/assets/icons/skin_${SKIN_CODE}.png		# skin main image
	for VALUE in {1..16};		build_icon ${CURRENT_DIR}/skin_${SKIN_CODE}.svg ${ASSETS_DIR}/icons/skin_${SKIN_CODE}.png

			# skin images
			for SKIN_IMAGE in ${SKIN_IMAGES}
	do		do
	if [ -f "${CURRENT_DIR}/skins/${SKIN_CODE}/${VALUE}.svg" ]; then		build_icon ${CURRENT_DIR}/skins/${SKIN_CODE}/${SKIN_IMAGE}.svg ${ASSETS_DIR}/skins/${SKIN_CODE}_${SKIN_IMAGE}.png
	build_icon ${CURRENT_DIR}/skins/${SKIN_CODE}/${VALUE}.svg ${BASE_DIR}/assets/skins/${SKIN_CODE}_${VALUE}.png
	fi
	done		done
	}		}

	# Game icons		#######################################################
	build_icon ${CURRENT_DIR}/button_back.svg ${BASE_DIR}/assets/icons/button_back.png
	build_icon ${CURRENT_DIR}/button_help.svg ${BASE_DIR}/assets/icons/button_help.png
	build_icon ${CURRENT_DIR}/button_show_conflicts.svg ${BASE_DIR}/assets/icons/button_show_conflicts.png
	build_icon ${CURRENT_DIR}/button_start.svg ${BASE_DIR}/assets/icons/button_start.png
	build_icon ${CURRENT_DIR}/difficulty_easy.svg ${BASE_DIR}/assets/icons/difficulty_easy.png
	build_icon ${CURRENT_DIR}/difficulty_medium.svg ${BASE_DIR}/assets/icons/difficulty_medium.png
	build_icon ${CURRENT_DIR}/difficulty_hard.svg ${BASE_DIR}/assets/icons/difficulty_hard.png
	build_icon ${CURRENT_DIR}/difficulty_nightmare.svg ${BASE_DIR}/assets/icons/difficulty_nightmare.png
	build_icon ${CURRENT_DIR}/game_win.svg ${BASE_DIR}/assets/icons/game_win.png
	build_icon ${CURRENT_DIR}/size_2x2.svg ${BASE_DIR}/assets/icons/size_2x2.png
	build_icon ${CURRENT_DIR}/size_3x2.svg ${BASE_DIR}/assets/icons/size_3x2.png
	build_icon ${CURRENT_DIR}/size_3x3.svg ${BASE_DIR}/assets/icons/size_3x3.png
	build_icon ${CURRENT_DIR}/size_4x4.svg ${BASE_DIR}/assets/icons/size_4x4.png
	build_icon ${CURRENT_DIR}/skins/empty.svg ${BASE_DIR}/assets/skins/empty.png

	# Skins		# Create output folders
	build_icon_for_skin "default"		mkdir -p ${ASSETS_DIR}/icons
	build_icon_for_skin "food"		mkdir -p ${ASSETS_DIR}/skins
	build_icon_for_skin "monsters"
	build_icon_for_skin "nature"		# Delete existing generated images
			find ${ASSETS_DIR}/icons -type f -name "*.png" -delete
			find ${ASSETS_DIR}/skins -type f -name "*.png" -delete

			# build game images
			for GAME_IMAGE in ${AVAILABLE_GAME_IMAGES}
			do
			build_icon ${CURRENT_DIR}/${GAME_IMAGE}.svg ${ASSETS_DIR}/icons/${GAME_IMAGE}.png
			done

			# build settings images
			for GAME_SETTING in ${AVAILABLES_GAME_SETTINGS}
			do
			build_settings_icons "${GAME_SETTING}"
			done

			# build skins images
			for SKIN in ${AVAILABLE_SKINS}
			do
			build_icon_for_skin "${SKIN}"
			done

icons/skins/empty.svg→icons/cell_empty.svg

+0 −0

File moved.

icons/featureGraphic.svg

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

icons/difficulty_easy.svg→icons/level_easy.svg

+0 −0

File moved.

icons/difficulty_hard.svg→icons/level_hard.svg

+0 −0

File moved.

icons/difficulty_medium.svg→icons/level_medium.svg

+0 −0

File moved.

icons/difficulty_nightmare.svg→icons/level_nightmare.svg

+0 −0

File moved.

icons/placeholder.svg

0 → 100644

+2 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="UTF-8"?>
			<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 102 102" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"/>

icons/skins/food/10.svg

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib/entities/cell.dart

+68 −58

Original line number	Original line	Diff line number	Diff line
	@@ -12,8 +12,8 @@ class Cell {
	bool isAnimated = false;		bool isAnimated = false;

	Cell(		Cell(
	@required this.value,		this.value,
	@required this.isFixed,		this.isFixed,
	);		);

	/*		/*
	@@ -40,15 +40,13 @@ class Cell {
	),		),
	),		),
	onTap: () {		onTap: () {
	if (col != null && row != null) {
	if (col != myProvider.currentCellCol \|\| row != myProvider.currentCellRow) {		if (col != myProvider.currentCellCol \|\| row != myProvider.currentCellRow) {
	myProvider.selectCell(col, row);		myProvider.selectCell(col, row);
	} else {		} else {
	myProvider.selectCell(null, null);		myProvider.selectCell(null, null);
	}		}
	}
	},		},
	)		),
	);		);
	}		}

	@@ -61,19 +59,18 @@ class Cell {
	}		}

	String imageAsset = this.getImageAssetName(myProvider);		String imageAsset = this.getImageAssetName(myProvider);
	Color backgroundColor = Colors.grey[200];		Color backgroundColor = Colors.grey.shade200;

	if (		if (myProvider.showConflicts &&
	myProvider.showConflicts		myProvider.currentCellCol != null &&
	&& myProvider.currentCellCol != null		myProvider.currentCellRow != null) {
	&& myProvider.currentCellRow != null
	) {
	List cells = myProvider.cells;		List cells = myProvider.cells;
	int blockSizeHorizontal = myProvider.blockSizeHorizontal;		int blockSizeHorizontal = myProvider.blockSizeHorizontal;
	int blockSizeVertical = myProvider.blockSizeVertical;		int blockSizeVertical = myProvider.blockSizeVertical;

	if (!BoardUtils.isValueAllowed(cells, blockSizeHorizontal, blockSizeVertical, myProvider.currentCellCol, myProvider.currentCellRow, this.value)) {		if (!BoardUtils.isValueAllowed(cells, blockSizeHorizontal, blockSizeVertical,
	backgroundColor = Colors.pink[100];		myProvider.currentCellCol, myProvider.currentCellRow, this.value)) {
			backgroundColor = Colors.pink.shade100;
	}		}
	}		}

	@@ -86,31 +83,29 @@ class Cell {
	),		),
	),		),
	child: GestureDetector(		child: GestureDetector(
	child: Image(		child: Image(image: AssetImage(imageAsset), fit: BoxFit.fill),
	image: AssetImage(imageAsset),
	fit: BoxFit.fill
	),
	onTap: () {		onTap: () {
	if (myProvider.currentCellCol != null && myProvider.currentCellRow != null) {		if (myProvider.currentCellCol != null && myProvider.currentCellRow != null) {
	myProvider.updateCellValue(myProvider.currentCellCol, myProvider.currentCellRow, this.value);		myProvider.updateCellValue(
			myProvider.currentCellCol, myProvider.currentCellRow, this.value);
	}		}
	myProvider.selectCell(null, null);		myProvider.selectCell(null, null);
	if (BoardUtils.checkBoardIsSolved(myProvider)) {		if (BoardUtils.checkBoardIsSolved(myProvider)) {
	BoardAnimate.startAnimation(myProvider, 'win');		BoardAnimate.startAnimation(myProvider, 'win');
	}		}
	},		},
	)		));
	);
	}		}

	/*		/*
	* Compute image asset name, from skin and cell value/state		* Compute image asset name, from skin and cell value/state
	*/		*/
	String getImageAssetName(Data myProvider) {		String getImageAssetName(Data myProvider) {
	String imageAsset = 'assets/skins/empty.png';		String imageAsset = 'assets/icons/cell_empty.png';
	if (this.value > 0) {		if (this.value > 0) {
	int cellValue = myProvider.getTranslatedValueForDisplay(this.value);		int cellValue = myProvider.getTranslatedValueForDisplay(this.value);
	imageAsset = 'assets/skins/' + myProvider.skin + '_' + cellValue.toString() + '.png';		imageAsset =
			'assets/skins/' + myProvider.parameterSkin + '_' + cellValue.toString() + '.png';
	}		}

	return imageAsset;		return imageAsset;
	@@ -118,14 +113,14 @@ class Cell {

	// Compute cell background color, from cell state		// Compute cell background color, from cell state
	Color getBackgroundColor(Data myProvider) {		Color getBackgroundColor(Data myProvider) {
	Color editableCellColor = Colors.grey[100];		Color editableCellColor = Colors.grey.shade100;
	Color editableCellColorConflict = Colors.pink[100];		Color editableCellColorConflict = Colors.pink.shade100;
	Color fixedCellColor = Colors.grey[300];		Color fixedCellColor = Colors.grey.shade300;
	Color fixedCellColorConflict = Colors.pink[200];		Color fixedCellColorConflict = Colors.pink.shade200;
	Color editableSelectedValueColor = Colors.green[100];		Color editableSelectedValueColor = Colors.green.shade100;
	Color fixedSelectedValueColor = Colors.green[300];		Color fixedSelectedValueColor = Colors.green.shade300;
	Color editableAnimated = Colors.green[200];		Color editableAnimated = Colors.green.shade200;
	Color fixedAnimated = Colors.green[300];		Color fixedAnimated = Colors.green.shade300;

	Color backgroundColor = editableCellColor;		Color backgroundColor = editableCellColor;

	@@ -182,7 +177,7 @@ class Cell {
	}		}

	if (!myProvider.gameIsRunning) {		if (!myProvider.gameIsRunning) {
	cellBorderColor = Colors.green[700];		cellBorderColor = Colors.green.shade700;
	}		}

	Border borders = Border.all(		Border borders = Border.all(
	@@ -193,10 +188,25 @@ class Cell {
	// Update cell borders if not currently selected cell		// Update cell borders if not currently selected cell
	if (col != myProvider.currentCellCol \|\| row != myProvider.currentCellRow) {		if (col != myProvider.currentCellCol \|\| row != myProvider.currentCellRow) {
	borders = Border(		borders = Border(
	top: BorderSide(width: cellBorderWidth, color: ((row % blockSizeVertical) == 0) ? cellBorderDarkColor : cellBorderLightColor),		top: BorderSide(
	left: BorderSide(width: cellBorderWidth, color: ((col % blockSizeHorizontal) == 0) ? cellBorderDarkColor : cellBorderLightColor),		width: cellBorderWidth,
	right: BorderSide(width: cellBorderWidth, color: (((col + 1) % blockSizeHorizontal) == 0) ? cellBorderDarkColor : cellBorderLightColor),		color:
	bottom: BorderSide(width: cellBorderWidth, color: (((row + 1) % blockSizeVertical) == 0) ? cellBorderDarkColor : cellBorderLightColor),		((row % blockSizeVertical) == 0) ? cellBorderDarkColor : cellBorderLightColor),
			left: BorderSide(
			width: cellBorderWidth,
			color: ((col % blockSizeHorizontal) == 0)
			? cellBorderDarkColor
			: cellBorderLightColor),
			right: BorderSide(
			width: cellBorderWidth,
			color: (((col + 1) % blockSizeHorizontal) == 0)
			? cellBorderDarkColor
			: cellBorderLightColor),
			bottom: BorderSide(
			width: cellBorderWidth,
			color: (((row + 1) % blockSizeVertical) == 0)
			? cellBorderDarkColor
			: cellBorderLightColor),
	);		);
	}		}

lib/layout/board.dart

+7 −18

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
	import '../provider/data.dart';		import '../provider/data.dart';

	class Board {		class Board {

	static Container buildGameBoard(Data myProvider) {		static Container buildGameBoard(Data myProvider) {
	Color borderColor = Colors.black;		Color borderColor = Colors.black;

	@@ -30,22 +29,12 @@ class Board {
	int boardSize = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;		int boardSize = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;
	List cells = myProvider.cells;		List cells = myProvider.cells;

	return Table(		return Table(defaultColumnWidth: IntrinsicColumnWidth(), children: [
	defaultColumnWidth: IntrinsicColumnWidth(),
	children: [
	for (var row = 0; row < boardSize; row++)		for (var row = 0; row < boardSize; row++)
	TableRow(children: [		TableRow(children: [
	for (var col = 0; col < boardSize; col++)		for (var col = 0; col < boardSize; col++)
	Column(children: [		Column(children: [cells[row][col].widget(myProvider, row, col)]),
	cells[row][col].widget(
	myProvider,
	row,
	col
	)
	]),
	]),		]),
	]		]);
	);
	}		}

	}		}

lib/layout/game.dart

+35 −33

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,6 @@ import '../utils/board_utils.dart';
	import '../utils/game_utils.dart';		import '../utils/game_utils.dart';

	class Game {		class Game {

	static Container buildGameWidget(Data myProvider) {		static Container buildGameWidget(Data myProvider) {
	bool gameIsFinished = BoardUtils.checkBoardIsSolved(myProvider);		bool gameIsFinished = BoardUtils.checkBoardIsSolved(myProvider);

	@@ -31,10 +30,11 @@ class Game {
	static Container buildSelectCellValueBar(Data myProvider) {		static Container buildSelectCellValueBar(Data myProvider) {
	List cells = myProvider.cells;		List cells = myProvider.cells;

	Color borderColor = Colors.blue;		bool isCellSelected =
			(myProvider.currentCellCol != null && myProvider.currentCellRow != null);
	bool isCellSelected = (myProvider.currentCellCol != null && myProvider.currentCellRow != null);		bool isUpdatableCellSelected = isCellSelected
	bool isUpdatableCellSelected = isCellSelected ? !myProvider.cells[myProvider.currentCellRow][myProvider.currentCellCol].isFixed : false;		? !cells[myProvider.currentCellRow ?? 0][myProvider.currentCellCol ?? 0].isFixed
			: false;
	int maxValue = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;		int maxValue = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;

	int maxItemsPerLine = 10;		int maxItemsPerLine = 10;
	@@ -44,35 +44,31 @@ class Game {
	return Container(		return Container(
	margin: EdgeInsets.all(2),		margin: EdgeInsets.all(2),
	padding: EdgeInsets.all(2),		padding: EdgeInsets.all(2),

	child: Table(		child: Table(
	defaultColumnWidth: IntrinsicColumnWidth(),		defaultColumnWidth: IntrinsicColumnWidth(),
	children: [		children: [
	for (var lineIndex = 0; lineIndex < linesCount; lineIndex++)		for (var lineIndex = 0; lineIndex < linesCount; lineIndex++)
	TableRow(		TableRow(
	children: [		children: [
	for (		for (var value = lineIndex * itemsCountPerLine;
	var value = lineIndex * itemsCountPerLine;
	value < (lineIndex + 1) * itemsCountPerLine;		value < (lineIndex + 1) * itemsCountPerLine;
	value++		value++)
	)
	Column(		Column(
	children: [		children: [
	Cell(		Cell(isUpdatableCellSelected ? (value <= maxValue ? value : -1) : -1,
	isUpdatableCellSelected ? (value <= maxValue ? value : -1) : -1,		false)
	false		.widgetUpdateValue(myProvider)
	).widgetUpdateValue(myProvider)		],
	]
	),		),
	]		],
	),		),
	]		],
	),		),
	);		);
	}		}

	static FlatButton buildRestartGameButton(Data myProvider) {		static TextButton buildRestartGameButton(Data myProvider) {
	return FlatButton(		return TextButton(
	child: Container(		child: Container(
	child: Image(		child: Image(
	image: AssetImage('assets/icons/button_back.png'),		image: AssetImage('assets/icons/button_back.png'),
	@@ -85,29 +81,35 @@ class Game {

	static Container buildEndGameMessage(Data myProvider) {		static Container buildEndGameMessage(Data myProvider) {
	Image decorationImage = Image(		Image decorationImage = Image(
	image: AssetImage(		image: AssetImage('assets/icons/game_win.png'),
	'assets/icons/game_win.png'		fit: BoxFit.fill,
	),
	fit: BoxFit.fill
	);		);

	return Container(		return Container(
	margin: EdgeInsets.all(2),		margin: EdgeInsets.all(2),
	padding: EdgeInsets.all(2),		padding: EdgeInsets.all(2),

	child: Table(		child: Table(
	defaultColumnWidth: IntrinsicColumnWidth(),		defaultColumnWidth: IntrinsicColumnWidth(),
	children: [		children: [
	TableRow(		TableRow(
	children: [		children: [
	Column(children: [ decorationImage ]),		Column(
	Column(children: [ myProvider.animationInProgress ? decorationImage : buildRestartGameButton(myProvider) ]),		children: [decorationImage],
	Column(children: [ decorationImage ]),		),
			Column(
			children: [
			myProvider.animationInProgress
			? decorationImage
			: buildRestartGameButton(myProvider)
			],
			),
			Column(
			children: [decorationImage],
			),
			],
			),
	],		],
	),		),
	]
	)
	);		);
	}		}

	}		}

lib/layout/parameters.dart

+57 −34

Original line number	Original line	Diff line number	Diff line
	@@ -4,23 +4,43 @@ import '../provider/data.dart';
	import '../utils/game_utils.dart';		import '../utils/game_utils.dart';

	class Parameters {		class Parameters {
			static double separatorHeight = 2.0;
			static double blockMargin = 3.0;
			static double blockPadding = 2.0;
			static Color buttonBackgroundColor = Colors.white;
			static Color buttonBorderColorActive = Colors.blue;
			static Color buttonBorderColorInactive = Colors.white;
			static double buttonBorderWidth = 10.0;
			static double buttonBorderRadius = 8.0;
			static double buttonPadding = 0.0;
			static double buttonMargin = 0.0;

	static Container buildParametersSelector(Data myProvider) {		static Container buildParametersSelector(Data myProvider) {
			List<Widget> lines = [];

			List parameters = myProvider.availableParameters;
			for (var index = 0; index < parameters.length; index++) {
			lines.add(Parameters.buildParameterSelector(myProvider, parameters[index]));
			lines.add(SizedBox(height: Parameters.separatorHeight));
			}

	return Container(		return Container(
	padding: EdgeInsets.all(2),		child: Column(
	margin: EdgeInsets.all(2),		mainAxisAlignment: MainAxisAlignment.start,
			crossAxisAlignment: CrossAxisAlignment.center,
			children: [
			SizedBox(height: Parameters.separatorHeight),
			Expanded(
	child: Column(		child: Column(
	mainAxisSize: MainAxisSize.min,		mainAxisSize: MainAxisSize.min,
	mainAxisAlignment: MainAxisAlignment.center,		mainAxisAlignment: MainAxisAlignment.center,
	children: [		children: lines,
	Parameters.buildParameterSelector(myProvider, 'difficulty'),		),
	SizedBox(height: 5),		),
	Parameters.buildParameterSelector(myProvider, 'size'),		SizedBox(height: Parameters.separatorHeight),
	SizedBox(height: 5),		Container(
	Parameters.buildParameterSelector(myProvider, 'skin'),		child: Parameters.buildStartGameButton(myProvider),
	SizedBox(height: 5),		),

	Parameters.buildStartGameButton(myProvider),
	],		],
	),		),
	);		);
	@@ -29,17 +49,13 @@ class Parameters {
	static Container buildStartGameButton(Data myProvider) {		static Container buildStartGameButton(Data myProvider) {
	Column decorationImage = Column(		Column decorationImage = Column(
	children: [		children: [
	Image(		Image(image: AssetImage('assets/icons/placeholder.png'), fit: BoxFit.fill),
	image: AssetImage('assets/icons/game_win.png'),		],
	fit: BoxFit.fill
	),
	]
	);		);

	return Container(		return Container(
	margin: EdgeInsets.all(2),		margin: EdgeInsets.all(Parameters.blockMargin),
	padding: EdgeInsets.all(2),		padding: EdgeInsets.all(Parameters.blockPadding),

	child: Table(		child: Table(
	defaultColumnWidth: IntrinsicColumnWidth(),		defaultColumnWidth: IntrinsicColumnWidth(),
	children: [		children: [
	@@ -48,7 +64,7 @@ class Parameters {
	decorationImage,		decorationImage,
	Column(		Column(
	children: [		children: [
	FlatButton(		TextButton(
	child: Container(		child: Container(
	child: Image(		child: Image(
	image: AssetImage('assets/icons/button_start.png'),		image: AssetImage('assets/icons/button_start.png'),
	@@ -57,19 +73,23 @@ class Parameters {
	),		),
	onPressed: () => GameUtils.startGame(myProvider),		onPressed: () => GameUtils.startGame(myProvider),
	),		),
	]		],
	),		),
	decorationImage,		decorationImage,
	],		],
	),		),
	]		],
	)		),
	);		);
	}		}

	static Table buildParameterSelector(Data myProvider, String parameterCode) {		static Widget buildParameterSelector(Data myProvider, String parameterCode) {
	List availableValues = myProvider.getParameterAvailableValues(parameterCode);		List availableValues = myProvider.getParameterAvailableValues(parameterCode);

			if (availableValues.length == 1) {
			return SizedBox(height: 0.0);
			}

	return Table(		return Table(
	defaultColumnWidth: IntrinsicColumnWidth(),		defaultColumnWidth: IntrinsicColumnWidth(),
	children: [		children: [
	@@ -79,7 +99,7 @@ class Parameters {
	Column(		Column(
	children: [		children: [
	_buildParameterButton(myProvider, parameterCode, availableValues[index])		_buildParameterButton(myProvider, parameterCode, availableValues[index])
	]		],
	),		),
	],		],
	),		),
	@@ -87,21 +107,25 @@ class Parameters {
	);		);
	}		}

	static FlatButton _buildParameterButton(Data myProvider, String parameterCode, String parameterValue) {		static Widget _buildParameterButton(
			Data myProvider, String parameterCode, String parameterValue) {
	String currentValue = myProvider.getParameterValue(parameterCode).toString();		String currentValue = myProvider.getParameterValue(parameterCode).toString();

	bool isActive = (parameterValue == currentValue);		bool isActive = (parameterValue == currentValue);
	String imageAsset = 'assets/icons/' + parameterCode + '_' + parameterValue + '.png';		String imageAsset = 'assets/icons/' + parameterCode + '_' + parameterValue + '.png';

	return FlatButton(		return TextButton(
	padding: EdgeInsets.all(2),
	child: Container(		child: Container(
			margin: EdgeInsets.all(Parameters.buttonMargin),
			padding: EdgeInsets.all(Parameters.buttonPadding),
	decoration: BoxDecoration(		decoration: BoxDecoration(
	color: Colors.white,		color: Parameters.buttonBackgroundColor,
	borderRadius: BorderRadius.circular(10),		borderRadius: BorderRadius.circular(Parameters.buttonBorderRadius),
	border: Border.all(		border: Border.all(
	color: isActive ? Colors.blue : Colors.white,		color: isActive
	width: 10,		? Parameters.buttonBorderColorActive
			: Parameters.buttonBorderColorInactive,
			width: Parameters.buttonBorderWidth,
	),		),
	),		),
	child: Image(		child: Image(
	@@ -112,5 +136,4 @@ class Parameters {
	onPressed: () => myProvider.setParameterValue(parameterCode, parameterValue),		onPressed: () => myProvider.setParameterValue(parameterCode, parameterValue),
	);		);
	}		}

	}		}

lib/provider/data.dart

+84 −69

Original line number	Original line	Diff line number	Diff line
	@@ -2,91 +2,100 @@ import 'package:flutter/foundation.dart';
	import 'package:shared_preferences/shared_preferences.dart';		import 'package:shared_preferences/shared_preferences.dart';

	class Data extends ChangeNotifier {		class Data extends ChangeNotifier {

	// Configuration available values		// Configuration available values
	List _availableDifficultyLevels = ['easy', 'medium', 'hard', 'nightmare'];		List _availableParameters = ['level', 'size', 'skin'];
	List _availableSizes = ['2x2', '3x2', '3x3', '4x4'];
	List _availableSkins = ['default', 'food', 'nature', 'monsters'];		List _availableLevelValues = ['easy', 'medium', 'hard', 'nightmare'];
			List _availableSizeValues = ['2x2', '3x2', '3x3', '4x4'];
			List _availableSkinValues = ['default', 'food', 'nature', 'monsters'];
	List _shufflableSkins = ['food', 'nature', 'monsters'];		List _shufflableSkins = ['food', 'nature', 'monsters'];

	List get availableDifficultyLevels => _availableDifficultyLevels;		List get availableParameters => _availableParameters;
	List get availableSizes => _availableSizes;		List get availableLevelValues => _availableLevelValues;
	List get availableSkins => _availableSkins;		List get availableSizeValues => _availableSizeValues;
			List get availableSkinValues => _availableSkinValues;

	// Application default configuration		// Application default configuration
	String _level = null;		String _parameterLevel = '';
	String _levelDefault = 'medium';		String _parameterLevelDefault = 'medium';
	String _size = null;		String _parameterSize = '';
	String _sizeDefault = '3x3';		String _parameterSizeDefault = '3x3';
	String _skin = null;		String _parameterSkin = '';
	String _skinDefault = 'default';		String _parameterSkinDefault = 'default';

			// Application current configuration
			String get parameterLevel => _parameterLevel;
			String get parameterSize => _parameterSize;
			String get parameterSkin => _parameterSkin;

	// Game data		// Game data
	bool _assetsPreloaded = false;		bool _assetsPreloaded = false;
	bool _gameIsRunning = false;		bool _gameIsRunning = false;
	bool _animationInProgress = false;		bool _animationInProgress = false;
	int _blockSizeVertical = null;		int _blockSizeVertical = 0;
	int _blockSizeHorizontal = null;		int _blockSizeHorizontal = 0;
	List _cells = [];		List _cells = [];
	List _cellsSolved = [];		List _cellsSolved = [];
	List _shuffledCellValues = [];		List _shuffledCellValues = [];
	int _currentCellCol = null;		int? _currentCellCol;
	int _currentCellRow = null;		int? _currentCellRow;
	int _currentCellValue = null;		int? _currentCellValue;
	bool _showConflicts = false;		bool _showConflicts = false;
	int _givenTipsCount = 0;		int _givenTipsCount = 0;

	String get level => _level;		void updateParameterLevel(String parameterLevel) {
	void updateLevel(String level) {		_parameterLevel = parameterLevel;
	_level = level;
	notifyListeners();		notifyListeners();
	}		}

	String get size => _size;
	int get blockSizeVertical => _blockSizeVertical;		int get blockSizeVertical => _blockSizeVertical;
	int get blockSizeHorizontal => _blockSizeHorizontal;		int get blockSizeHorizontal => _blockSizeHorizontal;
	void updateSize(String size) {		void updateParameterSize(String parameterSize) {
	_size = size;		_parameterSize = parameterSize;
	_blockSizeHorizontal = int.parse(_size.split('x')[0]);		_blockSizeHorizontal = int.parse(_parameterSize.split('x')[0]);
	_blockSizeVertical = int.parse(_size.split('x')[1]);		_blockSizeVertical = int.parse(_parameterSize.split('x')[1]);
	notifyListeners();		notifyListeners();
	}		}

	String get skin => _skin;		void updateParameterSkin(String parameterSkin) {
	void updateSkin(String skin) {		_parameterSkin = parameterSkin;
	_skin = skin;
	notifyListeners();		notifyListeners();
	}		}

	getParameterValue(String parameterCode) {		String getParameterValue(String parameterCode) {
	switch (parameterCode) {		switch (parameterCode) {
	case 'difficulty': { return _level; }		case 'level':
	break;		return _parameterLevel;
	case 'size': { return _size; }		case 'size':
	break;		return _parameterSize;
	case 'skin': { return _skin; }		case 'skin':
	break;		return _parameterSkin;
	}		}
			return '';
	}		}

	List getParameterAvailableValues(String parameterCode) {		List getParameterAvailableValues(String parameterCode) {
	switch (parameterCode) {		switch (parameterCode) {
	case 'difficulty': { return _availableDifficultyLevels; }		case 'level':
	break;		return _availableLevelValues;
	case 'size': { return _availableSizes; }		case 'size':
	break;		return _availableSizeValues;
	case 'skin': { return _availableSkins; }		case 'skin':
	break;		return _availableSkinValues;
	}		}
			return [];
	}		}

	setParameterValue(String parameterCode, String parameterValue) async {		void setParameterValue(String parameterCode, String parameterValue) async {
	switch (parameterCode) {		switch (parameterCode) {
	case 'difficulty': { updateLevel(parameterValue); }		case 'level':
			updateParameterLevel(parameterValue);
	break;		break;
	case 'size': { updateSize(parameterValue); }		case 'size':
			updateParameterSize(parameterValue);
	break;		break;
	case 'skin': { updateSkin(parameterValue); }		case 'skin':
			updateParameterSkin(parameterValue);
	break;		break;
	}		}
	final prefs = await SharedPreferences.getInstance();		final prefs = await SharedPreferences.getInstance();
	@@ -95,9 +104,9 @@ class Data extends ChangeNotifier {

	void initParametersValues() async {		void initParametersValues() async {
	final prefs = await SharedPreferences.getInstance();		final prefs = await SharedPreferences.getInstance();
	setParameterValue('difficulty', prefs.getString('difficulty') ?? _levelDefault);		setParameterValue('level', prefs.getString('level') ?? _parameterLevelDefault);
	setParameterValue('size', prefs.getString('size') ?? _sizeDefault);		setParameterValue('size', prefs.getString('size') ?? _parameterSizeDefault);
	setParameterValue('skin', prefs.getString('skin') ?? _skinDefault);		setParameterValue('skin', prefs.getString('skin') ?? _parameterSkinDefault);
	}		}

	bool get gameIsRunning => _gameIsRunning;		bool get gameIsRunning => _gameIsRunning;
	@@ -126,31 +135,32 @@ class Data extends ChangeNotifier {
	int maxCellValue = 16;		int maxCellValue = 16;
	List values = new List<int>.generate(maxCellValue, (i) => i + 1);		List values = new List<int>.generate(maxCellValue, (i) => i + 1);

	if (_shufflableSkins.contains(_skin)) {		if (_shufflableSkins.contains(_parameterSkin)) {
	values.shuffle();		values.shuffle();
	print('Shuffled tiles values: ' + values.toString());		print('Shuffled tiles values: ' + values.toString());
	}		}

	_shuffledCellValues = values;		_shuffledCellValues = values;
	}		}

	int getTranslatedValueForDisplay(int originalValue) {		int getTranslatedValueForDisplay(int originalValue) {
	return _shuffledCellValues[originalValue - 1];		return _shuffledCellValues[originalValue - 1];
	}		}

	int get currentCellCol => _currentCellCol;		int? get currentCellCol => _currentCellCol;
	set updateCurrentCellCol(int currentCellCol) {		set updateCurrentCellCol(int? currentCellCol) {
	_currentCellCol = currentCellCol;		_currentCellCol = currentCellCol;
	notifyListeners();		notifyListeners();
	}		}

	int get currentCellRow => _currentCellRow;		int? get currentCellRow => _currentCellRow;
	set updateCurrentCellRow(int currentCellRow) {		set updateCurrentCellRow(int? currentCellRow) {
	_currentCellRow = currentCellRow;		_currentCellRow = currentCellRow;
	notifyListeners();		notifyListeners();
	}		}

	int get currentCellValue => _currentCellValue;		int? get currentCellValue => _currentCellValue;
	set updateCurrentCellValue(int currentCellValue) {		set updateCurrentCellValue(int? currentCellValue) {
	_currentCellValue = currentCellValue;		_currentCellValue = currentCellValue;
	notifyListeners();		notifyListeners();
	}		}
	@@ -160,12 +170,13 @@ class Data extends ChangeNotifier {
	_givenTipsCount = _givenTipsCount + 1;		_givenTipsCount = _givenTipsCount + 1;
	notifyListeners();		notifyListeners();
	}		}

	resetGivenTipsCount() {		resetGivenTipsCount() {
	_givenTipsCount = 0;		_givenTipsCount = 0;
	notifyListeners();		notifyListeners();
	}		}

	selectCell(int col, int row) {		selectCell(int? col, int? row) {
	_currentCellCol = col;		_currentCellCol = col;
	_currentCellRow = row;		_currentCellRow = row;
	_currentCellValue = null;		_currentCellValue = null;
	@@ -177,18 +188,21 @@ class Data extends ChangeNotifier {
	notifyListeners();		notifyListeners();
	}		}

	updateCellValue(int col, int row, int value) {		updateCellValue(int? col, int? row, int value) {
			if ((col != null) && (row != null)) {
	if (!_cells[row][col].isFixed) {		if (!_cells[row][col].isFixed) {
	_cells[row][col].value = value;		_cells[row][col].value = value;
	}		}
	notifyListeners();		notifyListeners();
	}		}
			}

	bool get showConflicts => _showConflicts;		bool get showConflicts => _showConflicts;
	void updateShowConflicts(bool showConflicts) {		void updateShowConflicts(bool showConflicts) {
	_showConflicts = showConflicts;		_showConflicts = showConflicts;
	notifyListeners();		notifyListeners();
	}		}

	void toggleShowConflicts() {		void toggleShowConflicts() {
	updateShowConflicts(!showConflicts);		updateShowConflicts(!showConflicts);
	}		}
	@@ -208,6 +222,7 @@ class Data extends ChangeNotifier {
	}		}
	notifyListeners();		notifyListeners();
	}		}

	void resetAnimatedBackground() {		void resetAnimatedBackground() {
	int boardSideLength = _blockSizeHorizontal * _blockSizeVertical;		int boardSideLength = _blockSizeHorizontal * _blockSizeVertical;
	for (var row = 0; row < boardSideLength; row++) {		for (var row = 0; row < boardSideLength; row++) {

lib/screens/home.dart

+22 −39

Original line number	Original line	Diff line number	Diff line
	@@ -33,30 +33,21 @@ class _HomeState extends State<Home> {
	'button_show_conflicts',		'button_show_conflicts',
	'button_start',		'button_start',
	'game_win',		'game_win',
			'placeholder',
			'cell_empty'
	];		];
	myProvider.availableDifficultyLevels.forEach(		myProvider.availableLevelValues.forEach((level) => gameImages.add('level_' + level));
	(difficulty) => gameImages.add('difficulty_' + difficulty)		myProvider.availableSizeValues.forEach((size) => gameImages.add('size_' + size));
	);
	myProvider.availableSizes.forEach(
	(size) => gameImages.add('size_' + size)
	);

	gameImages.forEach(		gameImages.forEach((image) => assets.add('assets/icons/' + image + '.png'));
	(image) => assets.add('assets/icons/' + image + '.png')
	);

	List skinImages = [];		List skinImages = [];
	for (int value = 1; value <= 16; value++) {		for (int value = 1; value <= 16; value++) {
	skinImages.add(value.toString());		skinImages.add(value.toString());
	}		}

	myProvider.availableSkins.forEach(		myProvider.availableSkinValues.forEach((skin) => skinImages
	(skin) => skinImages.forEach(		.forEach((image) => assets.add('assets/skins/' + skin + '_' + image + '.png')));
	(image) => assets.add('assets/skins/' + skin + '_' + image + '.png')
	)
	);

	assets.add('assets/skins/empty.png');

	return assets;		return assets;
	}		}
	@@ -67,9 +58,7 @@ class _HomeState extends State<Home> {

	if (!myProvider.assetsPreloaded) {		if (!myProvider.assetsPreloaded) {
	List assets = getImagesAssets(myProvider);		List assets = getImagesAssets(myProvider);
	assets.forEach(		assets.forEach((asset) => precacheImage(AssetImage(asset), context));
	(asset) => precacheImage(AssetImage(asset), context)
	);
	myProvider.updateAssetsPreloaded(true);		myProvider.updateAssetsPreloaded(true);
	}		}

	@@ -77,7 +66,7 @@ class _HomeState extends State<Home> {

	if (myProvider.gameIsRunning) {		if (myProvider.gameIsRunning) {
	menuActions = [		menuActions = [
	FlatButton(		TextButton(
	child: Container(		child: Container(
	decoration: BoxDecoration(		decoration: BoxDecoration(
	borderRadius: BorderRadius.circular(4),		borderRadius: BorderRadius.circular(4),
	@@ -86,17 +75,16 @@ class _HomeState extends State<Home> {
	width: 4,		width: 4,
	),		),
	),		),
	margin: EdgeInsets.all(8),
	child: Image(		child: 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.resetGame(myProvider),		onLongPress: () => GameUtils.resetGame(myProvider),
	),		),
	Spacer(flex: 6),		Spacer(flex: 6),
	FlatButton(		TextButton(
	child: Container(		child: Container(
	decoration: BoxDecoration(		decoration: BoxDecoration(
	borderRadius: BorderRadius.circular(4),		borderRadius: BorderRadius.circular(4),
	@@ -105,31 +93,27 @@ class _HomeState extends State<Home> {
	width: 4,		width: 4,
	),		),
	),		),
	margin: EdgeInsets.all(8),
	child: Badge(		child: Badge(
	showBadge: myProvider.givenTipsCount == 0 ? false : true,		showBadge: myProvider.givenTipsCount == 0 ? false : true,
	badgeColor:		badgeColor: myProvider.givenTipsCount < 10
	myProvider.givenTipsCount < 10
	? Colors.green		? Colors.green
	: myProvider.givenTipsCount < 20		: myProvider.givenTipsCount < 20
	? Colors.orange		? Colors.orange
	: Colors.red,		: Colors.red,
	badgeContent: Text(		badgeContent: Text(
	myProvider.givenTipsCount == 0 ? '' : myProvider.givenTipsCount.toString(),		myProvider.givenTipsCount == 0 ? '' : myProvider.givenTipsCount.toString(),
	style: TextStyle(		style: TextStyle(color: Colors.white),
	color: Colors.white
	)
	),		),
	child: Image(		child: 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(),		Spacer(),
	FlatButton(		TextButton(
	child: Container(		child: Container(
	decoration: BoxDecoration(		decoration: BoxDecoration(
	borderRadius: BorderRadius.circular(4),		borderRadius: BorderRadius.circular(4),
	@@ -138,10 +122,9 @@ class _HomeState extends State<Home> {
	width: 4,		width: 4,
	),		),
	),		),
	margin: EdgeInsets.all(8),
	child: Image(		child: Image(
	image: AssetImage('assets/icons/button_show_conflicts.png'),		image: AssetImage('assets/icons/button_show_conflicts.png'),
	fit: BoxFit.fill		fit: BoxFit.fill,
	),		),
	),		),
	onPressed: () {		onPressed: () {
	@@ -159,9 +142,9 @@ class _HomeState extends State<Home> {
	child: Center(		child: Center(
	child: myProvider.gameIsRunning		child: myProvider.gameIsRunning
	? Game.buildGameWidget(myProvider)		? Game.buildGameWidget(myProvider)
	: Parameters.buildParametersSelector(myProvider)		: Parameters.buildParametersSelector(myProvider),
			),
	),		),
	)
	);		);
	}		}
	}		}