From e3865dc1e18831b0ef488b779986ac2c015064e0 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 12:21:19 -0300
Subject: [PATCH 01/11] Update strings

---
 i18n/src/main/res/values-af-rZA/strings.xml  |  3 +--
 i18n/src/main/res/values-ar-rSA/strings.xml  |  3 +--
 i18n/src/main/res/values-bg-rBG/strings.xml  |  3 +--
 i18n/src/main/res/values-ca-rES/strings.xml  |  3 +--
 i18n/src/main/res/values-cs-rCZ/strings.xml  |  3 +--
 i18n/src/main/res/values-da-rDK/strings.xml  |  3 +--
 i18n/src/main/res/values-de-rDE/strings.xml  |  3 +--
 i18n/src/main/res/values-el-rGR/strings.xml  |  3 +--
 i18n/src/main/res/values-en-rUS/strings.xml  |  3 +--
 i18n/src/main/res/values-eo-rUY/strings.xml  |  3 +--
 i18n/src/main/res/values-es-rES/strings.xml  |  3 +--
 i18n/src/main/res/values-fa-rIR/strings.xml  |  5 ++---
 i18n/src/main/res/values-fi-rFI/strings.xml  |  3 +--
 i18n/src/main/res/values-fr-rFR/strings.xml  |  3 +--
 i18n/src/main/res/values-hi-rIN/strings.xml  |  4 ++--
 i18n/src/main/res/values-hu-rHU/strings.xml  |  3 +--
 i18n/src/main/res/values-in-rID/strings.xml  |  3 +--
 i18n/src/main/res/values-it-rIT/strings.xml  |  3 +--
 i18n/src/main/res/values-iw-rIL/strings.xml  |  3 +--
 i18n/src/main/res/values-ja-rJP/strings.xml  |  3 +--
 i18n/src/main/res/values-ko-rKR/strings.xml  |  3 +--
 i18n/src/main/res/values-ku-rTR/strings.xml  |  3 +--
 i18n/src/main/res/values-lv-rLV/strings.xml  | 11 +++++------
 i18n/src/main/res/values-nl-rNL/strings.xml  |  3 +--
 i18n/src/main/res/values-no-rNO/strings.xml  |  3 +--
 i18n/src/main/res/values-pl-rPL/strings.xml  |  3 +--
 i18n/src/main/res/values-pt-rBR/strings.xml  |  3 +--
 i18n/src/main/res/values-pt-rPT/strings.xml  |  3 +--
 i18n/src/main/res/values-ro-rRO/strings.xml  |  3 +--
 i18n/src/main/res/values-ru-rRU/strings.xml  |  3 +--
 i18n/src/main/res/values-sk-rSK/strings.xml  |  3 +--
 i18n/src/main/res/values-sv-rSE/strings.xml  | 13 ++++++-------
 i18n/src/main/res/values-ta-rIN/strings.xml  |  5 ++---
 i18n/src/main/res/values-th-rTH/strings.xml  |  3 +--
 i18n/src/main/res/values-tr-rTR/strings.xml  |  3 +--
 i18n/src/main/res/values-uk-rUA/strings.xml  |  9 ++++-----
 i18n/src/main/res/values-vec-rIT/strings.xml |  3 +--
 i18n/src/main/res/values-vi-rVN/strings.xml  |  3 +--
 i18n/src/main/res/values-zh-rCN/strings.xml  |  3 +--
 i18n/src/main/res/values-zh-rTW/strings.xml  |  6 +++---
 40 files changed, 57 insertions(+), 95 deletions(-)

diff --git a/i18n/src/main/res/values-af-rZA/strings.xml b/i18n/src/main/res/values-af-rZA/strings.xml
index 203327b8d..ad388ddac 100644
--- a/i18n/src/main/res/values-af-rZA/strings.xml
+++ b/i18n/src/main/res/values-af-rZA/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Verstellings</string>
     <string name="animations">Animasie</string>
     <string name="vibration">Haptiese terugvoer</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Aangaande</string>
     <string name="events">Statistiek</string>
     <string name="custom">Pasmaak</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Wil u \'n nuwe spel begin met hierdie kaart?</string>
     <string name="mines_remaining">%d myne</string>
     <string name="game_time">Speeltyd</string>
-    <string name="mine">Myne</string>
     <string name="settings_general">Algemeen</string>
     <string name="settings_gameplay">Spel</string>
     <string name="settings_accessibility">Toeganklikheid</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-ar-rSA/strings.xml b/i18n/src/main/res/values-ar-rSA/strings.xml
index 2f596cf5b..b49069482 100644
--- a/i18n/src/main/res/values-ar-rSA/strings.xml
+++ b/i18n/src/main/res/values-ar-rSA/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">الإعدادات</string>
     <string name="animations">الرسوم المتحركة</string>
     <string name="vibration">تغذية راجعة باللمس</string>
-    <string name="haptic_feedback_level">تغذية راجعة باللمس</string>
     <string name="about">حول</string>
     <string name="events">إحصائيات</string>
     <string name="custom">مخصص</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">هل تريد بدء لعبة جديدة؟</string>
     <string name="mines_remaining">%d لغم</string>
     <string name="game_time">وقت اللعب</string>
-    <string name="mine">لغم</string>
     <string name="settings_general">عام</string>
     <string name="settings_gameplay">أسلوب اللعبة</string>
     <string name="settings_accessibility">إمكانية الوصول</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">قد لا يكون حقل الألغام الحالي خاليًا من التخمين!</string>
     <string name="fixed_size">الجم الثابت</string>
     <string name="progressive">التقدمي</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-bg-rBG/strings.xml b/i18n/src/main/res/values-bg-rBG/strings.xml
index d47867d8e..c54a7eeed 100644
--- a/i18n/src/main/res/values-bg-rBG/strings.xml
+++ b/i18n/src/main/res/values-bg-rBG/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Настройки</string>
     <string name="animations">Анимации</string>
     <string name="vibration">Вибрация при докосване</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">За нас</string>
     <string name="events">Статистики</string>
     <string name="custom">По избор</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Искате ли да започнете нова игра?</string>
     <string name="mines_remaining">%d мини</string>
     <string name="game_time">Време в играта</string>
-    <string name="mine">Мина</string>
     <string name="settings_general">Основни</string>
     <string name="settings_gameplay">Начин на игра</string>
     <string name="settings_accessibility">Достъпност</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Сегашното поле може да не е без предположения!</string>
     <string name="fixed_size">Фиксиран размер</string>
     <string name="progressive">Прогресивен</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-ca-rES/strings.xml b/i18n/src/main/res/values-ca-rES/strings.xml
index 0b75f882b..2cd474bae 100644
--- a/i18n/src/main/res/values-ca-rES/strings.xml
+++ b/i18n/src/main/res/values-ca-rES/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Configuració</string>
     <string name="animations">Animacions</string>
     <string name="vibration">Resposta hàptica</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Quant a</string>
     <string name="events">Estadístiques</string>
     <string name="custom">Personalitzat</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Vols començar un joc nou?</string>
     <string name="mines_remaining">%d mines</string>
     <string name="game_time">Temps de joc</string>
-    <string name="mine">Mina</string>
     <string name="settings_general">General</string>
     <string name="settings_gameplay">Joc</string>
     <string name="settings_accessibility">Accessibilitat</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Mida Fixa</string>
     <string name="progressive">Progressiu</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-cs-rCZ/strings.xml b/i18n/src/main/res/values-cs-rCZ/strings.xml
index 8abb174a5..fa615b53c 100644
--- a/i18n/src/main/res/values-cs-rCZ/strings.xml
+++ b/i18n/src/main/res/values-cs-rCZ/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Nastavení</string>
     <string name="animations">Animace</string>
     <string name="vibration">Hmatová odezva</string>
-    <string name="haptic_feedback_level">Síla hmatové odezvy</string>
     <string name="about">O aplikaci</string>
     <string name="events">Statistiky</string>
     <string name="custom">Vlastní</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Chcete začít novou hru?</string>
     <string name="mines_remaining">Počet min: %d</string>
     <string name="game_time">Herní čas</string>
-    <string name="mine">Mina</string>
     <string name="settings_general">Obecné</string>
     <string name="settings_gameplay">Hra</string>
     <string name="settings_accessibility">Přístupnost</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Možná budete potřebovat nápovědu k dokončení této úrovně!</string>
     <string name="fixed_size">Pevná velikost</string>
     <string name="progressive">Progresivní</string>
+    <string name="highlight_unsolved_numbers">Zvýraznit nevyřešená čísla</string>
 </resources>
diff --git a/i18n/src/main/res/values-da-rDK/strings.xml b/i18n/src/main/res/values-da-rDK/strings.xml
index 8f45bdcb7..ee60961d3 100644
--- a/i18n/src/main/res/values-da-rDK/strings.xml
+++ b/i18n/src/main/res/values-da-rDK/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Settings</string>
     <string name="animations">Animationer</string>
     <string name="vibration">Haptisk Feedback</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Om</string>
     <string name="events">Statistik</string>
     <string name="custom">Tilpasset</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Vil du starte et nyt spil?</string>
     <string name="mines_remaining">%d miner</string>
     <string name="game_time">Spil Tid</string>
-    <string name="mine">Mine</string>
     <string name="settings_general">Generelt</string>
     <string name="settings_gameplay">Gameplay</string>
     <string name="settings_accessibility">Tilgængelighed</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-de-rDE/strings.xml b/i18n/src/main/res/values-de-rDE/strings.xml
index c1af47140..ad1a46e3c 100644
--- a/i18n/src/main/res/values-de-rDE/strings.xml
+++ b/i18n/src/main/res/values-de-rDE/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Einstellungen</string>
     <string name="animations">Animationen</string>
     <string name="vibration">Haptische Rückmeldung</string>
