diff --git a/lib/data/models/static/date_format_model.dart b/lib/data/models/static/date_format_model.dart index 6226f6053..33be62f61 100644 --- a/lib/data/models/static/date_format_model.dart +++ b/lib/data/models/static/date_format_model.dart @@ -6,10 +6,11 @@ part 'date_format_model.g.dart'; abstract class DateFormatListResponse implements Built { + factory DateFormatListResponse([void updates(DateFormatListResponseBuilder b)]) = _$DateFormatListResponse; + DateFormatListResponse._(); + BuiltList get data; - DateFormatListResponse._(); - factory DateFormatListResponse([void updates(DateFormatListResponseBuilder b)]) = _$DateFormatListResponse; static Serializer get serializer => _$dateFormatListResponseSerializer; } diff --git a/lib/data/repositories/client_repository.dart b/lib/data/repositories/client_repository.dart index 32f7557b7..ac4036cb1 100644 --- a/lib/data/repositories/client_repository.dart +++ b/lib/data/repositories/client_repository.dart @@ -28,7 +28,7 @@ class ClientRepository { Future saveData(CompanyEntity company, AuthState auth, ClientEntity client, [EntityAction action]) async { - var data = serializers.serializeWith(ClientEntity.serializer, client); + final data = serializers.serializeWith(ClientEntity.serializer, client); Future response; if (client.isNew) { @@ -42,7 +42,7 @@ class ClientRepository { response = await webClient.put(url, company.token, json.encode(data)); } - ClientItemResponse clientResponse = serializers.deserializeWith( + final ClientItemResponse clientResponse = serializers.deserializeWith( ClientItemResponse.serializer, response); return clientResponse.data; diff --git a/lib/data/repositories/credit_repository.dart b/lib/data/repositories/credit_repository.dart index 34c0c44b1..acc4e503f 100644 --- a/lib/data/repositories/credit_repository.dart +++ b/lib/data/repositories/credit_repository.dart @@ -20,7 +20,7 @@ class CreditsRepository { final Future response = await webClient.get( auth.url + '/credits?per_page=500', company.token); - CreditListResponse creditResponse = serializers.deserializeWith( + final CreditListResponse creditResponse = serializers.deserializeWith( CreditListResponse.serializer, response); return creditResponse.data; @@ -28,7 +28,7 @@ class CreditsRepository { Future saveData(CompanyEntity company, AuthState auth, CreditEntity credit, [EntityAction action]) async { - var data = serializers.serializeWith(CreditEntity.serializer, credit); + final data = serializers.serializeWith(CreditEntity.serializer, credit); Future response; if (credit.isNew) { diff --git a/lib/data/repositories/expense_repository.dart b/lib/data/repositories/expense_repository.dart index ffa595dbc..8fb332cbf 100644 --- a/lib/data/repositories/expense_repository.dart +++ b/lib/data/repositories/expense_repository.dart @@ -20,7 +20,7 @@ class ExpenseRepository { final Future response = await webClient.get( auth.url + '/expenses?per_page=500', company.token); - ExpenseListResponse expenseResponse = serializers.deserializeWith( + final ExpenseListResponse expenseResponse = serializers.deserializeWith( ExpenseListResponse.serializer, response); return expenseResponse.data; @@ -42,7 +42,7 @@ class ExpenseRepository { response = await webClient.put(url, company.token, json.encode(data)); } - ExpenseItemResponse expenseResponse = serializers.deserializeWith( + final ExpenseItemResponse expenseResponse = serializers.deserializeWith( ExpenseItemResponse.serializer, response); return expenseResponse.data; diff --git a/lib/data/repositories/invoice_repository.dart b/lib/data/repositories/invoice_repository.dart index 44a26d163..234a527b5 100644 --- a/lib/data/repositories/invoice_repository.dart +++ b/lib/data/repositories/invoice_repository.dart @@ -20,7 +20,7 @@ class InvoiceRepository { final Future response = await webClient.get( auth.url + '/invoices?include=invitations', company.token); - InvoiceListResponse invoiceResponse = serializers.deserializeWith( + final InvoiceListResponse invoiceResponse = serializers.deserializeWith( InvoiceListResponse.serializer, response); return invoiceResponse.data; @@ -28,7 +28,7 @@ class InvoiceRepository { Future saveData(CompanyEntity company, AuthState auth, InvoiceEntity invoice, [EntityAction action]) async { - var data = serializers.serializeWith(InvoiceEntity.serializer, invoice); + final data = serializers.serializeWith(InvoiceEntity.serializer, invoice); Future response; if (invoice.isNew) { diff --git a/lib/data/repositories/payment_repository.dart b/lib/data/repositories/payment_repository.dart index ac64b27db..65fe9e399 100644 --- a/lib/data/repositories/payment_repository.dart +++ b/lib/data/repositories/payment_repository.dart @@ -20,7 +20,7 @@ class PaymentsRepository { final Future response = await webClient.get( auth.url + '/payments?per_page=500', company.token); - PaymentListResponse paymentResponse = serializers.deserializeWith( + final PaymentListResponse paymentResponse = serializers.deserializeWith( PaymentListResponse.serializer, response); return paymentResponse.data; @@ -42,7 +42,7 @@ class PaymentsRepository { response = await webClient.put(url, company.token, json.encode(data)); } - PaymentItemResponse paymentResponse = serializers.deserializeWith( + final PaymentItemResponse paymentResponse = serializers.deserializeWith( PaymentItemResponse.serializer, response); return paymentResponse.data; diff --git a/lib/data/repositories/persistence_repository.dart b/lib/data/repositories/persistence_repository.dart index 66cd55c83..b4e94bff7 100644 --- a/lib/data/repositories/persistence_repository.dart +++ b/lib/data/repositories/persistence_repository.dart @@ -32,7 +32,7 @@ class PersistenceRepository { Future saveAuthState(AuthState state) async { - var data = serializers.serializeWith(AuthState.serializer, state); + final data = serializers.serializeWith(AuthState.serializer, state); return await fileStorage.save(json.encode(data)); } @@ -54,7 +54,7 @@ class PersistenceRepository { Future saveUIState(UIState state) async { - var data = serializers.serializeWith(UIState.serializer, state); + final data = serializers.serializeWith(UIState.serializer, state); return await fileStorage.save(json.encode(data)); } diff --git a/lib/data/repositories/product_repository.dart b/lib/data/repositories/product_repository.dart index 8fc0e905a..44665f6a6 100644 --- a/lib/data/repositories/product_repository.dart +++ b/lib/data/repositories/product_repository.dart @@ -28,7 +28,7 @@ class ProductRepository { Future saveData(CompanyEntity company, AuthState auth, ProductEntity product, [EntityAction action]) async { - var data = serializers.serializeWith(ProductEntity.serializer, product); + final data = serializers.serializeWith(ProductEntity.serializer, product); Future response; if (product.isNew) { @@ -42,7 +42,7 @@ class ProductRepository { response = await webClient.put(url, company.token, json.encode(data)); } - ProductItemResponse productResponse = serializers.deserializeWith( + final ProductItemResponse productResponse = serializers.deserializeWith( ProductItemResponse.serializer, response); return productResponse.data; diff --git a/lib/data/repositories/project_repository.dart b/lib/data/repositories/project_repository.dart index 677b0fccd..325cd5a2a 100644 --- a/lib/data/repositories/project_repository.dart +++ b/lib/data/repositories/project_repository.dart @@ -20,7 +20,7 @@ class ProjectsRepository { final Future response = await webClient.get( auth.url + '/projects?per_page=500', company.token); - ProjectListResponse projectResponse = serializers.deserializeWith( + final ProjectListResponse projectResponse = serializers.deserializeWith( ProjectListResponse.serializer, response); return projectResponse.data; @@ -42,7 +42,7 @@ class ProjectsRepository { response = await webClient.put(url, company.token, json.encode(data)); } - ProjectItemResponse projectResponse = serializers.deserializeWith( + final ProjectItemResponse projectResponse = serializers.deserializeWith( ProjectItemResponse.serializer, response); return projectResponse.data; diff --git a/lib/data/repositories/task_repository.dart b/lib/data/repositories/task_repository.dart index 04a52620c..f650efc0b 100644 --- a/lib/data/repositories/task_repository.dart +++ b/lib/data/repositories/task_repository.dart @@ -20,7 +20,7 @@ class TasksRepository { final Future response = await webClient.get( auth.url + '/tasks?per_page=500', company.token); - TaskListResponse taskResponse = serializers.deserializeWith( + final TaskListResponse taskResponse = serializers.deserializeWith( TaskListResponse.serializer, response); return taskResponse.data; @@ -28,7 +28,7 @@ class TasksRepository { Future saveData(CompanyEntity company, AuthState auth, TaskEntity task, [EntityAction action]) async { - var data = serializers.serializeWith(TaskEntity.serializer, task); + final data = serializers.serializeWith(TaskEntity.serializer, task); Future response; if (task.isNew) { diff --git a/lib/data/repositories/vendor_repository.dart b/lib/data/repositories/vendor_repository.dart index 95ccd146b..332e4aeb6 100644 --- a/lib/data/repositories/vendor_repository.dart +++ b/lib/data/repositories/vendor_repository.dart @@ -20,7 +20,7 @@ class VendorRepository { final Future response = await webClient.get( auth.url + '/vendors?per_page=500', company.token); - VendorListResponse vendorResponse = serializers.deserializeWith( + final VendorListResponse vendorResponse = serializers.deserializeWith( VendorListResponse.serializer, response); return vendorResponse.data; @@ -28,7 +28,7 @@ class VendorRepository { Future saveData(CompanyEntity company, AuthState auth, VendorEntity vendor, [EntityAction action]) async { - var data = serializers.serializeWith(VendorEntity.serializer, vendor); + final data = serializers.serializeWith(VendorEntity.serializer, vendor); Future response; if (vendor.isNew) { diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart index 72502922c..1b76f3ca1 100644 --- a/lib/redux/app/app_middleware.dart +++ b/lib/redux/app/app_middleware.dart @@ -236,7 +236,7 @@ Middleware _createUserLoggedIn( return (Store store, dynamic action, NextDispatcher next) { next(action); - var state = store.state; + final state = store.state; authRepository.saveAuthState(state.authState); uiRepository.saveUIState(state.uiState); @@ -268,7 +268,7 @@ Middleware _createDataLoaded( // first process the action so the data is in the state next(action); - AppState state = store.state; + final AppState state = store.state; switch (state.uiState.selectedCompanyIndex) { case 1: diff --git a/lib/redux/auth/auth_middleware.dart b/lib/redux/auth/auth_middleware.dart index 261fc3959..dbeb50bb4 100644 --- a/lib/redux/auth/auth_middleware.dart +++ b/lib/redux/auth/auth_middleware.dart @@ -88,8 +88,8 @@ Middleware _createLoginRequest(AuthRepository repository) { bool _isVersionSupported(String version) { var parts = version.split('.'); - int major = int.parse(parts[0]); - int minor = int.parse(parts[1]); + final int major = int.parse(parts[0]); + final int minor = int.parse(parts[1]); return true; diff --git a/lib/redux/client/client_middleware.dart b/lib/redux/client/client_middleware.dart index f1a917456..588131b01 100644 --- a/lib/redux/client/client_middleware.dart +++ b/lib/redux/client/client_middleware.dart @@ -86,7 +86,7 @@ Middleware _archiveClient(ClientRepository repository) { Middleware _deleteClient(ClientRepository repository) { return (Store store, dynamic action, NextDispatcher next) { - var origClient = store.state.clientState.map[action.clientId]; + final origClient = store.state.clientState.map[action.clientId]; repository .saveData(store.state.selectedCompany, store.state.authState, origClient, EntityAction.delete) @@ -155,7 +155,7 @@ Middleware _saveClient(ClientRepository repository) { Middleware _loadClients(ClientRepository repository) { return (Store store, dynamic action, NextDispatcher next) { - AppState state = store.state; + final AppState state = store.state; if (!state.clientState.isStale && !action.force) { next(action); diff --git a/lib/redux/client/client_reducer.dart b/lib/redux/client/client_reducer.dart index 53fc3ae55..33c91a1e0 100644 --- a/lib/redux/client/client_reducer.dart +++ b/lib/redux/client/client_reducer.dart @@ -120,7 +120,7 @@ final clientsReducer = combineReducers([ ]); ClientState _archiveClientRequest(ClientState clientState, ArchiveClientRequest action) { - var client = clientState.map[action.clientId].rebuild((b) => b + final client = clientState.map[action.clientId].rebuild((b) => b ..archivedAt = DateTime.now().millisecondsSinceEpoch ); diff --git a/lib/redux/client/client_selectors.dart b/lib/redux/client/client_selectors.dart index 224f02d45..7cef6dfff 100644 --- a/lib/redux/client/client_selectors.dart +++ b/lib/redux/client/client_selectors.dart @@ -14,8 +14,8 @@ List dropdownClientsSelector( BuiltList clientList, String filter) { - var list = clientList.where((clientId) { - var client = clientMap[clientId]; + final list = clientList.where((clientId) { + final client = clientMap[clientId]; if (! client.isActive) { return false; } @@ -52,8 +52,8 @@ List visibleClientsSelector( }).toList(); list.sort((clientAId, clientBId) { - var clientA = clientMap[clientAId]; - var clientB = clientMap[clientBId]; + final clientA = clientMap[clientAId]; + final clientB = clientMap[clientBId]; return clientA.compareTo(clientB, clientListState.sortField, clientListState.sortAscending); }); diff --git a/lib/redux/invoice/invoice_middleware.dart b/lib/redux/invoice/invoice_middleware.dart index c2f4999c6..6b95e303c 100644 --- a/lib/redux/invoice/invoice_middleware.dart +++ b/lib/redux/invoice/invoice_middleware.dart @@ -65,7 +65,7 @@ Middleware _editInvoice() { Middleware _archiveInvoice(InvoiceRepository repository) { return (Store store, dynamic action, NextDispatcher next) { - var origInvoice = store.state.invoiceState.map[action.invoiceId]; + final origInvoice = store.state.invoiceState.map[action.invoiceId]; repository .saveData(store.state.selectedCompany, store.state.authState, origInvoice, EntityAction.archive) @@ -180,7 +180,7 @@ Middleware _saveInvoice(InvoiceRepository repository) { Middleware _loadInvoices(InvoiceRepository repository) { return (Store store, dynamic action, NextDispatcher next) { - AppState state = store.state; + final AppState state = store.state; if (!state.invoiceState.isStale && !action.force) { next(action); diff --git a/lib/redux/invoice/invoice_reducer.dart b/lib/redux/invoice/invoice_reducer.dart index 56e81a383..56a59b018 100644 --- a/lib/redux/invoice/invoice_reducer.dart +++ b/lib/redux/invoice/invoice_reducer.dart @@ -129,7 +129,7 @@ final invoicesReducer = combineReducers([ ]); InvoiceState _archiveInvoiceRequest(InvoiceState invoiceState, ArchiveInvoiceRequest action) { - var invoice = invoiceState.map[action.invoiceId].rebuild((b) => b + final invoice = invoiceState.map[action.invoiceId].rebuild((b) => b ..archivedAt = DateTime.now().millisecondsSinceEpoch ); @@ -151,7 +151,7 @@ InvoiceState _archiveInvoiceFailure(InvoiceState invoiceState, ArchiveInvoiceFai } InvoiceState _deleteInvoiceRequest(InvoiceState invoiceState, DeleteInvoiceRequest action) { - var invoice = invoiceState.map[action.invoiceId].rebuild((b) => b + final invoice = invoiceState.map[action.invoiceId].rebuild((b) => b ..archivedAt = DateTime.now().millisecondsSinceEpoch ..isDeleted = true ); diff --git a/lib/redux/product/product_middleware.dart b/lib/redux/product/product_middleware.dart index cd044ad05..42e22e3e8 100644 --- a/lib/redux/product/product_middleware.dart +++ b/lib/redux/product/product_middleware.dart @@ -141,7 +141,7 @@ Middleware _saveProduct(ProductRepository repository) { Middleware _loadProducts(ProductRepository repository) { return (Store store, dynamic action, NextDispatcher next) { - AppState state = store.state; + final AppState state = store.state; if (!state.productState.isStale && !action.force) { next(action); diff --git a/lib/redux/product/product_reducer.dart b/lib/redux/product/product_reducer.dart index d464c533a..e0e016778 100644 --- a/lib/redux/product/product_reducer.dart +++ b/lib/redux/product/product_reducer.dart @@ -93,7 +93,7 @@ final productsReducer = combineReducers([ ]); ProductState _archiveProductRequest(ProductState productState, ArchiveProductRequest action) { - var product = productState.map[action.productId].rebuild((b) => b + final product = productState.map[action.productId].rebuild((b) => b ..archivedAt = DateTime.now().millisecondsSinceEpoch ); diff --git a/lib/redux/product/product_selectors.dart b/lib/redux/product/product_selectors.dart index 3c8441b93..e57f4f276 100644 --- a/lib/redux/product/product_selectors.dart +++ b/lib/redux/product/product_selectors.dart @@ -14,8 +14,8 @@ List visibleProductsSelector( BuiltList productList, ListUIState productListState) { - var list = productList.where((productId) { - var product = productMap[productId]; + final list = productList.where((productId) { + final product = productMap[productId]; if (! product.matchesStates(productListState.stateFilters)) { return false; } diff --git a/lib/ui/client/client_screen.dart b/lib/ui/client/client_screen.dart index c54f1ddc8..920833b7d 100644 --- a/lib/ui/client/client_screen.dart +++ b/lib/ui/client/client_screen.dart @@ -15,8 +15,8 @@ class ClientScreen extends StatelessWidget { @override Widget build(BuildContext context) { - var store = StoreProvider.of(context); - var localization = AppLocalization.of(context); + final store = StoreProvider.of(context); + final localization = AppLocalization.of(context); return Scaffold( appBar: AppBar( diff --git a/lib/ui/client/edit/client_edit_billing_address.dart b/lib/ui/client/edit/client_edit_billing_address.dart index 64009790a..fcd9eb90b 100644 --- a/lib/ui/client/edit/client_edit_billing_address.dart +++ b/lib/ui/client/edit/client_edit_billing_address.dart @@ -40,7 +40,7 @@ class ClientEditBillingAddressState extends State { _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); - var client = widget.viewModel.client; + final client = widget.viewModel.client; _address1Controller.text = client.address1; _address2Controller.text = client.address2; _cityController.text = client.city; @@ -63,7 +63,7 @@ class ClientEditBillingAddressState extends State { } void _onChanged() { - var client = widget.viewModel.client.rebuild((b) => b + final client = widget.viewModel.client.rebuild((b) => b ..address1 = _address1Controller.text.trim() ..address2 = _address2Controller.text.trim() ..city = _cityController.text.trim() diff --git a/lib/ui/client/edit/client_edit_contacts.dart b/lib/ui/client/edit/client_edit_contacts.dart index 8a8080ee4..b9cee3170 100644 --- a/lib/ui/client/edit/client_edit_contacts.dart +++ b/lib/ui/client/edit/client_edit_contacts.dart @@ -15,9 +15,9 @@ class ClientEditContacts extends StatelessWidget { @override Widget build(BuildContext context) { - var localization = AppLocalization.of(context); - var client = viewModel.client; - var contacts = client.contacts.map((contact) => ContactEditDetails( + final localization = AppLocalization.of(context); + final client = viewModel.client; + final contacts = client.contacts.map((contact) => ContactEditDetails( viewModel: viewModel, key: Key('__${EntityType.contact}_${contact.id}__'), isRemoveVisible: client.contacts.length > 1, diff --git a/lib/ui/client/edit/client_edit_details.dart b/lib/ui/client/edit/client_edit_details.dart index 387b70307..3466ff1d5 100644 --- a/lib/ui/client/edit/client_edit_details.dart +++ b/lib/ui/client/edit/client_edit_details.dart @@ -38,7 +38,7 @@ class ClientEditDetailsState extends State { _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); - var client = widget.viewModel.client; + final client = widget.viewModel.client; _nameController.text = client.name; _idNumberController.text = client.idNumber; _vatNumberController.text = client.vatNumber; @@ -76,7 +76,7 @@ class ClientEditDetailsState extends State { @override Widget build(BuildContext context) { - var localization = AppLocalization.of(context); + final localization = AppLocalization.of(context); return ListView( shrinkWrap: true, diff --git a/lib/ui/client/edit/client_edit_shipping_address.dart b/lib/ui/client/edit/client_edit_shipping_address.dart index 575f90321..d344b3c8c 100644 --- a/lib/ui/client/edit/client_edit_shipping_address.dart +++ b/lib/ui/client/edit/client_edit_shipping_address.dart @@ -63,7 +63,7 @@ class ClientEditShippingAddressState extends State { } void _onChanged() { - var client = widget.viewModel.client.rebuild((b) => b + final client = widget.viewModel.client.rebuild((b) => b ..shippingAddress1 = _shippingAddress1Controller.text.trim() ..shippingAddress2 = _shippingAddress2Controller.text.trim() ..shippingCity = _shippingCityController.text.trim() diff --git a/lib/ui/client/view/client_view_details.dart b/lib/ui/client/view/client_view_details.dart index d58e81a9b..2f029b8dc 100644 --- a/lib/ui/client/view/client_view_details.dart +++ b/lib/ui/client/view/client_view_details.dart @@ -30,7 +30,7 @@ class _ClientViewDetailsState extends State { } Widget _launchStatus(BuildContext context, AsyncSnapshot snapshot) { - var localization = AppLocalization.of(context); + final localization = AppLocalization.of(context); if (snapshot.hasError) { return new Text('${localization.error}: ${snapshot.error}'); } else { @@ -49,7 +49,7 @@ class _ClientViewDetailsState extends State { listTiles .add(FutureBuilder(future: _launched, builder: _launchStatus)); - var contacts = client.contacts; + final contacts = client.contacts; contacts.forEach((contact) { if ((contact.email ?? '').isNotEmpty) { listTiles.add(AppListTile( diff --git a/lib/ui/invoice/edit/invoice_edit_items.dart b/lib/ui/invoice/edit/invoice_edit_items.dart index a13fc949b..94ba5913d 100644 --- a/lib/ui/invoice/edit/invoice_edit_items.dart +++ b/lib/ui/invoice/edit/invoice_edit_items.dart @@ -80,7 +80,7 @@ class ItemEditDetailsState extends State with AutomaticKeepAliv _controllers.forEach((dynamic controller) => controller.removeListener(_onChanged)); - var invoiceItem = widget.invoiceItem; + final invoiceItem = widget.invoiceItem; _productKeyController.text = invoiceItem.productKey; _notesController.text = invoiceItem.notes; _costController.text = formatNumber( @@ -105,7 +105,7 @@ class ItemEditDetailsState extends State with AutomaticKeepAliv } void _onChanged() { - var invoiceItem = widget.invoiceItem.rebuild((b) => b + final invoiceItem = widget.invoiceItem.rebuild((b) => b ..productKey = _productKeyController.text.trim() ..notes = _notesController.text.trim() ..cost = double.tryParse(_costController.text) ?? 0.0 diff --git a/lib/ui/invoice/edit/invoice_edit_vm.dart b/lib/ui/invoice/edit/invoice_edit_vm.dart index 26f3e7c57..62a52cbbc 100644 --- a/lib/ui/invoice/edit/invoice_edit_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_vm.dart @@ -55,7 +55,7 @@ class InvoiceEditVM { }); factory InvoiceEditVM.fromStore(Store store) { - AppState state = store.state; + final AppState state = store.state; final invoice = state.invoiceUIState.editing; return InvoiceEditVM( diff --git a/lib/ui/invoice/edit/invoice_item_selector.dart b/lib/ui/invoice/edit/invoice_item_selector.dart index 3cc1edaec..7bc9564b2 100644 --- a/lib/ui/invoice/edit/invoice_item_selector.dart +++ b/lib/ui/invoice/edit/invoice_item_selector.dart @@ -59,7 +59,7 @@ class _InvoiceItemSelectorState extends State { @override Widget build(BuildContext context) { - var localization = AppLocalization.of(context); + final localization = AppLocalization.of(context); Widget _headerRow() { return Row( @@ -132,8 +132,8 @@ class _InvoiceItemSelectorState extends State { } Widget _entityList() { - var state = widget.state.selectedCompanyState.productState; - var matches = state.list + final state = widget.state.selectedCompanyState.productState; + final matches = state.list .where((entityId) => state.map[entityId].matchesSearch(_filter)) .toList(); diff --git a/lib/ui/invoice/invoice_screen.dart b/lib/ui/invoice/invoice_screen.dart index 54db1d0f9..20866716a 100644 --- a/lib/ui/invoice/invoice_screen.dart +++ b/lib/ui/invoice/invoice_screen.dart @@ -15,8 +15,8 @@ class InvoiceScreen extends StatelessWidget { @override Widget build(BuildContext context) { - var store = StoreProvider.of(context); - var localization = AppLocalization.of(context); + final store = StoreProvider.of(context); + final localization = AppLocalization.of(context); return Scaffold( appBar: AppBar( diff --git a/lib/ui/invoice/view/invoice_view.dart b/lib/ui/invoice/view/invoice_view.dart index 38b60b471..94ac72b89 100644 --- a/lib/ui/invoice/view/invoice_view.dart +++ b/lib/ui/invoice/view/invoice_view.dart @@ -49,7 +49,7 @@ class _InvoiceViewState extends State { ), ]; - Map fields = { + final Map fields = { InvoiceFields.invoiceStatusId: invoiceStatusSelector(invoice, store.state.staticState), InvoiceFields.invoiceDate: invoice.invoiceDate, @@ -67,7 +67,7 @@ class _InvoiceViewState extends State { : FormatNumberType.percent), }; - List fieldWidgets = []; + final List fieldWidgets = []; fields.forEach((field, value) { if (value != null && value.isNotEmpty) { fieldWidgets.add(Column( diff --git a/lib/ui/invoice/view/invoice_view_vm.dart b/lib/ui/invoice/view/invoice_view_vm.dart index 9b9db8245..6c390f5fb 100644 --- a/lib/ui/invoice/view/invoice_view_vm.dart +++ b/lib/ui/invoice/view/invoice_view_vm.dart @@ -62,7 +62,7 @@ class InvoiceViewVM { final client = store.state.clientState.map[invoice.clientId]; Future _viewPdf(BuildContext context) async { - var localization = AppLocalization.of(context); + final localization = AppLocalization.of(context); String url; bool useWebView; diff --git a/lib/ui/product/edit/product_edit.dart b/lib/ui/product/edit/product_edit.dart index 407b46b66..596caab74 100644 --- a/lib/ui/product/edit/product_edit.dart +++ b/lib/ui/product/edit/product_edit.dart @@ -61,7 +61,7 @@ class _ProductEditState extends State { } void _onChanged() { - var product = widget.viewModel.product.rebuild((b) => b + final product = widget.viewModel.product.rebuild((b) => b ..productKey = _productKeyController.text.trim() ..notes = _notesController.text.trim() ..cost = double.tryParse(_costController.text) ?? 0.0 diff --git a/lib/ui/product/product_screen.dart b/lib/ui/product/product_screen.dart index 24719bb0a..ad1433268 100644 --- a/lib/ui/product/product_screen.dart +++ b/lib/ui/product/product_screen.dart @@ -16,8 +16,8 @@ class ProductScreen extends StatelessWidget { @override Widget build(BuildContext context) { - var store = StoreProvider.of(context); - var localization = AppLocalization.of(context); + final store = StoreProvider.of(context); + final localization = AppLocalization.of(context); return Scaffold( appBar: AppBar( diff --git a/lib/utils/formatting.dart b/lib/utils/formatting.dart index 8169eafe7..bf6071406 100644 --- a/lib/utils/formatting.dart +++ b/lib/utils/formatting.dart @@ -47,8 +47,8 @@ String formatNumber( currencyId = kCurrencyUSDollar; } - CurrencyEntity currency = state.staticState.currencyMap[currencyId]; - CountryEntity country = state.staticState.countryMap[countryId]; + final CurrencyEntity currency = state.staticState.currencyMap[currencyId]; + final CountryEntity country = state.staticState.countryMap[countryId]; String thousandSeparator = currency.thousandSeparator; String decimalSeparator = currency.decimalSeparator; diff --git a/samples/form_keys.dart b/samples/form_keys.dart index c50e5d1dd..15ef961c8 100644 --- a/samples/form_keys.dart +++ b/samples/form_keys.dart @@ -176,7 +176,7 @@ class ContactsPageState extends State } List getContacts() { - List contacts = []; + final List contacts = []; _contactKeys.forEach((contactKey) { contacts.add(contactKey.currentState.getContact()); }); diff --git a/samples/form_redux.dart b/samples/form_redux.dart index f8a609fe4..90ef997a9 100644 --- a/samples/form_redux.dart +++ b/samples/form_redux.dart @@ -233,8 +233,8 @@ class ContactsPage extends StatelessWidget { @override Widget build(BuildContext context) { return StoreBuilder(builder: (BuildContext context, Store store) { - var client = store.state.client; - var contacts = client.contacts.map((contact) => ContactForm( + final client = store.state.client; + final contacts = client.contacts.map((contact) => ContactForm( contact: contact, //key: Key('__contact_${contact.id}__'), index: store.state.client.contacts.indexOf(contact))); diff --git a/test_driver/widget_test.dart b/test_driver/widget_test.dart index 94bc5e392..95b1735f6 100644 --- a/test_driver/widget_test.dart +++ b/test_driver/widget_test.dart @@ -20,7 +20,7 @@ void main() { test('measure', () async { // Record the performance timeline of things that happen inside the closure - Timeline timeline = await driver.traceAction(() async { + final Timeline timeline = await driver.traceAction(() async { //SerializableFinder email = find.byValueKey('email');