Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Correct the blue filter entity type selector on web

This commit is contained in:
Hillel Coren 2020-08-26 13:37:35 +03:00
parent 3049880432
commit bc9ba7807a
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ui/app/app_bottom_bar.dart
View File

@ -476,7 +476,10 @@ class _AppBottomBarState extends State<AppBottomBar> {
onPressed: _onColumnsPressed,
child: Text(
localization.columns,
style: TextStyle(color: state.linkColor),
style: TextStyle(
color: state.prefState.enableDarkMode
? Colors.white
: Colors.black),
),
)
else

34
lib/ui/app/main_screen.dart
View File

@ -664,6 +664,8 @@ class _EntityFilter extends StatelessWidget {
? state.accentColor
: Theme.of(context).cardColor;
print('enableDarkMode: ${state.prefState.enableDarkMode} + hasAccentColor: ${state.hasAccentColor}');
return Material(
color: backgroundColor,
child: AnimatedContainer(
@ -709,22 +711,22 @@ class _EntityFilter extends StatelessWidget {
),
actions: [
PopupMenuButton<EntityType>(
child: Row(
children: [
Text(
routeEntityType == filterEntityType
? localization.overview
: '${localization.lookup(routeEntityType.plural)}',
style: TextStyle(
fontSize: 17,
color: state.prefState.enableDarkMode ||
state.hasAccentColor
? Colors.white
: Theme.of(context).accentColor),
),
SizedBox(width: 4),
Icon(Icons.arrow_drop_down),
],
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8),
child: Row(
children: [
Text(
routeEntityType == filterEntityType
? localization.overview
: '${localization.lookup(routeEntityType.plural)}',
style: TextStyle(
fontSize: 17,
color: state.headerTextColor),
),
SizedBox(width: 4),
Icon(Icons.arrow_drop_down),
],
),
),
initialValue: routeEntityType,
onSelected: (EntityType value) {