-    <string name="haptic_feedback_level">Haptische Rückmeldung</string>
     <string name="about">Über</string>
     <string name="events">Statistiken</string>
     <string name="custom">Benutzerdefiniert</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Möchtest du ein neues Spiel beginnen?</string>
     <string name="mines_remaining">%d Minen</string>
     <string name="game_time">Spielzeit</string>
-    <string name="mine">Mine</string>
     <string name="settings_general">Allgemein</string>
     <string name="settings_gameplay">Spielablauf</string>
     <string name="settings_accessibility">Barrierefreiheit</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Das aktuelle Minenfeld ist möglicherweise nicht ratenfrei!</string>
     <string name="fixed_size">Feste Größe</string>
     <string name="progressive">Fortschrittlich</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-el-rGR/strings.xml b/i18n/src/main/res/values-el-rGR/strings.xml
index 8c52a4b7b..1b1e6b82a 100644
--- a/i18n/src/main/res/values-el-rGR/strings.xml
+++ b/i18n/src/main/res/values-el-rGR/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Ρυθμίσεις</string>
     <string name="animations">Εφέ Κίνησης</string>
     <string name="vibration">Δόνηση</string>
-    <string name="haptic_feedback_level">Επίπεδο Δόνησης</string>
     <string name="about">Σχετικά</string>
     <string name="events">Στατιστικά</string>
     <string name="custom">Προσαρμοσμένο</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Θέλετε να ξεκινήσετε ένα νέο παιχνίδι;</string>
     <string name="mines_remaining">%d νάρκες</string>
     <string name="game_time">Ώρα Παιχνιδιού</string>
-    <string name="mine">Νάρκη</string>
     <string name="settings_general">Γενικά</string>
     <string name="settings_gameplay">Gameplay</string>
     <string name="settings_accessibility">Προσβασιμότητα</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Το τρέχον ναρκοπέδιο δεν μπορεί να λυθεί χωρίς μαντεψιές!</string>
     <string name="fixed_size">Προεπιλεγμένο Μέγεθος</string>
     <string name="progressive">Προοδευτικό</string>
+    <string name="highlight_unsolved_numbers">Επισήμανση άλυτων αριθμών</string>
 </resources>
diff --git a/i18n/src/main/res/values-en-rUS/strings.xml b/i18n/src/main/res/values-en-rUS/strings.xml
index 0f59475b9..a13a03c24 100644
--- a/i18n/src/main/res/values-en-rUS/strings.xml
+++ b/i18n/src/main/res/values-en-rUS/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Settings</string>
     <string name="animations">Animations</string>
     <string name="vibration">Haptic Feedback</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">About</string>
     <string name="events">Statistics</string>
     <string name="custom">Custom</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Do you want to start a new game?</string>
     <string name="mines_remaining">%d mines</string>
     <string name="game_time">Game Time</string>
-    <string name="mine">Mine</string>
     <string name="settings_general">General</string>
     <string name="settings_gameplay">Gameplay</string>
     <string name="settings_accessibility">Accessibility</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-eo-rUY/strings.xml b/i18n/src/main/res/values-eo-rUY/strings.xml
index 1058daa6a..0a80dea9c 100644
--- a/i18n/src/main/res/values-eo-rUY/strings.xml
+++ b/i18n/src/main/res/values-eo-rUY/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Agordoj</string>
     <string name="animations">Animacioj</string>
     <string name="vibration">Tuŝ-retrokuplado</string>
-    <string name="haptic_feedback_level">Tuŝ-retrokuplado</string>
     <string name="about">Pri</string>
     <string name="events">Statistikaĵoj</string>
     <string name="custom">Laŭmenda</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Ĉu vi volas komenci novan ludon?</string>
     <string name="mines_remaining">%d minoj</string>
     <string name="game_time">Luda Tempo</string>
-    <string name="mine">Mino</string>
     <string name="settings_general">Ĝeneralaj</string>
     <string name="settings_gameplay">Ludmaniero</string>
     <string name="settings_accessibility">Alirebleco</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-es-rES/strings.xml b/i18n/src/main/res/values-es-rES/strings.xml
index 0b5847e0a..f57fa696d 100644
--- a/i18n/src/main/res/values-es-rES/strings.xml
+++ b/i18n/src/main/res/values-es-rES/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Configuración</string>
     <string name="animations">Animaciones</string>
     <string name="vibration">Respuesta háptica</string>
-    <string name="haptic_feedback_level">Nivel de respuesta táctil</string>
     <string name="about">Acerca de</string>
     <string name="events">Estadísticas</string>
     <string name="custom">Personalizado</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">¿Deseas empezar una nueva partida?</string>
     <string name="mines_remaining">%d minas</string>
     <string name="game_time">Tiempo de juego</string>
-    <string name="mine">Mina</string>
     <string name="settings_general">General</string>
     <string name="settings_gameplay">Jugabilidad</string>
     <string name="settings_accessibility">Accesibilidad</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">¡Es posible que necesites una pista para solucionar este nivel!</string>
     <string name="fixed_size">Tamaño fijo</string>
     <string name="progressive">Progresivo</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-fa-rIR/strings.xml b/i18n/src/main/res/values-fa-rIR/strings.xml
index 4dbc448a7..2f0420e19 100644
--- a/i18n/src/main/res/values-fa-rIR/strings.xml
+++ b/i18n/src/main/res/values-fa-rIR/strings.xml
@@ -7,7 +7,7 @@
     <string name="tutorial_text_3">If a square has the same number of flags, all other remaining squares adjacent to it aren\'t mines (the green arrow).</string>
     <string name="tutorial_text_4">Review the numbers and keep opening squares.</string>
     <string name="games">Games</string>
-    <string name="tap_to_begin">Tap to begin</string>
+    <string name="tap_to_begin">Tap to Begin</string>
     <string name="previous_games">Previous Games</string>
     <string name="minefield">Difficulty</string>
     <string name="standard">Standard</string>
@@ -20,7 +20,6 @@
     <string name="settings">Settings</string>
     <string name="animations">Animations</string>
     <string name="vibration">Haptic Feedback</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">About</string>
     <string name="events">Statistics</string>
     <string name="custom">Custom</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Do you want to start a new game?</string>
     <string name="mines_remaining">%d mines</string>
     <string name="game_time">Game Time</string>
-    <string name="mine">Mine</string>
     <string name="settings_general">General</string>
     <string name="settings_gameplay">Gameplay</string>
     <string name="settings_accessibility">Accessibility</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-fi-rFI/strings.xml b/i18n/src/main/res/values-fi-rFI/strings.xml
index e5d27360d..35f66b9bb 100644
--- a/i18n/src/main/res/values-fi-rFI/strings.xml
+++ b/i18n/src/main/res/values-fi-rFI/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Asetukset</string>
     <string name="animations">Animaatiot</string>
     <string name="vibration">Värinä</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Tietoja</string>
     <string name="events">Tilastot</string>
     <string name="custom">Mukautettu</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Tahdotko aloittaa uuden pelin?</string>
     <string name="mines_remaining">%d miinaa</string>
     <string name="game_time">Peliaika</string>
-    <string name="mine">Louhi</string>
     <string name="settings_general">Yleiset</string>
     <string name="settings_gameplay">Pelattavuus</string>
     <string name="settings_accessibility">Esteettömyys</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-fr-rFR/strings.xml b/i18n/src/main/res/values-fr-rFR/strings.xml
index 76bdac826..dad2f3843 100644
--- a/i18n/src/main/res/values-fr-rFR/strings.xml
+++ b/i18n/src/main/res/values-fr-rFR/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Réglages</string>
     <string name="animations">Animations</string>
     <string name="vibration">Retour tactile</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">À propos</string>
     <string name="events">Statistiques</string>
     <string name="custom">Personnalisé</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Voulez-vous commencer une nouvelle partie ?</string>
     <string name="mines_remaining">%d mines</string>
     <string name="game_time">Temps de jeu</string>
-    <string name="mine">Mine</string>
     <string name="settings_general">Général</string>
     <string name="settings_gameplay">Jouabilité</string>
     <string name="settings_accessibility">Accessibilité</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Le champ de mines actuel ne peut pas être résolu sans deviner !</string>
     <string name="fixed_size">Taille fixe</string>
     <string name="progressive">Progressif</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-hi-rIN/strings.xml b/i18n/src/main/res/values-hi-rIN/strings.xml
index 18584894a..8947e6a68 100644
--- a/i18n/src/main/res/values-hi-rIN/strings.xml
+++ b/i18n/src/main/res/values-hi-rIN/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:locale="hi">
     <string name="tutorial">ट्यूटोरियल</string>
     <string name="tutorial_basic">गेम का नियम सरल है, स्क्वेयर पर मौजूद संख्या उसके पास वाले माइन की संख्या को दर्शाती है और आपको सभी माइन पर फ़्लैग लगाना है.</string>
@@ -112,7 +112,6 @@
     <string name="switch_control_desc">फ्लैग करें और खोलें के बीच स्विच करने के लिए बटन का उपयोग करें</string>
     <string name="app_description">आपको एक आयताकार बोर्ड को साफ करना होगा जिसमें छिपी हुई माइन हैं, साथ ही उनमें से कोई भी विस्फोट न हो.</string>
     <string name="app_name">एंटीमाइन</string>
-    <string name="crowdin" translatable="false">Crowdin</string>
     <string name="do_you_know_how_to_play">क्या आप माइनस्वीपर खेलना जानते हैं?</string>
     <string name="close">बंद करे</string>
     <string name="open_tutorial">ट्यूटोरियल खोलें</string>
