From f15fad4f2a698055f0859cc62d7b44d995b2843e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Tue, 5 Nov 2024 13:00:39 +0100
Subject: [PATCH] Use activity buttons widgets from flutter_custom_toolbox
---
fastlane/metadata/android/en-US/changelogs/18.txt | 1 +
fastlane/metadata/android/fr-FR/changelogs/18.txt | 1 +
lib/common/ui/nav/global_app_bar.dart | 7 +------
pubspec.lock | 6 +++---
pubspec.yaml | 4 ++--
5 files changed, 8 insertions(+), 11 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/18.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/18.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/18.txt b/fastlane/metadata/android/en-US/changelogs/18.txt
new file mode 100644
index 0000000..e41f2c1
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/18.txt
@@ -0,0 +1 @@
+Use activity buttons widgets from flutter_custom_toolbox.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/18.txt b/fastlane/metadata/android/fr-FR/changelogs/18.txt
new file mode 100644
index 0000000..f58100d
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/18.txt
@@ -0,0 +1 @@
+Utilisation des boutons d'activité à partir du package flutter_custom_toolbox.
diff --git a/lib/common/ui/nav/global_app_bar.dart b/lib/common/ui/nav/global_app_bar.dart
index 2faa2c9..2ad2dcc 100644
--- a/lib/common/ui/nav/global_app_bar.dart
+++ b/lib/common/ui/nav/global_app_bar.dart
@@ -22,17 +22,12 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
final List<Widget> menuActions = [];
if (currentActivity.isRunning && !currentActivity.isFinished) {
- menuActions.add(StyledButton(
- color: Colors.red,
+ menuActions.add(ActivityButtonQuit(
onPressed: () {},
onLongPress: () {
BlocProvider.of<ActivityCubit>(context).quitActivity();
BlocProvider.of<NavCubitPage>(context).goToPageHome();
},
- child: const Image(
- image: AssetImage('assets/ui/button_back.png'),
- fit: BoxFit.fill,
- ),
));
} else {
if (pageIndex == Screen.indexActivity) {
diff --git a/pubspec.lock b/pubspec.lock
index 970aa36..1896dfc 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -122,11 +122,11 @@ packages:
dependency: "direct main"
description:
path: "."
- ref: "0.3.0"
- resolved-ref: b24e16ca0cf72bde23640c72020d5c9da2e00e62
+ ref: "0.4.0"
+ resolved-ref: eb9c090bd00d73324eab8737f74b3339cc24c9e8
url: "https://git.harrault.fr/android/flutter-toolbox.git"
source: git
- version: "0.3.0"
+ version: "0.4.0"
flutter_lints:
dependency: "direct dev"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index a37662c..a21a4fa 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: MIDI Synth
publish_to: "none"
-version: 0.3.1+17
+version: 0.3.2+18
environment:
sdk: "^3.0.0"
@@ -16,7 +16,7 @@ dependencies:
flutter_custom_toolbox:
git:
url: https://git.harrault.fr/android/flutter-toolbox.git
- ref: 0.3.0
+ ref: 0.4.0
# specific
# (none)
--
GitLab