From 88f55bd769efdd6a9f124c25b7686fbff0fd7b88 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 27 May 2020 09:54:10 +0300 Subject: [PATCH] Light theme --- lib/main_app.dart | 6 +++--- lib/redux/quote/quote_selectors.dart | 3 +++ lib/ui/app/app_border.dart | 5 +++-- lib/ui/app/view_scaffold.dart | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/main_app.dart b/lib/main_app.dart index 87afaff0d..615061cec 100644 --- a/lib/main_app.dart +++ b/lib/main_app.dart @@ -178,15 +178,15 @@ class InvoiceNinjaAppState extends State { indicatorColor: Colors.white, backgroundColor: const Color(0xFFE7EBEE), canvasColor: const Color(0xFFE7EBEE), + scaffoldBackgroundColor: const Color(0xFFE7EBEE), cardColor: Colors.white, bottomAppBarColor: Colors.white, tabBarTheme: TabBarTheme( labelColor: Colors.black, unselectedLabelColor: Colors.black.withOpacity(.65), ), - buttonTheme: ButtonThemeData( - textTheme: ButtonTextTheme.accent - ), + buttonTheme: + ButtonThemeData(textTheme: ButtonTextTheme.accent), appBarTheme: AppBarTheme( color: Colors.white, iconTheme: IconThemeData( diff --git a/lib/redux/quote/quote_selectors.dart b/lib/redux/quote/quote_selectors.dart index 34605952a..1fecd109e 100644 --- a/lib/redux/quote/quote_selectors.dart +++ b/lib/redux/quote/quote_selectors.dart @@ -75,8 +75,11 @@ EntityStats quoteStatsForClient( String clientId, BuiltMap quoteMap) { int countActive = 0; int countArchived = 0; + print('## CLIENT ID: $clientId'); quoteMap.forEach((quoteId, quote) { + print('## QUOTE ID: $quoteId, ${quote.number} ${quote.amount}'); if (quote.clientId == clientId) { + print('## MATCH'); if (quote.isActive) { countActive++; } else if (quote.isArchived) { diff --git a/lib/ui/app/app_border.dart b/lib/ui/app/app_border.dart index 2bc122982..089393c47 100644 --- a/lib/ui/app/app_border.dart +++ b/lib/ui/app/app_border.dart @@ -22,8 +22,9 @@ class AppBorder extends StatelessWidget { final state = store.state; final enableDarkMode = state.prefState.enableDarkMode; const borderWidth = 1.5; - final color = convertHexStringToColor( - enableDarkMode ? kDefaultDarkBorderColor : kDefaultLightBorderColor); + final color = enableDarkMode + ? convertHexStringToColor(kDefaultDarkBorderColor) + : Colors.white; return Container( decoration: BoxDecoration( diff --git a/lib/ui/app/view_scaffold.dart b/lib/ui/app/view_scaffold.dart index 34b9de002..8fd058d48 100644 --- a/lib/ui/app/view_scaffold.dart +++ b/lib/ui/app/view_scaffold.dart @@ -68,7 +68,7 @@ class ViewScaffold extends StatelessWidget { appBar: AppBar( leading: leading, automaticallyImplyLeading: isMobile(context) || isSettings, - title: FittedBox(child: Text(title)), + title: Text(title, maxLines: 2,), bottom: appBarBottom, actions: entity.isNew ? []