@@ -122,4 +121,5 @@
     <string name="no_guess_fail_warning">वर्तमान माइनफ़ील्ड अनुमान-मुक्त नहीं हो सकता है!</string>
     <string name="fixed_size">निर्धारित आकार</string>
     <string name="progressive">प्रोग्रेसिव</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-hu-rHU/strings.xml b/i18n/src/main/res/values-hu-rHU/strings.xml
index 2593bd809..23560e166 100644
--- a/i18n/src/main/res/values-hu-rHU/strings.xml
+++ b/i18n/src/main/res/values-hu-rHU/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Beállítások</string>
     <string name="animations">Animációk</string>
     <string name="vibration">Érintéskori visszajelzés</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Rólunk</string>
     <string name="events">Statisztikák</string>
     <string name="custom">Egyéni</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Szeretnél új játékot kezdeni?</string>
     <string name="mines_remaining">%d akna</string>
     <string name="game_time">Játékidő</string>
-    <string name="mine">Akna</string>
     <string name="settings_general">Általános</string>
     <string name="settings_gameplay">Játékmenet</string>
     <string name="settings_accessibility">Kisegítő lehetőségek</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">A jelenlegi szint lehet nem tipp mentes!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-in-rID/strings.xml b/i18n/src/main/res/values-in-rID/strings.xml
index f4fe60baf..bd97bef92 100644
--- a/i18n/src/main/res/values-in-rID/strings.xml
+++ b/i18n/src/main/res/values-in-rID/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Pengaturan</string>
     <string name="animations">Animasi</string>
     <string name="vibration">Umpan Balik Haptik</string>
-    <string name="haptic_feedback_level">Tingkat Umpan Balik Haptik</string>
     <string name="about">Tentang</string>
     <string name="events">Statistik</string>
     <string name="custom">Kustom</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Apakah Anda ingin memulai permainan baru?</string>
     <string name="mines_remaining">%d ranjau</string>
     <string name="game_time">Waktu permainan</string>
-    <string name="mine">Ranjau</string>
     <string name="settings_general">Umum</string>
     <string name="settings_gameplay">Gameplay</string>
     <string name="settings_accessibility">Aksesibilitas</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Ladang Ranjau saat ini kemungkinan tidak dapat diselesaikan tanpa menebak!</string>
     <string name="fixed_size">Ukuran tetap</string>
     <string name="progressive">Progresif</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-it-rIT/strings.xml b/i18n/src/main/res/values-it-rIT/strings.xml
index 67a32395a..ed2a0d11a 100644
--- a/i18n/src/main/res/values-it-rIT/strings.xml
+++ b/i18n/src/main/res/values-it-rIT/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Impostazioni</string>
     <string name="animations">Animazioni</string>
     <string name="vibration">Feedback tattile</string>
-    <string name="haptic_feedback_level">Feedback tattile</string>
     <string name="about">Informazioni</string>
     <string name="events">Statistiche</string>
     <string name="custom">Personalizza</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Vuoi iniziare una nuova partita?</string>
     <string name="mines_remaining">%d mine</string>
     <string name="game_time">Tempo di gioco</string>
-    <string name="mine">Scava</string>
     <string name="settings_general">Generale</string>
     <string name="settings_gameplay">Gioco</string>
     <string name="settings_accessibility">Accessibilità</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">L\'attuale campo minato potrebbe non essere indovinabile!</string>
     <string name="fixed_size">Dimensione Fissa</string>
     <string name="progressive">Progressivo</string>
+    <string name="highlight_unsolved_numbers">Evidenzia numeri non risolti</string>
 </resources>
diff --git a/i18n/src/main/res/values-iw-rIL/strings.xml b/i18n/src/main/res/values-iw-rIL/strings.xml
index c7aea6cc8..5075d83d2 100644
--- a/i18n/src/main/res/values-iw-rIL/strings.xml
+++ b/i18n/src/main/res/values-iw-rIL/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">הגדרות</string>
     <string name="animations">אנימציות</string>
     <string name="vibration">משוב רטט</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">אודות</string>
     <string name="events">סטטיסטיקה</string>
     <string name="custom">התאמה אישית</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">האם ברצונך להתחיל משחק חדש?</string>
     <string name="mines_remaining">%d מוקשים</string>
     <string name="game_time">זמן משחק</string>
-    <string name="mine">מוקש</string>
     <string name="settings_general">כללי</string>
     <string name="settings_gameplay">משחק</string>
     <string name="settings_accessibility">נגישות</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-ja-rJP/strings.xml b/i18n/src/main/res/values-ja-rJP/strings.xml
index 3cd1af429..57f135c5d 100644
--- a/i18n/src/main/res/values-ja-rJP/strings.xml
+++ b/i18n/src/main/res/values-ja-rJP/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">設定</string>
     <string name="animations">アニメーション</string>
     <string name="vibration">タッチ操作バイブ</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">このアプリについて</string>
     <string name="events">統計</string>
     <string name="custom">カスタム</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">新しくゲームを始めますか？</string>
     <string name="mines_remaining">%d 個の地雷</string>
     <string name="game_time">ゲーム時間</string>
-    <string name="mine">地雷</string>
     <string name="settings_general">全般</string>
     <string name="settings_gameplay">ゲームプレイ</string>
     <string name="settings_accessibility">アクセシビリティ</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-ko-rKR/strings.xml b/i18n/src/main/res/values-ko-rKR/strings.xml
index bf53e0a85..ebc1e5fe2 100644
--- a/i18n/src/main/res/values-ko-rKR/strings.xml
+++ b/i18n/src/main/res/values-ko-rKR/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">설정</string>
     <string name="animations">애니메이션</string>
     <string name="vibration">터치 시 진동</string>
-    <string name="haptic_feedback_level">터치 시 진동 크기</string>
     <string name="about">앱 정보</string>
     <string name="events">통계</string>
     <string name="custom">사용자 지정</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">새로운 게임을 시작하시겠습니까?</string>
     <string name="mines_remaining">%d 개</string>
     <string name="game_time">게임 시간</string>
-    <string name="mine">지뢰</string>
     <string name="settings_general">일반</string>
     <string name="settings_gameplay">게임 플레이</string>
     <string name="settings_accessibility">접근성</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">현재 레벨은 추정 없이 깨지 못할 수도 있습니다!</string>
     <string name="fixed_size">고정 크기</string>
     <string name="progressive">프로그레시브</string>
+    <string name="highlight_unsolved_numbers">미해결 숫자 강조</string>
 </resources>
diff --git a/i18n/src/main/res/values-ku-rTR/strings.xml b/i18n/src/main/res/values-ku-rTR/strings.xml
index ca54f8de8..b95f9d7da 100644
--- a/i18n/src/main/res/values-ku-rTR/strings.xml
+++ b/i18n/src/main/res/values-ku-rTR/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">ڕێکخستنەکان</string>
     <string name="animations">ئەنیمەیشنەکان</string>
     <string name="vibration">وڵامدانەوەی ڕاوبۆچون</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">دەربارە</string>
     <string name="events">ئامار</string>
     <string name="custom">ئاسایی</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">ئایا دەتەوێت یاریەکی نوێ دەست پێبکەیت؟</string>
     <string name="mines_remaining">%dمینەکان</string>
     <string name="game_time">کاتی یاری</string>
-    <string name="mine">مین</string>
     <string name="settings_general">گشتی</string>
     <string name="settings_gameplay">شێوازی یاری</string>
     <string name="settings_accessibility">توانای گەیشتن</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-lv-rLV/strings.xml b/i18n/src/main/res/values-lv-rLV/strings.xml
index 434c47430..0d681e2d6 100644
--- a/i18n/src/main/res/values-lv-rLV/strings.xml
+++ b/i18n/src/main/res/values-lv-rLV/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Iestatījumi</string>
     <string name="animations">Animācijas</string>
     <string name="vibration">Haptiskas atsauksmes</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Par lietotni</string>
     <string name="events">Statistika</string>
     <string name="custom">Pielāgots</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Vai tu vēlies uzsākt jaunu spēli?</string>
     <string name="mines_remaining">%d mīnas</string>
     <string name="game_time">Spēles laiks</string>
-    <string name="mine">Mīna</string>
     <string name="settings_general">Vispārīgi</string>
     <string name="settings_gameplay">Spēlē</string>
     <string name="settings_accessibility">Pieejamība</string>
@@ -54,18 +52,18 @@
     <string name="version_s">Versija %1$s</string>
     <string name="sound_effects">Skaņas efekti</string>
     <string name="are_you_sure">Vai esi pārliecināts(a)?</string>
-    <string name="enable_automatic_flags">Ieslēgt automātisku atzīmēšanu</string>
+    <string name="enable_automatic_flags">Iespējot automātisku atzīmēšanu</string>
     <string name="open_areas">Atvērti lauki</string>
     <string name="total_time">Kopējais laiks</string>
     <string name="average_time">Vidējais laiks</string>
     <string name="shortest_time">Īsākais laiks</string>
     <string name="performance">Izpilde</string>
     <string name="ok">Labi</string>
-    <string name="use_question_mark">Izmantot arī jautājuma zīmi</string>
-    <string name="no_guessing_mode">Bez minēšanas</string>
+    <string name="use_question_mark">Iespējot jautājuma zīmi</string>
+    <string name="no_guessing_mode">Režīms bez minēšanas</string>
     <string name="control">Kontroles</string>
     <string name="single_click">Pieskāriens</string>
-    <string name="double_click">Dubultpiesitiens</string>
+    <string name="double_click">Dubultpieskāriens</string>
     <string name="long_press">Ilgs pieskāriens</string>
     <string name="touch_sensibility">Jūtīgums</string>
     <string name="open_tile">Atvērt</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Pašreizējais mīnu lauks nav no minēšanas brīvs!</string>
     <string name="fixed_size">Nemainīga lieluma</string>
     <string name="progressive">Ar attīstību</string>
