From ededf1821a96d2e26c1fbb40a862976c763ec87b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 2 Jun 2022 16:42:42 +0300 Subject: [PATCH] Adjust app borders --- lib/ui/app/app_border.dart | 8 ++++++++ lib/ui/client/view/client_view.dart | 1 + lib/ui/vendor/view/vendor_view.dart | 9 +++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/ui/app/app_border.dart b/lib/ui/app/app_border.dart index deb883d43..f4f6bee36 100644 --- a/lib/ui/app/app_border.dart +++ b/lib/ui/app/app_border.dart @@ -15,12 +15,14 @@ class AppBorder extends StatelessWidget { const AppBorder({ @required this.child, this.isTop, + this.isBottom, this.isLeft, this.hideBorder = false, }); final Widget child; final bool isTop; + final bool isBottom; final bool isLeft; final bool hideBorder; @@ -56,6 +58,12 @@ class AppBorder extends StatelessWidget { color: color, ) : BorderSide.none, + bottom: isBottom == true + ? BorderSide( + width: borderWidth, + color: color, + ) + : BorderSide.none, left: isLeft == true ? BorderSide( width: borderWidth, diff --git a/lib/ui/client/view/client_view.dart b/lib/ui/client/view/client_view.dart index 859bab0ea..a62a7cbf5 100644 --- a/lib/ui/client/view/client_view.dart +++ b/lib/ui/client/view/client_view.dart @@ -102,6 +102,7 @@ class _ClientViewState extends State Expanded( child: AppBorder( isTop: true, + isBottom: true, child: ClientViewFullwidth( viewModel: viewModel, ), diff --git a/lib/ui/vendor/view/vendor_view.dart b/lib/ui/vendor/view/vendor_view.dart index 0cfad1914..cccd704e6 100644 --- a/lib/ui/vendor/view/vendor_view.dart +++ b/lib/ui/vendor/view/vendor_view.dart @@ -8,6 +8,7 @@ import 'package:flutter_redux/flutter_redux.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/app_border.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/bottom_buttons.dart'; import 'package:invoiceninja_flutter/ui/app/entity_top_filter.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; @@ -92,8 +93,12 @@ class _VendorViewState extends State children: [ EntityTopFilterHeader(), Expanded( - child: VendorViewFullwidth( - viewModel: viewModel, + child: AppBorder( + isTop: true, + isBottom: true, + child: VendorViewFullwidth( + viewModel: viewModel, + ), )), ], ),