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

View File

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

View File

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

View File

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