From f6a06828a7347cd029196dab38ff5faa8e6fa7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr> Date: Mon, 14 Feb 2022 21:19:09 +0100 Subject: [PATCH] Add a toast on shot tap on back to menu button --- android/gradle.properties | 4 ++-- .../metadata/android/en-US/changelogs/52.txt | 1 + .../metadata/android/fr-FR/changelogs/52.txt | 1 + lib/main.dart | 21 +++++++++++-------- lib/screens/home.dart | 2 ++ pubspec.lock | 7 +++++++ pubspec.yaml | 1 + 7 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/52.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/52.txt diff --git a/android/gradle.properties b/android/gradle.properties index 5ce6d26..2bfb268 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=0.1.2 -app.versionCode=51 +app.versionName=0.1.3 +app.versionCode=52 diff --git a/fastlane/metadata/android/en-US/changelogs/52.txt b/fastlane/metadata/android/en-US/changelogs/52.txt new file mode 100644 index 0000000..ac60274 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/52.txt @@ -0,0 +1 @@ +Add a message on short tap on back to menu button diff --git a/fastlane/metadata/android/fr-FR/changelogs/52.txt b/fastlane/metadata/android/fr-FR/changelogs/52.txt new file mode 100644 index 0000000..cf96159 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/52.txt @@ -0,0 +1 @@ +Ajout d'un message en cas de tap court sur le bouton de retour au menu diff --git a/lib/main.dart b/lib/main.dart index dd1afff..7f44866 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; +import 'package:overlay_support/overlay_support.dart'; import 'provider/data.dart'; import 'screens/home.dart'; @@ -17,16 +18,18 @@ class MyApp extends StatelessWidget { return ChangeNotifierProvider( create: (BuildContext context) => Data(), child: Consumer<Data>(builder: (context, data, child) { - return MaterialApp( - debugShowCheckedModeBanner: false, - theme: ThemeData( - primaryColor: Colors.blue, - visualDensity: VisualDensity.adaptivePlatformDensity, + return OverlaySupport( + child: MaterialApp( + debugShowCheckedModeBanner: false, + theme: ThemeData( + primaryColor: Colors.blue, + visualDensity: VisualDensity.adaptivePlatformDensity, + ), + home: Home(), + routes: { + Home.id: (context) => Home(), + }, ), - home: Home(), - routes: { - Home.id: (context) => Home(), - }, ); }), ); diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 7e8e6d4..c70e537 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:badges/badges.dart'; +import 'package:overlay_support/overlay_support.dart'; import '../layout/game.dart'; import '../layout/parameters.dart'; @@ -91,6 +92,7 @@ class _HomeState extends State<Home> { fit: BoxFit.fill ), ), + onPressed: () => toast('Long press to quit game...'), onLongPress: () => GameUtils.resetGame(myProvider), ), Spacer(flex: 6), diff --git a/pubspec.lock b/pubspec.lock index e2c094c..23c91b0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -121,6 +121,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" + overlay_support: + dependency: "direct main" + description: + name: overlay_support + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.1" path: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index a0cb54c..3a730a8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,6 +12,7 @@ dependencies: provider: ^6.0.2 badges: ^2.0.1 shared_preferences: ^2.0.6 + overlay_support: ^1.0.0 dev_dependencies: flutter_test: -- GitLab