diff --git a/lib/main.dart b/lib/main.dart index 8ee53bc7b..e29b13c37 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -61,12 +61,40 @@ class _InvoiceNinjaAppState extends State { const AppLocalizationsDelegate(), GlobalMaterialLocalizations.delegate, ], + // light theme + + theme: ThemeData().copyWith( + accentColor: Colors.lightBlueAccent, + primaryColor: const Color(0xFF117cc1), + primaryColorLight: const Color(0xFF5dabf4), + primaryColorDark: const Color(0xFF0D5D91), + indicatorColor: const Color(0xFFFFFFFF), + iconTheme: IconThemeData().copyWith(), + bottomAppBarColor: const Color(0xFF117cc1), + ), + + + //dark theme + /* + theme: ThemeData.dark().copyWith( + accentColor: Colors.lightBlueAccent, + primaryColor: const Color(0xFF117cc1), + primaryColorLight: const Color(0xFF5dabf4), + primaryColorDark: const Color(0xFF0D5D91), + indicatorColor: const Color(0xFFFFFFFF), + iconTheme: IconThemeData().copyWith(color: Colors.white), + bottomAppBarColor: const Color(0xFF117cc1), + ), + */ + + /* theme: ThemeData().copyWith( primaryColor: const Color(0xFF117cc1), primaryColorLight: const Color(0xFF5dabf4), primaryColorDark: const Color(0xFF0D5D91), indicatorColor: const Color(0xFFFFFFFF), ), + */ /* theme: ThemeData( brightness: Brightness.dark, diff --git a/lib/ui/app/actions_menu_button.dart b/lib/ui/app/actions_menu_button.dart index 557dc0214..af06d1c00 100644 --- a/lib/ui/app/actions_menu_button.dart +++ b/lib/ui/app/actions_menu_button.dart @@ -30,7 +30,7 @@ class ActionMenuButton extends StatelessWidget { value: EntityAction.restore, child: Row( children: [ - Icon(Icons.restore, color: Colors.grey[600]), + Icon(Icons.restore,), SizedBox(width: 15.0), Text(AppLocalization.of(context).restore), ], @@ -40,7 +40,7 @@ class ActionMenuButton extends StatelessWidget { value: EntityAction.archive, child: Row( children: [ - Icon(Icons.archive, color: Colors.grey[600]), + Icon(Icons.archive,), SizedBox(width: 15.0), Text(AppLocalization.of(context).archive), ], @@ -50,7 +50,7 @@ class ActionMenuButton extends StatelessWidget { value: EntityAction.delete, child: Row( children: [ - Icon(Icons.delete, color: Colors.grey[600]), + Icon(Icons.delete,), SizedBox(width: 15.0), Text(AppLocalization.of(context).delete), ], diff --git a/lib/ui/app/app_bottom_bar.dart b/lib/ui/app/app_bottom_bar.dart index a7d88967a..1ce311617 100644 --- a/lib/ui/app/app_bottom_bar.dart +++ b/lib/ui/app/app_bottom_bar.dart @@ -46,7 +46,7 @@ class _AppBottomBarState extends State { converter: (Store store) => store.state.getListState(widget.entityType).stateFilters, builder: (BuildContext context, stateFilters) { return Container( - color: Colors.grey[200], + color: Theme.of(context).backgroundColor, //Colors.grey[200], child: new Column(mainAxisSize: MainAxisSize.min, children: [ Column( children: EntityState.values.map((state) { @@ -101,7 +101,7 @@ class _AppBottomBarState extends State { converter: (Store store) => store.state.getListState(widget.entityType), builder: (BuildContext context, listUIState) { return Container( - color: Colors.grey[200], + color: Theme.of(context).backgroundColor, child: Column( mainAxisSize: MainAxisSize.min, children: widget.sortFields.map((sortField) { @@ -131,6 +131,7 @@ class _AppBottomBarState extends State { }; return new BottomAppBar( + color: Theme.of(context).bottomAppBarColor, hasNotch: true, child: Row( children: [ @@ -138,11 +139,13 @@ class _AppBottomBarState extends State { tooltip: AppLocalization.of(context).sort, icon: Icon(Icons.sort_by_alpha), onPressed: _showSortSheet, + color: Colors.white, ), IconButton( tooltip: AppLocalization.of(context).filter, icon: Icon(Icons.filter_list), onPressed: _showFilterSheet, + color: Colors.white, ), ], ), diff --git a/lib/ui/client/client_screen.dart b/lib/ui/client/client_screen.dart index 79b9bd2b3..13e4e7a96 100644 --- a/lib/ui/client/client_screen.dart +++ b/lib/ui/client/client_screen.dart @@ -63,7 +63,7 @@ class ClientScreen extends StatelessWidget { .of(context) .push(MaterialPageRoute(builder: (_) => ClientEditScreen())); }, - child: Icon(Icons.add), + child: Icon(Icons.add, color: Colors.white,), tooltip: localization.newClient, ), ); diff --git a/lib/ui/client/edit/client_edit_contacts.dart b/lib/ui/client/edit/client_edit_contacts.dart index d456aad1b..9eef8e44d 100644 --- a/lib/ui/client/edit/client_edit_contacts.dart +++ b/lib/ui/client/edit/client_edit_contacts.dart @@ -83,7 +83,6 @@ class ClientEditContactsState extends State child: RaisedButton( elevation: 4.0, color: Theme.of(context).primaryColor, - textColor: Theme.of(context).secondaryHeaderColor, child: Text(localization.addContact.toUpperCase()), onPressed: _onAddPressed, ), diff --git a/lib/ui/client/view/client_view.dart b/lib/ui/client/view/client_view.dart index 2837cd40f..9cde0ad41 100644 --- a/lib/ui/client/view/client_view.dart +++ b/lib/ui/client/view/client_view.dart @@ -98,7 +98,7 @@ class _ClientViewState extends State ]), ); }, - child: Icon(Icons.add), + child: Icon(Icons.add, color: Colors.white,), tooltip: localization.create, ), ); diff --git a/lib/ui/client/view/client_view_overview.dart b/lib/ui/client/view/client_view_overview.dart index f79535784..0954bc634 100644 --- a/lib/ui/client/view/client_view_overview.dart +++ b/lib/ui/client/view/client_view_overview.dart @@ -110,7 +110,6 @@ class ClientOverview extends StatelessWidget { height: 1.0, ), Container( - color: Colors.white, child: Material( type: MaterialType.transparency, child: ListTile( @@ -125,7 +124,6 @@ class ClientOverview extends StatelessWidget { height: 1.0, ), Container( - color: Colors.white, child: Material( type: MaterialType.transparency, child: ListTile( diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index 0ae877891..5c099886e 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -97,7 +97,7 @@ class DashboardRow extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text(this.title, - style: TextStyle(color: Colors.grey[700])), + style: TextStyle()), Text(this.isMoney ? "\$" + this.amount.toStringAsFixed(2) : this.amount.toString(), @@ -140,7 +140,7 @@ class DashboardColumn extends StatelessWidget { Center(child: ColorIcon(this.icon, this.color)), SizedBox(height: 18.0), Text(this.title, - style: TextStyle(color: Colors.grey[700])), + style: TextStyle()), Text(this.isMoney ? "\$" + this.amount.toStringAsFixed(2) : this.amount.toString(), diff --git a/lib/ui/invoice/invoice_screen.dart b/lib/ui/invoice/invoice_screen.dart index 1a98f50d7..0065161f0 100644 --- a/lib/ui/invoice/invoice_screen.dart +++ b/lib/ui/invoice/invoice_screen.dart @@ -60,7 +60,7 @@ class InvoiceScreen extends StatelessWidget { .of(context) .push(MaterialPageRoute(builder: (_) => InvoiceEditScreen())); }, - child: Icon(Icons.add), + child: Icon(Icons.add,color: Colors.white,), tooltip: localization.newInvoice, ), ); diff --git a/lib/ui/product/product_screen.dart b/lib/ui/product/product_screen.dart index b0a43100e..b14c5a2af 100644 --- a/lib/ui/product/product_screen.dart +++ b/lib/ui/product/product_screen.dart @@ -60,7 +60,7 @@ class ProductScreen extends StatelessWidget { .of(context) .push(MaterialPageRoute(builder: (_) => ProductEditScreen())); }, - child: Icon(Icons.add), + child: Icon(Icons.add,color: Colors.white,), tooltip: localization.newProduct, ), );