From 9c12a831764ff4b686e025803bae6506c3418e08 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 5 Dec 2024 14:55:10 +1100 Subject: [PATCH] Specify app bar color (#558) --- lib/api_form.dart | 1 + lib/app_colors.dart | 5 +++++ lib/barcode/camera_controller.dart | 1 + lib/barcode/wedge_controller.dart | 1 + lib/settings/about.dart | 1 + lib/settings/app_settings.dart | 1 + lib/settings/barcode_settings.dart | 7 ++++++- lib/settings/home_settings.dart | 2 ++ lib/settings/login.dart | 1 + lib/settings/part_settings.dart | 6 +++++- lib/settings/release.dart | 5 ++++- lib/settings/settings.dart | 1 + lib/widget/home.dart | 1 + lib/widget/refreshable_state.dart | 1 + 14 files changed, 31 insertions(+), 3 deletions(-) diff --git a/lib/api_form.dart b/lib/api_form.dart index 95222800..c22877d8 100644 --- a/lib/api_form.dart +++ b/lib/api_form.dart @@ -1498,6 +1498,7 @@ class _APIFormWidgetState extends State { return Scaffold( appBar: AppBar( title: Text(widget.title), + backgroundColor: COLOR_APP_BAR, actions: [ IconButton( icon: Icon(widget.icon), diff --git a/lib/app_colors.dart b/lib/app_colors.dart index b5d5eace..d9b0da95 100644 --- a/lib/app_colors.dart +++ b/lib/app_colors.dart @@ -27,6 +27,11 @@ Color get COLOR_ACTION { } } +// Return an "app bar" color based on the current theme +Color get COLOR_APP_BAR { + return Colors.blueGrey; +} + const Color COLOR_WARNING = Color.fromRGBO(250, 150, 50, 1); const Color COLOR_DANGER = Color.fromRGBO(200, 50, 75, 1); const Color COLOR_SUCCESS = Color.fromRGBO(100, 200, 75, 1); diff --git a/lib/barcode/camera_controller.dart b/lib/barcode/camera_controller.dart index 0e644d49..460aecb5 100644 --- a/lib/barcode/camera_controller.dart +++ b/lib/barcode/camera_controller.dart @@ -135,6 +135,7 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState { return Scaffold( appBar: AppBar( + backgroundColor: COLOR_APP_BAR, title: Text(L10().scanBarcode), actions: [ IconButton( diff --git a/lib/barcode/wedge_controller.dart b/lib/barcode/wedge_controller.dart index 741cec16..1c553e17 100644 --- a/lib/barcode/wedge_controller.dart +++ b/lib/barcode/wedge_controller.dart @@ -102,6 +102,7 @@ class _WedgeBarcodeControllerState extends InvenTreeBarcodeControllerState { return Scaffold( appBar: AppBar( + backgroundColor: COLOR_APP_BAR, title: Text(L10().scanBarcode), ), backgroundColor: Colors.black.withOpacity(0.9), diff --git a/lib/settings/about.dart b/lib/settings/about.dart index 7928eb25..6bbd68ec 100644 --- a/lib/settings/about.dart +++ b/lib/settings/about.dart @@ -225,6 +225,7 @@ class InvenTreeAboutWidget extends StatelessWidget { return Scaffold( appBar: AppBar( title: Text(L10().appAbout), + backgroundColor: COLOR_APP_BAR, ), body: ListView( children: ListTile.divideTiles( diff --git a/lib/settings/app_settings.dart b/lib/settings/app_settings.dart index f623f8f5..a2e82aad 100644 --- a/lib/settings/app_settings.dart +++ b/lib/settings/app_settings.dart @@ -157,6 +157,7 @@ class _InvenTreeAppSettingsState extends State { key: _settingsKey, appBar: AppBar( title: Text(L10().appSettings), + backgroundColor: COLOR_APP_BAR ), body: Container( child: ListView( diff --git a/lib/settings/barcode_settings.dart b/lib/settings/barcode_settings.dart index d8811246..08a7bf60 100644 --- a/lib/settings/barcode_settings.dart +++ b/lib/settings/barcode_settings.dart @@ -3,6 +3,8 @@ import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:inventree/l10.dart"; import "package:inventree/preferences.dart"; +import "package:inventree/app_colors.dart"; + import "package:inventree/widget/dialogs.dart"; @@ -110,7 +112,10 @@ class _InvenTreeBarcodeSettingsState extends State { key: _settingsKey, appBar: AppBar( title: Text(L10().homeScreen), + backgroundColor: COLOR_APP_BAR, ), body: Container( child: ListView( diff --git a/lib/settings/login.dart b/lib/settings/login.dart index b895a38d..d580b1d1 100644 --- a/lib/settings/login.dart +++ b/lib/settings/login.dart @@ -108,6 +108,7 @@ class _InvenTreeLoginState extends State { return Scaffold( appBar: AppBar( title: Text(L10().login), + backgroundColor: COLOR_APP_BAR, actions: [ IconButton( icon: Icon(TablerIcons.transition_right, color: COLOR_SUCCESS), diff --git a/lib/settings/part_settings.dart b/lib/settings/part_settings.dart index 11cba4b4..02952b68 100644 --- a/lib/settings/part_settings.dart +++ b/lib/settings/part_settings.dart @@ -3,6 +3,7 @@ import "package:flutter/material.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:inventree/l10.dart"; +import "package:inventree/app_colors.dart"; import "package:inventree/preferences.dart"; @@ -45,7 +46,10 @@ class _InvenTreePartSettingsState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar(title: Text(L10().partSettings)), + appBar: AppBar( + title: Text(L10().partSettings), + backgroundColor: COLOR_APP_BAR + ), body: Container( child: ListView( children: [ diff --git a/lib/settings/release.dart b/lib/settings/release.dart index 4358a47f..20e10b2f 100644 --- a/lib/settings/release.dart +++ b/lib/settings/release.dart @@ -1,5 +1,6 @@ import "package:flutter/material.dart"; import "package:flutter_markdown/flutter_markdown.dart"; +import "package:inventree/app_colors.dart"; import "package:url_launcher/url_launcher.dart"; import "package:inventree/l10.dart"; @@ -16,7 +17,8 @@ class ReleaseNotesWidget extends StatelessWidget { Widget build (BuildContext context) { return Scaffold( appBar: AppBar( - title: Text(L10().releaseNotes) + title: Text(L10().releaseNotes), + backgroundColor: COLOR_APP_BAR, ), body: Markdown( selectable: false, @@ -54,6 +56,7 @@ class CreditsWidget extends StatelessWidget { return Scaffold( appBar: AppBar( title: Text(L10().credits), + backgroundColor: COLOR_APP_BAR, ), body: Markdown( selectable: false, diff --git a/lib/settings/settings.dart b/lib/settings/settings.dart index 82267cef..715d9634 100644 --- a/lib/settings/settings.dart +++ b/lib/settings/settings.dart @@ -43,6 +43,7 @@ class _InvenTreeSettingsState extends State { key: _scaffoldKey, appBar: AppBar( title: Text(L10().settings), + backgroundColor: COLOR_APP_BAR, ), body: Center( child: ListView( diff --git a/lib/widget/home.dart b/lib/widget/home.dart index e68c35c3..ac1f44c4 100644 --- a/lib/widget/home.dart +++ b/lib/widget/home.dart @@ -397,6 +397,7 @@ class _InvenTreeHomePageState extends State with BaseWidgetPr key: homeKey, appBar: AppBar( title: Text(L10().appTitle), + backgroundColor: COLOR_APP_BAR, actions: [ IconButton( icon: Icon( diff --git a/lib/widget/refreshable_state.dart b/lib/widget/refreshable_state.dart index 8296b7e1..d18d07cb 100644 --- a/lib/widget/refreshable_state.dart +++ b/lib/widget/refreshable_state.dart @@ -60,6 +60,7 @@ mixin BaseWidgetProperties { centerTitle: false, bottom: tabs.isEmpty ? null : TabBar(tabs: tabs), title: Text(getAppBarTitle()), + backgroundColor: COLOR_APP_BAR, actions: appBarActions(context), leading: backButton(context, key), );