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

Updating design

This commit is contained in:
Hillel Coren 2020-05-04 15:40:58 +03:00
parent 1229bcfc09
commit d27efaf916
3 changed files with 141 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/constants.dart
View File

@ -350,6 +350,7 @@ const String kDefaultCurrencyId = '1';
const String kDefaultDateFormat = '5'; const String kDefaultDateFormat = '5';
const String kDefaultAccentColor = '#0091EA'; const String kDefaultAccentColor = '#0091EA';
const String kDefaultSelectedColor = '#1E252F'; const String kDefaultSelectedColor = '#1E252F';
const String kDefaultBorderColor = '#393A3C';
const String kReportGroupDay = 'day'; const String kReportGroupDay = 'day';
const String kReportGroupMonth = 'month'; const String kReportGroupMonth = 'month';

1
lib/main.dart
View File

@ -292,6 +292,7 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
//canvasColor: const Color(0xFF1B1C1E), //canvasColor: const Color(0xFF1B1C1E),
canvasColor: Colors.black, canvasColor: Colors.black,
cardColor: const Color(0xFF1B1C1E), cardColor: const Color(0xFF1B1C1E),
bottomAppBarColor: const Color(0xFF1B1C1E),
) )
: ThemeData(fontFamily: fontFamily).copyWith( : ThemeData(fontFamily: fontFamily).copyWith(
pageTransitionsTheme: pageTransitionsTheme, pageTransitionsTheme: pageTransitionsTheme,

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

@ -200,6 +200,13 @@ class MenuDrawer extends StatelessWidget {
width: state.prefState.isMenuCollapsed ? 65 : kDrawerWidth, width: state.prefState.isMenuCollapsed ? 65 : kDrawerWidth,
child: Drawer( child: Drawer(
child: SafeArea( child: SafeArea(
child: Container(
decoration: BoxDecoration(
border: Border.all(
width: 1,
color: convertHexStringToColor(kDefaultBorderColor),
),
),
child: Column( child: Column(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
@ -209,7 +216,9 @@ class MenuDrawer extends StatelessWidget {
: Container( : Container(
padding: padding:
EdgeInsets.symmetric(horizontal: 14, vertical: 3), EdgeInsets.symmetric(horizontal: 14, vertical: 3),
color: enableDarkMode ? Colors.white10 : Theme.of(context).cardColor, color: enableDarkMode
? Colors.white10
: Theme.of(context).cardColor,
child: state.prefState.isMenuCollapsed child: state.prefState.isMenuCollapsed
? _collapsedCompanySelector ? _collapsedCompanySelector
: _expandedCompanySelector), : _expandedCompanySelector),
@ -225,10 +234,11 @@ class MenuDrawer extends StatelessWidget {
company: company, company: company,
icon: getEntityIcon(EntityType.dashboard), icon: getEntityIcon(EntityType.dashboard),
title: localization.dashboard, title: localization.dashboard,
onTap: () => store.dispatch( onTap: () => store.dispatch(ViewDashboard(
ViewDashboard(navigator: Navigator.of(context))), navigator: Navigator.of(context))),
onLongPress: () => store.dispatch(ViewDashboard( onLongPress: () => store.dispatch(ViewDashboard(
navigator: Navigator.of(context), filter: '')), navigator: Navigator.of(context),
filter: '')),
), ),
DrawerTile( DrawerTile(
company: company, company: company,
@ -296,8 +306,8 @@ class MenuDrawer extends StatelessWidget {
icon: getEntityIcon(EntityType.reports), icon: getEntityIcon(EntityType.reports),
title: localization.reports, title: localization.reports,
onTap: () { onTap: () {
store.dispatch( store.dispatch(ViewReports(
ViewReports(navigator: Navigator.of(context))); navigator: Navigator.of(context)));
}, },
), ),
DrawerTile( DrawerTile(
@ -313,7 +323,16 @@ class MenuDrawer extends StatelessWidget {
], ],
), ),
)), )),
Align( Container(
decoration: BoxDecoration(
color: Theme.of(context).bottomAppBarColor,
border: Border(
top: BorderSide(
width: 1,
color: convertHexStringToColor(kDefaultBorderColor),
)),
),
child: Align(
child: state.prefState.isMenuCollapsed child: state.prefState.isMenuCollapsed
? SidebarFooterCollapsed( ? SidebarFooterCollapsed(
isUpdateAvailable: state.account.isUpdateAvailable, isUpdateAvailable: state.account.isUpdateAvailable,
@ -321,10 +340,12 @@ class MenuDrawer extends StatelessWidget {
: SidebarFooter(), : SidebarFooter(),
alignment: Alignment(0, 1), alignment: Alignment(0, 1),
), ),
),
], ],
), ),
), ),
), ),
),
); );
} }
} }