From 818e39a0e8f4de58d0af1ef5357a37717426b543 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 19 Sep 2023 17:13:13 +0300 Subject: [PATCH] Null safety --- lib/ui/app/forms/design_picker.dart | 2 +- lib/ui/credit/edit/credit_edit_details_vm.dart | 2 +- lib/ui/dashboard/dashboard_panels.dart | 12 +++++++----- lib/ui/design/edit/design_edit.dart | 3 ++- lib/ui/document/document_presenter.dart | 2 +- lib/ui/invoice/edit/invoice_edit_details_vm.dart | 2 +- lib/ui/invoice/edit/invoice_edit_vm.dart | 3 ++- lib/ui/project/edit/project_edit_vm.dart | 2 +- .../edit/recurring_expense_edit_vm.dart | 11 +++++------ .../edit/recurring_invoice_edit_details_vm.dart | 6 +++--- .../edit/recurring_invoice_edit_vm.dart | 4 ++-- lib/ui/task/edit/task_edit_details_vm.dart | 4 ++-- lib/ui/transaction/edit/transaction_edit_vm.dart | 2 +- lib/ui/transaction/view/transaction_view.dart | 4 ++-- 14 files changed, 31 insertions(+), 28 deletions(-) diff --git a/lib/ui/app/forms/design_picker.dart b/lib/ui/app/forms/design_picker.dart index ddc5b229c..c840942cb 100644 --- a/lib/ui/app/forms/design_picker.dart +++ b/lib/ui/app/forms/design_picker.dart @@ -17,7 +17,7 @@ class DesignPicker extends StatelessWidget { this.initialValue, }); - final Function(DesignEntity?) onSelected; + final Function(DesignEntity) onSelected; final String? label; final String? initialValue; diff --git a/lib/ui/credit/edit/credit_edit_details_vm.dart b/lib/ui/credit/edit/credit_edit_details_vm.dart index 103098025..ac2e4b6aa 100644 --- a/lib/ui/credit/edit/credit_edit_details_vm.dart +++ b/lib/ui/credit/edit/credit_edit_details_vm.dart @@ -101,7 +101,7 @@ class CreditEditDetailsVM extends EntityEditDetailsVM { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch(UpdateCurrentRoute(CreditEditScreen.route)); } as FutureOr Function(Null))); completer.future.then((SelectableEntity client) { diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index 07e05706b..05d824ae2 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -414,7 +414,7 @@ class DashboardPanels extends StatelessWidget { final previousExpenseData = memoizedPreviousChartExpenses( state.staticState.currencyMap, state.company, - settings.rebuild((b) => b..offset += 1), + settings.rebuild((b) => b..offset = settings.offset + 1), state.invoiceState.map, state.expenseState.map); @@ -481,8 +481,8 @@ class DashboardPanels extends StatelessWidget { child: Row( children: [ Expanded( - child: - Text(localization!.addGatewayHelpMessage!), + child: Text( + localization!.addGatewayHelpMessage!), ), if (isDesktop(context)) TextButton( @@ -633,7 +633,8 @@ class DashboardPanels extends StatelessWidget { return FormCard( padding: const EdgeInsets.all(0), children: [ - Text(localization!.lookup(dashboardField.field)!, + Text( + localization!.lookup(dashboardField.field)!, style: textTheme.titleMedium, textAlign: TextAlign.center), SizedBox(height: 6), @@ -647,7 +648,8 @@ class DashboardPanels extends StatelessWidget { style: textTheme.headlineSmall, textAlign: TextAlign.center), SizedBox(height: 6), - Text(localization.lookup(dashboardField.period)!, + Text( + localization.lookup(dashboardField.period)!, style: textTheme.bodySmall, textAlign: TextAlign.center), ], diff --git a/lib/ui/design/edit/design_edit.dart b/lib/ui/design/edit/design_edit.dart index 42883c9df..0c8005d7c 100644 --- a/lib/ui/design/edit/design_edit.dart +++ b/lib/ui/design/edit/design_edit.dart @@ -230,7 +230,8 @@ class _DesignEditState extends State return EditScaffold( entity: design, isFullscreen: true, - title: design.isNew ? localization!.newDesign : localization!.editDesign, + title: + design.isNew ? localization!.newDesign : localization!.editDesign, onCancelPressed: (context) => viewModel.onCancelPressed(context), appBarBottom: isMobile(context) ? TabBar( diff --git a/lib/ui/document/document_presenter.dart b/lib/ui/document/document_presenter.dart index 2702fdd64..e2b0a5c3c 100644 --- a/lib/ui/document/document_presenter.dart +++ b/lib/ui/document/document_presenter.dart @@ -57,7 +57,7 @@ class DocumentPresenter extends EntityPresenter { case DocumentFields.id: return Text(document!.id); case DocumentFields.hash: - return Text(document.hash); + return Text(document!.hash); case DocumentFields.linkedTo: final parentEntity = state.getEntity(document!.parentType, document.parentId); diff --git a/lib/ui/invoice/edit/invoice_edit_details_vm.dart b/lib/ui/invoice/edit/invoice_edit_details_vm.dart index f98352190..3e7676fdf 100644 --- a/lib/ui/invoice/edit/invoice_edit_details_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_details_vm.dart @@ -129,7 +129,7 @@ class InvoiceEditDetailsVM extends EntityEditDetailsVM { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch(UpdateCurrentRoute(InvoiceEditScreen.route)); } as FutureOr Function(Null))); completer.future.then((SelectableEntity client) { diff --git a/lib/ui/invoice/edit/invoice_edit_vm.dart b/lib/ui/invoice/edit/invoice_edit_vm.dart index 218aec963..eb574692e 100644 --- a/lib/ui/invoice/edit/invoice_edit_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_vm.dart @@ -208,7 +208,8 @@ class InvoiceEditVM extends AbstractInvoiceEditVM { ..projectId = projectId ?? '' ..invitations.replace(BuiltList(client! .emailContacts - .map((contact) => InvitationEntity(clientContactId: contact!.id)) + .map( + (contact) => InvitationEntity(clientContactId: contact!.id)) .toList()))))); } store.dispatch(AddInvoiceItems(items)); diff --git a/lib/ui/project/edit/project_edit_vm.dart b/lib/ui/project/edit/project_edit_vm.dart index 36dd85a68..b6d2d2fa4 100644 --- a/lib/ui/project/edit/project_edit_vm.dart +++ b/lib/ui/project/edit/project_edit_vm.dart @@ -88,7 +88,7 @@ class ProjectEditVM { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch(UpdateCurrentRoute(ProjectEditScreen.route)); } as FutureOr Function(Null))); completer.future.then((SelectableEntity client) { diff --git a/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart b/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart index c282448a3..2db5cbf7b 100644 --- a/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart +++ b/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart @@ -48,7 +48,7 @@ class RecurringExpenseEditVM extends AbstractExpenseEditVM { AppState? state, ExpenseEntity? expense, Function(ExpenseEntity)? onChanged, - Function(BuildContext)? onSavePressed, + Function(BuildContext, [EntityAction?])? onSavePressed, Function(BuildContext)? onCancelPressed, bool? isLoading, bool? isSaving, @@ -62,8 +62,7 @@ class RecurringExpenseEditVM extends AbstractExpenseEditVM { state: state, expense: expense, onChanged: onChanged, - onSavePressed: - onSavePressed as dynamic Function(BuildContext, [EntityAction])?, + onSavePressed: onSavePressed, onCancelPressed: onCancelPressed, origExpense: origExpense, onAddClientPressed: onAddClientPressed, @@ -91,10 +90,10 @@ class RecurringExpenseEditVM extends AbstractExpenseEditVM { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch( UpdateCurrentRoute(RecurringExpenseEditScreen.route)); - } as FutureOr Function(Null))); + } as FutureOr<_> Function(Null))); completer.future.then((SelectableEntity client) { store.dispatch(UpdateCurrentRoute(RecurringExpenseEditScreen.route)); }); @@ -106,7 +105,7 @@ class RecurringExpenseEditVM extends AbstractExpenseEditVM { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch( UpdateCurrentRoute(RecurringExpenseEditScreen.route)); } as FutureOr Function(Null))); diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart index 0fe22bed0..7d1b144ad 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart @@ -57,8 +57,8 @@ class RecurringInvoiceEditDetailsVM extends EntityEditDetailsVM { CompanyEntity? company, InvoiceEntity? invoice, Function(InvoiceEntity)? onChanged, - Function(BuildContext, InvoiceEntity, ClientEntity)? onClientChanged, - Function(BuildContext, InvoiceEntity, VendorEntity)? onVendorChanged, + Function(BuildContext, InvoiceEntity, ClientEntity?)? onClientChanged, + Function(BuildContext, InvoiceEntity, VendorEntity?)? onVendorChanged, BuiltMap? clientMap, BuiltList? clientList, Function(BuildContext context, Completer completer)? @@ -103,7 +103,7 @@ class RecurringInvoiceEditDetailsVM extends EntityEditDetailsVM { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch( UpdateCurrentRoute(RecurringInvoiceEditScreen.route)); } as FutureOr Function(Null))); 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 8af29ef31..dfec0d1af 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart @@ -52,7 +52,7 @@ class RecurringInvoiceEditVM extends AbstractInvoiceEditVM { InvoiceEntity? invoice, int? invoiceItemIndex, InvoiceEntity? origInvoice, - Function(BuildContext)? onSavePressed, + Function(BuildContext, [EntityAction?])? onSavePressed, Function(List, String, String)? onItemsAdded, bool? isSaving, Function(BuildContext)? onCancelPressed, @@ -63,7 +63,7 @@ class RecurringInvoiceEditVM extends AbstractInvoiceEditVM { invoice: invoice, invoiceItemIndex: invoiceItemIndex, origInvoice: origInvoice, - onSavePressed: onSavePressed as dynamic Function(BuildContext, [EntityAction])?, + onSavePressed: onSavePressed, onItemsAdded: onItemsAdded, isSaving: isSaving, onCancelPressed: onCancelPressed, diff --git a/lib/ui/task/edit/task_edit_details_vm.dart b/lib/ui/task/edit/task_edit_details_vm.dart index f84b9d0ba..a77856f2c 100644 --- a/lib/ui/task/edit/task_edit_details_vm.dart +++ b/lib/ui/task/edit/task_edit_details_vm.dart @@ -82,7 +82,7 @@ class TaskEditDetailsVM { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch(UpdateCurrentRoute(TaskEditDetailsScreen.route)); } as FutureOr Function(Null))); completer.future.then((SelectableEntity client) { @@ -107,7 +107,7 @@ class TaskEditDetailsVM { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch(UpdateCurrentRoute(TaskEditDetailsScreen.route)); } as FutureOr Function(Null))); completer.future.then((SelectableEntity client) { diff --git a/lib/ui/transaction/edit/transaction_edit_vm.dart b/lib/ui/transaction/edit/transaction_edit_vm.dart index c8977b4b6..a39a26e19 100644 --- a/lib/ui/transaction/edit/transaction_edit_vm.dart +++ b/lib/ui/transaction/edit/transaction_edit_vm.dart @@ -110,7 +110,7 @@ class TransactionEditVM { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch(UpdateCurrentRoute(TransactionEditScreen.route)); } as FutureOr Function(Null))); completer.future.then((SelectableEntity client) { diff --git a/lib/ui/transaction/view/transaction_view.dart b/lib/ui/transaction/view/transaction_view.dart index 8afbac7f6..e7fac79df 100644 --- a/lib/ui/transaction/view/transaction_view.dart +++ b/lib/ui/transaction/view/transaction_view.dart @@ -1109,7 +1109,7 @@ class _MatchWithdrawalsState extends State<_MatchWithdrawals> { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch(UpdateCurrentRoute( TransactionScreen.route)); } as FutureOr Function(Null))); @@ -1193,7 +1193,7 @@ class _MatchWithdrawalsState extends State<_MatchWithdrawals> { force: true, completer: completer, cancelCompleter: Completer() - ..future.then((_) { + ..future.then(() { store.dispatch(UpdateCurrentRoute( TransactionScreen.route)); } as FutureOr Function(Null)));