From c3b6fb656bc53411fb3f2962d346ede005717f07 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 6 May 2020 21:37:20 +0300 Subject: [PATCH] Updating design --- lib/constants.dart | 9 ++++++--- lib/ui/app/app_border.dart | 14 +++++++++++--- lib/ui/app/list_filter.dart | 4 ++-- lib/ui/app/lists/list_divider.dart | 11 ++++++++++- lib/ui/app/lists/selected_indicator.dart | 11 ++++++++++- lib/ui/app/menu_drawer.dart | 5 ++++- lib/ui/app/tables/entity_list.dart | 2 +- 7 files changed, 44 insertions(+), 12 deletions(-) diff --git a/lib/constants.dart b/lib/constants.dart index 75a943064..ad9fe6740 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -360,9 +360,12 @@ const String kExpenseStatusInvoiced = '3'; const String kDefaultCurrencyId = '1'; const String kDefaultDateFormat = '5'; const String kDefaultAccentColor = '#0091EA'; -const String kDefaultSelectedColorLight = '#1E252F'; -const String kDefaultSelectedColorDark = '#253750'; -const String kDefaultBorderColor = '#393A3C'; +const String kDefaultDarkSelectedColorMenu = '#1E252F'; +const String kDefaultDarkSelectedColor = '#253750'; +const String kDefaultDarkBorderColor = '#393A3C'; +const String kDefaultLightSelectedColorMenu = '#DDDDDD'; +const String kDefaultLightSelectedColor = '#EEEEEE'; +const String kDefaultLightBorderColor = '#C6C5C3'; const String kReportGroupDay = 'day'; const String kReportGroupMonth = 'month'; diff --git a/lib/ui/app/app_border.dart b/lib/ui/app/app_border.dart index 6a1e709fd..037d045ed 100644 --- a/lib/ui/app/app_border.dart +++ b/lib/ui/app/app_border.dart @@ -1,6 +1,9 @@ import 'package:flutter/material.dart'; import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/constants.dart'; +import 'package:redux/redux.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class AppBorder extends StatelessWidget { const AppBorder({ @@ -15,7 +18,12 @@ class AppBorder extends StatelessWidget { @override Widget build(BuildContext context) { + final Store store = StoreProvider.of(context); + final state = store.state; + final enableDarkMode = state.prefState.enableDarkMode; const borderWidth = 1.5; + final color = convertHexStringToColor( + enableDarkMode ? kDefaultDarkBorderColor : kDefaultLightBorderColor); return Container( decoration: BoxDecoration( @@ -24,7 +32,7 @@ class AppBorder extends StatelessWidget { top: isTop ? BorderSide( width: borderWidth, - color: convertHexStringToColor(kDefaultBorderColor), + color: color, ) : BorderSide.none, /* @@ -44,13 +52,13 @@ class AppBorder extends StatelessWidget { left: isLeft ? BorderSide( width: borderWidth, - color: convertHexStringToColor(kDefaultBorderColor), + color: color, ) : BorderSide.none, ) : Border.all( width: borderWidth, - color: convertHexStringToColor(kDefaultBorderColor), + color: color, ), ), child: child); diff --git a/lib/ui/app/list_filter.dart b/lib/ui/app/list_filter.dart index 8cce1270f..819d0c186 100644 --- a/lib/ui/app/list_filter.dart +++ b/lib/ui/app/list_filter.dart @@ -64,8 +64,8 @@ class _ListFilterState extends State { decoration: BoxDecoration( color: isFilterSet ? convertHexStringToColor( - kDefaultBorderColor) // TODO set color here - : convertHexStringToColor(kDefaultBorderColor), + kDefaultDarkBorderColor) // TODO set color here + : convertHexStringToColor(kDefaultDarkBorderColor), borderRadius: BorderRadius.all(Radius.circular(5)), ), child: TextField( diff --git a/lib/ui/app/lists/list_divider.dart b/lib/ui/app/lists/list_divider.dart index abbb0b091..5c53ea879 100644 --- a/lib/ui/app/lists/list_divider.dart +++ b/lib/ui/app/lists/list_divider.dart @@ -1,12 +1,21 @@ import 'package:flutter/material.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/utils/colors.dart'; +import 'package:redux/redux.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ListDivider extends StatelessWidget { @override Widget build(BuildContext context) { + final Store store = StoreProvider.of(context); + final state = store.state; + final enableDarkMode = state.prefState.enableDarkMode; + final color = convertHexStringToColor( + enableDarkMode ? kDefaultDarkBorderColor : kDefaultLightBorderColor); + return Divider( - color: convertHexStringToColor(kDefaultBorderColor), + color: color, thickness: 1.5, height: 1.5, ); diff --git a/lib/ui/app/lists/selected_indicator.dart b/lib/ui/app/lists/selected_indicator.dart index 1d9b4b0b6..3e5d000a5 100644 --- a/lib/ui/app/lists/selected_indicator.dart +++ b/lib/ui/app/lists/selected_indicator.dart @@ -1,5 +1,8 @@ +import 'package:redux/redux.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_redux/flutter_redux.dart'; import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/colors.dart'; class SelectedIndicator extends StatelessWidget { @@ -10,9 +13,15 @@ class SelectedIndicator extends StatelessWidget { @override Widget build(BuildContext context) { + final Store store = StoreProvider.of(context); + final state = store.state; + final enableDarkMode = state.prefState.enableDarkMode; + return Container( color: isSelected - ? convertHexStringToColor(kDefaultSelectedColorDark) + ? convertHexStringToColor(enableDarkMode + ? kDefaultDarkSelectedColor + : kDefaultLightSelectedColor) : null, child: child, ); diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart index 91d405ee8..080957152 100644 --- a/lib/ui/app/menu_drawer.dart +++ b/lib/ui/app/menu_drawer.dart @@ -378,6 +378,7 @@ class _DrawerTileState extends State { } } + final enableDarkMode = state.prefState.enableDarkMode; final localization = AppLocalization.of(context); final route = widget.title == localization.dashboard ? kDashboard @@ -429,7 +430,9 @@ class _DrawerTileState extends State { Widget child = Container( color: isSelected - ? convertHexStringToColor(kDefaultSelectedColorLight) + ? convertHexStringToColor(enableDarkMode + ? kDefaultDarkSelectedColorMenu + : kDefaultLightSelectedColorMenu) : null, child: ListTile( dense: true, diff --git a/lib/ui/app/tables/entity_list.dart b/lib/ui/app/tables/entity_list.dart index 4712f0e90..4496fdf3c 100644 --- a/lib/ui/app/tables/entity_list.dart +++ b/lib/ui/app/tables/entity_list.dart @@ -135,7 +135,7 @@ class _EntityListState extends State { child: ListView.separated( shrinkWrap: true, separatorBuilder: (context, index) => Divider( - color: convertHexStringToColor(kDefaultBorderColor), + color: convertHexStringToColor(kDefaultDarkBorderColor), height: 1.5, thickness: 1.5, ),