+    <string name="highlight_unsolved_numbers">Izcelt neatrisinātos skaitļus</string>
 </resources>
diff --git a/i18n/src/main/res/values-nl-rNL/strings.xml b/i18n/src/main/res/values-nl-rNL/strings.xml
index 842ab4c26..dac5bdc51 100644
--- a/i18n/src/main/res/values-nl-rNL/strings.xml
+++ b/i18n/src/main/res/values-nl-rNL/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Instellingen</string>
     <string name="animations">Animaties</string>
     <string name="vibration">Haptische feedback</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Over</string>
     <string name="events">Statistieken</string>
     <string name="custom">Aangepast</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Wil je een nieuw spel beginnen?</string>
     <string name="mines_remaining">%d mijnen</string>
     <string name="game_time">Game Tijd</string>
-    <string name="mine">Mijn</string>
     <string name="settings_general">Algemeen</string>
     <string name="settings_gameplay">Gameplay</string>
     <string name="settings_accessibility">Toegankelijkheid</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-no-rNO/strings.xml b/i18n/src/main/res/values-no-rNO/strings.xml
index 99769b324..dc6b744bd 100644
--- a/i18n/src/main/res/values-no-rNO/strings.xml
+++ b/i18n/src/main/res/values-no-rNO/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Innstillinger</string>
     <string name="animations">Animasjoner</string>
     <string name="vibration">Haptisk Tilbakemelding</string>
-    <string name="haptic_feedback_level">Haptisk Tilbakemelding Nivå</string>
     <string name="about">Om</string>
     <string name="events">Statistikk</string>
     <string name="custom">Egendefinert</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Vil du starte et nytt spill?</string>
     <string name="mines_remaining">%d miner</string>
     <string name="game_time">Spilletid</string>
-    <string name="mine">Mine</string>
     <string name="settings_general">Generelt</string>
     <string name="settings_gameplay">Spillopplevelse</string>
     <string name="settings_accessibility">Tilgjengelighet</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Det nåværende minefeltet kan ikke løses uten å gjette!</string>
     <string name="fixed_size">Fast størrelse</string>
     <string name="progressive">Progressiv</string>
+    <string name="highlight_unsolved_numbers">Marker uløste numre</string>
 </resources>
diff --git a/i18n/src/main/res/values-pl-rPL/strings.xml b/i18n/src/main/res/values-pl-rPL/strings.xml
index 91b2be1a9..9ec3a6bec 100644
--- a/i18n/src/main/res/values-pl-rPL/strings.xml
+++ b/i18n/src/main/res/values-pl-rPL/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Ustawienia</string>
     <string name="animations">Animacje</string>
     <string name="vibration">Wibracja przy dotknięciu</string>
-    <string name="haptic_feedback_level">Intensywność wibracji</string>
     <string name="about">Informacje</string>
     <string name="events">Statystyki</string>
     <string name="custom">Niestandardowy</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Czy chcesz rozpocząć nową rozgrywkę?</string>
     <string name="mines_remaining">%d</string>
     <string name="game_time">Czas gry</string>
-    <string name="mine">Mina</string>
     <string name="settings_general">Ogólne</string>
     <string name="settings_gameplay">Rozgrywka</string>
     <string name="settings_accessibility">Ułatwienia dostępu</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">To pole minowe może wymagać zgadywania, aby je ukończyć!</string>
     <string name="fixed_size">Ustalony rozmiar</string>
     <string name="progressive">Progresywny</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-pt-rBR/strings.xml b/i18n/src/main/res/values-pt-rBR/strings.xml
index 20065382e..302b2d677 100644
--- a/i18n/src/main/res/values-pt-rBR/strings.xml
+++ b/i18n/src/main/res/values-pt-rBR/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Preferências</string>
     <string name="animations">Animações</string>
     <string name="vibration">Feedback tátil</string>
-    <string name="haptic_feedback_level">Nível de Feedback tátil</string>
     <string name="about">Sobre</string>
     <string name="events">Estatísticas</string>
     <string name="custom">Personalizado</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Você quer começar um novo jogo?</string>
     <string name="mines_remaining">%d minas</string>
     <string name="game_time">Tempo de jogo</string>
-    <string name="mine">Mina</string>
     <string name="settings_general">Geral</string>
     <string name="settings_gameplay">Jogabilidade</string>
     <string name="settings_accessibility">Acessibilidade</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">O campo minado atual pode não ser resolvido sem adivinhação!</string>
     <string name="fixed_size">Tamanho Fixo</string>
     <string name="progressive">Progressivo</string>
+    <string name="highlight_unsolved_numbers">Destacar números não resolvidos</string>
 </resources>
diff --git a/i18n/src/main/res/values-pt-rPT/strings.xml b/i18n/src/main/res/values-pt-rPT/strings.xml
index 866e882ed..3b7d4b160 100644
--- a/i18n/src/main/res/values-pt-rPT/strings.xml
+++ b/i18n/src/main/res/values-pt-rPT/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Configurações</string>
     <string name="animations">Animações</string>
     <string name="vibration">Resposta tátil</string>
-    <string name="haptic_feedback_level">Nível de resposta tátil</string>
     <string name="about">Sobre</string>
     <string name="events">Estatísticas</string>
     <string name="custom">Personalizado</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Queres começar um novo jogo?</string>
     <string name="mines_remaining">%d minas</string>
     <string name="game_time">Tempo de jogo</string>
-    <string name="mine">Mina</string>
     <string name="settings_general">Geral</string>
     <string name="settings_gameplay">Jogabilidade</string>
     <string name="settings_accessibility">Acessibilidade</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">O campo minado atual pode não ser resolvido sem adivinhação!</string>
     <string name="fixed_size">Tamanho fixo</string>
     <string name="progressive">Progressivo</string>
+    <string name="highlight_unsolved_numbers">Destacar números não resolvidos</string>
 </resources>
diff --git a/i18n/src/main/res/values-ro-rRO/strings.xml b/i18n/src/main/res/values-ro-rRO/strings.xml
index 03af96b1c..ad39f2221 100644
--- a/i18n/src/main/res/values-ro-rRO/strings.xml
+++ b/i18n/src/main/res/values-ro-rRO/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Setări</string>
     <string name="animations">Animații</string>
     <string name="vibration">Feedback haptic</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Despre</string>
     <string name="events">Statistici</string>
     <string name="custom">Personalizat</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Vrei să începi un joc nou?</string>
     <string name="mines_remaining">%d mine</string>
     <string name="game_time">Durata Jocului</string>
-    <string name="mine">Mină</string>
     <string name="settings_general">General</string>
     <string name="settings_gameplay">Joc</string>
     <string name="settings_accessibility">Accesibilitate</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Este posibil ca actualul teren de mine să nu fie lipsit de ghiciri!</string>
     <string name="fixed_size">Dimensiune fixă</string>
     <string name="progressive">Progresiv</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-ru-rRU/strings.xml b/i18n/src/main/res/values-ru-rRU/strings.xml
index 8360f0b70..631512bc3 100644
--- a/i18n/src/main/res/values-ru-rRU/strings.xml
+++ b/i18n/src/main/res/values-ru-rRU/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Настройки</string>
     <string name="animations">Анимации</string>
     <string name="vibration">Виброотклик</string>
-    <string name="haptic_feedback_level">Уровень виброотклика</string>
     <string name="about">Об игре</string>
     <string name="events">Статистика</string>
     <string name="custom">Другой</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Начать новую игру?</string>
     <string name="mines_remaining">%d мин</string>
     <string name="game_time">Время в игре</string>
-    <string name="mine">Мина</string>
     <string name="settings_general">Общее</string>
     <string name="settings_gameplay">Геймплей</string>
     <string name="settings_accessibility">Специальные возможности</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Вам может понадобиться подсказка, чтобы пройти этот уровень!</string>
     <string name="fixed_size">Фиксированный размер</string>
     <string name="progressive">Прогрессивный</string>
+    <string name="highlight_unsolved_numbers">Подсвечивать неразгаданные числа</string>
 </resources>
diff --git a/i18n/src/main/res/values-sk-rSK/strings.xml b/i18n/src/main/res/values-sk-rSK/strings.xml
index 7803d41f6..a45a09dba 100644
--- a/i18n/src/main/res/values-sk-rSK/strings.xml
+++ b/i18n/src/main/res/values-sk-rSK/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Settings</string>
     <string name="animations">Animations</string>
     <string name="vibration">Haptic Feedback</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">About</string>
     <string name="events">Statistics</string>
     <string name="custom">Custom</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Do you want to start a new game?</string>
     <string name="mines_remaining">%d mines</string>
     <string name="game_time">Game Time</string>
-    <string name="mine">Mine</string>
     <string name="settings_general">General</string>
     <string name="settings_gameplay">Gameplay</string>
     <string name="settings_accessibility">Accessibility</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-sv-rSE/strings.xml b/i18n/src/main/res/values-sv-rSE/strings.xml
index b32f80b15..ef7509da0 100644
--- a/i18n/src/main/res/values-sv-rSE/strings.xml
+++ b/i18n/src/main/res/values-sv-rSE/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Inställningar</string>
     <string name="animations">Animationer</string>
     <string name="vibration">Haptik-feedback</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Om</string>
     <string name="events">Statistik</string>
     <string name="custom">Anpassa</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Vill du starta ett nytt spel?</string>
     <string name="mines_remaining">%d minor</string>
     <string name="game_time">Speltid</string>
-    <string name="mine">Mina</string>
     <string name="settings_general">Allmänt</string>
     <string name="settings_gameplay">Spelsätt</string>
     <string name="settings_accessibility">Tillgänglighet</string>
@@ -118,9 +116,10 @@
     <string name="close">Stäng</string>
     <string name="open_tutorial">Öppna Guide</string>
     <string name="click_numbers">Tillåt tryck på siffror</string>
