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, onPressed: _onColumnsPressed,
child: Text( child: Text(
localization.columns, localization.columns,
style: TextStyle(color: state.linkColor), style: TextStyle(
color: state.prefState.enableDarkMode
? Colors.white
: Colors.black),
), ),
) )
else else

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

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