From 42f4cfbd2e6a99d2a053aac4422e43e98b18752c Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 19 Aug 2019 16:13:32 +0300 Subject: [PATCH] Tablet layout --- lib/redux/client/client_actions.dart | 4 +--- lib/redux/document/document_actions.dart | 3 +-- lib/redux/expense/expense_actions.dart | 4 +--- lib/redux/payment/payment_actions.dart | 4 +--- lib/redux/project/project_actions.dart | 4 +--- lib/redux/task/task_actions.dart | 2 -- lib/redux/vendor/vendor_actions.dart | 4 +--- lib/ui/document/edit/document_edit.dart | 1 + lib/ui/expense/edit/expense_edit_vm.dart | 13 +++++-------- lib/ui/invoice/edit/invoice_edit_details_vm.dart | 3 +-- lib/ui/payment/edit/payment_edit.dart | 1 + lib/ui/product/edit/product_edit.dart | 1 + lib/ui/project/edit/project_edit.dart | 1 + lib/ui/project/edit/project_edit_vm.dart | 5 +---- lib/ui/quote/edit/quote_edit_details_vm.dart | 5 +---- lib/ui/task/edit/task_edit_details_vm.dart | 8 ++------ stubs/redux/stub/stub_actions | 4 +--- 17 files changed, 21 insertions(+), 46 deletions(-) diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart index 88a658e5a..9b277afa5 100644 --- a/lib/redux/client/client_actions.dart +++ b/lib/redux/client/client_actions.dart @@ -36,15 +36,13 @@ class EditClient implements PersistUI { @required this.context, this.contact, this.completer, - this.force = false, - this.trackRoute = true}); + this.force = false}); final ClientEntity client; final ContactEntity contact; final BuildContext context; final Completer completer; final bool force; - final bool trackRoute; } class EditContact implements PersistUI { diff --git a/lib/redux/document/document_actions.dart b/lib/redux/document/document_actions.dart index 6c180979c..5e8e4a4b1 100644 --- a/lib/redux/document/document_actions.dart +++ b/lib/redux/document/document_actions.dart @@ -23,12 +23,11 @@ class ViewDocument implements PersistUI { class EditDocument implements PersistUI { EditDocument( - {this.document, this.context, this.completer, this.trackRoute = true}); + {this.document, this.context, this.completer,}); final DocumentEntity document; final BuildContext context; final Completer completer; - final bool trackRoute; } class UpdateDocument implements PersistUI { diff --git a/lib/redux/expense/expense_actions.dart b/lib/redux/expense/expense_actions.dart index 75d24ada9..042eb3c8e 100644 --- a/lib/redux/expense/expense_actions.dart +++ b/lib/redux/expense/expense_actions.dart @@ -35,13 +35,11 @@ class EditExpense implements PersistUI { {@required this.expense, @required this.context, this.completer, - this.force = false, - this.trackRoute = true}); + this.force = false}); final ExpenseEntity expense; final BuildContext context; final Completer completer; - final bool trackRoute; final bool force; } diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart index 0b0fa12c5..018662a12 100644 --- a/lib/redux/payment/payment_actions.dart +++ b/lib/redux/payment/payment_actions.dart @@ -32,13 +32,11 @@ class EditPayment implements PersistUI { {@required this.payment, @required this.context, this.completer, - this.force = false, - this.trackRoute = true}); + this.force = false}); final PaymentEntity payment; final BuildContext context; final Completer completer; - final bool trackRoute; final bool force; } diff --git a/lib/redux/project/project_actions.dart b/lib/redux/project/project_actions.dart index fd82d50bd..edfc5c5eb 100644 --- a/lib/redux/project/project_actions.dart +++ b/lib/redux/project/project_actions.dart @@ -36,13 +36,11 @@ class EditProject implements PersistUI { {@required this.project, @required this.context, this.completer, - this.force = false, - this.trackRoute = true}); + this.force = false}); final ProjectEntity project; final BuildContext context; final Completer completer; - final bool trackRoute; final bool force; } diff --git a/lib/redux/task/task_actions.dart b/lib/redux/task/task_actions.dart index 0b4a7d857..1c537c0e3 100644 --- a/lib/redux/task/task_actions.dart +++ b/lib/redux/task/task_actions.dart @@ -38,7 +38,6 @@ class EditTask implements PersistUI { this.taskTime, this.context, this.completer, - this.trackRoute = true, this.force = false, this.taskTimeIndex}); @@ -47,7 +46,6 @@ class EditTask implements PersistUI { final TaskTime taskTime; final BuildContext context; final Completer completer; - final bool trackRoute; final bool force; } diff --git a/lib/redux/vendor/vendor_actions.dart b/lib/redux/vendor/vendor_actions.dart index 20598d955..bdb753d32 100644 --- a/lib/redux/vendor/vendor_actions.dart +++ b/lib/redux/vendor/vendor_actions.dart @@ -34,14 +34,12 @@ class EditVendor implements PersistUI { @required this.context, this.contact, this.completer, - this.force = false, - this.trackRoute = true}); + this.force = false}); final VendorEntity vendor; final VendorContactEntity contact; final BuildContext context; final Completer completer; - final bool trackRoute; final bool force; } diff --git a/lib/ui/document/edit/document_edit.dart b/lib/ui/document/edit/document_edit.dart index 60c6d3c61..eb36996af 100644 --- a/lib/ui/document/edit/document_edit.dart +++ b/lib/ui/document/edit/document_edit.dart @@ -107,6 +107,7 @@ class _DocumentEditState extends State { key: _formKey, child: Builder(builder: (BuildContext context) { return ListView( + key: ValueKey(viewModel.document.id), children: [ FormCard( children: [ diff --git a/lib/ui/expense/edit/expense_edit_vm.dart b/lib/ui/expense/edit/expense_edit_vm.dart index 24507862d..a4a480b26 100644 --- a/lib/ui/expense/edit/expense_edit_vm.dart +++ b/lib/ui/expense/edit/expense_edit_vm.dart @@ -83,10 +83,7 @@ class ExpenseEditVM { }, onAddClientPressed: (context, completer) { store.dispatch(EditClient( - client: ClientEntity(), - context: context, - completer: completer, - trackRoute: false)); + client: ClientEntity(), context: context, completer: completer)); completer.future.then((SelectableEntity client) { Scaffold.of(context).showSnackBar(SnackBar( content: SnackBarRow( @@ -96,10 +93,10 @@ class ExpenseEditVM { }, onAddVendorPressed: (context, completer) { store.dispatch(EditVendor( - vendor: VendorEntity(), - context: context, - completer: completer, - trackRoute: false)); + vendor: VendorEntity(), + context: context, + completer: completer, + )); completer.future.then((SelectableEntity client) { Scaffold.of(context).showSnackBar(SnackBar( content: SnackBarRow( diff --git a/lib/ui/invoice/edit/invoice_edit_details_vm.dart b/lib/ui/invoice/edit/invoice_edit_details_vm.dart index 030cf6219..f5c6befa4 100644 --- a/lib/ui/invoice/edit/invoice_edit_details_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_details_vm.dart @@ -84,8 +84,7 @@ class InvoiceEditDetailsVM extends EntityEditDetailsVM { client: ClientEntity(), context: context, completer: completer, - force: true, - trackRoute: false)); + force: true)); completer.future.then((SelectableEntity client) { Scaffold.of(context).showSnackBar(SnackBar( content: SnackBarRow( diff --git a/lib/ui/payment/edit/payment_edit.dart b/lib/ui/payment/edit/payment_edit.dart index 01335a032..746d5fa01 100644 --- a/lib/ui/payment/edit/payment_edit.dart +++ b/lib/ui/payment/edit/payment_edit.dart @@ -132,6 +132,7 @@ class _PaymentEditState extends State { body: Form( key: _formKey, child: ListView( + key: ValueKey(viewModel.payment.id), children: [ FormCard( children: [ diff --git a/lib/ui/product/edit/product_edit.dart b/lib/ui/product/edit/product_edit.dart index e862b6cf9..f53d9ee52 100644 --- a/lib/ui/product/edit/product_edit.dart +++ b/lib/ui/product/edit/product_edit.dart @@ -145,6 +145,7 @@ class _ProductEditState extends State { body: Form( key: _formKey, child: ListView( + key: ValueKey(viewModel.product.id), children: [ FormCard( children: [ diff --git a/lib/ui/project/edit/project_edit.dart b/lib/ui/project/edit/project_edit.dart index 694b3952a..d600e9692 100644 --- a/lib/ui/project/edit/project_edit.dart +++ b/lib/ui/project/edit/project_edit.dart @@ -149,6 +149,7 @@ class _ProjectEditState extends State { key: _formKey, child: Builder(builder: (BuildContext context) { return ListView( + key: ValueKey(viewModel.project.id), children: [ FormCard( children: [ diff --git a/lib/ui/project/edit/project_edit_vm.dart b/lib/ui/project/edit/project_edit_vm.dart index c24236a94..ce3d39fd1 100644 --- a/lib/ui/project/edit/project_edit_vm.dart +++ b/lib/ui/project/edit/project_edit_vm.dart @@ -81,10 +81,7 @@ class ProjectEditVM { }, onAddClientPressed: (context, completer) { store.dispatch(EditClient( - client: ClientEntity(), - context: context, - completer: completer, - trackRoute: false)); + client: ClientEntity(), context: context, completer: completer)); completer.future.then((SelectableEntity client) { Scaffold.of(context).showSnackBar(SnackBar( content: SnackBarRow( diff --git a/lib/ui/quote/edit/quote_edit_details_vm.dart b/lib/ui/quote/edit/quote_edit_details_vm.dart index 6e07e61c0..cc0d0b0f3 100644 --- a/lib/ui/quote/edit/quote_edit_details_vm.dart +++ b/lib/ui/quote/edit/quote_edit_details_vm.dart @@ -63,10 +63,7 @@ class QuoteEditDetailsVM extends EntityEditDetailsVM { clientList: state.clientState.list, onAddClientPressed: (context, completer) { store.dispatch(EditClient( - client: ClientEntity(), - context: context, - completer: completer, - trackRoute: false)); + client: ClientEntity(), context: context, completer: completer)); completer.future.then((SelectableEntity client) { Scaffold.of(context).showSnackBar(SnackBar( content: SnackBarRow( diff --git a/lib/ui/task/edit/task_edit_details_vm.dart b/lib/ui/task/edit/task_edit_details_vm.dart index e83a84cd7..d72d38ae8 100644 --- a/lib/ui/task/edit/task_edit_details_vm.dart +++ b/lib/ui/task/edit/task_edit_details_vm.dart @@ -63,10 +63,7 @@ class TaskEditDetailsVM { }, onAddClientPressed: (context, completer) { store.dispatch(EditClient( - client: ClientEntity(), - context: context, - completer: completer, - trackRoute: false)); + client: ClientEntity(), context: context, completer: completer)); completer.future.then((SelectableEntity client) { Scaffold.of(context).showSnackBar(SnackBar( content: SnackBarRow( @@ -79,8 +76,7 @@ class TaskEditDetailsVM { project: ProjectEntity() .rebuild((b) => b..clientId = task.clientId ?? 0), context: context, - completer: completer, - trackRoute: false)); + completer: completer)); completer.future.then((SelectableEntity client) { Scaffold.of(context).showSnackBar(SnackBar( content: SnackBarRow( diff --git a/stubs/redux/stub/stub_actions b/stubs/redux/stub/stub_actions index 5a49b8c49..2d5beb5b6 100644 --- a/stubs/redux/stub/stub_actions +++ b/stubs/redux/stub/stub_actions @@ -32,13 +32,11 @@ class EditStub implements PersistUI { {@required this.stub, @required this.context, this.completer, - this.force = false, - this.trackRoute = true}); + this.force = false); final StubEntity stub; final BuildContext context; final Completer completer; - final bool trackRoute; final bool force; }