From 4adf979cb6e8295173f117a07c0b29ecba06d3b5 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 1 Oct 2023 14:05:54 +0300 Subject: [PATCH] Null safety --- lib/redux/client/client_reducer.dart | 33 ++++++++++--------- .../expense_category_reducer.dart | 26 +++++++-------- lib/redux/project/project_reducer.dart | 26 +++++++-------- lib/redux/vendor/vendor_reducer.dart | 33 ++++++++++--------- .../invoice/edit/invoice_edit_details_vm.dart | 17 +++++----- 5 files changed, 69 insertions(+), 66 deletions(-) diff --git a/lib/redux/client/client_reducer.dart b/lib/redux/client/client_reducer.dart index 8893a87ed..faa8d3413 100644 --- a/lib/redux/client/client_reducer.dart +++ b/lib/redux/client/client_reducer.dart @@ -15,18 +15,18 @@ import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState clientUIReducer(ClientUIState state, dynamic action) { - return state.rebuild((b) => b - ..listUIState.replace(clientListReducer(state.listUIState, action)) - ..editing.replace(editingReducer(state.editing, action)!) - ..editingContact - .replace(editingContactReducer(state.editingContact, action)!) - ..selectedId = selectedIdReducer(state.selectedId, action) - ..forceSelected = forceSelectedReducer(state.forceSelected, action) - ..tabIndex = tabIndexReducer(state.tabIndex, action) - ..saveCompleter = saveCompleterReducer(state.saveCompleter, action) - ..cancelCompleter = cancelCompleterReducer( - state.cancelCompleter as Completer?, action) - as Completer?); + return state.rebuild( + (b) => b + ..listUIState.replace(clientListReducer(state.listUIState, action)) + ..editing.replace(editingReducer(state.editing, action)!) + ..editingContact + .replace(editingContactReducer(state.editingContact, action)!) + ..selectedId = selectedIdReducer(state.selectedId, action) + ..forceSelected = forceSelectedReducer(state.forceSelected, action) + ..tabIndex = tabIndexReducer(state.tabIndex, action) + ..saveCompleter = saveCompleterReducer(state.saveCompleter, action) + ..cancelCompleter = cancelCompleterReducer(state.cancelCompleter, action), + ); } final forceSelectedReducer = combineReducers([ @@ -55,9 +55,9 @@ final saveCompleterReducer = combineReducers?>([ }), ]); -final cancelCompleterReducer = combineReducers?>([ - TypedReducer?, EditClient>((completer, action) { - return action.cancelCompleter as Completer?; +final cancelCompleterReducer = combineReducers?>([ + TypedReducer?, EditClient>((completer, action) { + return action.cancelCompleter as Completer?; }), ]); @@ -137,7 +137,8 @@ final editingReducer = combineReducers([ }), TypedReducer((client, action) { return client!.rebuild((b) => b - ..contacts[action.index] = action.contact..isChanged = true); + ..contacts[action.index] = action.contact + ..isChanged = true); }), TypedReducer((client, action) { return ClientEntity(); diff --git a/lib/redux/expense_category/expense_category_reducer.dart b/lib/redux/expense_category/expense_category_reducer.dart index dd73f90cc..897fd967e 100644 --- a/lib/redux/expense_category/expense_category_reducer.dart +++ b/lib/redux/expense_category/expense_category_reducer.dart @@ -15,15 +15,16 @@ import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState expenseCategoryUIReducer( ExpenseCategoryUIState state, dynamic action) { - return state.rebuild((b) => b - ..listUIState.replace(expenseCategoryListReducer(state.listUIState, action)) - ..editing.replace(editingReducer(state.editing, action)!) - ..selectedId = selectedIdReducer(state.selectedId, action) - ..forceSelected = forceSelectedReducer(state.forceSelected, action) - ..saveCompleter = saveCompleterReducer(state.saveCompleter, action) - ..cancelCompleter = cancelCompleterReducer( - state.cancelCompleter as Completer?, action) - as Completer?); + return state.rebuild( + (b) => b + ..listUIState + .replace(expenseCategoryListReducer(state.listUIState, action)) + ..editing.replace(editingReducer(state.editing, action)!) + ..selectedId = selectedIdReducer(state.selectedId, action) + ..forceSelected = forceSelectedReducer(state.forceSelected, action) + ..saveCompleter = saveCompleterReducer(state.saveCompleter, action) + ..cancelCompleter = cancelCompleterReducer(state.cancelCompleter, action), + ); } final saveCompleterReducer = combineReducers?>([ @@ -33,10 +34,9 @@ final saveCompleterReducer = combineReducers?>([ }), ]); -final cancelCompleterReducer = combineReducers?>([ - TypedReducer?, EditExpenseCategory>( - (completer, action) { - return action.cancelCompleter as Completer?; +final cancelCompleterReducer = combineReducers?>([ + TypedReducer?, EditExpenseCategory>((completer, action) { + return action.cancelCompleter as Completer?; }), ]); diff --git a/lib/redux/project/project_reducer.dart b/lib/redux/project/project_reducer.dart index 055f5bdd3..80f334053 100644 --- a/lib/redux/project/project_reducer.dart +++ b/lib/redux/project/project_reducer.dart @@ -16,16 +16,16 @@ import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState projectUIReducer(ProjectUIState state, dynamic action) { - return state.rebuild((b) => b - ..listUIState.replace(projectListReducer(state.listUIState, action)) - ..editing.replace(editingReducer(state.editing, action)!) - ..selectedId = selectedIdReducer(state.selectedId, action) - ..forceSelected = forceSelectedReducer(state.forceSelected, action) - ..tabIndex = tabIndexReducer(state.tabIndex, action) - ..saveCompleter = saveCompleterReducer(state.saveCompleter, action) - ..cancelCompleter = cancelCompleterReducer( - state.cancelCompleter as Completer?, action) - as Completer?); + return state.rebuild( + (b) => b + ..listUIState.replace(projectListReducer(state.listUIState, action)) + ..editing.replace(editingReducer(state.editing, action)!) + ..selectedId = selectedIdReducer(state.selectedId, action) + ..forceSelected = forceSelectedReducer(state.forceSelected, action) + ..tabIndex = tabIndexReducer(state.tabIndex, action) + ..saveCompleter = saveCompleterReducer(state.saveCompleter, action) + ..cancelCompleter = cancelCompleterReducer(state.cancelCompleter, action), + ); } final forceSelectedReducer = combineReducers([ @@ -54,9 +54,9 @@ final saveCompleterReducer = combineReducers?>([ }), ]); -final cancelCompleterReducer = combineReducers?>([ - TypedReducer?, EditProject>((completer, action) { - return action.cancelCompleter as Completer?; +final cancelCompleterReducer = combineReducers?>([ + TypedReducer?, EditProject>((completer, action) { + return action.cancelCompleter as Completer?; }), ]); diff --git a/lib/redux/vendor/vendor_reducer.dart b/lib/redux/vendor/vendor_reducer.dart index 3ffa224dc..a9bfbbc4b 100644 --- a/lib/redux/vendor/vendor_reducer.dart +++ b/lib/redux/vendor/vendor_reducer.dart @@ -15,18 +15,18 @@ import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_state.dart'; EntityUIState vendorUIReducer(VendorUIState state, dynamic action) { - return state.rebuild((b) => b - ..listUIState.replace(vendorListReducer(state.listUIState, action)) - ..editing.replace(editingReducer(state.editing, action)!) - ..editingContact - .replace(editingVendorContactReducer(state.editingContact, action)!) - ..selectedId = selectedIdReducer(state.selectedId, action) - ..forceSelected = forceSelectedReducer(state.forceSelected, action) - ..tabIndex = tabIndexReducer(state.tabIndex, action) - ..saveCompleter = saveCompleterReducer(state.saveCompleter, action) - ..cancelCompleter = cancelCompleterReducer( - state.cancelCompleter as Completer?, action) - as Completer?); + return state.rebuild( + (b) => b + ..listUIState.replace(vendorListReducer(state.listUIState, action)) + ..editing.replace(editingReducer(state.editing, action)!) + ..editingContact + .replace(editingVendorContactReducer(state.editingContact, action)!) + ..selectedId = selectedIdReducer(state.selectedId, action) + ..forceSelected = forceSelectedReducer(state.forceSelected, action) + ..tabIndex = tabIndexReducer(state.tabIndex, action) + ..saveCompleter = saveCompleterReducer(state.saveCompleter, action) + ..cancelCompleter = cancelCompleterReducer(state.cancelCompleter, action), + ); } final forceSelectedReducer = combineReducers([ @@ -55,9 +55,9 @@ final saveCompleterReducer = combineReducers?>([ }), ]); -final cancelCompleterReducer = combineReducers?>([ - TypedReducer?, EditVendor>((completer, action) { - return action.cancelCompleter as Completer?; +final cancelCompleterReducer = combineReducers?>([ + TypedReducer?, EditVendor>((completer, action) { + return action.cancelCompleter as Completer?; }), ]); @@ -141,7 +141,8 @@ VendorEntity _removeContact(VendorEntity? vendor, DeleteVendorContact action) { VendorEntity _updateContact(VendorEntity? vendor, UpdateVendorContact action) { return vendor!.rebuild((b) => b - ..contacts[action.index] = action.contact..isChanged = true); + ..contacts[action.index] = action.contact + ..isChanged = true); } final vendorListReducer = combineReducers([ diff --git a/lib/ui/invoice/edit/invoice_edit_details_vm.dart b/lib/ui/invoice/edit/invoice_edit_details_vm.dart index 0b4b7be75..910056fcb 100644 --- a/lib/ui/invoice/edit/invoice_edit_details_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_details_vm.dart @@ -126,14 +126,15 @@ class InvoiceEditDetailsVM extends EntityEditDetailsVM { }, onAddClientPressed: (context, completer) { createEntity( - context: context, - entity: ClientEntity(state: state), - force: true, - completer: completer, - cancelCompleter: Completer() - ..future.then((_) { - store.dispatch(UpdateCurrentRoute(InvoiceEditScreen.route)); - })); + context: context, + entity: ClientEntity(state: state), + force: true, + completer: completer, + cancelCompleter: Completer() + ..future.then((_) { + store.dispatch(UpdateCurrentRoute(InvoiceEditScreen.route)); + }), + ); completer.future.then((SelectableEntity client) { store.dispatch(UpdateCurrentRoute(InvoiceEditScreen.route)); });