Skip to content
Snippets Groups Projects
Commit f3962a0e authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '40-remove-code-deprecations' into 'master'

Resolve "Remove code deprecations"

Closes #40

See merge request !37
parents afc506ff d13b41c4
No related branches found
No related tags found
1 merge request!37Resolve "Remove code deprecations"
Pipeline #5823 passed
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
app.versionName=1.2.15
app.versionCode=26
app.versionName=1.2.16
app.versionCode=27
......@@ -38,8 +38,8 @@ class Home extends StatelessWidget {
body: Builder(
builder: (context) => Center(
child: myProvider.searching == true
? WillPopScope(
onWillPop: () async => false,
? PopScope(
onPopInvoked: (didPop) {},
child: const Center(
child: CircularProgressIndicator(),
),
......@@ -106,7 +106,7 @@ class Home extends StatelessWidget {
style: TextButton.styleFrom(
foregroundColor: Colors.white,
backgroundColor: const Color(board),
padding: const EdgeInsets.all(10.0),
padding: const EdgeInsets.all(20.0),
),
onPressed: () async {
myProvider.resetGame();
......@@ -115,6 +115,7 @@ class Home extends StatelessWidget {
await const Game().pickWord(context, myProvider);
if (myProvider.secretWord == '' || myProvider.hiddenWord == '') {
control = false;
if (!context.mounted) return;
var response = await Navigator.push(
context,
MaterialPageRoute(
......@@ -127,6 +128,7 @@ class Home extends StatelessWidget {
} else {
myProvider.setPrefGameMode = false;
myProvider.setPrefLevel = defaultLevel;
if (!context.mounted) return;
await const Game().pickWord(context, myProvider);
control = true;
}
......@@ -135,10 +137,12 @@ class Home extends StatelessWidget {
if (myProvider.secretWord == 'UNEXPECTED ERROR') {
control = false;
myProvider.resetGame();
if (!context.mounted) return;
errorWord(context);
}
if (control) {
if (!context.mounted) return;
Navigator.pushNamed(context, Game.id)
.then((value) => myProvider.searching = false);
}
......
......@@ -8,8 +8,8 @@ class DialogFetchError extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color(board),
body: WillPopScope(
onWillPop: () async => false,
body: PopScope(
onPopInvoked: (didPop) {},
child: AlertDialog(
title: const Text('Connexion impossible'),
content: const Text('Impossible de récupérer un mot aléatoire. '
......
......@@ -18,8 +18,8 @@ class DialogGameOver extends StatelessWidget {
backgroundColor: Colors.transparent,
body: myProvider.searching == true
? const Center(child: CircularProgressIndicator())
: WillPopScope(
onWillPop: () async => false,
: PopScope(
onPopInvoked: (didPop) {},
child: AlertDialog(
title: Row(
children: [
......@@ -51,6 +51,7 @@ class DialogGameOver extends StatelessWidget {
onPressed: () async {
myProvider.resetSuccessAndErrors();
await const Game().pickWord(context, myProvider);
if (!context.mounted) return;
Navigator.of(context).pop();
},
),
......
......@@ -54,6 +54,7 @@ class LetterButtons extends StatelessWidget {
if (myProvider.errors == 8) {
await Future.delayed(const Duration(milliseconds: 900)); //????
myProvider.addDefeat();
if (!context.mounted) return;
showDialog(
context: context,
builder: (context) => const DialogGameOver(defeat),
......
name: hangman
description: Hangman game, have fun with words and letters!
publish_to: 'none'
version: 1.2.15+26
version: 1.2.16+27
environment:
sdk: '^3.0.0'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment