From d3f7b76540f3eff78e040b9a57bdb5fc8f7e69e8 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 13 Apr 2021 05:47:51 +0300 Subject: [PATCH] Fix for app context --- lib/ui/client/edit/client_edit_vm.dart | 2 +- lib/ui/company_gateway/edit/company_gateway_edit_vm.dart | 2 +- lib/ui/credit/edit/credit_edit_vm.dart | 2 +- lib/ui/document/edit/document_edit_vm.dart | 2 +- lib/ui/expense/edit/expense_edit_vm.dart | 2 +- lib/ui/expense_category/edit/expense_category_edit_vm.dart | 2 +- lib/ui/group/edit/group_edit_vm.dart | 2 +- lib/ui/invoice/edit/invoice_edit_vm.dart | 2 +- lib/ui/payment/edit/payment_edit_vm.dart | 2 +- lib/ui/payment_term/edit/payment_term_edit_vm.dart | 2 +- lib/ui/product/edit/product_edit_vm.dart | 2 +- lib/ui/project/edit/project_edit_vm.dart | 5 +++-- lib/ui/quote/edit/quote_edit_vm.dart | 2 +- lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart | 2 +- lib/ui/subscription/edit/subscription_edit_vm.dart | 2 +- lib/ui/task/edit/task_edit_vm.dart | 2 +- lib/ui/task_status/edit/task_status_edit_vm.dart | 2 +- lib/ui/tax_rate/edit/tax_rate_edit_vm.dart | 2 +- lib/ui/token/edit/token_edit_vm.dart | 2 +- lib/ui/user/edit/user_edit_vm.dart | 2 +- lib/ui/vendor/edit/vendor_edit_vm.dart | 2 +- lib/ui/webhook/edit/webhook_edit_vm.dart | 2 +- stubs/ui/stub/edit/stub_edit_vm | 2 +- 23 files changed, 25 insertions(+), 24 deletions(-) diff --git a/lib/ui/client/edit/client_edit_vm.dart b/lib/ui/client/edit/client_edit_vm.dart index fb44a2f31..f8613a41b 100644 --- a/lib/ui/client/edit/client_edit_vm.dart +++ b/lib/ui/client/edit/client_edit_vm.dart @@ -111,7 +111,7 @@ class ClientEditVM { showToast(client.isNew ? localization.createdClient : localization.updatedClient); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(ClientViewScreen.route)); if (client.isNew && state.clientUIState.saveCompleter == null) { appContext.navigator diff --git a/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart b/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart index fee2cd404..b65bb32b3 100644 --- a/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart +++ b/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart @@ -85,7 +85,7 @@ class CompanyGatewayEditVM { ? localization.createdCompanyGateway : localization.updatedCompanyGateway); - if (isMobile(context)) { + if (state.prefState.isMobile) { store .dispatch(UpdateCurrentRoute(CompanyGatewayViewScreen.route)); if (companyGateway.isNew) { diff --git a/lib/ui/credit/edit/credit_edit_vm.dart b/lib/ui/credit/edit/credit_edit_vm.dart index 4b245bf7d..6c4f0bd94 100644 --- a/lib/ui/credit/edit/credit_edit_vm.dart +++ b/lib/ui/credit/edit/credit_edit_vm.dart @@ -95,7 +95,7 @@ class CreditEditVM extends EntityEditVM { ? localization.createdCredit : localization.updatedCredit); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(CreditViewScreen.route)); if (credit.isNew) { appContext.navigator diff --git a/lib/ui/document/edit/document_edit_vm.dart b/lib/ui/document/edit/document_edit_vm.dart index b6f145dcc..8a5760921 100644 --- a/lib/ui/document/edit/document_edit_vm.dart +++ b/lib/ui/document/edit/document_edit_vm.dart @@ -68,7 +68,7 @@ class DocumentEditVM { showToast(client.isNew ? localization.createdClient : localization.updatedClient); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(DocumentViewScreen.route)); if (document.isNew) { appContext.navigator diff --git a/lib/ui/expense/edit/expense_edit_vm.dart b/lib/ui/expense/edit/expense_edit_vm.dart index a485a6de2..87f260f39 100644 --- a/lib/ui/expense/edit/expense_edit_vm.dart +++ b/lib/ui/expense/edit/expense_edit_vm.dart @@ -113,7 +113,7 @@ class ExpenseEditVM { ? localization.createdExpense : localization.updatedExpense); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(ExpenseViewScreen.route)); if (expense.isNew) { appContext.navigator diff --git a/lib/ui/expense_category/edit/expense_category_edit_vm.dart b/lib/ui/expense_category/edit/expense_category_edit_vm.dart index 8227c2b13..2b361cf5e 100644 --- a/lib/ui/expense_category/edit/expense_category_edit_vm.dart +++ b/lib/ui/expense_category/edit/expense_category_edit_vm.dart @@ -85,7 +85,7 @@ class ExpenseCategoryEditVM { ? localization.createdExpenseCategory : localization.updatedExpenseCategory); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch( UpdateCurrentRoute(ExpenseCategoryViewScreen.route)); if (expenseCategory.isNew) { diff --git a/lib/ui/group/edit/group_edit_vm.dart b/lib/ui/group/edit/group_edit_vm.dart index 54e91f011..4c7da0342 100644 --- a/lib/ui/group/edit/group_edit_vm.dart +++ b/lib/ui/group/edit/group_edit_vm.dart @@ -82,7 +82,7 @@ class GroupEditVM { ? localization.createdGroup : localization.updatedGroup); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(GroupViewScreen.route)); if (group.isNew) { appContext.navigator diff --git a/lib/ui/invoice/edit/invoice_edit_vm.dart b/lib/ui/invoice/edit/invoice_edit_vm.dart index e472e896a..089a85d35 100644 --- a/lib/ui/invoice/edit/invoice_edit_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_vm.dart @@ -118,7 +118,7 @@ class InvoiceEditVM extends EntityEditVM { ? localization.createdInvoice : localization.updatedInvoice); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(InvoiceViewScreen.route)); if (invoice.isNew) { appContext.navigator diff --git a/lib/ui/payment/edit/payment_edit_vm.dart b/lib/ui/payment/edit/payment_edit_vm.dart index e17e17eca..324ec67a6 100644 --- a/lib/ui/payment/edit/payment_edit_vm.dart +++ b/lib/ui/payment/edit/payment_edit_vm.dart @@ -97,7 +97,7 @@ class PaymentEditVM { showToast(payment.isNew ? localization.createdPayment : localization.updatedPayment); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(PaymentViewScreen.route)); if (payment.isNew) { appContext.navigator diff --git a/lib/ui/payment_term/edit/payment_term_edit_vm.dart b/lib/ui/payment_term/edit/payment_term_edit_vm.dart index 209cae2e3..fcb8b224d 100644 --- a/lib/ui/payment_term/edit/payment_term_edit_vm.dart +++ b/lib/ui/payment_term/edit/payment_term_edit_vm.dart @@ -83,7 +83,7 @@ class PaymentTermEditVM { ? localization.createdPaymentTerm : localization.updatedPaymentTerm); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(PaymentTermScreen.route)); if (paymentTerm.isNew) { Navigator.of(context) diff --git a/lib/ui/product/edit/product_edit_vm.dart b/lib/ui/product/edit/product_edit_vm.dart index 6cbae12f1..dd624f993 100644 --- a/lib/ui/product/edit/product_edit_vm.dart +++ b/lib/ui/product/edit/product_edit_vm.dart @@ -85,7 +85,7 @@ class ProductEditVM { ? localization.createdProduct : localization.updatedProduct); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(ProductViewScreen.route)); if (product.isNew) { appContext.navigator diff --git a/lib/ui/project/edit/project_edit_vm.dart b/lib/ui/project/edit/project_edit_vm.dart index f91ddc456..34a58e042 100644 --- a/lib/ui/project/edit/project_edit_vm.dart +++ b/lib/ui/project/edit/project_edit_vm.dart @@ -105,7 +105,7 @@ class ProjectEditVM { ? localization.createdProject : localization.updatedProject); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(ProjectViewScreen.route)); if (project.isNew && state.projectUIState.saveCompleter == null) { appContext.navigator @@ -114,7 +114,8 @@ class ProjectEditVM { appContext.navigator.pop(savedProject); } } else { - viewEntity(appContext: appContext, entity: savedProject, force: true); + viewEntity( + appContext: appContext, entity: savedProject, force: true); } }).catchError((Object error) { showDialog( diff --git a/lib/ui/quote/edit/quote_edit_vm.dart b/lib/ui/quote/edit/quote_edit_vm.dart index 874c09be1..b371fea1e 100644 --- a/lib/ui/quote/edit/quote_edit_vm.dart +++ b/lib/ui/quote/edit/quote_edit_vm.dart @@ -94,7 +94,7 @@ class QuoteEditVM extends EntityEditVM { ? localization.createdQuote : localization.updatedQuote); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(QuoteViewScreen.route)); if (quote.isNew) { appContext.navigator diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart index 1a92acf62..c20ed909d 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart @@ -95,7 +95,7 @@ class RecurringInvoiceEditVM extends EntityEditVM { ? localization.createdRecurringInvoice : localization.updatedRecurringInvoice); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch( UpdateCurrentRoute(RecurringInvoiceViewScreen.route)); if (recurringInvoice.isNew) { diff --git a/lib/ui/subscription/edit/subscription_edit_vm.dart b/lib/ui/subscription/edit/subscription_edit_vm.dart index d7f5225f3..94e405a51 100644 --- a/lib/ui/subscription/edit/subscription_edit_vm.dart +++ b/lib/ui/subscription/edit/subscription_edit_vm.dart @@ -97,7 +97,7 @@ class SubscriptionEditVM { showToast(subscription.isNew ? localization.createdSubscription : localization.updatedSubscription); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(SubscriptionViewScreen.route)); if (subscription.isNew) { appContext.navigator diff --git a/lib/ui/task/edit/task_edit_vm.dart b/lib/ui/task/edit/task_edit_vm.dart index 288017b57..5ceb02d1b 100644 --- a/lib/ui/task/edit/task_edit_vm.dart +++ b/lib/ui/task/edit/task_edit_vm.dart @@ -99,7 +99,7 @@ class TaskEditVM { ? localization.createTask : localization.updatedTask); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(TaskViewScreen.route)); if (task.isNew) { appContext.navigator.pushReplacementNamed(TaskViewScreen.route); diff --git a/lib/ui/task_status/edit/task_status_edit_vm.dart b/lib/ui/task_status/edit/task_status_edit_vm.dart index 6eef2d89d..80ce50162 100644 --- a/lib/ui/task_status/edit/task_status_edit_vm.dart +++ b/lib/ui/task_status/edit/task_status_edit_vm.dart @@ -84,7 +84,7 @@ class TaskStatusEditVM { ? localization.createdTaskStatus : localization.updatedTaskStatus); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(TaskStatusViewScreen.route)); if (taskStatus.isNew) { appContext.navigator diff --git a/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart b/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart index f6b0848f1..b94583b24 100644 --- a/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart +++ b/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart @@ -84,7 +84,7 @@ class TaxRateEditVM { ? localization.createdTaxRate : localization.updatedTaxRate); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(TaxRateViewScreen.route)); if (taxRate.isNew) { appContext.navigator diff --git a/lib/ui/token/edit/token_edit_vm.dart b/lib/ui/token/edit/token_edit_vm.dart index fca87a00b..1ecc26f5b 100644 --- a/lib/ui/token/edit/token_edit_vm.dart +++ b/lib/ui/token/edit/token_edit_vm.dart @@ -95,7 +95,7 @@ class TokenEditVM { ? localization.createdToken : localization.updatedToken); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(TokenViewScreen.route)); if (token.isNew) { appContext.navigator diff --git a/lib/ui/user/edit/user_edit_vm.dart b/lib/ui/user/edit/user_edit_vm.dart index 945a84183..f407ef0ca 100644 --- a/lib/ui/user/edit/user_edit_vm.dart +++ b/lib/ui/user/edit/user_edit_vm.dart @@ -94,7 +94,7 @@ class UserEditVM { ? localization.createdUser : localization.updatedUser); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(UserViewScreen.route)); if (user.isNew) { appContext.navigator.pushReplacementNamed(UserViewScreen.route); diff --git a/lib/ui/vendor/edit/vendor_edit_vm.dart b/lib/ui/vendor/edit/vendor_edit_vm.dart index 56ccc389c..9ec9e1a26 100644 --- a/lib/ui/vendor/edit/vendor_edit_vm.dart +++ b/lib/ui/vendor/edit/vendor_edit_vm.dart @@ -96,7 +96,7 @@ class VendorEditVM { ? localization.createdVendor : localization.updatedVendor); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(VendorViewScreen.route)); if (vendor.isNew && state.vendorUIState.saveCompleter == null) { appContext.navigator diff --git a/lib/ui/webhook/edit/webhook_edit_vm.dart b/lib/ui/webhook/edit/webhook_edit_vm.dart index 18ef715f9..c61033f8d 100644 --- a/lib/ui/webhook/edit/webhook_edit_vm.dart +++ b/lib/ui/webhook/edit/webhook_edit_vm.dart @@ -87,7 +87,7 @@ class WebhookEditVM { ? localization.createdWebhook : localization.updatedWebhook); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(WebhookViewScreen.route)); if (webhook.isNew) { appContext.navigator diff --git a/stubs/ui/stub/edit/stub_edit_vm b/stubs/ui/stub/edit/stub_edit_vm index 214acdcd1..b545d1637 100644 --- a/stubs/ui/stub/edit/stub_edit_vm +++ b/stubs/ui/stub/edit/stub_edit_vm @@ -79,7 +79,7 @@ class StubEditVM { showToast(stub.isNew ? localization.createdStub : localization.updatedStub); - if (isMobile(context)) { + if (state.prefState.isMobile) { store.dispatch(UpdateCurrentRoute(StubViewScreen.route)); if (stub.isNew) { Navigator.of(context).pushReplacementNamed(StubViewScreen.route);