-    <string name="tap_to_customize">Tap to customize</string>
-    <string name="toggle_button_top">Show \"Toggle Button\" on top bar</string>
-    <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
-    <string name="fixed_size">Fixed Size</string>
-    <string name="progressive">Progressive</string>
+    <string name="tap_to_customize">Tryck för att anpassa</string>
+    <string name="toggle_button_top">Visa \"Växla knapp\" i övre fältet</string>
+    <string name="no_guess_fail_warning">Den nuvarande minfälten kanske inte är gissfri!</string>
+    <string name="fixed_size">Fast storlek</string>
+    <string name="progressive">Progressiv</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-ta-rIN/strings.xml b/i18n/src/main/res/values-ta-rIN/strings.xml
index 0cdcd4ac6..afbd0ba23 100644
--- a/i18n/src/main/res/values-ta-rIN/strings.xml
+++ b/i18n/src/main/res/values-ta-rIN/strings.xml
@@ -7,7 +7,7 @@
     <string name="tutorial_text_3">If a square has the same number of flags, all other remaining squares adjacent to it aren\'t mines (the green arrow).</string>
     <string name="tutorial_text_4">Review the numbers and keep opening squares.</string>
     <string name="games">Games</string>
-    <string name="tap_to_begin">Tap to begin</string>
+    <string name="tap_to_begin">Tap to Begin</string>
     <string name="previous_games">முந்தைய ஆட்டங்கள்</string>
     <string name="minefield">கடினத்தன்மை</string>
     <string name="standard">Standard</string>
@@ -20,7 +20,6 @@
     <string name="settings">அமைப்புகள்</string>
     <string name="animations">Animations</string>
     <string name="vibration">Haptic Feedback</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">செயலி பற்றி</string>
     <string name="events">புள்ளியியல்</string>
     <string name="custom">தனி விருப்பம்</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Do you want to start a new game?</string>
     <string name="mines_remaining">%d mines</string>
     <string name="game_time">Game Time</string>
-    <string name="mine">Mine</string>
     <string name="settings_general">General</string>
     <string name="settings_gameplay">Gameplay</string>
     <string name="settings_accessibility">Accessibility</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">நிலையான அளவு</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-th-rTH/strings.xml b/i18n/src/main/res/values-th-rTH/strings.xml
index 3516c5057..f7f0f9cf3 100644
--- a/i18n/src/main/res/values-th-rTH/strings.xml
+++ b/i18n/src/main/res/values-th-rTH/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">การตั้งค่า</string>
     <string name="animations">ภาพเคลื่อนไหว</string>
     <string name="vibration">สั่นเมื่อแตะ</string>
-    <string name="haptic_feedback_level">การตอบสนองแบบสัมผัส</string>
     <string name="about">เกี่ยวกับ</string>
     <string name="events">สติถิ</string>
     <string name="custom">ปรับแต่งเอง</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">ยืนยันเริ่มเกมใหม่หรือไม่？</string>
     <string name="mines_remaining">%d กับระเบิด</string>
     <string name="game_time">เวลาเล่นเกม</string>
-    <string name="mine">ทุ่นระเบิด</string>
     <string name="settings_general">ทั่วไป</string>
     <string name="settings_gameplay">การเล่นเกม</string>
     <string name="settings_accessibility">การเข้าถึง</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-tr-rTR/strings.xml b/i18n/src/main/res/values-tr-rTR/strings.xml
index 50243f3e4..563cb07a0 100644
--- a/i18n/src/main/res/values-tr-rTR/strings.xml
+++ b/i18n/src/main/res/values-tr-rTR/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Ayarlar</string>
     <string name="animations">Animasyonlar</string>
     <string name="vibration">Dokunsal Geribildirim</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Hakkında</string>
     <string name="events">İstatistikler</string>
     <string name="custom">Özel</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Yeni bir oyun başlatmak istiyor musunuz?</string>
     <string name="mines_remaining">%d mayın</string>
     <string name="game_time">Oyun Süresi</string>
-    <string name="mine">Mayın</string>
     <string name="settings_general">Genel</string>
     <string name="settings_gameplay">Oynanış</string>
     <string name="settings_accessibility">Erişilebilirlik</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Mevcut mayın tarlası tahmin edilemez olmayabilir!</string>
     <string name="fixed_size">Sabit Boyut</string>
     <string name="progressive">İlerleme</string>
+    <string name="highlight_unsolved_numbers">Çözülmemiş sayıları vurgula</string>
 </resources>
diff --git a/i18n/src/main/res/values-uk-rUA/strings.xml b/i18n/src/main/res/values-uk-rUA/strings.xml
index 8783c2a0d..8c61eee82 100644
--- a/i18n/src/main/res/values-uk-rUA/strings.xml
+++ b/i18n/src/main/res/values-uk-rUA/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Налаштування</string>
     <string name="animations">Анімації</string>
     <string name="vibration">Вібрація при натиску</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Про додаток</string>
     <string name="events">Статистика</string>
     <string name="custom">Свої налаштування</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Хочете розпочати нову гру?</string>
     <string name="mines_remaining">%d мін</string>
     <string name="game_time">Тривалість гри</string>
-    <string name="mine">Міна</string>
     <string name="settings_general">Загальне</string>
     <string name="settings_gameplay">Геймплей</string>
     <string name="settings_accessibility">Спеціальні можливості</string>
@@ -119,8 +117,9 @@
     <string name="open_tutorial">Відкрити навчання</string>
     <string name="click_numbers">Дозволити натискання на цифри</string>
     <string name="tap_to_customize">Натисніть, щоб налаштувати</string>
-    <string name="toggle_button_top">Show \"Toggle Button\" on top bar</string>
+    <string name="toggle_button_top">Показувати \"Перемкнути кнопки\" на верхній панелі</string>
     <string name="no_guess_fail_warning">The current minefield may not be guess-free!</string>
-    <string name="fixed_size">Fixed Size</string>
-    <string name="progressive">Progressive</string>
+    <string name="fixed_size">Фіксований розмір</string>
+    <string name="progressive">Прогресивна</string>
+    <string name="highlight_unsolved_numbers">Підсвічувати невирішені числа</string>
 </resources>
diff --git a/i18n/src/main/res/values-vec-rIT/strings.xml b/i18n/src/main/res/values-vec-rIT/strings.xml
index 51a707aa4..36e15064a 100644
--- a/i18n/src/main/res/values-vec-rIT/strings.xml
+++ b/i18n/src/main/res/values-vec-rIT/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Inpostasion</string>
     <string name="animations">Animasion</string>
     <string name="vibration">Feedback Tàtiłe</string>
-    <string name="haptic_feedback_level">Feedback Tàtiłe</string>
     <string name="about">Informasion</string>
     <string name="events">Statìsteghe</string>
     <string name="custom">Parsonałizà</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Vuto scuminsiar na nova partìa?</string>
     <string name="mines_remaining">%d mine</string>
     <string name="game_time">Tenpo de Zogo</string>
-    <string name="mine">Mina</string>
     <string name="settings_general">Zenarałe</string>
     <string name="settings_gameplay">Zogo</string>
     <string name="settings_accessibility">Acesibiłità</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">\'Sto canpo minà no el se połe mìa conpletar sensa intivar!</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-vi-rVN/strings.xml b/i18n/src/main/res/values-vi-rVN/strings.xml
index 52226dcc6..83560f79a 100644
--- a/i18n/src/main/res/values-vi-rVN/strings.xml
+++ b/i18n/src/main/res/values-vi-rVN/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">Cài đặt</string>
     <string name="animations">Hiệu ứng động</string>
     <string name="vibration">Phản hồi rung</string>
-    <string name="haptic_feedback_level">Haptic Feedback Level</string>
     <string name="about">Giới thiệu</string>
     <string name="events">Thống kê</string>
     <string name="custom">Tuỳ chỉnh</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">Bạn có chắc muốn bắt đầu trò chơi mới?</string>
     <string name="mines_remaining">%d mìn</string>
     <string name="game_time">Thời gian chơi</string>
-    <string name="mine">Mìn</string>
     <string name="settings_general">Tổng quan</string>
     <string name="settings_gameplay">Cách thức chơi</string>
     <string name="settings_accessibility">Trợ năng</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">Bãi mìn hiện tại có thể sẽ không giải được mà không đoán!</string>
     <string name="fixed_size">Kích thước cố định</string>
     <string name="progressive">Tiến trình</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-zh-rCN/strings.xml b/i18n/src/main/res/values-zh-rCN/strings.xml
index 3d1c335a9..d06ad410a 100644
--- a/i18n/src/main/res/values-zh-rCN/strings.xml
+++ b/i18n/src/main/res/values-zh-rCN/strings.xml
@@ -20,7 +20,6 @@
     <string name="settings">设置</string>
     <string name="animations">动画</string>
     <string name="vibration">触摸反馈</string>
-    <string name="haptic_feedback_level">触动反馈级别</string>
     <string name="about">关于</string>
     <string name="events">统计</string>
     <string name="custom">自定义</string>
@@ -33,7 +32,6 @@
     <string name="new_game_request">你要开始一个新游戏吗？</string>
     <string name="mines_remaining">%d 个地雷</string>
     <string name="game_time">游戏时间</string>
-    <string name="mine">地雷</string>
     <string name="settings_general">通用</string>
     <string name="settings_gameplay">游戏性</string>
     <string name="settings_accessibility">无障碍</string>
@@ -123,4 +121,5 @@
     <string name="no_guess_fail_warning">当前雷场可能不是“无需猜测”的！</string>
     <string name="fixed_size">Fixed Size</string>
     <string name="progressive">Progressive</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>
