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

Adjust menu navigation

This commit is contained in:
Hillel Coren 2022-05-23 11:53:01 +03:00
parent 349d071c2b
commit 71c08d7cb5
3 changed files with 101 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/constants.dart
View File

@ -104,7 +104,8 @@ const kProductPlans = [
const double kMobileLayoutWidth = 700;
const double kMobileDialogPadding = 12;
const double kDrawerWidth = 272;
const double kDrawerWidthMobile = 272;
const double kDrawerWidthDesktop = 220;
const double kTableColumnGap = 16;
const double kTopBottomBarHeight = 50;
const double kDialogWidth = 400;

2
lib/ui/app/history_drawer.dart
View File

@ -49,7 +49,7 @@ class HistoryDrawer extends StatelessWidget {
}
return SizedBox(
width: kDrawerWidth,
width: kDrawerWidthMobile,
child: Drawer(
child: Scaffold(
appBar: AppBar(

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

@ -255,7 +255,11 @@ class MenuDrawer extends StatelessWidget {
return FocusTraversalGroup(
child: Container(
width: state.isMenuCollapsed ? 65 : kDrawerWidth,
width: state.isMenuCollapsed
? 65
: isDesktop(context)
? kDrawerWidthDesktop
: kDrawerWidthMobile,
child: Drawer(
child: SafeArea(
child: Column(
@ -565,7 +569,7 @@ class DrawerTile extends StatefulWidget {
}
class _DrawerTileState extends State<DrawerTile> {
//bool _isHovered = false;
bool _isHovered = false;
@override
Widget build(BuildContext context) {
@ -643,43 +647,76 @@ class _DrawerTileState extends State<DrawerTile> {
}
}
Widget trailingWidget;
if (!state.isMenuCollapsed) {
if (widget.title == localization.dashboard) {
trailingWidget = IconButton(
icon: Icon(
Icons.search,
color: textColor,
),
onPressed: () {
if (isMobile(context)) {
navigator.pop();
}
store.dispatch(ViewDashboard(
filter: uiState.mainRoute == 'dashboard' && uiState.filter == ''
? null
: ''));
},
final onTap = () {
if (widget.entityType != null) {
viewEntitiesByType(
entityType: widget.entityType,
);
} else if (userCompany.canCreate(widget.entityType)) {
trailingWidget = IconButton(
tooltip: prefState.enableTooltips ? widget.iconTooltip : null,
icon: Icon(
Icons.add_circle_outline,
color: textColor,
),
onPressed: () {
if (isMobile(context)) {
navigator.pop();
}
createEntityByType(
context: context,
entityType: widget.entityType,
applyFilter: false,
);
},
} else {
widget.onTap();
}
};
final onLongPress = () {
if (widget.onLongPress != null) {
widget.onLongPress();
} else if (widget.entityType != null) {
createEntityByType(
context: context,
entityType: widget.entityType,
applyFilter: false,
);
}
};
if (state.isMenuCollapsed) {
return InkWell(
onTap: onTap,
onLongPress: onLongPress,
child: SizedBox(
height: 40,
child: Icon(
widget.icon,
color: textColor,
),
));
}
Widget iconWidget;
if (widget.title == localization.dashboard) {
iconWidget = IconButton(
icon: Icon(
Icons.search,
color: textColor,
),
onPressed: () {
if (isMobile(context)) {
navigator.pop();
}
store.dispatch(ViewDashboard(
filter: uiState.mainRoute == 'dashboard' && uiState.filter == ''
? null
: ''));
},
);
} else if (userCompany.canCreate(widget.entityType)) {
iconWidget = IconButton(
tooltip: prefState.enableTooltips ? widget.iconTooltip : null,
icon: Icon(
Icons.add_circle_outline,
color: textColor,
),
onPressed: () {
if (isMobile(context)) {
navigator.pop();
}
createEntityByType(
context: context,
entityType: widget.entityType,
applyFilter: false,
);
},
);
}
bool isLoading = false;
@ -695,56 +732,30 @@ class _DrawerTileState extends State<DrawerTile> {
opacity: isSelected ? 1 : .8,
child: ListTile(
dense: true,
leading: Padding(
padding: const EdgeInsets.only(left: 4),
child: isLoading
? SizedBox(
child: CircularProgressIndicator(),
width: 22,
height: 22,
)
: Icon(
widget.icon,
size: 22,
color: textColor,
),
),
title: state.isMenuCollapsed
? SizedBox()
: Text(
widget.title,
key: ValueKey('menu_${widget.title}'),
style: Theme.of(context).textTheme.bodyText1.copyWith(
fontSize: 14,
color: textColor,
),
),
onTap: () {
if (widget.entityType != null) {
viewEntitiesByType(
entityType: widget.entityType,
);
} else {
widget.onTap();
}
},
onLongPress: () => widget.onLongPress != null
? widget.onLongPress()
: widget.entityType != null
? createEntityByType(
context: context,
entityType: widget.entityType,
applyFilter: false,
leading: _isHovered && isDesktop(context) && iconWidget != null
? iconWidget
: isLoading
? SizedBox(
child: CircularProgressIndicator(),
width: 22,
height: 22,
)
: null,
/*
trailing: _isHovered ||
!RendererBinding.instance.mouseTracker.mouseIsConnected
? trailingWidget
: null,
*/
trailing: state.isMenuCollapsed ? null : trailingWidget,
: IconButton(
icon: Icon(widget.icon),
color: textColor,
onPressed: onTap,
),
title: Text(
widget.title,
key: ValueKey('menu_${widget.title}'),
style: Theme.of(context).textTheme.bodyText1.copyWith(
fontSize: 14,
color: textColor,
),
),
onTap: onTap,
onLongPress: onLongPress,
trailing: isMobile(context) ? iconWidget : null,
),
),
);
@ -757,8 +768,8 @@ class _DrawerTileState extends State<DrawerTile> {
}
return MouseRegion(
//onEnter: (event) => setState(() => _isHovered = true),
//onExit: (event) => setState(() => _isHovered = false),
onEnter: (event) => setState(() => _isHovered = true),
onExit: (event) => setState(() => _isHovered = false),
child: child,
);
}