diff --git a/app/src/main/java/dev/lucasnlm/antimine/gameover/viewmodel/EndGameDialogViewModel.kt b/app/src/main/java/dev/lucasnlm/antimine/gameover/viewmodel/EndGameDialogViewModel.kt
index 6fa960c3..56f8691c 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/gameover/viewmodel/EndGameDialogViewModel.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/gameover/viewmodel/EndGameDialogViewModel.kt
@@ -56,15 +56,15 @@ class EndGameDialogViewModel(
R.drawable.emoji_sad_but_relieved_face,
).safeRandomEmoji(except)
- private fun messageTo(time: Long, gameResult: GameResult): String =
+ private fun messageTo(minesCount: Int, time: Long, gameResult: GameResult): String =
if (time != 0L) {
when (gameResult) {
- GameResult.Victory -> context.getString(R.string.game_over_desc_4, time)
- GameResult.GameOver -> context.getString(R.string.game_over_desc_1)
- else -> context.getString(R.string.game_over_desc_1)
+ GameResult.Victory -> context.getString(R.string.generic_win, minesCount, time)
+ GameResult.GameOver -> context.getString(R.string.generic_game_over)
+ else -> context.getString(R.string.generic_game_over)
}
} else {
- context.getString(R.string.game_over_desc_1)
+ context.getString(R.string.generic_game_over)
}
override fun initialState() = EndGameDialogState(
@@ -83,7 +83,7 @@ class EndGameDialogViewModel(
EndGameDialogState(
titleEmoji = randomVictoryEmoji(0),
title = context.getString(R.string.you_won),
- message = messageTo(event.time, event.gameResult),
+ message = messageTo(event.rightMines, event.time, event.gameResult),
gameResult = event.gameResult,
showContinueButton = false,
received = event.received
@@ -93,7 +93,7 @@ class EndGameDialogViewModel(
EndGameDialogState(
titleEmoji = randomGameOverEmoji(0),
title = context.getString(R.string.you_lost),
- message = messageTo(event.time, event.gameResult),
+ message = messageTo(event.rightMines, event.time, event.gameResult),
gameResult = event.gameResult,
showContinueButton = event.showContinueButton,
received = event.received
diff --git a/common/src/main/res/values-af-rZA/strings.xml b/common/src/main/res/values-af-rZA/strings.xml
index ed1899c1..55d10067 100644
--- a/common/src/main/res/values-af-rZA/strings.xml
+++ b/common/src/main/res/values-af-rZA/strings.xml
@@ -56,8 +56,8 @@
Jy het verloor!
You finished!
Nederlae
- Sterkte met u volgende wedstryd.
- U het die wedstryd binne %1$d sekondes voltooi.
+ Sterkte met u volgende wedstryd.
+ U het die wedstryd binne %1$d sekondes voltooi.
Kon nie deel nie
Weergawe %1$s
Byklanke
diff --git a/common/src/main/res/values-ar-rSA/strings.xml b/common/src/main/res/values-ar-rSA/strings.xml
index c68527fb..dfbfd61f 100644
--- a/common/src/main/res/values-ar-rSA/strings.xml
+++ b/common/src/main/res/values-ar-rSA/strings.xml
@@ -56,8 +56,8 @@
لقد خسرت!
انتهيت منها!
الهزائم
- حظا موفقا في لعبتك القادمة.
- انتهيت من حقل الألغام في %1$d ثانية.
+ حظا موفقا في لعبتك القادمة.
+ انتهيت من حقل الألغام في %1$d ثانية.
فشل المشاركة
الإصدار %1$s
مؤثرات صوتية
diff --git a/common/src/main/res/values-bg-rBG/strings.xml b/common/src/main/res/values-bg-rBG/strings.xml
index 5d3319f9..19792bfd 100644
--- a/common/src/main/res/values-bg-rBG/strings.xml
+++ b/common/src/main/res/values-bg-rBG/strings.xml
@@ -56,8 +56,8 @@
Вие загубихте!
Вие свършихте!
Загуби
- Успех при следващата игра.
- Вие свършихте полето за %1$d секунди.
+ Успех при следващата игра.
+ Вие свършихте полето за %1$d секунди.
Неуспешно споделяне
Версия %1$s
Звукови ефекти
diff --git a/common/src/main/res/values-ca-rES/strings.xml b/common/src/main/res/values-ca-rES/strings.xml
index 4ceb2f3b..4979c9ae 100644
--- a/common/src/main/res/values-ca-rES/strings.xml
+++ b/common/src/main/res/values-ca-rES/strings.xml
@@ -56,8 +56,8 @@
Has perdut!
Has acabat!
Derrotes
- Que tinguis sort en el proper joc.
- Has completat el camp de mines en %1$d segons.
+ Que tinguis sort en el proper joc.
+ Has completat el camp de mines en %1$d segons.
No s\'ha pogut compartir
Versió %1$s
Efecte de so
diff --git a/common/src/main/res/values-cs-rCZ/strings.xml b/common/src/main/res/values-cs-rCZ/strings.xml
index 851e7765..8ac829a6 100644
--- a/common/src/main/res/values-cs-rCZ/strings.xml
+++ b/common/src/main/res/values-cs-rCZ/strings.xml
@@ -56,8 +56,8 @@
Prohráli jste!
Skončili jste!
Prohry
- Hodně štěstí při další hře.
- Dokončili jste minové pole za %1$d sekund.
+ Hodně štěstí při další hře.
+ Dokončili jste minové pole za %1$d sekund.
Sdílení se nezdařilo
Verze %1$s
Zvukové efekty
diff --git a/common/src/main/res/values-da-rDK/strings.xml b/common/src/main/res/values-da-rDK/strings.xml
index f77bba42..8aa6d2f8 100644
--- a/common/src/main/res/values-da-rDK/strings.xml
+++ b/common/src/main/res/values-da-rDK/strings.xml
@@ -56,8 +56,8 @@
Du tabte!
You finished!
Nederlag
- Held og lykke med dit næste spil.
- Du færdiggjorde minefeltet om %1$d sekunder.
+ Held og lykke med dit næste spil.
+ Du færdiggjorde minefeltet om %1$d sekunder.
Mislykkedes at dele
Version %1$s
Lyd effekter
diff --git a/common/src/main/res/values-de-rDE/strings.xml b/common/src/main/res/values-de-rDE/strings.xml
index 698ecb43..42d32215 100644
--- a/common/src/main/res/values-de-rDE/strings.xml
+++ b/common/src/main/res/values-de-rDE/strings.xml
@@ -56,8 +56,8 @@
Du hast verloren!
Du bist fertig!
Niederlagen
- Viel Glück bei deinem nächsten Spiel.
- Du hast das Minenfeld in %1$d Sekunden abgearbeitet.
+ Viel Glück bei deinem nächsten Spiel.
+ Du hast das Minenfeld in %1$d Sekunden abgearbeitet.
Fehler beim Teilen
Version %1$s
Toneffekte
diff --git a/common/src/main/res/values-el-rGR/strings.xml b/common/src/main/res/values-el-rGR/strings.xml
index b69861c1..b2cdb159 100644
--- a/common/src/main/res/values-el-rGR/strings.xml
+++ b/common/src/main/res/values-el-rGR/strings.xml
@@ -56,8 +56,8 @@
Έχασες!
You finished!
Ήττες
- Καλή τύχη στο επόμενο παιχνίδι σας.
- Ολοκληρώσατε το ναρκοπέδιο σε %1$d δευτερόλεπτα.
+ Καλή τύχη στο επόμενο παιχνίδι σας.
+ Ολοκληρώσατε το ναρκοπέδιο σε %1$d δευτερόλεπτα.
Αποτυχία κοινοποίησης
Έκδοση %1$s
Ηχητικά εφέ
diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml
index 9916cfb6..ba3ffcd7 100644
--- a/common/src/main/res/values-en-rUS/strings.xml
+++ b/common/src/main/res/values-en-rUS/strings.xml
@@ -56,8 +56,8 @@
You lost!
You have finished!
Defeats
- Good luck on your next game.
- You finished the minefield in %1$d seconds.
+ Good luck on your next game.
+ You found %1$d mines in %2$d seconds.
Failed to share
Version %1$s
Sound Effects
diff --git a/common/src/main/res/values-es-rES/strings.xml b/common/src/main/res/values-es-rES/strings.xml
index 46bdbb4c..726fd705 100644
--- a/common/src/main/res/values-es-rES/strings.xml
+++ b/common/src/main/res/values-es-rES/strings.xml
@@ -56,8 +56,8 @@
¡Perdiste!
¡Has terminado!
Derrotas
- Buena suerte en tu próxima partida.
- Has terminado el campo de minas en %1$d segundos.
+ Buena suerte en tu próxima partida.
+ Has terminado el campo de minas en %1$d segundos.
Error al compartir
Versión %1$s
Efectos Sonoros
diff --git a/common/src/main/res/values-fi-rFI/strings.xml b/common/src/main/res/values-fi-rFI/strings.xml
index 128f0b1a..0d028363 100644
--- a/common/src/main/res/values-fi-rFI/strings.xml
+++ b/common/src/main/res/values-fi-rFI/strings.xml
@@ -56,8 +56,8 @@
Hävisit!
Olet valmis!
Tappioita
- Onnea seuraavaan peliisi.
- Läpäisit miinakentän %1$d sekunnissa.
+ Onnea seuraavaan peliisi.
+ Läpäisit miinakentän %1$d sekunnissa.
Jakaminen epäonnistui
Versio %1$s
Äänitehosteet
diff --git a/common/src/main/res/values-fr-rFR/strings.xml b/common/src/main/res/values-fr-rFR/strings.xml
index 3d373a3e..b2d52b2e 100644
--- a/common/src/main/res/values-fr-rFR/strings.xml
+++ b/common/src/main/res/values-fr-rFR/strings.xml
@@ -56,8 +56,8 @@
Défaite !
Vous avez fini!
Défaites
- Bonne chance pour votre prochaine partie.
- Vous avez déminé le champ de mine en %1$d secondes.
+ Bonne chance pour votre prochaine partie.
+ Vous avez déminé le champ de mine en %1$d secondes.
Échec du partage
Version %1$s
Effets sonores
diff --git a/common/src/main/res/values-hi-rIN/strings.xml b/common/src/main/res/values-hi-rIN/strings.xml
index 40a8c4d9..2e614bb3 100644
--- a/common/src/main/res/values-hi-rIN/strings.xml
+++ b/common/src/main/res/values-hi-rIN/strings.xml
@@ -56,8 +56,8 @@
तुम हार गए!
You finished!
पराजय
- अपने अगले खेल पर शुभकामनाएँ।
- आपने %1$d सेकंड में खेल समाप्त किया।
+ अपने अगले खेल पर शुभकामनाएँ।
+ आपने %1$d सेकंड में खेल समाप्त किया।
शेअर करने में असफ़ल
संस्करण %1$s
ध्वनि प्रभाव
diff --git a/common/src/main/res/values-hu-rHU/strings.xml b/common/src/main/res/values-hu-rHU/strings.xml
index d1932660..3a11691e 100644
--- a/common/src/main/res/values-hu-rHU/strings.xml
+++ b/common/src/main/res/values-hu-rHU/strings.xml
@@ -56,8 +56,8 @@
Vesztettél!
You finished!
Vereségek
- Sok szerencsét a következő játékhoz.
- %1$d másodperc alatt tisztítottad meg az aknamezőt.
+ Sok szerencsét a következő játékhoz.
+ %1$d másodperc alatt tisztítottad meg az aknamezőt.
Sikertelen megosztás
%1$s verzió
Hangeffektek
diff --git a/common/src/main/res/values-in-rID/strings.xml b/common/src/main/res/values-in-rID/strings.xml
index b0eff01e..e5b9dd55 100644
--- a/common/src/main/res/values-in-rID/strings.xml
+++ b/common/src/main/res/values-in-rID/strings.xml
@@ -56,8 +56,8 @@
Anda Kalah!
You finished!
Kalah
- Semoga sukses di game berikutnya.
- Anda menyelesaikan permainan dalam %1$d detik.
+ Semoga sukses di game berikutnya.
+ Anda menyelesaikan permainan dalam %1$d detik.
Gagal berbagi
Versi %1$s
Efek suara
diff --git a/common/src/main/res/values-it-rIT/strings.xml b/common/src/main/res/values-it-rIT/strings.xml
index c97bc95e..3550b954 100644
--- a/common/src/main/res/values-it-rIT/strings.xml
+++ b/common/src/main/res/values-it-rIT/strings.xml
@@ -56,8 +56,8 @@
Hai perso!
Hai finito!
Sconfitte
- Buona fortuna nella prossima partita.
- Hai finito il campo minato in %1$d secondi.
+ Buona fortuna nella prossima partita.
+ Hai finito il campo minato in %1$d secondi.
Condivisione fallita
Versione %1$s
Effetti Sonori
diff --git a/common/src/main/res/values-iw-rIL/strings.xml b/common/src/main/res/values-iw-rIL/strings.xml
index bf5f47d6..abee1a0d 100644
--- a/common/src/main/res/values-iw-rIL/strings.xml
+++ b/common/src/main/res/values-iw-rIL/strings.xml
@@ -56,8 +56,8 @@
הפסדת!
You finished!
הפסדים
- בהצלחה במשחק הבא.
- סיימת את שדה המוקשים ב%1$d שניות.
+ בהצלחה במשחק הבא.
+ סיימת את שדה המוקשים ב%1$d שניות.
השיתוף נכשל
גרסה %1$s
אפקטי צליל
diff --git a/common/src/main/res/values-ja-rJP/strings.xml b/common/src/main/res/values-ja-rJP/strings.xml
index 682ac5d5..0a598692 100644
--- a/common/src/main/res/values-ja-rJP/strings.xml
+++ b/common/src/main/res/values-ja-rJP/strings.xml
@@ -56,8 +56,8 @@
あなたの負けです!
完了しました!
敗北回数
- 次のゲームでも頑張りましょう。
- あなたは %1$d 秒でクリアしました。
+ 次のゲームでも頑張りましょう。
+ あなたは %1$d 秒でクリアしました。
共有に失敗しました
バージョン %1$s
サウンドエフェクト
diff --git a/common/src/main/res/values-ko-rKR/strings.xml b/common/src/main/res/values-ko-rKR/strings.xml
index 21b8c767..dca46d88 100644
--- a/common/src/main/res/values-ko-rKR/strings.xml
+++ b/common/src/main/res/values-ko-rKR/strings.xml
@@ -56,8 +56,8 @@
실패!
끝났어!
실패 횟수
- 다음 판에서는 잘하시길 빕니다.
- %1$d초만에 이번 판을 끝내셨습니다.
+ 다음 판에서는 잘하시길 빕니다.
+ %1$d초만에 이번 판을 끝내셨습니다.
공유 실패
버전: %1$s
효과음
diff --git a/common/src/main/res/values-nl-rNL/strings.xml b/common/src/main/res/values-nl-rNL/strings.xml
index f6bcd070..040ee051 100644
--- a/common/src/main/res/values-nl-rNL/strings.xml
+++ b/common/src/main/res/values-nl-rNL/strings.xml
@@ -56,8 +56,8 @@
Je hebt verloren!
Je bent klaar!
Nederlagen
- Veel succes bij je volgende spel.
- Je hebt het mijnenveld voltooid in %1$d seconden.
+ Veel succes bij je volgende spel.
+ Je hebt het mijnenveld voltooid in %1$d seconden.
Delen mislukt
Versie %1$s
Geluids Effecten
diff --git a/common/src/main/res/values-no-rNO/strings.xml b/common/src/main/res/values-no-rNO/strings.xml
index 3b267e5c..291218f4 100644
--- a/common/src/main/res/values-no-rNO/strings.xml
+++ b/common/src/main/res/values-no-rNO/strings.xml
@@ -56,8 +56,8 @@
Du tapte!
Du er ferdig!
Nederlag
- Lykke til på det neste spillet.
- Du har avjobbet minefeltet i %1$d sekunder.
+ Lykke til på det neste spillet.
+ Du har avjobbet minefeltet i %1$d sekunder.
Feilet med å dele
Versjon %1$s
Lydeffekter
diff --git a/common/src/main/res/values-pl-rPL/strings.xml b/common/src/main/res/values-pl-rPL/strings.xml
index a661c534..3c2a67cd 100644
--- a/common/src/main/res/values-pl-rPL/strings.xml
+++ b/common/src/main/res/values-pl-rPL/strings.xml
@@ -56,8 +56,8 @@
Nie udało się!
Udało się!
Porażki
- Powodzenia następnym razem.
- Rozminowano pole w ciągu %1$d sekund.
+ Powodzenia następnym razem.
+ Rozminowano pole w ciągu %1$d sekund.
Nie udało się udostępnić
Wersja %1$s
Efekty dźwiękowe
diff --git a/common/src/main/res/values-pt-rBR/strings.xml b/common/src/main/res/values-pt-rBR/strings.xml
index 85772e32..6ab6be76 100644
--- a/common/src/main/res/values-pt-rBR/strings.xml
+++ b/common/src/main/res/values-pt-rBR/strings.xml
@@ -56,8 +56,8 @@
Você perdeu!
Você terminou!
Derrotas
- Boa sorte no seu próximo jogo.
- Você finalizou o campo minado em %1$d segundos.
+ Boa sorte no seu próximo jogo.
+ Você finalizou o campo minado em %1$d segundos.
Falha ao compartilhar
Versão %1$s
Efeitos sonoros
diff --git a/common/src/main/res/values-pt-rPT/strings.xml b/common/src/main/res/values-pt-rPT/strings.xml
index a14fd547..50812c6b 100644
--- a/common/src/main/res/values-pt-rPT/strings.xml
+++ b/common/src/main/res/values-pt-rPT/strings.xml
@@ -56,8 +56,8 @@
Perdeu!
Você terminou!
Derrotas
- Boa sorte no seu próximo jogo.
- Você finalizou o campo minado em %1$d segundos.
+ Boa sorte no seu próximo jogo.
+ Você finalizou o campo minado em %1$d segundos.
Falha ao compartilhar
Versão %1$s
Efeitos Sonoros
diff --git a/common/src/main/res/values-ro-rRO/strings.xml b/common/src/main/res/values-ro-rRO/strings.xml
index 58105f40..68e29048 100644
--- a/common/src/main/res/values-ro-rRO/strings.xml
+++ b/common/src/main/res/values-ro-rRO/strings.xml
@@ -56,8 +56,8 @@
Aţi pierdut!
You finished!
Înfrângeri
- Mult noroc la următorul joc.
- Ai terminat câmpul minat în %1$d secunde.
+ Mult noroc la următorul joc.
+ Ai terminat câmpul minat în %1$d secunde.
Share-uirea imaginii a eșuat
Versiunea %1$s
Efecte sonore
diff --git a/common/src/main/res/values-ru-rRU/strings.xml b/common/src/main/res/values-ru-rRU/strings.xml
index abe902ae..89df46dc 100644
--- a/common/src/main/res/values-ru-rRU/strings.xml
+++ b/common/src/main/res/values-ru-rRU/strings.xml
@@ -56,8 +56,8 @@
Вы проиграли!
Вы закончили!
Поражения
- Удачи в вашей следующий раз.
- Вы завершили минное поле за %1$d секунд.
+ Удачи в вашей следующий раз.
+ Вы завершили минное поле за %1$d секунд.
Не удалось поделиться
Версия %1$s
Звуковые эффекты
diff --git a/common/src/main/res/values-sv-rSE/strings.xml b/common/src/main/res/values-sv-rSE/strings.xml
index 00e0ef7b..706a7be1 100644
--- a/common/src/main/res/values-sv-rSE/strings.xml
+++ b/common/src/main/res/values-sv-rSE/strings.xml
@@ -56,8 +56,8 @@
Du förlorade!
Du är färdig!
Förluster
- Lycka till på ditt nästa spel.
- Du avslutade minfältet på %1$d sekunder.
+ Lycka till på ditt nästa spel.
+ Du avslutade minfältet på %1$d sekunder.
Misslyckades att dela
Version %1$s
Ljudeffekter
diff --git a/common/src/main/res/values-th-rTH/strings.xml b/common/src/main/res/values-th-rTH/strings.xml
index 02c31199..3c804a80 100644
--- a/common/src/main/res/values-th-rTH/strings.xml
+++ b/common/src/main/res/values-th-rTH/strings.xml
@@ -56,8 +56,8 @@
คุณแพ้!
You finished!
ปราชัย
- ขอให้โชคดีในเกมถัดไป
- คุณเล่นเกมเสร็จใน %1$d วินาที
+ ขอให้โชคดีในเกมถัดไป
+ คุณเล่นเกมเสร็จใน %1$d วินาที
ไม่สามารถแชร์ได้
เวอร์ชั่น: %1$s
เสียงประกอบ
diff --git a/common/src/main/res/values-tr-rTR/strings.xml b/common/src/main/res/values-tr-rTR/strings.xml
index 4385f4c7..f03787d1 100644
--- a/common/src/main/res/values-tr-rTR/strings.xml
+++ b/common/src/main/res/values-tr-rTR/strings.xml
@@ -56,8 +56,8 @@
Kaybettin!
Bitirdin!
Yenilgi
- Sonraki oyunda iyi şanslar.
- Mayın tarlasını %1$d saniyede bitirdin.
+ Sonraki oyunda iyi şanslar.
+ Mayın tarlasını %1$d saniyede bitirdin.
Paylaşılamıyor
Sürüm: %1$s
Ses Efektleri
diff --git a/common/src/main/res/values-uk-rUA/strings.xml b/common/src/main/res/values-uk-rUA/strings.xml
index 0dd557cb..40e8985d 100644
--- a/common/src/main/res/values-uk-rUA/strings.xml
+++ b/common/src/main/res/values-uk-rUA/strings.xml
@@ -56,8 +56,8 @@
Програш!
Ви закінчили!
Поразок
- Удачі у наступній грі.
- Ви розмінували поле за %1$d секунд.
+ Удачі у наступній грі.
+ Ви розмінували поле за %1$d секунд.
Не вдалося поділитись
Версія: %1$s
Звукові ефекти
diff --git a/common/src/main/res/values-vi-rVN/strings.xml b/common/src/main/res/values-vi-rVN/strings.xml
index 2f1332bf..952634e0 100644
--- a/common/src/main/res/values-vi-rVN/strings.xml
+++ b/common/src/main/res/values-vi-rVN/strings.xml
@@ -56,8 +56,8 @@
Thua rồi!
Bạn đã hoàn thành!
Thua
- Chúc bạn may mắn lần sau.
- Bạn giải xong trò chơi trong vòng %1$d giây.
+ Chúc bạn may mắn lần sau.
+ Bạn giải xong trò chơi trong vòng %1$d giây.
Chia sẻ thất bại
Phiên bản %1$s
Hiệu ứng âm thanh
diff --git a/common/src/main/res/values-zh-rCN/strings.xml b/common/src/main/res/values-zh-rCN/strings.xml
index ad67aa2d..630a706c 100644
--- a/common/src/main/res/values-zh-rCN/strings.xml
+++ b/common/src/main/res/values-zh-rCN/strings.xml
@@ -56,8 +56,8 @@
你输了!
您已看完!
失败
- 祝您下次游戏好运。
- 你在 %1$d 秒内清空了雷场.
+ 祝您下次游戏好运。
+ 你在 %1$d 秒内清空了雷场.
分享失败
版本 %1$s
音效
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 5b24cc54..9cc7c4b5 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -56,8 +56,8 @@
You lost!
You have finished!
Defeats
- Good luck on your next game.
- You finished the minefield in %1$d seconds.
+ Good luck on your next game.
+ You finished the minefield in %1$d seconds.
Failed to share
Version %1$s
Sound Effects