From 39a73558c38171cec2328e14c081526aad9ffcc6 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 2 Jul 2018 11:26:24 +0300 Subject: [PATCH] Refactor --- lib/redux/app/app_middleware.dart | 10 +++++----- lib/redux/app/app_reducer.dart | 2 +- lib/redux/auth/auth_middleware.dart | 10 +++++----- lib/redux/client/client_middleware.dart | 2 +- lib/redux/company/company_reducer.dart | 2 +- lib/redux/dashboard/dashboard_middleware.dart | 6 +++--- lib/redux/invoice/invoice_reducer.dart | 6 +++--- lib/redux/product/product_middleware.dart | 2 +- lib/redux/product/product_reducer.dart | 6 +++--- lib/redux/ui/ui_reducer.dart | 2 +- lib/ui/client/edit/client_edit_billing_address.dart | 6 +++--- lib/ui/client/edit/client_edit_contacts.dart | 6 +++--- lib/ui/client/edit/client_edit_details.dart | 6 +++--- lib/ui/client/edit/client_edit_shipping_address.dart | 6 +++--- lib/ui/invoice/edit/invoice_edit_details.dart | 6 +++--- lib/ui/invoice/edit/invoice_edit_items.dart | 6 +++--- lib/ui/product/edit/product_edit.dart | 6 +++--- samples/form_redux.dart | 2 +- 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart index 96adc8635..e18d8f8a7 100644 --- a/lib/redux/app/app_middleware.dart +++ b/lib/redux/app/app_middleware.dart @@ -126,7 +126,7 @@ Middleware _createLoadState( CompanyState company4State; CompanyState company5State; - return (Store store, action, NextDispatcher next) { + return (Store store, dynamic action, NextDispatcher next) { authRepository.exists().then((exists) { if (exists) { authRepository.loadAuthState().then((state) { @@ -233,7 +233,7 @@ Middleware _createUserLoggedIn( PersistenceRepository company4Repository, PersistenceRepository company5Repository, ) { - return (Store store, action, NextDispatcher next) { + return (Store store, dynamic action, NextDispatcher next) { next(action); var state = store.state; @@ -250,7 +250,7 @@ Middleware _createUserLoggedIn( } Middleware _createUIChange(PersistenceRepository uiRepository) { - return (Store store, action, NextDispatcher next) { + return (Store store, dynamic action, NextDispatcher next) { next(action); uiRepository.saveUIState(store.state.uiState); @@ -264,7 +264,7 @@ Middleware _createDataLoaded( PersistenceRepository company4Repository, PersistenceRepository company5Repository, ) { - return (Store store, action, NextDispatcher next) { + return (Store store, dynamic action, NextDispatcher next) { // first process the action so the data is in the state next(action); @@ -300,7 +300,7 @@ Middleware _createDeleteState( PersistenceRepository company4Repository, PersistenceRepository company5Repository, ) { - return (Store store, action, NextDispatcher next) { + return (Store store, dynamic action, NextDispatcher next) { authRepository.delete(); uiRepository.delete(); staticRepository.delete(); diff --git a/lib/redux/app/app_reducer.dart b/lib/redux/app/app_reducer.dart index f844a4dbf..0a617ba75 100644 --- a/lib/redux/app/app_reducer.dart +++ b/lib/redux/app/app_reducer.dart @@ -7,7 +7,7 @@ import 'package:invoiceninja/redux/static/static_reducer.dart'; import 'package:invoiceninja/redux/company/company_reducer.dart'; // We create the State reducer by combining many smaller reducers into one! -AppState appReducer(AppState state, action) { +AppState appReducer(AppState state, dynamic action) { if (action is UserLogout) { return AppState().rebuild((b) => b.authState.replace(state.authState)); } else if (action is LoadStateSuccess) { diff --git a/lib/redux/auth/auth_middleware.dart b/lib/redux/auth/auth_middleware.dart index e2595c0e4..f63f5c52c 100644 --- a/lib/redux/auth/auth_middleware.dart +++ b/lib/redux/auth/auth_middleware.dart @@ -21,7 +21,7 @@ List> createStoreAuthMiddleware([ ]; } -_saveAuthLocal(action) async { +_saveAuthLocal(dynamic action) async { SharedPreferences prefs = await SharedPreferences.getInstance(); prefs.setString('email', action.email); prefs.setString('url', action.url); @@ -34,7 +34,7 @@ _saveAuthLocal(action) async { } } -_loadAuthLocal(Store store, action) async { +_loadAuthLocal(Store store, dynamic action) async { SharedPreferences prefs = await SharedPreferences.getInstance(); String email = prefs.getString('email') ?? Config.LOGIN_EMAIL; @@ -47,7 +47,7 @@ _loadAuthLocal(Store store, action) async { } Middleware _createLoginInit() { - return (Store store, action, NextDispatcher next) { + return (Store store, dynamic action, NextDispatcher next) { _loadAuthLocal(store, action); next(action); @@ -55,7 +55,7 @@ Middleware _createLoginInit() { } Middleware _createLoginRequest(AuthRepository repository) { - return (Store store, action, NextDispatcher next) { + return (Store store, dynamic action, NextDispatcher next) { repository .login(action.email, action.password, action.url, action.secret) .then((data) { @@ -76,7 +76,7 @@ Middleware _createLoginRequest(AuthRepository repository) { } else { store.dispatch(UserLoginFailure('The minimum version is v4.5')); } - }).catchError((error) { + }).catchError((Object error) { print(error); store.dispatch(UserLoginFailure(error.toString())); }); diff --git a/lib/redux/client/client_middleware.dart b/lib/redux/client/client_middleware.dart index 6a039c2a0..965b7946c 100644 --- a/lib/redux/client/client_middleware.dart +++ b/lib/redux/client/client_middleware.dart @@ -72,7 +72,7 @@ Middleware _archiveClient(ClientRepository repository) { if (action.completer != null) { action.completer.complete(null); } - }).catchError((error) { + }).catchError((Object error) { print(error); store.dispatch(ArchiveClientFailure(origClient)); if (action.completer != null) { diff --git a/lib/redux/company/company_reducer.dart b/lib/redux/company/company_reducer.dart index c19343836..194fd672c 100644 --- a/lib/redux/company/company_reducer.dart +++ b/lib/redux/company/company_reducer.dart @@ -7,7 +7,7 @@ import 'package:invoiceninja/redux/invoice/invoice_reducer.dart'; import 'package:invoiceninja/redux/dashboard/dashboard_reducer.dart'; import 'package:invoiceninja/redux/company/company_actions.dart'; -CompanyState companyReducer(CompanyState state, action) { +CompanyState companyReducer(CompanyState state, dynamic action) { return state.rebuild((b) => b ..clientState.replace(clientsReducer(state.clientState, action)) diff --git a/lib/redux/dashboard/dashboard_middleware.dart b/lib/redux/dashboard/dashboard_middleware.dart index ab13116da..cc29c6466 100644 --- a/lib/redux/dashboard/dashboard_middleware.dart +++ b/lib/redux/dashboard/dashboard_middleware.dart @@ -21,7 +21,7 @@ List> createStoreDashboardMiddleware([ Middleware _createViewDashboard() { - return (Store store, action, NextDispatcher next) { + return (Store store, dynamic action, NextDispatcher next) { store.dispatch(LoadDashboard()); store.dispatch(UpdateCurrentRoute(DashboardScreen.route)); @@ -35,7 +35,7 @@ Middleware _createViewDashboard() { } Middleware _createLoadDashboard(DashboardRepository repository) { - return (Store store, action, NextDispatcher next) { + return (Store store, dynamic action, NextDispatcher next) { AppState state = store.state; if (!state.dashboardState.isStale && !action.force) { @@ -57,7 +57,7 @@ Middleware _createLoadDashboard(DashboardRepository repository) { if (state.clientState.isStale) { store.dispatch(LoadClients()); } - }).catchError((error) { + }).catchError((Object error) { print(error); store.dispatch(LoadDashboardFailure(error)); }); diff --git a/lib/redux/invoice/invoice_reducer.dart b/lib/redux/invoice/invoice_reducer.dart index e35a27d40..9e471e3a9 100644 --- a/lib/redux/invoice/invoice_reducer.dart +++ b/lib/redux/invoice/invoice_reducer.dart @@ -7,7 +7,7 @@ import 'package:redux/redux.dart'; import 'package:invoiceninja/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja/redux/invoice/invoice_state.dart'; -EntityUIState invoiceUIReducer(InvoiceUIState state, action) { +EntityUIState invoiceUIReducer(InvoiceUIState state, dynamic action) { return state.rebuild((b) => b ..listUIState.replace(invoiceListReducer(state.listUIState, action)) ..editing.replace(editingReducer(state.editing, action)) @@ -45,11 +45,11 @@ final editingReducer = combineReducers([ TypedReducer(_clearEditing), ]); -InvoiceEntity _clearEditing(InvoiceEntity client, action) { +InvoiceEntity _clearEditing(InvoiceEntity client, dynamic action) { return InvoiceEntity(); } -InvoiceEntity _updateEditing(InvoiceEntity invoice, action) { +InvoiceEntity _updateEditing(InvoiceEntity invoice, dynamic action) { return action.invoice; } diff --git a/lib/redux/product/product_middleware.dart b/lib/redux/product/product_middleware.dart index 51b8e4fcb..fd0ae0444 100644 --- a/lib/redux/product/product_middleware.dart +++ b/lib/redux/product/product_middleware.dart @@ -82,7 +82,7 @@ Middleware _deleteProduct(ProductRepository repository) { if (action.completer != null) { action.completer.complete(null); } - }).catchError((error) { + }).catchError((Object error) { print(error); store.dispatch(DeleteProductFailure(origProduct)); if (action.completer != null) { diff --git a/lib/redux/product/product_reducer.dart b/lib/redux/product/product_reducer.dart index 10d24db3e..018ff29c8 100644 --- a/lib/redux/product/product_reducer.dart +++ b/lib/redux/product/product_reducer.dart @@ -6,7 +6,7 @@ import 'package:redux/redux.dart'; import 'package:invoiceninja/redux/product/product_actions.dart'; import 'package:invoiceninja/redux/product/product_state.dart'; -EntityUIState productUIReducer(ProductUIState state, action) { +EntityUIState productUIReducer(ProductUIState state, dynamic action) { return state.rebuild((b) => b ..listUIState.replace(productListReducer(state.listUIState, action)) ..editing.replace(editingReducer(state.editing, action)) @@ -33,11 +33,11 @@ final editingReducer = combineReducers([ TypedReducer(_clearEditing), ]); -ProductEntity _clearEditing(ProductEntity client, action) { +ProductEntity _clearEditing(ProductEntity client, dynamic action) { return ProductEntity(); } -ProductEntity _updateEditing(ProductEntity client, action) { +ProductEntity _updateEditing(ProductEntity client, dynamic action) { return action.product; } diff --git a/lib/redux/ui/ui_reducer.dart b/lib/redux/ui/ui_reducer.dart index 99cd47688..e55498c21 100644 --- a/lib/redux/ui/ui_reducer.dart +++ b/lib/redux/ui/ui_reducer.dart @@ -6,7 +6,7 @@ import 'package:invoiceninja/redux/product/product_reducer.dart'; import 'package:invoiceninja/redux/invoice/invoice_reducer.dart'; import 'package:redux/redux.dart'; -UIState uiReducer(UIState state, action) { +UIState uiReducer(UIState state, dynamic action) { return state.rebuild((b) => b ..selectedCompanyIndex = selectedCompanyIndexReducer(state.selectedCompanyIndex, action) diff --git a/lib/ui/client/edit/client_edit_billing_address.dart b/lib/ui/client/edit/client_edit_billing_address.dart index 28a97c3d4..335425878 100644 --- a/lib/ui/client/edit/client_edit_billing_address.dart +++ b/lib/ui/client/edit/client_edit_billing_address.dart @@ -38,7 +38,7 @@ class ClientEditBillingAddressState extends State { _postalCodeController, ]; - _controllers.forEach((controller) => controller.removeListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); var client = widget.viewModel.client; _address1Controller.text = client.address1; @@ -47,14 +47,14 @@ class ClientEditBillingAddressState extends State { _stateController.text = client.state; _postalCodeController.text = client.postalCode; - _controllers.forEach((controller) => controller.addListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.addListener(_onChanged)); super.didChangeDependencies(); } @override void dispose() { - _controllers.forEach((controller) { + _controllers.forEach((dynamic controller) { controller.removeListener(_onChanged); controller.dispose(); }); diff --git a/lib/ui/client/edit/client_edit_contacts.dart b/lib/ui/client/edit/client_edit_contacts.dart index e7c1affaa..21fc2b6f0 100644 --- a/lib/ui/client/edit/client_edit_contacts.dart +++ b/lib/ui/client/edit/client_edit_contacts.dart @@ -76,7 +76,7 @@ class ContactEditDetailsState extends State { _phoneController, ]; - _controllers.forEach((controller) => controller.removeListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); var contact = widget.contact; _firstNameController.text = contact.firstName; @@ -84,14 +84,14 @@ class ContactEditDetailsState extends State { _emailController.text = contact.email; _phoneController.text = contact.phone; - _controllers.forEach((controller) => controller.addListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.addListener(_onChanged)); super.didChangeDependencies(); } @override void dispose() { - _controllers.forEach((controller) { + _controllers.forEach((dynamic controller) { controller.removeListener(_onChanged); controller.dispose(); }); diff --git a/lib/ui/client/edit/client_edit_details.dart b/lib/ui/client/edit/client_edit_details.dart index 32a657ee4..afa537cea 100644 --- a/lib/ui/client/edit/client_edit_details.dart +++ b/lib/ui/client/edit/client_edit_details.dart @@ -36,7 +36,7 @@ class ClientEditDetailsState extends State { _phoneController, ]; - _controllers.forEach((controller) => controller.removeListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); var client = widget.viewModel.client; _nameController.text = client.name; @@ -45,14 +45,14 @@ class ClientEditDetailsState extends State { _websiteController.text = client.website; _phoneController.text = client.workPhone; - _controllers.forEach((controller) => controller.addListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.addListener(_onChanged)); super.didChangeDependencies(); } @override void dispose() { - _controllers.forEach((controller) { + _controllers.forEach((dynamic controller) { controller.removeListener(_onChanged); controller.dispose(); }); diff --git a/lib/ui/client/edit/client_edit_shipping_address.dart b/lib/ui/client/edit/client_edit_shipping_address.dart index d70ec2953..791fdde59 100644 --- a/lib/ui/client/edit/client_edit_shipping_address.dart +++ b/lib/ui/client/edit/client_edit_shipping_address.dart @@ -38,7 +38,7 @@ class ClientEditShippingAddressState extends State { _shippingPostalCodeController, ]; - _controllers.forEach((controller) => controller.removeListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); var client = widget.viewModel.client; _shippingAddress1Controller.text = client.shippingAddress1; @@ -47,14 +47,14 @@ class ClientEditShippingAddressState extends State { _shippingStateController.text = client.shippingState; _shippingPostalCodeController.text = client.shippingPostalCode; - _controllers.forEach((controller) => controller.addListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.addListener(_onChanged)); super.didChangeDependencies(); } @override void dispose() { - _controllers.forEach((controller) { + _controllers.forEach((dynamic controller) { controller.removeListener(_onChanged); controller.dispose(); }); diff --git a/lib/ui/invoice/edit/invoice_edit_details.dart b/lib/ui/invoice/edit/invoice_edit_details.dart index 61503fbed..5759b3281 100644 --- a/lib/ui/invoice/edit/invoice_edit_details.dart +++ b/lib/ui/invoice/edit/invoice_edit_details.dart @@ -42,7 +42,7 @@ class InvoiceEditDetailsState extends State with AutomaticKe _partialController, ]; - _controllers.forEach((controller) => controller.removeListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); final invoice = widget.viewModel.invoice; _invoiceNumberController.text = invoice.invoiceNumber; @@ -55,14 +55,14 @@ class InvoiceEditDetailsState extends State with AutomaticKe invoice.partial, widget.viewModel.state, formatNumberType: FormatNumberType.input); - _controllers.forEach((controller) => controller.addListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.addListener(_onChanged)); super.didChangeDependencies(); } @override void dispose() { - _controllers.forEach((controller) { + _controllers.forEach((dynamic controller) { controller.removeListener(_onChanged); controller.dispose(); }); diff --git a/lib/ui/invoice/edit/invoice_edit_items.dart b/lib/ui/invoice/edit/invoice_edit_items.dart index 691777729..165fc9a4d 100644 --- a/lib/ui/invoice/edit/invoice_edit_items.dart +++ b/lib/ui/invoice/edit/invoice_edit_items.dart @@ -78,7 +78,7 @@ class ItemEditDetailsState extends State with AutomaticKeepAliv _qtyController, ]; - _controllers.forEach((controller) => controller.removeListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); var invoiceItem = widget.invoiceItem; _productKeyController.text = invoiceItem.productKey; @@ -89,14 +89,14 @@ class ItemEditDetailsState extends State with AutomaticKeepAliv _qtyController.text = formatNumber(invoiceItem.qty, widget.viewModel.state, formatNumberType: FormatNumberType.input); - _controllers.forEach((controller) => controller.addListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.addListener(_onChanged)); super.didChangeDependencies(); } @override void dispose() { - _controllers.forEach((controller) { + _controllers.forEach((dynamic controller) { controller.removeListener(_onChanged); controller.dispose(); }); diff --git a/lib/ui/product/edit/product_edit.dart b/lib/ui/product/edit/product_edit.dart index 2325855a7..96cb62d9d 100644 --- a/lib/ui/product/edit/product_edit.dart +++ b/lib/ui/product/edit/product_edit.dart @@ -38,21 +38,21 @@ class _ProductEditState extends State { _costController, ]; - _controllers.forEach((controller) => controller.removeListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); var product = widget.viewModel.product; _productKeyController.text = product.productKey; _notesController.text = product.notes; _costController.text = formatNumber(product.cost, widget.viewModel.state, formatNumberType: FormatNumberType.input); - _controllers.forEach((controller) => controller.addListener(_onChanged)); + _controllers.forEach((dynamic controller) => controller.addListener(_onChanged)); super.didChangeDependencies(); } @override void dispose() { - _controllers.forEach((controller) { + _controllers.forEach((dynamic controller) { controller.removeListener(_onChanged); controller.dispose(); }); diff --git a/samples/form_redux.dart b/samples/form_redux.dart index 342ff5bd7..06a254f62 100644 --- a/samples/form_redux.dart +++ b/samples/form_redux.dart @@ -61,7 +61,7 @@ class DeleteContact { DeleteContact(this.index); } -AppState reducer(AppState state, action) { +AppState reducer(AppState state, dynamic action) { // In an actual app you'd most like want to // use built_value to rebuild the state if (action is UpdateClient) {