diff --git a/i18n/src/main/res/values-zh-rTW/strings.xml b/i18n/src/main/res/values-zh-rTW/strings.xml
index 6aaab9ea3..ad2919e95 100644
--- a/i18n/src/main/res/values-zh-rTW/strings.xml
+++ b/i18n/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:locale="zh">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:locale="zh-rTW">
     <string name="tutorial">教程</string>
     <string name="tutorial_basic">遊戲規則很簡單，方格上的數字顯示與其相鄰的地雷數量，您必須標記所有地雷。</string>
     <string name="tutorial_text_1">如果一個數字與相同數量的方塊接觸，那麼這些方塊都是地雷。</string>
@@ -112,7 +112,6 @@
     <string name="switch_control_desc">使用按鈕在標記和打開之間切換</string>
     <string name="app_description">你必須在不引爆任何地雷的情況下清除一個包含隱藏地雷的矩形板。</string>
     <string name="app_name">踩地雷</string>
-    <string name="crowdin" translatable="false">Crowdin</string>
     <string name="do_you_know_how_to_play">你知道怎麼玩掃雷嗎？</string>
     <string name="close">關閉</string>
     <string name="open_tutorial">打開教程</string>
@@ -122,4 +121,5 @@
     <string name="no_guess_fail_warning">目前的雷區可能不是無猜測的！</string>
     <string name="fixed_size">固定尺寸</string>
     <string name="progressive">進步</string>
+    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
 </resources>

From 04bdd3059ce738536b0e4e0c0007acd70699a137 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 12:24:13 -0300
Subject: [PATCH 02/11] Update save cloud of dim numbers

---
 .../java/dev/lucasnlm/antimine/cloud/CloudSaveManagerImpl.kt   | 1 +
 .../src/main/java/dev/lucasnlm/external/model/CloudSave.kt     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/java/dev/lucasnlm/antimine/cloud/CloudSaveManagerImpl.kt b/app/src/main/java/dev/lucasnlm/antimine/cloud/CloudSaveManagerImpl.kt
