From 758155131ad2f24538f0ad27997dc8afbff017eb Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 17 Nov 2019 11:57:41 +0200 Subject: [PATCH] Formatting --- lib/constants.dart | 1 - lib/data/mock/mock_clients.dart | 2 +- lib/data/mock/mock_dashboard.dart | 2 +- lib/data/mock/mock_documents.dart | 2 +- lib/data/mock/mock_expenses.dart | 2 +- lib/data/mock/mock_invoices.dart | 2 +- lib/data/mock/mock_login.dart | 2 +- lib/data/mock/mock_payments.dart | 2 +- lib/data/mock/mock_products.dart | 2 +- lib/data/mock/mock_projects.dart | 2 +- lib/data/mock/mock_quotes.dart | 2 +- lib/data/mock/mock_tasks.dart | 2 +- lib/data/mock/mock_vendors.dart | 2 +- lib/data/repositories/client_repository.dart | 3 +- .../repositories/document_repository.dart | 3 +- lib/data/repositories/invoice_repository.dart | 3 +- lib/data/repositories/payment_repository.dart | 3 +- lib/data/web_client.dart | 1 - lib/main.dart | 5 +-- lib/redux/app/app_selectors.dart | 1 + lib/redux/client/client_actions.dart | 9 ++-- lib/redux/expense/expense_actions.dart | 3 +- lib/redux/expense/expense_selectors.dart | 18 ++++---- lib/redux/group/group_actions.dart | 10 +++-- lib/redux/group/group_selectors.dart | 4 +- lib/redux/invoice/invoice_actions.dart | 6 ++- lib/redux/invoice/invoice_reducer.dart | 3 +- lib/redux/invoice/invoice_selectors.dart | 19 ++++---- lib/redux/payment/payment_actions.dart | 6 ++- lib/redux/product/product_actions.dart | 3 +- lib/redux/project/project_selectors.dart | 9 ++-- lib/redux/quote/quote_actions.dart | 12 ++++-- lib/redux/quote/quote_selectors.dart | 21 +++++---- lib/redux/task/task_actions.dart | 6 ++- lib/redux/tax_rate/tax_rate_actions.dart | 3 +- lib/redux/ui/ui_state.dart | 2 - lib/redux/user/user_actions.dart | 7 +-- lib/redux/vendor/vendor_actions.dart | 9 ++-- lib/ui/app/form_card.dart | 20 +++++---- lib/ui/app/list_scaffold.dart | 6 ++- lib/ui/client/client_list.dart | 4 +- lib/ui/client/client_screen.dart | 4 +- lib/ui/client/edit/client_edit_notes.dart | 8 ++-- lib/ui/client/edit/client_edit_vm.dart | 4 +- lib/ui/client/view/client_view_overview.dart | 43 ++++++++----------- lib/ui/client/view/client_view_vm.dart | 5 +-- .../company_gateway_list_item.dart | 10 +++-- lib/ui/dashboard/dashboard_panels.dart | 16 ++----- lib/ui/dashboard/dashboard_screen.dart | 7 +-- lib/ui/dashboard/dashboard_screen_vm.dart | 3 +- lib/ui/document/document_list.dart | 4 +- lib/ui/document/edit/document_edit_vm.dart | 3 +- lib/ui/group/edit/group_edit_vm.dart | 4 +- lib/ui/group/group_list.dart | 4 +- lib/ui/group/group_screen.dart | 4 +- lib/ui/group/view/group_view.dart | 6 +-- lib/ui/invoice/edit/invoice_edit_details.dart | 4 +- .../invoice/edit/invoice_item_selector.dart | 3 +- lib/ui/invoice/invoice_list.dart | 6 +-- .../invoice/view/invoice_view_overview.dart | 3 +- lib/ui/payment/payment_list.dart | 6 +-- lib/ui/project/project_list.dart | 4 +- lib/ui/project/view/project_view_vm.dart | 9 ++-- lib/ui/settings/client_portal.dart | 6 +-- lib/ui/settings/company_details.dart | 3 +- lib/ui/settings/email_settings.dart | 3 +- lib/ui/settings/generated_numbers.dart | 5 ++- lib/ui/settings/invoice_design.dart | 5 ++- lib/ui/settings/settings_screen_vm.dart | 4 +- lib/ui/settings/templates_and_reminders.dart | 4 +- lib/ui/task/task_list.dart | 6 +-- lib/ui/task/task_screen.dart | 4 +- lib/ui/tax_rate/tax_rate_list.dart | 4 +- lib/ui/user/user_screen.dart | 4 +- lib/ui/user/view/user_view_vm.dart | 3 +- lib/ui/vendor/edit/vendor_edit_vm.dart | 4 +- lib/ui/vendor/vendor_list.dart | 4 +- lib/ui/vendor/view/vendor_view_vm.dart | 4 +- lib/utils/formatting.dart | 3 +- lib/utils/icons.dart | 5 +-- 80 files changed, 230 insertions(+), 225 deletions(-) diff --git a/lib/constants.dart b/lib/constants.dart index 8b7ee483b..02b77267f 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -424,4 +424,3 @@ const kPageSizes = [ 'Letter', 'Tabloid', ]; - diff --git a/lib/data/mock/mock_clients.dart b/lib/data/mock/mock_clients.dart index 5aba4ccd8..52d58776c 100644 --- a/lib/data/mock/mock_clients.dart +++ b/lib/data/mock/mock_clients.dart @@ -253,4 +253,4 @@ const dynamic kMockClients = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_dashboard.dart b/lib/data/mock/mock_dashboard.dart index 8eeb1abe6..2c4f5956f 100644 --- a/lib/data/mock/mock_dashboard.dart +++ b/lib/data/mock/mock_dashboard.dart @@ -14,4 +14,4 @@ const dynamic kMockDashboard = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_documents.dart b/lib/data/mock/mock_documents.dart index 9a760d662..1a6b50bdf 100644 --- a/lib/data/mock/mock_documents.dart +++ b/lib/data/mock/mock_documents.dart @@ -12,4 +12,4 @@ const dynamic kMockDocuments = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_expenses.dart b/lib/data/mock/mock_expenses.dart index b3b058528..3c18c4ad7 100644 --- a/lib/data/mock/mock_expenses.dart +++ b/lib/data/mock/mock_expenses.dart @@ -12,4 +12,4 @@ const dynamic kMockExpenses = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_invoices.dart b/lib/data/mock/mock_invoices.dart index 098408dcd..21d5930f9 100644 --- a/lib/data/mock/mock_invoices.dart +++ b/lib/data/mock/mock_invoices.dart @@ -153,4 +153,4 @@ const dynamic kMockInvoices = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_login.dart b/lib/data/mock/mock_login.dart index 863dd064c..7930f59b9 100644 --- a/lib/data/mock/mock_login.dart +++ b/lib/data/mock/mock_login.dart @@ -2426,4 +2426,4 @@ const dynamic kMockLogin = ''' ] } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_payments.dart b/lib/data/mock/mock_payments.dart index f3d45be89..61eebabdb 100644 --- a/lib/data/mock/mock_payments.dart +++ b/lib/data/mock/mock_payments.dart @@ -12,4 +12,4 @@ const dynamic kMockPayments = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_products.dart b/lib/data/mock/mock_products.dart index 5e51190ff..cc7b2a034 100644 --- a/lib/data/mock/mock_products.dart +++ b/lib/data/mock/mock_products.dart @@ -82,4 +82,4 @@ const dynamic kMockProducts = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_projects.dart b/lib/data/mock/mock_projects.dart index 729f1d523..b9f4f7ef3 100644 --- a/lib/data/mock/mock_projects.dart +++ b/lib/data/mock/mock_projects.dart @@ -12,4 +12,4 @@ const dynamic kMockProjects = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_quotes.dart b/lib/data/mock/mock_quotes.dart index 6d4d731bb..221e0583b 100644 --- a/lib/data/mock/mock_quotes.dart +++ b/lib/data/mock/mock_quotes.dart @@ -12,4 +12,4 @@ const dynamic kMockQuotes = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_tasks.dart b/lib/data/mock/mock_tasks.dart index 821c2e3f9..8749749c8 100644 --- a/lib/data/mock/mock_tasks.dart +++ b/lib/data/mock/mock_tasks.dart @@ -12,4 +12,4 @@ const dynamic kMockTasks = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/mock/mock_vendors.dart b/lib/data/mock/mock_vendors.dart index 3fcf5b626..70ed521c8 100644 --- a/lib/data/mock/mock_vendors.dart +++ b/lib/data/mock/mock_vendors.dart @@ -12,4 +12,4 @@ const dynamic kMockVendors = ''' } } } -'''; \ No newline at end of file +'''; diff --git a/lib/data/repositories/client_repository.dart b/lib/data/repositories/client_repository.dart index b2ad76a4e..ff30926bf 100644 --- a/lib/data/repositories/client_repository.dart +++ b/lib/data/repositories/client_repository.dart @@ -46,8 +46,7 @@ class ClientRepository { if (Config.DEMO_MODE) { response = json.decode(kMockClients); } else { - response = - await webClient.get(url, credentials.token); + response = await webClient.get(url, credentials.token); } final ClientListResponse clientResponse = diff --git a/lib/data/repositories/document_repository.dart b/lib/data/repositories/document_repository.dart index f62c2c336..9317074ce 100644 --- a/lib/data/repositories/document_repository.dart +++ b/lib/data/repositories/document_repository.dart @@ -41,8 +41,7 @@ class DocumentRepository { if (Config.DEMO_MODE) { response = json.decode(kMockDocuments); } else { - response = - await webClient.get(url, credentials.token); + response = await webClient.get(url, credentials.token); } final DocumentListResponse documentResponse = diff --git a/lib/data/repositories/invoice_repository.dart b/lib/data/repositories/invoice_repository.dart index 9ac35b42f..7e6cf4d9e 100644 --- a/lib/data/repositories/invoice_repository.dart +++ b/lib/data/repositories/invoice_repository.dart @@ -43,8 +43,7 @@ class InvoiceRepository { if (Config.DEMO_MODE) { response = json.decode(kMockInvoices); } else { - response = - await webClient.get(url, credentials.token); + response = await webClient.get(url, credentials.token); } final InvoiceListResponse invoiceResponse = diff --git a/lib/data/repositories/payment_repository.dart b/lib/data/repositories/payment_repository.dart index 5acd186f6..98a8aae95 100644 --- a/lib/data/repositories/payment_repository.dart +++ b/lib/data/repositories/payment_repository.dart @@ -30,8 +30,7 @@ class PaymentRepository { if (Config.DEMO_MODE) { response = json.decode(kMockPayments); } else { - response = - await webClient.get(url, credentials.token); + response = await webClient.get(url, credentials.token); } final PaymentListResponse paymentResponse = diff --git a/lib/data/web_client.dart b/lib/data/web_client.dart index 4c6eacc3e..e7b37dbae 100644 --- a/lib/data/web_client.dart +++ b/lib/data/web_client.dart @@ -120,7 +120,6 @@ Map _getHeaders(String token) => { }; void _checkResponse(http.Response response) { - if (Config.DEMO_MODE) { throw 'Saving is not supported in the demo'; } diff --git a/lib/main.dart b/lib/main.dart index 7cc835830..1dd2546f0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -226,9 +226,8 @@ class InvoiceNinjaAppState extends State { final state = widget.store.state; Intl.defaultLocale = localeSelector(state); final localization = AppLocalization(Locale(Intl.defaultLocale)); - final accentColor = - convertHexStringToColor(state.accentColor) ?? - Colors.lightBlueAccent; + final accentColor = convertHexStringToColor(state.accentColor) ?? + Colors.lightBlueAccent; return MaterialApp( supportedLocales: kLanguages .map((String locale) => AppLocalization.createLocale(locale)) diff --git a/lib/redux/app/app_selectors.dart b/lib/redux/app/app_selectors.dart index e69de29bb..8b1378917 100644 --- a/lib/redux/app/app_selectors.dart +++ b/lib/redux/app/app_selectors.dart @@ -0,0 +1 @@ + diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart index 61b16fff4..d060e99c6 100644 --- a/lib/redux/client/client_actions.dart +++ b/lib/redux/client/client_actions.dart @@ -314,15 +314,18 @@ void handleClientAction( break; case EntityAction.restore: store.dispatch(RestoreClientRequest( - snackBarCompleter(context, localization.restoredClient), clientIds)); + snackBarCompleter(context, localization.restoredClient), + clientIds)); break; case EntityAction.archive: store.dispatch(ArchiveClientRequest( - snackBarCompleter(context, localization.archivedClient), clientIds)); + snackBarCompleter(context, localization.archivedClient), + clientIds)); break; case EntityAction.delete: store.dispatch(DeleteClientRequest( - snackBarCompleter(context, localization.deletedClient), clientIds)); + snackBarCompleter(context, localization.deletedClient), + clientIds)); break; case EntityAction.toggleMultiselect: if (!store.state.clientListState.isInMultiselect()) { diff --git a/lib/redux/expense/expense_actions.dart b/lib/redux/expense/expense_actions.dart index 240aeae60..c41b650e2 100644 --- a/lib/redux/expense/expense_actions.dart +++ b/lib/redux/expense/expense_actions.dart @@ -297,7 +297,8 @@ void handleExpenseAction( break; case EntityAction.delete: store.dispatch(DeleteExpenseRequest( - snackBarCompleter(context, localization.deletedExpense), expenseIds)); + snackBarCompleter(context, localization.deletedExpense), + expenseIds)); break; case EntityAction.toggleMultiselect: if (!store.state.expenseListState.isInMultiselect()) { diff --git a/lib/redux/expense/expense_selectors.dart b/lib/redux/expense/expense_selectors.dart index 821633f35..e36545a02 100644 --- a/lib/redux/expense/expense_selectors.dart +++ b/lib/redux/expense/expense_selectors.dart @@ -111,13 +111,12 @@ List filteredExpensesSelector( return list; } -var memoizedExpenseStatsForVendor = memo2((String vendorId, - BuiltMap expenseMap) => - expenseStatsForVendor(vendorId, expenseMap)); +var memoizedExpenseStatsForVendor = memo2( + (String vendorId, BuiltMap expenseMap) => + expenseStatsForVendor(vendorId, expenseMap)); EntityStats expenseStatsForVendor( - String vendorId, - BuiltMap expenseMap) { + String vendorId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { @@ -133,13 +132,12 @@ EntityStats expenseStatsForVendor( return EntityStats(countActive: countActive, countArchived: countArchived); } -var memoizedExpenseStatsForClient = memo2((String clientId, - BuiltMap expenseMap) => - expenseStatsForClient(clientId, expenseMap)); +var memoizedExpenseStatsForClient = memo2( + (String clientId, BuiltMap expenseMap) => + expenseStatsForClient(clientId, expenseMap)); EntityStats expenseStatsForClient( - String clientId, - BuiltMap expenseMap) { + String clientId, BuiltMap expenseMap) { int countActive = 0; int countArchived = 0; expenseMap.forEach((expenseId, expense) { diff --git a/lib/redux/group/group_actions.dart b/lib/redux/group/group_actions.dart index 2f4c8d1da..d9d27865b 100644 --- a/lib/redux/group/group_actions.dart +++ b/lib/redux/group/group_actions.dart @@ -242,7 +242,6 @@ class FilterGroupsByEntity implements PersistUI { void handleGroupAction( BuildContext context, List groups, EntityAction action) { - if (groups.isEmpty) { return; } @@ -267,15 +266,18 @@ void handleGroupAction( break; case EntityAction.restore: store.dispatch(RestoreGroupRequest( - snackBarCompleter(context, localization.restoredGroup), groupIds)); + snackBarCompleter(context, localization.restoredGroup), + groupIds)); break; case EntityAction.archive: store.dispatch(ArchiveGroupRequest( - snackBarCompleter(context, localization.archivedGroup), groupIds)); + snackBarCompleter(context, localization.archivedGroup), + groupIds)); break; case EntityAction.delete: store.dispatch(DeleteGroupRequest( - snackBarCompleter(context, localization.deletedGroup), groupIds)); + snackBarCompleter(context, localization.deletedGroup), + groupIds)); break; case EntityAction.toggleMultiselect: if (!store.state.groupListState.isInMultiselect()) { diff --git a/lib/redux/group/group_selectors.dart b/lib/redux/group/group_selectors.dart index 33b1d5726..fa445f836 100644 --- a/lib/redux/group/group_selectors.dart +++ b/lib/redux/group/group_selectors.dart @@ -67,8 +67,8 @@ var memoizedClientStatsForGroup = memo2( (BuiltMap clientMap, String groupId) => clientStatsForGroup(clientMap, groupId)); -EntityStats clientStatsForGroup(BuiltMap clientMap, - String groupId) { +EntityStats clientStatsForGroup( + BuiltMap clientMap, String groupId) { int countActive = 0; int countArchived = 0; clientMap.forEach((clientId, client) { diff --git a/lib/redux/invoice/invoice_actions.dart b/lib/redux/invoice/invoice_actions.dart index 15d6247a9..06302f6cf 100644 --- a/lib/redux/invoice/invoice_actions.dart +++ b/lib/redux/invoice/invoice_actions.dart @@ -381,7 +381,8 @@ void handleInvoiceAction(BuildContext context, List invoices, break; case EntityAction.sendEmail: store.dispatch(ShowEmailInvoice( - completer: snackBarCompleter(context, localization.emailedInvoice), + completer: + snackBarCompleter(context, localization.emailedInvoice), invoice: invoice, context: context)); break; @@ -408,7 +409,8 @@ void handleInvoiceAction(BuildContext context, List invoices, break; case EntityAction.delete: store.dispatch(DeleteInvoiceRequest( - snackBarCompleter(context, localization.deletedInvoice), invoiceIds)); + snackBarCompleter(context, localization.deletedInvoice), + invoiceIds)); break; case EntityAction.toggleMultiselect: if (!store.state.invoiceListState.isInMultiselect()) { diff --git a/lib/redux/invoice/invoice_reducer.dart b/lib/redux/invoice/invoice_reducer.dart index 092311547..f04a2decf 100644 --- a/lib/redux/invoice/invoice_reducer.dart +++ b/lib/redux/invoice/invoice_reducer.dart @@ -19,7 +19,8 @@ EntityUIState invoiceUIReducer(InvoiceUIState state, dynamic action) { final editingItemIndexReducer = combineReducers([ TypedReducer((index, action) => action.invoiceItemIndex), - TypedReducer((index, action) => action.invoiceItemIndex), + TypedReducer( + (index, action) => action.invoiceItemIndex), ]); Reducer dropdownFilterReducer = combineReducers([ diff --git a/lib/redux/invoice/invoice_selectors.dart b/lib/redux/invoice/invoice_selectors.dart index 3645eeeca..d1eb74818 100644 --- a/lib/redux/invoice/invoice_selectors.dart +++ b/lib/redux/invoice/invoice_selectors.dart @@ -72,7 +72,6 @@ List filteredInvoicesSelector( } } - if (!invoice.matchesStates(invoiceListState.stateFilters)) { return false; } @@ -102,13 +101,12 @@ List filteredInvoicesSelector( return list; } -var memoizedInvoiceStatsForClient = memo2((String clientId, - BuiltMap invoiceMap) => - invoiceStatsForClient(clientId, invoiceMap)); +var memoizedInvoiceStatsForClient = memo2( + (String clientId, BuiltMap invoiceMap) => + invoiceStatsForClient(clientId, invoiceMap)); EntityStats invoiceStatsForClient( - String clientId, - BuiltMap invoiceMap) { + String clientId, BuiltMap invoiceMap) { int countActive = 0; int countArchived = 0; invoiceMap.forEach((invoiceId, invoice) { @@ -124,13 +122,12 @@ EntityStats invoiceStatsForClient( return EntityStats(countActive: countActive, countArchived: countArchived); } -var memoizedInvoiceStatsForUser = memo2((String userId, - BuiltMap invoiceMap) => - invoiceStatsForUser(userId, invoiceMap)); +var memoizedInvoiceStatsForUser = memo2( + (String userId, BuiltMap invoiceMap) => + invoiceStatsForUser(userId, invoiceMap)); EntityStats invoiceStatsForUser( - String userId, - BuiltMap invoiceMap) { + String userId, BuiltMap invoiceMap) { int countActive = 0; int countArchived = 0; invoiceMap.forEach((invoiceId, invoice) { diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart index 74863eee3..a2675e585 100644 --- a/lib/redux/payment/payment_actions.dart +++ b/lib/redux/payment/payment_actions.dart @@ -278,7 +278,8 @@ void handlePaymentAction( break; case EntityAction.sendEmail: store.dispatch(EmailPaymentRequest( - snackBarCompleter(context, localization.emailedPayment), payment)); + snackBarCompleter(context, localization.emailedPayment), + payment)); break; case EntityAction.restore: store.dispatch(RestorePaymentRequest( @@ -292,7 +293,8 @@ void handlePaymentAction( break; case EntityAction.delete: store.dispatch(DeletePaymentRequest( - snackBarCompleter(context, localization.deletedPayment), paymentIds)); + snackBarCompleter(context, localization.deletedPayment), + paymentIds)); break; case EntityAction.toggleMultiselect: if (!store.state.paymentListState.isInMultiselect()) { diff --git a/lib/redux/product/product_actions.dart b/lib/redux/product/product_actions.dart index f1327420a..f6c73c51d 100644 --- a/lib/redux/product/product_actions.dart +++ b/lib/redux/product/product_actions.dart @@ -245,7 +245,8 @@ void handleProductAction( break; case EntityAction.delete: store.dispatch(DeleteProductRequest( - snackBarCompleter(context, localization.deletedProduct), productIds)); + snackBarCompleter(context, localization.deletedProduct), + productIds)); break; case EntityAction.toggleMultiselect: if (!store.state.productListState.isInMultiselect()) { diff --git a/lib/redux/project/project_selectors.dart b/lib/redux/project/project_selectors.dart index e9027d762..babecda5a 100644 --- a/lib/redux/project/project_selectors.dart +++ b/lib/redux/project/project_selectors.dart @@ -131,13 +131,12 @@ Duration taskDurationForProject( return Duration(seconds: total); } -var memoizedProjectStatsForClient = memo2((String clientId, - BuiltMap projectMap) => - projectStatsForClient(clientId, projectMap)); +var memoizedProjectStatsForClient = memo2( + (String clientId, BuiltMap projectMap) => + projectStatsForClient(clientId, projectMap)); EntityStats projectStatsForClient( - String clientId, - BuiltMap projectMap) { + String clientId, BuiltMap projectMap) { int countActive = 0; int countArchived = 0; projectMap.forEach((projectId, project) { diff --git a/lib/redux/quote/quote_actions.dart b/lib/redux/quote/quote_actions.dart index aa9fb3daf..a10d828f1 100644 --- a/lib/redux/quote/quote_actions.dart +++ b/lib/redux/quote/quote_actions.dart @@ -409,7 +409,8 @@ Future handleQuoteAction( break; case EntityAction.sendEmail: store.dispatch(ShowEmailQuote( - completer: snackBarCompleter(context, localization.emailedQuote), + completer: + snackBarCompleter(context, localization.emailedQuote), quote: quote, context: context)); break; @@ -422,15 +423,18 @@ Future handleQuoteAction( break; case EntityAction.restore: store.dispatch(RestoreQuoteRequest( - snackBarCompleter(context, localization.restoredQuote), quoteIds)); + snackBarCompleter(context, localization.restoredQuote), + quoteIds)); break; case EntityAction.archive: store.dispatch(ArchiveQuoteRequest( - snackBarCompleter(context, localization.archivedQuote), quoteIds)); + snackBarCompleter(context, localization.archivedQuote), + quoteIds)); break; case EntityAction.delete: store.dispatch(DeleteQuoteRequest( - snackBarCompleter(context, localization.deletedQuote), quoteIds)); + snackBarCompleter(context, localization.deletedQuote), + quoteIds)); break; case EntityAction.toggleMultiselect: if (!store.state.quoteListState.isInMultiselect()) { diff --git a/lib/redux/quote/quote_selectors.dart b/lib/redux/quote/quote_selectors.dart index 828bd846d..31637ef8f 100644 --- a/lib/redux/quote/quote_selectors.dart +++ b/lib/redux/quote/quote_selectors.dart @@ -24,7 +24,6 @@ List filteredQuotesSelector( final client = clientMap[quote.clientId] ?? ClientEntity(id: quote.clientId); - if (quoteListState.filterEntityType == EntityType.client) { if (!quoteListState.entityMatchesFilter(client)) { return false; @@ -70,13 +69,12 @@ List filteredQuotesSelector( return list; } -var memoizedQuoteStatsForClient = memo2((String clientId, - BuiltMap quoteMap) => - quoteStatsForClient(clientId, quoteMap)); +var memoizedQuoteStatsForClient = memo2( + (String clientId, BuiltMap quoteMap) => + quoteStatsForClient(clientId, quoteMap)); EntityStats quoteStatsForClient( - String clientId, - BuiltMap quoteMap) { + String clientId, BuiltMap quoteMap) { int countActive = 0; int countArchived = 0; quoteMap.forEach((quoteId, quote) { @@ -92,13 +90,14 @@ EntityStats quoteStatsForClient( return EntityStats(countActive: countActive, countArchived: countArchived); } -var memoizedQuoteStatsForUser = memo2((String userId, - BuiltMap quoteMap) => - quoteStatsForUser(userId, quoteMap)); +var memoizedQuoteStatsForUser = memo2( + (String userId, BuiltMap quoteMap) => + quoteStatsForUser(userId, quoteMap)); EntityStats quoteStatsForUser( - String userId, - BuiltMap quoteMap,) { + String userId, + BuiltMap quoteMap, +) { int countActive = 0; int countArchived = 0; quoteMap.forEach((quoteId, quote) { diff --git a/lib/redux/task/task_actions.dart b/lib/redux/task/task_actions.dart index a226bc112..b60ea3ced 100644 --- a/lib/redux/task/task_actions.dart +++ b/lib/redux/task/task_actions.dart @@ -345,11 +345,13 @@ void handleTaskAction( break; case EntityAction.restore: store.dispatch(RestoreTaskRequest( - snackBarCompleter(context, localization.restoredTask), taskIds)); + snackBarCompleter(context, localization.restoredTask), + taskIds)); break; case EntityAction.archive: store.dispatch(ArchiveTaskRequest( - snackBarCompleter(context, localization.archivedTask), taskIds)); + snackBarCompleter(context, localization.archivedTask), + taskIds)); break; case EntityAction.delete: store.dispatch(DeleteTaskRequest( diff --git a/lib/redux/tax_rate/tax_rate_actions.dart b/lib/redux/tax_rate/tax_rate_actions.dart index 7f83c2f3b..185987b18 100644 --- a/lib/redux/tax_rate/tax_rate_actions.dart +++ b/lib/redux/tax_rate/tax_rate_actions.dart @@ -273,7 +273,8 @@ void handleTaxRateAction( break; case EntityAction.delete: store.dispatch(DeleteTaxRateRequest( - snackBarCompleter(context, localization.deletedTaxRate), taxRateIds)); + snackBarCompleter(context, localization.deletedTaxRate), + taxRateIds)); break; case EntityAction.toggleMultiselect: if (!store.state.taxRateListState.isInMultiselect()) { diff --git a/lib/redux/ui/ui_state.dart b/lib/redux/ui/ui_state.dart index 5306beb77..c4fae298e 100644 --- a/lib/redux/ui/ui_state.dart +++ b/lib/redux/ui/ui_state.dart @@ -122,6 +122,4 @@ abstract class UIState implements Built { } bool get isEditing => currentRoute.endsWith('edit'); - } - diff --git a/lib/redux/user/user_actions.dart b/lib/redux/user/user_actions.dart index b555db68d..ffb66b473 100644 --- a/lib/redux/user/user_actions.dart +++ b/lib/redux/user/user_actions.dart @@ -244,7 +244,6 @@ class FilterUsersByEntity implements PersistUI { void handleUserAction( BuildContext context, List users, EntityAction action) { - if (users.isEmpty) { return; } @@ -261,11 +260,13 @@ void handleUserAction( break; case EntityAction.restore: store.dispatch(RestoreUserRequest( - snackBarCompleter(context, localization.restoredUser), userIds)); + snackBarCompleter(context, localization.restoredUser), + userIds)); break; case EntityAction.archive: store.dispatch(ArchiveUserRequest( - snackBarCompleter(context, localization.archivedUser), userIds)); + snackBarCompleter(context, localization.archivedUser), + userIds)); break; case EntityAction.delete: store.dispatch(DeleteUserRequest( diff --git a/lib/redux/vendor/vendor_actions.dart b/lib/redux/vendor/vendor_actions.dart index d67c04e2c..d22b61a5b 100644 --- a/lib/redux/vendor/vendor_actions.dart +++ b/lib/redux/vendor/vendor_actions.dart @@ -300,15 +300,18 @@ void handleVendorAction( break; case EntityAction.restore: store.dispatch(RestoreVendorRequest( - snackBarCompleter(context, localization.restoredVendor), vendorIds)); + snackBarCompleter(context, localization.restoredVendor), + vendorIds)); break; case EntityAction.archive: store.dispatch(ArchiveVendorRequest( - snackBarCompleter(context, localization.archivedVendor), vendorIds)); + snackBarCompleter(context, localization.archivedVendor), + vendorIds)); break; case EntityAction.delete: store.dispatch(DeleteVendorRequest( - snackBarCompleter(context, localization.deletedVendor), vendorIds)); + snackBarCompleter(context, localization.deletedVendor), + vendorIds)); break; case EntityAction.toggleMultiselect: if (!store.state.vendorListState.isInMultiselect()) { diff --git a/lib/ui/app/form_card.dart b/lib/ui/app/form_card.dart index 2cc735ef9..b5dd25bb0 100644 --- a/lib/ui/app/form_card.dart +++ b/lib/ui/app/form_card.dart @@ -29,15 +29,17 @@ class FormCard extends StatelessWidget { child: Padding( padding: const EdgeInsets.only( left: 16.0, top: 16.0, right: 16.0, bottom: 20.0), - child: child != null ? child : Container( - width: double.infinity, - child: Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: - crossAxisAlignment ?? CrossAxisAlignment.center, - children: children, - ), - ), + child: child != null + ? child + : Container( + width: double.infinity, + child: Column( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: + crossAxisAlignment ?? CrossAxisAlignment.center, + children: children, + ), + ), ), ), ); diff --git a/lib/ui/app/list_scaffold.dart b/lib/ui/app/list_scaffold.dart index 45fb4a8e5..713a05641 100644 --- a/lib/ui/app/list_scaffold.dart +++ b/lib/ui/app/list_scaffold.dart @@ -97,10 +97,12 @@ class ListScaffold extends StatelessWidget { builder: (context) => IconButton( icon: Icon(Icons.menu), onPressed: () { - if (isMobile(context) || state.prefState.isHistoryFloated) { + if (isMobile(context) || + state.prefState.isHistoryFloated) { Scaffold.of(context).openEndDrawer(); } else { - store.dispatch(UserSettingsChanged(sidebar: AppSidebar.history)); + store.dispatch( + UserSettingsChanged(sidebar: AppSidebar.history)); } }, ), diff --git a/lib/ui/client/client_list.dart b/lib/ui/client/client_list.dart index fae0a0b63..16bc61499 100644 --- a/lib/ui/client/client_list.dart +++ b/lib/ui/client/client_list.dart @@ -74,7 +74,9 @@ class ClientList extends StatelessWidget { onTap: () => viewModel.onClientTap(context, client), onLongPress: () async { - final longPressIsSelection = store.state.prefState + final longPressIsSelection = store + .state + .prefState .longPressSelectionIsDefault ?? true; if (longPressIsSelection && !isInMultiselect) { diff --git a/lib/ui/client/client_screen.dart b/lib/ui/client/client_screen.dart index 0f3dd9319..cb9e34e46 100644 --- a/lib/ui/client/client_screen.dart +++ b/lib/ui/client/client_screen.dart @@ -90,9 +90,7 @@ class ClientScreen extends StatelessWidget { .toList(); await showEntityActionsDialog( - entities: clients, - context: context, - multiselect: true); + entities: clients, context: context, multiselect: true); store.dispatch(ClearClientMultiselect(context: context)); }, ), diff --git a/lib/ui/client/edit/client_edit_notes.dart b/lib/ui/client/edit/client_edit_notes.dart index e3122f4e5..54e4d93b9 100644 --- a/lib/ui/client/edit/client_edit_notes.dart +++ b/lib/ui/client/edit/client_edit_notes.dart @@ -103,10 +103,10 @@ class ClientEditNotesState extends State { labelText: localization.size, items: memoizedSizeList(state.staticState.sizeMap) .map((sizeId) => DropdownMenuItem( - child: Text( - state.staticState.sizeMap[sizeId].name), - value: sizeId, - )).toList(), + child: Text(state.staticState.sizeMap[sizeId].name), + value: sizeId, + )) + .toList(), onChanged: (dynamic sizeId) => viewModel.onChanged( client.rebuild((b) => b..sizeId = sizeId), ), diff --git a/lib/ui/client/edit/client_edit_vm.dart b/lib/ui/client/edit/client_edit_vm.dart index 4aa0552f8..9c63d576a 100644 --- a/lib/ui/client/edit/client_edit_vm.dart +++ b/lib/ui/client/edit/client_edit_vm.dart @@ -118,8 +118,8 @@ class ClientEditVM { Navigator.of(context).pop(savedClient); } } else { - store.dispatch( - ViewClient(context: context, clientId: savedClient.id, force: true)); + store.dispatch(ViewClient( + context: context, clientId: savedClient.id, force: true)); } }).catchError((Object error) { showDialog( diff --git a/lib/ui/client/view/client_view_overview.dart b/lib/ui/client/view/client_view_overview.dart index ad500fc0a..844512a59 100644 --- a/lib/ui/client/view/client_view_overview.dart +++ b/lib/ui/client/view/client_view_overview.dart @@ -32,9 +32,7 @@ class ClientOverview extends StatelessWidget { final localization = AppLocalization.of(context); final client = viewModel.client; final company = viewModel.company; - final state = StoreProvider - .of(context) - .state; + final state = StoreProvider.of(context).state; final statics = state.staticState; final fields = {}; final group = client.hasGroup ? state.groupState.map[client.groupId] : null; @@ -73,9 +71,7 @@ class ClientOverview extends StatelessWidget { : Container(), if (client.hasGroup) ...[ Material( - color: Theme - .of(context) - .canvasColor, + color: Theme.of(context).canvasColor, child: ListTile( title: EntityStateTitle(entity: group), leading: Icon(getEntityIcon(EntityType.group), size: 18.0), @@ -100,8 +96,8 @@ class ClientOverview extends StatelessWidget { onLongPress: () => viewModel.onEntityPressed(context, EntityType.invoice, true), subtitle: - memoizedInvoiceStatsForClient(client.id, state.invoiceState.map) - .present(localization.active, localization.archived), + memoizedInvoiceStatsForClient(client.id, state.invoiceState.map) + .present(localization.active, localization.archived), ), EntityListTile( bottomPadding: 1, @@ -111,7 +107,7 @@ class ClientOverview extends StatelessWidget { onLongPress: () => viewModel.onEntityPressed(context, EntityType.payment, true), subtitle: memoizedPaymentStatsForClient( - client.id, state.paymentState.map, state.invoiceState.map) + client.id, state.paymentState.map, state.invoiceState.map) .present(localization.active, localization.archived), ), if (company.isModuleEnabled(EntityType.quote)) @@ -123,8 +119,8 @@ class ClientOverview extends StatelessWidget { onLongPress: () => viewModel.onEntityPressed(context, EntityType.quote, true), subtitle: - memoizedQuoteStatsForClient(client.id, state.quoteState.map) - .present(localization.active, localization.archived), + memoizedQuoteStatsForClient(client.id, state.quoteState.map) + .present(localization.active, localization.archived), ), if (company.isModuleEnabled(EntityType.project)) EntityListTile( @@ -135,8 +131,8 @@ class ClientOverview extends StatelessWidget { onLongPress: () => viewModel.onEntityPressed(context, EntityType.project, true), subtitle: - memoizedProjectStatsForClient(client.id, state.projectState.map) - .present(localization.active, localization.archived), + memoizedProjectStatsForClient(client.id, state.projectState.map) + .present(localization.active, localization.archived), ), if (company.isModuleEnabled(EntityType.task)) EntityListTile( @@ -158,8 +154,8 @@ class ClientOverview extends StatelessWidget { onLongPress: () => viewModel.onEntityPressed(context, EntityType.expense, true), subtitle: - memoizedExpenseStatsForClient(client.id, state.expenseState.map) - .present(localization.active, localization.archived), + memoizedExpenseStatsForClient(client.id, state.expenseState.map) + .present(localization.active, localization.archived), ), ], ); @@ -167,12 +163,13 @@ class ClientOverview extends StatelessWidget { } class EntityListTile extends StatelessWidget { - const EntityListTile({this.icon, - this.onTap, - this.onLongPress, - this.title, - this.subtitle, - this.bottomPadding = 12}); + const EntityListTile( + {this.icon, + this.onTap, + this.onLongPress, + this.title, + this.subtitle, + this.bottomPadding = 12}); final Function onTap; final Function onLongPress; @@ -186,9 +183,7 @@ class EntityListTile extends StatelessWidget { return Column( children: [ Material( - color: Theme - .of(context) - .canvasColor, + color: Theme.of(context).canvasColor, child: ListTile( title: Text(title), subtitle: Text(subtitle), diff --git a/lib/ui/client/view/client_view_vm.dart b/lib/ui/client/view/client_view_vm.dart index 748040e55..51a4ea9c3 100644 --- a/lib/ui/client/view/client_view_vm.dart +++ b/lib/ui/client/view/client_view_vm.dart @@ -42,7 +42,7 @@ class ClientViewScreen extends StatelessWidget { } } -class ClientViewVM { +class ClientViewVM { ClientViewVM({ @required this.state, @required this.client, @@ -110,8 +110,7 @@ class ClientViewVM { if (longPress && client.isActive) { store.dispatch(EditQuote( context: context, - quote: InvoiceEntity( - company: state.company, isQuote: true))); + quote: InvoiceEntity(company: state.company, isQuote: true))); store.dispatch(UpdateQuoteClient(client: client)); } else { store.dispatch(FilterQuotesByEntity( diff --git a/lib/ui/company_gateway/company_gateway_list_item.dart b/lib/ui/company_gateway/company_gateway_list_item.dart index 31fc28941..60f61315f 100644 --- a/lib/ui/company_gateway/company_gateway_list_item.dart +++ b/lib/ui/company_gateway/company_gateway_list_item.dart @@ -59,10 +59,12 @@ class CompanyGatewayListItem extends StatelessWidget { ? () => onEntityAction(EntityAction.toggleMultiselect) : onTap, onLongPress: onLongPress, - trailing: onRemovePressed == null ? null : FlatButton( - child: Text(AppLocalization.of(context).remove), - onPressed: onRemovePressed, - ), + trailing: onRemovePressed == null + ? null + : FlatButton( + child: Text(AppLocalization.of(context).remove), + onPressed: onRemovePressed, + ), leading: showCheckbox ? IgnorePointer( ignoring: listUIState.isInMultiselect(), diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index db95ad87f..a3266a631 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -184,12 +184,8 @@ class DashboardPanels extends StatelessWidget { final isLoaded = viewModel.state.invoiceState.isLoaded; final settings = viewModel.dashboardUIState; final state = viewModel.state; - final currentData = memoizedChartInvoices( - state.staticState.currencyMap, - state.company, - settings, - state.invoiceState.map, - state.clientState.map); + final currentData = memoizedChartInvoices(state.staticState.currencyMap, + state.company, settings, state.invoiceState.map, state.clientState.map); List previousData; if (settings.enableComparison) { @@ -244,12 +240,8 @@ class DashboardPanels extends StatelessWidget { final settings = viewModel.dashboardUIState; final state = viewModel.state; final isLoaded = state.quoteState.isLoaded; - final currentData = memoizedChartQuotes( - state.staticState.currencyMap, - state.company, - settings, - state.quoteState.map, - state.clientState.map); + final currentData = memoizedChartQuotes(state.staticState.currencyMap, + state.company, settings, state.quoteState.map, state.clientState.map); List previousData; if (settings.enableComparison) { diff --git a/lib/ui/dashboard/dashboard_screen.dart b/lib/ui/dashboard/dashboard_screen.dart index da0f4afea..e162bdff0 100644 --- a/lib/ui/dashboard/dashboard_screen.dart +++ b/lib/ui/dashboard/dashboard_screen.dart @@ -70,8 +70,8 @@ class _DashboardScreenState extends State ? null : IconButton( icon: Icon(Icons.menu), - onPressed: () => - store.dispatch(UserSettingsChanged(sidebar: AppSidebar.menu)), + onPressed: () => store + .dispatch(UserSettingsChanged(sidebar: AppSidebar.menu)), ), title: ListFilter( title: AppLocalization.of(context).dashboard, @@ -96,7 +96,8 @@ class _DashboardScreenState extends State if (isMobile(context) || state.prefState.isHistoryFloated) { Scaffold.of(context).openEndDrawer(); } else { - store.dispatch(UserSettingsChanged(sidebar: AppSidebar.history)); + store.dispatch( + UserSettingsChanged(sidebar: AppSidebar.history)); } }, ), diff --git a/lib/ui/dashboard/dashboard_screen_vm.dart b/lib/ui/dashboard/dashboard_screen_vm.dart index 082e54bab..b18a8ca4a 100644 --- a/lib/ui/dashboard/dashboard_screen_vm.dart +++ b/lib/ui/dashboard/dashboard_screen_vm.dart @@ -80,8 +80,7 @@ class DashboardVM { onCurrencyChanged: (currencyId) => store.dispatch(UpdateDashboardSettings(currencyId: currencyId)), filter: filter, - filteredList: - memoizedFilteredSelector(filter, state.userCompanyState), + filteredList: memoizedFilteredSelector(filter, state.userCompanyState), ); } diff --git a/lib/ui/document/document_list.dart b/lib/ui/document/document_list.dart index 264a8ff3a..e93662ee1 100644 --- a/lib/ui/document/document_list.dart +++ b/lib/ui/document/document_list.dart @@ -71,7 +71,9 @@ class DocumentList extends StatelessWidget { } }, onLongPress: () async { - final longPressIsSelection = store.state.prefState + final longPressIsSelection = store + .state + .prefState .longPressSelectionIsDefault ?? true; if (longPressIsSelection && !isInMultiselect) { diff --git a/lib/ui/document/edit/document_edit_vm.dart b/lib/ui/document/edit/document_edit_vm.dart index 40f1b126e..3c7360c38 100644 --- a/lib/ui/document/edit/document_edit_vm.dart +++ b/lib/ui/document/edit/document_edit_vm.dart @@ -82,7 +82,8 @@ class DocumentEditVM { Navigator.of(context).pop(savedDocument); } } else { - store.dispatch(ViewDocument(context: context, documentId: savedDocument.id, force: true)); + store.dispatch(ViewDocument( + context: context, documentId: savedDocument.id, force: true)); } }).catchError((Object error) { showDialog( diff --git a/lib/ui/group/edit/group_edit_vm.dart b/lib/ui/group/edit/group_edit_vm.dart index e20e11cc0..7ee9bca3f 100644 --- a/lib/ui/group/edit/group_edit_vm.dart +++ b/lib/ui/group/edit/group_edit_vm.dart @@ -86,8 +86,8 @@ class GroupEditVM { Navigator.of(context).pop(savedGroup); } } else { - store.dispatch( - ViewGroup(context: context, groupId: savedGroup.id, force: true)); + store.dispatch(ViewGroup( + context: context, groupId: savedGroup.id, force: true)); } }).catchError((Object error) { showDialog( diff --git a/lib/ui/group/group_list.dart b/lib/ui/group/group_list.dart index 13d5391cb..d04389421 100644 --- a/lib/ui/group/group_list.dart +++ b/lib/ui/group/group_list.dart @@ -68,7 +68,9 @@ class GroupList extends StatelessWidget { } }, onLongPress: () async { - final longPressIsSelection = store.state.prefState + final longPressIsSelection = store + .state + .prefState .longPressSelectionIsDefault ?? true; if (longPressIsSelection && !isInMultiselect) { diff --git a/lib/ui/group/group_screen.dart b/lib/ui/group/group_screen.dart index b7cb02edf..da089d370 100644 --- a/lib/ui/group/group_screen.dart +++ b/lib/ui/group/group_screen.dart @@ -93,9 +93,7 @@ class GroupSettingsScreen extends StatelessWidget { .toList(); await showEntityActionsDialog( - entities: groups, - context: context, - multiselect: true); + entities: groups, context: context, multiselect: true); store.dispatch(ClearGroupMultiselect(context: context)); }, ), diff --git a/lib/ui/group/view/group_view.dart b/lib/ui/group/view/group_view.dart index 80343904e..0876218e6 100644 --- a/lib/ui/group/view/group_view.dart +++ b/lib/ui/group/view/group_view.dart @@ -281,10 +281,8 @@ class SettingsViewer extends StatelessWidget { settings.requireInvoiceSignature?.toString(), localization.requireQuoteSignature: settings.requireQuoteSignature?.toString(), - localization.allPagesHeader: - settings.allPagesHeader?.toString(), - localization.allPagesFooter: - settings.allPagesFooter?.toString(), + localization.allPagesHeader: settings.allPagesHeader?.toString(), + localization.allPagesFooter: settings.allPagesFooter?.toString(), //localization.enableReminder1: settings.enableReminder1, //localization.enableReminder2: settings.enableReminder2, //localization.enableReminder3: settings.enableReminder3, diff --git a/lib/ui/invoice/edit/invoice_edit_details.dart b/lib/ui/invoice/edit/invoice_edit_details.dart index bd0017436..e38cab812 100644 --- a/lib/ui/invoice/edit/invoice_edit_details.dart +++ b/lib/ui/invoice/edit/invoice_edit_details.dart @@ -166,8 +166,8 @@ class InvoiceEditDetailsState extends State { ), UserPicker( userId: invoice.assignedUserId, - onChanged: (userId) => viewModel - .onChanged(invoice.rebuild((b) => b..assignedUserId = userId)), + onChanged: (userId) => viewModel.onChanged( + invoice.rebuild((b) => b..assignedUserId = userId)), ), DatePicker( validator: (String val) => val.trim().isEmpty diff --git a/lib/ui/invoice/edit/invoice_item_selector.dart b/lib/ui/invoice/edit/invoice_item_selector.dart index a4d8a924c..4a7d91a86 100644 --- a/lib/ui/invoice/edit/invoice_item_selector.dart +++ b/lib/ui/invoice/edit/invoice_item_selector.dart @@ -69,7 +69,8 @@ class _InvoiceItemSelectorState extends State items.add( convertProductToInvoiceItem(product: product, context: context)); } else { - items.add(InvoiceItemEntity(productKey: product.productKey, quantity: 1)); + items.add( + InvoiceItemEntity(productKey: product.productKey, quantity: 1)); } } else if (entity.entityType == EntityType.task) { final task = entity as TaskEntity; diff --git a/lib/ui/invoice/invoice_list.dart b/lib/ui/invoice/invoice_list.dart index 8a9c0fba1..6cf26a3a4 100644 --- a/lib/ui/invoice/invoice_list.dart +++ b/lib/ui/invoice/invoice_list.dart @@ -80,9 +80,9 @@ class InvoiceList extends StatelessWidget { } }, onLongPress: () async { - final longPressIsSelection = - state.prefState.longPressSelectionIsDefault ?? - true; + final longPressIsSelection = state.prefState + .longPressSelectionIsDefault ?? + true; if (longPressIsSelection && !isInMultiselect) { handleInvoiceAction(context, [invoice], EntityAction.toggleMultiselect); diff --git a/lib/ui/invoice/view/invoice_view_overview.dart b/lib/ui/invoice/view/invoice_view_overview.dart index 874ef5d5e..3a9d31f1a 100644 --- a/lib/ui/invoice/view/invoice_view_overview.dart +++ b/lib/ui/invoice/view/invoice_view_overview.dart @@ -160,7 +160,8 @@ class InvoiceOverview extends StatelessWidget { invoice: invoice, invoiceItem: invoiceItem, onTap: () => userCompany.canEditEntity(invoice) - ? viewModel.onEditPressed(context, invoice.lineItems.indexOf(invoiceItem)) + ? viewModel.onEditPressed( + context, invoice.lineItems.indexOf(invoiceItem)) : null, ); }, diff --git a/lib/ui/payment/payment_list.dart b/lib/ui/payment/payment_list.dart index a74f32f72..9042eab2c 100644 --- a/lib/ui/payment/payment_list.dart +++ b/lib/ui/payment/payment_list.dart @@ -76,9 +76,9 @@ class PaymentList extends StatelessWidget { } }, onLongPress: () async { - final longPressIsSelection = - state.prefState.longPressSelectionIsDefault ?? - true; + final longPressIsSelection = state.prefState + .longPressSelectionIsDefault ?? + true; if (longPressIsSelection && !isInMultiselect) { handlePaymentAction(context, [payment], EntityAction.toggleMultiselect); diff --git a/lib/ui/project/project_list.dart b/lib/ui/project/project_list.dart index 15025fc68..7943ff5cc 100644 --- a/lib/ui/project/project_list.dart +++ b/lib/ui/project/project_list.dart @@ -77,7 +77,9 @@ class ProjectList extends StatelessWidget { } }, onLongPress: () async { - final longPressIsSelection = store.state.prefState + final longPressIsSelection = store + .state + .prefState .longPressSelectionIsDefault ?? true; if (longPressIsSelection && !isInMultiselect) { diff --git a/lib/ui/project/view/project_view_vm.dart b/lib/ui/project/view/project_view_vm.dart index 3a07e9f27..ec777f6d4 100644 --- a/lib/ui/project/view/project_view_vm.dart +++ b/lib/ui/project/view/project_view_vm.dart @@ -81,8 +81,9 @@ class ProjectViewVM { onClientPressed: (BuildContext context, [bool longPress = false]) { if (longPress) { showEntityActionsDialog( - context: context, - entities: [client],); + context: context, + entities: [client], + ); } else { store.dispatch(ViewClient(clientId: client.id, context: context)); } @@ -103,8 +104,8 @@ class ProjectViewVM { }, onAddTaskPressed: (context) => store.dispatch(EditTask( context: context, - task: - TaskEntity(isRunning: state.prefState.autoStartTasks).rebuild((b) => b + task: TaskEntity(isRunning: state.prefState.autoStartTasks) + .rebuild((b) => b ..projectId = project.id ..clientId = project.clientId), force: true, diff --git a/lib/ui/settings/client_portal.dart b/lib/ui/settings/client_portal.dart index 2f11d2a5d..d264d2187 100644 --- a/lib/ui/settings/client_portal.dart +++ b/lib/ui/settings/client_portal.dart @@ -126,9 +126,9 @@ class _ClientPortalState extends State AppDropdownButton( labelText: localization.portalMode, value: viewModel.company.portalMode, - onChanged: (dynamic value) => viewModel.onCompanyChanged(viewModel - .company - .rebuild((b) => b..portalMode = value)), + onChanged: (dynamic value) => viewModel.onCompanyChanged( + viewModel.company + .rebuild((b) => b..portalMode = value)), items: [ DropdownMenuItem( child: Text(localization.subdomain), diff --git a/lib/ui/settings/company_details.dart b/lib/ui/settings/company_details.dart index 4e2c09675..af792f065 100644 --- a/lib/ui/settings/company_details.dart +++ b/lib/ui/settings/company_details.dart @@ -292,7 +292,8 @@ class _CompanyDetailsState extends State child: Text( state.staticState.sizeMap[sizeId].name), value: sizeId, - )).toList(), + )) + .toList(), onChanged: (dynamic sizeId) => viewModel.onCompanyChanged( company.rebuild((b) => b..sizeId = sizeId), ), diff --git a/lib/ui/settings/email_settings.dart b/lib/ui/settings/email_settings.dart index 920756612..627de42d8 100644 --- a/lib/ui/settings/email_settings.dart +++ b/lib/ui/settings/email_settings.dart @@ -140,7 +140,8 @@ class _EmailSettingsState extends State label: localization.enableMarkup, helpLabel: localization.enableMarkupHelp, value: settings.enableEmailMarkup, - iconData: kIsWeb ? Icons.email : FontAwesomeIcons.solidEnvelope, + iconData: + kIsWeb ? Icons.email : FontAwesomeIcons.solidEnvelope, onChanged: (value) => viewModel.onSettingsChanged( settings.rebuild((b) => b..enableEmailMarkup = value)), ), diff --git a/lib/ui/settings/generated_numbers.dart b/lib/ui/settings/generated_numbers.dart index c944bfa5a..015cadb42 100644 --- a/lib/ui/settings/generated_numbers.dart +++ b/lib/ui/settings/generated_numbers.dart @@ -158,8 +158,9 @@ class _GeneratedNumbersState extends State AppDropdownButton( labelText: localization.resetCounter, value: settings.resetCounterFrequencyId, - onChanged: (dynamic value) => viewModel.onSettingsChanged(settings - .rebuild((b) => b..resetCounterFrequencyId = value)), + onChanged: (dynamic value) => viewModel.onSettingsChanged( + settings.rebuild( + (b) => b..resetCounterFrequencyId = value)), items: [ DropdownMenuItem( child: Text(localization.never), diff --git a/lib/ui/settings/invoice_design.dart b/lib/ui/settings/invoice_design.dart index 16f58aa4b..39a745e22 100644 --- a/lib/ui/settings/invoice_design.dart +++ b/lib/ui/settings/invoice_design.dart @@ -83,8 +83,9 @@ class _InvoiceDesignState extends State AppDropdownButton( labelText: localization.invoiceDesign, value: settings.defaultInvoiceDesignId, - onChanged: (dynamic value) => viewModel.onSettingsChanged(settings - .rebuild((b) => b..defaultInvoiceDesignId = value)), + onChanged: (dynamic value) => viewModel.onSettingsChanged( + settings + .rebuild((b) => b..defaultInvoiceDesignId = value)), items: designs .map((designId) => DropdownMenuItem( value: designId, diff --git a/lib/ui/settings/settings_screen_vm.dart b/lib/ui/settings/settings_screen_vm.dart index e6bbdc9a3..8f6f9a849 100644 --- a/lib/ui/settings/settings_screen_vm.dart +++ b/lib/ui/settings/settings_screen_vm.dart @@ -25,9 +25,7 @@ class SettingsScreenBuilder extends StatelessWidget { } class SettingsScreenVM { - SettingsScreenVM({ - @required this.state - }); + SettingsScreenVM({@required this.state}); final AppState state; static SettingsScreenVM fromStore(Store store) { diff --git a/lib/ui/settings/templates_and_reminders.dart b/lib/ui/settings/templates_and_reminders.dart index cc9f4b120..29e7772a5 100644 --- a/lib/ui/settings/templates_and_reminders.dart +++ b/lib/ui/settings/templates_and_reminders.dart @@ -315,8 +315,8 @@ class _TemplatesAndRemindersState extends State AppDropdownButton( labelText: localization.frequency, value: settings.endlessReminderFrequencyId, - onChanged: (dynamic value) => viewModel.onSettingsChanged( - settings.rebuild( + onChanged: (dynamic value) => + viewModel.onSettingsChanged(settings.rebuild( (b) => b..endlessReminderFrequencyId = value)), items: kFrequencies .map((id, frequency) => diff --git a/lib/ui/task/task_list.dart b/lib/ui/task/task_list.dart index 741e4987e..db05ff80e 100644 --- a/lib/ui/task/task_list.dart +++ b/lib/ui/task/task_list.dart @@ -75,9 +75,9 @@ class TaskList extends StatelessWidget { } }, onLongPress: () async { - final longPressIsSelection = - state.prefState.longPressSelectionIsDefault ?? - true; + final longPressIsSelection = state.prefState + .longPressSelectionIsDefault ?? + true; if (longPressIsSelection && !isInMultiselect) { handleTaskAction(context, [task], EntityAction.toggleMultiselect); diff --git a/lib/ui/task/task_screen.dart b/lib/ui/task/task_screen.dart index 2fc887369..5f776af31 100644 --- a/lib/ui/task/task_screen.dart +++ b/lib/ui/task/task_screen.dart @@ -90,9 +90,7 @@ class TaskScreen extends StatelessWidget { .toList(); await showEntityActionsDialog( - entities: tasks, - context: context, - multiselect: true); + entities: tasks, context: context, multiselect: true); store.dispatch(ClearTaskMultiselect(context: context)); }, ), diff --git a/lib/ui/tax_rate/tax_rate_list.dart b/lib/ui/tax_rate/tax_rate_list.dart index acb0563da..ec7b18ce2 100644 --- a/lib/ui/tax_rate/tax_rate_list.dart +++ b/lib/ui/tax_rate/tax_rate_list.dart @@ -63,7 +63,9 @@ class TaxRateList extends StatelessWidget { } }, onLongPress: () async { - final longPressIsSelection = store.state.prefState + final longPressIsSelection = store + .state + .prefState .longPressSelectionIsDefault ?? true; if (longPressIsSelection && !isInMultiselect) { diff --git a/lib/ui/user/user_screen.dart b/lib/ui/user/user_screen.dart index c2f4c1695..86e7a91d2 100644 --- a/lib/ui/user/user_screen.dart +++ b/lib/ui/user/user_screen.dart @@ -94,9 +94,7 @@ class UserScreen extends StatelessWidget { .toList(); await showEntityActionsDialog( - entities: users, - context: context, - multiselect: true); + entities: users, context: context, multiselect: true); store.dispatch(ClearUserMultiselect(context: context)); }, ), diff --git a/lib/ui/user/view/user_view_vm.dart b/lib/ui/user/view/user_view_vm.dart index be2ad4f9a..57a9a9ab3 100644 --- a/lib/ui/user/view/user_view_vm.dart +++ b/lib/ui/user/view/user_view_vm.dart @@ -109,8 +109,7 @@ class UserViewVM { if (longPress && user.isActive) { store.dispatch(EditQuote( context: context, - quote: InvoiceEntity( - company: state.company, isQuote: true))); + quote: InvoiceEntity(company: state.company, isQuote: true))); } else { store.dispatch(FilterQuotesByEntity( entityId: user.id, entityType: EntityType.user)); diff --git a/lib/ui/vendor/edit/vendor_edit_vm.dart b/lib/ui/vendor/edit/vendor_edit_vm.dart index 917c62441..70325972d 100644 --- a/lib/ui/vendor/edit/vendor_edit_vm.dart +++ b/lib/ui/vendor/edit/vendor_edit_vm.dart @@ -100,8 +100,8 @@ class VendorEditVM { Navigator.of(context).pop(savedVendor); } } else { - store.dispatch( - ViewVendor(context: context, vendorId: savedVendor.id, force: true)); + store.dispatch(ViewVendor( + context: context, vendorId: savedVendor.id, force: true)); } }).catchError((Object error) { showDialog( diff --git a/lib/ui/vendor/vendor_list.dart b/lib/ui/vendor/vendor_list.dart index 20a56ab5d..822bc3938 100644 --- a/lib/ui/vendor/vendor_list.dart +++ b/lib/ui/vendor/vendor_list.dart @@ -62,7 +62,9 @@ class VendorList extends StatelessWidget { } }, onLongPress: () async { - final longPressIsSelection = store.state.prefState + final longPressIsSelection = store + .state + .prefState .longPressSelectionIsDefault ?? true; if (longPressIsSelection && !isInMultiselect) { diff --git a/lib/ui/vendor/view/vendor_view_vm.dart b/lib/ui/vendor/view/vendor_view_vm.dart index 95c80d24e..e8350ffeb 100644 --- a/lib/ui/vendor/view/vendor_view_vm.dart +++ b/lib/ui/vendor/view/vendor_view_vm.dart @@ -95,8 +95,8 @@ class VendorViewVM { if (longPress && vendor.isActive) { store.dispatch(EditExpense( context: context, - expense: ExpenseEntity( - company: state.company, vendor: vendor))); + expense: + ExpenseEntity(company: state.company, vendor: vendor))); } else { store.dispatch(FilterExpensesByEntity( entityId: vendor.id, entityType: EntityType.vendor)); diff --git a/lib/utils/formatting.dart b/lib/utils/formatting.dart index 830b415a4..4729c634f 100644 --- a/lib/utils/formatting.dart +++ b/lib/utils/formatting.dart @@ -64,8 +64,7 @@ String formatNumber( final state = StoreProvider.of(context).state; final CompanyEntity company = state.company; - final ClientEntity client = - state.userCompanyState.clientState.map[clientId]; + final ClientEntity client = state.userCompanyState.clientState.map[clientId]; String countryId; diff --git a/lib/utils/icons.dart b/lib/utils/icons.dart index 616a4e4eb..b3a3f5aad 100644 --- a/lib/utils/icons.dart +++ b/lib/utils/icons.dart @@ -80,8 +80,7 @@ IconData getEntityIcon(EntityType entityType) { return null; } } - - + switch (entityType) { case EntityType.product: return FontAwesomeIcons.cube; @@ -185,7 +184,7 @@ IconData getSettingIcon(String section) { return null; } } - + switch (section) { case kSettingsCompanyDetails: return FontAwesomeIcons.building;