From 87b25a501f14d490d5d4420c1c8812488300ec9f Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 17 Nov 2019 14:43:25 +0200 Subject: [PATCH] Settings --- lib/redux/app/app_middleware.dart | 1 + lib/ui/auth/login_view.dart | 2 +- lib/ui/client/edit/client_edit.dart | 2 +- lib/ui/company_gateway/edit/company_gateway_edit.dart | 2 +- lib/ui/document/edit/document_edit.dart | 2 +- lib/ui/expense/edit/expense_edit.dart | 2 +- lib/ui/group/edit/group_edit.dart | 2 +- lib/ui/invoice/edit/invoice_edit_vm.dart | 2 +- lib/ui/payment/edit/payment_edit.dart | 2 +- lib/ui/product/edit/product_edit.dart | 2 +- lib/ui/project/edit/project_edit.dart | 2 +- lib/ui/quote/edit/quote_edit_vm.dart | 2 +- lib/ui/settings/buy_now_buttons.dart | 2 +- lib/ui/settings/client_portal.dart | 2 +- lib/ui/settings/company_details.dart | 2 +- lib/ui/settings/credit_cards_and_banks.dart | 2 +- lib/ui/settings/custom_fields.dart | 2 +- lib/ui/settings/data_visualizations.dart | 2 +- lib/ui/settings/device_settings_list.dart | 2 +- lib/ui/settings/email_settings.dart | 2 +- lib/ui/settings/generated_numbers.dart | 2 +- lib/ui/settings/import_export.dart | 2 +- lib/ui/settings/invoice_design.dart | 2 +- lib/ui/settings/localization_settings.dart | 2 +- lib/ui/settings/notifications.dart | 2 +- lib/ui/settings/product_settings.dart | 2 +- lib/ui/settings/tax_settings.dart | 2 +- lib/ui/settings/templates_and_reminders.dart | 2 +- lib/ui/settings/user_details.dart | 2 +- lib/ui/settings/workflow_settings.dart | 2 +- lib/ui/task/edit/task_edit.dart | 2 +- lib/ui/tax_rate/edit/tax_rate_edit.dart | 2 +- lib/ui/user/edit/user_edit.dart | 2 +- lib/ui/vendor/edit/vendor_edit.dart | 2 +- samples/form_keys.dart | 2 +- samples/form_redux.dart | 2 +- stubs/ui/stub/edit/stub_edit | 2 +- 37 files changed, 37 insertions(+), 36 deletions(-) diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart index 25fc46c70..d288aa11e 100644 --- a/lib/redux/app/app_middleware.dart +++ b/lib/redux/app/app_middleware.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:convert'; +import 'package:flutter/material.dart' as prefix0; import 'package:invoiceninja_flutter/.env.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart index 578907d10..713f3c406 100644 --- a/lib/ui/auth/login_view.dart +++ b/lib/ui/auth/login_view.dart @@ -31,7 +31,7 @@ class LoginView extends StatefulWidget { } class _LoginState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_login'); final _firstNameController = TextEditingController(); final _lastNameController = TextEditingController(); diff --git a/lib/ui/client/edit/client_edit.dart b/lib/ui/client/edit/client_edit.dart index f1ec8cadc..d8fea655c 100644 --- a/lib/ui/client/edit/client_edit.dart +++ b/lib/ui/client/edit/client_edit.dart @@ -26,7 +26,7 @@ class ClientEdit extends StatefulWidget { class _ClientEditState extends State with SingleTickerProviderStateMixin { TabController _controller; - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_clientEdit'); @override void initState() { diff --git a/lib/ui/company_gateway/edit/company_gateway_edit.dart b/lib/ui/company_gateway/edit/company_gateway_edit.dart index 224aafbbf..8fb3bcc29 100644 --- a/lib/ui/company_gateway/edit/company_gateway_edit.dart +++ b/lib/ui/company_gateway/edit/company_gateway_edit.dart @@ -33,7 +33,7 @@ class CompanyGatewayEdit extends StatefulWidget { class _CompanyGatewayEditState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_companyGatewayEdit'); final FocusScopeNode _focusNode = FocusScopeNode(); TabController _controller; diff --git a/lib/ui/document/edit/document_edit.dart b/lib/ui/document/edit/document_edit.dart index 073efdbec..2251d6876 100644 --- a/lib/ui/document/edit/document_edit.dart +++ b/lib/ui/document/edit/document_edit.dart @@ -20,7 +20,7 @@ class DocumentEdit extends StatefulWidget { } class _DocumentEditState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_documentEdit'); final _debouncer = Debouncer(); // STARTER: controllers - do not remove comment diff --git a/lib/ui/expense/edit/expense_edit.dart b/lib/ui/expense/edit/expense_edit.dart index 85d49e709..08c37bdd6 100644 --- a/lib/ui/expense/edit/expense_edit.dart +++ b/lib/ui/expense/edit/expense_edit.dart @@ -23,7 +23,7 @@ class ExpenseEdit extends StatefulWidget { class _ExpenseEditState extends State with SingleTickerProviderStateMixin { TabController _controller; - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_expenseEdit'); @override void initState() { diff --git a/lib/ui/group/edit/group_edit.dart b/lib/ui/group/edit/group_edit.dart index 0346ced51..d67457a84 100644 --- a/lib/ui/group/edit/group_edit.dart +++ b/lib/ui/group/edit/group_edit.dart @@ -23,7 +23,7 @@ class GroupEdit extends StatefulWidget { } class _GroupEditState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_groupEdit'); final _nameController = TextEditingController(); final _custom1Controller = TextEditingController(); diff --git a/lib/ui/invoice/edit/invoice_edit_vm.dart b/lib/ui/invoice/edit/invoice_edit_vm.dart index 82b38bd37..d6521ffa6 100644 --- a/lib/ui/invoice/edit/invoice_edit_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_vm.dart @@ -18,7 +18,7 @@ class InvoiceEditScreen extends StatelessWidget { static const String route = '/invoice/edit'; - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_invoiceEdit'); @override Widget build(BuildContext context) { diff --git a/lib/ui/payment/edit/payment_edit.dart b/lib/ui/payment/edit/payment_edit.dart index 94e0b9993..d23f36a73 100644 --- a/lib/ui/payment/edit/payment_edit.dart +++ b/lib/ui/payment/edit/payment_edit.dart @@ -28,7 +28,7 @@ class PaymentEdit extends StatefulWidget { } class _PaymentEditState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_paymentEdit'); final _amountController = TextEditingController(); final _transactionReferenceController = TextEditingController(); diff --git a/lib/ui/product/edit/product_edit.dart b/lib/ui/product/edit/product_edit.dart index 3e32373d8..d2561b974 100644 --- a/lib/ui/product/edit/product_edit.dart +++ b/lib/ui/product/edit/product_edit.dart @@ -26,7 +26,7 @@ class ProductEdit extends StatefulWidget { } class _ProductEditState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_productEdit'); bool autoValidate = false; diff --git a/lib/ui/project/edit/project_edit.dart b/lib/ui/project/edit/project_edit.dart index 1e07dc14e..95cac4086 100644 --- a/lib/ui/project/edit/project_edit.dart +++ b/lib/ui/project/edit/project_edit.dart @@ -27,7 +27,7 @@ class ProjectEdit extends StatefulWidget { } class _ProjectEditState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_projectEdit'); final _debouncer = Debouncer(); bool autoValidate = false; diff --git a/lib/ui/quote/edit/quote_edit_vm.dart b/lib/ui/quote/edit/quote_edit_vm.dart index b1b238796..5e992a13b 100644 --- a/lib/ui/quote/edit/quote_edit_vm.dart +++ b/lib/ui/quote/edit/quote_edit_vm.dart @@ -19,7 +19,7 @@ class QuoteEditScreen extends StatelessWidget { static const String route = '/quote/edit'; - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_quotesEdit'); @override Widget build(BuildContext context) { diff --git a/lib/ui/settings/buy_now_buttons.dart b/lib/ui/settings/buy_now_buttons.dart index 15ce7c37f..ebb081d2a 100644 --- a/lib/ui/settings/buy_now_buttons.dart +++ b/lib/ui/settings/buy_now_buttons.dart @@ -19,7 +19,7 @@ class BuyNowButtons extends StatefulWidget { } class _BuyNowButtonsState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_buyNowButtons'); bool autoValidate = false; diff --git a/lib/ui/settings/client_portal.dart b/lib/ui/settings/client_portal.dart index d264d2187..959a62b40 100644 --- a/lib/ui/settings/client_portal.dart +++ b/lib/ui/settings/client_portal.dart @@ -28,7 +28,7 @@ class ClientPortal extends StatefulWidget { class _ClientPortalState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_clientPortal'); final FocusScopeNode _focusNode = FocusScopeNode(); TabController _controller; diff --git a/lib/ui/settings/company_details.dart b/lib/ui/settings/company_details.dart index af792f065..fb6754c29 100644 --- a/lib/ui/settings/company_details.dart +++ b/lib/ui/settings/company_details.dart @@ -31,7 +31,7 @@ class CompanyDetails extends StatefulWidget { class _CompanyDetailsState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_companyDetails'); final FocusScopeNode _focusNode = FocusScopeNode(); TabController _controller; diff --git a/lib/ui/settings/credit_cards_and_banks.dart b/lib/ui/settings/credit_cards_and_banks.dart index 547b90c31..22ba8fb1f 100644 --- a/lib/ui/settings/credit_cards_and_banks.dart +++ b/lib/ui/settings/credit_cards_and_banks.dart @@ -18,7 +18,7 @@ class CreditCardsAndBanks extends StatefulWidget { class _CreditCardsAndBanksState extends State with SingleTickerProviderStateMixin { - //static final GlobalKey _formKey = GlobalKey(); + //static final GlobalKey _formKey = GlobalKey(debugLabel: '_creditCardsAndBanks); TabController _controller; diff --git a/lib/ui/settings/custom_fields.dart b/lib/ui/settings/custom_fields.dart index a82248503..0ece0f589 100644 --- a/lib/ui/settings/custom_fields.dart +++ b/lib/ui/settings/custom_fields.dart @@ -25,7 +25,7 @@ class CustomFields extends StatefulWidget { class _CustomFieldsState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_customFields'); final _debouncer = Debouncer(); FocusScopeNode _focusNode; diff --git a/lib/ui/settings/data_visualizations.dart b/lib/ui/settings/data_visualizations.dart index d28a5fc2e..c1f620f3f 100644 --- a/lib/ui/settings/data_visualizations.dart +++ b/lib/ui/settings/data_visualizations.dart @@ -17,7 +17,7 @@ class DataVisualizations extends StatefulWidget { } class _DataVisualizationsState extends State { - //static final GlobalKey _formKey = GlobalKey(); + //static final GlobalKey _formKey = GlobalKey(debugLabel: '_dataVisualizations'); bool autoValidate = false; diff --git a/lib/ui/settings/device_settings_list.dart b/lib/ui/settings/device_settings_list.dart index 1f0365d13..894158279 100644 --- a/lib/ui/settings/device_settings_list.dart +++ b/lib/ui/settings/device_settings_list.dart @@ -24,7 +24,7 @@ class DeviceSettings extends StatefulWidget { } class _DeviceSettingsState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_deviceSettings'); @override Widget build(BuildContext context) { diff --git a/lib/ui/settings/email_settings.dart b/lib/ui/settings/email_settings.dart index 627de42d8..aa63e8b07 100644 --- a/lib/ui/settings/email_settings.dart +++ b/lib/ui/settings/email_settings.dart @@ -25,7 +25,7 @@ class EmailSettings extends StatefulWidget { class _EmailSettingsState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_emailSettings'); TabController _tabController; FocusScopeNode _focusNode; diff --git a/lib/ui/settings/generated_numbers.dart b/lib/ui/settings/generated_numbers.dart index 015cadb42..1440725e9 100644 --- a/lib/ui/settings/generated_numbers.dart +++ b/lib/ui/settings/generated_numbers.dart @@ -27,7 +27,7 @@ class GeneratedNumbers extends StatefulWidget { class _GeneratedNumbersState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_generatedNumbers'); FocusScopeNode _focusNode; TabController _controller; diff --git a/lib/ui/settings/import_export.dart b/lib/ui/settings/import_export.dart index 8751c0398..15ac91853 100644 --- a/lib/ui/settings/import_export.dart +++ b/lib/ui/settings/import_export.dart @@ -17,7 +17,7 @@ class ImportExport extends StatefulWidget { } class _ImportExportState extends State { - //static final GlobalKey _formKey = GlobalKey(); + //static final GlobalKey _formKey = GlobalKey(debugLabel: '_importExport); bool autoValidate = false; diff --git a/lib/ui/settings/invoice_design.dart b/lib/ui/settings/invoice_design.dart index 39a745e22..22db4afd9 100644 --- a/lib/ui/settings/invoice_design.dart +++ b/lib/ui/settings/invoice_design.dart @@ -29,7 +29,7 @@ class InvoiceDesign extends StatefulWidget { class _InvoiceDesignState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_invoiceDesign'); TabController _controller; FocusScopeNode _focusNode; diff --git a/lib/ui/settings/localization_settings.dart b/lib/ui/settings/localization_settings.dart index 48ba46772..8fd428d73 100644 --- a/lib/ui/settings/localization_settings.dart +++ b/lib/ui/settings/localization_settings.dart @@ -27,7 +27,7 @@ class LocalizationSettings extends StatefulWidget { } class _LocalizationSettingsState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_localizationSettings'); bool autoValidate = false; diff --git a/lib/ui/settings/notifications.dart b/lib/ui/settings/notifications.dart index 9e3919476..02ca965dd 100644 --- a/lib/ui/settings/notifications.dart +++ b/lib/ui/settings/notifications.dart @@ -17,7 +17,7 @@ class NotificationSettings extends StatefulWidget { } class _NotificationSettingsState extends State { - //static final GlobalKey _formKey = GlobalKey(); + //static final GlobalKey _formKey = GlobalKey(debugLabel: '_notifications'); bool autoValidate = false; diff --git a/lib/ui/settings/product_settings.dart b/lib/ui/settings/product_settings.dart index 422b85987..9b2e7667c 100644 --- a/lib/ui/settings/product_settings.dart +++ b/lib/ui/settings/product_settings.dart @@ -19,7 +19,7 @@ class ProductSettings extends StatefulWidget { } class _ProductSettingsState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_productSettings'); @override Widget build(BuildContext context) { diff --git a/lib/ui/settings/tax_settings.dart b/lib/ui/settings/tax_settings.dart index 436086d6a..f77c6c57e 100644 --- a/lib/ui/settings/tax_settings.dart +++ b/lib/ui/settings/tax_settings.dart @@ -24,7 +24,7 @@ class TaxSettings extends StatefulWidget { } class _TaxSettingsState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_taxSettings'); @override Widget build(BuildContext context) { diff --git a/lib/ui/settings/templates_and_reminders.dart b/lib/ui/settings/templates_and_reminders.dart index 29e7772a5..b00154040 100644 --- a/lib/ui/settings/templates_and_reminders.dart +++ b/lib/ui/settings/templates_and_reminders.dart @@ -30,7 +30,7 @@ class TemplatesAndReminders extends StatefulWidget { class _TemplatesAndRemindersState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_templatesAndReminders'); final _debouncer = Debouncer(); String _template = kEmailTemplateInvoice; diff --git a/lib/ui/settings/user_details.dart b/lib/ui/settings/user_details.dart index 4bed95813..8da5031f4 100644 --- a/lib/ui/settings/user_details.dart +++ b/lib/ui/settings/user_details.dart @@ -21,7 +21,7 @@ class UserDetails extends StatefulWidget { } class _UserDetailsState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_userDetails'); bool autoValidate = false; diff --git a/lib/ui/settings/workflow_settings.dart b/lib/ui/settings/workflow_settings.dart index 54696f9f3..524c4eee4 100644 --- a/lib/ui/settings/workflow_settings.dart +++ b/lib/ui/settings/workflow_settings.dart @@ -22,7 +22,7 @@ class WorkflowSettings extends StatefulWidget { class _WorkflowSettingsState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_workflowSettings'); FocusScopeNode _focusNode; TabController _controller; diff --git a/lib/ui/task/edit/task_edit.dart b/lib/ui/task/edit/task_edit.dart index 9f41b35d1..780db011c 100644 --- a/lib/ui/task/edit/task_edit.dart +++ b/lib/ui/task/edit/task_edit.dart @@ -26,7 +26,7 @@ class _TaskEditState extends State Timer _timer; TabController _controller; - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_taskEdit'); static const kDetailsScreen = 0; static const kTimesScreen = 1; diff --git a/lib/ui/tax_rate/edit/tax_rate_edit.dart b/lib/ui/tax_rate/edit/tax_rate_edit.dart index b3ed4d471..910f95ea2 100644 --- a/lib/ui/tax_rate/edit/tax_rate_edit.dart +++ b/lib/ui/tax_rate/edit/tax_rate_edit.dart @@ -22,7 +22,7 @@ class TaxRateEdit extends StatefulWidget { } class _TaxRateEditState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_taxRateEdit'); bool autoValidate = false; diff --git a/lib/ui/user/edit/user_edit.dart b/lib/ui/user/edit/user_edit.dart index 5574e0918..5365d7f3f 100644 --- a/lib/ui/user/edit/user_edit.dart +++ b/lib/ui/user/edit/user_edit.dart @@ -26,7 +26,7 @@ class UserEdit extends StatefulWidget { } class _UserEditState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_userEdit'); final _debouncer = Debouncer(); bool autoValidate = false; diff --git a/lib/ui/vendor/edit/vendor_edit.dart b/lib/ui/vendor/edit/vendor_edit.dart index bb277e4bc..d95066692 100644 --- a/lib/ui/vendor/edit/vendor_edit.dart +++ b/lib/ui/vendor/edit/vendor_edit.dart @@ -24,7 +24,7 @@ class VendorEdit extends StatefulWidget { class _VendorEditState extends State with SingleTickerProviderStateMixin { TabController _controller; - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_vendorEdit'); @override void initState() { diff --git a/samples/form_keys.dart b/samples/form_keys.dart index f9150d2ec..f1c81645d 100644 --- a/samples/form_keys.dart +++ b/samples/form_keys.dart @@ -23,7 +23,7 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_appState'); static final GlobalKey _clientKey = GlobalKey(); diff --git a/samples/form_redux.dart b/samples/form_redux.dart index b456f8da4..b0051a099 100644 --- a/samples/form_redux.dart +++ b/samples/form_redux.dart @@ -119,7 +119,7 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State with SingleTickerProviderStateMixin { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_appState'); TabController _controller; diff --git a/stubs/ui/stub/edit/stub_edit b/stubs/ui/stub/edit/stub_edit index fd2fac943..d7eaffd20 100644 --- a/stubs/ui/stub/edit/stub_edit +++ b/stubs/ui/stub/edit/stub_edit @@ -20,7 +20,7 @@ class StubEdit extends StatefulWidget { } class _StubEditState extends State { - static final GlobalKey _formKey = GlobalKey(); + static final GlobalKey _formKey = GlobalKey(debugLabel: '_stubEdit'); final _debouncer = Debouncer(); // STARTER: controllers - do not remove comment