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

Remove code deprecations

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