Updating design

This commit is contained in:
Hillel Coren 2020-05-06 21:37:20 +03:00
parent 79f5a03aa8
commit c3b6fb656b
7 changed files with 44 additions and 12 deletions

View File

@ -360,9 +360,12 @@ const String kExpenseStatusInvoiced = '3';
const String kDefaultCurrencyId = '1'; const String kDefaultCurrencyId = '1';
const String kDefaultDateFormat = '5'; const String kDefaultDateFormat = '5';
const String kDefaultAccentColor = '#0091EA'; const String kDefaultAccentColor = '#0091EA';
const String kDefaultSelectedColorLight = '#1E252F'; const String kDefaultDarkSelectedColorMenu = '#1E252F';
const String kDefaultSelectedColorDark = '#253750'; const String kDefaultDarkSelectedColor = '#253750';
const String kDefaultBorderColor = '#393A3C'; const String kDefaultDarkBorderColor = '#393A3C';
const String kDefaultLightSelectedColorMenu = '#DDDDDD';
const String kDefaultLightSelectedColor = '#EEEEEE';
const String kDefaultLightBorderColor = '#C6C5C3';
const String kReportGroupDay = 'day'; const String kReportGroupDay = 'day';
const String kReportGroupMonth = 'month'; const String kReportGroupMonth = 'month';

View File

@ -1,6 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/colors.dart';
import 'package:invoiceninja_flutter/constants.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 { class AppBorder extends StatelessWidget {
const AppBorder({ const AppBorder({
@ -15,7 +18,12 @@ class AppBorder extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final Store<AppState> store = StoreProvider.of<AppState>(context);
final state = store.state;
final enableDarkMode = state.prefState.enableDarkMode;
const borderWidth = 1.5; const borderWidth = 1.5;
final color = convertHexStringToColor(
enableDarkMode ? kDefaultDarkBorderColor : kDefaultLightBorderColor);
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
@ -24,7 +32,7 @@ class AppBorder extends StatelessWidget {
top: isTop top: isTop
? BorderSide( ? BorderSide(
width: borderWidth, width: borderWidth,
color: convertHexStringToColor(kDefaultBorderColor), color: color,
) )
: BorderSide.none, : BorderSide.none,
/* /*
@ -44,13 +52,13 @@ class AppBorder extends StatelessWidget {
left: isLeft left: isLeft
? BorderSide( ? BorderSide(
width: borderWidth, width: borderWidth,
color: convertHexStringToColor(kDefaultBorderColor), color: color,
) )
: BorderSide.none, : BorderSide.none,
) )
: Border.all( : Border.all(
width: borderWidth, width: borderWidth,
color: convertHexStringToColor(kDefaultBorderColor), color: color,
), ),
), ),
child: child); child: child);

View File

@ -64,8 +64,8 @@ class _ListFilterState extends State<ListFilter> {
decoration: BoxDecoration( decoration: BoxDecoration(
color: isFilterSet color: isFilterSet
? convertHexStringToColor( ? convertHexStringToColor(
kDefaultBorderColor) // TODO set color here kDefaultDarkBorderColor) // TODO set color here
: convertHexStringToColor(kDefaultBorderColor), : convertHexStringToColor(kDefaultDarkBorderColor),
borderRadius: BorderRadius.all(Radius.circular(5)), borderRadius: BorderRadius.all(Radius.circular(5)),
), ),
child: TextField( child: TextField(

View File

@ -1,12 +1,21 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/utils/colors.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 { class ListDivider extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final Store<AppState> store = StoreProvider.of<AppState>(context);
final state = store.state;
final enableDarkMode = state.prefState.enableDarkMode;
final color = convertHexStringToColor(
enableDarkMode ? kDefaultDarkBorderColor : kDefaultLightBorderColor);
return Divider( return Divider(
color: convertHexStringToColor(kDefaultBorderColor), color: color,
thickness: 1.5, thickness: 1.5,
height: 1.5, height: 1.5,
); );

View File

@ -1,5 +1,8 @@
import 'package:redux/redux.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/colors.dart';
class SelectedIndicator extends StatelessWidget { class SelectedIndicator extends StatelessWidget {
@ -10,9 +13,15 @@ class SelectedIndicator extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final Store<AppState> store = StoreProvider.of<AppState>(context);
final state = store.state;
final enableDarkMode = state.prefState.enableDarkMode;
return Container( return Container(
color: isSelected color: isSelected
? convertHexStringToColor(kDefaultSelectedColorDark) ? convertHexStringToColor(enableDarkMode
? kDefaultDarkSelectedColor
: kDefaultLightSelectedColor)
: null, : null,
child: child, child: child,
); );

View File

@ -378,6 +378,7 @@ class _DrawerTileState extends State<DrawerTile> {
} }
} }
final enableDarkMode = state.prefState.enableDarkMode;
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final route = widget.title == localization.dashboard final route = widget.title == localization.dashboard
? kDashboard ? kDashboard
@ -429,7 +430,9 @@ class _DrawerTileState extends State<DrawerTile> {
Widget child = Container( Widget child = Container(
color: isSelected color: isSelected
? convertHexStringToColor(kDefaultSelectedColorLight) ? convertHexStringToColor(enableDarkMode
? kDefaultDarkSelectedColorMenu
: kDefaultLightSelectedColorMenu)
: null, : null,
child: ListTile( child: ListTile(
dense: true, dense: true,

View File

@ -135,7 +135,7 @@ class _EntityListState extends State<EntityList> {
child: ListView.separated( child: ListView.separated(
shrinkWrap: true, shrinkWrap: true,
separatorBuilder: (context, index) => Divider( separatorBuilder: (context, index) => Divider(
color: convertHexStringToColor(kDefaultBorderColor), color: convertHexStringToColor(kDefaultDarkBorderColor),
height: 1.5, height: 1.5,
thickness: 1.5, thickness: 1.5,
), ),