Refactor

lib/redux/app/app_middleware.dart

@@ -126,7 +126,7 @@ Middleware<AppState> _createLoadState(
   CompanyState company4State;
   CompanyState company5State;
 
-  return (Store<AppState> store, action, NextDispatcher next) {
+  return (Store<AppState> store, dynamic action, NextDispatcher next) {
     authRepository.exists().then((exists) {
       if (exists) {
         authRepository.loadAuthState().then((state) {
@@ -233,7 +233,7 @@ Middleware<AppState> _createUserLoggedIn(
   PersistenceRepository company4Repository,
   PersistenceRepository company5Repository,
 ) {
-  return (Store<AppState> store, action, NextDispatcher next) {
+  return (Store<AppState> store, dynamic action, NextDispatcher next) {
     next(action);
 
     var state = store.state;
@@ -250,7 +250,7 @@ Middleware<AppState> _createUserLoggedIn(
 }
 
 Middleware<AppState> _createUIChange(PersistenceRepository uiRepository) {
-  return (Store<AppState> store, action, NextDispatcher next) {
+  return (Store<AppState> store, dynamic action, NextDispatcher next) {
     next(action);
 
     uiRepository.saveUIState(store.state.uiState);
@@ -264,7 +264,7 @@ Middleware<AppState> _createDataLoaded(
   PersistenceRepository company4Repository,
   PersistenceRepository company5Repository,
 ) {
-  return (Store<AppState> store, action, NextDispatcher next) {
+  return (Store<AppState> store, dynamic action, NextDispatcher next) {
     // first process the action so the data is in the state
     next(action);
 
@@ -300,7 +300,7 @@ Middleware<AppState> _createDeleteState(
   PersistenceRepository company4Repository,
   PersistenceRepository company5Repository,
 ) {
-  return (Store<AppState> store, action, NextDispatcher next) {
+  return (Store<AppState> store, dynamic action, NextDispatcher next) {
     authRepository.delete();
     uiRepository.delete();
     staticRepository.delete();

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) {

lib/redux/auth/auth_middleware.dart

@@ -21,7 +21,7 @@ List<Middleware<AppState>> 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<AppState> store, action) async {
+_loadAuthLocal(Store<AppState> store, dynamic action) async {
   SharedPreferences prefs = await SharedPreferences.getInstance();
 
   String email = prefs.getString('email') ?? Config.LOGIN_EMAIL;
@@ -47,7 +47,7 @@ _loadAuthLocal(Store<AppState> store, action) async {
 }
 
 Middleware<AppState> _createLoginInit() {
-  return (Store<AppState> store, action, NextDispatcher next) {
+  return (Store<AppState> store, dynamic action, NextDispatcher next) {
     _loadAuthLocal(store, action);
 
     next(action);
@@ -55,7 +55,7 @@ Middleware<AppState> _createLoginInit() {
 }
 
 Middleware<AppState> _createLoginRequest(AuthRepository repository) {
-  return (Store<AppState> store, action, NextDispatcher next) {
+  return (Store<AppState> store, dynamic action, NextDispatcher next) {
     repository
         .login(action.email, action.password, action.url, action.secret)
         .then((data) {
@@ -76,7 +76,7 @@ Middleware<AppState> _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()));
     });

lib/redux/client/client_middleware.dart

@@ -72,7 +72,7 @@ Middleware<AppState> _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) {

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))

lib/redux/dashboard/dashboard_middleware.dart

@@ -21,7 +21,7 @@ List<Middleware<AppState>> createStoreDashboardMiddleware([
 
 
 Middleware<AppState> _createViewDashboard() {
-  return (Store<AppState> store, action, NextDispatcher next) {
+  return (Store<AppState> store, dynamic action, NextDispatcher next) {
     store.dispatch(LoadDashboard());
     store.dispatch(UpdateCurrentRoute(DashboardScreen.route));
 
@@ -35,7 +35,7 @@ Middleware<AppState> _createViewDashboard() {
 }
 
 Middleware<AppState> _createLoadDashboard(DashboardRepository repository) {
-  return (Store<AppState> store, action, NextDispatcher next) {
+  return (Store<AppState> store, dynamic action, NextDispatcher next) {
     AppState state = store.state;
 
     if (!state.dashboardState.isStale && !action.force) {
@@ -57,7 +57,7 @@ Middleware<AppState> _createLoadDashboard(DashboardRepository repository) {
       if (state.clientState.isStale) {
         store.dispatch(LoadClients());
       }
-    }).catchError((error) {
+    }).catchError((Object error) {
       print(error);
       store.dispatch(LoadDashboardFailure(error));
     });

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<InvoiceEntity>([
   TypedReducer<InvoiceEntity, SelectCompany>(_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;
 }
 

lib/redux/product/product_middleware.dart

@@ -82,7 +82,7 @@ Middleware<AppState> _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) {

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<ProductEntity>([
   TypedReducer<ProductEntity, SelectCompany>(_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;
 }
 

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)

lib/ui/client/edit/client_edit_billing_address.dart

@@ -38,7 +38,7 @@ class ClientEditBillingAddressState extends State<ClientEditBillingAddress> {
       _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<ClientEditBillingAddress> {
     _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();
     });

lib/ui/client/edit/client_edit_contacts.dart

@@ -76,7 +76,7 @@ class ContactEditDetailsState extends State<ContactEditDetails> {
       _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<ContactEditDetails> {
     _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();
     });

lib/ui/client/edit/client_edit_details.dart

@@ -36,7 +36,7 @@ class ClientEditDetailsState extends State<ClientEditDetails> {
       _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<ClientEditDetails> {
     _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();
     });

lib/ui/client/edit/client_edit_shipping_address.dart

@@ -38,7 +38,7 @@ class ClientEditShippingAddressState extends State<ClientEditShippingAddress> {
       _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<ClientEditShippingAddress> {
     _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();
     });

lib/ui/invoice/edit/invoice_edit_details.dart

@@ -42,7 +42,7 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> 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<InvoiceEditDetails> 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();
     });

lib/ui/invoice/edit/invoice_edit_items.dart

@@ -78,7 +78,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> 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<ItemEditDetails> 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();
     });

lib/ui/product/edit/product_edit.dart

@@ -38,21 +38,21 @@ class _ProductEditState extends State<ProductEdit> {
       _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();
     });

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) {