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

Correct ink splashes

This commit is contained in:
Hillel Coren 2020-06-30 18:11:15 +03:00
parent b550eb751e
commit d299dc99cd
1 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
lib/ui/app/menu_drawer.dart
View File

@ -449,56 +449,52 @@ class _DrawerTileState extends State<DrawerTile> {
} }
Widget child = Material( Widget child = Material(
color: Colors.transparent, color: isSelected
child: Container( ? convertHexStringToColor(enableDarkMode
color: isSelected ? kDefaultDarkSelectedColorMenu
? convertHexStringToColor(enableDarkMode : kDefaultLightSelectedColorMenu)
? kDefaultDarkSelectedColorMenu : Colors.transparent,
: kDefaultLightSelectedColorMenu) child: ListTile(
: Colors.transparent, dense: true,
child: ListTile( leading: Padding(
dense: true, padding: const EdgeInsets.only(left: 4),
leading: Padding( child: Icon(
padding: const EdgeInsets.only(left: 4), widget.icon,
child: Icon( size: 20,
widget.icon, color: textColor,
size: 20,
color: textColor,
),
), ),
title: Text(
widget.title,
style: Theme.of(context).textTheme.bodyText1.copyWith(
fontWeight: FontWeight.w100,
fontSize: 16,
color: textColor,
),
overflow: TextOverflow.clip,
maxLines: 1,
),
onTap: () {
if (widget.entityType != null) {
viewEntitiesByType(
context: context, entityType: widget.entityType);
} else {
widget.onTap();
}
},
onLongPress: () => widget.onLongPress != null
? widget.onLongPress()
: widget.entityType != null
? createEntityByType(
context: context, entityType: widget.entityType)
: null,
/*
trailing: _isHovered ||
!RendererBinding.instance.mouseTracker.mouseIsConnected
? trailingWidget
: null,
*/
trailing: state.isMenuCollapsed ? null : trailingWidget,
), ),
title: Text(
widget.title,
style: Theme.of(context).textTheme.bodyText1.copyWith(
fontWeight: FontWeight.w100,
fontSize: 16,
color: textColor,
),
overflow: TextOverflow.clip,
maxLines: 1,
),
onTap: () {
if (widget.entityType != null) {
viewEntitiesByType(context: context, entityType: widget.entityType);
} else {
widget.onTap();
}
},
onLongPress: () => widget.onLongPress != null
? widget.onLongPress()
: widget.entityType != null
? createEntityByType(
context: context, entityType: widget.entityType)
: null,
/*
trailing: _isHovered ||
!RendererBinding.instance.mouseTracker.mouseIsConnected
? trailingWidget
: null,
*/
trailing: state.isMenuCollapsed ? null : trailingWidget,
), ),
); );
@ -525,7 +521,7 @@ class SidebarFooter extends StatelessWidget {
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final account = state.userCompany.account; final account = state.userCompany.account;
return Container( return Material(
color: Theme.of(context).bottomAppBarColor, color: Theme.of(context).bottomAppBarColor,
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,