index 1896ac6f4..79616f2a9 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/cloud/CloudSaveManagerImpl.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/cloud/CloudSaveManagerImpl.kt
@@ -54,6 +54,7 @@ class CloudSaveManagerImpl(
                     squareDivider = preferencesRepository.squareDivider(),
                     doubleClickTimeout = preferencesRepository.getDoubleClickTimeout().toInt(),
                     allowTapNumbers = preferencesRepository.allowTapOnNumbers().toInt(),
+                    highlightNumbers = preferencesRepository.dimNumbers().toInt(),
                 )
             }
         } catch (e: Exception) {
diff --git a/external/src/main/java/dev/lucasnlm/external/model/CloudSave.kt b/external/src/main/java/dev/lucasnlm/external/model/CloudSave.kt
index d47453b4f..c0dac6c38 100644
--- a/external/src/main/java/dev/lucasnlm/external/model/CloudSave.kt
+++ b/external/src/main/java/dev/lucasnlm/external/model/CloudSave.kt
@@ -24,6 +24,7 @@ data class CloudSave(
     val doubleClickTimeout: Int,
     val allowTapNumbers: Int,
     val hapticFeedbackLevel: Int,
+    val highlightNumbers: Int,
 )
 
 fun CloudSave.toHashMap(): HashMap<String, Any> = hashMapOf(
@@ -48,6 +49,7 @@ fun CloudSave.toHashMap(): HashMap<String, Any> = hashMapOf(
     "newSquareDivider" to squareDivider,
     "doubleClickTimeout" to doubleClickTimeout,
     "allowTapNumbers" to allowTapNumbers,
+    "highlightNumbers" to highlightNumbers,
 )
 
 private fun Any?.parseInt(): Int = this?.toString()?.toInt() ?: throw Exception("Fail to parse Int")
@@ -78,4 +80,5 @@ fun cloudSaveOf(id: String, data: Map<String, Any>) =
         squareDivider = data["newSquareDivider"].parseInt(0),
         doubleClickTimeout = data["doubleClickTimeout"].parseInt(400),
         allowTapNumbers = data["allowTapNumbers"].parseInt(1),
+        highlightNumbers = data["highlightNumbers"].parseInt(0),
     )

From fb522044bfb6b510578a3d6beb0809099baba973 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 13:09:19 -0300
Subject: [PATCH 03/11] Bump dependencies

---
 about/build.gradle    |  4 ++--
 app/build.gradle      | 16 ++++++++--------
 common/build.gradle   |  4 ++--
 control/build.gradle  |  4 ++--
 core/build.gradle     |  8 ++++----
 gdx/build.gradle      |  2 +-
 i18n/build.gradle     |  2 +-
 sgtatham/build.gradle |  3 +--
 themes/build.gradle   |  4 ++--
 tutorial/build.gradle |  4 ++--
 ui/build.gradle       |  4 ++--
 11 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/about/build.gradle b/about/build.gradle
index a51526277..27818fa4d 100644
--- a/about/build.gradle
+++ b/about/build.gradle
@@ -46,14 +46,14 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // RecyclerView
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
diff --git a/app/build.gradle b/app/build.gradle
index 674b01f83..cc18aa43f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 1500021
-        versionName '15.0.2'
+        versionCode 1501001
+        versionName '15.1.0'
         minSdkVersion 21
         targetSdkVersion 31
         multiDexEnabled true
@@ -130,15 +130,15 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
     implementation 'androidx.work:work-runtime-ktx:2.7.0'
 
     // Lifecycle
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.0'
 
     // Room
     implementation 'androidx.room:room-ktx:2.3.0'
@@ -161,7 +161,7 @@ dependencies {
     // Tests
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'android.arch.core:core-testing:1.1.1'
-    testImplementation 'androidx.core:core-ktx:1.6.0'
+    testImplementation 'androidx.core:core-ktx:1.7.0'
     testImplementation 'androidx.test:core-ktx:1.4.0'
     testImplementation 'androidx.test:rules:1.4.0'
     testImplementation 'androidx.test:runner:1.4.0'
diff --git a/common/build.gradle b/common/build.gradle
index d4c169adc..30ea1731f 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -45,14 +45,14 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // Google
     implementation 'com.google.android.material:material:1.4.0'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
diff --git a/control/build.gradle b/control/build.gradle
index 92f59c6f9..7dff41ff8 100644
--- a/control/build.gradle
+++ b/control/build.gradle
@@ -45,14 +45,14 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // RecyclerView
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
diff --git a/core/build.gradle b/core/build.gradle
index d4ad56f20..1f681763c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -49,8 +49,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
 
     // Lifecycle
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.0'
 }
\ No newline at end of file
diff --git a/gdx/build.gradle b/gdx/build.gradle
index dd6f27227..7d7e3938d 100644
--- a/gdx/build.gradle
+++ b/gdx/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // Koin
diff --git a/i18n/build.gradle b/i18n/build.gradle
index 6f35e25be..82a393114 100644
--- a/i18n/build.gradle
+++ b/i18n/build.gradle
@@ -34,7 +34,7 @@ android {
 dependencies {
     // Dependencies must be hardcoded to support F-droid
 
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     testImplementation 'junit:junit:4.13.2'
diff --git a/sgtatham/build.gradle b/sgtatham/build.gradle
index 06396eaad..b23d765ed 100644
--- a/sgtatham/build.gradle
+++ b/sgtatham/build.gradle
@@ -44,10 +44,9 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
-    testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
\ No newline at end of file
diff --git a/themes/build.gradle b/themes/build.gradle
index 8c92d54d0..495b8f583 100644
--- a/themes/build.gradle
+++ b/themes/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // Google
@@ -53,7 +53,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
diff --git a/tutorial/build.gradle b/tutorial/build.gradle
index 8c92d54d0..495b8f583 100644
--- a/tutorial/build.gradle
+++ b/tutorial/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // Google
@@ -53,7 +53,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'
diff --git a/ui/build.gradle b/ui/build.gradle
index 554f906f5..dc11c3c68 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -43,14 +43,14 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // RecyclerView
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
 
     // Lifecycle
     api 'android.arch.lifecycle:extensions:1.1.1'

From 0c4e73ffe0a3ad5ebe2014982cd9c734070eec38 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 13:09:46 -0300
Subject: [PATCH 04/11] Try improve acknowledgePurchase

---
 .../dev/lucasnlm/external/BillingManager.kt   | 60 ++++++++++++-------
 .../lucasnlm/external/di/ExternalModule.kt    |  3 +-
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/proprietary/src/main/java/dev/lucasnlm/external/BillingManager.kt b/proprietary/src/main/java/dev/lucasnlm/external/BillingManager.kt
index 6ed52bb3d..85b7dc12f 100644
--- a/proprietary/src/main/java/dev/lucasnlm/external/BillingManager.kt
+++ b/proprietary/src/main/java/dev/lucasnlm/external/BillingManager.kt
@@ -10,22 +10,25 @@ import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.android.billingclient.api.SkuDetailsParams
+import com.android.billingclient.api.acknowledgePurchase
 import com.android.billingclient.api.querySkuDetails
 import dev.lucasnlm.external.model.Price
 import dev.lucasnlm.external.model.PurchaseInfo
-import kotlinx.coroutines.channels.ConflatedBroadcastChannel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.launch
 
 class BillingManager(
     private val context: Context,
     private val crashReporter: CrashReporter,
+    private val coroutineScope: CoroutineScope,
 ) : IBillingManager, BillingClientStateListener, PurchasesUpdatedListener {
     private var retry = 0
-    private val purchaseBroadcaster = ConflatedBroadcastChannel<PurchaseInfo>()
+    private val purchaseBroadcaster = MutableStateFlow<PurchaseInfo?>(null)
     private val unlockPrice = MutableStateFlow<Price?>(null)
     private val billingClient by lazy {
         BillingClient.newBuilder(context)
@@ -40,9 +43,31 @@ class BillingManager(
         return unlockPrice.asSharedFlow().filterNotNull()
     }
 
-    override fun listenPurchases(): Flow<PurchaseInfo> = purchaseBroadcaster.asFlow()
+    override fun listenPurchases(): Flow<PurchaseInfo> = purchaseBroadcaster.asSharedFlow().filterNotNull()
 
-    private fun handlePurchases(purchases: List<Purchase>) {
+    private fun asyncRefreshPurchasesList() {
+        coroutineScope.launch {
+            while (true) {
+                val purchasesList: List<Purchase> = billingClient
+                    .queryPurchases(BillingClient.SkuType.INAPP)
+                    .purchasesList.let { it?.toList() ?: listOf() }
+
+                if (purchasesList.isEmpty()) {
+                    break
+                } else {
+                    val result = handlePurchases(purchasesList)
+
+                    if (result) {
+                        break
+                    } else {
+                        delay(30 * 1000L)
+                    }
+                }
+            }
+        }
+    }
+
+    private suspend fun handlePurchases(purchases: List<Purchase>): Boolean {
         val status: Boolean = purchases.firstOrNull {
             it.sku == PREMIUM
         }.let {
@@ -56,14 +81,17 @@ class BillingManager(
                             .setPurchaseToken(it.purchaseToken)
                             .build()
 
-                    billingClient.acknowledgePurchase(acknowledgePurchaseParams) {
-                        // Purchase acknowledged
+                    val result = billingClient.acknowledgePurchase(acknowledgePurchaseParams)
+
+                    if (result.responseCode != BillingClient.BillingResponseCode.OK) {
+                        return false
                     }
                 }
             }
         }
 
-        purchaseBroadcaster.trySend(PurchaseInfo.PurchaseResult(isFreeUnlock = false, unlockStatus = status))
+        purchaseBroadcaster.tryEmit(PurchaseInfo.PurchaseResult(isFreeUnlock = false, unlockStatus = status))
+        return true
     }
 
     override fun onBillingServiceDisconnected() {
@@ -100,11 +128,7 @@ class BillingManager(
                     }
                 }
 
-            val purchasesList: List<Purchase> = billingClient
-                .queryPurchases(BillingClient.SkuType.INAPP)
-                .purchasesList.let { it?.toList() ?: listOf() }
-
-            handlePurchases(purchasesList)
+            asyncRefreshPurchasesList()
         } else {
             val code = billingResult.responseCode
             val message = billingResult.debugMessage
@@ -113,15 +137,11 @@ class BillingManager(
     }
 
     override fun onPurchasesUpdated(billingResult: BillingResult, purchases: MutableList<Purchase>?) {
-        val purchasesList: List<Purchase> = if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
-            // The BillingClient is ready. You can query purchases here.
-            purchases?.toList() ?: listOf()
+        if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+            asyncRefreshPurchasesList()
         } else {
             crashReporter.sendError("Charge update failed due to response ${billingResult.responseCode}")
-            listOf()
         }
-
-        handlePurchases(purchasesList)
     }
 
     override fun start() {
@@ -153,7 +173,7 @@ class BillingManager(
             }
         } else {
             crashReporter.sendError("Fail to charge due to unready status")
-            purchaseBroadcaster.trySend(PurchaseInfo.PurchaseFail)
+            purchaseBroadcaster.tryEmit(PurchaseInfo.PurchaseFail)
         }
     }
 
diff --git a/proprietary/src/main/java/dev/lucasnlm/external/di/ExternalModule.kt b/proprietary/src/main/java/dev/lucasnlm/external/di/ExternalModule.kt
index 06bfc2369..9b691b8e1 100644
--- a/proprietary/src/main/java/dev/lucasnlm/external/di/ExternalModule.kt
+++ b/proprietary/src/main/java/dev/lucasnlm/external/di/ExternalModule.kt
@@ -18,13 +18,14 @@ import dev.lucasnlm.external.InAppUpdateManager
 import dev.lucasnlm.external.InstantAppManager
 import dev.lucasnlm.external.PlayGamesManager
 import dev.lucasnlm.external.ReviewWrapper
+import kotlinx.coroutines.GlobalScope
 import org.koin.dsl.bind
 import org.koin.dsl.module
 
 val ExternalModule = module {
     single { InstantAppManager() } bind IInstantAppManager::class
 
-    single { BillingManager(get(), get()) } bind IBillingManager::class
+    single { BillingManager(get(), get(), GlobalScope) } bind IBillingManager::class
 
     single { PlayGamesManager(get(), get()) } bind IPlayGamesManager::class
 

From bcdae9ae49a450dd2cf359916b9d86a1cd6b78b3 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 14:11:37 -0300
Subject: [PATCH 05/11] Bump google iap library

---
 proprietary/build.gradle                                   | 2 +-
 .../src/main/java/dev/lucasnlm/external/BillingManager.kt  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/proprietary/build.gradle b/proprietary/build.gradle
index 1bb9c9de7..8b37dad6c 100644
--- a/proprietary/build.gradle
+++ b/proprietary/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
 
     // Google
-    implementation 'com.android.billingclient:billing-ktx:3.0.3'
+    implementation 'com.android.billingclient:billing-ktx:4.0.0'
     implementation 'com.google.android.gms:play-services-instantapps:17.0.1'
     implementation 'com.google.android.gms:play-services-games:21.0.0'
     implementation 'com.google.android.gms:play-services-auth:19.2.0'
diff --git a/proprietary/src/main/java/dev/lucasnlm/external/BillingManager.kt b/proprietary/src/main/java/dev/lucasnlm/external/BillingManager.kt
index 85b7dc12f..5553ca12c 100644
--- a/proprietary/src/main/java/dev/lucasnlm/external/BillingManager.kt
+++ b/proprietary/src/main/java/dev/lucasnlm/external/BillingManager.kt
@@ -11,6 +11,7 @@ import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.android.billingclient.api.SkuDetailsParams
 import com.android.billingclient.api.acknowledgePurchase
+import com.android.billingclient.api.queryPurchasesAsync
 import com.android.billingclient.api.querySkuDetails
 import dev.lucasnlm.external.model.Price
 import dev.lucasnlm.external.model.PurchaseInfo
@@ -49,8 +50,8 @@ class BillingManager(
         coroutineScope.launch {
             while (true) {
                 val purchasesList: List<Purchase> = billingClient
-                    .queryPurchases(BillingClient.SkuType.INAPP)
-                    .purchasesList.let { it?.toList() ?: listOf() }
+                    .queryPurchasesAsync(BillingClient.SkuType.INAPP)
+                    .purchasesList
 
                 if (purchasesList.isEmpty()) {
                     break
@@ -69,7 +70,7 @@ class BillingManager(
 
     private suspend fun handlePurchases(purchases: List<Purchase>): Boolean {
         val status: Boolean = purchases.firstOrNull {
-            it.sku == PREMIUM
+            it.skus.contains(PREMIUM)
         }.let {
             when (it?.purchaseState) {
                 Purchase.PurchaseState.PURCHASED, Purchase.PurchaseState.PENDING -> true

From 7212c020efd9ddcc67ac25b33b4a5c91eda41b33 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 14:11:43 -0300
Subject: [PATCH 06/11] Lint

---
 .../main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt    | 1 +
 .../lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt   | 2 +-
 .../antimine/common/level/logic/MinefieldHandlerTest.kt         | 2 +-
 gdx/src/main/java/dev/lucasnlm/antimine/gdx/GdxLocal.kt         | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt
index 79ab56a0f..299ab5edf 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt
@@ -1,5 +1,6 @@
 package dev.lucasnlm.antimine.splash
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt
index 058c8e582..5916599fe 100644
--- a/common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt
+++ b/common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt
@@ -524,7 +524,7 @@ open class GameViewModel(
         }
     }
 
-    fun refreshUserPreferences() {
+    private fun refreshUserPreferences() {
         if (initialized) {
             gameController.apply {
                 val controlType = preferencesRepository.controlStyle()
diff --git a/common/src/test/java/dev/lucasnlm/antimine/common/level/logic/MinefieldHandlerTest.kt b/common/src/test/java/dev/lucasnlm/antimine/common/level/logic/MinefieldHandlerTest.kt
index 1177838e6..f82c2c3a4 100644
--- a/common/src/test/java/dev/lucasnlm/antimine/common/level/logic/MinefieldHandlerTest.kt
+++ b/common/src/test/java/dev/lucasnlm/antimine/common/level/logic/MinefieldHandlerTest.kt
@@ -31,7 +31,7 @@ class MinefieldHandlerTest {
 
     @Test
     fun testOpenAreaWithSafeZone() {
-        handleMinefield() { handler ->
+        handleMinefield { handler ->
             assertTrue(handler.result()[3].isCovered)
             handler.openAt(3, false, openNeighbors = false)
             assertFalse(handler.result()[3].isCovered)
diff --git a/gdx/src/main/java/dev/lucasnlm/antimine/gdx/GdxLocal.kt b/gdx/src/main/java/dev/lucasnlm/antimine/gdx/GdxLocal.kt
index 3b4b94040..19c8da4a2 100644
--- a/gdx/src/main/java/dev/lucasnlm/antimine/gdx/GdxLocal.kt
+++ b/gdx/src/main/java/dev/lucasnlm/antimine/gdx/GdxLocal.kt
@@ -11,7 +11,6 @@ object GdxLocal {
     var textureAtlas: TextureAtlas? = null
     var areaAtlas: TextureAtlas? = null
     var gameTextures: GameTextures? = null
-    var highlightAlpha = 0.0f
     var zoom = 1.0f
 
     // Global animation scale, it defines how fast/slow all animations must be executed.

From a6c47286c6523e028d9a91d64816331e30987bf6 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 16:47:05 -0300
Subject: [PATCH 07/11] Update string

---
 i18n/src/main/res/values-pl-rPL/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i18n/src/main/res/values-pl-rPL/strings.xml b/i18n/src/main/res/values-pl-rPL/strings.xml
index 9ec3a6bec..b73183b5e 100644
--- a/i18n/src/main/res/values-pl-rPL/strings.xml
+++ b/i18n/src/main/res/values-pl-rPL/strings.xml
@@ -121,5 +121,5 @@
     <string name="no_guess_fail_warning">To pole minowe może wymagać zgadywania, aby je ukończyć!</string>
     <string name="fixed_size">Ustalony rozmiar</string>
     <string name="progressive">Progresywny</string>
-    <string name="highlight_unsolved_numbers">Highlight unsolved numbers</string>
+    <string name="highlight_unsolved_numbers">Podświetl nierozwiązane pola</string>
 </resources>

From a060a375ebebf3aa711eec788197ea6b2e794353 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 16:47:17 -0300
Subject: [PATCH 08/11] Update Firebase code

---
 .../lucasnlm/antimine/main/MainActivity.kt    |  1 +
 .../antimine/splash/SplashActivity.kt         |  1 -
 .../lucasnlm/external/IPlayGamesManager.kt    |  1 +
 .../dev/lucasnlm/external/PlayGamesManager.kt |  4 +++
 .../dev/lucasnlm/external/PlayGamesManager.kt | 29 +++++++++++++++++++
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt
index a3d1e3bcf..3a0aad04b 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt
@@ -410,6 +410,7 @@ class MainActivity : ThematicActivity(R.layout.activity_main) {
     }
 
     private fun afterGooglePlayGames() {
+        playGamesManager.signInToFirebase(this)
         inAppUpdateManager.checkUpdate(this)
     }
 
diff --git a/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt
index 299ab5edf..79ab56a0f 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt
@@ -1,6 +1,5 @@
 package dev.lucasnlm.antimine.splash
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
diff --git a/external/src/main/java/dev/lucasnlm/external/IPlayGamesManager.kt b/external/src/main/java/dev/lucasnlm/external/IPlayGamesManager.kt
index 937c778b1..271e88cdf 100644
--- a/external/src/main/java/dev/lucasnlm/external/IPlayGamesManager.kt
+++ b/external/src/main/java/dev/lucasnlm/external/IPlayGamesManager.kt
@@ -41,4 +41,5 @@ interface IPlayGamesManager {
     fun submitLeaderboard(leaderboard: Leaderboard, value: Long)
     fun keepRequestingLogin(status: Boolean)
     fun shouldRequestLogin(): Boolean
+    fun signInToFirebase(activity: Activity)
 }
diff --git a/foss/src/main/java/dev/lucasnlm/external/PlayGamesManager.kt b/foss/src/main/java/dev/lucasnlm/external/PlayGamesManager.kt
index b72ed62e1..6c6eb0dfb 100644
--- a/foss/src/main/java/dev/lucasnlm/external/PlayGamesManager.kt
+++ b/foss/src/main/java/dev/lucasnlm/external/PlayGamesManager.kt
@@ -55,4 +55,8 @@ class PlayGamesManager(
     override fun shouldRequestLogin(): Boolean {
         return false
     }
+
+    override fun signInToFirebase(activity: Activity) {
+        // F-droid build doesn't have Google Play Games
+    }
 }
diff --git a/proprietary/src/main/java/dev/lucasnlm/external/PlayGamesManager.kt b/proprietary/src/main/java/dev/lucasnlm/external/PlayGamesManager.kt
index 6f2b706af..50ad974f5 100644
--- a/proprietary/src/main/java/dev/lucasnlm/external/PlayGamesManager.kt
+++ b/proprietary/src/main/java/dev/lucasnlm/external/PlayGamesManager.kt
@@ -11,6 +11,10 @@ import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.games.Games
+import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.auth.PlayGamesAuthProvider
+import com.google.firebase.auth.ktx.auth
+import com.google.firebase.ktx.Firebase
 import kotlinx.coroutines.tasks.await
 
 class PlayGamesManager(
@@ -19,6 +23,9 @@ class PlayGamesManager(
 ) : IPlayGamesManager {
     private var account: GoogleSignInAccount? = null
     private var requestLogin: Boolean = true
+    private val firebaseAuth: FirebaseAuth by lazy {
+        Firebase.auth
+    }
 
     private fun setupPopUp(activity: Activity, account: GoogleSignInAccount) {
         Games.getGamesClient(context, account).apply {
@@ -134,6 +141,28 @@ class PlayGamesManager(
         return requestLogin
     }
 
+    override fun signInToFirebase(activity: Activity) {
+        val googleAccount = account
+        val serverAuthCode = googleAccount?.serverAuthCode
+
+        if (googleAccount != null && serverAuthCode != null) {
+            val credential = PlayGamesAuthProvider.getCredential(serverAuthCode)
+
+            firebaseAuth.signInWithCredential(credential)
+                .addOnCompleteListener(activity) { task ->
+                    if (task.isSuccessful) {
+                        Log.d(TAG, "signInWithCredential:success")
+                    } else {
+                        Log.w(TAG, "signInWithCredential:failure", task.exception)
+                    }
+                }
+                .addOnFailureListener {
+                    Log.e(TAG, "Fail to signIn with firebase", it)
+                    crashReporter.sendError("Fail to  signIn with firebase. $it")
+                }
+        }
+    }
+
     companion object {
         val TAG = PlayGamesManager::class.simpleName
     }

From bd0d1722de06c213bfcf2146956707c00d74af02 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 17:06:44 -0300
Subject: [PATCH 09/11] Fix test

---
 app/src/test/java/dev/lucasnlm/antimine/di/TestAppModule.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/test/java/dev/lucasnlm/antimine/di/TestAppModule.kt b/app/src/test/java/dev/lucasnlm/antimine/di/TestAppModule.kt
index e9b7f8f7a..0153500ca 100644
--- a/app/src/test/java/dev/lucasnlm/antimine/di/TestAppModule.kt
+++ b/app/src/test/java/dev/lucasnlm/antimine/di/TestAppModule.kt
@@ -69,6 +69,8 @@ val AppModule = module {
             override fun keepRequestingLogin(status: Boolean) {}
 
             override fun shouldRequestLogin(): Boolean = false
+
+            override fun signInToFirebase(activity: Activity) {}
         }
     } bind IPlayGamesManager::class
 

From 595de762c44d0fc21fc02f66bc15e6696f6333ae Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 17:24:06 -0300
Subject: [PATCH 10/11] Revert change to fix build

---
 app/build.gradle      | 2 +-
 i18n/build.gradle     | 2 +-
 sgtatham/build.gradle | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cc18aa43f..b9494ac4c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -161,7 +161,7 @@ dependencies {
     // Tests
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'android.arch.core:core-testing:1.1.1'
-    testImplementation 'androidx.core:core-ktx:1.7.0'
+    testImplementation 'androidx.core:core-ktx:1.6.0'
     testImplementation 'androidx.test:core-ktx:1.4.0'
     testImplementation 'androidx.test:rules:1.4.0'
     testImplementation 'androidx.test:runner:1.4.0'
diff --git a/i18n/build.gradle b/i18n/build.gradle
index 82a393114..6f35e25be 100644
--- a/i18n/build.gradle
+++ b/i18n/build.gradle
@@ -34,7 +34,7 @@ android {
 dependencies {
     // Dependencies must be hardcoded to support F-droid
 
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     testImplementation 'junit:junit:4.13.2'
diff --git a/sgtatham/build.gradle b/sgtatham/build.gradle
index b23d765ed..c8d97d494 100644
--- a/sgtatham/build.gradle
+++ b/sgtatham/build.gradle
@@ -44,7 +44,7 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

From 5a129c5915956117ba178d48706a2bead9202956 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucasnunesk@gmail.com>
Date: Sun, 31 Oct 2021 17:32:18 -0300
Subject: [PATCH 11/11] Revert change to fix build

---
 about/build.gradle    | 2 +-
 app/build.gradle      | 2 +-
 common/build.gradle   | 2 +-
 control/build.gradle  | 2 +-
 gdx/build.gradle      | 2 +-
 themes/build.gradle   | 2 +-
 tutorial/build.gradle | 2 +-
 ui/build.gradle       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/about/build.gradle b/about/build.gradle
index 27818fa4d..95ae51438 100644
--- a/about/build.gradle
+++ b/about/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // RecyclerView
diff --git a/app/build.gradle b/app/build.gradle
index b9494ac4c..43c5236f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -130,7 +130,7 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
     implementation 'androidx.work:work-runtime-ktx:2.7.0'
 
diff --git a/common/build.gradle b/common/build.gradle
index 30ea1731f..0a34ec05f 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -45,7 +45,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // Google
diff --git a/control/build.gradle b/control/build.gradle
index 7dff41ff8..c2b33d66a 100644
--- a/control/build.gradle
+++ b/control/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // RecyclerView
diff --git a/gdx/build.gradle b/gdx/build.gradle
index 7d7e3938d..dd6f27227 100644
--- a/gdx/build.gradle
+++ b/gdx/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // Koin
diff --git a/themes/build.gradle b/themes/build.gradle
index 495b8f583..f26da1e71 100644
--- a/themes/build.gradle
+++ b/themes/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // Google
diff --git a/tutorial/build.gradle b/tutorial/build.gradle
index 495b8f583..f26da1e71 100644
--- a/tutorial/build.gradle
+++ b/tutorial/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // Google
diff --git a/ui/build.gradle b/ui/build.gradle
index dc11c3c68..185b5e59d 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.3.1'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
 
     // RecyclerView