From 652bc4f117b21c4f206a71dd7d788e0a9b2514c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Sun, 15 Dec 2024 18:23:52 +0100
Subject: [PATCH] Fix top bar buttons color
---
CHANGELOG.md | 4 ++++
lib/nav/application_navigation_definition.dart | 12 ++++++++++++
lib/nav/ui/global_app_bar.dart | 7 +------
pubspec.yaml | 2 +-
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ecfe23..9d69ee0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.1
+
+- Fix top bar buttons color
+
## 0.6.0
- Add application navigation widgets
diff --git a/lib/nav/application_navigation_definition.dart b/lib/nav/application_navigation_definition.dart
index 5e5809e..9f021ae 100644
--- a/lib/nav/application_navigation_definition.dart
+++ b/lib/nav/application_navigation_definition.dart
@@ -75,6 +75,18 @@ class AppBarButton {
this.onPressed,
this.onLongPress,
});
+
+ Widget render(BuildContext context) {
+ return ElevatedButton(
+ onPressed: () => onPressed!(context),
+ onLongPress: () => onLongPress!(context),
+ style: ElevatedButton.styleFrom(
+ shape: const CircleBorder(),
+ iconColor: Theme.of(context).colorScheme.onSurface,
+ ),
+ child: icon,
+ );
+ }
}
/// Navigation configuration for application
diff --git a/lib/nav/ui/global_app_bar.dart b/lib/nav/ui/global_app_bar.dart
index 86d42a4..7aaab29 100644
--- a/lib/nav/ui/global_app_bar.dart
+++ b/lib/nav/ui/global_app_bar.dart
@@ -71,12 +71,7 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
// add buttons
final List<AppBarButton> buttons = builder(context);
for (AppBarButton button in buttons) {
- menuActions.add(ElevatedButton(
- onPressed: () => button.onPressed!(context),
- onLongPress: () => button.onLongPress!(context),
- style: ElevatedButton.styleFrom(shape: const CircleBorder()),
- child: button.icon,
- ));
+ menuActions.add(button.render(context));
}
// standard right pushed "quit activity" button
diff --git a/pubspec.yaml b/pubspec.yaml
index 883ba0b..2bff66d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: "Flutter custom toolbox for org.benoitharrault.* projects."
publish_to: "none"
-version: 0.6.0
+version: 0.6.1
homepage: https://git.harrault.fr/android/flutter-toolbox
--
GitLab