diff --git a/android/gradle.properties b/android/gradle.properties
index 663881258a10822c0b4abc064b6e0bc0ccf48833..81949dfd2077495aaea8a6bc81ad9c75442f9ebb 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
-app.versionName=0.0.13
-app.versionCode=13
+app.versionName=0.0.14
+app.versionCode=14
diff --git a/assets/skins/default_tile_1.png b/assets/skins/default_tile_1.png
index c4b951d92fa7c2c3d7843ef06e725fab8fc34e48..23690a6cd9133c42af5c1222b19634639f041572 100644
Binary files a/assets/skins/default_tile_1.png and b/assets/skins/default_tile_1.png differ
diff --git a/assets/skins/default_tile_2.png b/assets/skins/default_tile_2.png
index c47dee8a726f1e8e7f5193bfd5650f608e755124..ec9272a8c8476f89c5abfb7c0155ee425c861dd5 100644
Binary files a/assets/skins/default_tile_2.png and b/assets/skins/default_tile_2.png differ
diff --git a/assets/skins/default_tile_3.png b/assets/skins/default_tile_3.png
index 7da3d63267168150d65b94e11187d833f63d5e6a..9f546a2f252a142b1947ab99cab5fcd01abfbef4 100644
Binary files a/assets/skins/default_tile_3.png and b/assets/skins/default_tile_3.png differ
diff --git a/assets/skins/default_tile_4.png b/assets/skins/default_tile_4.png
index 1bfd5edb7930ebf522874d20a79596bc03b5fe49..007939df9809ddaab453b71efcbe4e611d08810d 100644
Binary files a/assets/skins/default_tile_4.png and b/assets/skins/default_tile_4.png differ
diff --git a/assets/skins/default_tile_5.png b/assets/skins/default_tile_5.png
index 38d695079a8377d20cb67e7e300a2a9b2c38da69..39231465aa288a4fca4f6a8b30d66d6eab6cb90a 100644
Binary files a/assets/skins/default_tile_5.png and b/assets/skins/default_tile_5.png differ
diff --git a/assets/skins/default_tile_6.png b/assets/skins/default_tile_6.png
index a9074fa7dfbdcb7506cf0296c9385eb7bc410269..567407e037578be6f15251e0f101936794a48701 100644
Binary files a/assets/skins/default_tile_6.png and b/assets/skins/default_tile_6.png differ
diff --git a/assets/skins/default_tile_7.png b/assets/skins/default_tile_7.png
index 8bf9bda2e28c5ef165e2a8e0ed3eaee7973be116..0687e540437da95f865fc7df85d98df478b68f20 100644
Binary files a/assets/skins/default_tile_7.png and b/assets/skins/default_tile_7.png differ
diff --git a/assets/skins/default_tile_8.png b/assets/skins/default_tile_8.png
index 8733181012a39f2acc822446787d29bc79c113ec..45fa69284816659672cea66e446ea9de00c37755 100644
Binary files a/assets/skins/default_tile_8.png and b/assets/skins/default_tile_8.png differ
diff --git a/assets/skins/default_tile_mine.png b/assets/skins/default_tile_mine.png
index 71f1ea3c0204c33522ed29671136ea61d074e4b6..044c7333ce662fb1f15217d55376e8f751975fb0 100644
Binary files a/assets/skins/default_tile_mine.png and b/assets/skins/default_tile_mine.png differ
diff --git a/assets/skins/default_tile_mine_not_found.png b/assets/skins/default_tile_mine_not_found.png
index a28db91fca96e5a509956ddd81d51bea2cd974c1..0c27686a2a9428932261ed88254e76bfb78a2385 100644
Binary files a/assets/skins/default_tile_mine_not_found.png and b/assets/skins/default_tile_mine_not_found.png differ
diff --git a/fastlane/metadata/android/en-US/changelogs/14.txt b/fastlane/metadata/android/en-US/changelogs/14.txt
new file mode 100644
index 0000000000000000000000000000000000000000..352b4c4d4bbd4aa928145ee527cf5769a116613a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/14.txt
@@ -0,0 +1 @@
+Improve game layout
diff --git a/fastlane/metadata/android/fr-FR/changelogs/14.txt b/fastlane/metadata/android/fr-FR/changelogs/14.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c8a2234b7dbd978ee7fae37959cc16bfd36915be
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/14.txt
@@ -0,0 +1 @@
+Amélioration des graphismes
diff --git a/icons/skins/default/tile_1.svg b/icons/skins/default/tile_1.svg
index da4bfe1fc437d22bd1538d6e2806078c4189790a..fdb5f80ec942878b034830f0a2048914e73606ff 100644
--- a/icons/skins/default/tile_1.svg
+++ b/icons/skins/default/tile_1.svg
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/>
-<g stroke-width="3.1763" aria-label="1"><path d="m66.056 3.7513v92.497h-25.559v-60.61q-6.2037 4.7148-12.035 7.6306-5.7695 2.9157-14.517 5.5833v-20.72q12.904-4.1565 20.038-9.988t11.167-14.393z"/></g></svg>
+<g fill="#182bd4" stroke-width="3.1763" aria-label="1"><path d="m66.056 3.7513v92.497h-25.559v-60.61q-6.2037 4.7148-12.035 7.6306-5.7695 2.9157-14.517 5.5833v-20.72q12.904-4.1565 20.038-9.988t11.167-14.393z" fill="#182bd4"/></g></svg>
diff --git a/icons/skins/default/tile_2.svg b/icons/skins/default/tile_2.svg
index 7f1a27e8b0270ba5493499bb3f450336d7dad014..3a2c27efec65f4bc406890f10c797f6191530e6d 100644
--- a/icons/skins/default/tile_2.svg
+++ b/icons/skins/default/tile_2.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g stroke-width="3.1763" aria-label="2"><path d="m87.905 96.249h-75.809q1.3028-11.229 7.8787-21.093 6.638-9.9259 24.815-23.388 11.105-8.2509 14.206-12.531 3.1019-4.2806 3.1019-8.1269 0-4.1565-3.1019-7.0722-3.0398-2.9778-7.6926-2.9778-4.8389 0-7.9408 3.0398-3.0398 3.0398-4.0944 10.732l-25.311-2.0472q1.4889-10.67 5.4593-16.626 3.9704-6.0176 11.167-9.1815 7.2583-3.2259 20.038-3.2259 13.338 0 20.72 3.0398 7.4445 3.0398 11.663 9.3676 4.2806 6.2657 4.2806 14.082 0 8.313-4.9009 15.882-4.8389 7.5685-17.681 16.626-7.6306 5.2732-10.236 7.3824-2.5435 2.1093-6.0176 5.5213h39.456z"/></g></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g fill="#007400" stroke-width="3.1763" aria-label="2"><path d="m87.905 96.249h-75.809q1.3028-11.229 7.8787-21.093 6.638-9.9259 24.815-23.388 11.105-8.2509 14.206-12.531 3.1019-4.2806 3.1019-8.1269 0-4.1565-3.1019-7.0722-3.0398-2.9778-7.6926-2.9778-4.8389 0-7.9408 3.0398-3.0398 3.0398-4.0944 10.732l-25.311-2.0472q1.4889-10.67 5.4593-16.626 3.9704-6.0176 11.167-9.1815 7.2583-3.2259 20.038-3.2259 13.338 0 20.72 3.0398 7.4445 3.0398 11.663 9.3676 4.2806 6.2657 4.2806 14.082 0 8.313-4.9009 15.882-4.8389 7.5685-17.681 16.626-7.6306 5.2732-10.236 7.3824-2.5435 2.1093-6.0176 5.5213h39.456z" fill="#007400"/></g></svg>
diff --git a/icons/skins/default/tile_3.svg b/icons/skins/default/tile_3.svg
index e48bb58e31eaa99af11ab54f81aea35189a0d4d4..7e8324321ce3f9da9ba382c4d24115ed369616aa 100644
--- a/icons/skins/default/tile_3.svg
+++ b/icons/skins/default/tile_3.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g stroke-width="3.1763" aria-label="3"><path d="m37.686 30.831-23.884-4.2806q2.9778-11.415 11.415-17.494 8.4991-6.0796 24.008-6.0796 17.805 0 25.745 6.638 7.9408 6.638 7.9408 16.688 0 5.8935-3.2259 10.67-3.2259 4.7769-9.7398 8.375 5.2732 1.3028 8.0648 3.0398 4.5287 2.7917 7.0102 7.3824 2.5435 4.5287 2.5435 10.856 0 7.9408-4.1565 15.261-4.1565 7.2583-11.973 11.229-7.8167 3.9083-20.534 3.9083-12.407 0-19.604-2.9157-7.1343-2.9157-11.787-8.4991-4.5907-5.6454-7.0722-14.144l25.249-3.35q1.4889 7.6306 4.5907 10.608 3.1639 2.9157 8.0028 2.9157 5.087 0 8.437-3.7222 3.412-3.7222 3.412-9.9259 0-6.3278-3.288-9.8019-3.2259-3.4741-8.8093-3.4741-2.9778 0-8.1889 1.4889l1.3028-18.053q2.1093 0.31018 3.288 0.31018 4.963 0 8.2509-3.1639 3.35-3.1639 3.35-7.5065 0-4.1565-2.4815-6.638t-6.8241-2.4815q-4.4667 0-7.2583 2.7296-2.7917 2.6676-3.7843 9.4296z"/></g></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g fill="#c60000" stroke-width="3.1763" aria-label="3"><path d="m37.686 30.831-23.884-4.2806q2.9778-11.415 11.415-17.494 8.4991-6.0796 24.008-6.0796 17.805 0 25.745 6.638 7.9408 6.638 7.9408 16.688 0 5.8935-3.2259 10.67-3.2259 4.7769-9.7398 8.375 5.2732 1.3028 8.0648 3.0398 4.5287 2.7917 7.0102 7.3824 2.5435 4.5287 2.5435 10.856 0 7.9408-4.1565 15.261-4.1565 7.2583-11.973 11.229-7.8167 3.9083-20.534 3.9083-12.407 0-19.604-2.9157-7.1343-2.9157-11.787-8.4991-4.5907-5.6454-7.0722-14.144l25.249-3.35q1.4889 7.6306 4.5907 10.608 3.1639 2.9157 8.0028 2.9157 5.087 0 8.437-3.7222 3.412-3.7222 3.412-9.9259 0-6.3278-3.288-9.8019-3.2259-3.4741-8.8093-3.4741-2.9778 0-8.1889 1.4889l1.3028-18.053q2.1093 0.31018 3.288 0.31018 4.963 0 8.2509-3.1639 3.35-3.1639 3.35-7.5065 0-4.1565-2.4815-6.638t-6.8241-2.4815q-4.4667 0-7.2583 2.7296-2.7917 2.6676-3.7843 9.4296z" fill="#c60000"/></g></svg>
diff --git a/icons/skins/default/tile_4.svg b/icons/skins/default/tile_4.svg
index 609d4409e1e78aa0f20618fc7a0a0b37fddd07bb..37c6a54bb7e374c68afa1845a4aa160bbd8dc98b 100644
--- a/icons/skins/default/tile_4.svg
+++ b/icons/skins/default/tile_4.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g stroke-width="3.1763" aria-label="4"><path d="m56.297 79.25h-46.032v-20.782l46.032-54.717h22.023v55.895h11.415v19.604h-11.415v16.998h-22.023zm0-19.604v-28.599l-24.319 28.599z"/></g></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g fill="#000474" stroke-width="3.1763" aria-label="4"><path d="m56.297 79.25h-46.032v-20.782l46.032-54.717h22.023v55.895h11.415v19.604h-11.415v16.998h-22.023zm0-19.604v-28.599l-24.319 28.599z" fill="#000474"/></g></svg>
diff --git a/icons/skins/default/tile_5.svg b/icons/skins/default/tile_5.svg
index 3e4ce20f882889cce3fd54a6440da0189ae248bc..a994edd66ba9c0988c239f79a7a76843d32a89fd 100644
--- a/icons/skins/default/tile_5.svg
+++ b/icons/skins/default/tile_5.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g stroke-width="3.1763" aria-label="5"><path d="m23.479 3.7513h59.99v20.162h-40.634l-2.1713 13.648q4.2185-1.9852 8.313-2.9778 4.1565-0.99259 8.1889-0.99259 13.648 0 22.147 8.2509 8.4991 8.2509 8.4991 20.782 0 8.8093-4.4046 16.936-4.3426 8.1269-12.407 12.407-8.0028 4.2806-20.534 4.2806-8.9954 0-15.447-1.675-6.3898-1.737-10.919-5.087-4.4667-3.412-7.2583-7.6926-2.7917-4.2806-4.6528-10.67l25.559-2.7917q0.93056 6.1417 4.3426 9.3676 3.412 3.1639 8.1269 3.1639 5.2732 0 8.6852-3.9704 3.4741-4.0324 3.4741-11.973 0-8.1269-3.4741-11.911-3.4741-3.7843-9.2435-3.7843-3.6602 0-7.0722 1.7991-2.5435 1.3028-5.5833 4.7148l-21.527-3.1019z"/></g></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g fill="#750000" stroke-width="3.1763" aria-label="5"><path d="m23.479 3.7513h59.99v20.162h-40.634l-2.1713 13.648q4.2185-1.9852 8.313-2.9778 4.1565-0.99259 8.1889-0.99259 13.648 0 22.147 8.2509 8.4991 8.2509 8.4991 20.782 0 8.8093-4.4046 16.936-4.3426 8.1269-12.407 12.407-8.0028 4.2806-20.534 4.2806-8.9954 0-15.447-1.675-6.3898-1.737-10.919-5.087-4.4667-3.412-7.2583-7.6926-2.7917-4.2806-4.6528-10.67l25.559-2.7917q0.93056 6.1417 4.3426 9.3676 3.412 3.1639 8.1269 3.1639 5.2732 0 8.6852-3.9704 3.4741-4.0324 3.4741-11.973 0-8.1269-3.4741-11.911-3.4741-3.7843-9.2435-3.7843-3.6602 0-7.0722 1.7991-2.5435 1.3028-5.5833 4.7148l-21.527-3.1019z" fill="#750000"/></g></svg>
diff --git a/icons/skins/default/tile_6.svg b/icons/skins/default/tile_6.svg
index 684ec0f338496c51fc361f1d145d9c17bea7cb4f..4f10e2e657d0fdab61ec1a4fdaca020daff3bea0 100644
--- a/icons/skins/default/tile_6.svg
+++ b/icons/skins/default/tile_6.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g stroke-width="3.1763" aria-label="6"><path d="m85.547 24.999-25.125 3.1019q-0.99259-5.2732-3.35-7.4445-2.2954-2.1713-5.7074-2.1713-6.1417 0-9.5537 6.2037-2.4815 4.4667-3.6602 19.107 4.5287-4.5907 9.3056-6.762 4.7769-2.2333 11.043-2.2333 12.159 0 20.534 8.6852 8.437 8.6852 8.437 22.023 0 8.9954-4.2806 16.44-4.2185 7.4445-11.787 11.291-7.5065 3.7843-18.859 3.7843-13.648 0-21.899-4.6528-8.2509-4.6528-13.214-14.827-4.9009-10.236-4.9009-27.048 0-24.629 10.36-36.044 10.36-11.477 28.723-11.477 10.856 0 17.122 2.5435 6.3278 2.4815 10.484 7.3204 4.1565 4.8389 6.3278 12.159zm-46.528 40.51q0 7.3824 3.7222 11.601 3.7222 4.1565 9.1195 4.1565 4.963 0 8.313-3.7843t3.35-11.291q0-7.6926-3.4741-11.725t-8.6232-4.0324q-5.2732 0-8.8713 3.9083-3.5361 3.9083-3.5361 11.167z"/></g></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g stroke-width="3.1763" aria-label="6"><path d="m85.547 24.999-25.125 3.1019q-0.99259-5.2732-3.35-7.4445-2.2954-2.1713-5.7074-2.1713-6.1417 0-9.5537 6.2037-2.4815 4.4667-3.6602 19.107 4.5287-4.5907 9.3056-6.762 4.7769-2.2333 11.043-2.2333 12.159 0 20.534 8.6852 8.437 8.6852 8.437 22.023 0 8.9954-4.2806 16.44-4.2185 7.4445-11.787 11.291-7.5065 3.7843-18.859 3.7843-13.648 0-21.899-4.6528-8.2509-4.6528-13.214-14.827-4.9009-10.236-4.9009-27.048 0-24.629 10.36-36.044 10.36-11.477 28.723-11.477 10.856 0 17.122 2.5435 6.3278 2.4815 10.484 7.3204 4.1565 4.8389 6.3278 12.159zm-46.528 40.51q0 7.3824 3.7222 11.601 3.7222 4.1565 9.1195 4.1565 4.963 0 8.313-3.7843t3.35-11.291q0-7.6926-3.4741-11.725t-8.6232-4.0324q-5.2732 0-8.8713 3.9083-3.5361 3.9083-3.5361 11.167z" fill="#00849d"/></g></svg>
diff --git a/icons/skins/default/tile_7.svg b/icons/skins/default/tile_7.svg
index 40d418cdf8746dc499e285f9ac1472ea15c7c4c3..e85de47be6a7f43a55490b4c816bddd18c3356b1 100644
--- a/icons/skins/default/tile_7.svg
+++ b/icons/skins/default/tile_7.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g stroke-width="3.1763" aria-label="7"><path d="m13.119 4.5268h73.762v17.06q-9.6158 8.6852-16.068 18.797-7.8167 12.283-12.345 27.358-3.5982 11.725-4.8389 27.731h-25.187q2.9778-22.271 9.3676-37.346t20.224-32.259h-44.915z"/></g></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g fill="#363636" stroke-width="3.1763" aria-label="7"><path d="m13.119 4.5268h73.762v17.06q-9.6158 8.6852-16.068 18.797-7.8167 12.283-12.345 27.358-3.5982 11.725-4.8389 27.731h-25.187q2.9778-22.271 9.3676-37.346t20.224-32.259h-44.915z" fill="#363636"/></g></svg>
diff --git a/icons/skins/default/tile_8.svg b/icons/skins/default/tile_8.svg
index c444e92a5a6a2218cb1dfd24f2815e73319d84e9..5f8638a52b843046d99827d4ff03c4780bd03b4c 100644
--- a/icons/skins/default/tile_8.svg
+++ b/icons/skins/default/tile_8.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g stroke-width="3.1763" aria-label="8"><path d="m28.039 46.588q-5.9556-3.1639-8.6852-7.0722-3.7222-5.3352-3.7222-12.283 0-11.415 10.732-18.673 8.375-5.5833 22.147-5.5833 18.239 0 26.924 6.9482 8.7472 6.9482 8.7472 17.494 0 6.1417-3.4741 11.477-2.6056 3.9704-8.1889 7.6926 7.3824 3.5361 10.981 9.3676 3.6602 5.8315 3.6602 12.904 0 6.8241-3.1639 12.78-3.1019 5.8935-7.6926 9.1195-4.5287 3.2259-11.353 4.7148-6.762 1.5509-14.455 1.5509-14.455 0-22.085-3.412-7.6306-3.412-11.601-10.05t-3.9704-14.827q0-8.0028 3.7222-13.524 3.7222-5.5833 11.477-8.6232zm11.353-17.867q0 4.7148 2.9157 7.6306 2.9778 2.8537 7.8787 2.8537 4.3426 0 7.1343-2.8537t2.7917-7.3824q0-4.7148-2.9157-7.6306-2.9157-2.9778-7.4445-2.9778-4.5907 0-7.5065 2.9157-2.8537 2.8537-2.8537 7.4445zm-1.3648 39.145q0 6.0176 3.6602 9.8639 3.6602 3.7843 8.375 3.7843 4.5287 0 8.1269-3.8463 3.5982-3.9083 3.5982-9.8639 0-6.0176-3.6602-9.8639-3.5982-3.8463-8.375-3.8463-4.7148 0-8.2509 3.7222-3.4741 3.7222-3.4741 10.05z"/></g></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g fill="#535353" stroke-width="3.1763" aria-label="8"><path d="m28.039 46.588q-5.9556-3.1639-8.6852-7.0722-3.7222-5.3352-3.7222-12.283 0-11.415 10.732-18.673 8.375-5.5833 22.147-5.5833 18.239 0 26.924 6.9482 8.7472 6.9482 8.7472 17.494 0 6.1417-3.4741 11.477-2.6056 3.9704-8.1889 7.6926 7.3824 3.5361 10.981 9.3676 3.6602 5.8315 3.6602 12.904 0 6.8241-3.1639 12.78-3.1019 5.8935-7.6926 9.1195-4.5287 3.2259-11.353 4.7148-6.762 1.5509-14.455 1.5509-14.455 0-22.085-3.412-7.6306-3.412-11.601-10.05t-3.9704-14.827q0-8.0028 3.7222-13.524 3.7222-5.5833 11.477-8.6232zm11.353-17.867q0 4.7148 2.9157 7.6306 2.9778 2.8537 7.8787 2.8537 4.3426 0 7.1343-2.8537t2.7917-7.3824q0-4.7148-2.9157-7.6306-2.9157-2.9778-7.4445-2.9778-4.5907 0-7.5065 2.9157-2.8537 2.8537-2.8537 7.4445zm-1.3648 39.145q0 6.0176 3.6602 9.8639 3.6602 3.7843 8.375 3.7843 4.5287 0 8.1269-3.8463 3.5982-3.9083 3.5982-9.8639 0-6.0176-3.6602-9.8639-3.5982-3.8463-8.375-3.8463-4.7148 0-8.2509 3.7222-3.4741 3.7222-3.4741 10.05z" fill="#535353"/></g></svg>
diff --git a/icons/skins/default/tile_mine.svg b/icons/skins/default/tile_mine.svg
index 4c2a1f5dee28181ddc9d369508ca3bbe6f1ebc46..0eff0ccd21d44cdee79c27a9ece506192296bbf3 100644
--- a/icons/skins/default/tile_mine.svg
+++ b/icons/skins/default/tile_mine.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g transform="matrix(1.0346 0 0 1.0346 -1.7311 -1.7312)" fill="#eb0404" stroke="#870000" stroke-width="1.9331"><path d="m92.148 55.869c-0.626-0.939-1.482-1.519-2.568-1.739l-6.792-1.242c0.368-5.669-0.727-11.035-3.286-16.096l5.853-4.224c0.939-0.663 1.491-1.574 1.657-2.733 0.202-1.086-0.037-2.071-0.718-2.954l-0.469-0.718c-0.626-0.883-1.537-1.427-2.733-1.629-1.031-0.166-2.016 0.092-2.954 0.773l-5.632 4.059c-3.81-4.215-8.347-7.206-13.611-8.973l1.27-7.731c0.202-1.104-0.037-2.126-0.718-3.065-0.626-0.883-1.482-1.427-2.568-1.629l-0.856-0.166c-1.104-0.147-2.126 0.092-3.065 0.718-0.884 0.681-1.427 1.565-1.629 2.65l-1.16 7.427c-2.503-0.221-4.951-0.175-7.344 0.138-1.362 0.055-2.641 0.294-3.838 0.718-0.626 0.147-1.224 0.331-1.795 0.552l-3.451-7.51c-0.46-0.994-1.215-1.693-2.264-2.098-1.031-0.423-2.043-0.405-3.037 0.055l-0.773 0.414c-0.994 0.405-1.73 1.16-2.209 2.264-0.368 1.031-0.313 2.043 0.166 3.037l3.506 7.648c-0.202 0.11-0.405 0.249-0.607 0.414-5.264 3.681-9.019 8.31-11.265 13.888l-6.958-1.546c-1.086-0.276-2.098-0.074-3.037 0.607-0.994 0.534-1.592 1.344-1.795 2.43l-0.246 0.772c-0.203 1.104-0.018 2.172 0.552 3.203 0.626 0.883 1.491 1.463 2.595 1.739l6.626 1.546c-0.736 5.835 0.101 11.329 2.512 16.483l-5.411 3.672c-0.939 0.626-1.537 1.491-1.795 2.595-0.147 1.086 0.092 2.098 0.718 3.037l0.469 0.635c0.626 0.939 1.454 1.537 2.485 1.795 1.16 0.147 2.209-0.092 3.147-0.718l5.135-3.424c3.7 4.583 8.255 7.887 13.667 9.912l-1.242 6.323c-0.202 1.104 9e-3 2.154 0.635 3.147 0.626 0.883 1.482 1.427 2.568 1.629l0.801 0.166c1.086 0.258 2.098 0.101 3.037-0.469 0.939-0.681 1.509-1.574 1.712-2.678l1.242-6.074c6 0.626 11.651-0.285 16.952-2.733l4.003 6.074c0.626 0.939 1.509 1.518 2.651 1.739 1.049 0.258 2.043 0.074 2.982-0.552l0.69-0.387c0.939-0.626 1.537-1.518 1.795-2.678 0.203-1.086-9e-3 -2.098-0.635-3.037l-3.81-5.936c4.583-3.7 7.841-8.255 9.774-13.667l6.875 1.242c1.086 0.202 2.098-9e-3 3.037-0.635 0.883-0.607 1.427-1.463 1.629-2.568l0.166-0.773c0.202-1.103-0.01-2.143-0.636-3.119zm-50.085-15.013c-0.824 1.929-2.217 3.297-4.178 4.102-1.962 0.806-3.92 0.815-5.876 0.028-1.936-0.778-3.299-2.13-4.09-4.056s-0.774-3.853 0.05-5.782c0.844-1.92 2.247-3.284 4.209-4.089 1.962-0.806 3.91-0.819 5.846-0.041 1.956 0.787 3.329 2.144 4.12 4.069 0.79 1.925 0.763 3.848-0.081 5.769z" fill="#eb0404" stroke="#870000" stroke-width="1.9331"/></g></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g transform="matrix(1.0346 0 0 1.0346 -1.7311 -1.7312)" fill="#ce0000" stroke="#870000" stroke-width="1.9331"><path d="m92.148 55.869c-0.626-0.939-1.482-1.519-2.568-1.739l-6.792-1.242c0.368-5.669-0.727-11.035-3.286-16.096l5.853-4.224c0.939-0.663 1.491-1.574 1.657-2.733 0.202-1.086-0.037-2.071-0.718-2.954l-0.469-0.718c-0.626-0.883-1.537-1.427-2.733-1.629-1.031-0.166-2.016 0.092-2.954 0.773l-5.632 4.059c-3.81-4.215-8.347-7.206-13.611-8.973l1.27-7.731c0.202-1.104-0.037-2.126-0.718-3.065-0.626-0.883-1.482-1.427-2.568-1.629l-0.856-0.166c-1.104-0.147-2.126 0.092-3.065 0.718-0.884 0.681-1.427 1.565-1.629 2.65l-1.16 7.427c-2.503-0.221-4.951-0.175-7.344 0.138-1.362 0.055-2.641 0.294-3.838 0.718-0.626 0.147-1.224 0.331-1.795 0.552l-3.451-7.51c-0.46-0.994-1.215-1.693-2.264-2.098-1.031-0.423-2.043-0.405-3.037 0.055l-0.773 0.414c-0.994 0.405-1.73 1.16-2.209 2.264-0.368 1.031-0.313 2.043 0.166 3.037l3.506 7.648c-0.202 0.11-0.405 0.249-0.607 0.414-5.264 3.681-9.019 8.31-11.265 13.888l-6.958-1.546c-1.086-0.276-2.098-0.074-3.037 0.607-0.994 0.534-1.592 1.344-1.795 2.43l-0.246 0.772c-0.203 1.104-0.018 2.172 0.552 3.203 0.626 0.883 1.491 1.463 2.595 1.739l6.626 1.546c-0.736 5.835 0.101 11.329 2.512 16.483l-5.411 3.672c-0.939 0.626-1.537 1.491-1.795 2.595-0.147 1.086 0.092 2.098 0.718 3.037l0.469 0.635c0.626 0.939 1.454 1.537 2.485 1.795 1.16 0.147 2.209-0.092 3.147-0.718l5.135-3.424c3.7 4.583 8.255 7.887 13.667 9.912l-1.242 6.323c-0.202 1.104 9e-3 2.154 0.635 3.147 0.626 0.883 1.482 1.427 2.568 1.629l0.801 0.166c1.086 0.258 2.098 0.101 3.037-0.469 0.939-0.681 1.509-1.574 1.712-2.678l1.242-6.074c6 0.626 11.651-0.285 16.952-2.733l4.003 6.074c0.626 0.939 1.509 1.518 2.651 1.739 1.049 0.258 2.043 0.074 2.982-0.552l0.69-0.387c0.939-0.626 1.537-1.518 1.795-2.678 0.203-1.086-9e-3 -2.098-0.635-3.037l-3.81-5.936c4.583-3.7 7.841-8.255 9.774-13.667l6.875 1.242c1.086 0.202 2.098-9e-3 3.037-0.635 0.883-0.607 1.427-1.463 1.629-2.568l0.166-0.773c0.202-1.103-0.01-2.143-0.636-3.119zm-50.085-15.013c-0.824 1.929-2.217 3.297-4.178 4.102-1.962 0.806-3.92 0.815-5.876 0.028-1.936-0.778-3.299-2.13-4.09-4.056s-0.774-3.853 0.05-5.782c0.844-1.92 2.247-3.284 4.209-4.089 1.962-0.806 3.91-0.819 5.846-0.041 1.956 0.787 3.329 2.144 4.12 4.069 0.79 1.925 0.763 3.848-0.081 5.769z" fill="#ce0000" stroke="#870000" stroke-width="1.9331"/></g></svg>
diff --git a/icons/skins/default/tile_mine_not_found.svg b/icons/skins/default/tile_mine_not_found.svg
index f637966fac15986616dc3a7c62aaf4fc0fe13cf6..04fc7fa8fa9c2be8a5ea00e0ca2d9fbb77ad8b12 100644
--- a/icons/skins/default/tile_mine_not_found.svg
+++ b/icons/skins/default/tile_mine_not_found.svg
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g transform="matrix(1.0346 0 0 1.0346 -1.7311 -1.7312)" fill="#787878" stroke="#444343" stroke-width="1.9331"><path d="m92.148 55.869c-0.626-0.939-1.482-1.519-2.568-1.739l-6.792-1.242c0.368-5.669-0.727-11.035-3.286-16.096l5.853-4.224c0.939-0.663 1.491-1.574 1.657-2.733 0.202-1.086-0.037-2.071-0.718-2.954l-0.469-0.718c-0.626-0.883-1.537-1.427-2.733-1.629-1.031-0.166-2.016 0.092-2.954 0.773l-5.632 4.059c-3.81-4.215-8.347-7.206-13.611-8.973l1.27-7.731c0.202-1.104-0.037-2.126-0.718-3.065-0.626-0.883-1.482-1.427-2.568-1.629l-0.856-0.166c-1.104-0.147-2.126 0.092-3.065 0.718-0.884 0.681-1.427 1.565-1.629 2.65l-1.16 7.427c-2.503-0.221-4.951-0.175-7.344 0.138-1.362 0.055-2.641 0.294-3.838 0.718-0.626 0.147-1.224 0.331-1.795 0.552l-3.451-7.51c-0.46-0.994-1.215-1.693-2.264-2.098-1.031-0.423-2.043-0.405-3.037 0.055l-0.773 0.414c-0.994 0.405-1.73 1.16-2.209 2.264-0.368 1.031-0.313 2.043 0.166 3.037l3.506 7.648c-0.202 0.11-0.405 0.249-0.607 0.414-5.264 3.681-9.019 8.31-11.265 13.888l-6.958-1.546c-1.086-0.276-2.098-0.074-3.037 0.607-0.994 0.534-1.592 1.344-1.795 2.43l-0.246 0.772c-0.203 1.104-0.018 2.172 0.552 3.203 0.626 0.883 1.491 1.463 2.595 1.739l6.626 1.546c-0.736 5.835 0.101 11.329 2.512 16.483l-5.411 3.672c-0.939 0.626-1.537 1.491-1.795 2.595-0.147 1.086 0.092 2.098 0.718 3.037l0.469 0.635c0.626 0.939 1.454 1.537 2.485 1.795 1.16 0.147 2.209-0.092 3.147-0.718l5.135-3.424c3.7 4.583 8.255 7.887 13.667 9.912l-1.242 6.323c-0.202 1.104 9e-3 2.154 0.635 3.147 0.626 0.883 1.482 1.427 2.568 1.629l0.801 0.166c1.086 0.258 2.098 0.101 3.037-0.469 0.939-0.681 1.509-1.574 1.712-2.678l1.242-6.074c6 0.626 11.651-0.285 16.952-2.733l4.003 6.074c0.626 0.939 1.509 1.518 2.651 1.739 1.049 0.258 2.043 0.074 2.982-0.552l0.69-0.387c0.939-0.626 1.537-1.518 1.795-2.678 0.203-1.086-9e-3 -2.098-0.635-3.037l-3.81-5.936c4.583-3.7 7.841-8.255 9.774-13.667l6.875 1.242c1.086 0.202 2.098-9e-3 3.037-0.635 0.883-0.607 1.427-1.463 1.629-2.568l0.166-0.773c0.202-1.103-0.01-2.143-0.636-3.119zm-50.085-15.013c-0.824 1.929-2.217 3.297-4.178 4.102-1.962 0.806-3.92 0.815-5.876 0.028-1.936-0.778-3.299-2.13-4.09-4.056s-0.774-3.853 0.05-5.782c0.844-1.92 2.247-3.284 4.209-4.089 1.962-0.806 3.91-0.819 5.846-0.041 1.956 0.787 3.329 2.144 4.12 4.069 0.79 1.925 0.763 3.848-0.081 5.769z" fill="#787878" stroke="#444343" stroke-width="1.9331"/></g></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><g transform="matrix(1.0346 0 0 1.0346 -1.7311 -1.7312)" fill="#616161" stroke="#373737" stroke-width="1.9331"><path d="m92.148 55.869c-0.626-0.939-1.482-1.519-2.568-1.739l-6.792-1.242c0.368-5.669-0.727-11.035-3.286-16.096l5.853-4.224c0.939-0.663 1.491-1.574 1.657-2.733 0.202-1.086-0.037-2.071-0.718-2.954l-0.469-0.718c-0.626-0.883-1.537-1.427-2.733-1.629-1.031-0.166-2.016 0.092-2.954 0.773l-5.632 4.059c-3.81-4.215-8.347-7.206-13.611-8.973l1.27-7.731c0.202-1.104-0.037-2.126-0.718-3.065-0.626-0.883-1.482-1.427-2.568-1.629l-0.856-0.166c-1.104-0.147-2.126 0.092-3.065 0.718-0.884 0.681-1.427 1.565-1.629 2.65l-1.16 7.427c-2.503-0.221-4.951-0.175-7.344 0.138-1.362 0.055-2.641 0.294-3.838 0.718-0.626 0.147-1.224 0.331-1.795 0.552l-3.451-7.51c-0.46-0.994-1.215-1.693-2.264-2.098-1.031-0.423-2.043-0.405-3.037 0.055l-0.773 0.414c-0.994 0.405-1.73 1.16-2.209 2.264-0.368 1.031-0.313 2.043 0.166 3.037l3.506 7.648c-0.202 0.11-0.405 0.249-0.607 0.414-5.264 3.681-9.019 8.31-11.265 13.888l-6.958-1.546c-1.086-0.276-2.098-0.074-3.037 0.607-0.994 0.534-1.592 1.344-1.795 2.43l-0.246 0.772c-0.203 1.104-0.018 2.172 0.552 3.203 0.626 0.883 1.491 1.463 2.595 1.739l6.626 1.546c-0.736 5.835 0.101 11.329 2.512 16.483l-5.411 3.672c-0.939 0.626-1.537 1.491-1.795 2.595-0.147 1.086 0.092 2.098 0.718 3.037l0.469 0.635c0.626 0.939 1.454 1.537 2.485 1.795 1.16 0.147 2.209-0.092 3.147-0.718l5.135-3.424c3.7 4.583 8.255 7.887 13.667 9.912l-1.242 6.323c-0.202 1.104 9e-3 2.154 0.635 3.147 0.626 0.883 1.482 1.427 2.568 1.629l0.801 0.166c1.086 0.258 2.098 0.101 3.037-0.469 0.939-0.681 1.509-1.574 1.712-2.678l1.242-6.074c6 0.626 11.651-0.285 16.952-2.733l4.003 6.074c0.626 0.939 1.509 1.518 2.651 1.739 1.049 0.258 2.043 0.074 2.982-0.552l0.69-0.387c0.939-0.626 1.537-1.518 1.795-2.678 0.203-1.086-9e-3 -2.098-0.635-3.037l-3.81-5.936c4.583-3.7 7.841-8.255 9.774-13.667l6.875 1.242c1.086 0.202 2.098-9e-3 3.037-0.635 0.883-0.607 1.427-1.463 1.629-2.568l0.166-0.773c0.202-1.103-0.01-2.143-0.636-3.119zm-50.085-15.013c-0.824 1.929-2.217 3.297-4.178 4.102-1.962 0.806-3.92 0.815-5.876 0.028-1.936-0.778-3.299-2.13-4.09-4.056s-0.774-3.853 0.05-5.782c0.844-1.92 2.247-3.284 4.209-4.089 1.962-0.806 3.91-0.819 5.846-0.041 1.956 0.787 3.329 2.144 4.12 4.069 0.79 1.925 0.763 3.848-0.081 5.769z" fill="#616161" stroke="#373737" stroke-width="1.9331"/></g></svg>
diff --git a/lib/entities/cell.dart b/lib/entities/cell.dart
index 9bd32ccfcb82a1662cd319cd327b287931640f38..4d7b8ae66f163865b816086ce02009774d4b6fd2 100644
--- a/lib/entities/cell.dart
+++ b/lib/entities/cell.dart
@@ -100,7 +100,7 @@ class Cell {
if (myProvider.gameWin) {
return this.isAnimated ? Colors.green[400] : Colors.green[500];
} else if (myProvider.gameFail) {
- return this.isAnimated ? Colors.pink[300] : Colors.pink[400];
+ return this.isAnimated ? Colors.pink[200] : Colors.pink[400];
}
return this.isAnimated ? Colors.white : Colors.grey[200];
diff --git a/lib/layout/board.dart b/lib/layout/board.dart
index 0c12899be5110528211ff0494eb12d69334bc40f..9e4df1e2df752496855747dc6d4cb51eab7c0362 100644
--- a/lib/layout/board.dart
+++ b/lib/layout/board.dart
@@ -85,19 +85,56 @@ class Board {
);
}
- static Container buildMinesCounterWidget(Data myProvider) {
- String markedMinesCount = BoardUtils.countFlaggedCells(myProvider.cells).toString();
- String placedMinesCount = myProvider.minesCount.toString();
+ static Widget buildMinesCounterWidget(Data myProvider) {
+ int flaggedCellsCount = BoardUtils.countFlaggedCells(myProvider.cells);
+ int minesCount = myProvider.minesCount;
+ double blockSize = 40;
- return Container(
- child: Text(
- markedMinesCount + ' / ' + placedMinesCount,
- style: TextStyle(
- fontSize: 20,
- color: Colors.white
- ),
+ Image flagIconBlock = Image(
+ image: AssetImage('assets/skins/' + myProvider.skin + '_tile_flag.png'),
+ fit: BoxFit.fill,
+ height: blockSize,
+ width: blockSize,
+ );
+ Image mineIconBlock = Image(
+ image: AssetImage('assets/skins/' + myProvider.skin + '_tile_mine.png'),
+ fit: BoxFit.fill,
+ height: blockSize,
+ width: blockSize,
+ );
+ Text markedMinesCountBlock = Text(
+ flaggedCellsCount.toString(),
+ style: TextStyle(
+ fontSize: blockSize,
+ fontWeight: FontWeight.bold,
+ color: Colors.white
),
);
+ Text placedMinesCountBlock = Text(
+ minesCount.toString(),
+ style: TextStyle(
+ fontSize: blockSize,
+ fontWeight: FontWeight.bold,
+ color: Colors.white
+ ),
+ );
+
+ return Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ markedMinesCountBlock,
+ flagIconBlock,
+ SizedBox(width: blockSize * 2),
+ mineIconBlock,
+ placedMinesCountBlock,
+ ],
+ )
+ ]);
}
}
diff --git a/lib/layout/game.dart b/lib/layout/game.dart
index a3cca39cb6df4c2c809d2bc66a30e594007e17f4..a37bd50e889d91726fd39a4f41d4628c7f91a576 100644
--- a/lib/layout/game.dart
+++ b/lib/layout/game.dart
@@ -10,7 +10,7 @@ class Game {
return Container(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.center,
children: [
Board.buildGameBoard(myProvider),
SizedBox(height: 2),
diff --git a/lib/utils/board_animate.dart b/lib/utils/board_animate.dart
index be41181f9d93d4e3e10767b879af5d0e3340e38f..8fcecfe1a5f32ffe83e7da55133bb2400368a975 100644
--- a/lib/utils/board_animate.dart
+++ b/lib/utils/board_animate.dart
@@ -58,7 +58,7 @@ class BoardAnimate {
bool isHilighted = false;
for (var mineIndex = 0; mineIndex < explodedMines.length; mineIndex++) {
double distance = sqrt(pow((explodedMines[mineIndex][0] - row), 2) + pow((explodedMines[mineIndex][1] - col), 2));
- isHilighted = isHilighted || ((patternIndex + distance) % 3 < 1);
+ isHilighted = isHilighted || ((patternIndex + distance) % 4 < 2);
}
patternRow.add(isHilighted);
}