From 6edf33a4522c8a6548c7ea7a6be436eebb1e1810 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 3 Aug 2021 11:33:27 +0300 Subject: [PATCH] Full width vendor editor --- lib/ui/app/edit_scaffold.dart | 2 +- lib/ui/client/edit/client_edit.dart | 50 +++++++++---------- lib/ui/credit/edit/credit_edit.dart | 38 +++++++------- lib/ui/invoice/edit/invoice_edit.dart | 44 ++++++++-------- lib/ui/quote/quote_edit.dart | 38 +++++++------- .../edit/recurring_invoice_edit.dart | 4 +- lib/ui/task/edit/task_edit.dart | 26 +++++----- lib/ui/vendor/edit/vendor_edit.dart | 5 ++ 8 files changed, 100 insertions(+), 107 deletions(-) diff --git a/lib/ui/app/edit_scaffold.dart b/lib/ui/app/edit_scaffold.dart index b8e3ea474..3901508e0 100644 --- a/lib/ui/app/edit_scaffold.dart +++ b/lib/ui/app/edit_scaffold.dart @@ -174,7 +174,7 @@ class EditScaffold extends StatelessWidget { enabled: isEnabled, ) ], - bottom: appBarBottom, + bottom: isFullscreen ? null : appBarBottom, ), bottomNavigationBar: bottomNavigationBar, floatingActionButtonLocation: FloatingActionButtonLocation.endDocked, diff --git a/lib/ui/client/edit/client_edit.dart b/lib/ui/client/edit/client_edit.dart index 3f2ae587b..467b17ee8 100644 --- a/lib/ui/client/edit/client_edit.dart +++ b/lib/ui/client/edit/client_edit.dart @@ -70,32 +70,30 @@ class _ClientEditState extends State viewModel.onSavePressed(context); }, - appBarBottom: isFullscreen - ? null - : TabBar( - controller: _controller, - isScrollable: true, - tabs: [ - Tab( - text: localization.details, - ), - Tab( - text: localization.contacts, - ), - Tab( - text: localization.notes, - ), - Tab( - text: localization.settings, - ), - Tab( - text: localization.billingAddress, - ), - Tab( - text: localization.shippingAddress, - ), - ], - ), + appBarBottom: TabBar( + controller: _controller, + isScrollable: true, + tabs: [ + Tab( + text: localization.details, + ), + Tab( + text: localization.contacts, + ), + Tab( + text: localization.notes, + ), + Tab( + text: localization.settings, + ), + Tab( + text: localization.billingAddress, + ), + Tab( + text: localization.shippingAddress, + ), + ], + ), body: Form( key: _formKey, child: isFullscreen diff --git a/lib/ui/credit/edit/credit_edit.dart b/lib/ui/credit/edit/credit_edit.dart index ab1095ec7..8ea966a3d 100644 --- a/lib/ui/credit/edit/credit_edit.dart +++ b/lib/ui/credit/edit/credit_edit.dart @@ -98,26 +98,24 @@ class _CreditEditState extends State EntityAction.emailCredit, ], onActionPressed: (context, action) => _onSavePressed(context, action), - appBarBottom: isFullscreen - ? null - : TabBar( - controller: _controller, - //isScrollable: true, - tabs: [ - Tab( - text: localization.details, - ), - Tab( - text: localization.contacts, - ), - Tab( - text: localization.items, - ), - Tab( - text: localization.notes, - ), - ], - ), + appBarBottom: TabBar( + controller: _controller, + //isScrollable: true, + tabs: [ + Tab( + text: localization.details, + ), + Tab( + text: localization.contacts, + ), + Tab( + text: localization.items, + ), + Tab( + text: localization.notes, + ), + ], + ), body: Form( key: _formKey, child: isFullscreen diff --git a/lib/ui/invoice/edit/invoice_edit.dart b/lib/ui/invoice/edit/invoice_edit.dart index 3b431bac9..0356af8de 100644 --- a/lib/ui/invoice/edit/invoice_edit.dart +++ b/lib/ui/invoice/edit/invoice_edit.dart @@ -103,29 +103,27 @@ class _InvoiceEditState extends State EntityAction.markPaid, ], onActionPressed: (context, action) => _onSavePressed(context, action), - appBarBottom: isFullscreen - ? null - : TabBar( - controller: _controller, - isScrollable: true, - tabs: [ - Tab( - text: localization.details, - ), - Tab( - text: localization.contacts, - ), - Tab( - text: localization.items, - ), - Tab( - text: localization.notes, - ), - Tab( - text: localization.pdf, - ), - ], - ), + appBarBottom: TabBar( + controller: _controller, + isScrollable: true, + tabs: [ + Tab( + text: localization.details, + ), + Tab( + text: localization.contacts, + ), + Tab( + text: localization.items, + ), + Tab( + text: localization.notes, + ), + Tab( + text: localization.pdf, + ), + ], + ), body: Form( key: _formKey, child: isFullscreen diff --git a/lib/ui/quote/quote_edit.dart b/lib/ui/quote/quote_edit.dart index e99a8fcfb..4b00928ad 100644 --- a/lib/ui/quote/quote_edit.dart +++ b/lib/ui/quote/quote_edit.dart @@ -97,26 +97,24 @@ class _QuoteEditState extends State EntityAction.emailQuote, ], onActionPressed: (context, action) => _onSavePressed(context, action), - appBarBottom: isFullscreen - ? null - : TabBar( - controller: _controller, - //isScrollable: true, - tabs: [ - Tab( - text: localization.details, - ), - Tab( - text: localization.contacts, - ), - Tab( - text: localization.items, - ), - Tab( - text: localization.notes, - ), - ], - ), + appBarBottom: TabBar( + controller: _controller, + //isScrollable: true, + tabs: [ + Tab( + text: localization.details, + ), + Tab( + text: localization.contacts, + ), + Tab( + text: localization.items, + ), + Tab( + text: localization.notes, + ), + ], + ), body: Form( key: _formKey, child: isFullscreen diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart index 4f5f78428..303e6f5b3 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart @@ -98,9 +98,7 @@ class _RecurringInvoiceEditState extends State EntityAction.viewPdf, ], onActionPressed: (context, action) => _onSavePressed(context, action), - appBarBottom: isFullscreen - ? null - : TabBar( + appBarBottom:TabBar( controller: _controller, //isScrollable: true, tabs: [ diff --git a/lib/ui/task/edit/task_edit.dart b/lib/ui/task/edit/task_edit.dart index 47aae98c5..18cbd2eff 100644 --- a/lib/ui/task/edit/task_edit.dart +++ b/lib/ui/task/edit/task_edit.dart @@ -102,20 +102,18 @@ class _TaskEditState extends State viewModel.onSavePressed(context); }, - appBarBottom: isFullscreen - ? null - : TabBar( - controller: _controller, - //isScrollable: true, - tabs: [ - Tab( - text: localization.details, - ), - Tab( - text: localization.times, - ), - ], - ), + appBarBottom: TabBar( + controller: _controller, + //isScrollable: true, + tabs: [ + Tab( + text: localization.details, + ), + Tab( + text: localization.times, + ), + ], + ), body: Form( key: _formKey, child: isFullscreen diff --git a/lib/ui/vendor/edit/vendor_edit.dart b/lib/ui/vendor/edit/vendor_edit.dart index 6d47dabfb..4b29d91f2 100644 --- a/lib/ui/vendor/edit/vendor_edit.dart +++ b/lib/ui/vendor/edit/vendor_edit.dart @@ -1,5 +1,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_address.dart'; import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_contacts_vm.dart'; @@ -45,8 +46,12 @@ class _VendorEditState extends State final localization = AppLocalization.of(context); final viewModel = widget.viewModel; final vendor = viewModel.vendor; + final state = viewModel.state; + final prefState = state.prefState; + final isFullscreen = prefState.isEditorFullScreen(EntityType.vendor); return EditScaffold( + isFullscreen: isFullscreen, entity: vendor, title: vendor.isNew ? localization.newVendor : localization.editVendor, onCancelPressed: (context) => viewModel.onCancelPressed(context),