diff --git a/analysis_options.yaml b/analysis_options.yaml index 66c72acf8..70e017457 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -84,7 +84,7 @@ linter: # - comment_references # blocked on https://github.com/dart-lang/dartdoc/issues/1153 # - constant_identifier_names # https://github.com/dart-lang/linter/issues/204 - control_flow_in_finally - - directives_ordering + # - directives_ordering - empty_catches - empty_constructor_bodies - empty_statements diff --git a/lib/colors.dart b/lib/colors.dart index 74a507f89..ca8070d8c 100644 --- a/lib/colors.dart +++ b/lib/colors.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'constants.dart'; import 'data/models/static/color_theme_model.dart'; diff --git a/lib/data/file_storage.dart b/lib/data/file_storage.dart index 9c36216f9..c80679856 100644 --- a/lib/data/file_storage.dart +++ b/lib/data/file_storage.dart @@ -1,9 +1,13 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:archive/archive.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:archive/archive.dart'; import 'package:shared_preferences/shared_preferences.dart'; //import 'package:idb_shim/idb.dart'; diff --git a/lib/data/models/account_model.dart b/lib/data/models/account_model.dart index 397bacd04..f1b2d7a5f 100644 --- a/lib/data/models/account_model.dart +++ b/lib/data/models/account_model.dart @@ -1,8 +1,11 @@ +// Package imports: import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:version/version.dart'; +// Project imports: +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; + part 'account_model.g.dart'; abstract class AccountEntity diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart index 089f0ac04..fca2b02b6 100644 --- a/lib/data/models/client_model.dart +++ b/lib/data/models/client_model.dart @@ -1,7 +1,13 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:flutter/foundation.dart'; +import 'package:collection/collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; @@ -14,7 +20,6 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:collection/collection.dart'; part 'client_model.g.dart'; diff --git a/lib/data/models/company_gateway_model.dart b/lib/data/models/company_gateway_model.dart index 285f34952..7c0a4a958 100644 --- a/lib/data/models/company_gateway_model.dart +++ b/lib/data/models/company_gateway_model.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:convert'; +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart index 17f6e5c90..b12ce5934 100644 --- a/lib/data/models/company_model.dart +++ b/lib/data/models/company_model.dart @@ -1,8 +1,13 @@ +// Dart imports: import 'dart:convert'; +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/account_model.dart'; import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; @@ -14,7 +19,6 @@ import 'package:invoiceninja_flutter/data/models/settings_model.dart'; import 'package:invoiceninja_flutter/data/models/system_log_model.dart'; import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; part 'company_model.g.dart'; diff --git a/lib/data/models/credit_model.dart b/lib/data/models/credit_model.dart index 4899da60e..b03965b23 100644 --- a/lib/data/models/credit_model.dart +++ b/lib/data/models/credit_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; part 'credit_model.g.dart'; diff --git a/lib/data/models/dashboard_model.dart b/lib/data/models/dashboard_model.dart index ce6c3e50d..e0eadc868 100644 --- a/lib/data/models/dashboard_model.dart +++ b/lib/data/models/dashboard_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; part 'dashboard_model.g.dart'; diff --git a/lib/data/models/design_model.dart b/lib/data/models/design_model.dart index 39a12172d..68c9be422 100644 --- a/lib/data/models/design_model.dart +++ b/lib/data/models/design_model.dart @@ -1,6 +1,9 @@ -import 'package:built_value/built_value.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/data/models/document_model.dart b/lib/data/models/document_model.dart index cda45d34f..4ce9b9a94 100644 --- a/lib/data/models/document_model.dart +++ b/lib/data/models/document_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart index e01f4a009..026dd4199 100644 --- a/lib/data/models/entities.dart +++ b/lib/data/models/entities.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; diff --git a/lib/data/models/expense_category_model.dart b/lib/data/models/expense_category_model.dart index 9d574a483..4c777d87d 100644 --- a/lib/data/models/expense_category_model.dart +++ b/lib/data/models/expense_category_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart index d02bf0a80..321c64ba7 100644 --- a/lib/data/models/expense_model.dart +++ b/lib/data/models/expense_model.dart @@ -1,6 +1,10 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; +import 'package:collection/collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -9,7 +13,6 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:collection/collection.dart'; part 'expense_model.g.dart'; diff --git a/lib/data/models/gateway_token_model.dart b/lib/data/models/gateway_token_model.dart index 4eb2dd77e..5ea88c2a4 100644 --- a/lib/data/models/gateway_token_model.dart +++ b/lib/data/models/gateway_token_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/data/models/group_model.dart b/lib/data/models/group_model.dart index f4aa2bb61..e334da236 100644 --- a/lib/data/models/group_model.dart +++ b/lib/data/models/group_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/data/models/health_check_model.dart b/lib/data/models/health_check_model.dart index 0d9fdc825..fc3538bbd 100644 --- a/lib/data/models/health_check_model.dart +++ b/lib/data/models/health_check_model.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; diff --git a/lib/data/models/import_model.dart b/lib/data/models/import_model.dart index 13d3dec35..7807260be 100644 --- a/lib/data/models/import_model.dart +++ b/lib/data/models/import_model.dart @@ -1,7 +1,12 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:flutter/foundation.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'import_model.g.dart'; diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index 3bd24238c..e11943395 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -1,6 +1,10 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; +import 'package:collection/collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; @@ -13,7 +17,6 @@ import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/money.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:collection/collection.dart'; part 'invoice_model.g.dart'; diff --git a/lib/data/models/mixins/invoice_mixin.dart b/lib/data/models/mixins/invoice_mixin.dart index ac62b3d53..a7b723fea 100644 --- a/lib/data/models/mixins/invoice_mixin.dart +++ b/lib/data/models/mixins/invoice_mixin.dart @@ -1,5 +1,10 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart index 81fe9a2ae..466b7f2c8 100644 --- a/lib/data/models/models.dart +++ b/lib/data/models/models.dart @@ -1,8 +1,12 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; + export 'package:invoiceninja_flutter/data/models/client_model.dart'; export 'package:invoiceninja_flutter/data/models/company_model.dart'; export 'package:invoiceninja_flutter/data/models/credit_model.dart'; diff --git a/lib/data/models/payment_model.dart b/lib/data/models/payment_model.dart index 75d734768..4c55bcf33 100644 --- a/lib/data/models/payment_model.dart +++ b/lib/data/models/payment_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/data/models/payment_term_model.dart b/lib/data/models/payment_term_model.dart index ac434554b..1533c9440 100644 --- a/lib/data/models/payment_term_model.dart +++ b/lib/data/models/payment_term_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart index 64682c60b..1675edc1d 100644 --- a/lib/data/models/product_model.dart +++ b/lib/data/models/product_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/data/models/project_model.dart b/lib/data/models/project_model.dart index f9e8ee326..eed0399e0 100644 --- a/lib/data/models/project_model.dart +++ b/lib/data/models/project_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/data/models/quote_model.dart b/lib/data/models/quote_model.dart index e6f366e08..d13c41c54 100644 --- a/lib/data/models/quote_model.dart +++ b/lib/data/models/quote_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; part 'quote_model.g.dart'; diff --git a/lib/data/models/serializers.dart b/lib/data/models/serializers.dart index 926f87229..95c64c7b6 100644 --- a/lib/data/models/serializers.dart +++ b/lib/data/models/serializers.dart @@ -1,68 +1,71 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/serializer.dart'; import 'package:built_value/standard_json_plugin.dart'; -import 'package:invoiceninja_flutter/data/models/credit_model.dart'; -import 'package:invoiceninja_flutter/data/models/document_model.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/account_model.dart'; +import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; -import 'package:invoiceninja_flutter/data/models/gateway_token_model.dart'; +import 'package:invoiceninja_flutter/data/models/credit_model.dart'; +import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; +import 'package:invoiceninja_flutter/data/models/design_model.dart'; +import 'package:invoiceninja_flutter/data/models/document_model.dart'; +import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/expense_model.dart'; +import 'package:invoiceninja_flutter/data/models/gateway_token_model.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/health_check_model.dart'; import 'package:invoiceninja_flutter/data/models/import_model.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/payment_model.dart'; -import 'package:invoiceninja_flutter/data/models/account_model.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; import 'package:invoiceninja_flutter/data/models/project_model.dart'; +import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; import 'package:invoiceninja_flutter/data/models/system_log_model.dart'; import 'package:invoiceninja_flutter/data/models/task_model.dart'; +import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; +import 'package:invoiceninja_flutter/data/models/token_model.dart'; +import 'package:invoiceninja_flutter/data/models/user_model.dart'; import 'package:invoiceninja_flutter/data/models/vendor_model.dart'; -import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; +import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_state.dart'; -import 'package:invoiceninja_flutter/redux/company/company_state.dart'; -import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; -import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/product/product_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_state.dart'; +import 'package:invoiceninja_flutter/redux/company/company_state.dart'; +import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; +import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; +import 'package:invoiceninja_flutter/redux/design/design_state.dart'; +import 'package:invoiceninja_flutter/redux/document/document_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_state.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_state.dart'; -import 'package:invoiceninja_flutter/redux/task/task_state.dart'; -import 'package:invoiceninja_flutter/redux/project/project_state.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; +import 'package:invoiceninja_flutter/redux/group/group_state.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_state.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_state.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; +import 'package:invoiceninja_flutter/redux/product/product_state.dart'; +import 'package:invoiceninja_flutter/redux/project/project_state.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; +import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; +import 'package:invoiceninja_flutter/redux/static/static_state.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; +import 'package:invoiceninja_flutter/redux/task/task_state.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; +import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; +import 'package:invoiceninja_flutter/redux/token/token_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_state.dart'; +import 'package:invoiceninja_flutter/redux/user/user_state.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_state.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; // STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; -import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; -import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; -import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; -import 'package:invoiceninja_flutter/data/models/token_model.dart'; -import 'package:invoiceninja_flutter/redux/token/token_state.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; -import 'package:invoiceninja_flutter/data/models/design_model.dart'; -import 'package:invoiceninja_flutter/redux/design/design_state.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; -import 'package:invoiceninja_flutter/data/models/user_model.dart'; -import 'package:invoiceninja_flutter/redux/user/user_state.dart'; -import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; -import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; -import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart'; -import 'package:invoiceninja_flutter/redux/group/group_state.dart'; -import 'package:invoiceninja_flutter/redux/document/document_state.dart'; part 'serializers.g.dart'; diff --git a/lib/data/models/settings_model.dart b/lib/data/models/settings_model.dart index dca076342..be48de606 100644 --- a/lib/data/models/settings_model.dart +++ b/lib/data/models/settings_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/data/models/static/color_theme_model.dart b/lib/data/models/static/color_theme_model.dart index e5bf223c1..2d9e2336a 100644 --- a/lib/data/models/static/color_theme_model.dart +++ b/lib/data/models/static/color_theme_model.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; class ColorTheme { diff --git a/lib/data/models/static/country_model.dart b/lib/data/models/static/country_model.dart index 9f17edf18..ac11fa05b 100644 --- a/lib/data/models/static/country_model.dart +++ b/lib/data/models/static/country_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'country_model.g.dart'; diff --git a/lib/data/models/static/currency_model.dart b/lib/data/models/static/currency_model.dart index c8a7b33cd..393abd893 100644 --- a/lib/data/models/static/currency_model.dart +++ b/lib/data/models/static/currency_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'currency_model.g.dart'; diff --git a/lib/data/models/static/date_format_model.dart b/lib/data/models/static/date_format_model.dart index 78eac6bb6..0d19d718f 100644 --- a/lib/data/models/static/date_format_model.dart +++ b/lib/data/models/static/date_format_model.dart @@ -1,7 +1,10 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; import 'package:intl/intl.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'date_format_model.g.dart'; diff --git a/lib/data/models/static/datetime_format_model.dart b/lib/data/models/static/datetime_format_model.dart index abc2a79d3..a32382e7f 100644 --- a/lib/data/models/static/datetime_format_model.dart +++ b/lib/data/models/static/datetime_format_model.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; diff --git a/lib/data/models/static/font_model.dart b/lib/data/models/static/font_model.dart index 8c78ca715..5c9430532 100644 --- a/lib/data/models/static/font_model.dart +++ b/lib/data/models/static/font_model.dart @@ -1,5 +1,8 @@ +// Package imports: import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'font_model.g.dart'; diff --git a/lib/data/models/static/industry_model.dart b/lib/data/models/static/industry_model.dart index 17011f11d..4f2443608 100644 --- a/lib/data/models/static/industry_model.dart +++ b/lib/data/models/static/industry_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'industry_model.g.dart'; diff --git a/lib/data/models/static/invoice_status_model.dart b/lib/data/models/static/invoice_status_model.dart index d1ce763ee..789ba12e7 100644 --- a/lib/data/models/static/invoice_status_model.dart +++ b/lib/data/models/static/invoice_status_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'invoice_status_model.g.dart'; diff --git a/lib/data/models/static/language_model.dart b/lib/data/models/static/language_model.dart index 42a50e01d..a94d9c392 100644 --- a/lib/data/models/static/language_model.dart +++ b/lib/data/models/static/language_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'language_model.g.dart'; diff --git a/lib/data/models/static/payment_type_model.dart b/lib/data/models/static/payment_type_model.dart index 9c75e4171..402e3b6de 100644 --- a/lib/data/models/static/payment_type_model.dart +++ b/lib/data/models/static/payment_type_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'payment_type_model.g.dart'; diff --git a/lib/data/models/static/size_model.dart b/lib/data/models/static/size_model.dart index a5ab72e2f..8060389bf 100644 --- a/lib/data/models/static/size_model.dart +++ b/lib/data/models/static/size_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'size_model.g.dart'; diff --git a/lib/data/models/static/static_data_model.dart b/lib/data/models/static/static_data_model.dart index 1be5324ef..ce5ea2276 100644 --- a/lib/data/models/static/static_data_model.dart +++ b/lib/data/models/static/static_data_model.dart @@ -1,17 +1,20 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; +import 'package:invoiceninja_flutter/data/models/static/country_model.dart'; import 'package:invoiceninja_flutter/data/models/static/currency_model.dart'; -import 'package:invoiceninja_flutter/data/models/static/size_model.dart'; -import 'package:invoiceninja_flutter/data/models/static/industry_model.dart'; -import 'package:invoiceninja_flutter/data/models/static/timezone_model.dart'; import 'package:invoiceninja_flutter/data/models/static/date_format_model.dart'; import 'package:invoiceninja_flutter/data/models/static/datetime_format_model.dart'; -import 'package:invoiceninja_flutter/data/models/static/country_model.dart'; +import 'package:invoiceninja_flutter/data/models/static/industry_model.dart'; +import 'package:invoiceninja_flutter/data/models/static/invoice_status_model.dart'; import 'package:invoiceninja_flutter/data/models/static/language_model.dart'; import 'package:invoiceninja_flutter/data/models/static/payment_type_model.dart'; -import 'package:invoiceninja_flutter/data/models/static/invoice_status_model.dart'; +import 'package:invoiceninja_flutter/data/models/static/size_model.dart'; +import 'package:invoiceninja_flutter/data/models/static/timezone_model.dart'; part 'static_data_model.g.dart'; diff --git a/lib/data/models/static/timezone_model.dart b/lib/data/models/static/timezone_model.dart index f1e91c4ba..4eb10915c 100644 --- a/lib/data/models/static/timezone_model.dart +++ b/lib/data/models/static/timezone_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; part 'timezone_model.g.dart'; diff --git a/lib/data/models/subscription_model.dart b/lib/data/models/subscription_model.dart index ba99b138d..2b6671d7b 100644 --- a/lib/data/models/subscription_model.dart +++ b/lib/data/models/subscription_model.dart @@ -1,8 +1,11 @@ -import 'package:built_value/built_value.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; diff --git a/lib/data/models/system_log_model.dart b/lib/data/models/system_log_model.dart index ba6a672ed..c0c910438 100644 --- a/lib/data/models/system_log_model.dart +++ b/lib/data/models/system_log_model.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart index 7f36a2fca..e2be44020 100644 --- a/lib/data/models/task_model.dart +++ b/lib/data/models/task_model.dart @@ -1,7 +1,13 @@ +// Dart imports: import 'dart:convert'; + +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; +import 'package:collection/collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -11,7 +17,6 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:collection/collection.dart'; part 'task_model.g.dart'; diff --git a/lib/data/models/task_status_model.dart b/lib/data/models/task_status_model.dart index 2aee060ca..71c7685a7 100644 --- a/lib/data/models/task_status_model.dart +++ b/lib/data/models/task_status_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/data/models/tax_rate_model.dart b/lib/data/models/tax_rate_model.dart index c0c8950ba..2e0000d8d 100644 --- a/lib/data/models/tax_rate_model.dart +++ b/lib/data/models/tax_rate_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/data/models/token_model.dart b/lib/data/models/token_model.dart index 94a020a83..6e26264c9 100644 --- a/lib/data/models/token_model.dart +++ b/lib/data/models/token_model.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:convert'; +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/data/models/user_model.dart b/lib/data/models/user_model.dart index b73b452d1..b4ca6d7b0 100644 --- a/lib/data/models/user_model.dart +++ b/lib/data/models/user_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/data/models/vendor_model.dart b/lib/data/models/vendor_model.dart index 2c1891d60..abbefdaf9 100644 --- a/lib/data/models/vendor_model.dart +++ b/lib/data/models/vendor_model.dart @@ -1,13 +1,16 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; +import 'package:collection/collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:collection/collection.dart'; part 'vendor_model.g.dart'; diff --git a/lib/data/models/webhook_model.dart b/lib/data/models/webhook_model.dart index 91893159c..95b5009fc 100644 --- a/lib/data/models/webhook_model.dart +++ b/lib/data/models/webhook_model.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart index 49e6d23af..e539e241f 100644 --- a/lib/data/repositories/auth_repository.dart +++ b/lib/data/repositories/auth_repository.dart @@ -1,9 +1,14 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; import 'dart:io'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/mock/mock_login.dart'; diff --git a/lib/data/repositories/client_repository.dart b/lib/data/repositories/client_repository.dart index fe236ba79..512296456 100644 --- a/lib/data/repositories/client_repository.dart +++ b/lib/data/repositories/client_repository.dart @@ -1,9 +1,16 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart'; diff --git a/lib/data/repositories/company_gateway_repository.dart b/lib/data/repositories/company_gateway_repository.dart index e407a44ca..a30187bf5 100644 --- a/lib/data/repositories/company_gateway_repository.dart +++ b/lib/data/repositories/company_gateway_repository.dart @@ -1,13 +1,18 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CompanyGatewayRepository { const CompanyGatewayRepository({ diff --git a/lib/data/repositories/credit_repository.dart b/lib/data/repositories/credit_repository.dart index ecaf0bdc2..35afbf18e 100644 --- a/lib/data/repositories/credit_repository.dart +++ b/lib/data/repositories/credit_repository.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart'; class CreditRepository { diff --git a/lib/data/repositories/design_repository.dart b/lib/data/repositories/design_repository.dart index b47d8571f..7169f12b2 100644 --- a/lib/data/repositories/design_repository.dart +++ b/lib/data/repositories/design_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class DesignRepository { const DesignRepository({ diff --git a/lib/data/repositories/document_repository.dart b/lib/data/repositories/document_repository.dart index 0be93d85b..a8377600d 100644 --- a/lib/data/repositories/document_repository.dart +++ b/lib/data/repositories/document_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class DocumentRepository { const DocumentRepository({ diff --git a/lib/data/repositories/expense_category_repository.dart b/lib/data/repositories/expense_category_repository.dart index 67a033f01..2377e168c 100644 --- a/lib/data/repositories/expense_category_repository.dart +++ b/lib/data/repositories/expense_category_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ExpenseCategoryRepository { const ExpenseCategoryRepository({ diff --git a/lib/data/repositories/expense_repository.dart b/lib/data/repositories/expense_repository.dart index 71df74cfd..117fa16bf 100644 --- a/lib/data/repositories/expense_repository.dart +++ b/lib/data/repositories/expense_repository.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart'; class ExpenseRepository { diff --git a/lib/data/repositories/group_repository.dart b/lib/data/repositories/group_repository.dart index f9b93fed1..2c61cde84 100644 --- a/lib/data/repositories/group_repository.dart +++ b/lib/data/repositories/group_repository.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class GroupRepository { const GroupRepository({ diff --git a/lib/data/repositories/invoice_repository.dart b/lib/data/repositories/invoice_repository.dart index 4e85e6b2b..d3c151085 100644 --- a/lib/data/repositories/invoice_repository.dart +++ b/lib/data/repositories/invoice_repository.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:http/http.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:http/http.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart'; class InvoiceRepository { diff --git a/lib/data/repositories/payment_repository.dart b/lib/data/repositories/payment_repository.dart index 5ca84422f..eced71016 100644 --- a/lib/data/repositories/payment_repository.dart +++ b/lib/data/repositories/payment_repository.dart @@ -1,13 +1,20 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart'; class PaymentRepository { diff --git a/lib/data/repositories/payment_term_repository.dart b/lib/data/repositories/payment_term_repository.dart index d1958e532..c37e118f5 100644 --- a/lib/data/repositories/payment_term_repository.dart +++ b/lib/data/repositories/payment_term_repository.dart @@ -1,13 +1,18 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class PaymentTermRepository { const PaymentTermRepository({ diff --git a/lib/data/repositories/persistence_repository.dart b/lib/data/repositories/persistence_repository.dart index 4b54b1fcb..9963e5461 100644 --- a/lib/data/repositories/persistence_repository.dart +++ b/lib/data/repositories/persistence_repository.dart @@ -1,15 +1,23 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; import 'dart:io'; -import 'package:meta/meta.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:invoiceninja_flutter/redux/static/static_state.dart'; + +// Package imports: +import 'package:meta/meta.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/file_storage.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_state.dart'; +import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/data/file_storage.dart'; + // ignore: unused_import import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; diff --git a/lib/data/repositories/product_repository.dart b/lib/data/repositories/product_repository.dart index 225f5d474..d526950a6 100644 --- a/lib/data/repositories/product_repository.dart +++ b/lib/data/repositories/product_repository.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:http/http.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:http/http.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart'; class ProductRepository { diff --git a/lib/data/repositories/project_repository.dart b/lib/data/repositories/project_repository.dart index 3189e5b88..021d2a214 100644 --- a/lib/data/repositories/project_repository.dart +++ b/lib/data/repositories/project_repository.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart'; class ProjectRepository { diff --git a/lib/data/repositories/quote_repository.dart b/lib/data/repositories/quote_repository.dart index f4930170c..a5e7516c6 100644 --- a/lib/data/repositories/quote_repository.dart +++ b/lib/data/repositories/quote_repository.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart'; class QuoteRepository { diff --git a/lib/data/repositories/recurring_expense_repository.dart b/lib/data/repositories/recurring_expense_repository.dart index 5e389b777..410971d80 100644 --- a/lib/data/repositories/recurring_expense_repository.dart +++ b/lib/data/repositories/recurring_expense_repository.dart @@ -1,13 +1,18 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class RecurringExpenseRepository { const RecurringExpenseRepository({ diff --git a/lib/data/repositories/recurring_invoice_repository.dart b/lib/data/repositories/recurring_invoice_repository.dart index b50e319f9..3ecc1e73f 100644 --- a/lib/data/repositories/recurring_invoice_repository.dart +++ b/lib/data/repositories/recurring_invoice_repository.dart @@ -1,13 +1,18 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class RecurringInvoiceRepository { const RecurringInvoiceRepository({ diff --git a/lib/data/repositories/settings_repository.dart b/lib/data/repositories/settings_repository.dart index 33a713ef2..a378429ae 100644 --- a/lib/data/repositories/settings_repository.dart +++ b/lib/data/repositories/settings_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/group_model.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class SettingsRepository { const SettingsRepository({ diff --git a/lib/data/repositories/static/static_repository.dart b/lib/data/repositories/static/static_repository.dart index f151068b0..6d645bef4 100644 --- a/lib/data/repositories/static/static_repository.dart +++ b/lib/data/repositories/static/static_repository.dart @@ -1,10 +1,13 @@ +// Dart imports: import 'dart:async'; import 'dart:core'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/models/static/static_data_model.dart'; +import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class StaticRepository { const StaticRepository({ diff --git a/lib/data/repositories/subscription_repository.dart b/lib/data/repositories/subscription_repository.dart index 4669015a4..849a540c1 100644 --- a/lib/data/repositories/subscription_repository.dart +++ b/lib/data/repositories/subscription_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class SubscriptionRepository { const SubscriptionRepository({ diff --git a/lib/data/repositories/task_repository.dart b/lib/data/repositories/task_repository.dart index 36df7e4a0..7d51f9a5c 100644 --- a/lib/data/repositories/task_repository.dart +++ b/lib/data/repositories/task_repository.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart'; class TaskRepository { diff --git a/lib/data/repositories/task_status_repository.dart b/lib/data/repositories/task_status_repository.dart index 2e204de6f..14f837c17 100644 --- a/lib/data/repositories/task_status_repository.dart +++ b/lib/data/repositories/task_status_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TaskStatusRepository { const TaskStatusRepository({ diff --git a/lib/data/repositories/tax_rate_repository.dart b/lib/data/repositories/tax_rate_repository.dart index ee52c4366..6c760b271 100644 --- a/lib/data/repositories/tax_rate_repository.dart +++ b/lib/data/repositories/tax_rate_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TaxRateRepository { const TaxRateRepository({ diff --git a/lib/data/repositories/token_repository.dart b/lib/data/repositories/token_repository.dart index 42a6f752e..6f0c127df 100644 --- a/lib/data/repositories/token_repository.dart +++ b/lib/data/repositories/token_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TokenRepository { const TokenRepository({ diff --git a/lib/data/repositories/user_repository.dart b/lib/data/repositories/user_repository.dart index 935daaef2..b49da6aa3 100644 --- a/lib/data/repositories/user_repository.dart +++ b/lib/data/repositories/user_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class UserRepository { const UserRepository({ diff --git a/lib/data/repositories/vendor_repository.dart b/lib/data/repositories/vendor_repository.dart index 086a2f151..d4c5f3c63 100644 --- a/lib/data/repositories/vendor_repository.dart +++ b/lib/data/repositories/vendor_repository.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/serialization.dart'; class VendorRepository { diff --git a/lib/data/repositories/webhook_repository.dart b/lib/data/repositories/webhook_repository.dart index 377450449..91076139f 100644 --- a/lib/data/repositories/webhook_repository.dart +++ b/lib/data/repositories/webhook_repository.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/serializers.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class WebhookRepository { const WebhookRepository({ diff --git a/lib/data/web_client.dart b/lib/data/web_client.dart index 6de0bcd38..f53dd3f58 100644 --- a/lib/data/web_client.dart +++ b/lib/data/web_client.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:core'; + +// Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:http/http.dart'; -import 'package:invoiceninja_flutter/.env.dart'; + +// Package imports: import 'package:http/http.dart' as http; +import 'package:http/http.dart'; +import 'package:version/version.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:version/version.dart'; class WebClient { const WebClient(); diff --git a/lib/main.dart b/lib/main.dart index d42ccaff7..97eadc5d9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,18 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:redux/redux.dart'; +import 'package:redux_logging/redux_logging.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +// Project imports: import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; @@ -19,36 +29,33 @@ import 'package:invoiceninja_flutter/redux/dashboard/dashboard_middleware.dart'; import 'package:invoiceninja_flutter/redux/design/design_middleware.dart'; import 'package:invoiceninja_flutter/redux/document/document_middleware.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_middleware.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_middleware.dart'; import 'package:invoiceninja_flutter/redux/group/group_middleware.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_middleware.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_middleware.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_middleware.dart'; import 'package:invoiceninja_flutter/redux/product/product_middleware.dart'; import 'package:invoiceninja_flutter/redux/project/project_middleware.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_middleware.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_middleware.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_middleware.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_middleware.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_middleware.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_middleware.dart'; import 'package:invoiceninja_flutter/redux/task/task_middleware.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_middleware.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_middleware.dart'; +import 'package:invoiceninja_flutter/redux/token/token_middleware.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/redux/user/user_middleware.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_middleware.dart'; -import 'package:redux/redux.dart'; -import 'package:redux_logging/redux_logging.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; -import 'package:shared_preferences/shared_preferences.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_middleware.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; // STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_middleware.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_middleware.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_middleware.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_middleware.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_middleware.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_middleware.dart'; -import 'package:invoiceninja_flutter/redux/token/token_middleware.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_middleware.dart'; void main({bool isTesting = false}) async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/main_app.dart b/lib/main_app.dart index cfea91e70..3ae277abd 100644 --- a/lib/main_app.dart +++ b/lib/main_app.dart @@ -1,11 +1,20 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:intl/intl.dart'; +import 'package:local_auth/local_auth.dart'; +import 'package:redux/redux.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -35,6 +44,10 @@ import 'package:invoiceninja_flutter/ui/design/design_screen.dart'; import 'package:invoiceninja_flutter/ui/design/design_screen_vm.dart'; import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/design/view/design_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/edit/expense_category_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/expense_category_screen.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/expense_category_screen_vm.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; import 'package:invoiceninja_flutter/ui/payment/refund/payment_refund_vm.dart'; import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart'; @@ -42,7 +55,15 @@ import 'package:invoiceninja_flutter/ui/payment_term/payment_term_screen.dart'; import 'package:invoiceninja_flutter/ui/payment_term/payment_term_screen_vm.dart'; import 'package:invoiceninja_flutter/ui/payment_term/view/payment_term_view_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/quote_pdf_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_expense/edit/recurring_expense_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_screen.dart'; +import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_screen_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_expense/view/recurring_expense_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_pdf_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_screen.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_screen_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/view/recurring_invoice_view_vm.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/account_management_vm.dart'; @@ -52,50 +73,35 @@ import 'package:invoiceninja_flutter/ui/settings/online_payments_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/settings_screen_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/task_settings_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/tax_settings_vm.dart'; +import 'package:invoiceninja_flutter/ui/subscription/edit/subscription_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/subscription/subscription_screen.dart'; +import 'package:invoiceninja_flutter/ui/subscription/subscription_screen_vm.dart'; +import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/task_status/edit/task_status_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/task_status/task_status_screen.dart'; +import 'package:invoiceninja_flutter/ui/task_status/task_status_screen_vm.dart'; +import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view_vm.dart'; import 'package:invoiceninja_flutter/ui/tax_rate/edit/tax_rate_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen.dart'; import 'package:invoiceninja_flutter/ui/tax_rate/view/tax_rate_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/token/edit/token_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/token/token_screen.dart'; +import 'package:invoiceninja_flutter/ui/token/token_screen_vm.dart'; +import 'package:invoiceninja_flutter/ui/token/view/token_view_vm.dart'; import 'package:invoiceninja_flutter/ui/user/edit/user_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/user/user_screen.dart'; import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:local_auth/local_auth.dart'; -import 'package:redux/redux.dart'; - -// STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_screen.dart'; -import 'package:invoiceninja_flutter/ui/recurring_expense/edit/recurring_expense_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/recurring_expense/view/recurring_expense_view_vm.dart'; -import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_screen_vm.dart'; - -import 'package:invoiceninja_flutter/ui/subscription/subscription_screen.dart'; -import 'package:invoiceninja_flutter/ui/subscription/edit/subscription_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view_vm.dart'; -import 'package:invoiceninja_flutter/ui/subscription/subscription_screen_vm.dart'; -import 'package:invoiceninja_flutter/ui/task_status/task_status_screen.dart'; -import 'package:invoiceninja_flutter/ui/task_status/edit/task_status_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view_vm.dart'; -import 'package:invoiceninja_flutter/ui/task_status/task_status_screen_vm.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/expense_category_screen.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/edit/expense_category_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view_vm.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/expense_category_screen_vm.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_screen.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/view/recurring_invoice_view_vm.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_screen_vm.dart'; -import 'package:invoiceninja_flutter/ui/webhook/webhook_screen.dart'; import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/webhook/view/webhook_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/webhook/webhook_screen.dart'; import 'package:invoiceninja_flutter/ui/webhook/webhook_screen_vm.dart'; -import 'package:invoiceninja_flutter/ui/token/token_screen.dart'; -import 'package:invoiceninja_flutter/ui/token/edit/token_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/token/view/token_view_vm.dart'; -import 'package:invoiceninja_flutter/ui/token/token_screen_vm.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; + +// STARTER: import - do not remove comment + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; final navigatorKey = GlobalKey(); diff --git a/lib/redux/app/app_actions.dart b/lib/redux/app/app_actions.dart index b359c5cb5..926eae5e6 100644 --- a/lib/redux/app/app_actions.dart +++ b/lib/redux/app/app_actions.dart @@ -1,9 +1,16 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; @@ -20,20 +27,28 @@ import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; import 'package:invoiceninja_flutter/redux/product/product_actions.dart'; import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; +import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/alert_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/screen_imports.dart'; @@ -49,19 +64,10 @@ import 'package:invoiceninja_flutter/ui/user/user_screen.dart'; import 'package:invoiceninja_flutter/ui/webhook/webhook_screen.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; // STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; -import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; -import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:redux/redux.dart'; class PersistUI {} diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart index b050c6a76..96dbfd08a 100644 --- a/lib/redux/app/app_middleware.dart +++ b/lib/redux/app/app_middleware.dart @@ -1,9 +1,19 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:math'; -import 'package:invoiceninja_flutter/.env.dart'; + +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:path_provider/path_provider.dart'; +import 'package:redux/redux.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/file_storage.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -29,9 +39,6 @@ import 'package:invoiceninja_flutter/ui/dashboard/dashboard_screen_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:redux/redux.dart'; -import 'package:path_provider/path_provider.dart'; -import 'package:shared_preferences/shared_preferences.dart'; // ignore: unused_import import 'package:invoiceninja_flutter/utils/web_stub.dart' diff --git a/lib/redux/app/app_reducer.dart b/lib/redux/app/app_reducer.dart index 5cb9d2b70..cdb1ab6cf 100644 --- a/lib/redux/app/app_reducer.dart +++ b/lib/redux/app/app_reducer.dart @@ -1,35 +1,38 @@ +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/app/loading_reducer.dart'; +import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; +import 'package:invoiceninja_flutter/redux/auth/auth_reducer.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; +import 'package:invoiceninja_flutter/redux/company/company_reducer.dart'; import 'package:invoiceninja_flutter/redux/company/company_state.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; +import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; import 'package:invoiceninja_flutter/redux/product/product_actions.dart'; import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; -import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/pref_reducer.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_reducer.dart'; -import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/app/loading_reducer.dart'; -import 'package:invoiceninja_flutter/redux/auth/auth_reducer.dart'; -import 'package:invoiceninja_flutter/redux/company/company_reducer.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/static/static_reducer.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; +import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; +import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/pref_reducer.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_reducer.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; // STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; -import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; -import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; // We create the State reducer by combining many smaller reducers into one! AppState appReducer(AppState state, dynamic action) { diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart index dea6bcbe2..bf0a1ed64 100644 --- a/lib/redux/app/app_state.dart +++ b/lib/redux/app/app_state.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:ui'; -import 'package:invoiceninja_flutter/.env.dart'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:flutter/foundation.dart'; +import 'package:timeago/timeago.dart' as timeago; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/account_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -13,79 +20,79 @@ import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; import 'package:invoiceninja_flutter/redux/client/client_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_state.dart'; import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_selectors.dart'; +import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_selectors.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; import 'package:invoiceninja_flutter/redux/design/design_selectors.dart'; import 'package:invoiceninja_flutter/redux/design/design_state.dart'; import 'package:invoiceninja_flutter/redux/document/document_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_selectors.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_state.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_selectors.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; import 'package:invoiceninja_flutter/redux/group/group_selectors.dart'; +import 'package:invoiceninja_flutter/redux/group/group_state.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_state.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_selectors.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_state.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_selectors.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; import 'package:invoiceninja_flutter/redux/product/product_selectors.dart'; import 'package:invoiceninja_flutter/redux/product/product_state.dart'; import 'package:invoiceninja_flutter/redux/project/project_selectors.dart'; import 'package:invoiceninja_flutter/redux/project/project_state.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_selectors.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_selectors.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_selectors.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_selectors.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; import 'package:invoiceninja_flutter/redux/task/task_state.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_selectors.dart'; +import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; +import 'package:invoiceninja_flutter/redux/token/token_selectors.dart'; +import 'package:invoiceninja_flutter/redux/token/token_state.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_state.dart'; +import 'package:invoiceninja_flutter/redux/user/user_state.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_selectors.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_state.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_selectors.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; import 'package:invoiceninja_flutter/ui/app/screen_imports.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/company_gateway/edit/company_gateway_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/credit/credit_screen.dart'; import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart'; -// STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; -import 'package:invoiceninja_flutter/ui/recurring_expense/edit/recurring_expense_edit_vm.dart'; -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_selectors.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; -import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_screen.dart'; -import 'package:invoiceninja_flutter/ui/subscription/edit/subscription_edit_vm.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_selectors.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_screen.dart'; -import 'package:invoiceninja_flutter/ui/task_status/edit/task_status_edit_vm.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; import 'package:invoiceninja_flutter/ui/expense_category/edit/expense_category_edit_vm.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_selectors.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_selectors.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; -import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_selectors.dart'; -import 'package:invoiceninja_flutter/redux/token/token_state.dart'; -import 'package:invoiceninja_flutter/ui/token/edit/token_edit_vm.dart'; -import 'package:invoiceninja_flutter/redux/token/token_selectors.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; +import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_selectors.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; -import 'package:invoiceninja_flutter/redux/user/user_state.dart'; -import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; -import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart'; -import 'package:invoiceninja_flutter/redux/group/group_state.dart'; +import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_expense/edit/recurring_expense_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_screen.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_screen.dart'; +import 'package:invoiceninja_flutter/ui/subscription/edit/subscription_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/task_status/edit/task_status_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/tax_rate/edit/tax_rate_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/token/edit/token_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:timeago/timeago.dart' as timeago; + +// STARTER: import - do not remove comment part 'app_state.g.dart'; diff --git a/lib/redux/app/loading_reducer.dart b/lib/redux/app/loading_reducer.dart index 1b215862c..6b1b7714d 100644 --- a/lib/redux/app/loading_reducer.dart +++ b/lib/redux/app/loading_reducer.dart @@ -1,6 +1,9 @@ -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +// Package imports: import 'package:redux/redux.dart'; +// Project imports: +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + final loadingReducer = combineReducers([ TypedReducer(_setLoading), TypedReducer(_setLoaded), diff --git a/lib/redux/auth/auth_actions.dart b/lib/redux/auth/auth_actions.dart index b664ccae2..3edd04097 100644 --- a/lib/redux/auth/auth_actions.dart +++ b/lib/redux/auth/auth_actions.dart @@ -1,5 +1,10 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/auth/auth_middleware.dart b/lib/redux/auth/auth_middleware.dart index 83050979d..ad74ef3c3 100644 --- a/lib/redux/auth/auth_middleware.dart +++ b/lib/redux/auth/auth_middleware.dart @@ -1,9 +1,21 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:redux/redux.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/auth_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; @@ -11,11 +23,6 @@ import 'package:invoiceninja_flutter/ui/app/app_builder.dart'; import 'package:invoiceninja_flutter/ui/auth/login_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:shared_preferences/shared_preferences.dart'; -import 'package:invoiceninja_flutter/data/repositories/auth_repository.dart'; List> createStoreAuthMiddleware([ AuthRepository repository = const AuthRepository(), diff --git a/lib/redux/auth/auth_reducer.dart b/lib/redux/auth/auth_reducer.dart index c546ff4ad..872499b1a 100644 --- a/lib/redux/auth/auth_reducer.dart +++ b/lib/redux/auth/auth_reducer.dart @@ -1,8 +1,11 @@ -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/utils/formatting.dart'; +// Package imports: import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_state.dart'; +import 'package:invoiceninja_flutter/utils/formatting.dart'; Reducer authReducer = combineReducers([ TypedReducer(userLoadUrlReducer), diff --git a/lib/redux/auth/auth_state.dart b/lib/redux/auth/auth_state.dart index 72991b667..7f062a501 100644 --- a/lib/redux/auth/auth_state.dart +++ b/lib/redux/auth/auth_state.dart @@ -1,5 +1,8 @@ +// Package imports: import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart index f30a3366a..cef465c31 100644 --- a/lib/redux/client/client_actions.dart +++ b/lib/redux/client/client_actions.dart @@ -1,8 +1,16 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -11,7 +19,6 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class ViewClientList implements PersistUI { ViewClientList({ diff --git a/lib/redux/client/client_middleware.dart b/lib/redux/client/client_middleware.dart index 397e43eaa..960507673 100644 --- a/lib/redux/client/client_middleware.dart +++ b/lib/redux/client/client_middleware.dart @@ -1,5 +1,11 @@ -import 'package:invoiceninja_flutter/.env.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/repositories/client_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; @@ -12,7 +18,6 @@ import 'package:invoiceninja_flutter/ui/client/client_pdf_vm.dart'; import 'package:invoiceninja_flutter/ui/client/client_screen.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_vm.dart'; -import 'package:redux/redux.dart'; List> createStoreClientsMiddleware([ ClientRepository repository = const ClientRepository(), diff --git a/lib/redux/client/client_reducer.dart b/lib/redux/client/client_reducer.dart index e049514c5..1643366a4 100644 --- a/lib/redux/client/client_reducer.dart +++ b/lib/redux/client/client_reducer.dart @@ -1,6 +1,11 @@ +// Dart imports: import 'dart:async'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; @@ -8,7 +13,6 @@ import 'package:invoiceninja_flutter/redux/client/client_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:redux/redux.dart'; EntityUIState clientUIReducer(ClientUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/client/client_selectors.dart b/lib/redux/client/client_selectors.dart index d9e8ccf55..c36fed99b 100644 --- a/lib/redux/client/client_selectors.dart +++ b/lib/redux/client/client_selectors.dart @@ -1,9 +1,12 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/group_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownClientList = memo4( diff --git a/lib/redux/client/client_state.dart b/lib/redux/client/client_state.dart index 4c3f2eb8d..de82d49d2 100644 --- a/lib/redux/client/client_state.dart +++ b/lib/redux/client/client_state.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:async'; +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; diff --git a/lib/redux/company/company_actions.dart b/lib/redux/company/company_actions.dart index 8a532c298..e3e25073c 100644 --- a/lib/redux/company/company_actions.dart +++ b/lib/redux/company/company_actions.dart @@ -1,9 +1,15 @@ +// Dart imports: import 'dart:async'; -import 'package:http/http.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; diff --git a/lib/redux/company/company_reducer.dart b/lib/redux/company/company_reducer.dart index 0462795a8..733f02c4f 100644 --- a/lib/redux/company/company_reducer.dart +++ b/lib/redux/company/company_reducer.dart @@ -1,38 +1,41 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/client/client_reducer.dart'; +import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/company/company_state.dart'; +import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_reducer.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_reducer.dart'; +import 'package:invoiceninja_flutter/redux/design/design_reducer.dart'; +import 'package:invoiceninja_flutter/redux/document/document_reducer.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/expense/expense_reducer.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_reducer.dart'; +import 'package:invoiceninja_flutter/redux/group/group_reducer.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_reducer.dart'; +import 'package:invoiceninja_flutter/redux/payment/payment_reducer.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_reducer.dart'; +import 'package:invoiceninja_flutter/redux/product/product_reducer.dart'; +import 'package:invoiceninja_flutter/redux/project/project_reducer.dart'; +import 'package:invoiceninja_flutter/redux/quote/quote_reducer.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_reducer.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_reducer.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/company/company_state.dart'; -import 'package:invoiceninja_flutter/redux/product/product_reducer.dart'; -import 'package:invoiceninja_flutter/redux/client/client_reducer.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_reducer.dart'; -import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/document/document_reducer.dart'; -import 'package:invoiceninja_flutter/redux/expense/expense_reducer.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_reducer.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_reducer.dart'; import 'package:invoiceninja_flutter/redux/task/task_reducer.dart'; -import 'package:invoiceninja_flutter/redux/project/project_reducer.dart'; -import 'package:invoiceninja_flutter/redux/payment/payment_reducer.dart'; -import 'package:invoiceninja_flutter/redux/quote/quote_reducer.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_reducer.dart'; +import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_reducer.dart'; +import 'package:invoiceninja_flutter/redux/token/token_reducer.dart'; +import 'package:invoiceninja_flutter/redux/user/user_reducer.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_reducer.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_reducer.dart'; // STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_reducer.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_reducer.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_reducer.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_reducer.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_reducer.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_reducer.dart'; -import 'package:invoiceninja_flutter/redux/token/token_reducer.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_reducer.dart'; -import 'package:invoiceninja_flutter/redux/design/design_reducer.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_reducer.dart'; -import 'package:invoiceninja_flutter/redux/user/user_reducer.dart'; -import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_reducer.dart'; -import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_reducer.dart'; -import 'package:invoiceninja_flutter/redux/group/group_reducer.dart'; UserCompanyState companyReducer(UserCompanyState state, dynamic action) { if (action is DeleteCompanySuccess) { diff --git a/lib/redux/company/company_selectors.dart b/lib/redux/company/company_selectors.dart index f5fda0a21..0aba829f5 100644 --- a/lib/redux/company/company_selectors.dart +++ b/lib/redux/company/company_selectors.dart @@ -1,10 +1,13 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_state.dart'; -import 'package:memoize/memoize.dart'; var memoizedDropdownExpenseCategoriesList = memo2( (BuiltMap categoryMap, diff --git a/lib/redux/company/company_state.dart b/lib/redux/company/company_state.dart index affa21f56..0dfe35dd6 100644 --- a/lib/redux/company/company_state.dart +++ b/lib/redux/company/company_state.dart @@ -1,39 +1,42 @@ -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/group_model.dart'; -import 'package:invoiceninja_flutter/redux/client/client_state.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_state.dart'; -import 'package:invoiceninja_flutter/redux/product/product_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; +// Package imports: import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -// STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; - -import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; - -import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; - -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; - -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; - -import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; -import 'package:invoiceninja_flutter/redux/token/token_state.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; -import 'package:invoiceninja_flutter/redux/design/design_state.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; -import 'package:invoiceninja_flutter/redux/user/user_state.dart'; -import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/group_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/client/client_state.dart'; import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart'; -import 'package:invoiceninja_flutter/redux/group/group_state.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; +import 'package:invoiceninja_flutter/redux/design/design_state.dart'; import 'package:invoiceninja_flutter/redux/document/document_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_state.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_state.dart'; -import 'package:invoiceninja_flutter/redux/task/task_state.dart'; -import 'package:invoiceninja_flutter/redux/project/project_state.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; +import 'package:invoiceninja_flutter/redux/group/group_state.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_state.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_state.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; +import 'package:invoiceninja_flutter/redux/product/product_state.dart'; +import 'package:invoiceninja_flutter/redux/project/project_state.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; +import 'package:invoiceninja_flutter/redux/task/task_state.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; +import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; +import 'package:invoiceninja_flutter/redux/token/token_state.dart'; +import 'package:invoiceninja_flutter/redux/user/user_state.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_state.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; + +// STARTER: import - do not remove comment + + + + + part 'company_state.g.dart'; diff --git a/lib/redux/company_gateway/company_gateway_actions.dart b/lib/redux/company_gateway/company_gateway_actions.dart index 65fc0f7f9..7dde3c781 100644 --- a/lib/redux/company_gateway/company_gateway_actions.dart +++ b/lib/redux/company_gateway/company_gateway_actions.dart @@ -1,8 +1,14 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/redux/company_gateway/company_gateway_middleware.dart b/lib/redux/company_gateway/company_gateway_middleware.dart index 2943ed515..1263e715e 100644 --- a/lib/redux/company_gateway/company_gateway_middleware.dart +++ b/lib/redux/company_gateway/company_gateway_middleware.dart @@ -1,19 +1,25 @@ +// Dart imports: import 'dart:developer' as dev; + +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Package imports: import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/company_gateway_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/company_gateway/company_gateway_screen.dart'; import 'package:invoiceninja_flutter/ui/company_gateway/edit/company_gateway_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/company_gateway/view/company_gateway_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/company_gateway_repository.dart'; - -import 'package:invoiceninja_flutter/main_app.dart'; List> createStoreCompanyGatewaysMiddleware([ CompanyGatewayRepository repository = const CompanyGatewayRepository(), diff --git a/lib/redux/company_gateway/company_gateway_reducer.dart b/lib/redux/company_gateway/company_gateway_reducer.dart index b4422f972..77672ee69 100644 --- a/lib/redux/company_gateway/company_gateway_reducer.dart +++ b/lib/redux/company_gateway/company_gateway_reducer.dart @@ -1,4 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -7,7 +11,6 @@ import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actio import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:redux/redux.dart'; EntityUIState companyGatewayUIReducer( CompanyGatewayUIState state, dynamic action) { diff --git a/lib/redux/company_gateway/company_gateway_selectors.dart b/lib/redux/company_gateway/company_gateway_selectors.dart index e6a47621d..053dc4015 100644 --- a/lib/redux/company_gateway/company_gateway_selectors.dart +++ b/lib/redux/company_gateway/company_gateway_selectors.dart @@ -1,11 +1,14 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/payment_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownCompanyGatewayList = memo3( diff --git a/lib/redux/company_gateway/company_gateway_state.dart b/lib/redux/company_gateway/company_gateway_state.dart index e7b93ba62..7011c7381 100644 --- a/lib/redux/company_gateway/company_gateway_state.dart +++ b/lib/redux/company_gateway/company_gateway_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'company_gateway_state.g.dart'; diff --git a/lib/redux/credit/credit_actions.dart b/lib/redux/credit/credit_actions.dart index a05102722..7832f71ad 100644 --- a/lib/redux/credit/credit_actions.dart +++ b/lib/redux/credit/credit_actions.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -14,7 +21,6 @@ import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart' import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class ViewCreditList implements PersistUI { ViewCreditList({this.force = false}); diff --git a/lib/redux/credit/credit_middleware.dart b/lib/redux/credit/credit_middleware.dart index 0630e9cbc..c0d2e456e 100644 --- a/lib/redux/credit/credit_middleware.dart +++ b/lib/redux/credit/credit_middleware.dart @@ -1,19 +1,23 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/credit/credit_pdf_vm.dart'; -import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/credit/credit_email_vm.dart'; -import 'package:invoiceninja_flutter/ui/credit/credit_screen.dart'; -import 'package:invoiceninja_flutter/ui/credit/view/credit_view_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/credit_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/credit_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; +import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/credit/credit_email_vm.dart'; +import 'package:invoiceninja_flutter/ui/credit/credit_pdf_vm.dart'; +import 'package:invoiceninja_flutter/ui/credit/credit_screen.dart'; +import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/credit/view/credit_view_vm.dart'; List> createStoreCreditsMiddleware([ CreditRepository repository = const CreditRepository(), diff --git a/lib/redux/credit/credit_reducer.dart b/lib/redux/credit/credit_reducer.dart index 7c13a7a10..beb17402a 100644 --- a/lib/redux/credit/credit_reducer.dart +++ b/lib/redux/credit/credit_reducer.dart @@ -1,4 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -7,7 +11,6 @@ import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:redux/redux.dart'; EntityUIState creditUIReducer(CreditUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/credit/credit_selectors.dart b/lib/redux/credit/credit_selectors.dart index 411776606..e77038519 100644 --- a/lib/redux/credit/credit_selectors.dart +++ b/lib/redux/credit/credit_selectors.dart @@ -1,7 +1,10 @@ -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownCreditList = memo6( diff --git a/lib/redux/credit/credit_state.dart b/lib/redux/credit/credit_state.dart index 29851771f..f82678c63 100644 --- a/lib/redux/credit/credit_state.dart +++ b/lib/redux/credit/credit_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/credit_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'credit_state.g.dart'; diff --git a/lib/redux/dashboard/dashboard_actions.dart b/lib/redux/dashboard/dashboard_actions.dart index 725bbcc2c..3ed549cc6 100644 --- a/lib/redux/dashboard/dashboard_actions.dart +++ b/lib/redux/dashboard/dashboard_actions.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/redux/dashboard/dashboard_middleware.dart b/lib/redux/dashboard/dashboard_middleware.dart index 3c4d0dc16..f6cb51448 100644 --- a/lib/redux/dashboard/dashboard_middleware.dart +++ b/lib/redux/dashboard/dashboard_middleware.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/dashboard/dashboard_screen_vm.dart'; -import 'package:redux/redux.dart'; List> createStoreDashboardMiddleware() { final viewDashboard = _createViewDashboard(); diff --git a/lib/redux/dashboard/dashboard_reducer.dart b/lib/redux/dashboard/dashboard_reducer.dart index dd0726c90..da7491b64 100644 --- a/lib/redux/dashboard/dashboard_reducer.dart +++ b/lib/redux/dashboard/dashboard_reducer.dart @@ -1,9 +1,12 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; -import 'package:redux/redux.dart'; DashboardUIState dashboardUIReducer(DashboardUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/dashboard/dashboard_selectors.dart b/lib/redux/dashboard/dashboard_selectors.dart index 168b88478..a0507ee9b 100644 --- a/lib/redux/dashboard/dashboard_selectors.dart +++ b/lib/redux/dashboard/dashboard_selectors.dart @@ -1,5 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:charts_common/common.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -7,7 +11,6 @@ import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/money.dart'; -import 'package:memoize/memoize.dart'; class ChartDataGroup { ChartDataGroup(this.name); diff --git a/lib/redux/dashboard/dashboard_sidebar_selectors.dart b/lib/redux/dashboard/dashboard_sidebar_selectors.dart index f5df7f733..efe85e9bc 100644 --- a/lib/redux/dashboard/dashboard_sidebar_selectors.dart +++ b/lib/redux/dashboard/dashboard_sidebar_selectors.dart @@ -1,9 +1,12 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_model.dart'; -import 'package:memoize/memoize.dart'; var memoizedUpcomingInvoices = memo2(( BuiltMap invoiceMap, diff --git a/lib/redux/dashboard/dashboard_state.dart b/lib/redux/dashboard/dashboard_state.dart index cda6b34ab..b03c7f72b 100644 --- a/lib/redux/dashboard/dashboard_state.dart +++ b/lib/redux/dashboard/dashboard_state.dart @@ -1,9 +1,12 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:built_value/built_value.dart'; -import 'package:built_value/serializer.dart'; import 'package:invoiceninja_flutter/utils/dates.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/redux/design/design_actions.dart b/lib/redux/design/design_actions.dart index 02ee375e6..0499d680b 100644 --- a/lib/redux/design/design_actions.dart +++ b/lib/redux/design/design_actions.dart @@ -1,7 +1,14 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/design/design_middleware.dart b/lib/redux/design/design_middleware.dart index 4a32123e5..5b128db27 100644 --- a/lib/redux/design/design_middleware.dart +++ b/lib/redux/design/design_middleware.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Package imports: import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/design_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/design/design_screen.dart'; import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/design/view/design_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/design_repository.dart'; - -import 'package:invoiceninja_flutter/main_app.dart'; List> createStoreDesignsMiddleware([ DesignRepository repository = const DesignRepository(), diff --git a/lib/redux/design/design_reducer.dart b/lib/redux/design/design_reducer.dart index 2a2e8ad17..777e3bd5f 100644 --- a/lib/redux/design/design_reducer.dart +++ b/lib/redux/design/design_reducer.dart @@ -1,12 +1,15 @@ -import 'package:redux/redux.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/design/design_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState designUIReducer(DesignUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/design/design_selectors.dart b/lib/redux/design/design_selectors.dart index 174c79209..fd64cf60f 100644 --- a/lib/redux/design/design_selectors.dart +++ b/lib/redux/design/design_selectors.dart @@ -1,9 +1,12 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/design_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownDesignList = memo3( diff --git a/lib/redux/design/design_state.dart b/lib/redux/design/design_state.dart index 556dc340f..403585ea7 100644 --- a/lib/redux/design/design_state.dart +++ b/lib/redux/design/design_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/design_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'design_state.g.dart'; diff --git a/lib/redux/document/document_actions.dart b/lib/redux/document/document_actions.dart index 600dd7351..d2d79948d 100644 --- a/lib/redux/document/document_actions.dart +++ b/lib/redux/document/document_actions.dart @@ -1,9 +1,15 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/document/document_middleware.dart b/lib/redux/document/document_middleware.dart index c3e9fc9fe..6223a900d 100644 --- a/lib/redux/document/document_middleware.dart +++ b/lib/redux/document/document_middleware.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Package imports: import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/document_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/document/document_screen.dart'; import 'package:invoiceninja_flutter/ui/document/edit/document_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/document/view/document_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/document_repository.dart'; - -import 'package:invoiceninja_flutter/main_app.dart'; List> createStoreDocumentsMiddleware([ DocumentRepository repository = const DocumentRepository(), diff --git a/lib/redux/document/document_reducer.dart b/lib/redux/document/document_reducer.dart index 5b09cc523..1b3797fbc 100644 --- a/lib/redux/document/document_reducer.dart +++ b/lib/redux/document/document_reducer.dart @@ -1,4 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; @@ -6,7 +10,6 @@ import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; import 'package:invoiceninja_flutter/redux/document/document_state.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:redux/redux.dart'; EntityUIState documentUIReducer(DocumentUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/document/document_selectors.dart b/lib/redux/document/document_selectors.dart index 5b4c999b9..94ef3c9ac 100644 --- a/lib/redux/document/document_selectors.dart +++ b/lib/redux/document/document_selectors.dart @@ -1,5 +1,8 @@ -import 'package:memoize/memoize.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; diff --git a/lib/redux/document/document_state.dart b/lib/redux/document/document_state.dart index ab674338b..defc16d5f 100644 --- a/lib/redux/document/document_state.dart +++ b/lib/redux/document/document_state.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:async'; +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/document_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; diff --git a/lib/redux/expense/expense_actions.dart b/lib/redux/expense/expense_actions.dart index 1253af5b8..0bf1c24a6 100644 --- a/lib/redux/expense/expense_actions.dart +++ b/lib/redux/expense/expense_actions.dart @@ -1,10 +1,16 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/expense/expense_middleware.dart b/lib/redux/expense/expense_middleware.dart index 1a18e4553..64751aa51 100644 --- a/lib/redux/expense/expense_middleware.dart +++ b/lib/redux/expense/expense_middleware.dart @@ -1,18 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/expense/expense_screen.dart'; -import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/expense_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/expense_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/expense/expense_screen.dart'; +import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; List> createStoreExpensesMiddleware([ ExpenseRepository repository = const ExpenseRepository(), diff --git a/lib/redux/expense/expense_reducer.dart b/lib/redux/expense/expense_reducer.dart index d04f99ae1..46ee395dd 100644 --- a/lib/redux/expense/expense_reducer.dart +++ b/lib/redux/expense/expense_reducer.dart @@ -1,12 +1,15 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState expenseUIReducer(ExpenseUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/expense/expense_selectors.dart b/lib/redux/expense/expense_selectors.dart index 7ae7870f4..49e458bc3 100644 --- a/lib/redux/expense/expense_selectors.dart +++ b/lib/redux/expense/expense_selectors.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; InvoiceItemEntity convertExpenseToInvoiceItem({ diff --git a/lib/redux/expense/expense_state.dart b/lib/redux/expense/expense_state.dart index 208c1586c..28e1e957b 100644 --- a/lib/redux/expense/expense_state.dart +++ b/lib/redux/expense/expense_state.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:async'; +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/expense_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; diff --git a/lib/redux/expense_category/expense_category_actions.dart b/lib/redux/expense_category/expense_category_actions.dart index f0b94e42a..7b1821e52 100644 --- a/lib/redux/expense_category/expense_category_actions.dart +++ b/lib/redux/expense_category/expense_category_actions.dart @@ -1,13 +1,20 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; class ViewExpenseCategoryList implements PersistUI { ViewExpenseCategoryList({ diff --git a/lib/redux/expense_category/expense_category_middleware.dart b/lib/redux/expense_category/expense_category_middleware.dart index 6cb94c258..9b6bc1310 100644 --- a/lib/redux/expense_category/expense_category_middleware.dart +++ b/lib/redux/expense_category/expense_category_middleware.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/expense_category_screen.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/edit/expense_category_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/expense_category_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/expense_category_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/edit/expense_category_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/expense_category_screen.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view_vm.dart'; List> createStoreExpenseCategoriesMiddleware([ ExpenseCategoryRepository repository = const ExpenseCategoryRepository(), diff --git a/lib/redux/expense_category/expense_category_reducer.dart b/lib/redux/expense_category/expense_category_reducer.dart index 462d7e650..7e87fa1cf 100644 --- a/lib/redux/expense_category/expense_category_reducer.dart +++ b/lib/redux/expense_category/expense_category_reducer.dart @@ -1,13 +1,16 @@ -import 'package:redux/redux.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState expenseCategoryUIReducer( ExpenseCategoryUIState state, dynamic action) { diff --git a/lib/redux/expense_category/expense_category_selectors.dart b/lib/redux/expense_category/expense_category_selectors.dart index 5ca0bebb5..865229e41 100644 --- a/lib/redux/expense_category/expense_category_selectors.dart +++ b/lib/redux/expense_category/expense_category_selectors.dart @@ -1,8 +1,11 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownExpenseCategoryList = memo5( diff --git a/lib/redux/expense_category/expense_category_state.dart b/lib/redux/expense_category/expense_category_state.dart index 72161344a..ab496c698 100644 --- a/lib/redux/expense_category/expense_category_state.dart +++ b/lib/redux/expense_category/expense_category_state.dart @@ -1,10 +1,15 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'expense_category_state.g.dart'; diff --git a/lib/redux/group/group_actions.dart b/lib/redux/group/group_actions.dart index e9cfc44b9..7ddde5508 100644 --- a/lib/redux/group/group_actions.dart +++ b/lib/redux/group/group_actions.dart @@ -1,9 +1,15 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/redux/group/group_middleware.dart b/lib/redux/group/group_middleware.dart index 003bb9aed..93fc7df9f 100644 --- a/lib/redux/group/group_middleware.dart +++ b/lib/redux/group/group_middleware.dart @@ -1,18 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/data/models/group_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/group/group_screen.dart'; -import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/group_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/group_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/group_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/group/group_screen.dart'; +import 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart'; List> createStoreGroupsMiddleware([ GroupRepository repository = const GroupRepository(), diff --git a/lib/redux/group/group_reducer.dart b/lib/redux/group/group_reducer.dart index 1dcb794d1..f16d9d576 100644 --- a/lib/redux/group/group_reducer.dart +++ b/lib/redux/group/group_reducer.dart @@ -1,4 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -7,7 +11,6 @@ import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_state.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:redux/redux.dart'; EntityUIState groupUIReducer(GroupUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/group/group_selectors.dart b/lib/redux/group/group_selectors.dart index 780502210..8cddf89cf 100644 --- a/lib/redux/group/group_selectors.dart +++ b/lib/redux/group/group_selectors.dart @@ -1,9 +1,12 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownGroupList = memo3((BuiltMap groupMap, diff --git a/lib/redux/group/group_state.dart b/lib/redux/group/group_state.dart index 46d777d30..de9043936 100644 --- a/lib/redux/group/group_state.dart +++ b/lib/redux/group/group_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/group_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'group_state.g.dart'; diff --git a/lib/redux/invoice/invoice_actions.dart b/lib/redux/invoice/invoice_actions.dart index 5277a58c0..8e2844aee 100644 --- a/lib/redux/invoice/invoice_actions.dart +++ b/lib/redux/invoice/invoice_actions.dart @@ -1,9 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -12,7 +20,6 @@ import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart' import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class ViewInvoiceList implements PersistUI { ViewInvoiceList({this.force = false}); diff --git a/lib/redux/invoice/invoice_middleware.dart b/lib/redux/invoice/invoice_middleware.dart index b09099972..8df9519bb 100644 --- a/lib/redux/invoice/invoice_middleware.dart +++ b/lib/redux/invoice/invoice_middleware.dart @@ -1,20 +1,24 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/invoice_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_email_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_email_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/invoice_screen.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/invoice_repository.dart'; - -import 'package:invoiceninja_flutter/main_app.dart'; List> createStoreInvoicesMiddleware([ InvoiceRepository repository = const InvoiceRepository(), diff --git a/lib/redux/invoice/invoice_reducer.dart b/lib/redux/invoice/invoice_reducer.dart index 783bab941..8e2ea50d1 100644 --- a/lib/redux/invoice/invoice_reducer.dart +++ b/lib/redux/invoice/invoice_reducer.dart @@ -1,14 +1,17 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:redux/redux.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState invoiceUIReducer(InvoiceUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/invoice/invoice_selectors.dart b/lib/redux/invoice/invoice_selectors.dart index d3c6d5b57..4b5b35831 100644 --- a/lib/redux/invoice/invoice_selectors.dart +++ b/lib/redux/invoice/invoice_selectors.dart @@ -1,7 +1,10 @@ -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownInvoiceList = memo7( diff --git a/lib/redux/invoice/invoice_state.dart b/lib/redux/invoice/invoice_state.dart index b76f8c7dc..038f39370 100644 --- a/lib/redux/invoice/invoice_state.dart +++ b/lib/redux/invoice/invoice_state.dart @@ -1,9 +1,13 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/data/models/models.dart'; +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart index a1b30f451..2fbf3c455 100644 --- a/lib/redux/payment/payment_actions.dart +++ b/lib/redux/payment/payment_actions.dart @@ -1,9 +1,15 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/payment/payment_middleware.dart b/lib/redux/payment/payment_middleware.dart index 5d7d596a9..cfc3e4875 100644 --- a/lib/redux/payment/payment_middleware.dart +++ b/lib/redux/payment/payment_middleware.dart @@ -1,19 +1,23 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; -import 'package:invoiceninja_flutter/ui/payment/refund/payment_refund_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/payment/payment_screen.dart'; -import 'package:invoiceninja_flutter/ui/payment/edit/payment_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/payment/view/payment_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/payment_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/payment_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/payment/edit/payment_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/payment/payment_screen.dart'; +import 'package:invoiceninja_flutter/ui/payment/refund/payment_refund_vm.dart'; +import 'package:invoiceninja_flutter/ui/payment/view/payment_view_vm.dart'; List> createStorePaymentsMiddleware([ PaymentRepository repository = const PaymentRepository(), diff --git a/lib/redux/payment/payment_reducer.dart b/lib/redux/payment/payment_reducer.dart index 81e9055bd..c6501a8d1 100644 --- a/lib/redux/payment/payment_reducer.dart +++ b/lib/redux/payment/payment_reducer.dart @@ -1,12 +1,15 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState paymentUIReducer(PaymentUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/payment/payment_selectors.dart b/lib/redux/payment/payment_selectors.dart index 08fec2718..9345ad1ff 100644 --- a/lib/redux/payment/payment_selectors.dart +++ b/lib/redux/payment/payment_selectors.dart @@ -1,7 +1,10 @@ -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedPaymentsByInvoice = memo3((String invoiceId, diff --git a/lib/redux/payment/payment_state.dart b/lib/redux/payment/payment_state.dart index 3ee189e12..2e12e3fa1 100644 --- a/lib/redux/payment/payment_state.dart +++ b/lib/redux/payment/payment_state.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:async'; +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/payment_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; diff --git a/lib/redux/payment_term/payment_term_actions.dart b/lib/redux/payment_term/payment_term_actions.dart index 1b0411a48..b72f08641 100644 --- a/lib/redux/payment_term/payment_term_actions.dart +++ b/lib/redux/payment_term/payment_term_actions.dart @@ -1,7 +1,14 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/redux/payment_term/payment_term_middleware.dart b/lib/redux/payment_term/payment_term_middleware.dart index 8a30d5b3b..c656be828 100644 --- a/lib/redux/payment_term/payment_term_middleware.dart +++ b/lib/redux/payment_term/payment_term_middleware.dart @@ -1,18 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/payment_term/view/payment_term_view_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/payment_term/payment_term_screen.dart'; -import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/payment_term_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; +import 'package:invoiceninja_flutter/data/repositories/payment_term_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/payment_term/payment_term_screen.dart'; +import 'package:invoiceninja_flutter/ui/payment_term/view/payment_term_view_vm.dart'; List> createStorePaymentTermsMiddleware([ PaymentTermRepository repository = const PaymentTermRepository(), diff --git a/lib/redux/payment_term/payment_term_reducer.dart b/lib/redux/payment_term/payment_term_reducer.dart index 3df6b38ab..35694b887 100644 --- a/lib/redux/payment_term/payment_term_reducer.dart +++ b/lib/redux/payment_term/payment_term_reducer.dart @@ -1,13 +1,16 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; -import 'package:redux/redux.dart'; -import 'package:built_collection/built_collection.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState paymentTermUIReducer(PaymentTermUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/payment_term/payment_term_selectors.dart b/lib/redux/payment_term/payment_term_selectors.dart index 613530f52..8d2f7fd5d 100644 --- a/lib/redux/payment_term/payment_term_selectors.dart +++ b/lib/redux/payment_term/payment_term_selectors.dart @@ -1,7 +1,10 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownPaymentTermList = memo2( diff --git a/lib/redux/payment_term/payment_term_state.dart b/lib/redux/payment_term/payment_term_state.dart index 96cfd0855..f2faec6ec 100644 --- a/lib/redux/payment_term/payment_term_state.dart +++ b/lib/redux/payment_term/payment_term_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'payment_term_state.g.dart'; diff --git a/lib/redux/product/product_actions.dart b/lib/redux/product/product_actions.dart index a56dd15dd..9ee9b6b39 100644 --- a/lib/redux/product/product_actions.dart +++ b/lib/redux/product/product_actions.dart @@ -1,9 +1,15 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/product/product_middleware.dart b/lib/redux/product/product_middleware.dart index bbf1b83a9..1e1607fdb 100644 --- a/lib/redux/product/product_middleware.dart +++ b/lib/redux/product/product_middleware.dart @@ -1,18 +1,22 @@ -import 'package:invoiceninja_flutter/.env.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/product_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; +import 'package:invoiceninja_flutter/redux/product/product_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/product/product_screen.dart'; import 'package:invoiceninja_flutter/ui/product/view/product_view_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/product/product_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/product_repository.dart'; - -import 'package:invoiceninja_flutter/main_app.dart'; List> createStoreProductsMiddleware([ ProductRepository repository = const ProductRepository(), diff --git a/lib/redux/product/product_reducer.dart b/lib/redux/product/product_reducer.dart index 068858d1b..667c7c50d 100644 --- a/lib/redux/product/product_reducer.dart +++ b/lib/redux/product/product_reducer.dart @@ -1,4 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/product_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -7,7 +11,6 @@ import 'package:invoiceninja_flutter/redux/product/product_actions.dart'; import 'package:invoiceninja_flutter/redux/product/product_state.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:redux/redux.dart'; EntityUIState productUIReducer(ProductUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/product/product_selectors.dart b/lib/redux/product/product_selectors.dart index 4716ef814..56fb4db98 100644 --- a/lib/redux/product/product_selectors.dart +++ b/lib/redux/product/product_selectors.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:memoize/memoize.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; +import 'package:invoiceninja_flutter/utils/formatting.dart'; InvoiceItemEntity convertProductToInvoiceItem({ @required ProductEntity product, diff --git a/lib/redux/product/product_state.dart b/lib/redux/product/product_state.dart index 5c073f4b1..d00772c46 100644 --- a/lib/redux/product/product_state.dart +++ b/lib/redux/product/product_state.dart @@ -1,9 +1,13 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/data/models/models.dart'; +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; diff --git a/lib/redux/project/project_actions.dart b/lib/redux/project/project_actions.dart index a0136b2de..16cd7442a 100644 --- a/lib/redux/project/project_actions.dart +++ b/lib/redux/project/project_actions.dart @@ -1,10 +1,16 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/project/project_middleware.dart b/lib/redux/project/project_middleware.dart index cb676c7bf..4592b4528 100644 --- a/lib/redux/project/project_middleware.dart +++ b/lib/redux/project/project_middleware.dart @@ -1,18 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/project/project_screen.dart'; -import 'package:invoiceninja_flutter/ui/project/edit/project_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/project/view/project_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/project_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/project_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; +import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/project/edit/project_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/project/project_screen.dart'; +import 'package:invoiceninja_flutter/ui/project/view/project_view_vm.dart'; List> createStoreProjectsMiddleware([ ProjectRepository repository = const ProjectRepository(), diff --git a/lib/redux/project/project_reducer.dart b/lib/redux/project/project_reducer.dart index d393bfccd..0e9fc2f2a 100644 --- a/lib/redux/project/project_reducer.dart +++ b/lib/redux/project/project_reducer.dart @@ -1,14 +1,18 @@ +// Dart imports: import 'dart:async'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; import 'package:invoiceninja_flutter/redux/project/project_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState projectUIReducer(ProjectUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/project/project_selectors.dart b/lib/redux/project/project_selectors.dart index feda8c221..a30af0aaf 100644 --- a/lib/redux/project/project_selectors.dart +++ b/lib/redux/project/project_selectors.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_selectors.dart'; import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; List convertProjectToInvoiceItem({ diff --git a/lib/redux/project/project_state.dart b/lib/redux/project/project_state.dart index 6a9380233..5e0b01199 100644 --- a/lib/redux/project/project_state.dart +++ b/lib/redux/project/project_state.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:async'; +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/project_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; diff --git a/lib/redux/quote/quote_actions.dart b/lib/redux/quote/quote_actions.dart index 90df090e2..92380ebf1 100644 --- a/lib/redux/quote/quote_actions.dart +++ b/lib/redux/quote/quote_actions.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -13,7 +20,6 @@ import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart' import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class ViewQuoteList implements PersistUI { ViewQuoteList({this.force = false}); diff --git a/lib/redux/quote/quote_middleware.dart b/lib/redux/quote/quote_middleware.dart index f09069468..17ee8c85c 100644 --- a/lib/redux/quote/quote_middleware.dart +++ b/lib/redux/quote/quote_middleware.dart @@ -1,6 +1,15 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/quote_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; @@ -9,11 +18,6 @@ import 'package:invoiceninja_flutter/ui/quote/quote_email_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/quote_pdf_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/quote_screen.dart'; import 'package:invoiceninja_flutter/ui/quote/view/quote_view_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/quote_repository.dart'; - -import 'package:invoiceninja_flutter/main_app.dart'; List> createStoreQuotesMiddleware([ QuoteRepository repository = const QuoteRepository(), diff --git a/lib/redux/quote/quote_reducer.dart b/lib/redux/quote/quote_reducer.dart index a4d70b4ef..9e3ba8b1e 100644 --- a/lib/redux/quote/quote_reducer.dart +++ b/lib/redux/quote/quote_reducer.dart @@ -1,4 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; @@ -8,7 +12,6 @@ import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_state.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:redux/redux.dart'; EntityUIState quoteUIReducer(QuoteUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/quote/quote_selectors.dart b/lib/redux/quote/quote_selectors.dart index d311b4935..359d81061 100644 --- a/lib/redux/quote/quote_selectors.dart +++ b/lib/redux/quote/quote_selectors.dart @@ -1,7 +1,10 @@ -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; ClientEntity quoteClientSelector( diff --git a/lib/redux/quote/quote_state.dart b/lib/redux/quote/quote_state.dart index 9043039d6..a110cca48 100644 --- a/lib/redux/quote/quote_state.dart +++ b/lib/redux/quote/quote_state.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:async'; +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/quote_model.dart'; diff --git a/lib/redux/recurring_expense/recurring_expense_actions.dart b/lib/redux/recurring_expense/recurring_expense_actions.dart index a09d93421..dfa9723f7 100644 --- a/lib/redux/recurring_expense/recurring_expense_actions.dart +++ b/lib/redux/recurring_expense/recurring_expense_actions.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; class ViewRecurringExpenseList implements PersistUI { ViewRecurringExpenseList({ diff --git a/lib/redux/recurring_expense/recurring_expense_middleware.dart b/lib/redux/recurring_expense/recurring_expense_middleware.dart index 061cd5871..f71a3fe30 100644 --- a/lib/redux/recurring_expense/recurring_expense_middleware.dart +++ b/lib/redux/recurring_expense/recurring_expense_middleware.dart @@ -1,16 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; + +// Package imports: import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_screen.dart'; -import 'package:invoiceninja_flutter/ui/recurring_expense/edit/recurring_expense_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/recurring_expense/view/recurring_expense_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/repositories/recurring_expense_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/recurring_expense/edit/recurring_expense_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_screen.dart'; +import 'package:invoiceninja_flutter/ui/recurring_expense/view/recurring_expense_view_vm.dart'; List> createStoreRecurringExpensesMiddleware([ RecurringExpenseRepository repository = const RecurringExpenseRepository(), diff --git a/lib/redux/recurring_expense/recurring_expense_reducer.dart b/lib/redux/recurring_expense/recurring_expense_reducer.dart index 13af0237d..6f50264a4 100644 --- a/lib/redux/recurring_expense/recurring_expense_reducer.dart +++ b/lib/redux/recurring_expense/recurring_expense_reducer.dart @@ -1,13 +1,16 @@ -import 'package:redux/redux.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState recurringExpenseUIReducer( RecurringExpenseUIState state, dynamic action) { diff --git a/lib/redux/recurring_expense/recurring_expense_selectors.dart b/lib/redux/recurring_expense/recurring_expense_selectors.dart index faf2e44e8..2ddb53855 100644 --- a/lib/redux/recurring_expense/recurring_expense_selectors.dart +++ b/lib/redux/recurring_expense/recurring_expense_selectors.dart @@ -1,9 +1,12 @@ -import 'package:invoiceninja_flutter/data/models/recurring_expense_model.dart'; -import 'package:invoiceninja_flutter/redux/static/static_state.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/recurring_expense_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownRecurringExpenseList = memo9( diff --git a/lib/redux/recurring_expense/recurring_expense_state.dart b/lib/redux/recurring_expense/recurring_expense_state.dart index c2b9a1c19..b50662c91 100644 --- a/lib/redux/recurring_expense/recurring_expense_state.dart +++ b/lib/redux/recurring_expense/recurring_expense_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/recurring_expense_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'recurring_expense_state.g.dart'; diff --git a/lib/redux/recurring_invoice/recurring_invoice_actions.dart b/lib/redux/recurring_invoice/recurring_invoice_actions.dart index 1cda39fbc..b224e29bf 100644 --- a/lib/redux/recurring_invoice/recurring_invoice_actions.dart +++ b/lib/redux/recurring_invoice/recurring_invoice_actions.dart @@ -1,8 +1,16 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -11,7 +19,6 @@ import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart' import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class ViewRecurringInvoiceList implements PersistUI { ViewRecurringInvoiceList({ diff --git a/lib/redux/recurring_invoice/recurring_invoice_middleware.dart b/lib/redux/recurring_invoice/recurring_invoice_middleware.dart index ca86a3be5..ae7d0e817 100644 --- a/lib/redux/recurring_invoice/recurring_invoice_middleware.dart +++ b/lib/redux/recurring_invoice/recurring_invoice_middleware.dart @@ -1,19 +1,23 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_pdf_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_screen.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/recurring_invoice/view/recurring_invoice_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/recurring_invoice_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/recurring_invoice_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_pdf_vm.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_screen.dart'; +import 'package:invoiceninja_flutter/ui/recurring_invoice/view/recurring_invoice_view_vm.dart'; List> createStoreRecurringInvoicesMiddleware([ RecurringInvoiceRepository repository = const RecurringInvoiceRepository(), diff --git a/lib/redux/recurring_invoice/recurring_invoice_reducer.dart b/lib/redux/recurring_invoice/recurring_invoice_reducer.dart index 92db95502..ddcef5138 100644 --- a/lib/redux/recurring_invoice/recurring_invoice_reducer.dart +++ b/lib/redux/recurring_invoice/recurring_invoice_reducer.dart @@ -1,13 +1,16 @@ -import 'package:redux/redux.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState recurringInvoiceUIReducer( RecurringInvoiceUIState state, dynamic action) { diff --git a/lib/redux/recurring_invoice/recurring_invoice_selectors.dart b/lib/redux/recurring_invoice/recurring_invoice_selectors.dart index 0177b5600..7c0a072d0 100644 --- a/lib/redux/recurring_invoice/recurring_invoice_selectors.dart +++ b/lib/redux/recurring_invoice/recurring_invoice_selectors.dart @@ -1,8 +1,11 @@ -import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedFilteredRecurringInvoiceList = memo6(( diff --git a/lib/redux/recurring_invoice/recurring_invoice_state.dart b/lib/redux/recurring_invoice/recurring_invoice_state.dart index f62195f27..238823e7e 100644 --- a/lib/redux/recurring_invoice/recurring_invoice_state.dart +++ b/lib/redux/recurring_invoice/recurring_invoice_state.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/recurring_invoice_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'recurring_invoice_state.g.dart'; diff --git a/lib/redux/reports/reports_actions.dart b/lib/redux/reports/reports_actions.dart index bb841fbe5..787bea9e1 100644 --- a/lib/redux/reports/reports_actions.dart +++ b/lib/redux/reports/reports_actions.dart @@ -1,5 +1,10 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; class ViewReports implements PersistUI { diff --git a/lib/redux/reports/reports_middleware.dart b/lib/redux/reports/reports_middleware.dart index 41fe3294b..8570186b8 100644 --- a/lib/redux/reports/reports_middleware.dart +++ b/lib/redux/reports/reports_middleware.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; -import 'package:redux/redux.dart'; List> createStoreReportsMiddleware() { final viewReports = _viewReports(); diff --git a/lib/redux/reports/reports_reducer.dart b/lib/redux/reports/reports_reducer.dart index 21685f908..5b7ecb85f 100644 --- a/lib/redux/reports/reports_reducer.dart +++ b/lib/redux/reports/reports_reducer.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; diff --git a/lib/redux/reports/reports_state.dart b/lib/redux/reports/reports_state.dart index baad096ad..6d5e05e0d 100644 --- a/lib/redux/reports/reports_state.dart +++ b/lib/redux/reports/reports_state.dart @@ -1,8 +1,11 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/constants.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; + part 'reports_state.g.dart'; abstract class ReportsUIState diff --git a/lib/redux/settings/settings_actions.dart b/lib/redux/settings/settings_actions.dart index facc62061..260887368 100644 --- a/lib/redux/settings/settings_actions.dart +++ b/lib/redux/settings/settings_actions.dart @@ -1,7 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; diff --git a/lib/redux/settings/settings_middleware.dart b/lib/redux/settings/settings_middleware.dart index 1ae3cfab2..023a25802 100644 --- a/lib/redux/settings/settings_middleware.dart +++ b/lib/redux/settings/settings_middleware.dart @@ -1,4 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -15,7 +21,6 @@ import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/settings_screen.dart'; -import 'package:redux/redux.dart'; List> createStoreSettingsMiddleware([ SettingsRepository repository = const SettingsRepository(), diff --git a/lib/redux/settings/settings_reducer.dart b/lib/redux/settings/settings_reducer.dart index 4314312a8..688e59d4f 100644 --- a/lib/redux/settings/settings_reducer.dart +++ b/lib/redux/settings/settings_reducer.dart @@ -1,10 +1,13 @@ +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_state.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; -import 'package:redux/redux.dart'; Reducer settingsUIReducer = combineReducers([ TypedReducer((state, action) { diff --git a/lib/redux/static/static_reducer.dart b/lib/redux/static/static_reducer.dart index 0467ca1f8..5b68d8ebd 100644 --- a/lib/redux/static/static_reducer.dart +++ b/lib/redux/static/static_reducer.dart @@ -1,6 +1,9 @@ +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; -import 'package:redux/redux.dart'; Reducer staticReducer = combineReducers([ TypedReducer(staticLoadedReducer), diff --git a/lib/redux/static/static_selectors.dart b/lib/redux/static/static_selectors.dart index 69eebef94..18f9ccb2a 100644 --- a/lib/redux/static/static_selectors.dart +++ b/lib/redux/static/static_selectors.dart @@ -1,8 +1,11 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/static/font_model.dart'; -import 'package:memoize/memoize.dart'; var memoizedCountryList = memo1( (BuiltMap countryMap) => countryList(countryMap)); diff --git a/lib/redux/static/static_state.dart b/lib/redux/static/static_state.dart index 07083bd7a..c1e4c4e0f 100644 --- a/lib/redux/static/static_state.dart +++ b/lib/redux/static/static_state.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/redux/subscription/subscription_actions.dart b/lib/redux/subscription/subscription_actions.dart index 46301e455..668331b5c 100644 --- a/lib/redux/subscription/subscription_actions.dart +++ b/lib/redux/subscription/subscription_actions.dart @@ -1,13 +1,20 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; class ViewSubscriptionList implements PersistUI { ViewSubscriptionList({ diff --git a/lib/redux/subscription/subscription_middleware.dart b/lib/redux/subscription/subscription_middleware.dart index 714fc67b6..5b48fcc72 100644 --- a/lib/redux/subscription/subscription_middleware.dart +++ b/lib/redux/subscription/subscription_middleware.dart @@ -1,16 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; + +// Package imports: import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/subscription/subscription_screen.dart'; -import 'package:invoiceninja_flutter/ui/subscription/edit/subscription_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/repositories/subscription_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/subscription/edit/subscription_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/subscription/subscription_screen.dart'; +import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view_vm.dart'; List> createStoreSubscriptionsMiddleware([ SubscriptionRepository repository = const SubscriptionRepository(), diff --git a/lib/redux/subscription/subscription_reducer.dart b/lib/redux/subscription/subscription_reducer.dart index 977944b39..f28904dbd 100644 --- a/lib/redux/subscription/subscription_reducer.dart +++ b/lib/redux/subscription/subscription_reducer.dart @@ -1,13 +1,16 @@ -import 'package:redux/redux.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState subscriptionUIReducer(SubscriptionUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/subscription/subscription_selectors.dart b/lib/redux/subscription/subscription_selectors.dart index 6dc2c00b6..46f424938 100644 --- a/lib/redux/subscription/subscription_selectors.dart +++ b/lib/redux/subscription/subscription_selectors.dart @@ -1,9 +1,12 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownSubscriptionList = memo5( diff --git a/lib/redux/subscription/subscription_state.dart b/lib/redux/subscription/subscription_state.dart index 8094c622a..74e5e1095 100644 --- a/lib/redux/subscription/subscription_state.dart +++ b/lib/redux/subscription/subscription_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'subscription_state.g.dart'; diff --git a/lib/redux/task/task_actions.dart b/lib/redux/task/task_actions.dart index d8d4611a6..74b086e29 100644 --- a/lib/redux/task/task_actions.dart +++ b/lib/redux/task/task_actions.dart @@ -1,11 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/task/task_middleware.dart b/lib/redux/task/task_middleware.dart index 97364a72d..92099df8b 100644 --- a/lib/redux/task/task_middleware.dart +++ b/lib/redux/task/task_middleware.dart @@ -1,18 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/task/task_screen.dart'; -import 'package:invoiceninja_flutter/ui/task/edit/task_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/task/view/task_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/task_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/task_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; +import 'package:invoiceninja_flutter/ui/task/edit/task_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/task/task_screen.dart'; +import 'package:invoiceninja_flutter/ui/task/view/task_view_vm.dart'; List> createStoreTasksMiddleware([ TaskRepository repository = const TaskRepository(), diff --git a/lib/redux/task/task_reducer.dart b/lib/redux/task/task_reducer.dart index 451e50cfb..8033ae80f 100644 --- a/lib/redux/task/task_reducer.dart +++ b/lib/redux/task/task_reducer.dart @@ -1,12 +1,15 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; import 'package:invoiceninja_flutter/redux/task/task_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState taskUIReducer(TaskUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/task/task_selectors.dart b/lib/redux/task/task_selectors.dart index 487907a78..8e1f311d4 100644 --- a/lib/redux/task/task_selectors.dart +++ b/lib/redux/task/task_selectors.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/data/models/group_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:memoize/memoize.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; +import 'package:invoiceninja_flutter/utils/formatting.dart'; InvoiceItemEntity convertTaskToInvoiceItem( {BuildContext context, TaskEntity task}) { diff --git a/lib/redux/task/task_state.dart b/lib/redux/task/task_state.dart index 60b443e8e..037bc1d5b 100644 --- a/lib/redux/task/task_state.dart +++ b/lib/redux/task/task_state.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:async'; +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; diff --git a/lib/redux/task_status/task_status_actions.dart b/lib/redux/task_status/task_status_actions.dart index cce871cf2..bb76eea4e 100644 --- a/lib/redux/task_status/task_status_actions.dart +++ b/lib/redux/task_status/task_status_actions.dart @@ -1,13 +1,20 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; class ViewTaskStatusList implements PersistUI { ViewTaskStatusList({ diff --git a/lib/redux/task_status/task_status_middleware.dart b/lib/redux/task_status/task_status_middleware.dart index c995e181e..7788b35db 100644 --- a/lib/redux/task_status/task_status_middleware.dart +++ b/lib/redux/task_status/task_status_middleware.dart @@ -1,16 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; + +// Package imports: import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/task_status/task_status_screen.dart'; -import 'package:invoiceninja_flutter/ui/task_status/edit/task_status_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/repositories/task_status_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/task_status/edit/task_status_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/task_status/task_status_screen.dart'; +import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view_vm.dart'; List> createStoreTaskStatusesMiddleware([ TaskStatusRepository repository = const TaskStatusRepository(), diff --git a/lib/redux/task_status/task_status_reducer.dart b/lib/redux/task_status/task_status_reducer.dart index 06de74fc4..a97d716e9 100644 --- a/lib/redux/task_status/task_status_reducer.dart +++ b/lib/redux/task_status/task_status_reducer.dart @@ -1,14 +1,17 @@ -import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; -import 'package:redux/redux.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState taskStatusUIReducer(TaskStatusUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/task_status/task_status_selectors.dart b/lib/redux/task_status/task_status_selectors.dart index 07daf6926..c5612b693 100644 --- a/lib/redux/task_status/task_status_selectors.dart +++ b/lib/redux/task_status/task_status_selectors.dart @@ -1,9 +1,12 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownTaskStatusList = memo4( diff --git a/lib/redux/task_status/task_status_state.dart b/lib/redux/task_status/task_status_state.dart index 91eb684d1..80f10b3b6 100644 --- a/lib/redux/task_status/task_status_state.dart +++ b/lib/redux/task_status/task_status_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'task_status_state.g.dart'; diff --git a/lib/redux/tax_rate/tax_rate_actions.dart b/lib/redux/tax_rate/tax_rate_actions.dart index 67270e068..f22b896f4 100644 --- a/lib/redux/tax_rate/tax_rate_actions.dart +++ b/lib/redux/tax_rate/tax_rate_actions.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class ViewTaxRateList implements PersistUI { ViewTaxRateList({this.force = false}); diff --git a/lib/redux/tax_rate/tax_rate_middleware.dart b/lib/redux/tax_rate/tax_rate_middleware.dart index bb98d115c..b764fe301 100644 --- a/lib/redux/tax_rate/tax_rate_middleware.dart +++ b/lib/redux/tax_rate/tax_rate_middleware.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/edit/tax_rate_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/view/tax_rate_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/tax_rate_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/tax_rate_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/edit/tax_rate_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/view/tax_rate_view_vm.dart'; List> createStoreTaxRatesMiddleware([ TaxRateRepository repository = const TaxRateRepository(), diff --git a/lib/redux/tax_rate/tax_rate_reducer.dart b/lib/redux/tax_rate/tax_rate_reducer.dart index 844cff106..5f39616d5 100644 --- a/lib/redux/tax_rate/tax_rate_reducer.dart +++ b/lib/redux/tax_rate/tax_rate_reducer.dart @@ -1,12 +1,15 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState taxRateUIReducer(TaxRateUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/tax_rate/tax_rate_selectors.dart b/lib/redux/tax_rate/tax_rate_selectors.dart index cc8b6190b..84340a395 100644 --- a/lib/redux/tax_rate/tax_rate_selectors.dart +++ b/lib/redux/tax_rate/tax_rate_selectors.dart @@ -1,7 +1,10 @@ -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownTaxRateList = memo3( diff --git a/lib/redux/tax_rate/tax_rate_state.dart b/lib/redux/tax_rate/tax_rate_state.dart index 1dc724d1a..0d734e0d6 100644 --- a/lib/redux/tax_rate/tax_rate_state.dart +++ b/lib/redux/tax_rate/tax_rate_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'tax_rate_state.g.dart'; diff --git a/lib/redux/token/token_actions.dart b/lib/redux/token/token_actions.dart index 4eca94034..87c39672d 100644 --- a/lib/redux/token/token_actions.dart +++ b/lib/redux/token/token_actions.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/token/token_middleware.dart b/lib/redux/token/token_middleware.dart index d2d96f824..34753a902 100644 --- a/lib/redux/token/token_middleware.dart +++ b/lib/redux/token/token_middleware.dart @@ -1,18 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/token/token_screen.dart'; -import 'package:invoiceninja_flutter/ui/token/edit/token_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/token/view/token_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/token_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/token_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; +import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/token/edit/token_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/token/token_screen.dart'; +import 'package:invoiceninja_flutter/ui/token/view/token_view_vm.dart'; List> createStoreTokensMiddleware([ TokenRepository repository = const TokenRepository(), diff --git a/lib/redux/token/token_reducer.dart b/lib/redux/token/token_reducer.dart index aa97cc345..2cf112364 100644 --- a/lib/redux/token/token_reducer.dart +++ b/lib/redux/token/token_reducer.dart @@ -1,13 +1,16 @@ -import 'package:redux/redux.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/token/token_state.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; +import 'package:invoiceninja_flutter/redux/token/token_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; EntityUIState tokenUIReducer(TokenUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/token/token_selectors.dart b/lib/redux/token/token_selectors.dart index 1360e49f0..b88c90821 100644 --- a/lib/redux/token/token_selectors.dart +++ b/lib/redux/token/token_selectors.dart @@ -1,8 +1,11 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/token_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownTokenList = memo3((BuiltMap tokenMap, diff --git a/lib/redux/token/token_state.dart b/lib/redux/token/token_state.dart index 6549ae273..7b6cf0833 100644 --- a/lib/redux/token/token_state.dart +++ b/lib/redux/token/token_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/token_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'token_state.g.dart'; diff --git a/lib/redux/ui/entity_ui_state.dart b/lib/redux/ui/entity_ui_state.dart index 5761060ef..d0ed88a4f 100644 --- a/lib/redux/ui/entity_ui_state.dart +++ b/lib/redux/ui/entity_ui_state.dart @@ -1,6 +1,10 @@ +// Dart imports: import 'dart:async'; +// Package imports: import 'package:built_value/built_value.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; diff --git a/lib/redux/ui/list_ui_state.dart b/lib/redux/ui/list_ui_state.dart index 015828843..7b5d28fc5 100644 --- a/lib/redux/ui/list_ui_state.dart +++ b/lib/redux/ui/list_ui_state.dart @@ -1,6 +1,9 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; part 'list_ui_state.g.dart'; diff --git a/lib/redux/ui/pref_reducer.dart b/lib/redux/ui/pref_reducer.dart index 15c78165a..2bce81cf1 100644 --- a/lib/redux/ui/pref_reducer.dart +++ b/lib/redux/ui/pref_reducer.dart @@ -1,42 +1,47 @@ +// Dart imports: import 'dart:math'; + +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actions.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; +import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; import 'package:invoiceninja_flutter/redux/product/product_actions.dart'; import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; +import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; // STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; -import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; -import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; -import 'package:redux/redux.dart'; PrefState prefReducer( PrefState state, dynamic action, String selectedCompanyId) { diff --git a/lib/redux/ui/pref_state.dart b/lib/redux/ui/pref_state.dart index 7dd4f365e..045a7d5a7 100644 --- a/lib/redux/ui/pref_state.dart +++ b/lib/redux/ui/pref_state.dart @@ -1,7 +1,12 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:flutter/foundation.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/static/color_theme_model.dart'; diff --git a/lib/redux/ui/ui_reducer.dart b/lib/redux/ui/ui_reducer.dart index 6add247ed..10c77a185 100644 --- a/lib/redux/ui/ui_reducer.dart +++ b/lib/redux/ui/ui_reducer.dart @@ -1,39 +1,43 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/client/client_reducer.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_reducer.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_reducer.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_reducer.dart'; -import 'package:invoiceninja_flutter/redux/reports/reports_reducer.dart'; -import 'package:invoiceninja_flutter/redux/settings/settings_reducer.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_state.dart'; -import 'package:invoiceninja_flutter/redux/product/product_reducer.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_reducer.dart'; -import 'package:redux/redux.dart'; +import 'package:invoiceninja_flutter/redux/design/design_reducer.dart'; import 'package:invoiceninja_flutter/redux/document/document_reducer.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_reducer.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_reducer.dart'; +import 'package:invoiceninja_flutter/redux/group/group_reducer.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_reducer.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_reducer.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_reducer.dart'; +import 'package:invoiceninja_flutter/redux/product/product_reducer.dart'; import 'package:invoiceninja_flutter/redux/project/project_reducer.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_reducer.dart'; -import 'package:invoiceninja_flutter/redux/task/task_reducer.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_reducer.dart'; -// STARTER: import - do not remove comment import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_reducer.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_reducer.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_reducer.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_reducer.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_reducer.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_reducer.dart'; -import 'package:invoiceninja_flutter/redux/token/token_reducer.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_reducer.dart'; -import 'package:invoiceninja_flutter/redux/design/design_reducer.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_reducer.dart'; -import 'package:invoiceninja_flutter/redux/user/user_reducer.dart'; +import 'package:invoiceninja_flutter/redux/reports/reports_reducer.dart'; +import 'package:invoiceninja_flutter/redux/settings/settings_reducer.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_reducer.dart'; +import 'package:invoiceninja_flutter/redux/task/task_reducer.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_reducer.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_reducer.dart'; -import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_reducer.dart'; -import 'package:invoiceninja_flutter/redux/group/group_reducer.dart'; +import 'package:invoiceninja_flutter/redux/token/token_reducer.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_state.dart'; +import 'package:invoiceninja_flutter/redux/user/user_reducer.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_reducer.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_reducer.dart'; + +// STARTER: import - do not remove comment UIState uiReducer(UIState state, dynamic action) { final currentRoute = currentRouteReducer(state.currentRoute, action); diff --git a/lib/redux/ui/ui_state.dart b/lib/redux/ui/ui_state.dart index 050844dcd..3e7c00280 100644 --- a/lib/redux/ui/ui_state.dart +++ b/lib/redux/ui/ui_state.dart @@ -1,41 +1,44 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/client/client_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_state.dart'; +import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_state.dart'; -import 'package:invoiceninja_flutter/redux/product/product_state.dart'; -import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; -import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; -import 'package:invoiceninja_flutter/ui/auth/login_vm.dart'; +import 'package:invoiceninja_flutter/redux/design/design_state.dart'; import 'package:invoiceninja_flutter/redux/document/document_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_state.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; +import 'package:invoiceninja_flutter/redux/group/group_state.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_state.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_state.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; +import 'package:invoiceninja_flutter/redux/product/product_state.dart'; import 'package:invoiceninja_flutter/redux/project/project_state.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; +import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; import 'package:invoiceninja_flutter/redux/task/task_state.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; +import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; +import 'package:invoiceninja_flutter/redux/token/token_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; +import 'package:invoiceninja_flutter/redux/user/user_state.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_state.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; +import 'package:invoiceninja_flutter/ui/auth/login_vm.dart'; +import 'package:invoiceninja_flutter/utils/strings.dart'; // STARTER: import - do not remove comment -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_state.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_state.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_state.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_state.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_state.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; -import 'package:invoiceninja_flutter/redux/token/token_state.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart'; -import 'package:invoiceninja_flutter/redux/design/design_state.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_state.dart'; -import 'package:invoiceninja_flutter/redux/user/user_state.dart'; -import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart'; -import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart'; -import 'package:invoiceninja_flutter/redux/group/group_state.dart'; -import 'package:invoiceninja_flutter/utils/strings.dart'; part 'ui_state.g.dart'; diff --git a/lib/redux/user/user_actions.dart b/lib/redux/user/user_actions.dart index e0392253c..7ec3ae2af 100644 --- a/lib/redux/user/user_actions.dart +++ b/lib/redux/user/user_actions.dart @@ -1,16 +1,23 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/user_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; class ViewUserList implements PersistUI { ViewUserList({this.force = false}); diff --git a/lib/redux/user/user_middleware.dart b/lib/redux/user/user_middleware.dart index 1dd55062e..2826eb052 100644 --- a/lib/redux/user/user_middleware.dart +++ b/lib/redux/user/user_middleware.dart @@ -1,18 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/user/user_screen.dart'; -import 'package:invoiceninja_flutter/ui/user/edit/user_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/user_repository.dart'; +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/user_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; +import 'package:invoiceninja_flutter/ui/user/edit/user_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/user/user_screen.dart'; +import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart'; List> createStoreUsersMiddleware([ UserRepository repository = const UserRepository(), diff --git a/lib/redux/user/user_reducer.dart b/lib/redux/user/user_reducer.dart index 5ea16c1be..fffac57e3 100644 --- a/lib/redux/user/user_reducer.dart +++ b/lib/redux/user/user_reducer.dart @@ -1,10 +1,13 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/entities.dart'; -import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; +import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; diff --git a/lib/redux/user/user_selectors.dart b/lib/redux/user/user_selectors.dart index 6135599e1..5195bcd16 100644 --- a/lib/redux/user/user_selectors.dart +++ b/lib/redux/user/user_selectors.dart @@ -1,8 +1,11 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/user_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownUserList = memo3((BuiltMap userMap, diff --git a/lib/redux/user/user_state.dart b/lib/redux/user/user_state.dart index a507a549a..6105b8140 100644 --- a/lib/redux/user/user_state.dart +++ b/lib/redux/user/user_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/user_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'user_state.g.dart'; diff --git a/lib/redux/vendor/vendor_actions.dart b/lib/redux/vendor/vendor_actions.dart index e618c1ec8..793f46240 100644 --- a/lib/redux/vendor/vendor_actions.dart +++ b/lib/redux/vendor/vendor_actions.dart @@ -1,9 +1,15 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/vendor/vendor_middleware.dart b/lib/redux/vendor/vendor_middleware.dart index 79d9c7c95..bc6c51928 100644 --- a/lib/redux/vendor/vendor_middleware.dart +++ b/lib/redux/vendor/vendor_middleware.dart @@ -1,17 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/vendor_repository.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/vendor/vendor_screen.dart'; -import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/vendor_repository.dart'; +import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; +import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_vm.dart'; +import 'package:invoiceninja_flutter/ui/vendor/vendor_screen.dart'; +import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_vm.dart'; List> createStoreVendorsMiddleware([ VendorRepository repository = const VendorRepository(), diff --git a/lib/redux/vendor/vendor_reducer.dart b/lib/redux/vendor/vendor_reducer.dart index b0797c4d0..6bf3d27bb 100644 --- a/lib/redux/vendor/vendor_reducer.dart +++ b/lib/redux/vendor/vendor_reducer.dart @@ -1,9 +1,13 @@ +// Dart imports: import 'dart:async'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; diff --git a/lib/redux/vendor/vendor_selectors.dart b/lib/redux/vendor/vendor_selectors.dart index 973d931dd..873888713 100644 --- a/lib/redux/vendor/vendor_selectors.dart +++ b/lib/redux/vendor/vendor_selectors.dart @@ -1,8 +1,11 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownVendorList = memo4( diff --git a/lib/redux/vendor/vendor_state.dart b/lib/redux/vendor/vendor_state.dart index bf013f31f..5274d6a73 100644 --- a/lib/redux/vendor/vendor_state.dart +++ b/lib/redux/vendor/vendor_state.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:async'; +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/vendor_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; diff --git a/lib/redux/webhook/webhook_actions.dart b/lib/redux/webhook/webhook_actions.dart index 52afa8d1e..ca7c0c855 100644 --- a/lib/redux/webhook/webhook_actions.dart +++ b/lib/redux/webhook/webhook_actions.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/redux/webhook/webhook_middleware.dart b/lib/redux/webhook/webhook_middleware.dart index 008c88e37..282760f98 100644 --- a/lib/redux/webhook/webhook_middleware.dart +++ b/lib/redux/webhook/webhook_middleware.dart @@ -1,16 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; + +// Package imports: import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/repositories/webhook_repository.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/ui/webhook/webhook_screen.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/webhook/view/webhook_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/repositories/webhook_repository.dart'; +import 'package:invoiceninja_flutter/ui/webhook/webhook_screen.dart'; List> createStoreWebhooksMiddleware([ WebhookRepository repository = const WebhookRepository(), diff --git a/lib/redux/webhook/webhook_reducer.dart b/lib/redux/webhook/webhook_reducer.dart index 4519e0387..6e9f9b270 100644 --- a/lib/redux/webhook/webhook_reducer.dart +++ b/lib/redux/webhook/webhook_reducer.dart @@ -1,13 +1,16 @@ -import 'package:redux/redux.dart'; +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; -import 'package:invoiceninja_flutter/data/models/entities.dart'; EntityUIState webhookUIReducer(WebhookUIState state, dynamic action) { return state.rebuild((b) => b diff --git a/lib/redux/webhook/webhook_selectors.dart b/lib/redux/webhook/webhook_selectors.dart index 63fa17322..2e39f1ee9 100644 --- a/lib/redux/webhook/webhook_selectors.dart +++ b/lib/redux/webhook/webhook_selectors.dart @@ -1,8 +1,11 @@ +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:memoize/memoize.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; var memoizedDropdownWebhookList = memo3( diff --git a/lib/redux/webhook/webhook_state.dart b/lib/redux/webhook/webhook_state.dart index 121cdf3e0..f4b08f50b 100644 --- a/lib/redux/webhook/webhook_state.dart +++ b/lib/redux/webhook/webhook_state.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:async'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:built_collection/built_collection.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart'; import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; part 'webhook_state.g.dart'; diff --git a/lib/ui/app/FieldGrid.dart b/lib/ui/app/FieldGrid.dart index 97242dade..bb646c38d 100644 --- a/lib/ui/app/FieldGrid.dart +++ b/lib/ui/app/FieldGrid.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_styled_toast/flutter_styled_toast.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/app/actions_menu_button.dart b/lib/ui/app/actions_menu_button.dart index c4bfba0cc..00fa8511c 100644 --- a/lib/ui/app/actions_menu_button.dart +++ b/lib/ui/app/actions_menu_button.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/app/app_border.dart b/lib/ui/app/app_border.dart index b7422eca5..deb883d43 100644 --- a/lib/ui/app/app_border.dart +++ b/lib/ui/app/app_border.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/utils/colors.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:redux/redux.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/utils/colors.dart'; class AppBorder extends StatelessWidget { const AppBorder({ diff --git a/lib/ui/app/app_bottom_bar.dart b/lib/ui/app/app_bottom_bar.dart index a6f5442eb..32d42897b 100644 --- a/lib/ui/app/app_bottom_bar.dart +++ b/lib/ui/app/app_bottom_bar.dart @@ -1,7 +1,14 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; @@ -11,9 +18,7 @@ import 'package:invoiceninja_flutter/ui/app/buttons/app_text_button.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/multiselect_dialog.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:redux/redux.dart'; class AppBottomBar extends StatefulWidget { const AppBottomBar({ diff --git a/lib/ui/app/app_builder.dart b/lib/ui/app/app_builder.dart index 5eda4491c..0b1749334 100644 --- a/lib/ui/app/app_builder.dart +++ b/lib/ui/app/app_builder.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/ui/app/app_header.dart b/lib/ui/app/app_header.dart index ab5dec256..ba7451a06 100644 --- a/lib/ui/app/app_header.dart +++ b/lib/ui/app/app_header.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/form_card.dart'; class AppHeader extends StatelessWidget { diff --git a/lib/ui/app/app_scrollbar.dart b/lib/ui/app/app_scrollbar.dart index 4531f9e36..fca765cb8 100644 --- a/lib/ui/app/app_scrollbar.dart +++ b/lib/ui/app/app_scrollbar.dart @@ -1,5 +1,10 @@ -import 'package:draggable_scrollbar/draggable_scrollbar.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:draggable_scrollbar/draggable_scrollbar.dart'; + +// Project imports: import 'package:invoiceninja_flutter/utils/platforms.dart'; class AppScrollbar extends StatefulWidget { diff --git a/lib/ui/app/app_shortcuts.dart b/lib/ui/app/app_shortcuts.dart index baf40a7dc..ed3306744 100644 --- a/lib/ui/app/app_shortcuts.dart +++ b/lib/ui/app/app_shortcuts.dart @@ -1,6 +1,9 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/app/app_webview.dart b/lib/ui/app/app_webview.dart index a37f88c15..c104122a1 100644 --- a/lib/ui/app/app_webview.dart +++ b/lib/ui/app/app_webview.dart @@ -1,10 +1,15 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:webview_flutter/webview_flutter.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; -import 'package:webview_flutter/webview_flutter.dart'; class AppWebView extends StatelessWidget { const AppWebView({this.html}); diff --git a/lib/ui/app/blank_screen.dart b/lib/ui/app/blank_screen.dart index 87c001585..4bf68e193 100644 --- a/lib/ui/app/blank_screen.dart +++ b/lib/ui/app/blank_screen.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/app/buttons/app_text_button.dart b/lib/ui/app/buttons/app_text_button.dart index 93b01bce1..e31d7e03a 100644 --- a/lib/ui/app/buttons/app_text_button.dart +++ b/lib/ui/app/buttons/app_text_button.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class AppTextButton extends StatelessWidget { diff --git a/lib/ui/app/buttons/bottom_buttons.dart b/lib/ui/app/buttons/bottom_buttons.dart index 96ae05110..d8d61aa24 100644 --- a/lib/ui/app/buttons/bottom_buttons.dart +++ b/lib/ui/app/buttons/bottom_buttons.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/ui/app/buttons/edit_icon_button.dart b/lib/ui/app/buttons/edit_icon_button.dart index 1f9552203..df674b87f 100644 --- a/lib/ui/app/buttons/edit_icon_button.dart +++ b/lib/ui/app/buttons/edit_icon_button.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/app/buttons/elevated_button.dart b/lib/ui/app/buttons/elevated_button.dart index 96ae80564..acb827b44 100644 --- a/lib/ui/app/buttons/elevated_button.dart +++ b/lib/ui/app/buttons/elevated_button.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/ui/app/icon_text.dart'; diff --git a/lib/ui/app/change_layout_banner.dart b/lib/ui/app/change_layout_banner.dart index 3367f4020..a0d3d8c8a 100644 --- a/lib/ui/app/change_layout_banner.dart +++ b/lib/ui/app/change_layout_banner.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/app/confirm_email.dart b/lib/ui/app/confirm_email.dart index 2cbd52637..4c3232c07 100644 --- a/lib/ui/app/confirm_email.dart +++ b/lib/ui/app/confirm_email.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/ui/app/confirm_email_vm.dart'; diff --git a/lib/ui/app/confirm_email_vm.dart b/lib/ui/app/confirm_email_vm.dart index 3f6b40953..4a587c27f 100644 --- a/lib/ui/app/confirm_email_vm.dart +++ b/lib/ui/app/confirm_email_vm.dart @@ -1,14 +1,19 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/app/confirm_email.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ConfirmEmailBuilder extends StatelessWidget { const ConfirmEmailBuilder({Key key}) : super(key: key); diff --git a/lib/ui/app/debug/state_inspector.dart b/lib/ui/app/debug/state_inspector.dart index 7fc166f5c..b0b498102 100644 --- a/lib/ui/app/debug/state_inspector.dart +++ b/lib/ui/app/debug/state_inspector.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_json_viewer/flutter_json_viewer.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/responsive_padding.dart'; diff --git a/lib/ui/app/desktop_session_timeout.dart b/lib/ui/app/desktop_session_timeout.dart index 3cba505e8..385715d64 100644 --- a/lib/ui/app/desktop_session_timeout.dart +++ b/lib/ui/app/desktop_session_timeout.dart @@ -1,8 +1,14 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; diff --git a/lib/ui/app/dialogs/alert_dialog.dart b/lib/ui/app/dialogs/alert_dialog.dart index 1722297ab..d97741fbb 100644 --- a/lib/ui/app/dialogs/alert_dialog.dart +++ b/lib/ui/app/dialogs/alert_dialog.dart @@ -1,7 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; + +// Package imports: import 'package:pointer_interceptor/pointer_interceptor.dart'; +// Project imports: +import 'package:invoiceninja_flutter/utils/localization.dart'; + class MessageDialog extends StatelessWidget { const MessageDialog( this.message, { diff --git a/lib/ui/app/dialogs/error_dialog.dart b/lib/ui/app/dialogs/error_dialog.dart index 1634e9234..a7dfbd54f 100644 --- a/lib/ui/app/dialogs/error_dialog.dart +++ b/lib/ui/app/dialogs/error_dialog.dart @@ -1,13 +1,18 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:pointer_interceptor/pointer_interceptor.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/.env.dart'; -import 'package:pointer_interceptor/pointer_interceptor.dart'; class ErrorDialog extends StatelessWidget { const ErrorDialog(this.error, {this.clearErrorOnDismiss = false}); diff --git a/lib/ui/app/dialogs/health_check_dialog.dart b/lib/ui/app/dialogs/health_check_dialog.dart index b1f5731b7..60d42b49c 100644 --- a/lib/ui/app/dialogs/health_check_dialog.dart +++ b/lib/ui/app/dialogs/health_check_dialog.dart @@ -1,7 +1,14 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/health_check_model.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; @@ -9,7 +16,6 @@ import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class HealthCheckDialog extends StatefulWidget { @override diff --git a/lib/ui/app/dialogs/loading_dialog.dart b/lib/ui/app/dialogs/loading_dialog.dart index af3eae05e..a37c8703e 100644 --- a/lib/ui/app/dialogs/loading_dialog.dart +++ b/lib/ui/app/dialogs/loading_dialog.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/utils/localization.dart'; class LoadingDialog extends StatelessWidget { diff --git a/lib/ui/app/dialogs/multiselect_dialog.dart b/lib/ui/app/dialogs/multiselect_dialog.dart index ae844acca..b0fe3fc15 100644 --- a/lib/ui/app/dialogs/multiselect_dialog.dart +++ b/lib/ui/app/dialogs/multiselect_dialog.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/app/dismissible_entity.dart b/lib/ui/app/dismissible_entity.dart index d8f63942e..fc8bf3823 100644 --- a/lib/ui/app/dismissible_entity.dart +++ b/lib/ui/app/dismissible_entity.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/lists/selected_indicator.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/data/models/entities.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class DismissibleEntity extends StatelessWidget { const DismissibleEntity({ diff --git a/lib/ui/app/document_grid.dart b/lib/ui/app/document_grid.dart index 605e800f9..a96e35bb3 100644 --- a/lib/ui/app/document_grid.dart +++ b/lib/ui/app/document_grid.dart @@ -1,11 +1,22 @@ +// Dart imports: import 'dart:io'; -import 'package:cached_network_image/cached_network_image.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:http/http.dart' as http; import 'package:http/http.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:permission_handler/permission_handler.dart'; +import 'package:share/share.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -17,13 +28,8 @@ import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/files.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; -import 'package:http/http.dart' as http; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:path_provider/path_provider.dart'; -import 'package:permission_handler/permission_handler.dart'; -import 'package:share/share.dart'; -import 'package:url_launcher/url_launcher.dart'; class DocumentGrid extends StatelessWidget { const DocumentGrid({ diff --git a/lib/ui/app/edit_scaffold.dart b/lib/ui/app/edit_scaffold.dart index 1523a5a83..410d506ce 100644 --- a/lib/ui/app/edit_scaffold.dart +++ b/lib/ui/app/edit_scaffold.dart @@ -1,5 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -14,7 +20,6 @@ import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:url_launcher/url_launcher.dart'; class EditScaffold extends StatelessWidget { const EditScaffold({ diff --git a/lib/ui/app/entities/entity_actions_dialog.dart b/lib/ui/app/entities/entity_actions_dialog.dart index abfe76965..9085f5676 100644 --- a/lib/ui/app/entities/entity_actions_dialog.dart +++ b/lib/ui/app/entities/entity_actions_dialog.dart @@ -1,7 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/app/entities/entity_list_tile.dart b/lib/ui/app/entities/entity_list_tile.dart index f46f3ee89..1af9057e4 100644 --- a/lib/ui/app/entities/entity_list_tile.dart +++ b/lib/ui/app/entities/entity_list_tile.dart @@ -1,6 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -15,7 +21,6 @@ import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class EntityListTile extends StatefulWidget { const EntityListTile({ diff --git a/lib/ui/app/entities/entity_state_title.dart b/lib/ui/app/entities/entity_state_title.dart index 624583575..ba3227f36 100644 --- a/lib/ui/app/entities/entity_state_title.dart +++ b/lib/ui/app/entities/entity_state_title.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/app/entities/entity_status_chip.dart b/lib/ui/app/entities/entity_status_chip.dart index 5511017a8..371b48359 100644 --- a/lib/ui/app/entities/entity_status_chip.dart +++ b/lib/ui/app/entities/entity_status_chip.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/colors.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; diff --git a/lib/ui/app/entity_dropdown.dart b/lib/ui/app/entity_dropdown.dart index edcf4abaf..7e364dc6d 100644 --- a/lib/ui/app/entity_dropdown.dart +++ b/lib/ui/app/entity_dropdown.dart @@ -1,8 +1,16 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/app_border.dart'; @@ -12,7 +20,6 @@ import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:invoiceninja_flutter/.env.dart'; class EntityDropdown extends StatefulWidget { const EntityDropdown({ diff --git a/lib/ui/app/entity_header.dart b/lib/ui/app/entity_header.dart index cadc19548..61f5aec35 100644 --- a/lib/ui/app/entity_header.dart +++ b/lib/ui/app/entity_header.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/app/entity_state_label.dart b/lib/ui/app/entity_state_label.dart index df0030c6e..0f2bf3330 100644 --- a/lib/ui/app/entity_state_label.dart +++ b/lib/ui/app/entity_state_label.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/app/entity_top_filter.dart b/lib/ui/app/entity_top_filter.dart index 51a1d89f8..5d8f2eeff 100644 --- a/lib/ui/app/entity_top_filter.dart +++ b/lib/ui/app/entity_top_filter.dart @@ -1,13 +1,18 @@ -import 'package:invoiceninja_flutter/constants.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:overflow_view/overflow_view.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:overflow_view/overflow_view.dart'; class EntityTopFilter extends StatelessWidget { const EntityTopFilter({@required this.show}); diff --git a/lib/ui/app/form_card.dart b/lib/ui/app/form_card.dart index c6705f53f..5387d8484 100644 --- a/lib/ui/app/form_card.dart +++ b/lib/ui/app/form_card.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/ui/app/app_border.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/app/forms/app_dropdown_button.dart b/lib/ui/app/forms/app_dropdown_button.dart index 9bf4c16b8..5d6f11f79 100644 --- a/lib/ui/app/forms/app_dropdown_button.dart +++ b/lib/ui/app/forms/app_dropdown_button.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class AppDropdownButton extends StatelessWidget { diff --git a/lib/ui/app/forms/app_form.dart b/lib/ui/app/forms/app_form.dart index 17930ca3b..fac6564fe 100644 --- a/lib/ui/app/forms/app_form.dart +++ b/lib/ui/app/forms/app_form.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; diff --git a/lib/ui/app/forms/app_tab_bar.dart b/lib/ui/app/forms/app_tab_bar.dart index 0c031e362..b86f2ca8b 100644 --- a/lib/ui/app/forms/app_tab_bar.dart +++ b/lib/ui/app/forms/app_tab_bar.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class AppTabBar extends StatelessWidget { diff --git a/lib/ui/app/forms/app_toggle_buttons.dart b/lib/ui/app/forms/app_toggle_buttons.dart index a1b173377..18787ef5b 100644 --- a/lib/ui/app/forms/app_toggle_buttons.dart +++ b/lib/ui/app/forms/app_toggle_buttons.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/app/forms/bool_dropdown_button.dart b/lib/ui/app/forms/bool_dropdown_button.dart index cb424c5fe..3dcaffb56 100644 --- a/lib/ui/app/forms/bool_dropdown_button.dart +++ b/lib/ui/app/forms/bool_dropdown_button.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/app/forms/client_picker.dart b/lib/ui/app/forms/client_picker.dart index 61c716aa2..ffcd8b9be 100644 --- a/lib/ui/app/forms/client_picker.dart +++ b/lib/ui/app/forms/client_picker.dart @@ -1,7 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; diff --git a/lib/ui/app/forms/color_picker.dart b/lib/ui/app/forms/color_picker.dart index 8ffc91a63..839c48f92 100644 --- a/lib/ui/app/forms/color_picker.dart +++ b/lib/ui/app/forms/color_picker.dart @@ -1,17 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_colorpicker/flutter_colorpicker.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/static/color_theme_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; - -//import 'package:flutter_colorpicker/block_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; +//import 'package:flutter_colorpicker/block_picker.dart'; + class FormColorPicker extends StatefulWidget { const FormColorPicker({ this.labelText, diff --git a/lib/ui/app/forms/custom_field.dart b/lib/ui/app/forms/custom_field.dart index 7b3c7d87e..bb457a064 100644 --- a/lib/ui/app/forms/custom_field.dart +++ b/lib/ui/app/forms/custom_field.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/app/forms/custom_surcharges.dart b/lib/ui/app/forms/custom_surcharges.dart index 5b09152ca..8788daecc 100644 --- a/lib/ui/app/forms/custom_surcharges.dart +++ b/lib/ui/app/forms/custom_surcharges.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; diff --git a/lib/ui/app/forms/date_picker.dart b/lib/ui/app/forms/date_picker.dart index 8c6b5a685..f2f4dc81d 100644 --- a/lib/ui/app/forms/date_picker.dart +++ b/lib/ui/app/forms/date_picker.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; diff --git a/lib/ui/app/forms/decorated_form_field.dart b/lib/ui/app/forms/decorated_form_field.dart index c70ddb54c..cd05250c9 100644 --- a/lib/ui/app/forms/decorated_form_field.dart +++ b/lib/ui/app/forms/decorated_form_field.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class DecoratedFormField extends StatefulWidget { const DecoratedFormField({ diff --git a/lib/ui/app/forms/design_picker.dart b/lib/ui/app/forms/design_picker.dart index cab188c47..ed9bb9150 100644 --- a/lib/ui/app/forms/design_picker.dart +++ b/lib/ui/app/forms/design_picker.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/design_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; diff --git a/lib/ui/app/forms/discount_field.dart b/lib/ui/app/forms/discount_field.dart index c0a21b73a..d7c30facb 100644 --- a/lib/ui/app/forms/discount_field.dart +++ b/lib/ui/app/forms/discount_field.dart @@ -1,6 +1,8 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; +// Project imports: +import 'package:invoiceninja_flutter/utils/localization.dart'; import 'decorated_form_field.dart'; class DiscountField extends StatelessWidget { diff --git a/lib/ui/app/forms/duration_picker.dart b/lib/ui/app/forms/duration_picker.dart index 9136add94..a9633f1ce 100644 --- a/lib/ui/app/forms/duration_picker.dart +++ b/lib/ui/app/forms/duration_picker.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/ui/app/forms/dynamic_selector.dart b/lib/ui/app/forms/dynamic_selector.dart index cc9a3a842..cba5b5baa 100644 --- a/lib/ui/app/forms/dynamic_selector.dart +++ b/lib/ui/app/forms/dynamic_selector.dart @@ -1,7 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; diff --git a/lib/ui/app/forms/growable_form_field.dart b/lib/ui/app/forms/growable_form_field.dart index 2499cf944..d4d9bfb90 100644 --- a/lib/ui/app/forms/growable_form_field.dart +++ b/lib/ui/app/forms/growable_form_field.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; class GrowableFormField extends StatefulWidget { diff --git a/lib/ui/app/forms/help_link.dart b/lib/ui/app/forms/help_link.dart index c9f890bc1..71c02e386 100644 --- a/lib/ui/app/forms/help_link.dart +++ b/lib/ui/app/forms/help_link.dart @@ -1,8 +1,13 @@ +// Flutter imports: import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; + +// Package imports: import 'package:url_launcher/url_launcher.dart'; +// Project imports: +import 'package:invoiceninja_flutter/utils/localization.dart'; + class HelpLink extends StatelessWidget { const HelpLink({ @required this.url, diff --git a/lib/ui/app/forms/learn_more.dart b/lib/ui/app/forms/learn_more.dart index d631cd20a..f249e373e 100644 --- a/lib/ui/app/forms/learn_more.dart +++ b/lib/ui/app/forms/learn_more.dart @@ -1,7 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; + +// Package imports: import 'package:url_launcher/url_launcher.dart'; +// Project imports: +import 'package:invoiceninja_flutter/utils/localization.dart'; + class LearnMoreUrl extends StatelessWidget { const LearnMoreUrl({ @required this.child, diff --git a/lib/ui/app/forms/notification_settings.dart b/lib/ui/app/forms/notification_settings.dart index 498673e56..396b6b582 100644 --- a/lib/ui/app/forms/notification_settings.dart +++ b/lib/ui/app/forms/notification_settings.dart @@ -1,6 +1,11 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/user_model.dart'; diff --git a/lib/ui/app/forms/password_field.dart b/lib/ui/app/forms/password_field.dart index 55c1c8556..4b3fe66df 100644 --- a/lib/ui/app/forms/password_field.dart +++ b/lib/ui/app/forms/password_field.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/app/forms/project_picker.dart b/lib/ui/app/forms/project_picker.dart index 15d1aa41c..5889dc69b 100644 --- a/lib/ui/app/forms/project_picker.dart +++ b/lib/ui/app/forms/project_picker.dart @@ -1,7 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/project/project_selectors.dart'; diff --git a/lib/ui/app/forms/save_cancel_buttons.dart b/lib/ui/app/forms/save_cancel_buttons.dart index 66890b16c..807f9bdb3 100644 --- a/lib/ui/app/forms/save_cancel_buttons.dart +++ b/lib/ui/app/forms/save_cancel_buttons.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/buttons/app_text_button.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/app/forms/time_picker.dart b/lib/ui/app/forms/time_picker.dart index 93e340bcf..455ffd1c6 100644 --- a/lib/ui/app/forms/time_picker.dart +++ b/lib/ui/app/forms/time_picker.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/ui/app/forms/user_picker.dart b/lib/ui/app/forms/user_picker.dart index 4755d2daf..3a9eabd7f 100644 --- a/lib/ui/app/forms/user_picker.dart +++ b/lib/ui/app/forms/user_picker.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/user/user_selectors.dart'; diff --git a/lib/ui/app/gateways/token_meta.dart b/lib/ui/app/gateways/token_meta.dart index 4e5be61c1..0fbfc8182 100644 --- a/lib/ui/app/gateways/token_meta.dart +++ b/lib/ui/app/gateways/token_meta.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/gateway_token_model.dart'; class TokenMeta extends StatelessWidget { diff --git a/lib/ui/app/help_text.dart b/lib/ui/app/help_text.dart index 76e433ef0..d246aca6c 100644 --- a/lib/ui/app/help_text.dart +++ b/lib/ui/app/help_text.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class HelpText extends StatelessWidget { diff --git a/lib/ui/app/history_drawer.dart b/lib/ui/app/history_drawer.dart index 2fd315b9e..ed0883f2a 100644 --- a/lib/ui/app/history_drawer.dart +++ b/lib/ui/app/history_drawer.dart @@ -1,23 +1,29 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:timeago/timeago.dart' as timeago; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; +import 'package:invoiceninja_flutter/ui/app/history_drawer_vm.dart'; import 'package:invoiceninja_flutter/ui/app/live_text.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:timeago/timeago.dart' as timeago; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/app/history_drawer_vm.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/app/history_drawer_vm.dart b/lib/ui/app/history_drawer_vm.dart index 995510446..24d46ac67 100644 --- a/lib/ui/app/history_drawer_vm.dart +++ b/lib/ui/app/history_drawer_vm.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/ui/app/history_drawer.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/history_drawer.dart'; class HistoryDrawerBuilder extends StatelessWidget { const HistoryDrawerBuilder({Key key}) : super(key: key); diff --git a/lib/ui/app/icon_message.dart b/lib/ui/app/icon_message.dart index 6ec3a8597..c46bff13f 100644 --- a/lib/ui/app/icon_message.dart +++ b/lib/ui/app/icon_message.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class IconMessage extends StatelessWidget { diff --git a/lib/ui/app/icon_text.dart b/lib/ui/app/icon_text.dart index 1c8539374..e4fba208d 100644 --- a/lib/ui/app/icon_text.dart +++ b/lib/ui/app/icon_text.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class IconText extends StatelessWidget { diff --git a/lib/ui/app/invoice/invoice_email_view.dart b/lib/ui/app/invoice/invoice_email_view.dart index e7f16dbc1..5cf18cfec 100644 --- a/lib/ui/app/invoice/invoice_email_view.dart +++ b/lib/ui/app/invoice/invoice_email_view.dart @@ -1,20 +1,23 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_tab_bar.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/app/lists/activity_list_tile.dart'; +import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/credit/credit_pdf_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/invoice_email_vm.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/quote_pdf_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/templates_and_reminders.dart'; diff --git a/lib/ui/app/invoice/invoice_item_view.dart b/lib/ui/app/invoice/invoice_item_view.dart index 667c50719..50817cd6a 100644 --- a/lib/ui/app/invoice/invoice_item_view.dart +++ b/lib/ui/app/invoice/invoice_item_view.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class InvoiceItemListTile extends StatelessWidget { diff --git a/lib/ui/app/invoice/tax_rate_dropdown.dart b/lib/ui/app/invoice/tax_rate_dropdown.dart index 8391cc16c..36112a992 100644 --- a/lib/ui/app/invoice/tax_rate_dropdown.dart +++ b/lib/ui/app/invoice/tax_rate_dropdown.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/ui/app/invoice/tax_rate_field.dart b/lib/ui/app/invoice/tax_rate_field.dart index 569884900..860355902 100644 --- a/lib/ui/app/invoice/tax_rate_field.dart +++ b/lib/ui/app/invoice/tax_rate_field.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/ui/app/link_text.dart b/lib/ui/app/link_text.dart index 620f898f5..585fe0223 100644 --- a/lib/ui/app/link_text.dart +++ b/lib/ui/app/link_text.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:url_launcher/url_launcher.dart'; class LinkTextSpan extends TextSpan { diff --git a/lib/ui/app/list_filter.dart b/lib/ui/app/list_filter.dart index f62ef55d5..013249505 100644 --- a/lib/ui/app/list_filter.dart +++ b/lib/ui/app/list_filter.dart @@ -1,14 +1,19 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/entities.dart'; -import 'package:invoiceninja_flutter/utils/colors.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ListFilter extends StatefulWidget { const ListFilter({ diff --git a/lib/ui/app/list_scaffold.dart b/lib/ui/app/list_scaffold.dart index a0ff93600..f06cfd80a 100644 --- a/lib/ui/app/list_scaffold.dart +++ b/lib/ui/app/list_scaffold.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/app/lists/activity_list_tile.dart b/lib/ui/app/lists/activity_list_tile.dart index 68f6fdc2d..9195aa26a 100644 --- a/lib/ui/app/lists/activity_list_tile.dart +++ b/lib/ui/app/lists/activity_list_tile.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/app/lists/app_list_tile.dart b/lib/ui/app/lists/app_list_tile.dart index 5e27f5d8b..ef51323ad 100644 --- a/lib/ui/app/lists/app_list_tile.dart +++ b/lib/ui/app/lists/app_list_tile.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_styled_toast/flutter_styled_toast.dart'; + +// Project imports: import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/app/lists/list_divider.dart b/lib/ui/app/lists/list_divider.dart index b3189db46..d1039eccd 100644 --- a/lib/ui/app/lists/list_divider.dart +++ b/lib/ui/app/lists/list_divider.dart @@ -1,9 +1,14 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/utils/colors.dart'; -import 'package:redux/redux.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/utils/colors.dart'; class ListDivider extends StatelessWidget { @override diff --git a/lib/ui/app/lists/list_filter.dart b/lib/ui/app/lists/list_filter.dart index 686cc4f82..2678b70c3 100644 --- a/lib/ui/app/lists/list_filter.dart +++ b/lib/ui/app/lists/list_filter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/app/lists/selected_indicator.dart b/lib/ui/app/lists/selected_indicator.dart index 3b08be76c..854ae9731 100644 --- a/lib/ui/app/lists/selected_indicator.dart +++ b/lib/ui/app/lists/selected_indicator.dart @@ -1,6 +1,11 @@ -import 'package:redux/redux.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/colors.dart'; diff --git a/lib/ui/app/live_text.dart b/lib/ui/app/live_text.dart index 4411c3a3e..9e64d82b9 100644 --- a/lib/ui/app/live_text.dart +++ b/lib/ui/app/live_text.dart @@ -1,4 +1,7 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/widgets.dart'; class LiveText extends StatefulWidget { diff --git a/lib/ui/app/loading_indicator.dart b/lib/ui/app/loading_indicator.dart index cb0bbf672..1f00ac3bb 100644 --- a/lib/ui/app/loading_indicator.dart +++ b/lib/ui/app/loading_indicator.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class LoadingIndicator extends StatelessWidget { diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart index 86e3e7d36..db7e1b073 100644 --- a/lib/ui/app/main_screen.dart +++ b/lib/ui/app/main_screen.dart @@ -1,7 +1,13 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:invoiceninja_flutter/constants.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -10,6 +16,7 @@ import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; +import 'package:invoiceninja_flutter/ui/app/app_border.dart'; import 'package:invoiceninja_flutter/ui/app/blank_screen.dart'; import 'package:invoiceninja_flutter/ui/app/change_layout_banner.dart'; import 'package:invoiceninja_flutter/ui/app/confirm_email_vm.dart'; @@ -67,8 +74,6 @@ import 'package:invoiceninja_flutter/ui/token/view/token_view_vm.dart'; import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/webhook/view/webhook_view_vm.dart'; import 'package:invoiceninja_flutter/ui/webhook/webhook_screen_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/app_border.dart'; -import 'package:redux/redux.dart'; class MainScreen extends StatelessWidget { static const String route = '/main'; diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart index 06524a91d..c0febd1c1 100644 --- a/lib/ui/app/menu_drawer.dart +++ b/lib/ui/app/menu_drawer.dart @@ -1,13 +1,23 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:pointer_interceptor/pointer_interceptor.dart'; +import 'package:redux/redux.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -37,10 +47,6 @@ import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:pointer_interceptor/pointer_interceptor.dart'; -import 'package:redux/redux.dart'; -import 'package:url_launcher/url_launcher.dart'; class MenuDrawer extends StatelessWidget { const MenuDrawer({ diff --git a/lib/ui/app/menu_drawer_vm.dart b/lib/ui/app/menu_drawer_vm.dart index dd1190dc8..398078751 100644 --- a/lib/ui/app/menu_drawer_vm.dart +++ b/lib/ui/app/menu_drawer_vm.dart @@ -1,9 +1,17 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; @@ -11,14 +19,11 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_builder.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/loading_dialog.dart'; +import 'package:invoiceninja_flutter/ui/app/menu_drawer.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/oauth.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/ui/app/menu_drawer.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; class MenuDrawerBuilder extends StatelessWidget { const MenuDrawerBuilder({Key key}) : super(key: key); diff --git a/lib/ui/app/presenters/entity_presenter.dart b/lib/ui/app/presenters/entity_presenter.dart index 7ef1f2bc3..8d0ce4b97 100644 --- a/lib/ui/app/presenters/entity_presenter.dart +++ b/lib/ui/app/presenters/entity_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/ui/app/progress_button.dart b/lib/ui/app/progress_button.dart index d4c7b1826..87c1c55ac 100644 --- a/lib/ui/app/progress_button.dart +++ b/lib/ui/app/progress_button.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; class ProgressButton extends StatelessWidget { diff --git a/lib/ui/app/resources/cached_image.dart b/lib/ui/app/resources/cached_image.dart index 8cab3fd2e..a47b4d5d1 100644 --- a/lib/ui/app/resources/cached_image.dart +++ b/lib/ui/app/resources/cached_image.dart @@ -1,7 +1,12 @@ -import 'package:cached_network_image/cached_network_image.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CachedImage extends StatelessWidget { diff --git a/lib/ui/app/responsive_padding.dart b/lib/ui/app/responsive_padding.dart index dcf9d0418..225c98fb6 100644 --- a/lib/ui/app/responsive_padding.dart +++ b/lib/ui/app/responsive_padding.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/app/scrollable_listview.dart b/lib/ui/app/scrollable_listview.dart index bb40af53d..9556ebcac 100644 --- a/lib/ui/app/scrollable_listview.dart +++ b/lib/ui/app/scrollable_listview.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/app_scrollbar.dart'; class ScrollableListView extends StatefulWidget { diff --git a/lib/ui/app/snackbar_row.dart b/lib/ui/app/snackbar_row.dart index 1206087c1..d3ae68108 100644 --- a/lib/ui/app/snackbar_row.dart +++ b/lib/ui/app/snackbar_row.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class SnackBarRow extends StatelessWidget { diff --git a/lib/ui/app/system_log_viewer.dart b/lib/ui/app/system_log_viewer.dart index 39d3e102d..01bd4ca50 100644 --- a/lib/ui/app/system_log_viewer.dart +++ b/lib/ui/app/system_log_viewer.dart @@ -1,9 +1,15 @@ +// Dart imports: import 'dart:convert'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_json_viewer/flutter_json_viewer.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/system_log_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; diff --git a/lib/ui/app/tables/app_data_table.dart b/lib/ui/app/tables/app_data_table.dart index 5cbe93589..e8b5280a5 100644 --- a/lib/ui/app/tables/app_data_table.dart +++ b/lib/ui/app/tables/app_data_table.dart @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// Dart imports: import 'dart:math' as math; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; diff --git a/lib/ui/app/tables/app_data_table_source.dart b/lib/ui/app/tables/app_data_table_source.dart index 1259bb70c..be35ef830 100644 --- a/lib/ui/app/tables/app_data_table_source.dart +++ b/lib/ui/app/tables/app_data_table_source.dart @@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/tables/app_data_table.dart'; /// A data source for obtaining row data for [PaginatedDataTable] objects. diff --git a/lib/ui/app/tables/app_paginated_data_table.dart b/lib/ui/app/tables/app_paginated_data_table.dart index bb695af08..6ef185ad1 100644 --- a/lib/ui/app/tables/app_paginated_data_table.dart +++ b/lib/ui/app/tables/app_paginated_data_table.dart @@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// Dart imports: import 'dart:math' as math; -import 'package:flutter/material.dart' hide DataRow, DataCell, DataColumn; -import 'package:flutter/widgets.dart'; -import 'package:flutter/rendering.dart'; +// Flutter imports: import 'package:flutter/gestures.dart' show DragStartBehavior; +import 'package:flutter/material.dart' hide DataRow, DataCell, DataColumn; +import 'package:flutter/rendering.dart'; +import 'package:flutter/widgets.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/tables/app_data_table.dart'; import 'package:invoiceninja_flutter/ui/app/tables/app_data_table_source.dart'; diff --git a/lib/ui/app/tables/entity_datatable.dart b/lib/ui/app/tables/entity_datatable.dart index f93371a5c..fc20ff51f 100644 --- a/lib/ui/app/tables/entity_datatable.dart +++ b/lib/ui/app/tables/entity_datatable.dart @@ -1,6 +1,12 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/material.dart' hide DataRow, DataCell, DataColumn; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -14,7 +20,6 @@ import 'package:invoiceninja_flutter/ui/app/tables/app_data_table_source.dart'; import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class EntityDataTableSource extends AppDataTableSource { EntityDataTableSource( diff --git a/lib/ui/app/tables/entity_list.dart b/lib/ui/app/tables/entity_list.dart index 5a677cba2..190ae5b46 100644 --- a/lib/ui/app/tables/entity_list.dart +++ b/lib/ui/app/tables/entity_list.dart @@ -1,9 +1,16 @@ +// Dart imports: import 'dart:async'; import 'dart:math'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart' hide DataRow, DataCell, DataColumn; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:overflow_view/overflow_view.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -26,7 +33,6 @@ import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:overflow_view/overflow_view.dart'; class EntityList extends StatefulWidget { EntityList({ diff --git a/lib/ui/app/upgrade_dialog.dart b/lib/ui/app/upgrade_dialog.dart index 984074222..f415c32f3 100644 --- a/lib/ui/app/upgrade_dialog.dart +++ b/lib/ui/app/upgrade_dialog.dart @@ -1,3 +1,32 @@ +/* +// Dart imports: +import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; + +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:in_app_purchase/in_app_purchase.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/alert_dialog.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; +import 'package:invoiceninja_flutter/utils/dialogs.dart'; +import 'package:invoiceninja_flutter/utils/formatting.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; +*/ + import 'package:flutter/material.dart'; class UpgradeDialog extends StatelessWidget { @@ -10,24 +39,6 @@ class UpgradeDialog extends StatelessWidget { } /* -import 'dart:async'; -import 'dart:convert'; -import 'dart:io'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:in_app_purchase/in_app_purchase.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/web_client.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/alert_dialog.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/utils/dialogs.dart'; -import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class UpgradeDialog extends StatefulWidget { @override diff --git a/lib/ui/app/variables.dart b/lib/ui/app/variables.dart index e016c2782..8c02ebb42 100644 --- a/lib/ui/app/variables.dart +++ b/lib/ui/app/variables.dart @@ -1,8 +1,13 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/ui/app/view_scaffold.dart b/lib/ui/app/view_scaffold.dart index 85628ceee..56a03527f 100644 --- a/lib/ui/app/view_scaffold.dart +++ b/lib/ui/app/view_scaffold.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/app/web_session_timeout.dart b/lib/ui/app/web_session_timeout.dart index f887b7553..df417006f 100644 --- a/lib/ui/app/web_session_timeout.dart +++ b/lib/ui/app/web_session_timeout.dart @@ -1,7 +1,14 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; diff --git a/lib/ui/app/web_socket_refresh.dart b/lib/ui/app/web_socket_refresh.dart index 080b04612..f4c82d253 100644 --- a/lib/ui/app/web_socket_refresh.dart +++ b/lib/ui/app/web_socket_refresh.dart @@ -1,13 +1,20 @@ +// Dart imports: +import 'dart:convert'; +import 'dart:io'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -/* -import 'dart:io'; -import 'dart:convert'; +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; + +/* */ class WebSocketRefresh extends StatefulWidget { diff --git a/lib/ui/auth/init_screen.dart b/lib/ui/auth/init_screen.dart index d11d20ef2..32c6b8459 100644 --- a/lib/ui/auth/init_screen.dart +++ b/lib/ui/auth/init_screen.dart @@ -1,8 +1,13 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; -import 'package:redux/redux.dart'; class InitScreen extends StatelessWidget { @override diff --git a/lib/ui/auth/lock_screen.dart b/lib/ui/auth/lock_screen.dart index 88e3bdcdb..6defd0964 100644 --- a/lib/ui/auth/lock_screen.dart +++ b/lib/ui/auth/lock_screen.dart @@ -1,8 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; +// Package imports: import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +// Project imports: +import 'package:invoiceninja_flutter/utils/localization.dart'; + class LockScreen extends StatelessWidget { const LockScreen({@required this.onAuthenticatePressed}); diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart index bf6b42be1..9cfb18dbb 100644 --- a/lib/ui/auth/login_view.dart +++ b/lib/ui/auth/login_view.dart @@ -1,12 +1,24 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:rounded_loading_button/rounded_loading_button.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/alert_dialog.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_toggle_buttons.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/password_field.dart'; @@ -15,13 +27,9 @@ import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/auth/login_vm.dart'; import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/utils/oauth.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:invoiceninja_flutter/.env.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:rounded_loading_button/rounded_loading_button.dart'; -import 'package:url_launcher/url_launcher.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; diff --git a/lib/ui/auth/login_vm.dart b/lib/ui/auth/login_vm.dart index f8188f57b..9708562c1 100644 --- a/lib/ui/auth/login_vm.dart +++ b/lib/ui/auth/login_vm.dart @@ -1,24 +1,31 @@ +// Dart imports: import 'dart:async'; -import 'package:flutter/material.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/token_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; +import 'package:invoiceninja_flutter/redux/auth/auth_state.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/ui/app/app_builder.dart'; +import 'package:invoiceninja_flutter/ui/auth/login_view.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/oauth.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; -import 'package:invoiceninja_flutter/ui/auth/login_view.dart'; -import 'package:invoiceninja_flutter/redux/auth/auth_state.dart'; -import 'package:shared_preferences/shared_preferences.dart'; class LoginScreen extends StatelessWidget { const LoginScreen({Key key}) : super(key: key); diff --git a/lib/ui/client/client_list_item.dart b/lib/ui/client/client_list_item.dart index 439fd99ac..188ac40a4 100644 --- a/lib/ui/client/client_list_item.dart +++ b/lib/ui/client/client_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/client/client_list_vm.dart b/lib/ui/client/client_list_vm.dart index 466db2c07..9f3b87da8 100644 --- a/lib/ui/client/client_list_vm.dart +++ b/lib/ui/client/client_list_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -15,7 +22,6 @@ import 'package:invoiceninja_flutter/ui/client/client_list_item.dart'; import 'package:invoiceninja_flutter/ui/client/client_presenter.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class ClientListBuilder extends StatelessWidget { const ClientListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/client/client_pdf.dart b/lib/ui/client/client_pdf.dart index 6b53a105d..30b06f577 100644 --- a/lib/ui/client/client_pdf.dart +++ b/lib/ui/client/client_pdf.dart @@ -1,12 +1,22 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:io' as file; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart' as http; -import 'package:flutter/material.dart'; import 'package:http/http.dart'; +import 'package:native_pdf_view/native_pdf_view.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:share/share.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:flutter/foundation.dart'; import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; @@ -20,11 +30,9 @@ import 'package:invoiceninja_flutter/utils/dates.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:native_pdf_view/native_pdf_view.dart'; -import 'package:path_provider/path_provider.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; -import 'package:share/share.dart'; class ClientPdfView extends StatefulWidget { const ClientPdfView({ diff --git a/lib/ui/client/client_pdf_vm.dart b/lib/ui/client/client_pdf_vm.dart index 7f86035e8..cc4decbbc 100644 --- a/lib/ui/client/client_pdf_vm.dart +++ b/lib/ui/client/client_pdf_vm.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/client/client_pdf.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/client/client_pdf.dart'; class ClientPdfScreen extends StatelessWidget { const ClientPdfScreen({Key key, this.showAppBar = true}) : super(key: key); diff --git a/lib/ui/client/client_presenter.dart b/lib/ui/client/client_presenter.dart index 04b83d400..9955a0b5d 100644 --- a/lib/ui/client/client_presenter.dart +++ b/lib/ui/client/client_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/client/client_screen.dart b/lib/ui/client/client_screen.dart index 2c03d71ff..b68ef46d8 100644 --- a/lib/ui/client/client_screen.dart +++ b/lib/ui/client/client_screen.dart @@ -1,16 +1,20 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/client/client_list_vm.dart'; import 'package:invoiceninja_flutter/ui/client/client_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'client_screen_vm.dart'; class ClientScreen extends StatelessWidget { diff --git a/lib/ui/client/client_screen_vm.dart b/lib/ui/client/client_screen_vm.dart index a497049c2..7d95e1d1a 100644 --- a/lib/ui/client/client_screen_vm.dart +++ b/lib/ui/client/client_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; -import 'package:redux/redux.dart'; - import 'client_screen.dart'; class ClientScreenBuilder extends StatelessWidget { diff --git a/lib/ui/client/edit/client_edit.dart b/lib/ui/client/edit/client_edit.dart index 30c6b92d0..60be31c8d 100644 --- a/lib/ui/client/edit/client_edit.dart +++ b/lib/ui/client/edit/client_edit.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_billing_address.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_contacts_vm.dart'; @@ -11,7 +15,6 @@ import 'package:invoiceninja_flutter/ui/client/edit/client_edit_notes.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_settings.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_shipping_address.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class ClientEdit extends StatefulWidget { diff --git a/lib/ui/client/edit/client_edit_billing_address.dart b/lib/ui/client/edit/client_edit_billing_address.dart index 076b9b9d6..b744e05d6 100644 --- a/lib/ui/client/edit/client_edit_billing_address.dart +++ b/lib/ui/client/edit/client_edit_billing_address.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; @@ -8,7 +12,6 @@ import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; class ClientEditBillingAddress extends StatefulWidget { const ClientEditBillingAddress({ diff --git a/lib/ui/client/edit/client_edit_contacts.dart b/lib/ui/client/edit/client_edit_contacts.dart index 6867dc24e..910348f36 100644 --- a/lib/ui/client/edit/client_edit_contacts.dart +++ b/lib/ui/client/edit/client_edit_contacts.dart @@ -1,6 +1,9 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; diff --git a/lib/ui/client/edit/client_edit_contacts_vm.dart b/lib/ui/client/edit/client_edit_contacts_vm.dart index faebefbba..701c768e0 100644 --- a/lib/ui/client/edit/client_edit_contacts_vm.dart +++ b/lib/ui/client/edit/client_edit_contacts_vm.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/client/edit/client_edit_contacts.dart'; -import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; +import 'package:invoiceninja_flutter/ui/client/edit/client_edit_contacts.dart'; +import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; class ClientEditContactsScreen extends StatelessWidget { const ClientEditContactsScreen({Key key, @required this.viewModel}) diff --git a/lib/ui/client/edit/client_edit_desktop.dart b/lib/ui/client/edit/client_edit_desktop.dart index 64fb0cab4..9d1d8a1d6 100644 --- a/lib/ui/client/edit/client_edit_desktop.dart +++ b/lib/ui/client/edit/client_edit_desktop.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_billing_address.dart'; diff --git a/lib/ui/client/edit/client_edit_details.dart b/lib/ui/client/edit/client_edit_details.dart index cf8841a1a..7d6c66043 100644 --- a/lib/ui/client/edit/client_edit_details.dart +++ b/lib/ui/client/edit/client_edit_details.dart @@ -1,11 +1,19 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:contacts_service/contacts_service.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/dynamic_selector.dart'; @@ -14,8 +22,6 @@ import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/contacts.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; -import 'package:contacts_service/contacts_service.dart'; class ClientEditDetails extends StatefulWidget { const ClientEditDetails({ diff --git a/lib/ui/client/edit/client_edit_footer.dart b/lib/ui/client/edit/client_edit_footer.dart index ea8f5c9dd..650cc3ca1 100644 --- a/lib/ui/client/edit/client_edit_footer.dart +++ b/lib/ui/client/edit/client_edit_footer.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; diff --git a/lib/ui/client/edit/client_edit_notes.dart b/lib/ui/client/edit/client_edit_notes.dart index 9ee7fcbc9..d74b9e088 100644 --- a/lib/ui/client/edit/client_edit_notes.dart +++ b/lib/ui/client/edit/client_edit_notes.dart @@ -1,15 +1,18 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; -import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; class ClientEditNotes extends StatefulWidget { const ClientEditNotes({ diff --git a/lib/ui/client/edit/client_edit_settings.dart b/lib/ui/client/edit/client_edit_settings.dart index 92e82c9fd..f599dbd5b 100644 --- a/lib/ui/client/edit/client_edit_settings.dart +++ b/lib/ui/client/edit/client_edit_settings.dart @@ -1,16 +1,19 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_selectors.dart'; +import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; -import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; class ClientEditSettings extends StatefulWidget { const ClientEditSettings({ diff --git a/lib/ui/client/edit/client_edit_shipping_address.dart b/lib/ui/client/edit/client_edit_shipping_address.dart index 415ef01b0..4f1430c7c 100644 --- a/lib/ui/client/edit/client_edit_shipping_address.dart +++ b/lib/ui/client/edit/client_edit_shipping_address.dart @@ -1,14 +1,16 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; - import '../../app/form_card.dart'; class ClientEditShippingAddress extends StatefulWidget { diff --git a/lib/ui/client/edit/client_edit_vm.dart b/lib/ui/client/edit/client_edit_vm.dart index 307ad3e04..859e9c535 100644 --- a/lib/ui/client/edit/client_edit_vm.dart +++ b/lib/ui/client/edit/client_edit_vm.dart @@ -1,8 +1,15 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -15,7 +22,6 @@ import 'package:invoiceninja_flutter/ui/client/edit/client_edit.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class ClientEditScreen extends StatelessWidget { const ClientEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/client/view/client_view.dart b/lib/ui/client/view/client_view.dart index dca3eea47..aec79ac3f 100644 --- a/lib/ui/client/view/client_view.dart +++ b/lib/ui/client/view/client_view.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -11,9 +16,9 @@ import 'package:invoiceninja_flutter/ui/client/view/client_view_activity.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_details.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_documents.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_ledger.dart'; +import 'package:invoiceninja_flutter/ui/client/view/client_view_overview.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_system_logs.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_vm.dart'; -import 'package:invoiceninja_flutter/ui/client/view/client_view_overview.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class ClientView extends StatefulWidget { diff --git a/lib/ui/client/view/client_view_activity.dart b/lib/ui/client/view/client_view_activity.dart index 6b59fc493..4e7c6c513 100644 --- a/lib/ui/client/view/client_view_activity.dart +++ b/lib/ui/client/view/client_view_activity.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/lists/activity_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; diff --git a/lib/ui/client/view/client_view_details.dart b/lib/ui/client/view/client_view_details.dart index 4c5903233..154a443b1 100644 --- a/lib/ui/client/view/client_view_details.dart +++ b/lib/ui/client/view/client_view_details.dart @@ -1,8 +1,15 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/lists/app_list_tile.dart'; @@ -10,7 +17,6 @@ import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:url_launcher/url_launcher.dart'; class ClientViewDetails extends StatefulWidget { const ClientViewDetails({this.client}); diff --git a/lib/ui/client/view/client_view_documents.dart b/lib/ui/client/view/client_view_documents.dart index 5e5cfde52..278feee23 100644 --- a/lib/ui/client/view/client_view_documents.dart +++ b/lib/ui/client/view/client_view_documents.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/document_grid.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_vm.dart'; diff --git a/lib/ui/client/view/client_view_ledger.dart b/lib/ui/client/view/client_view_ledger.dart index 9db896eb0..0d7d73027 100644 --- a/lib/ui/client/view/client_view_ledger.dart +++ b/lib/ui/client/view/client_view_ledger.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/client/view/client_view_overview.dart b/lib/ui/client/view/client_view_overview.dart index 5383f5abc..7d19d1a77 100644 --- a/lib/ui/client/view/client_view_overview.dart +++ b/lib/ui/client/view/client_view_overview.dart @@ -1,4 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; @@ -21,9 +27,8 @@ import 'package:invoiceninja_flutter/ui/app/icon_message.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_vm.dart'; -import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/extensions.dart'; -import 'package:url_launcher/url_launcher.dart'; +import 'package:invoiceninja_flutter/utils/formatting.dart'; class ClientOverview extends StatelessWidget { const ClientOverview({ diff --git a/lib/ui/client/view/client_view_system_logs.dart b/lib/ui/client/view/client_view_system_logs.dart index b86d61662..05a9bcf72 100644 --- a/lib/ui/client/view/client_view_system_logs.dart +++ b/lib/ui/client/view/client_view_system_logs.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; import 'package:invoiceninja_flutter/ui/app/system_log_viewer.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_vm.dart'; diff --git a/lib/ui/client/view/client_view_vm.dart b/lib/ui/client/view/client_view_vm.dart index 32b01f05b..454432f04 100644 --- a/lib/ui/client/view/client_view_vm.dart +++ b/lib/ui/client/view/client_view_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -14,7 +21,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class ClientViewScreen extends StatelessWidget { const ClientViewScreen({ diff --git a/lib/ui/company_gateway/company_gateway_list.dart b/lib/ui/company_gateway/company_gateway_list.dart index fb72287cf..d7547f63f 100644 --- a/lib/ui/company_gateway/company_gateway_list.dart +++ b/lib/ui/company_gateway/company_gateway_list.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; diff --git a/lib/ui/company_gateway/company_gateway_list_item.dart b/lib/ui/company_gateway/company_gateway_list_item.dart index aad630f93..90e82911b 100644 --- a/lib/ui/company_gateway/company_gateway_list_item.dart +++ b/lib/ui/company_gateway/company_gateway_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/company_gateway/company_gateway_list_vm.dart b/lib/ui/company_gateway/company_gateway_list_vm.dart index 68f30cd02..c4af24592 100644 --- a/lib/ui/company_gateway/company_gateway_list_vm.dart +++ b/lib/ui/company_gateway/company_gateway_list_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter/material.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_selectors.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/company_gateway/company_gateway_list.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actions.dart'; +import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_selectors.dart'; +import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; +import 'package:invoiceninja_flutter/ui/company_gateway/company_gateway_list.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class CompanyGatewayListBuilder extends StatelessWidget { const CompanyGatewayListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/company_gateway/company_gateway_screen.dart b/lib/ui/company_gateway/company_gateway_screen.dart index 38f689c45..6131a8d3a 100644 --- a/lib/ui/company_gateway/company_gateway_screen.dart +++ b/lib/ui/company_gateway/company_gateway_screen.dart @@ -1,7 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -10,13 +16,12 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; +import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/forms/save_cancel_buttons.dart'; import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; -import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/ui/company_gateway/company_gateway_list_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; - import 'company_gateway_screen_vm.dart'; class CompanyGatewayScreen extends StatelessWidget { diff --git a/lib/ui/company_gateway/company_gateway_screen_vm.dart b/lib/ui/company_gateway/company_gateway_screen_vm.dart index 599a55852..fa2b513ab 100644 --- a/lib/ui/company_gateway/company_gateway_screen_vm.dart +++ b/lib/ui/company_gateway/company_gateway_screen_vm.dart @@ -1,8 +1,14 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -13,8 +19,6 @@ import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_selec import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; - import 'company_gateway_screen.dart'; class CompanyGatewayScreenBuilder extends StatelessWidget { diff --git a/lib/ui/company_gateway/edit/company_gateway_edit.dart b/lib/ui/company_gateway/edit/company_gateway_edit.dart index 84f3a6ce8..ada771f13 100644 --- a/lib/ui/company_gateway/edit/company_gateway_edit.dart +++ b/lib/ui/company_gateway/edit/company_gateway_edit.dart @@ -1,11 +1,19 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; @@ -18,14 +26,11 @@ import 'package:invoiceninja_flutter/ui/app/icon_text.dart'; import 'package:invoiceninja_flutter/ui/app/invoice/tax_rate_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/company_gateway/edit/company_gateway_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:url_launcher/url_launcher.dart'; class CompanyGatewayEdit extends StatefulWidget { const CompanyGatewayEdit({ diff --git a/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart b/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart index d662c439a..90bcf5c5e 100644 --- a/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart +++ b/lib/ui/company_gateway/edit/company_gateway_edit_vm.dart @@ -1,26 +1,33 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/company_gateway/edit/company_gateway_edit.dart'; +import 'package:invoiceninja_flutter/ui/company_gateway/view/company_gateway_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/company_gateway/view/company_gateway_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actions.dart'; -import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; -import 'package:invoiceninja_flutter/ui/company_gateway/edit/company_gateway_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:url_launcher/url_launcher.dart'; class CompanyGatewayEditScreen extends StatelessWidget { const CompanyGatewayEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/company_gateway/view/company_gateway_view.dart b/lib/ui/company_gateway/view/company_gateway_view.dart index c8e8f1268..781e462b1 100644 --- a/lib/ui/company_gateway/view/company_gateway_view.dart +++ b/lib/ui/company_gateway/view/company_gateway_view.dart @@ -1,8 +1,14 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_selectors.dart'; @@ -19,7 +25,6 @@ import 'package:invoiceninja_flutter/ui/company_gateway/view/company_gateway_vie import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class CompanyGatewayView extends StatefulWidget { const CompanyGatewayView({ diff --git a/lib/ui/company_gateway/view/company_gateway_view_vm.dart b/lib/ui/company_gateway/view/company_gateway_view_vm.dart index f69a7ca93..9beec8b91 100644 --- a/lib/ui/company_gateway/view/company_gateway_view_vm.dart +++ b/lib/ui/company_gateway/view/company_gateway_view_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/ui/company_gateway/company_gateway_screen.dart'; +import 'package:invoiceninja_flutter/ui/company_gateway/view/company_gateway_view.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_actions.dart'; -import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/company_gateway/view/company_gateway_view.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CompanyGatewayViewScreen extends StatelessWidget { const CompanyGatewayViewScreen({ diff --git a/lib/ui/credit/credit_email_vm.dart b/lib/ui/credit/credit_email_vm.dart index a8778848b..1a601bbdb 100644 --- a/lib/ui/credit/credit_email_vm.dart +++ b/lib/ui/credit/credit_email_vm.dart @@ -1,7 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/ui/app/invoice/invoice_email_view.dart'; @@ -9,9 +17,6 @@ import 'package:invoiceninja_flutter/ui/invoice/invoice_email_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CreditEmailScreen extends StatelessWidget { const CreditEmailScreen({Key key}) : super(key: key); diff --git a/lib/ui/credit/credit_list_item.dart b/lib/ui/credit/credit_list_item.dart index e0eb9c898..b06653b4c 100644 --- a/lib/ui/credit/credit_list_item.dart +++ b/lib/ui/credit/credit_list_item.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/colors.dart'; import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart'; +import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class CreditListItem extends StatelessWidget { diff --git a/lib/ui/credit/credit_list_vm.dart b/lib/ui/credit/credit_list_vm.dart index fd9a0c014..28fecc088 100644 --- a/lib/ui/credit/credit_list_vm.dart +++ b/lib/ui/credit/credit_list_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_selectors.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/credit/credit_list_item.dart'; import 'package:invoiceninja_flutter/ui/credit/credit_presenter.dart'; import 'package:invoiceninja_flutter/ui/invoice/invoice_list_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CreditListBuilder extends StatelessWidget { const CreditListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/credit/credit_pdf_vm.dart b/lib/ui/credit/credit_pdf_vm.dart index bdcae98c5..444111578 100644 --- a/lib/ui/credit/credit_pdf_vm.dart +++ b/lib/ui/credit/credit_pdf_vm.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; class CreditPdfScreen extends StatelessWidget { const CreditPdfScreen({Key key, this.showAppBar = true}) : super(key: key); diff --git a/lib/ui/credit/credit_presenter.dart b/lib/ui/credit/credit_presenter.dart index fa4ecef13..6bb1ed8f2 100644 --- a/lib/ui/credit/credit_presenter.dart +++ b/lib/ui/credit/credit_presenter.dart @@ -1,7 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/credit_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/credit/credit_screen.dart b/lib/ui/credit/credit_screen.dart index 7045a7360..b8f6142f4 100644 --- a/lib/ui/credit/credit_screen.dart +++ b/lib/ui/credit/credit_screen.dart @@ -1,16 +1,20 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/credit/credit_list_vm.dart'; import 'package:invoiceninja_flutter/ui/credit/credit_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'credit_screen_vm.dart'; class CreditScreen extends StatelessWidget { diff --git a/lib/ui/credit/credit_screen_vm.dart b/lib/ui/credit/credit_screen_vm.dart index 0262acf0c..8024d3a9f 100644 --- a/lib/ui/credit/credit_screen_vm.dart +++ b/lib/ui/credit/credit_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_selectors.dart'; -import 'package:redux/redux.dart'; - import 'credit_screen.dart'; class CreditScreenBuilder extends StatelessWidget { diff --git a/lib/ui/credit/edit/credit_edit.dart b/lib/ui/credit/edit/credit_edit.dart index 00db3643c..a475fc7ad 100644 --- a/lib/ui/credit/edit/credit_edit.dart +++ b/lib/ui/credit/edit/credit_edit.dart @@ -1,16 +1,19 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_details_vm.dart'; +import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_items_vm.dart'; +import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_notes_vm.dart'; import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_pdf_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_contacts_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_footer.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_item_selector.dart'; -import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_details_vm.dart'; -import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_items_vm.dart'; -import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_notes_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class CreditEdit extends StatefulWidget { diff --git a/lib/ui/credit/edit/credit_edit_details_vm.dart b/lib/ui/credit/edit/credit_edit_details_vm.dart index a76e34b7c..7b26ad3f9 100644 --- a/lib/ui/credit/edit/credit_edit_details_vm.dart +++ b/lib/ui/credit/edit/credit_edit_details_vm.dart @@ -1,20 +1,26 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_desktop.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CreditEditDetailsScreen extends StatelessWidget { const CreditEditDetailsScreen({Key key, @required this.viewModel}) diff --git a/lib/ui/credit/edit/credit_edit_items_vm.dart b/lib/ui/credit/edit/credit_edit_items_vm.dart index 83467adec..cff49f649 100644 --- a/lib/ui/credit/edit/credit_edit_items_vm.dart +++ b/lib/ui/credit/edit/credit_edit_items_vm.dart @@ -1,14 +1,19 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items_desktop.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CreditEditItemsScreen extends StatelessWidget { const CreditEditItemsScreen({ diff --git a/lib/ui/credit/edit/credit_edit_notes_vm.dart b/lib/ui/credit/edit/credit_edit_notes_vm.dart index a4397966e..cbe75e511 100644 --- a/lib/ui/credit/edit/credit_edit_notes_vm.dart +++ b/lib/ui/credit/edit/credit_edit_notes_vm.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CreditEditNotesScreen extends StatelessWidget { const CreditEditNotesScreen({Key key}) : super(key: key); diff --git a/lib/ui/credit/edit/credit_edit_pdf_vm.dart b/lib/ui/credit/edit/credit_edit_pdf_vm.dart index 2df6204d5..5f715055b 100644 --- a/lib/ui/credit/edit/credit_edit_pdf_vm.dart +++ b/lib/ui/credit/edit/credit_edit_pdf_vm.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf_vm.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf_vm.dart'; class CreditEditPDFScreen extends StatelessWidget { const CreditEditPDFScreen({Key key}) : super(key: key); diff --git a/lib/ui/credit/edit/credit_edit_vm.dart b/lib/ui/credit/edit/credit_edit_vm.dart index 70af2d3f6..5753899d3 100644 --- a/lib/ui/credit/edit/credit_edit_vm.dart +++ b/lib/ui/credit/edit/credit_edit_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_selectors.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/credit/view/credit_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CreditEditScreen extends StatelessWidget { const CreditEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/credit/view/credit_view_vm.dart b/lib/ui/credit/view/credit_view_vm.dart index 4e62dcaea..7a0d489d0 100644 --- a/lib/ui/credit/view/credit_view_vm.dart +++ b/lib/ui/credit/view/credit_view_vm.dart @@ -1,21 +1,27 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; +import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class CreditViewScreen extends StatelessWidget { const CreditViewScreen({ diff --git a/lib/ui/dashboard/dashboard_activity.dart b/lib/ui/dashboard/dashboard_activity.dart index 9ba33af64..6a43ae203 100644 --- a/lib/ui/dashboard/dashboard_activity.dart +++ b/lib/ui/dashboard/dashboard_activity.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/lists/activity_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; diff --git a/lib/ui/dashboard/dashboard_chart.dart b/lib/ui/dashboard/dashboard_chart.dart index 190f94204..61b582ed6 100644 --- a/lib/ui/dashboard/dashboard_chart.dart +++ b/lib/ui/dashboard/dashboard_chart.dart @@ -1,9 +1,14 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:charts_flutter/flutter.dart' as charts; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_selectors.dart'; -import 'package:charts_flutter/flutter.dart' as charts; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/dashboard/dashboard_date_range_picker.dart b/lib/ui/dashboard/dashboard_date_range_picker.dart index ff847a53c..2a5665587 100644 --- a/lib/ui/dashboard/dashboard_date_range_picker.dart +++ b/lib/ui/dashboard/dashboard_date_range_picker.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; diff --git a/lib/ui/dashboard/dashboard_overview.dart b/lib/ui/dashboard/dashboard_overview.dart index d4957bf9c..6e37e44c4 100644 --- a/lib/ui/dashboard/dashboard_overview.dart +++ b/lib/ui/dashboard/dashboard_overview.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/dashboard/dashboard_screen_vm.dart'; class DashboardOverview extends StatelessWidget { diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index 176527913..a85034d94 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -1,9 +1,18 @@ +// Dart imports: import 'dart:math'; -import 'package:charts_common/common.dart'; -import 'package:charts_flutter/flutter.dart' as charts; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:charts_common/common.dart'; +import 'package:charts_flutter/flutter.dart' as charts; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/company/company_selectors.dart'; @@ -16,8 +25,6 @@ import 'package:invoiceninja_flutter/ui/dashboard/dashboard_screen_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class DashboardPanels extends StatelessWidget { const DashboardPanels({ diff --git a/lib/ui/dashboard/dashboard_screen.dart b/lib/ui/dashboard/dashboard_screen.dart index c68412437..0eb0e3da5 100644 --- a/lib/ui/dashboard/dashboard_screen.dart +++ b/lib/ui/dashboard/dashboard_screen.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -8,8 +13,8 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/ui/app/app_border.dart'; import 'package:invoiceninja_flutter/ui/app/history_drawer_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/menu_drawer_vm.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/menu_drawer_vm.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/dashboard/dashboard_activity.dart'; import 'package:invoiceninja_flutter/ui/dashboard/dashboard_panels.dart'; diff --git a/lib/ui/dashboard/dashboard_screen_vm.dart b/lib/ui/dashboard/dashboard_screen_vm.dart index 3e3b16a9e..306c3da6f 100644 --- a/lib/ui/dashboard/dashboard_screen_vm.dart +++ b/lib/ui/dashboard/dashboard_screen_vm.dart @@ -1,23 +1,29 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/static/currency_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_selectors.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; +import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; import 'package:invoiceninja_flutter/ui/app/confirm_email_vm.dart'; import 'package:invoiceninja_flutter/ui/dashboard/dashboard_screen.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/dashboard/dashboard_state.dart'; class DashboardScreenBuilder extends StatelessWidget { const DashboardScreenBuilder({Key key}) : super(key: key); diff --git a/lib/ui/dashboard/dashboard_sidebar.dart b/lib/ui/dashboard/dashboard_sidebar.dart index de812a6b6..e620dc366 100644 --- a/lib/ui/dashboard/dashboard_sidebar.dart +++ b/lib/ui/dashboard/dashboard_sidebar.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/dashboard/dashboard_system_logs.dart b/lib/ui/dashboard/dashboard_system_logs.dart index 9c1553a52..932722123 100644 --- a/lib/ui/dashboard/dashboard_system_logs.dart +++ b/lib/ui/dashboard/dashboard_system_logs.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/system_log_viewer.dart'; import 'package:invoiceninja_flutter/ui/dashboard/dashboard_screen_vm.dart'; diff --git a/lib/ui/design/design_list_item.dart b/lib/ui/design/design_list_item.dart index 7c3bec969..12a00099e 100644 --- a/lib/ui/design/design_list_item.dart +++ b/lib/ui/design/design_list_item.dart @@ -1,13 +1,18 @@ -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/data/models/design_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; -import 'package:invoiceninja_flutter/utils/formatting.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/design_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; +import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; +import 'package:invoiceninja_flutter/utils/formatting.dart'; class DesignListItem extends StatelessWidget { const DesignListItem({ diff --git a/lib/ui/design/design_list_vm.dart b/lib/ui/design/design_list_vm.dart index b2edb273e..b49bdb3a5 100644 --- a/lib/ui/design/design_list_vm.dart +++ b/lib/ui/design/design_list_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/design_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; +import 'package:invoiceninja_flutter/redux/design/design_selectors.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/design/design_list_item.dart'; import 'package:invoiceninja_flutter/ui/design/design_presenter.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/design/design_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; class DesignListBuilder extends StatelessWidget { const DesignListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/design/design_presenter.dart b/lib/ui/design/design_presenter.dart index 966fbf40d..db6d5406d 100644 --- a/lib/ui/design/design_presenter.dart +++ b/lib/ui/design/design_presenter.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/design/design_screen.dart b/lib/ui/design/design_screen.dart index 0f6c9a40a..5ca2a7b3d 100644 --- a/lib/ui/design/design_screen.dart +++ b/lib/ui/design/design_screen.dart @@ -1,13 +1,18 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/design/design_list_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'design_screen_vm.dart'; diff --git a/lib/ui/design/design_screen_vm.dart b/lib/ui/design/design_screen_vm.dart index 0514ab3f9..6e490446f 100644 --- a/lib/ui/design/design_screen_vm.dart +++ b/lib/ui/design/design_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; import 'package:invoiceninja_flutter/redux/design/design_selectors.dart'; -import 'package:redux/redux.dart'; - import 'design_screen.dart'; class DesignScreenBuilder extends StatelessWidget { diff --git a/lib/ui/design/edit/design_edit.dart b/lib/ui/design/edit/design_edit.dart index 03d5d6ce7..6e9390746 100644 --- a/lib/ui/design/edit/design_edit.dart +++ b/lib/ui/design/edit/design_edit.dart @@ -1,10 +1,21 @@ +// Dart imports: import 'dart:convert'; import 'dart:typed_data'; import 'dart:ui'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:native_pdf_renderer/native_pdf_renderer.dart'; +import 'package:native_pdf_view/native_pdf_view.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/design_model.dart'; import 'package:invoiceninja_flutter/ui/app/app_webview.dart'; @@ -18,16 +29,13 @@ import 'package:invoiceninja_flutter/ui/app/icon_text.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/app/variables.dart'; import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/designs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:native_pdf_view/native_pdf_view.dart'; -import 'package:native_pdf_renderer/native_pdf_renderer.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; -import 'package:url_launcher/url_launcher.dart'; class DesignEdit extends StatefulWidget { const DesignEdit({ diff --git a/lib/ui/design/edit/design_edit_vm.dart b/lib/ui/design/edit/design_edit_vm.dart index 9d98ecc4e..3fa0c587f 100644 --- a/lib/ui/design/edit/design_edit_vm.dart +++ b/lib/ui/design/edit/design_edit_vm.dart @@ -1,17 +1,22 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/design_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/design/edit/design_edit.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; -import 'package:invoiceninja_flutter/data/models/design_model.dart'; -import 'package:invoiceninja_flutter/ui/design/edit/design_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class DesignEditScreen extends StatelessWidget { const DesignEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/design/view/design_view.dart b/lib/ui/design/view/design_view.dart index 74c63b674..5e2deea08 100644 --- a/lib/ui/design/view/design_view.dart +++ b/lib/ui/design/view/design_view.dart @@ -1,5 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:timeago/timeago.dart' as timeago; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_selectors.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart'; @@ -13,7 +19,6 @@ import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; import 'package:invoiceninja_flutter/ui/design/view/design_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:timeago/timeago.dart' as timeago; class DesignView extends StatefulWidget { const DesignView({ diff --git a/lib/ui/design/view/design_view_vm.dart b/lib/ui/design/view/design_view_vm.dart index 9c1a10468..e67bd65b8 100644 --- a/lib/ui/design/view/design_view_vm.dart +++ b/lib/ui/design/view/design_view_vm.dart @@ -1,19 +1,26 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/ui/design/design_screen.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/design_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/design/view/design_view.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/design/design_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/design/design_screen.dart'; +import 'package:invoiceninja_flutter/ui/design/view/design_view.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class DesignViewScreen extends StatelessWidget { const DesignViewScreen({ diff --git a/lib/ui/document/document_list_item.dart b/lib/ui/document/document_list_item.dart index afa5aa982..8e45a96e2 100644 --- a/lib/ui/document/document_list_item.dart +++ b/lib/ui/document/document_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/document/document_list_vm.dart b/lib/ui/document/document_list_vm.dart index fdf8ad3a5..7287fd01c 100644 --- a/lib/ui/document/document_list_vm.dart +++ b/lib/ui/document/document_list_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -15,7 +22,6 @@ import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/document/document_list_item.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class DocumentListBuilder extends StatelessWidget { const DocumentListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/document/document_screen.dart b/lib/ui/document/document_screen.dart index 9a66105dd..7143f158f 100644 --- a/lib/ui/document/document_screen.dart +++ b/lib/ui/document/document_screen.dart @@ -1,15 +1,19 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/document/document_list_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'document_screen_vm.dart'; class DocumentScreen extends StatelessWidget { diff --git a/lib/ui/document/document_screen_vm.dart b/lib/ui/document/document_screen_vm.dart index 8bdcb6171..93bef7a52 100644 --- a/lib/ui/document/document_screen_vm.dart +++ b/lib/ui/document/document_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/document/document_selectors.dart'; -import 'package:redux/redux.dart'; - import 'document_screen.dart'; class DocumentScreenBuilder extends StatelessWidget { diff --git a/lib/ui/document/edit/document_edit.dart b/lib/ui/document/edit/document_edit.dart index 01840274d..6083b7813 100644 --- a/lib/ui/document/edit/document_edit.dart +++ b/lib/ui/document/edit/document_edit.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; diff --git a/lib/ui/document/edit/document_edit_vm.dart b/lib/ui/document/edit/document_edit_vm.dart index c4e8f696d..63a16c0e6 100644 --- a/lib/ui/document/edit/document_edit_vm.dart +++ b/lib/ui/document/edit/document_edit_vm.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/document_model.dart'; -import 'package:invoiceninja_flutter/ui/document/edit/document_edit.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; +import 'package:invoiceninja_flutter/ui/document/edit/document_edit.dart'; class DocumentEditScreen extends StatelessWidget { const DocumentEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/document/view/document_view.dart b/lib/ui/document/view/document_view.dart index fd675ce5d..c8a79bbdc 100644 --- a/lib/ui/document/view/document_view.dart +++ b/lib/ui/document/view/document_view.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; import 'package:invoiceninja_flutter/ui/document/view/document_view_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; class DocumentView extends StatefulWidget { const DocumentView({ diff --git a/lib/ui/document/view/document_view_vm.dart b/lib/ui/document/view/document_view_vm.dart index b62303591..7a09a6812 100644 --- a/lib/ui/document/view/document_view_vm.dart +++ b/lib/ui/document/view/document_view_vm.dart @@ -1,8 +1,15 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/document_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -11,7 +18,6 @@ import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; import 'package:invoiceninja_flutter/ui/document/view/document_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class DocumentViewScreen extends StatelessWidget { const DocumentViewScreen({ diff --git a/lib/ui/expense/edit/expense_edit.dart b/lib/ui/expense/edit/expense_edit.dart index fd7f5108e..7983b72a8 100644 --- a/lib/ui/expense/edit/expense_edit.dart +++ b/lib/ui/expense/edit/expense_edit.dart @@ -1,18 +1,23 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/app_border.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_desktop.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_details.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_notes.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_settings.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/expense/edit/expense_edit_desktop.dart b/lib/ui/expense/edit/expense_edit_desktop.dart index 0d0c59178..39211f46b 100644 --- a/lib/ui/expense/edit/expense_edit_desktop.dart +++ b/lib/ui/expense/edit/expense_edit_desktop.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_details.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_notes.dart'; diff --git a/lib/ui/expense/edit/expense_edit_details.dart b/lib/ui/expense/edit/expense_edit_details.dart index 2296693b1..e01dfccec 100644 --- a/lib/ui/expense/edit/expense_edit_details.dart +++ b/lib/ui/expense/edit/expense_edit_details.dart @@ -1,10 +1,20 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; +import 'package:invoiceninja_flutter/redux/company/company_selectors.dart'; +import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart'; @@ -19,11 +29,6 @@ import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; -import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_selectors.dart'; -import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; -import 'package:invoiceninja_flutter/redux/company/company_selectors.dart'; class ExpenseEditDetails extends StatefulWidget { const ExpenseEditDetails({ diff --git a/lib/ui/expense/edit/expense_edit_notes.dart b/lib/ui/expense/edit/expense_edit_notes.dart index d82177d6d..66affb15b 100644 --- a/lib/ui/expense/edit/expense_edit_notes.dart +++ b/lib/ui/expense/edit/expense_edit_notes.dart @@ -1,13 +1,16 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; class ExpenseEditNotes extends StatefulWidget { const ExpenseEditNotes({ diff --git a/lib/ui/expense/edit/expense_edit_settings.dart b/lib/ui/expense/edit/expense_edit_settings.dart index c788ab821..abb71215f 100644 --- a/lib/ui/expense/edit/expense_edit_settings.dart +++ b/lib/ui/expense/edit/expense_edit_settings.dart @@ -1,11 +1,18 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/static/currency_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; +import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; @@ -14,8 +21,6 @@ import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; -import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/utils/money.dart'; class ExpenseEditSettings extends StatefulWidget { diff --git a/lib/ui/expense/edit/expense_edit_vm.dart b/lib/ui/expense/edit/expense_edit_vm.dart index 9d616dc7f..919171148 100644 --- a/lib/ui/expense/edit/expense_edit_vm.dart +++ b/lib/ui/expense/edit/expense_edit_vm.dart @@ -1,20 +1,27 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/expense_model.dart'; -import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit.dart'; +import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; class ExpenseEditScreen extends StatelessWidget { const ExpenseEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/expense/expense_list_item.dart b/lib/ui/expense/expense_list_item.dart index 45868b0df..9fa8fc9e4 100644 --- a/lib/ui/expense/expense_list_item.dart +++ b/lib/ui/expense/expense_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/expense/expense_list_vm.dart b/lib/ui/expense/expense_list_vm.dart index ee5e7beba..708ab2b69 100644 --- a/lib/ui/expense/expense_list_vm.dart +++ b/lib/ui/expense/expense_list_vm.dart @@ -1,9 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -15,7 +23,6 @@ import 'package:invoiceninja_flutter/ui/expense/expense_list_item.dart'; import 'package:invoiceninja_flutter/ui/expense/expense_presenter.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class ExpenseListBuilder extends StatelessWidget { const ExpenseListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/expense/expense_presenter.dart b/lib/ui/expense/expense_presenter.dart index c8dbb7024..b69119ce2 100644 --- a/lib/ui/expense/expense_presenter.dart +++ b/lib/ui/expense/expense_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; diff --git a/lib/ui/expense/expense_screen.dart b/lib/ui/expense/expense_screen.dart index 879f113cb..2010b28be 100644 --- a/lib/ui/expense/expense_screen.dart +++ b/lib/ui/expense/expense_screen.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/expense/expense_list_vm.dart'; import 'package:invoiceninja_flutter/ui/expense/expense_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'expense_screen_vm.dart'; class ExpenseScreen extends StatelessWidget { diff --git a/lib/ui/expense/expense_screen_vm.dart b/lib/ui/expense/expense_screen_vm.dart index 2fb808271..8f7228f43 100644 --- a/lib/ui/expense/expense_screen_vm.dart +++ b/lib/ui/expense/expense_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_selectors.dart'; -import 'package:redux/redux.dart'; - import 'expense_screen.dart'; class ExpenseScreenBuilder extends StatelessWidget { diff --git a/lib/ui/expense/view/expense_view.dart b/lib/ui/expense/view/expense_view.dart index fa78fe106..10e6f09bc 100644 --- a/lib/ui/expense/view/expense_view.dart +++ b/lib/ui/expense/view/expense_view.dart @@ -1,22 +1,27 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:http/http.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:http/http.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:permission_handler/permission_handler.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart'; import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/bottom_buttons.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view_documents.dart'; +import 'package:invoiceninja_flutter/ui/expense/view/expense_view_overview.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view_schedule.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; -import 'package:invoiceninja_flutter/ui/expense/view/expense_view_overview.dart'; import 'package:invoiceninja_flutter/utils/files.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:permission_handler/permission_handler.dart'; class ExpenseView extends StatefulWidget { const ExpenseView({ diff --git a/lib/ui/expense/view/expense_view_documents.dart b/lib/ui/expense/view/expense_view_documents.dart index 62b732eab..62f2f0b43 100644 --- a/lib/ui/expense/view/expense_view_documents.dart +++ b/lib/ui/expense/view/expense_view_documents.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/document_grid.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; diff --git a/lib/ui/expense/view/expense_view_overview.dart b/lib/ui/expense/view/expense_view_overview.dart index 687168bc9..5e3cd867b 100644 --- a/lib/ui/expense/view/expense_view_overview.dart +++ b/lib/ui/expense/view/expense_view_overview.dart @@ -1,3 +1,7 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/colors.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; @@ -5,12 +9,11 @@ import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_s import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; +import 'package:invoiceninja_flutter/ui/app/icon_message.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/ui/app/icon_message.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class ExpenseOverview extends StatelessWidget { diff --git a/lib/ui/expense/view/expense_view_schedule.dart b/lib/ui/expense/view/expense_view_schedule.dart index ec2503ded..57d8ca4ea 100644 --- a/lib/ui/expense/view/expense_view_schedule.dart +++ b/lib/ui/expense/view/expense_view_schedule.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; diff --git a/lib/ui/expense/view/expense_view_vm.dart b/lib/ui/expense/view/expense_view_vm.dart index 4c07925db..fd4398b68 100644 --- a/lib/ui/expense/view/expense_view_vm.dart +++ b/lib/ui/expense/view/expense_view_vm.dart @@ -1,13 +1,20 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/expense_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; @@ -16,7 +23,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class ExpenseViewScreen extends StatelessWidget { const ExpenseViewScreen({ diff --git a/lib/ui/expense_category/edit/expense_category_edit.dart b/lib/ui/expense_category/edit/expense_category_edit.dart index 07afb17d5..9080b2cc7 100644 --- a/lib/ui/expense_category/edit/expense_category_edit.dart +++ b/lib/ui/expense_category/edit/expense_category_edit.dart @@ -1,13 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/color_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/expense_category/edit/expense_category_edit_vm.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class ExpenseCategoryEdit extends StatefulWidget { const ExpenseCategoryEdit({ diff --git a/lib/ui/expense_category/edit/expense_category_edit_vm.dart b/lib/ui/expense_category/edit/expense_category_edit_vm.dart index fda5db792..2fef240d3 100644 --- a/lib/ui/expense_category/edit/expense_category_edit_vm.dart +++ b/lib/ui/expense_category/edit/expense_category_edit_vm.dart @@ -1,20 +1,27 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/edit/expense_category_edit.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/edit/expense_category_edit.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; class ExpenseCategoryEditScreen extends StatelessWidget { const ExpenseCategoryEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/expense_category/expense_category_list_item.dart b/lib/ui/expense_category/expense_category_list_item.dart index 258a84518..9525f616c 100644 --- a/lib/ui/expense_category/expense_category_list_item.dart +++ b/lib/ui/expense_category/expense_category_list_item.dart @@ -1,12 +1,17 @@ -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; -import 'package:invoiceninja_flutter/utils/formatting.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; +import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; +import 'package:invoiceninja_flutter/utils/formatting.dart'; class ExpenseCategoryListItem extends StatelessWidget { const ExpenseCategoryListItem({ diff --git a/lib/ui/expense_category/expense_category_list_vm.dart b/lib/ui/expense_category/expense_category_list_vm.dart index d72adcb7b..3bab72783 100644 --- a/lib/ui/expense_category/expense_category_list_vm.dart +++ b/lib/ui/expense_category/expense_category_list_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_selectors.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/expense_category/expense_category_list_item.dart'; import 'package:invoiceninja_flutter/ui/expense_category/expense_category_presenter.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; class ExpenseCategoryListBuilder extends StatelessWidget { const ExpenseCategoryListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/expense_category/expense_category_presenter.dart b/lib/ui/expense_category/expense_category_presenter.dart index aa854c116..8f105a2eb 100644 --- a/lib/ui/expense_category/expense_category_presenter.dart +++ b/lib/ui/expense_category/expense_category_presenter.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/expense_category/expense_category_screen.dart b/lib/ui/expense_category/expense_category_screen.dart index 5ea88f89a..3d406674b 100644 --- a/lib/ui/expense_category/expense_category_screen.dart +++ b/lib/ui/expense_category/expense_category_screen.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/expense_category/expense_category_list_vm.dart'; import 'package:invoiceninja_flutter/ui/expense_category/expense_category_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'expense_category_screen_vm.dart'; class ExpenseCategoryScreen extends StatelessWidget { diff --git a/lib/ui/expense_category/expense_category_screen_vm.dart b/lib/ui/expense_category/expense_category_screen_vm.dart index bb1f28fd1..455f66770 100644 --- a/lib/ui/expense_category/expense_category_screen_vm.dart +++ b/lib/ui/expense_category/expense_category_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; import 'package:invoiceninja_flutter/redux/expense_category/expense_category_selectors.dart'; -import 'package:redux/redux.dart'; - import 'expense_category_screen.dart'; class ExpenseCategoryScreenBuilder extends StatelessWidget { diff --git a/lib/ui/expense_category/view/expense_category_view.dart b/lib/ui/expense_category/view/expense_category_view.dart index a2e712b48..4813ef291 100644 --- a/lib/ui/expense_category/view/expense_category_view.dart +++ b/lib/ui/expense_category/view/expense_category_view.dart @@ -1,13 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/expense_category/expense_category_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view_vm.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/expense_category/view/expense_category_view_vm.dart b/lib/ui/expense_category/view/expense_category_view_vm.dart index f4a667391..1de0643fb 100644 --- a/lib/ui/expense_category/view/expense_category_view_vm.dart +++ b/lib/ui/expense_category/view/expense_category_view_vm.dart @@ -1,18 +1,25 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/expense_category/expense_category_screen.dart'; +import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/expense_category/view/expense_category_view.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ExpenseCategoryViewScreen extends StatelessWidget { const ExpenseCategoryViewScreen({ diff --git a/lib/ui/group/edit/group_edit.dart b/lib/ui/group/edit/group_edit.dart index f1bde7f8b..c82019a55 100644 --- a/lib/ui/group/edit/group_edit.dart +++ b/lib/ui/group/edit/group_edit.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; diff --git a/lib/ui/group/edit/group_edit_vm.dart b/lib/ui/group/edit/group_edit_vm.dart index ea6336742..af91972df 100644 --- a/lib/ui/group/edit/group_edit_vm.dart +++ b/lib/ui/group/edit/group_edit_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; -import 'package:invoiceninja_flutter/ui/group/edit/group_edit.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/group/edit/group_edit.dart'; +import 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; class GroupEditScreen extends StatelessWidget { const GroupEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/group/group_list_item.dart b/lib/ui/group/group_list_item.dart index 002a3a189..1aac5e855 100644 --- a/lib/ui/group/group_list_item.dart +++ b/lib/ui/group/group_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/group/group_list_vm.dart b/lib/ui/group/group_list_vm.dart index 210b73703..457dd4143 100644 --- a/lib/ui/group/group_list_vm.dart +++ b/lib/ui/group/group_list_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -16,7 +23,6 @@ import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/group/group_list_item.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class GroupListBuilder extends StatelessWidget { const GroupListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/group/group_screen.dart b/lib/ui/group/group_screen.dart index b74406c7d..39c792a38 100644 --- a/lib/ui/group/group_screen.dart +++ b/lib/ui/group/group_screen.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -7,11 +12,10 @@ import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/group/group_list_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'group_screen_vm.dart'; class GroupSettingsScreen extends StatelessWidget { diff --git a/lib/ui/group/group_screen_vm.dart b/lib/ui/group/group_screen_vm.dart index 69ced345f..c8adedff7 100644 --- a/lib/ui/group/group_screen_vm.dart +++ b/lib/ui/group/group_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/group/group_selectors.dart'; -import 'package:redux/redux.dart'; - import 'group_screen.dart'; class GroupScreenBuilder extends StatelessWidget { diff --git a/lib/ui/group/view/group_view.dart b/lib/ui/group/view/group_view.dart index 7b16e2271..abcd5a68b 100644 --- a/lib/ui/group/view/group_view.dart +++ b/lib/ui/group/view/group_view.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/group/view/group_view_vm.dart b/lib/ui/group/view/group_view_vm.dart index 3be2d7b29..8b03b5467 100644 --- a/lib/ui/group/view/group_view_vm.dart +++ b/lib/ui/group/view/group_view_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -18,7 +25,6 @@ import 'package:invoiceninja_flutter/ui/group/group_screen.dart'; import 'package:invoiceninja_flutter/ui/group/view/group_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class GroupViewScreen extends StatelessWidget { const GroupViewScreen({ diff --git a/lib/ui/invoice/edit/invoice_edit.dart b/lib/ui/invoice/edit/invoice_edit.dart index 578178686..42bde8b4c 100644 --- a/lib/ui/invoice/edit/invoice_edit.dart +++ b/lib/ui/invoice/edit/invoice_edit.dart @@ -1,8 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_contacts_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_footer.dart'; @@ -11,7 +15,6 @@ import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes_vm.dart' import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_item_selector.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/invoice/edit/invoice_edit_contacts.dart b/lib/ui/invoice/edit/invoice_edit_contacts.dart index 97cabac2c..069ac4bac 100644 --- a/lib/ui/invoice/edit/invoice_edit_contacts.dart +++ b/lib/ui/invoice/edit/invoice_edit_contacts.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart'; diff --git a/lib/ui/invoice/edit/invoice_edit_contacts_vm.dart b/lib/ui/invoice/edit/invoice_edit_contacts_vm.dart index e4bb4d356..ebb6362c7 100644 --- a/lib/ui/invoice/edit/invoice_edit_contacts_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_contacts_vm.dart @@ -1,14 +1,19 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_contacts.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class InvoiceEditContactsScreen extends StatelessWidget { const InvoiceEditContactsScreen({Key key, @required this.entityType}) diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart index 366ca31e0..8db18035f 100644 --- a/lib/ui/invoice/edit/invoice_edit_desktop.dart +++ b/lib/ui/invoice/edit/invoice_edit_desktop.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:convert'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:native_pdf_view/native_pdf_view.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart'; +import 'package:invoiceninja_flutter/data/models/settings_model.dart'; +import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/app_scrollbar.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:native_pdf_view/native_pdf_view.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/web_client.dart'; -import 'package:invoiceninja_flutter/data/models/entities.dart'; -import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; -import 'package:invoiceninja_flutter/data/models/settings_model.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_tab_bar.dart'; diff --git a/lib/ui/invoice/edit/invoice_edit_details.dart b/lib/ui/invoice/edit/invoice_edit_details.dart index 4d6724c54..5d3b60677 100644 --- a/lib/ui/invoice/edit/invoice_edit_details.dart +++ b/lib/ui/invoice/edit/invoice_edit_details.dart @@ -1,23 +1,26 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/client_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart'; +import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/design_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/discount_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/user_picker.dart'; import 'package:invoiceninja_flutter/ui/app/invoice/tax_rate_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/entities.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; -import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class InvoiceEditDetails extends StatefulWidget { diff --git a/lib/ui/invoice/edit/invoice_edit_details_vm.dart b/lib/ui/invoice/edit/invoice_edit_details_vm.dart index 882ebeb33..03f9fd245 100644 --- a/lib/ui/invoice/edit/invoice_edit_details_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_details_vm.dart @@ -1,18 +1,24 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/app/screen_imports.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_desktop.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class InvoiceEditDetailsScreen extends StatelessWidget { const InvoiceEditDetailsScreen({Key key, @required this.viewModel}) diff --git a/lib/ui/invoice/edit/invoice_edit_footer.dart b/lib/ui/invoice/edit/invoice_edit_footer.dart index 5e24ddd29..482e42aa9 100644 --- a/lib/ui/invoice/edit/invoice_edit_footer.dart +++ b/lib/ui/invoice/edit/invoice_edit_footer.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; diff --git a/lib/ui/invoice/edit/invoice_edit_items.dart b/lib/ui/invoice/edit/invoice_edit_items.dart index 084cbbaff..d6c1b24df 100644 --- a/lib/ui/invoice/edit/invoice_edit_items.dart +++ b/lib/ui/invoice/edit/invoice_edit_items.dart @@ -1,3 +1,8 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart'; @@ -9,8 +14,6 @@ import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class InvoiceEditItems extends StatefulWidget { diff --git a/lib/ui/invoice/edit/invoice_edit_items_desktop.dart b/lib/ui/invoice/edit/invoice_edit_items_desktop.dart index 26db84178..ba2a31ed9 100644 --- a/lib/ui/invoice/edit/invoice_edit_items_desktop.dart +++ b/lib/ui/invoice/edit/invoice_edit_items_desktop.dart @@ -1,7 +1,13 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; @@ -20,7 +26,6 @@ import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class InvoiceEditItemsDesktop extends StatefulWidget { const InvoiceEditItemsDesktop({ diff --git a/lib/ui/invoice/edit/invoice_edit_items_vm.dart b/lib/ui/invoice/edit/invoice_edit_items_vm.dart index cd841dbad..1d358d987 100644 --- a/lib/ui/invoice/edit/invoice_edit_items_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_items_vm.dart @@ -1,13 +1,18 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items_desktop.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class InvoiceEditItemsScreen extends StatelessWidget { const InvoiceEditItemsScreen({ diff --git a/lib/ui/invoice/edit/invoice_edit_notes.dart b/lib/ui/invoice/edit/invoice_edit_notes.dart index b9bd63965..29d40910c 100644 --- a/lib/ui/invoice/edit/invoice_edit_notes.dart +++ b/lib/ui/invoice/edit/invoice_edit_notes.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; diff --git a/lib/ui/invoice/edit/invoice_edit_notes_vm.dart b/lib/ui/invoice/edit/invoice_edit_notes_vm.dart index 650610d18..7188e0147 100644 --- a/lib/ui/invoice/edit/invoice_edit_notes_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_notes_vm.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes.dart'; class InvoiceEditNotesScreen extends StatelessWidget { const InvoiceEditNotesScreen({Key key}) : super(key: key); diff --git a/lib/ui/invoice/edit/invoice_edit_pdf.dart b/lib/ui/invoice/edit/invoice_edit_pdf.dart index dc1ca5c35..9800a3438 100644 --- a/lib/ui/invoice/edit/invoice_edit_pdf.dart +++ b/lib/ui/invoice/edit/invoice_edit_pdf.dart @@ -1,16 +1,23 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:native_pdf_view/native_pdf_view.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart'; +import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf_vm.dart'; -import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; -import 'package:native_pdf_view/native_pdf_view.dart'; class InvoiceEditPDF extends StatefulWidget { const InvoiceEditPDF({ diff --git a/lib/ui/invoice/edit/invoice_edit_pdf_vm.dart b/lib/ui/invoice/edit/invoice_edit_pdf_vm.dart index cc9d1c7b0..2bcebafa3 100644 --- a/lib/ui/invoice/edit/invoice_edit_pdf_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_pdf_vm.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf.dart'; class InvoiceEditPDFScreen extends StatelessWidget { const InvoiceEditPDFScreen({Key key}) : super(key: key); diff --git a/lib/ui/invoice/edit/invoice_edit_vm.dart b/lib/ui/invoice/edit/invoice_edit_vm.dart index 461bb8c56..bdbfc3f76 100644 --- a/lib/ui/invoice/edit/invoice_edit_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class InvoiceEditScreen extends StatelessWidget { const InvoiceEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/invoice/edit/invoice_item_selector.dart b/lib/ui/invoice/edit/invoice_item_selector.dart index 48a99790f..bd0b129f1 100644 --- a/lib/ui/invoice/edit/invoice_item_selector.dart +++ b/lib/ui/invoice/edit/invoice_item_selector.dart @@ -1,17 +1,22 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/expense/expense_selectors.dart'; import 'package:invoiceninja_flutter/redux/product/product_selectors.dart'; import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; -import 'package:invoiceninja_flutter/redux/expense/expense_selectors.dart'; -import 'package:flutter/material.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_tab_bar.dart'; import 'package:invoiceninja_flutter/ui/app/responsive_padding.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/expense/expense_list_item.dart'; import 'package:invoiceninja_flutter/ui/product/product_list_item.dart'; -import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/ui/task/task_list_item.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/invoice/invoice_email_vm.dart b/lib/ui/invoice/invoice_email_vm.dart index e16551e83..2d68600f0 100644 --- a/lib/ui/invoice/invoice_email_vm.dart +++ b/lib/ui/invoice/invoice_email_vm.dart @@ -1,16 +1,21 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/ui/app/invoice/invoice_email_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class InvoiceEmailScreen extends StatelessWidget { const InvoiceEmailScreen({Key key}) : super(key: key); diff --git a/lib/ui/invoice/invoice_list_item.dart b/lib/ui/invoice/invoice_list_item.dart index 1c4bdaf7c..886cd4be0 100644 --- a/lib/ui/invoice/invoice_list_item.dart +++ b/lib/ui/invoice/invoice_list_item.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/colors.dart'; import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart'; +import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/invoice/invoice_list_vm.dart b/lib/ui/invoice/invoice_list_vm.dart index 1f3dfbd2f..9992bc3f0 100644 --- a/lib/ui/invoice/invoice_list_vm.dart +++ b/lib/ui/invoice/invoice_list_vm.dart @@ -1,9 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -14,7 +22,6 @@ import 'package:invoiceninja_flutter/ui/invoice/invoice_list_item.dart'; import 'package:invoiceninja_flutter/ui/invoice/invoice_presenter.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class InvoiceListBuilder extends StatelessWidget { const InvoiceListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/invoice/invoice_pdf.dart b/lib/ui/invoice/invoice_pdf.dart index bee7ee6d7..439184db9 100644 --- a/lib/ui/invoice/invoice_pdf.dart +++ b/lib/ui/invoice/invoice_pdf.dart @@ -1,13 +1,24 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:io' as file; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart' as http; -import 'package:flutter/material.dart'; import 'package:http/http.dart'; +import 'package:native_pdf_view/native_pdf_view.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:share/share.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; -import 'package:flutter/foundation.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -16,17 +27,14 @@ import 'package:invoiceninja_flutter/ui/app/buttons/app_text_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:native_pdf_view/native_pdf_view.dart'; -import 'package:path_provider/path_provider.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; -import 'package:share/share.dart'; -import 'package:url_launcher/url_launcher.dart'; class InvoicePdfView extends StatefulWidget { const InvoicePdfView({ diff --git a/lib/ui/invoice/invoice_pdf_vm.dart b/lib/ui/invoice/invoice_pdf_vm.dart index e11080d84..99bb4a502 100644 --- a/lib/ui/invoice/invoice_pdf_vm.dart +++ b/lib/ui/invoice/invoice_pdf_vm.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf.dart'; class InvoicePdfScreen extends StatelessWidget { const InvoicePdfScreen({Key key, this.showAppBar = true}) : super(key: key); diff --git a/lib/ui/invoice/invoice_presenter.dart b/lib/ui/invoice/invoice_presenter.dart index 32d766e60..087bc848f 100644 --- a/lib/ui/invoice/invoice_presenter.dart +++ b/lib/ui/invoice/invoice_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; diff --git a/lib/ui/invoice/invoice_screen.dart b/lib/ui/invoice/invoice_screen.dart index ff8652f70..65066eeb5 100644 --- a/lib/ui/invoice/invoice_screen.dart +++ b/lib/ui/invoice/invoice_screen.dart @@ -1,17 +1,21 @@ -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; -import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_presenter.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_list_vm.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; - +import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_list_vm.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_presenter.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; import 'invoice_screen_vm.dart'; class InvoiceScreen extends StatelessWidget { diff --git a/lib/ui/invoice/invoice_screen_vm.dart b/lib/ui/invoice/invoice_screen_vm.dart index 1404266dd..ae993b4b8 100644 --- a/lib/ui/invoice/invoice_screen_vm.dart +++ b/lib/ui/invoice/invoice_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart'; -import 'package:redux/redux.dart'; - import 'invoice_screen.dart'; class InvoiceScreenBuilder extends StatelessWidget { diff --git a/lib/ui/invoice/view/invoice_view.dart b/lib/ui/invoice/view/invoice_view.dart index 825e3c97d..e998d7e2f 100644 --- a/lib/ui/invoice/view/invoice_view.dart +++ b/lib/ui/invoice/view/invoice_view.dart @@ -1,6 +1,13 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; @@ -15,8 +22,6 @@ import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_overview.dart' import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_schedule.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class InvoiceView extends StatefulWidget { const InvoiceView({ diff --git a/lib/ui/invoice/view/invoice_view_activity.dart b/lib/ui/invoice/view/invoice_view_activity.dart index a44905920..cf4555d66 100644 --- a/lib/ui/invoice/view/invoice_view_activity.dart +++ b/lib/ui/invoice/view/invoice_view_activity.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/lists/activity_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; diff --git a/lib/ui/invoice/view/invoice_view_contacts.dart b/lib/ui/invoice/view/invoice_view_contacts.dart index e9244847c..453b8fd13 100644 --- a/lib/ui/invoice/view/invoice_view_contacts.dart +++ b/lib/ui/invoice/view/invoice_view_contacts.dart @@ -1,6 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -8,7 +14,6 @@ import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class InvoiceViewContacts extends StatelessWidget { const InvoiceViewContacts({Key key, @required this.viewModel}) diff --git a/lib/ui/invoice/view/invoice_view_documents.dart b/lib/ui/invoice/view/invoice_view_documents.dart index e2aa3efa9..4da7e0940 100644 --- a/lib/ui/invoice/view/invoice_view_documents.dart +++ b/lib/ui/invoice/view/invoice_view_documents.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/document_grid.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; diff --git a/lib/ui/invoice/view/invoice_view_history.dart b/lib/ui/invoice/view/invoice_view_history.dart index dc81d91b2..d62e93405 100644 --- a/lib/ui/invoice/view/invoice_view_history.dart +++ b/lib/ui/invoice/view/invoice_view_history.dart @@ -1,4 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:timeago/timeago.dart' as timeago; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; @@ -6,7 +12,6 @@ import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:timeago/timeago.dart' as timeago; class InvoiceViewHistory extends StatefulWidget { const InvoiceViewHistory({Key key, @required this.viewModel}) diff --git a/lib/ui/invoice/view/invoice_view_overview.dart b/lib/ui/invoice/view/invoice_view_overview.dart index fb49521f8..d6c9149c5 100644 --- a/lib/ui/invoice/view/invoice_view_overview.dart +++ b/lib/ui/invoice/view/invoice_view_overview.dart @@ -1,4 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/colors.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; @@ -12,14 +18,13 @@ import 'package:invoiceninja_flutter/redux/payment/payment_selectors.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_list_tile.dart'; -import 'package:invoiceninja_flutter/ui/app/invoice/invoice_item_view.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; +import 'package:invoiceninja_flutter/ui/app/icon_message.dart'; +import 'package:invoiceninja_flutter/ui/app/invoice/invoice_item_view.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/ui/app/icon_message.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class InvoiceOverview extends StatelessWidget { diff --git a/lib/ui/invoice/view/invoice_view_schedule.dart b/lib/ui/invoice/view/invoice_view_schedule.dart index e04d238f3..0d29e63fe 100644 --- a/lib/ui/invoice/view/invoice_view_schedule.dart +++ b/lib/ui/invoice/view/invoice_view_schedule.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; diff --git a/lib/ui/invoice/view/invoice_view_vm.dart b/lib/ui/invoice/view/invoice_view_vm.dart index 4948223bf..d7ac0a928 100644 --- a/lib/ui/invoice/view/invoice_view_vm.dart +++ b/lib/ui/invoice/view/invoice_view_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -14,7 +21,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class InvoiceViewScreen extends StatelessWidget { const InvoiceViewScreen({ diff --git a/lib/ui/payment/edit/payment_edit.dart b/lib/ui/payment/edit/payment_edit.dart index 8a2e7f9e1..107462536 100644 --- a/lib/ui/payment/edit/payment_edit.dart +++ b/lib/ui/payment/edit/payment_edit.dart @@ -1,26 +1,30 @@ +// Dart imports: import 'dart:math'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/payment_model.dart'; +import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; import 'package:invoiceninja_flutter/redux/credit/credit_selectors.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart'; -import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/payment/edit/payment_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/utils/money.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/payment/edit/payment_edit_vm.dart b/lib/ui/payment/edit/payment_edit_vm.dart index b77b3b6b5..2d13eeae0 100644 --- a/lib/ui/payment/edit/payment_edit_vm.dart +++ b/lib/ui/payment/edit/payment_edit_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/payment_model.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/payment/edit/payment_edit.dart'; import 'package:invoiceninja_flutter/ui/payment/view/payment_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; -import 'package:invoiceninja_flutter/data/models/payment_model.dart'; -import 'package:invoiceninja_flutter/ui/payment/edit/payment_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class PaymentEditScreen extends StatelessWidget { const PaymentEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/payment/payment_list_item.dart b/lib/ui/payment/payment_list_item.dart index 64d29a67d..86b0d72da 100644 --- a/lib/ui/payment/payment_list_item.dart +++ b/lib/ui/payment/payment_list_item.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/colors.dart'; import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart'; +import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/payment/payment_list_vm.dart b/lib/ui/payment/payment_list_vm.dart index 7ec7b1ad5..d6b678efb 100644 --- a/lib/ui/payment/payment_list_vm.dart +++ b/lib/ui/payment/payment_list_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -16,7 +23,6 @@ import 'package:invoiceninja_flutter/ui/payment/payment_list_item.dart'; import 'package:invoiceninja_flutter/ui/payment/payment_presenter.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class PaymentListBuilder extends StatelessWidget { const PaymentListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/payment/payment_presenter.dart b/lib/ui/payment/payment_presenter.dart index 726fc88fb..71197fad1 100644 --- a/lib/ui/payment/payment_presenter.dart +++ b/lib/ui/payment/payment_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; diff --git a/lib/ui/payment/payment_screen.dart b/lib/ui/payment/payment_screen.dart index ca9782d5a..0b6aa9bba 100644 --- a/lib/ui/payment/payment_screen.dart +++ b/lib/ui/payment/payment_screen.dart @@ -1,16 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/payment/payment_list_vm.dart'; import 'package:invoiceninja_flutter/ui/payment/payment_presenter.dart'; import 'package:invoiceninja_flutter/ui/payment/payment_screen_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/payment/payment_list_vm.dart'; -import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; class PaymentScreen extends StatelessWidget { const PaymentScreen({ diff --git a/lib/ui/payment/payment_screen_vm.dart b/lib/ui/payment/payment_screen_vm.dart index 79674c1b2..02d25c1a8 100644 --- a/lib/ui/payment/payment_screen_vm.dart +++ b/lib/ui/payment/payment_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/payment/payment_selectors.dart'; -import 'package:redux/redux.dart'; - import 'payment_screen.dart'; class PaymentScreenBuilder extends StatelessWidget { diff --git a/lib/ui/payment/refund/payment_refund.dart b/lib/ui/payment/refund/payment_refund.dart index d9d1d6e7a..9d71fe316 100644 --- a/lib/ui/payment/refund/payment_refund.dart +++ b/lib/ui/payment/refund/payment_refund.dart @@ -1,21 +1,25 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/payment_model.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/payment/refund/payment_refund_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; class PaymentRefund extends StatefulWidget { diff --git a/lib/ui/payment/refund/payment_refund_vm.dart b/lib/ui/payment/refund/payment_refund_vm.dart index 54b16df8a..b376936f8 100644 --- a/lib/ui/payment/refund/payment_refund_vm.dart +++ b/lib/ui/payment/refund/payment_refund_vm.dart @@ -1,12 +1,22 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; +import 'package:invoiceninja_flutter/data/models/payment_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; @@ -15,10 +25,6 @@ import 'package:invoiceninja_flutter/ui/payment/refund/payment_refund.dart'; import 'package:invoiceninja_flutter/ui/payment/view/payment_view_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; -import 'package:invoiceninja_flutter/data/models/payment_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class PaymentRefundScreen extends StatelessWidget { const PaymentRefundScreen({Key key}) : super(key: key); diff --git a/lib/ui/payment/view/payment_view.dart b/lib/ui/payment/view/payment_view.dart index 36d713360..e9d2f5266 100644 --- a/lib/ui/payment/view/payment_view.dart +++ b/lib/ui/payment/view/payment_view.dart @@ -1,6 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/colors.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_model.dart'; @@ -8,15 +14,14 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/bottom_buttons.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_list_tile.dart'; -import 'package:invoiceninja_flutter/ui/app/icon_message.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; +import 'package:invoiceninja_flutter/ui/app/icon_message.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; import 'package:invoiceninja_flutter/ui/payment/view/payment_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class PaymentView extends StatefulWidget { const PaymentView({ diff --git a/lib/ui/payment/view/payment_view_vm.dart b/lib/ui/payment/view/payment_view_vm.dart index fadee58e7..5db6aa910 100644 --- a/lib/ui/payment/view/payment_view_vm.dart +++ b/lib/ui/payment/view/payment_view_vm.dart @@ -1,6 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -9,7 +15,6 @@ import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart'; import 'package:invoiceninja_flutter/ui/payment/view/payment_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class PaymentViewScreen extends StatelessWidget { const PaymentViewScreen({ diff --git a/lib/ui/payment_term/edit/payment_term_edit.dart b/lib/ui/payment_term/edit/payment_term_edit.dart index 2982476f7..3d91caff7 100644 --- a/lib/ui/payment_term/edit/payment_term_edit.dart +++ b/lib/ui/payment_term/edit/payment_term_edit.dart @@ -1,13 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; class PaymentTermEdit extends StatefulWidget { const PaymentTermEdit({ diff --git a/lib/ui/payment_term/edit/payment_term_edit_vm.dart b/lib/ui/payment_term/edit/payment_term_edit_vm.dart index a61ae111e..d0331651c 100644 --- a/lib/ui/payment_term/edit/payment_term_edit_vm.dart +++ b/lib/ui/payment_term/edit/payment_term_edit_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit.dart'; import 'package:invoiceninja_flutter/ui/payment_term/payment_term_screen.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; -import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; -import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class PaymentTermEditScreen extends StatelessWidget { const PaymentTermEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/payment_term/payment_term_list.dart b/lib/ui/payment_term/payment_term_list.dart index d89eabe4e..ef657c492 100644 --- a/lib/ui/payment_term/payment_term_list.dart +++ b/lib/ui/payment_term/payment_term_list.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; diff --git a/lib/ui/payment_term/payment_term_list_item.dart b/lib/ui/payment_term/payment_term_list_item.dart index eb2022843..05800319f 100644 --- a/lib/ui/payment_term/payment_term_list_item.dart +++ b/lib/ui/payment_term/payment_term_list_item.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; class PaymentTermListItem extends StatelessWidget { const PaymentTermListItem({ diff --git a/lib/ui/payment_term/payment_term_list_vm.dart b/lib/ui/payment_term/payment_term_list_vm.dart index 6f55f8e28..ec3024753 100644 --- a/lib/ui/payment_term/payment_term_list_vm.dart +++ b/lib/ui/payment_term/payment_term_list_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; -import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; -import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_item.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:flutter/material.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/payment_term/payment_term_selectors.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; +import 'package:invoiceninja_flutter/redux/payment_term/payment_term_selectors.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; +import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; +import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_item.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class PaymentTermListBuilder extends StatelessWidget { const PaymentTermListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/payment_term/payment_term_presenter.dart b/lib/ui/payment_term/payment_term_presenter.dart index d030c5213..095ead643 100644 --- a/lib/ui/payment_term/payment_term_presenter.dart +++ b/lib/ui/payment_term/payment_term_presenter.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/payment_term/payment_term_screen.dart b/lib/ui/payment_term/payment_term_screen.dart index 9bff8775d..21d5f4c08 100644 --- a/lib/ui/payment_term/payment_term_screen.dart +++ b/lib/ui/payment_term/payment_term_screen.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; diff --git a/lib/ui/payment_term/payment_term_screen_vm.dart b/lib/ui/payment_term/payment_term_screen_vm.dart index 424f21e52..8df114c2f 100644 --- a/lib/ui/payment_term/payment_term_screen_vm.dart +++ b/lib/ui/payment_term/payment_term_screen_vm.dart @@ -1,15 +1,19 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_selectors.dart'; -import 'package:redux/redux.dart'; - import 'payment_term_screen.dart'; class PaymentTermScreenBuilder extends StatelessWidget { diff --git a/lib/ui/payment_term/view/payment_term_view.dart b/lib/ui/payment_term/view/payment_term_view.dart index 0362e05cd..fa053b77e 100644 --- a/lib/ui/payment_term/view/payment_term_view.dart +++ b/lib/ui/payment_term/view/payment_term_view.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; diff --git a/lib/ui/payment_term/view/payment_term_view_vm.dart b/lib/ui/payment_term/view/payment_term_view_vm.dart index 167ab3e5f..e7a5c26f5 100644 --- a/lib/ui/payment_term/view/payment_term_view_vm.dart +++ b/lib/ui/payment_term/view/payment_term_view_vm.dart @@ -1,19 +1,26 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/payment_term_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/payment_term/payment_term_screen.dart'; import 'package:invoiceninja_flutter/ui/payment_term/view/payment_term_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class PaymentTermViewScreen extends StatelessWidget { const PaymentTermViewScreen({ diff --git a/lib/ui/product/edit/product_edit.dart b/lib/ui/product/edit/product_edit.dart index b51498720..a8f08fa47 100644 --- a/lib/ui/product/edit/product_edit.dart +++ b/lib/ui/product/edit/product_edit.dart @@ -1,17 +1,20 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/invoice/tax_rate_dropdown.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; +import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; -import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class ProductEdit extends StatefulWidget { diff --git a/lib/ui/product/edit/product_edit_vm.dart b/lib/ui/product/edit/product_edit_vm.dart index 62a0a69a1..5295a8ce6 100644 --- a/lib/ui/product/edit/product_edit_vm.dart +++ b/lib/ui/product/edit/product_edit_vm.dart @@ -1,9 +1,16 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -14,7 +21,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/product/edit/product_edit.dart'; import 'package:invoiceninja_flutter/ui/product/view/product_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:redux/redux.dart'; class ProductEditScreen extends StatelessWidget { const ProductEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/product/product_list_item.dart b/lib/ui/product/product_list_item.dart index 89fe0a9cf..a363d172f 100644 --- a/lib/ui/product/product_list_item.dart +++ b/lib/ui/product/product_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/product/product_list_vm.dart b/lib/ui/product/product_list_vm.dart index 4504dd236..6e814e0ae 100644 --- a/lib/ui/product/product_list_vm.dart +++ b/lib/ui/product/product_list_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -15,7 +22,6 @@ import 'package:invoiceninja_flutter/ui/product/product_list_item.dart'; import 'package:invoiceninja_flutter/ui/product/product_presenter.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class ProductListBuilder extends StatelessWidget { const ProductListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/product/product_presenter.dart b/lib/ui/product/product_presenter.dart index 3d84cb815..8c4faec31 100644 --- a/lib/ui/product/product_presenter.dart +++ b/lib/ui/product/product_presenter.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/cupertino.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/ui/product/product_screen.dart b/lib/ui/product/product_screen.dart index fd491de5d..8707fa906 100644 --- a/lib/ui/product/product_screen.dart +++ b/lib/ui/product/product_screen.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/product/product_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/product/product_list_vm.dart'; import 'package:invoiceninja_flutter/ui/product/product_presenter.dart'; import 'package:invoiceninja_flutter/ui/product/product_screen_vm.dart'; diff --git a/lib/ui/product/product_screen_vm.dart b/lib/ui/product/product_screen_vm.dart index 4a5097a40..4f0f9d2cb 100644 --- a/lib/ui/product/product_screen_vm.dart +++ b/lib/ui/product/product_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/product/product_selectors.dart'; -import 'package:redux/redux.dart'; - import 'product_screen.dart'; class ProductScreenBuilder extends StatelessWidget { diff --git a/lib/ui/product/view/product_view.dart b/lib/ui/product/view/product_view.dart index aa2456254..24a7aee46 100644 --- a/lib/ui/product/view/product_view.dart +++ b/lib/ui/product/view/product_view.dart @@ -1,6 +1,13 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/product/product_actions.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/bottom_buttons.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; @@ -8,8 +15,6 @@ import 'package:invoiceninja_flutter/ui/product/view/product_view_documents.dart import 'package:invoiceninja_flutter/ui/product/view/product_view_overview.dart'; import 'package:invoiceninja_flutter/ui/product/view/product_view_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ProductView extends StatefulWidget { const ProductView({ diff --git a/lib/ui/product/view/product_view_documents.dart b/lib/ui/product/view/product_view_documents.dart index 954fe4144..f4c5d9513 100644 --- a/lib/ui/product/view/product_view_documents.dart +++ b/lib/ui/product/view/product_view_documents.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/document_grid.dart'; import 'package:invoiceninja_flutter/ui/app/screen_imports.dart'; diff --git a/lib/ui/product/view/product_view_overview.dart b/lib/ui/product/view/product_view_overview.dart index c1dd89396..c3c9bd839 100644 --- a/lib/ui/product/view/product_view_overview.dart +++ b/lib/ui/product/view/product_view_overview.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; diff --git a/lib/ui/product/view/product_view_vm.dart b/lib/ui/product/view/product_view_vm.dart index c46908adb..5f58464db 100644 --- a/lib/ui/product/view/product_view_vm.dart +++ b/lib/ui/product/view/product_view_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -14,7 +21,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/product/view/product_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class ProductViewScreen extends StatelessWidget { const ProductViewScreen({ diff --git a/lib/ui/project/edit/project_edit.dart b/lib/ui/project/edit/project_edit.dart index 93c59f7e2..c6dd5cc2d 100644 --- a/lib/ui/project/edit/project_edit.dart +++ b/lib/ui/project/edit/project_edit.dart @@ -1,8 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart'; @@ -11,7 +15,6 @@ import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/user_picker.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/project/edit/project_edit_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/project/edit/project_edit_vm.dart b/lib/ui/project/edit/project_edit_vm.dart index f4211b1e2..0dadbfc1c 100644 --- a/lib/ui/project/edit/project_edit_vm.dart +++ b/lib/ui/project/edit/project_edit_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/project_model.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/project/edit/project_edit.dart'; import 'package:invoiceninja_flutter/ui/project/view/project_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; -import 'package:invoiceninja_flutter/data/models/project_model.dart'; -import 'package:invoiceninja_flutter/ui/project/edit/project_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ProjectEditScreen extends StatelessWidget { const ProjectEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/project/project_list_item.dart b/lib/ui/project/project_list_item.dart index 72e65a522..d2f60ac04 100644 --- a/lib/ui/project/project_list_item.dart +++ b/lib/ui/project/project_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/project/project_list_vm.dart b/lib/ui/project/project_list_vm.dart index d1c386b37..472b21940 100644 --- a/lib/ui/project/project_list_vm.dart +++ b/lib/ui/project/project_list_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -16,7 +23,6 @@ import 'package:invoiceninja_flutter/ui/project/project_list_item.dart'; import 'package:invoiceninja_flutter/ui/project/project_presenter.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class ProjectListBuilder extends StatelessWidget { const ProjectListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/project/project_presenter.dart b/lib/ui/project/project_presenter.dart index 5a469957a..4a3a432e6 100644 --- a/lib/ui/project/project_presenter.dart +++ b/lib/ui/project/project_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/project/project_screen.dart b/lib/ui/project/project_screen.dart index 6ad629b39..fcc513a87 100644 --- a/lib/ui/project/project_screen.dart +++ b/lib/ui/project/project_screen.dart @@ -1,16 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/project/project_list_vm.dart'; import 'package:invoiceninja_flutter/ui/project/project_presenter.dart'; import 'package:invoiceninja_flutter/ui/project/project_screen_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/project/project_list_vm.dart'; -import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; class ProjectScreen extends StatelessWidget { const ProjectScreen({ diff --git a/lib/ui/project/project_screen_vm.dart b/lib/ui/project/project_screen_vm.dart index 6e3eb7d46..7b0957bc4 100644 --- a/lib/ui/project/project_screen_vm.dart +++ b/lib/ui/project/project_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/project/project_selectors.dart'; -import 'package:redux/redux.dart'; - import 'project_screen.dart'; class ProjectScreenBuilder extends StatelessWidget { diff --git a/lib/ui/project/view/project_view.dart b/lib/ui/project/view/project_view.dart index 18ad33580..e134bcba0 100644 --- a/lib/ui/project/view/project_view.dart +++ b/lib/ui/project/view/project_view.dart @@ -1,7 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/bottom_buttons.dart'; diff --git a/lib/ui/project/view/project_view_documents.dart b/lib/ui/project/view/project_view_documents.dart index d579a5d06..1295a17e3 100644 --- a/lib/ui/project/view/project_view_documents.dart +++ b/lib/ui/project/view/project_view_documents.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/document_grid.dart'; import 'package:invoiceninja_flutter/ui/project/view/project_view_vm.dart'; diff --git a/lib/ui/project/view/project_view_overview.dart b/lib/ui/project/view/project_view_overview.dart index fdc24eecd..1fa7d4c0e 100644 --- a/lib/ui/project/view/project_view_overview.dart +++ b/lib/ui/project/view/project_view_overview.dart @@ -1,6 +1,10 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/project_model.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_selectors.dart'; diff --git a/lib/ui/project/view/project_view_vm.dart b/lib/ui/project/view/project_view_vm.dart index cfbfd2bc7..ac9874c50 100644 --- a/lib/ui/project/view/project_view_vm.dart +++ b/lib/ui/project/view/project_view_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/project_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -15,7 +22,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/project/view/project_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class ProjectViewScreen extends StatelessWidget { const ProjectViewScreen({ diff --git a/lib/ui/quote/edit/quote_edit_details_vm.dart b/lib/ui/quote/edit/quote_edit_details_vm.dart index 9f91961d5..529c25811 100644 --- a/lib/ui/quote/edit/quote_edit_details_vm.dart +++ b/lib/ui/quote/edit/quote_edit_details_vm.dart @@ -1,19 +1,25 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/app/screen_imports.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_desktop.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class QuoteEditDetailsScreen extends StatelessWidget { const QuoteEditDetailsScreen({Key key, @required this.viewModel}) diff --git a/lib/ui/quote/edit/quote_edit_items_vm.dart b/lib/ui/quote/edit/quote_edit_items_vm.dart index 79c5ac0f3..f936b251d 100644 --- a/lib/ui/quote/edit/quote_edit_items_vm.dart +++ b/lib/ui/quote/edit/quote_edit_items_vm.dart @@ -1,14 +1,19 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items_desktop.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class QuoteEditItemsScreen extends StatelessWidget { const QuoteEditItemsScreen({ diff --git a/lib/ui/quote/edit/quote_edit_notes_vm.dart b/lib/ui/quote/edit/quote_edit_notes_vm.dart index 291594ff5..b3f6ad4e2 100644 --- a/lib/ui/quote/edit/quote_edit_notes_vm.dart +++ b/lib/ui/quote/edit/quote_edit_notes_vm.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class QuoteEditNotesScreen extends StatelessWidget { const QuoteEditNotesScreen({Key key}) : super(key: key); diff --git a/lib/ui/quote/edit/quote_edit_pdf_vm.dart b/lib/ui/quote/edit/quote_edit_pdf_vm.dart index 0d3b9b02a..e75c63c74 100644 --- a/lib/ui/quote/edit/quote_edit_pdf_vm.dart +++ b/lib/ui/quote/edit/quote_edit_pdf_vm.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf_vm.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf_vm.dart'; class QuoteEditPDFScreen extends StatelessWidget { const QuoteEditPDFScreen({Key key}) : super(key: key); diff --git a/lib/ui/quote/edit/quote_edit_vm.dart b/lib/ui/quote/edit/quote_edit_vm.dart index fae7d1fe0..893f231b0 100644 --- a/lib/ui/quote/edit/quote_edit_vm.dart +++ b/lib/ui/quote/edit/quote_edit_vm.dart @@ -1,9 +1,20 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_selectors.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; @@ -12,10 +23,6 @@ import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/quote_edit.dart'; import 'package:invoiceninja_flutter/ui/quote/view/quote_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class QuoteEditScreen extends StatelessWidget { const QuoteEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/quote/quote_edit.dart b/lib/ui/quote/quote_edit.dart index 7e17cee9f..c7546e6e9 100644 --- a/lib/ui/quote/quote_edit.dart +++ b/lib/ui/quote/quote_edit.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_contacts_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_footer.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; @@ -8,7 +12,6 @@ import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_item_selector.dart' import 'package:invoiceninja_flutter/ui/quote/edit/quote_edit_details_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/edit/quote_edit_items_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/edit/quote_edit_notes_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/quote/edit/quote_edit_pdf_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/quote/quote_email_vm.dart b/lib/ui/quote/quote_email_vm.dart index 9e2806c34..df548263a 100644 --- a/lib/ui/quote/quote_email_vm.dart +++ b/lib/ui/quote/quote_email_vm.dart @@ -1,7 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/ui/app/invoice/invoice_email_view.dart'; @@ -9,9 +17,6 @@ import 'package:invoiceninja_flutter/ui/invoice/invoice_email_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class QuoteEmailScreen extends StatelessWidget { const QuoteEmailScreen({Key key}) : super(key: key); diff --git a/lib/ui/quote/quote_list_item.dart b/lib/ui/quote/quote_list_item.dart index 31d9d6dc2..9eb8c0b8e 100644 --- a/lib/ui/quote/quote_list_item.dart +++ b/lib/ui/quote/quote_list_item.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/colors.dart'; import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart'; +import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class QuoteListItem extends StatelessWidget { diff --git a/lib/ui/quote/quote_list_vm.dart b/lib/ui/quote/quote_list_vm.dart index 70d4c7e30..a51699db1 100644 --- a/lib/ui/quote/quote_list_vm.dart +++ b/lib/ui/quote/quote_list_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_selectors.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_list_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/quote_list_item.dart'; import 'package:invoiceninja_flutter/ui/quote/quote_presenter.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_list_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class QuoteListBuilder extends StatelessWidget { const QuoteListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/quote/quote_pdf_vm.dart b/lib/ui/quote/quote_pdf_vm.dart index 7a4b6edd3..09d64195a 100644 --- a/lib/ui/quote/quote_pdf_vm.dart +++ b/lib/ui/quote/quote_pdf_vm.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; class QuotePdfScreen extends StatelessWidget { const QuotePdfScreen({Key key, this.showAppBar = true}) : super(key: key); diff --git a/lib/ui/quote/quote_presenter.dart b/lib/ui/quote/quote_presenter.dart index 530d736ff..755d50de8 100644 --- a/lib/ui/quote/quote_presenter.dart +++ b/lib/ui/quote/quote_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/quote_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/quote/quote_screen.dart b/lib/ui/quote/quote_screen.dart index 658978f4d..5d8056500 100644 --- a/lib/ui/quote/quote_screen.dart +++ b/lib/ui/quote/quote_screen.dart @@ -1,18 +1,23 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/quote_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/quote/quote_list_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/quote_presenter.dart'; import 'package:invoiceninja_flutter/ui/quote/quote_screen_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/quote/quote_list_vm.dart'; -import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; class QuoteScreen extends StatelessWidget { const QuoteScreen({ diff --git a/lib/ui/quote/quote_screen_vm.dart b/lib/ui/quote/quote_screen_vm.dart index 3bb9be2c1..ef9297f3e 100644 --- a/lib/ui/quote/quote_screen_vm.dart +++ b/lib/ui/quote/quote_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/quote/quote_selectors.dart'; -import 'package:redux/redux.dart'; - import 'quote_screen.dart'; class QuoteScreenBuilder extends StatelessWidget { diff --git a/lib/ui/quote/view/quote_view_vm.dart b/lib/ui/quote/view/quote_view_vm.dart index dcb7d2db2..37e28f0e0 100644 --- a/lib/ui/quote/view/quote_view_vm.dart +++ b/lib/ui/quote/view/quote_view_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -15,7 +22,6 @@ import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class QuoteViewScreen extends StatelessWidget { const QuoteViewScreen({ diff --git a/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart b/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart index dda5eaecf..bc09ac663 100644 --- a/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart +++ b/lib/ui/recurring_expense/edit/recurring_expense_edit_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_selectors.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit.dart'; import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_vm.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/recurring_expense/view/recurring_expense_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class RecurringExpenseEditScreen extends StatelessWidget { diff --git a/lib/ui/recurring_expense/recurring_expense_list_item.dart b/lib/ui/recurring_expense/recurring_expense_list_item.dart index 09ef043bf..526c07b2d 100644 --- a/lib/ui/recurring_expense/recurring_expense_list_item.dart +++ b/lib/ui/recurring_expense/recurring_expense_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/recurring_expense/recurring_expense_list_vm.dart b/lib/ui/recurring_expense/recurring_expense_list_vm.dart index 6a55798ca..b2b777891 100644 --- a/lib/ui/recurring_expense/recurring_expense_list_vm.dart +++ b/lib/ui/recurring_expense/recurring_expense_list_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_selectors.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_list_item.dart'; import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_presenter.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; class RecurringExpenseListBuilder extends StatelessWidget { const RecurringExpenseListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/recurring_expense/recurring_expense_presenter.dart b/lib/ui/recurring_expense/recurring_expense_presenter.dart index dd31bc65d..534a2a924 100644 --- a/lib/ui/recurring_expense/recurring_expense_presenter.dart +++ b/lib/ui/recurring_expense/recurring_expense_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/recurring_expense_model.dart'; diff --git a/lib/ui/recurring_expense/recurring_expense_screen.dart b/lib/ui/recurring_expense/recurring_expense_screen.dart index c1b3b8727..5a06d801a 100644 --- a/lib/ui/recurring_expense/recurring_expense_screen.dart +++ b/lib/ui/recurring_expense/recurring_expense_screen.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/recurring_expense_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_list_vm.dart'; import 'package:invoiceninja_flutter/ui/recurring_expense/recurring_expense_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'recurring_expense_screen_vm.dart'; class RecurringExpenseScreen extends StatelessWidget { diff --git a/lib/ui/recurring_expense/recurring_expense_screen_vm.dart b/lib/ui/recurring_expense/recurring_expense_screen_vm.dart index 905e10e4c..995ee1ff6 100644 --- a/lib/ui/recurring_expense/recurring_expense_screen_vm.dart +++ b/lib/ui/recurring_expense/recurring_expense_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_selectors.dart'; -import 'package:redux/redux.dart'; - import 'recurring_expense_screen.dart'; class RecurringExpenseScreenBuilder extends StatelessWidget { diff --git a/lib/ui/recurring_expense/view/recurring_expense_view_vm.dart b/lib/ui/recurring_expense/view/recurring_expense_view_vm.dart index a7caca762..422d046da 100644 --- a/lib/ui/recurring_expense/view/recurring_expense_view_vm.dart +++ b/lib/ui/recurring_expense/view/recurring_expense_view_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; -import 'package:flutter_styled_toast/flutter_styled_toast.dart'; -import 'package:http/http.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view.dart'; import 'package:invoiceninja_flutter/ui/expense/view/expense_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class RecurringExpenseViewScreen extends StatelessWidget { const RecurringExpenseViewScreen({ diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart index 09c5669e6..35b88b109 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart index b273a3911..432166f96 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_details_vm.dart @@ -1,10 +1,19 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/app/screen_imports.dart'; @@ -12,9 +21,6 @@ import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_desktop.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details_vm.dart'; import 'package:invoiceninja_flutter/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class RecurringInvoiceEditDetailsScreen extends StatelessWidget { const RecurringInvoiceEditDetailsScreen({Key key, @required this.viewModel}) diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_items_vm.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_items_vm.dart index f21521778..37fa90627 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_items_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_items_vm.dart @@ -1,14 +1,19 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items_desktop.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_items_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class RecurringInvoiceEditItemsScreen extends StatelessWidget { const RecurringInvoiceEditItemsScreen({ diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_notes_vm.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_notes_vm.dart index 01d6befa7..0d0d2aeff 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_notes_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_notes_vm.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes_vm.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class RecurringInvoiceEditNotesScreen extends StatelessWidget { const RecurringInvoiceEditNotesScreen({Key key}) : super(key: key); diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_pdf_vm.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_pdf_vm.dart index ae93b12d4..e32a56246 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_pdf_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_pdf_vm.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf.dart'; -import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf_vm.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf.dart'; +import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf_vm.dart'; class RecurringInvoiceEditPDFScreen extends StatelessWidget { const RecurringInvoiceEditPDFScreen({Key key}) : super(key: key); diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart index 975e7e077..b072ad0b6 100644 --- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart +++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit_vm.dart @@ -1,9 +1,20 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_selectors.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; @@ -12,10 +23,6 @@ import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/recurring_invoice/edit/recurring_invoice_edit.dart'; import 'package:invoiceninja_flutter/ui/recurring_invoice/view/recurring_invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class RecurringInvoiceEditScreen extends StatelessWidget { const RecurringInvoiceEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/recurring_invoice/recurring_invoice_list_item.dart b/lib/ui/recurring_invoice/recurring_invoice_list_item.dart index a9ddbf306..3bcb7b3ac 100644 --- a/lib/ui/recurring_invoice/recurring_invoice_list_item.dart +++ b/lib/ui/recurring_invoice/recurring_invoice_list_item.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/colors.dart'; import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart'; +import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_status_chip.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; diff --git a/lib/ui/recurring_invoice/recurring_invoice_list_vm.dart b/lib/ui/recurring_invoice/recurring_invoice_list_vm.dart index 211c58877..287cad9ac 100644 --- a/lib/ui/recurring_invoice/recurring_invoice_list_vm.dart +++ b/lib/ui/recurring_invoice/recurring_invoice_list_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_selectors.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_list_item.dart'; import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_presenter.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; class RecurringInvoiceListBuilder extends StatelessWidget { const RecurringInvoiceListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/recurring_invoice/recurring_invoice_pdf_vm.dart b/lib/ui/recurring_invoice/recurring_invoice_pdf_vm.dart index 19066bc73..77c166c3e 100644 --- a/lib/ui/recurring_invoice/recurring_invoice_pdf_vm.dart +++ b/lib/ui/recurring_invoice/recurring_invoice_pdf_vm.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf.dart'; -import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf.dart'; +import 'package:invoiceninja_flutter/ui/invoice/invoice_pdf_vm.dart'; class RecurringInvoicePdfScreen extends StatelessWidget { const RecurringInvoicePdfScreen({Key key, this.showAppBar = true}) diff --git a/lib/ui/recurring_invoice/recurring_invoice_presenter.dart b/lib/ui/recurring_invoice/recurring_invoice_presenter.dart index 2a77eac1e..4ffe9a9fd 100644 --- a/lib/ui/recurring_invoice/recurring_invoice_presenter.dart +++ b/lib/ui/recurring_invoice/recurring_invoice_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/recurring_invoice_model.dart'; diff --git a/lib/ui/recurring_invoice/recurring_invoice_screen.dart b/lib/ui/recurring_invoice/recurring_invoice_screen.dart index 43b7fbc78..7a71f28e0 100644 --- a/lib/ui/recurring_invoice/recurring_invoice_screen.dart +++ b/lib/ui/recurring_invoice/recurring_invoice_screen.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/recurring_invoice_model.dart'; @@ -7,12 +12,11 @@ import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_list_vm.dart'; import 'package:invoiceninja_flutter/ui/recurring_invoice/recurring_invoice_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'recurring_invoice_screen_vm.dart'; class RecurringInvoiceScreen extends StatelessWidget { diff --git a/lib/ui/recurring_invoice/recurring_invoice_screen_vm.dart b/lib/ui/recurring_invoice/recurring_invoice_screen_vm.dart index 46fc34765..40bd5239e 100644 --- a/lib/ui/recurring_invoice/recurring_invoice_screen_vm.dart +++ b/lib/ui/recurring_invoice/recurring_invoice_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_selectors.dart'; -import 'package:redux/redux.dart'; - import 'recurring_invoice_screen.dart'; class RecurringInvoiceScreenBuilder extends StatelessWidget { diff --git a/lib/ui/recurring_invoice/view/recurring_invoice_view_vm.dart b/lib/ui/recurring_invoice/view/recurring_invoice_view_vm.dart index eac5f73a3..1853ac974 100644 --- a/lib/ui/recurring_invoice/view/recurring_invoice_view_vm.dart +++ b/lib/ui/recurring_invoice/view/recurring_invoice_view_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; -import 'package:flutter_styled_toast/flutter_styled_toast.dart'; -import 'package:http/http.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; +import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view.dart'; import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; -import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class RecurringInvoiceViewScreen extends StatelessWidget { const RecurringInvoiceViewScreen({ diff --git a/lib/ui/reports/client_report.dart b/lib/ui/reports/client_report.dart index 0d113a5a7..b78f5db27 100644 --- a/lib/ui/reports/client_report.dart +++ b/lib/ui/reports/client_report.dart @@ -1,5 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -7,9 +10,9 @@ import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/money.dart'; -import 'package:memoize/memoize.dart'; enum ClientReportFields { name, diff --git a/lib/ui/reports/contact_report.dart b/lib/ui/reports/contact_report.dart index 237e5faa1..385c49209 100644 --- a/lib/ui/reports/contact_report.dart +++ b/lib/ui/reports/contact_report.dart @@ -1,5 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -7,9 +10,9 @@ import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/money.dart'; -import 'package:memoize/memoize.dart'; enum ContactReportFields { name, diff --git a/lib/ui/reports/credit_report.dart b/lib/ui/reports/credit_report.dart index 782fe2089..049c2e090 100644 --- a/lib/ui/reports/credit_report.dart +++ b/lib/ui/reports/credit_report.dart @@ -1,13 +1,16 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:memoize/memoize.dart'; enum CreditReportFields { amount, diff --git a/lib/ui/reports/document_report.dart b/lib/ui/reports/document_report.dart index a4871f2de..0c582d751 100644 --- a/lib/ui/reports/document_report.dart +++ b/lib/ui/reports/document_report.dart @@ -1,15 +1,18 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; import 'package:intl/intl.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/document_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; +import 'package:invoiceninja_flutter/data/models/document_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:memoize/memoize.dart'; enum DocumentReportFields { name, diff --git a/lib/ui/reports/expense_report.dart b/lib/ui/reports/expense_report.dart index 9e9a4db4e..a4c059cc5 100644 --- a/lib/ui/reports/expense_report.dart +++ b/lib/ui/reports/expense_report.dart @@ -1,13 +1,16 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/expense_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; +import 'package:invoiceninja_flutter/data/models/expense_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; -import 'package:memoize/memoize.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; enum ExpenseReportFields { amount, diff --git a/lib/ui/reports/invoice_item_report.dart b/lib/ui/reports/invoice_item_report.dart index c7b27aa80..38e646995 100644 --- a/lib/ui/reports/invoice_item_report.dart +++ b/lib/ui/reports/invoice_item_report.dart @@ -1,4 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -8,7 +12,6 @@ import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; import 'package:invoiceninja_flutter/utils/enums.dart'; -import 'package:memoize/memoize.dart'; enum InvoiceItemReportFields { productKey, diff --git a/lib/ui/reports/invoice_report.dart b/lib/ui/reports/invoice_report.dart index 8e3be3b82..6058725bd 100644 --- a/lib/ui/reports/invoice_report.dart +++ b/lib/ui/reports/invoice_report.dart @@ -1,14 +1,17 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; +import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:memoize/memoize.dart'; enum InvoiceReportFields { amount, diff --git a/lib/ui/reports/invoice_tax_report.dart b/lib/ui/reports/invoice_tax_report.dart index df13118b4..e87f2a22a 100644 --- a/lib/ui/reports/invoice_tax_report.dart +++ b/lib/ui/reports/invoice_tax_report.dart @@ -1,13 +1,16 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; -import 'package:memoize/memoize.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; enum TaxRateReportFields { client, diff --git a/lib/ui/reports/payment_report.dart b/lib/ui/reports/payment_report.dart index a0e28fef4..cb2e7e994 100644 --- a/lib/ui/reports/payment_report.dart +++ b/lib/ui/reports/payment_report.dart @@ -1,13 +1,16 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/payment_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/payment_model.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; -import 'package:memoize/memoize.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; enum PaymentReportFields { number, diff --git a/lib/ui/reports/payment_tax_report.dart b/lib/ui/reports/payment_tax_report.dart index de688c601..c6a99b04e 100644 --- a/lib/ui/reports/payment_tax_report.dart +++ b/lib/ui/reports/payment_tax_report.dart @@ -1,13 +1,16 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; -import 'package:memoize/memoize.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; enum TaxRateReportFields { client, diff --git a/lib/ui/reports/product_report.dart b/lib/ui/reports/product_report.dart index b1eb261ab..7d32f6fd7 100644 --- a/lib/ui/reports/product_report.dart +++ b/lib/ui/reports/product_report.dart @@ -1,14 +1,17 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/product_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/product_model.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:memoize/memoize.dart'; enum ProductReportFields { name, diff --git a/lib/ui/reports/profit_loss_report.dart b/lib/ui/reports/profit_loss_report.dart index 9a4876858..e096bc825 100644 --- a/lib/ui/reports/profit_loss_report.dart +++ b/lib/ui/reports/profit_loss_report.dart @@ -1,12 +1,15 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; -import 'package:memoize/memoize.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; enum ProfitAndLossReportFields { client, diff --git a/lib/ui/reports/quote_item_report.dart b/lib/ui/reports/quote_item_report.dart index eae7291d0..1cf18de30 100644 --- a/lib/ui/reports/quote_item_report.dart +++ b/lib/ui/reports/quote_item_report.dart @@ -1,4 +1,8 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -8,7 +12,6 @@ import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; import 'package:invoiceninja_flutter/utils/enums.dart'; -import 'package:memoize/memoize.dart'; enum QuoteItemReportFields { productKey, diff --git a/lib/ui/reports/quote_report.dart b/lib/ui/reports/quote_report.dart index 835f1822c..f01e7e390 100644 --- a/lib/ui/reports/quote_report.dart +++ b/lib/ui/reports/quote_report.dart @@ -1,12 +1,15 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; -import 'package:memoize/memoize.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; enum QuoteReportFields { amount, diff --git a/lib/ui/reports/report_charts.dart b/lib/ui/reports/report_charts.dart index d20f45873..63b99a39d 100644 --- a/lib/ui/reports/report_charts.dart +++ b/lib/ui/reports/report_charts.dart @@ -1,5 +1,10 @@ -import 'package:charts_flutter/flutter.dart' as charts; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:charts_flutter/flutter.dart' as charts; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen_vm.dart'; diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart index 68833edf9..ee3786adc 100644 --- a/lib/ui/reports/reports_screen.dart +++ b/lib/ui/reports/reports_screen.dart @@ -1,7 +1,13 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; @@ -30,7 +36,6 @@ import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:invoiceninja_flutter/.env.dart'; class ReportsScreen extends StatelessWidget { const ReportsScreen({ diff --git a/lib/ui/reports/reports_screen_vm.dart b/lib/ui/reports/reports_screen_vm.dart index ab44c5985..ce5d0d0fb 100644 --- a/lib/ui/reports/reports_screen_vm.dart +++ b/lib/ui/reports/reports_screen_vm.dart @@ -1,10 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:io' as file; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:memoize/memoize.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:redux/redux.dart'; +import 'package:share/share.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/static/currency_model.dart'; @@ -16,8 +27,8 @@ import 'package:invoiceninja_flutter/ui/reports/client_report.dart'; import 'package:invoiceninja_flutter/ui/reports/contact_report.dart'; import 'package:invoiceninja_flutter/ui/reports/document_report.dart'; import 'package:invoiceninja_flutter/ui/reports/expense_report.dart'; -import 'package:invoiceninja_flutter/ui/reports/invoice_report.dart'; import 'package:invoiceninja_flutter/ui/reports/invoice_item_report.dart'; +import 'package:invoiceninja_flutter/ui/reports/invoice_report.dart'; import 'package:invoiceninja_flutter/ui/reports/invoice_tax_report.dart'; import 'package:invoiceninja_flutter/ui/reports/payment_report.dart'; import 'package:invoiceninja_flutter/ui/reports/payment_tax_report.dart'; @@ -32,14 +43,11 @@ import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/money.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:memoize/memoize.dart'; -import 'package:path_provider/path_provider.dart'; -import 'package:redux/redux.dart'; +import 'credit_report.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; -import 'package:share/share.dart'; -import 'credit_report.dart'; class ReportsScreenBuilder extends StatelessWidget { const ReportsScreenBuilder({Key key}) : super(key: key); diff --git a/lib/ui/reports/task_report.dart b/lib/ui/reports/task_report.dart index 5b8513a32..c9896f4ba 100644 --- a/lib/ui/reports/task_report.dart +++ b/lib/ui/reports/task_report.dart @@ -1,16 +1,19 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/data/models/group_model.dart'; -import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; -import 'package:invoiceninja_flutter/utils/enums.dart'; +import 'package:memoize/memoize.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; +import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart'; +import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; +import 'package:invoiceninja_flutter/utils/enums.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:memoize/memoize.dart'; enum TaskReportFields { rate, diff --git a/lib/ui/settings/account_management.dart b/lib/ui/settings/account_management.dart index 7101147d8..c46b9668b 100644 --- a/lib/ui/settings/account_management.dart +++ b/lib/ui/settings/account_management.dart @@ -1,6 +1,13 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; @@ -9,10 +16,10 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_header.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/loading_dialog.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/learn_more.dart'; @@ -26,8 +33,6 @@ import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:url_launcher/url_launcher.dart'; class AccountManagement extends StatefulWidget { const AccountManagement({ diff --git a/lib/ui/settings/account_management_vm.dart b/lib/ui/settings/account_management_vm.dart index e1726fb53..867d07134 100644 --- a/lib/ui/settings/account_management_vm.dart +++ b/lib/ui/settings/account_management_vm.dart @@ -1,12 +1,20 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart'; @@ -17,8 +25,6 @@ import 'package:invoiceninja_flutter/ui/settings/account_management.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/oauth.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class AccountManagementScreen extends StatelessWidget { const AccountManagementScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/buy_now_buttons.dart b/lib/ui/settings/buy_now_buttons.dart index ea83ca15b..25c94a1a2 100644 --- a/lib/ui/settings/buy_now_buttons.dart +++ b/lib/ui/settings/buy_now_buttons.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; diff --git a/lib/ui/settings/buy_now_buttons_vm.dart b/lib/ui/settings/buy_now_buttons_vm.dart index c675e0fc6..0022d56bc 100644 --- a/lib/ui/settings/buy_now_buttons_vm.dart +++ b/lib/ui/settings/buy_now_buttons_vm.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/ui/settings/buy_now_buttons.dart'; import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/settings/buy_now_buttons.dart'; class BuyNowButtonsScreen extends StatelessWidget { const BuyNowButtonsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/client_portal.dart b/lib/ui/settings/client_portal.dart index 6dc8e1edd..080f39809 100644 --- a/lib/ui/settings/client_portal.dart +++ b/lib/ui/settings/client_portal.dart @@ -1,16 +1,25 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_selectors.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; @@ -20,13 +29,10 @@ import 'package:invoiceninja_flutter/ui/app/icon_text.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/settings/client_portal_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:url_launcher/url_launcher.dart'; class ClientPortal extends StatefulWidget { const ClientPortal({ diff --git a/lib/ui/settings/client_portal_vm.dart b/lib/ui/settings/client_portal_vm.dart index 4b5b2edb4..387cab3c6 100644 --- a/lib/ui/settings/client_portal_vm.dart +++ b/lib/ui/settings/client_portal_vm.dart @@ -1,6 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -8,6 +14,7 @@ import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -16,8 +23,6 @@ import 'package:invoiceninja_flutter/ui/settings/client_portal.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ClientPortalScreen extends StatelessWidget { const ClientPortalScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/company_details.dart b/lib/ui/settings/company_details.dart index d6065d2fa..cf6ee1692 100644 --- a/lib/ui/settings/company_details.dart +++ b/lib/ui/settings/company_details.dart @@ -1,6 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:file_picker/file_picker.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_gateway_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -10,6 +16,7 @@ import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/blank_screen.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/document_grid.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; @@ -21,12 +28,10 @@ import 'package:invoiceninja_flutter/ui/app/forms/design_picker.dart'; import 'package:invoiceninja_flutter/ui/app/resources/cached_image.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/settings/company_details_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/files.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:file_picker/file_picker.dart'; class CompanyDetails extends StatefulWidget { const CompanyDetails({ diff --git a/lib/ui/settings/company_details_vm.dart b/lib/ui/settings/company_details_vm.dart index e3b66e469..d5d01ea5b 100644 --- a/lib/ui/settings/company_details_vm.dart +++ b/lib/ui/settings/company_details_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -13,6 +20,7 @@ import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/document/document_actions.dart'; @@ -23,8 +31,6 @@ import 'package:invoiceninja_flutter/ui/settings/company_details.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CompanyDetailsScreen extends StatelessWidget { const CompanyDetailsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/credit_cards_and_banks.dart b/lib/ui/settings/credit_cards_and_banks.dart index 502e6d5f9..575be5abb 100644 --- a/lib/ui/settings/credit_cards_and_banks.dart +++ b/lib/ui/settings/credit_cards_and_banks.dart @@ -1,7 +1,10 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/ui/settings/credit_cards_and_banks_vm.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/settings/credit_cards_and_banks_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class CreditCardsAndBanks extends StatefulWidget { diff --git a/lib/ui/settings/credit_cards_and_banks_vm.dart b/lib/ui/settings/credit_cards_and_banks_vm.dart index b1f993b5b..9cecdc888 100644 --- a/lib/ui/settings/credit_cards_and_banks_vm.dart +++ b/lib/ui/settings/credit_cards_and_banks_vm.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/ui/settings/credit_cards_and_banks.dart'; import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/settings/credit_cards_and_banks.dart'; class CreditCardsAndBanksScreen extends StatelessWidget { const CreditCardsAndBanksScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/custom_fields.dart b/lib/ui/settings/custom_fields.dart index d06679488..a8e709b0d 100644 --- a/lib/ui/settings/custom_fields.dart +++ b/lib/ui/settings/custom_fields.dart @@ -1,18 +1,23 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/settings/custom_fields_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; class CustomFields extends StatefulWidget { const CustomFields({ diff --git a/lib/ui/settings/custom_fields_vm.dart b/lib/ui/settings/custom_fields_vm.dart index 9b7f39f3f..fc6660321 100644 --- a/lib/ui/settings/custom_fields_vm.dart +++ b/lib/ui/settings/custom_fields_vm.dart @@ -1,19 +1,24 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/custom_fields.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class CustomFieldsScreen extends StatelessWidget { const CustomFieldsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/data_visualizations.dart b/lib/ui/settings/data_visualizations.dart index 8620d3428..bb241c8bd 100644 --- a/lib/ui/settings/data_visualizations.dart +++ b/lib/ui/settings/data_visualizations.dart @@ -1,7 +1,10 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/ui/settings/data_visualizations_vm.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/settings/data_visualizations_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class DataVisualizations extends StatefulWidget { diff --git a/lib/ui/settings/data_visualizations_vm.dart b/lib/ui/settings/data_visualizations_vm.dart index 363148f93..c721ee5e7 100644 --- a/lib/ui/settings/data_visualizations_vm.dart +++ b/lib/ui/settings/data_visualizations_vm.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/ui/settings/data_visualizations.dart'; import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/settings/data_visualizations.dart'; class DataVisualizationsScreen extends StatelessWidget { const DataVisualizationsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/device_settings.dart b/lib/ui/settings/device_settings.dart index 61628be08..f72c81a2c 100644 --- a/lib/ui/settings/device_settings.dart +++ b/lib/ui/settings/device_settings.dart @@ -1,8 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:timeago/timeago.dart' as timeago; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/static/color_theme_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -21,8 +28,6 @@ import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/strings.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:timeago/timeago.dart' as timeago; class DeviceSettings extends StatefulWidget { const DeviceSettings({ diff --git a/lib/ui/settings/device_settings_vm.dart b/lib/ui/settings/device_settings_vm.dart index 71b26d18e..63ea05cf1 100644 --- a/lib/ui/settings/device_settings_vm.dart +++ b/lib/ui/settings/device_settings_vm.dart @@ -1,8 +1,15 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:local_auth/local_auth.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -15,8 +22,6 @@ import 'package:invoiceninja_flutter/ui/settings/device_settings.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:local_auth/local_auth.dart'; -import 'package:redux/redux.dart'; class DeviceSettingsScreen extends StatelessWidget { const DeviceSettingsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/email_settings.dart b/lib/ui/settings/email_settings.dart index 2e71c2f44..d4e7cd0bc 100644 --- a/lib/ui/settings/email_settings.dart +++ b/lib/ui/settings/email_settings.dart @@ -1,13 +1,19 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_redux/flutter_redux.dart'; +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/user/user_selectors.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; @@ -15,11 +21,9 @@ import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/dynamic_selector.dart'; import 'package:invoiceninja_flutter/ui/settings/email_settings_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class EmailSettings extends StatefulWidget { const EmailSettings({ diff --git a/lib/ui/settings/email_settings_vm.dart b/lib/ui/settings/email_settings_vm.dart index eb120a0e1..7c4cfaa5c 100644 --- a/lib/ui/settings/email_settings_vm.dart +++ b/lib/ui/settings/email_settings_vm.dart @@ -1,11 +1,18 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -14,8 +21,6 @@ import 'package:invoiceninja_flutter/ui/settings/email_settings.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class EmailSettingsScreen extends StatelessWidget { const EmailSettingsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/expense_settings.dart b/lib/ui/settings/expense_settings.dart index 894e5657e..cc817f2fe 100644 --- a/lib/ui/settings/expense_settings.dart +++ b/lib/ui/settings/expense_settings.dart @@ -1,11 +1,14 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/settings/expense_settings_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class ExpenseSettings extends StatefulWidget { diff --git a/lib/ui/settings/expense_settings_vm.dart b/lib/ui/settings/expense_settings_vm.dart index 3f514e72e..ff472fa95 100644 --- a/lib/ui/settings/expense_settings_vm.dart +++ b/lib/ui/settings/expense_settings_vm.dart @@ -1,15 +1,20 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/expense_settings.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ExpenseSettingsScreen extends StatelessWidget { const ExpenseSettingsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/generated_numbers.dart b/lib/ui/settings/generated_numbers.dart index d382cb8e8..293741f53 100644 --- a/lib/ui/settings/generated_numbers.dart +++ b/lib/ui/settings/generated_numbers.dart @@ -1,8 +1,18 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; @@ -11,14 +21,9 @@ import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/settings/generated_numbers_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; -import 'package:url_launcher/url_launcher.dart'; class GeneratedNumbers extends StatefulWidget { const GeneratedNumbers({ diff --git a/lib/ui/settings/generated_numbers_vm.dart b/lib/ui/settings/generated_numbers_vm.dart index b3806c616..0d13b1f59 100644 --- a/lib/ui/settings/generated_numbers_vm.dart +++ b/lib/ui/settings/generated_numbers_vm.dart @@ -1,12 +1,19 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -14,8 +21,6 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/generated_numbers.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class GeneratedNumbersScreen extends StatelessWidget { const GeneratedNumbersScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/import_export.dart b/lib/ui/settings/import_export.dart index 8904d324e..b65d2bbec 100644 --- a/lib/ui/settings/import_export.dart +++ b/lib/ui/settings/import_export.dart @@ -1,18 +1,25 @@ +// Dart imports: import 'dart:convert'; -import 'package:built_collection/built_collection.dart'; -import 'package:file_picker/file_picker.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:file_picker/file_picker.dart'; +import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/import_model.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:flutter_redux/flutter_redux.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; @@ -24,7 +31,6 @@ import 'package:invoiceninja_flutter/utils/files.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class ImportExport extends StatefulWidget { const ImportExport({ diff --git a/lib/ui/settings/import_export_vm.dart b/lib/ui/settings/import_export_vm.dart index 0d5fdd0c1..b72c8f9bf 100644 --- a/lib/ui/settings/import_export_vm.dart +++ b/lib/ui/settings/import_export_vm.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/ui/settings/import_export.dart'; import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/settings/import_export.dart'; class ImportExportScreen extends StatelessWidget { const ImportExportScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/invoice_design.dart b/lib/ui/settings/invoice_design.dart index c5e177fe8..ab1b7e357 100644 --- a/lib/ui/settings/invoice_design.dart +++ b/lib/ui/settings/invoice_design.dart @@ -1,7 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_redux/flutter_redux.dart'; +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -16,6 +21,7 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/multiselect_dialog.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; @@ -26,10 +32,8 @@ import 'package:invoiceninja_flutter/ui/app/forms/design_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/learn_more.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/settings/invoice_design_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/fonts.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class InvoiceDesign extends StatefulWidget { const InvoiceDesign({ diff --git a/lib/ui/settings/invoice_design_vm.dart b/lib/ui/settings/invoice_design_vm.dart index 8a1127f03..b975771b7 100644 --- a/lib/ui/settings/invoice_design_vm.dart +++ b/lib/ui/settings/invoice_design_vm.dart @@ -1,9 +1,16 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; @@ -11,6 +18,7 @@ import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -19,8 +27,6 @@ import 'package:invoiceninja_flutter/ui/settings/invoice_design.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class InvoiceDesignScreen extends StatelessWidget { const InvoiceDesignScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/localization_settings.dart b/lib/ui/settings/localization_settings.dart index f41fee8db..77daebdea 100644 --- a/lib/ui/settings/localization_settings.dart +++ b/lib/ui/settings/localization_settings.dart @@ -1,13 +1,20 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_redux/flutter_redux.dart'; +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; @@ -16,13 +23,10 @@ import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/learn_more.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/settings/localization_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:url_launcher/url_launcher.dart'; class LocalizationSettings extends StatefulWidget { const LocalizationSettings({ diff --git a/lib/ui/settings/localization_vm.dart b/lib/ui/settings/localization_vm.dart index 8d78dc7e9..bf281cd2b 100644 --- a/lib/ui/settings/localization_vm.dart +++ b/lib/ui/settings/localization_vm.dart @@ -1,8 +1,15 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; @@ -10,6 +17,7 @@ import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -18,8 +26,6 @@ import 'package:invoiceninja_flutter/ui/app/app_builder.dart'; import 'package:invoiceninja_flutter/ui/settings/localization_settings.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class LocalizationScreen extends StatelessWidget { const LocalizationScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/online_payments.dart b/lib/ui/settings/online_payments.dart index 43e5b64e2..a426fdff5 100644 --- a/lib/ui/settings/online_payments.dart +++ b/lib/ui/settings/online_payments.dart @@ -1,15 +1,18 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/settings/online_payments_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/settings/online_payments_vm.dart b/lib/ui/settings/online_payments_vm.dart index 8b1b7fef4..3de8ab0a5 100644 --- a/lib/ui/settings/online_payments_vm.dart +++ b/lib/ui/settings/online_payments_vm.dart @@ -1,12 +1,19 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -14,8 +21,6 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/online_payments.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class OnlinePaymentsScreen extends StatelessWidget { const OnlinePaymentsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/product_settings.dart b/lib/ui/settings/product_settings.dart index a175baf67..f73b07a3c 100644 --- a/lib/ui/settings/product_settings.dart +++ b/lib/ui/settings/product_settings.dart @@ -1,9 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/settings/product_settings_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class ProductSettings extends StatefulWidget { diff --git a/lib/ui/settings/product_settings_vm.dart b/lib/ui/settings/product_settings_vm.dart index 8cec2fdc6..2ab718ea1 100644 --- a/lib/ui/settings/product_settings_vm.dart +++ b/lib/ui/settings/product_settings_vm.dart @@ -1,14 +1,19 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/product_settings.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class ProductSettingsScreen extends StatelessWidget { const ProductSettingsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/settings_list.dart b/lib/ui/settings/settings_list.dart index ceae77f7f..a84ae38de 100644 --- a/lib/ui/settings/settings_list.dart +++ b/lib/ui/settings/settings_list.dart @@ -1,6 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -11,7 +17,6 @@ import 'package:invoiceninja_flutter/ui/settings/settings_list_vm.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class SettingsList extends StatefulWidget { const SettingsList({ diff --git a/lib/ui/settings/settings_list_vm.dart b/lib/ui/settings/settings_list_vm.dart index 0f0d24fbd..5f72ba050 100644 --- a/lib/ui/settings/settings_list_vm.dart +++ b/lib/ui/settings/settings_list_vm.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/settings/settings_list.dart'; import 'package:redux/redux.dart'; +// Project imports: +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; +import 'package:invoiceninja_flutter/ui/settings/settings_list.dart'; + class SettingsListBuilder extends StatelessWidget { const SettingsListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/settings/settings_screen.dart b/lib/ui/settings/settings_screen.dart index 719d31042..9ead1bb93 100644 --- a/lib/ui/settings/settings_screen.dart +++ b/lib/ui/settings/settings_screen.dart @@ -1,10 +1,15 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/settings/settings_list_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/settings_screen_vm.dart'; diff --git a/lib/ui/settings/settings_screen_vm.dart b/lib/ui/settings/settings_screen_vm.dart index 2a15d2c6f..29084a84e 100644 --- a/lib/ui/settings/settings_screen_vm.dart +++ b/lib/ui/settings/settings_screen_vm.dart @@ -1,11 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/settings/settings_screen.dart'; import 'package:redux/redux.dart'; +// Project imports: +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/settings/settings_screen.dart'; import 'settings_screen.dart'; class SettingsScreenBuilder extends StatelessWidget { diff --git a/lib/ui/settings/settings_wizard.dart b/lib/ui/settings/settings_wizard.dart index 9f7f11705..ff1d8d165 100644 --- a/lib/ui/settings/settings_wizard.dart +++ b/lib/ui/settings/settings_wizard.dart @@ -1,11 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/user_model.dart'; diff --git a/lib/ui/settings/task_settings.dart b/lib/ui/settings/task_settings.dart index a1e973489..5fc994c63 100644 --- a/lib/ui/settings/task_settings.dart +++ b/lib/ui/settings/task_settings.dart @@ -1,13 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/settings_model.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/settings/task_settings_vm.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/settings/task_settings_vm.dart b/lib/ui/settings/task_settings_vm.dart index 02d24bda3..2dc955346 100644 --- a/lib/ui/settings/task_settings_vm.dart +++ b/lib/ui/settings/task_settings_vm.dart @@ -1,12 +1,19 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -14,8 +21,6 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/task_settings.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TaskSettingsScreen extends StatelessWidget { const TaskSettingsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/tax_settings.dart b/lib/ui/settings/tax_settings.dart index 999596b7c..cf1f4b049 100644 --- a/lib/ui/settings/tax_settings.dart +++ b/lib/ui/settings/tax_settings.dart @@ -1,16 +1,20 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +// Package imports: +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/invoice/tax_rate_dropdown.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/settings/tax_settings_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class TaxSettings extends StatefulWidget { const TaxSettings({ diff --git a/lib/ui/settings/tax_settings_vm.dart b/lib/ui/settings/tax_settings_vm.dart index 7858121dc..81ceb1f52 100644 --- a/lib/ui/settings/tax_settings_vm.dart +++ b/lib/ui/settings/tax_settings_vm.dart @@ -1,12 +1,19 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -14,8 +21,6 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/tax_settings.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TaxSettingsScreen extends StatelessWidget { const TaxSettingsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/templates_and_reminders.dart b/lib/ui/settings/templates_and_reminders.dart index 4cfd3118f..cf3f9ce60 100644 --- a/lib/ui/settings/templates_and_reminders.dart +++ b/lib/ui/settings/templates_and_reminders.dart @@ -1,16 +1,18 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/app_webview.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/app/variables.dart'; import 'package:invoiceninja_flutter/ui/settings/templates_and_reminders_vm.dart'; diff --git a/lib/ui/settings/templates_and_reminders_vm.dart b/lib/ui/settings/templates_and_reminders_vm.dart index b1fc23e15..0e57ce73e 100644 --- a/lib/ui/settings/templates_and_reminders_vm.dart +++ b/lib/ui/settings/templates_and_reminders_vm.dart @@ -1,12 +1,18 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:redux/redux.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/client_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/settings_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -14,7 +20,6 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/templates_and_reminders.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TemplatesAndRemindersScreen extends StatelessWidget { const TemplatesAndRemindersScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/user_details.dart b/lib/ui/settings/user_details.dart index f9bd7d136..4839b0ff0 100644 --- a/lib/ui/settings/user_details.dart +++ b/lib/ui/settings/user_details.dart @@ -1,26 +1,33 @@ +// Dart imports: import 'dart:convert'; -import 'package:flutter_styled_toast/flutter_styled_toast.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; -import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; -import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:qr_flutter/qr_flutter.dart'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:qr_flutter/qr_flutter.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; +import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; +import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/color_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/forms/notification_settings.dart'; import 'package:invoiceninja_flutter/ui/app/forms/password_field.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; @@ -29,7 +36,7 @@ import 'package:invoiceninja_flutter/ui/settings/user_details_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; class UserDetails extends StatefulWidget { const UserDetails({ diff --git a/lib/ui/settings/user_details_vm.dart b/lib/ui/settings/user_details_vm.dart index 16bc35a51..dfd1fed94 100644 --- a/lib/ui/settings/user_details_vm.dart +++ b/lib/ui/settings/user_details_vm.dart @@ -1,12 +1,20 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_builder.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/loading_dialog.dart'; @@ -15,8 +23,6 @@ import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/oauth.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class UserDetailsScreen extends StatelessWidget { const UserDetailsScreen({Key key}) : super(key: key); diff --git a/lib/ui/settings/workflow_settings.dart b/lib/ui/settings/workflow_settings.dart index 3aee9a66e..106625e9d 100644 --- a/lib/ui/settings/workflow_settings.dart +++ b/lib/ui/settings/workflow_settings.dart @@ -1,19 +1,24 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/settings_model.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/settings_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/settings/workflow_vm.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; class WorkflowSettings extends StatefulWidget { const WorkflowSettings({ diff --git a/lib/ui/settings/workflow_vm.dart b/lib/ui/settings/workflow_vm.dart index 5409ce887..88a8d5c8e 100644 --- a/lib/ui/settings/workflow_vm.dart +++ b/lib/ui/settings/workflow_vm.dart @@ -1,10 +1,17 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/company/company_actions.dart'; import 'package:invoiceninja_flutter/redux/group/group_actions.dart'; @@ -12,8 +19,6 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/settings/workflow_settings.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class WorkflowSettingsScreen extends StatelessWidget { const WorkflowSettingsScreen({Key key}) : super(key: key); diff --git a/lib/ui/subscription/edit/subscription_edit.dart b/lib/ui/subscription/edit/subscription_edit.dart index 53b59e81b..65f2e41bc 100644 --- a/lib/ui/subscription/edit/subscription_edit.dart +++ b/lib/ui/subscription/edit/subscription_edit.dart @@ -1,7 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -23,9 +28,9 @@ import 'package:invoiceninja_flutter/ui/app/forms/user_picker.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/subscription/edit/subscription_edit_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; class SubscriptionEdit extends StatefulWidget { diff --git a/lib/ui/subscription/edit/subscription_edit_vm.dart b/lib/ui/subscription/edit/subscription_edit_vm.dart index 7ff1b11d7..7a8f46e21 100644 --- a/lib/ui/subscription/edit/subscription_edit_vm.dart +++ b/lib/ui/subscription/edit/subscription_edit_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; -import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; -import 'package:invoiceninja_flutter/ui/subscription/edit/subscription_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/subscription/edit/subscription_edit.dart'; +import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; class SubscriptionEditScreen extends StatelessWidget { const SubscriptionEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/subscription/subscription_list_item.dart b/lib/ui/subscription/subscription_list_item.dart index 3fc6decce..2a1c956c4 100644 --- a/lib/ui/subscription/subscription_list_item.dart +++ b/lib/ui/subscription/subscription_list_item.dart @@ -1,13 +1,18 @@ -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; -import 'package:invoiceninja_flutter/utils/formatting.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; +import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; +import 'package:invoiceninja_flutter/utils/formatting.dart'; class SubscriptionListItem extends StatelessWidget { const SubscriptionListItem({ diff --git a/lib/ui/subscription/subscription_list_vm.dart b/lib/ui/subscription/subscription_list_vm.dart index 0f01c0654..ac06785f1 100644 --- a/lib/ui/subscription/subscription_list_vm.dart +++ b/lib/ui/subscription/subscription_list_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_selectors.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/subscription/subscription_list_item.dart'; import 'package:invoiceninja_flutter/ui/subscription/subscription_presenter.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; class SubscriptionListBuilder extends StatelessWidget { const SubscriptionListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/subscription/subscription_presenter.dart b/lib/ui/subscription/subscription_presenter.dart index cc3987710..20a743422 100644 --- a/lib/ui/subscription/subscription_presenter.dart +++ b/lib/ui/subscription/subscription_presenter.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/subscription/subscription_screen.dart b/lib/ui/subscription/subscription_screen.dart index f87351c1d..6046d3bce 100644 --- a/lib/ui/subscription/subscription_screen.dart +++ b/lib/ui/subscription/subscription_screen.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/subscription/subscription_list_vm.dart'; import 'package:invoiceninja_flutter/ui/subscription/subscription_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'subscription_screen_vm.dart'; class SubscriptionScreen extends StatelessWidget { diff --git a/lib/ui/subscription/subscription_screen_vm.dart b/lib/ui/subscription/subscription_screen_vm.dart index c88333a66..6fce5e0a6 100644 --- a/lib/ui/subscription/subscription_screen_vm.dart +++ b/lib/ui/subscription/subscription_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; import 'package:invoiceninja_flutter/redux/subscription/subscription_selectors.dart'; -import 'package:redux/redux.dart'; - import 'subscription_screen.dart'; class SubscriptionScreenBuilder extends StatelessWidget { diff --git a/lib/ui/subscription/view/subscription_view.dart b/lib/ui/subscription/view/subscription_view.dart index 2d86c52d2..95863f868 100644 --- a/lib/ui/subscription/view/subscription_view.dart +++ b/lib/ui/subscription/view/subscription_view.dart @@ -1,7 +1,13 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_selectors.dart'; @@ -9,11 +15,10 @@ import 'package:invoiceninja_flutter/ui/app/entities/entity_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; -import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view_vm.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:url_launcher/url_launcher.dart'; class SubscriptionView extends StatefulWidget { const SubscriptionView({ diff --git a/lib/ui/subscription/view/subscription_view_vm.dart b/lib/ui/subscription/view/subscription_view_vm.dart index 95da67446..674b0d4ac 100644 --- a/lib/ui/subscription/view/subscription_view_vm.dart +++ b/lib/ui/subscription/view/subscription_view_vm.dart @@ -1,19 +1,26 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/subscription/subscription_screen.dart'; +import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/subscription/subscription_actions.dart'; -import 'package:invoiceninja_flutter/data/models/subscription_model.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/subscription/view/subscription_view.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class SubscriptionViewScreen extends StatelessWidget { const SubscriptionViewScreen({ diff --git a/lib/ui/system/update_dialog.dart b/lib/ui/system/update_dialog.dart index b4a04dde3..1f88d4359 100644 --- a/lib/ui/system/update_dialog.dart +++ b/lib/ui/system/update_dialog.dart @@ -1,11 +1,18 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -13,9 +20,9 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; -import 'package:url_launcher/url_launcher.dart'; class UpdateDialog extends StatefulWidget { @override diff --git a/lib/ui/task/edit/task_edit.dart b/lib/ui/task/edit/task_edit.dart index b5d16ae7b..28db09d09 100644 --- a/lib/ui/task/edit/task_edit.dart +++ b/lib/ui/task/edit/task_edit.dart @@ -1,7 +1,14 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/task/edit/task_edit_desktop.dart b/lib/ui/task/edit/task_edit_desktop.dart index fec53ae67..fea3eb18d 100644 --- a/lib/ui/task/edit/task_edit_desktop.dart +++ b/lib/ui/task/edit/task_edit_desktop.dart @@ -1,7 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; @@ -22,7 +26,6 @@ import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; class TaskEditDesktop extends StatefulWidget { const TaskEditDesktop({ diff --git a/lib/ui/task/edit/task_edit_details.dart b/lib/ui/task/edit/task_edit_details.dart index 7b5eb5632..775adcce6 100644 --- a/lib/ui/task/edit/task_edit_details.dart +++ b/lib/ui/task/edit/task_edit_details.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; @@ -15,7 +19,6 @@ import 'package:invoiceninja_flutter/ui/task/edit/task_edit_details_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; class TaskEditDetails extends StatefulWidget { const TaskEditDetails({ diff --git a/lib/ui/task/edit/task_edit_details_vm.dart b/lib/ui/task/edit/task_edit_details_vm.dart index da002a577..5043e80b4 100644 --- a/lib/ui/task/edit/task_edit_details_vm.dart +++ b/lib/ui/task/edit/task_edit_details_vm.dart @@ -1,16 +1,23 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/task/edit/task_edit_desktop.dart'; import 'package:invoiceninja_flutter/ui/task/edit/task_edit_details.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; -import 'package:invoiceninja_flutter/data/models/task_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TaskEditDetailsScreen extends StatelessWidget { const TaskEditDetailsScreen({Key key}) : super(key: key); diff --git a/lib/ui/task/edit/task_edit_times.dart b/lib/ui/task/edit/task_edit_times.dart index 494b8680c..225d7521f 100644 --- a/lib/ui/task/edit/task_edit_times.dart +++ b/lib/ui/task/edit/task_edit_times.dart @@ -1,3 +1,7 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/duration_picker.dart'; @@ -7,7 +11,6 @@ import 'package:invoiceninja_flutter/ui/app/responsive_padding.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/task/edit/task_edit_times_vm.dart'; import 'package:invoiceninja_flutter/ui/task/task_time_view.dart'; -import 'package:flutter/material.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/task/edit/task_edit_times_vm.dart b/lib/ui/task/edit/task_edit_times_vm.dart index 4f9673e6b..752a3d16b 100644 --- a/lib/ui/task/edit/task_edit_times_vm.dart +++ b/lib/ui/task/edit/task_edit_times_vm.dart @@ -1,11 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; -import 'package:invoiceninja_flutter/ui/task/edit/task_edit_times.dart'; import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; +import 'package:invoiceninja_flutter/ui/task/edit/task_edit_times.dart'; class TaskEditTimesScreen extends StatelessWidget { const TaskEditTimesScreen({Key key}) : super(key: key); diff --git a/lib/ui/task/edit/task_edit_vm.dart b/lib/ui/task/edit/task_edit_vm.dart index d5f4c55b3..5834c425a 100644 --- a/lib/ui/task/edit/task_edit_vm.dart +++ b/lib/ui/task/edit/task_edit_vm.dart @@ -1,20 +1,27 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/task_model.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/task/edit/task_edit.dart'; import 'package:invoiceninja_flutter/ui/task/view/task_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; -import 'package:invoiceninja_flutter/data/models/task_model.dart'; -import 'package:invoiceninja_flutter/ui/task/edit/task_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TaskEditScreen extends StatelessWidget { const TaskEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/task/kanban/kanban_card.dart b/lib/ui/task/kanban/kanban_card.dart index 05dac139b..f80458941 100644 --- a/lib/ui/task/kanban/kanban_card.dart +++ b/lib/ui/task/kanban/kanban_card.dart @@ -1,19 +1,26 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/app/buttons/app_text_button.dart'; -import 'package:invoiceninja_flutter/ui/app/live_text.dart'; -import 'package:invoiceninja_flutter/ui/task/kanban/kanban_view.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/buttons/app_text_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; +import 'package:invoiceninja_flutter/ui/app/live_text.dart'; +import 'package:invoiceninja_flutter/ui/task/kanban/kanban_view.dart'; import 'package:invoiceninja_flutter/utils/colors.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class KanbanTaskCard extends StatefulWidget { const KanbanTaskCard({ diff --git a/lib/ui/task/kanban/kanban_status.dart b/lib/ui/task/kanban/kanban_status.dart index 9af62c9b4..7ce8551c2 100644 --- a/lib/ui/task/kanban/kanban_status.dart +++ b/lib/ui/task/kanban/kanban_status.dart @@ -1,7 +1,12 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/ui/app/buttons/app_text_button.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/ui/app/buttons/app_text_button.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/task/kanban/kanban_view.dart b/lib/ui/task/kanban/kanban_view.dart index 4336225be..c41f8a8e3 100644 --- a/lib/ui/task/kanban/kanban_view.dart +++ b/lib/ui/task/kanban/kanban_view.dart @@ -1,12 +1,17 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:boardview/board_item.dart'; import 'package:boardview/board_list.dart'; import 'package:boardview/boardview.dart'; import 'package:boardview/boardview_controller.dart'; -import 'package:flutter/material.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/task/kanban/kanban_card.dart'; import 'package:invoiceninja_flutter/ui/task/kanban/kanban_status.dart'; import 'package:invoiceninja_flutter/ui/task/kanban/kanban_view_vm.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/task/kanban/kanban_view_vm.dart b/lib/ui/task/kanban/kanban_view_vm.dart index 74bbf2a52..2d731afb7 100644 --- a/lib/ui/task/kanban/kanban_view_vm.dart +++ b/lib/ui/task/kanban/kanban_view_vm.dart @@ -1,13 +1,20 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; import 'package:invoiceninja_flutter/ui/task/kanban/kanban_view.dart'; -import 'package:redux/redux.dart'; class KanbanViewBuilder extends StatefulWidget { const KanbanViewBuilder({Key key}) : super(key: key); diff --git a/lib/ui/task/task_list_item.dart b/lib/ui/task/task_list_item.dart index 8b7ec2fc4..17c18b7eb 100644 --- a/lib/ui/task/task_list_item.dart +++ b/lib/ui/task/task_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/task/task_list_vm.dart b/lib/ui/task/task_list_vm.dart index 24d2cb058..e8d3b232c 100644 --- a/lib/ui/task/task_list_vm.dart +++ b/lib/ui/task/task_list_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -16,7 +23,6 @@ import 'package:invoiceninja_flutter/ui/task/task_list_item.dart'; import 'package:invoiceninja_flutter/ui/task/task_presenter.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class TaskListBuilder extends StatelessWidget { const TaskListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/task/task_presenter.dart b/lib/ui/task/task_presenter.dart index 23f46e9e2..a72024869 100644 --- a/lib/ui/task/task_presenter.dart +++ b/lib/ui/task/task_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/task/task_screen.dart b/lib/ui/task/task_screen.dart index 582ecccd5..adc9a2401 100644 --- a/lib/ui/task/task_screen.dart +++ b/lib/ui/task/task_screen.dart @@ -1,23 +1,28 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/task/kanban/kanban_view_vm.dart'; +import 'package:invoiceninja_flutter/ui/task/task_list_vm.dart'; import 'package:invoiceninja_flutter/ui/task/task_presenter.dart'; import 'package:invoiceninja_flutter/ui/task/task_screen_vm.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/task/task_list_vm.dart'; -import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class TaskScreen extends StatelessWidget { const TaskScreen({ diff --git a/lib/ui/task/task_screen_vm.dart b/lib/ui/task/task_screen_vm.dart index 1a3d61e21..86fc82669 100644 --- a/lib/ui/task/task_screen_vm.dart +++ b/lib/ui/task/task_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; -import 'package:redux/redux.dart'; - import 'task_screen.dart'; class TaskScreenBuilder extends StatelessWidget { diff --git a/lib/ui/task/task_time_view.dart b/lib/ui/task/task_time_view.dart index 6e0f6ba35..7aa8e5c6c 100644 --- a/lib/ui/task/task_time_view.dart +++ b/lib/ui/task/task_time_view.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:intl/intl.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/company/company_selectors.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class TaskTimeListTile extends StatelessWidget { diff --git a/lib/ui/task/view/task_view.dart b/lib/ui/task/view/task_view.dart index d47ddf57c..06069af4c 100644 --- a/lib/ui/task/view/task_view.dart +++ b/lib/ui/task/view/task_view.dart @@ -1,8 +1,13 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/bottom_buttons.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; diff --git a/lib/ui/task/view/task_view_documents.dart b/lib/ui/task/view/task_view_documents.dart index 65a025e26..5a327f7f9 100644 --- a/lib/ui/task/view/task_view_documents.dart +++ b/lib/ui/task/view/task_view_documents.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/document_grid.dart'; import 'package:invoiceninja_flutter/ui/task/view/task_view_vm.dart'; diff --git a/lib/ui/task/view/task_view_overview.dart b/lib/ui/task/view/task_view_overview.dart index aaf4ade45..ccb29e789 100644 --- a/lib/ui/task/view/task_view_overview.dart +++ b/lib/ui/task/view/task_view_overview.dart @@ -1,6 +1,11 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/task/task_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart'; diff --git a/lib/ui/task/view/task_view_vm.dart b/lib/ui/task/view/task_view_vm.dart index 39965cd46..ab8b5c2cc 100644 --- a/lib/ui/task/view/task_view_vm.dart +++ b/lib/ui/task/view/task_view_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/task_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -15,7 +22,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/task/view/task_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class TaskViewScreen extends StatelessWidget { const TaskViewScreen({ diff --git a/lib/ui/task_status/edit/task_status_edit.dart b/lib/ui/task_status/edit/task_status_edit.dart index 5d4aa9139..1e27703c3 100644 --- a/lib/ui/task_status/edit/task_status_edit.dart +++ b/lib/ui/task_status/edit/task_status_edit.dart @@ -1,13 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/color_picker.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/task_status/edit/task_status_edit_vm.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class TaskStatusEdit extends StatefulWidget { const TaskStatusEdit({ diff --git a/lib/ui/task_status/edit/task_status_edit_vm.dart b/lib/ui/task_status/edit/task_status_edit_vm.dart index f24d3347d..027821d53 100644 --- a/lib/ui/task_status/edit/task_status_edit_vm.dart +++ b/lib/ui/task_status/edit/task_status_edit_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; -import 'package:invoiceninja_flutter/ui/task_status/edit/task_status_edit.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/task_status/edit/task_status_edit.dart'; +import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; class TaskStatusEditScreen extends StatelessWidget { const TaskStatusEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/task_status/task_status_list_item.dart b/lib/ui/task_status/task_status_list_item.dart index 03320693b..5b15b728a 100644 --- a/lib/ui/task_status/task_status_list_item.dart +++ b/lib/ui/task_status/task_status_list_item.dart @@ -1,13 +1,18 @@ -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; -import 'package:invoiceninja_flutter/utils/formatting.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; +import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; +import 'package:invoiceninja_flutter/utils/formatting.dart'; class TaskStatusListItem extends StatelessWidget { const TaskStatusListItem({ diff --git a/lib/ui/task_status/task_status_list_vm.dart b/lib/ui/task_status/task_status_list_vm.dart index 39277a2e1..6ea645f67 100644 --- a/lib/ui/task_status/task_status_list_vm.dart +++ b/lib/ui/task_status/task_status_list_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/task_status/task_status_list_item.dart'; import 'package:invoiceninja_flutter/ui/task_status/task_status_presenter.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; class TaskStatusListBuilder extends StatelessWidget { const TaskStatusListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/task_status/task_status_presenter.dart b/lib/ui/task_status/task_status_presenter.dart index 050f1f511..fc89516ec 100644 --- a/lib/ui/task_status/task_status_presenter.dart +++ b/lib/ui/task_status/task_status_presenter.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/task_status/task_status_screen.dart b/lib/ui/task_status/task_status_screen.dart index 21b49f702..e671aa295 100644 --- a/lib/ui/task_status/task_status_screen.dart +++ b/lib/ui/task_status/task_status_screen.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/task_status/task_status_list_vm.dart'; import 'package:invoiceninja_flutter/ui/task_status/task_status_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'task_status_screen_vm.dart'; class TaskStatusScreen extends StatelessWidget { diff --git a/lib/ui/task_status/task_status_screen_vm.dart b/lib/ui/task_status/task_status_screen_vm.dart index 75360a49e..7d800f2dd 100644 --- a/lib/ui/task_status/task_status_screen_vm.dart +++ b/lib/ui/task_status/task_status_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart'; -import 'package:redux/redux.dart'; - import 'task_status_screen.dart'; class TaskStatusScreenBuilder extends StatelessWidget { diff --git a/lib/ui/task_status/view/task_status_view.dart b/lib/ui/task_status/view/task_status_view.dart index 25a10b8a5..91bf7b05e 100644 --- a/lib/ui/task_status/view/task_status_view.dart +++ b/lib/ui/task_status/view/task_status_view.dart @@ -1,13 +1,16 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; -import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view_vm.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/ui/task_status/view/task_status_view_vm.dart b/lib/ui/task_status/view/task_status_view_vm.dart index ee19b7ea9..c82d3f686 100644 --- a/lib/ui/task_status/view/task_status_view_vm.dart +++ b/lib/ui/task_status/view/task_status_view_vm.dart @@ -1,19 +1,26 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/task_status/task_status_screen.dart'; +import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/task_status/task_status_actions.dart'; -import 'package:invoiceninja_flutter/data/models/task_status_model.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/task_status/view/task_status_view.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TaskStatusViewScreen extends StatelessWidget { const TaskStatusViewScreen({ diff --git a/lib/ui/tax_rate/edit/tax_rate_edit.dart b/lib/ui/tax_rate/edit/tax_rate_edit.dart index cd7a697ac..39fe567d6 100644 --- a/lib/ui/tax_rate/edit/tax_rate_edit.dart +++ b/lib/ui/tax_rate/edit/tax_rate_edit.dart @@ -1,10 +1,12 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +// Project imports: +import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; -import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/tax_rate/edit/tax_rate_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart b/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart index 293a8d79d..aa93b3b7c 100644 --- a/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart +++ b/lib/ui/tax_rate/edit/tax_rate_edit_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/view/tax_rate_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/edit/tax_rate_edit.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/edit/tax_rate_edit.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/view/tax_rate_view_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; class TaxRateEditScreen extends StatelessWidget { const TaxRateEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/tax_rate/tax_rate_list_item.dart b/lib/ui/tax_rate/tax_rate_list_item.dart index 472be2fb4..4eba3eef3 100644 --- a/lib/ui/tax_rate/tax_rate_list_item.dart +++ b/lib/ui/tax_rate/tax_rate_list_item.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; class TaxRateListItem extends StatelessWidget { const TaxRateListItem({ diff --git a/lib/ui/tax_rate/tax_rate_list_vm.dart b/lib/ui/tax_rate/tax_rate_list_vm.dart index a1fd50b1f..ed3386c7b 100644 --- a/lib/ui/tax_rate/tax_rate_list_vm.dart +++ b/lib/ui/tax_rate/tax_rate_list_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_list_item.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; +import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_selectors.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; +import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_list_item.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class TaxRateListBuilder extends StatelessWidget { const TaxRateListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/tax_rate/tax_rate_screen.dart b/lib/ui/tax_rate/tax_rate_screen.dart index ee2264abe..2950e29ee 100644 --- a/lib/ui/tax_rate/tax_rate_screen.dart +++ b/lib/ui/tax_rate/tax_rate_screen.dart @@ -1,16 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; -import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen_vm.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_list_vm.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; +import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_list_vm.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen_vm.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class TaxRateSettingsScreen extends StatelessWidget { const TaxRateSettingsScreen({ diff --git a/lib/ui/tax_rate/tax_rate_screen_vm.dart b/lib/ui/tax_rate/tax_rate_screen_vm.dart index adde681a6..b3bf5266e 100644 --- a/lib/ui/tax_rate/tax_rate_screen_vm.dart +++ b/lib/ui/tax_rate/tax_rate_screen_vm.dart @@ -1,8 +1,14 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -10,7 +16,6 @@ import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_selectors.dart'; import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:redux/redux.dart'; class TaxRateScreenBuilder extends StatelessWidget { const TaxRateScreenBuilder({Key key}) : super(key: key); diff --git a/lib/ui/tax_rate/view/tax_rate_view.dart b/lib/ui/tax_rate/view/tax_rate_view.dart index f95048a6f..184c9c5c1 100644 --- a/lib/ui/tax_rate/view/tax_rate_view.dart +++ b/lib/ui/tax_rate/view/tax_rate_view.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; diff --git a/lib/ui/tax_rate/view/tax_rate_view_vm.dart b/lib/ui/tax_rate/view/tax_rate_view_vm.dart index 67a9c87c2..0742e1855 100644 --- a/lib/ui/tax_rate/view/tax_rate_view_vm.dart +++ b/lib/ui/tax_rate/view/tax_rate_view_vm.dart @@ -1,19 +1,26 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; -import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/tax_rate/view/tax_rate_view.dart'; +import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_actions.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/tax_rate_screen.dart'; +import 'package:invoiceninja_flutter/ui/tax_rate/view/tax_rate_view.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class TaxRateViewScreen extends StatelessWidget { const TaxRateViewScreen({ diff --git a/lib/ui/token/edit/token_edit.dart b/lib/ui/token/edit/token_edit.dart index a0d4ca6ff..5ff582aeb 100644 --- a/lib/ui/token/edit/token_edit.dart +++ b/lib/ui/token/edit/token_edit.dart @@ -1,12 +1,15 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/token/edit/token_edit_vm.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class TokenEdit extends StatefulWidget { const TokenEdit({ diff --git a/lib/ui/token/edit/token_edit_vm.dart b/lib/ui/token/edit/token_edit_vm.dart index 6d9552cda..db1e9b7bc 100644 --- a/lib/ui/token/edit/token_edit_vm.dart +++ b/lib/ui/token/edit/token_edit_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/token_model.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/token/edit/token_edit.dart'; +import 'package:invoiceninja_flutter/ui/token/view/token_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/token/view/token_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; -import 'package:invoiceninja_flutter/data/models/token_model.dart'; -import 'package:invoiceninja_flutter/ui/token/edit/token_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TokenEditScreen extends StatelessWidget { const TokenEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/token/token_list_item.dart b/lib/ui/token/token_list_item.dart index 9bcbfae8e..438fe4b67 100644 --- a/lib/ui/token/token_list_item.dart +++ b/lib/ui/token/token_list_item.dart @@ -1,12 +1,17 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/token_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; +import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; class TokenListItem extends StatelessWidget { const TokenListItem({ diff --git a/lib/ui/token/token_list_vm.dart b/lib/ui/token/token_list_vm.dart index e659c5249..f277f1c27 100644 --- a/lib/ui/token/token_list_vm.dart +++ b/lib/ui/token/token_list_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/token_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; +import 'package:invoiceninja_flutter/redux/token/token_selectors.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/token/token_list_item.dart'; import 'package:invoiceninja_flutter/ui/token/token_presenter.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/token/token_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; class TokenListBuilder extends StatelessWidget { const TokenListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/token/token_presenter.dart b/lib/ui/token/token_presenter.dart index 3d7bf3e0e..703082d06 100644 --- a/lib/ui/token/token_presenter.dart +++ b/lib/ui/token/token_presenter.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/token/token_screen.dart b/lib/ui/token/token_screen.dart index 1eb0ce9a6..8c02c4115 100644 --- a/lib/ui/token/token_screen.dart +++ b/lib/ui/token/token_screen.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/token/token_list_vm.dart'; import 'package:invoiceninja_flutter/ui/token/token_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'token_screen_vm.dart'; class TokenScreen extends StatelessWidget { diff --git a/lib/ui/token/token_screen_vm.dart b/lib/ui/token/token_screen_vm.dart index e3b1010ac..35583a2f5 100644 --- a/lib/ui/token/token_screen_vm.dart +++ b/lib/ui/token/token_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; import 'package:invoiceninja_flutter/redux/token/token_selectors.dart'; -import 'package:redux/redux.dart'; - import 'token_screen.dart'; class TokenScreenBuilder extends StatelessWidget { diff --git a/lib/ui/token/view/token_view.dart b/lib/ui/token/view/token_view.dart index a03dfc12f..6e8123d36 100644 --- a/lib/ui/token/view/token_view.dart +++ b/lib/ui/token/view/token_view.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/token_model.dart'; import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; diff --git a/lib/ui/token/view/token_view_vm.dart b/lib/ui/token/view/token_view_vm.dart index d5922048b..968ace97a 100644 --- a/lib/ui/token/view/token_view_vm.dart +++ b/lib/ui/token/view/token_view_vm.dart @@ -1,19 +1,26 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/token_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/ui/token/token_screen.dart'; +import 'package:invoiceninja_flutter/ui/token/view/token_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/token/token_actions.dart'; -import 'package:invoiceninja_flutter/data/models/token_model.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/token/view/token_view.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class TokenViewScreen extends StatelessWidget { const TokenViewScreen({ diff --git a/lib/ui/user/edit/user_edit.dart b/lib/ui/user/edit/user_edit.dart index 3571ecc15..c83d4867c 100644 --- a/lib/ui/user/edit/user_edit.dart +++ b/lib/ui/user/edit/user_edit.dart @@ -1,6 +1,11 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; diff --git a/lib/ui/user/edit/user_edit_vm.dart b/lib/ui/user/edit/user_edit_vm.dart index abf80094c..6db86e67d 100644 --- a/lib/ui/user/edit/user_edit_vm.dart +++ b/lib/ui/user/edit/user_edit_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/user_model.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/user/edit/user_edit.dart'; +import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/dialogs.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; -import 'package:invoiceninja_flutter/data/models/user_model.dart'; -import 'package:invoiceninja_flutter/ui/user/edit/user_edit.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class UserEditScreen extends StatelessWidget { const UserEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/user/user_list_item.dart b/lib/ui/user/user_list_item.dart index 7962a5957..0c1f4eb2c 100644 --- a/lib/ui/user/user_list_item.dart +++ b/lib/ui/user/user_list_item.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/user_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; class UserListItem extends StatelessWidget { const UserListItem({ diff --git a/lib/ui/user/user_list_vm.dart b/lib/ui/user/user_list_vm.dart index 086ba7d74..a279eded2 100644 --- a/lib/ui/user/user_list_vm.dart +++ b/lib/ui/user/user_list_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/user_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; +import 'package:invoiceninja_flutter/redux/user/user_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/user/user_list_item.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/user/user_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; class UserListBuilder extends StatelessWidget { const UserListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/user/user_screen.dart b/lib/ui/user/user_screen.dart index 9fbc85df2..ebd49dbcf 100644 --- a/lib/ui/user/user_screen.dart +++ b/lib/ui/user/user_screen.dart @@ -1,17 +1,22 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; -import 'package:invoiceninja_flutter/data/models/user_model.dart'; -import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; -import 'package:invoiceninja_flutter/ui/user/user_screen_vm.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/user/user_list_vm.dart'; +import 'package:invoiceninja_flutter/data/models/user_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; +import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/user/user_list_vm.dart'; +import 'package:invoiceninja_flutter/ui/user/user_screen_vm.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class UserScreen extends StatelessWidget { const UserScreen({ diff --git a/lib/ui/user/user_screen_vm.dart b/lib/ui/user/user_screen_vm.dart index e2700d45c..559192e47 100644 --- a/lib/ui/user/user_screen_vm.dart +++ b/lib/ui/user/user_screen_vm.dart @@ -1,13 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/data/models/user_model.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/user_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/user/user_selectors.dart'; -import 'package:redux/redux.dart'; import 'user_screen.dart'; class UserScreenBuilder extends StatelessWidget { diff --git a/lib/ui/user/view/user_view.dart b/lib/ui/user/view/user_view.dart index c4e251a12..6b95c5ce6 100644 --- a/lib/ui/user/view/user_view.dart +++ b/lib/ui/user/view/user_view.dart @@ -1,4 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_selectors.dart'; @@ -18,7 +24,6 @@ import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart'; -import 'package:flutter/material.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class UserView extends StatelessWidget { diff --git a/lib/ui/user/view/user_view_vm.dart b/lib/ui/user/view/user_view_vm.dart index 42be1bbdf..069cd459f 100644 --- a/lib/ui/user/view/user_view_vm.dart +++ b/lib/ui/user/view/user_view_vm.dart @@ -1,19 +1,26 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/user_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; import 'package:invoiceninja_flutter/ui/user/user_screen.dart'; +import 'package:invoiceninja_flutter/ui/user/view/user_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/user/user_actions.dart'; -import 'package:invoiceninja_flutter/data/models/user_model.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/user/view/user_view.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class UserViewScreen extends StatelessWidget { const UserViewScreen({ diff --git a/lib/ui/vendor/edit/vendor_edit.dart b/lib/ui/vendor/edit/vendor_edit.dart index 7f852b025..36d2ae990 100644 --- a/lib/ui/vendor/edit/vendor_edit.dart +++ b/lib/ui/vendor/edit/vendor_edit.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; diff --git a/lib/ui/vendor/edit/vendor_edit_address.dart b/lib/ui/vendor/edit/vendor_edit_address.dart index 3c1654414..d69ae521f 100644 --- a/lib/ui/vendor/edit/vendor_edit_address.dart +++ b/lib/ui/vendor/edit/vendor_edit_address.dart @@ -1,13 +1,16 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; class VendorEditAddress extends StatefulWidget { const VendorEditAddress({ diff --git a/lib/ui/vendor/edit/vendor_edit_contacts.dart b/lib/ui/vendor/edit/vendor_edit_contacts.dart index 42658a724..bb60fac53 100644 --- a/lib/ui/vendor/edit/vendor_edit_contacts.dart +++ b/lib/ui/vendor/edit/vendor_edit_contacts.dart @@ -1,6 +1,9 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; diff --git a/lib/ui/vendor/edit/vendor_edit_contacts_vm.dart b/lib/ui/vendor/edit/vendor_edit_contacts_vm.dart index aab3dc796..0fdf4426b 100644 --- a/lib/ui/vendor/edit/vendor_edit_contacts_vm.dart +++ b/lib/ui/vendor/edit/vendor_edit_contacts_vm.dart @@ -1,12 +1,17 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_contacts.dart'; -import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_vm.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; +import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_contacts.dart'; +import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_vm.dart'; class VendorEditContactsScreen extends StatelessWidget { const VendorEditContactsScreen({Key key, @required this.viewModel}) diff --git a/lib/ui/vendor/edit/vendor_edit_desktop.dart b/lib/ui/vendor/edit/vendor_edit_desktop.dart index 310eb80ed..01bb32051 100644 --- a/lib/ui/vendor/edit/vendor_edit_desktop.dart +++ b/lib/ui/vendor/edit/vendor_edit_desktop.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_address.dart'; diff --git a/lib/ui/vendor/edit/vendor_edit_details.dart b/lib/ui/vendor/edit/vendor_edit_details.dart index 62d6c967f..35e31bfb9 100644 --- a/lib/ui/vendor/edit/vendor_edit_details.dart +++ b/lib/ui/vendor/edit/vendor_edit_details.dart @@ -1,8 +1,15 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:contacts_service/contacts_service.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/ui/app/form_card.dart'; @@ -13,7 +20,6 @@ import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/contacts.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:contacts_service/contacts_service.dart'; class VendorEditDetails extends StatefulWidget { const VendorEditDetails({ diff --git a/lib/ui/vendor/edit/vendor_edit_footer.dart b/lib/ui/vendor/edit/vendor_edit_footer.dart index d269c5c01..becd7f257 100644 --- a/lib/ui/vendor/edit/vendor_edit_footer.dart +++ b/lib/ui/vendor/edit/vendor_edit_footer.dart @@ -1,8 +1,13 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/data/models/vendor_model.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/vendor_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/app_border.dart'; diff --git a/lib/ui/vendor/edit/vendor_edit_notes.dart b/lib/ui/vendor/edit/vendor_edit_notes.dart index f6cfba777..4fec2d378 100644 --- a/lib/ui/vendor/edit/vendor_edit_notes.dart +++ b/lib/ui/vendor/edit/vendor_edit_notes.dart @@ -1,14 +1,17 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart'; +import 'package:invoiceninja_flutter/ui/app/form_card.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/ui/app/form_card.dart'; -import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; class VendorEditNotes extends StatefulWidget { const VendorEditNotes({ diff --git a/lib/ui/vendor/edit/vendor_edit_vm.dart b/lib/ui/vendor/edit/vendor_edit_vm.dart index b7e5da603..16c048624 100644 --- a/lib/ui/vendor/edit/vendor_edit_vm.dart +++ b/lib/ui/vendor/edit/vendor_edit_vm.dart @@ -1,11 +1,19 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/vendor_model.dart'; +import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; @@ -14,8 +22,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/vendor/edit/vendor_edit.dart'; import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_vm.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:invoiceninja_flutter/main_app.dart'; -import 'package:redux/redux.dart'; class VendorEditScreen extends StatelessWidget { const VendorEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/vendor/vendor_list_item.dart b/lib/ui/vendor/vendor_list_item.dart index 0d7a354a6..45726793d 100644 --- a/lib/ui/vendor/vendor_list_item.dart +++ b/lib/ui/vendor/vendor_list_item.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; diff --git a/lib/ui/vendor/vendor_list_vm.dart b/lib/ui/vendor/vendor_list_vm.dart index d58c1892b..5834cb7fc 100644 --- a/lib/ui/vendor/vendor_list_vm.dart +++ b/lib/ui/vendor/vendor_list_vm.dart @@ -1,9 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:built_collection/built_collection.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; @@ -15,7 +23,6 @@ import 'package:invoiceninja_flutter/ui/vendor/vendor_list_item.dart'; import 'package:invoiceninja_flutter/ui/vendor/vendor_presenter.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class VendorListBuilder extends StatelessWidget { const VendorListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/vendor/vendor_presenter.dart b/lib/ui/vendor/vendor_presenter.dart index 022bc10d1..d77177636 100644 --- a/lib/ui/vendor/vendor_presenter.dart +++ b/lib/ui/vendor/vendor_presenter.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; diff --git a/lib/ui/vendor/vendor_screen.dart b/lib/ui/vendor/vendor_screen.dart index f5911a22a..d7ff1f1f1 100644 --- a/lib/ui/vendor/vendor_screen.dart +++ b/lib/ui/vendor/vendor_screen.dart @@ -1,16 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; +import 'package:invoiceninja_flutter/ui/vendor/vendor_list_vm.dart'; import 'package:invoiceninja_flutter/ui/vendor/vendor_presenter.dart'; import 'package:invoiceninja_flutter/ui/vendor/vendor_screen_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/vendor/vendor_list_vm.dart'; -import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; -import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; class VendorScreen extends StatelessWidget { const VendorScreen({ diff --git a/lib/ui/vendor/vendor_screen_vm.dart b/lib/ui/vendor/vendor_screen_vm.dart index 47d56213b..b0fd6df51 100644 --- a/lib/ui/vendor/vendor_screen_vm.dart +++ b/lib/ui/vendor/vendor_screen_vm.dart @@ -1,13 +1,17 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_selectors.dart'; -import 'package:redux/redux.dart'; - import 'vendor_screen.dart'; class VendorScreenBuilder extends StatelessWidget { diff --git a/lib/ui/vendor/view/vendor_view.dart b/lib/ui/vendor/view/vendor_view.dart index f506c7c66..6554f1093 100644 --- a/lib/ui/vendor/view/vendor_view.dart +++ b/lib/ui/vendor/view/vendor_view.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; @@ -8,8 +13,8 @@ import 'package:invoiceninja_flutter/ui/app/buttons/bottom_buttons.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_details.dart'; import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_documents.dart'; -import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_vm.dart'; import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_overview.dart'; +import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_vm.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class VendorView extends StatefulWidget { diff --git a/lib/ui/vendor/view/vendor_view_details.dart b/lib/ui/vendor/view/vendor_view_details.dart index da6f83361..b28b84195 100644 --- a/lib/ui/vendor/view/vendor_view_details.dart +++ b/lib/ui/vendor/view/vendor_view_details.dart @@ -1,12 +1,19 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/lists/app_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; -import 'package:url_launcher/url_launcher.dart'; class VendorViewDetails extends StatefulWidget { const VendorViewDetails({this.vendor}); diff --git a/lib/ui/vendor/view/vendor_view_documents.dart b/lib/ui/vendor/view/vendor_view_documents.dart index 7512351bd..d4158e179 100644 --- a/lib/ui/vendor/view/vendor_view_documents.dart +++ b/lib/ui/vendor/view/vendor_view_documents.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/ui/app/document_grid.dart'; import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_vm.dart'; diff --git a/lib/ui/vendor/view/vendor_view_overview.dart b/lib/ui/vendor/view/vendor_view_overview.dart index 74b82d260..c72b29906 100644 --- a/lib/ui/vendor/view/vendor_view_overview.dart +++ b/lib/ui/vendor/view/vendor_view_overview.dart @@ -1,6 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/data/models/vendor_model.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/entities.dart'; +import 'package:invoiceninja_flutter/data/models/vendor_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/expense/expense_selectors.dart'; import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_selectors.dart'; @@ -8,12 +14,11 @@ import 'package:invoiceninja_flutter/redux/vendor/vendor_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_list_tile.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; +import 'package:invoiceninja_flutter/ui/app/icon_message.dart'; import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view_vm.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/ui/app/icon_message.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class VendorOverview extends StatelessWidget { diff --git a/lib/ui/vendor/view/vendor_view_vm.dart b/lib/ui/vendor/view/vendor_view_vm.dart index c80da2121..cd3623e7d 100644 --- a/lib/ui/vendor/view/vendor_view_vm.dart +++ b/lib/ui/vendor/view/vendor_view_vm.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/vendor_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; @@ -15,7 +22,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/vendor/view/vendor_view.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; class VendorViewScreen extends StatelessWidget { const VendorViewScreen({ diff --git a/lib/ui/webhook/edit/webhook_edit.dart b/lib/ui/webhook/edit/webhook_edit.dart index 7ff3b0590..606ea1105 100644 --- a/lib/ui/webhook/edit/webhook_edit.dart +++ b/lib/ui/webhook/edit/webhook_edit.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart'; @@ -9,8 +12,8 @@ import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart'; -import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; +import 'package:invoiceninja_flutter/utils/localization.dart'; class WebhookEdit extends StatefulWidget { const WebhookEdit({ diff --git a/lib/ui/webhook/edit/webhook_edit_vm.dart b/lib/ui/webhook/edit/webhook_edit_vm.dart index 9ae65b16d..da08d9429 100644 --- a/lib/ui/webhook/edit/webhook_edit_vm.dart +++ b/lib/ui/webhook/edit/webhook_edit_vm.dart @@ -1,21 +1,28 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; -import 'package:invoiceninja_flutter/utils/completers.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; -import 'package:invoiceninja_flutter/ui/webhook/view/webhook_view_vm.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; -import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; -import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; +import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; +import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit.dart'; +import 'package:invoiceninja_flutter/ui/webhook/view/webhook_view_vm.dart'; +import 'package:invoiceninja_flutter/utils/completers.dart'; class WebhookEditScreen extends StatelessWidget { const WebhookEditScreen({Key key}) : super(key: key); diff --git a/lib/ui/webhook/view/webhook_view.dart b/lib/ui/webhook/view/webhook_view.dart index 9cf49eb74..9347fdf16 100644 --- a/lib/ui/webhook/view/webhook_view.dart +++ b/lib/ui/webhook/view/webhook_view.dart @@ -1,5 +1,8 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; diff --git a/lib/ui/webhook/view/webhook_view_vm.dart b/lib/ui/webhook/view/webhook_view_vm.dart index 5015dbeb1..40573cc2a 100644 --- a/lib/ui/webhook/view/webhook_view_vm.dart +++ b/lib/ui/webhook/view/webhook_view_vm.dart @@ -1,19 +1,26 @@ +// Dart imports: import 'dart:async'; -import 'package:invoiceninja_flutter/constants.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/data/models/models.dart'; +import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; +import 'package:invoiceninja_flutter/ui/webhook/view/webhook_view.dart'; import 'package:invoiceninja_flutter/ui/webhook/webhook_screen.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:redux/redux.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; -import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/webhook/view/webhook_view.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; class WebhookViewScreen extends StatelessWidget { const WebhookViewScreen({ diff --git a/lib/ui/webhook/webhook_list_item.dart b/lib/ui/webhook/webhook_list_item.dart index 888a18623..904dbcec5 100644 --- a/lib/ui/webhook/webhook_list_item.dart +++ b/lib/ui/webhook/webhook_list_item.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; class WebhookListItem extends StatelessWidget { diff --git a/lib/ui/webhook/webhook_list_vm.dart b/lib/ui/webhook/webhook_list_vm.dart index 0769abdb1..1dd7a754e 100644 --- a/lib/ui/webhook/webhook_list_vm.dart +++ b/lib/ui/webhook/webhook_list_vm.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; +import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/webhook_model.dart'; +import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; +import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; +import 'package:invoiceninja_flutter/redux/webhook/webhook_selectors.dart'; import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart'; import 'package:invoiceninja_flutter/ui/webhook/webhook_list_item.dart'; import 'package:invoiceninja_flutter/ui/webhook/webhook_presenter.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_redux/flutter_redux.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_selectors.dart'; -import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; class WebhookListBuilder extends StatelessWidget { const WebhookListBuilder({Key key}) : super(key: key); diff --git a/lib/ui/webhook/webhook_presenter.dart b/lib/ui/webhook/webhook_presenter.dart index a7fea84c9..280908435 100644 --- a/lib/ui/webhook/webhook_presenter.dart +++ b/lib/ui/webhook/webhook_presenter.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart'; diff --git a/lib/ui/webhook/webhook_screen.dart b/lib/ui/webhook/webhook_screen.dart index cbd934d5a..e02de6804 100644 --- a/lib/ui/webhook/webhook_screen.dart +++ b/lib/ui/webhook/webhook_screen.dart @@ -1,17 +1,21 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart'; -import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/app/list_filter.dart'; +import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart'; import 'package:invoiceninja_flutter/ui/webhook/webhook_list_vm.dart'; import 'package:invoiceninja_flutter/ui/webhook/webhook_presenter.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; - import 'webhook_screen_vm.dart'; class WebhookScreen extends StatelessWidget { diff --git a/lib/ui/webhook/webhook_screen_vm.dart b/lib/ui/webhook/webhook_screen_vm.dart index 3cc3d634e..8ad5a7728 100644 --- a/lib/ui/webhook/webhook_screen_vm.dart +++ b/lib/ui/webhook/webhook_screen_vm.dart @@ -1,14 +1,18 @@ -import 'package:built_collection/built_collection.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: +import 'package:built_collection/built_collection.dart'; import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; import 'package:invoiceninja_flutter/redux/webhook/webhook_selectors.dart'; -import 'package:redux/redux.dart'; - import 'webhook_screen.dart'; class WebhookScreenBuilder extends StatelessWidget { diff --git a/lib/utils/colors.dart b/lib/utils/colors.dart index 2a0ebd82f..71a585728 100644 --- a/lib/utils/colors.dart +++ b/lib/utils/colors.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; Color convertHexStringToColor(String value) { diff --git a/lib/utils/completers.dart b/lib/utils/completers.dart index ba7acab3f..4825412d2 100644 --- a/lib/utils/completers.dart +++ b/lib/utils/completers.dart @@ -1,7 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_styled_toast/flutter_styled_toast.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/main_app.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; diff --git a/lib/utils/contacts.dart b/lib/utils/contacts.dart index 00fefeaf0..5f2f4f513 100644 --- a/lib/utils/contacts.dart +++ b/lib/utils/contacts.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:contacts_service/contacts_service.dart'; import 'package:permission_handler/permission_handler.dart'; diff --git a/lib/utils/dates.dart b/lib/utils/dates.dart index 8b1fd9457..6eb0808fe 100644 --- a/lib/utils/dates.dart +++ b/lib/utils/dates.dart @@ -1,5 +1,7 @@ +// Dart imports: import 'dart:math'; +// Project imports: import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/dashboard_model.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; diff --git a/lib/utils/designs.dart b/lib/utils/designs.dart index 050225e81..2bc83fb38 100644 --- a/lib/utils/designs.dart +++ b/lib/utils/designs.dart @@ -1,13 +1,19 @@ +// Dart imports: import 'dart:convert'; + +// Flutter imports: import 'package:flutter/cupertino.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:http/http.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/data/models/design_model.dart'; import 'package:invoiceninja_flutter/data/models/serializers.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/.env.dart'; - import 'dialogs.dart'; void loadDesign({ diff --git a/lib/utils/dialogs.dart b/lib/utils/dialogs.dart index d6e339ff8..851335d3c 100644 --- a/lib/utils/dialogs.dart +++ b/lib/utils/dialogs.dart @@ -1,7 +1,13 @@ +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:pointer_interceptor/pointer_interceptor.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; @@ -15,9 +21,8 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/loading_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/icons.dart'; -import 'package:invoiceninja_flutter/utils/oauth.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:pointer_interceptor/pointer_interceptor.dart'; +import 'package:invoiceninja_flutter/utils/oauth.dart'; void showRefreshDataDialog( {@required BuildContext context, bool includeStatic = false}) async { diff --git a/lib/utils/extensions.dart b/lib/utils/extensions.dart index 6cb12a6ee..afafa0030 100644 --- a/lib/utils/extensions.dart +++ b/lib/utils/extensions.dart @@ -1,6 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:redux/redux.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; diff --git a/lib/utils/files.dart b/lib/utils/files.dart index 717622fc0..de2431f53 100644 --- a/lib/utils/files.dart +++ b/lib/utils/files.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:io'; -import 'package:file_picker/file_picker.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:file_picker/file_picker.dart'; import 'package:http/http.dart'; -import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:permission_handler/permission_handler.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/utils/platforms.dart'; + // ignore: unused_import import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; diff --git a/lib/utils/formatting.dart b/lib/utils/formatting.dart index 1d3030db0..7af808c4e 100644 --- a/lib/utils/formatting.dart +++ b/lib/utils/formatting.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:math'; + +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; import 'package:intl/intl.dart'; -import 'package:intl/number_symbols_data.dart'; import 'package:intl/number_symbols.dart'; +import 'package:intl/number_symbols_data.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index 2ee542776..0c312c0b2 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:invoiceninja_flutter/utils/strings.dart'; abstract class LocaleCodeAware { diff --git a/lib/utils/icons.dart b/lib/utils/icons.dart index a2f2f2707..9e0a9150b 100644 --- a/lib/utils/icons.dart +++ b/lib/utils/icons.dart @@ -1,7 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:invoiceninja_flutter/data/models/system_log_model.dart'; IconData getEntityActionIcon(EntityAction entityAction) { diff --git a/lib/utils/localization.dart b/lib/utils/localization.dart index 21c710f47..b14f231f2 100644 --- a/lib/utils/localization.dart +++ b/lib/utils/localization.dart @@ -1,6 +1,11 @@ +// Dart imports: import 'dart:async'; -import 'package:flutter/material.dart'; + +// Flutter imports: import 'package:flutter/foundation.dart' show SynchronousFuture; +import 'package:flutter/material.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/utils/i18n.dart'; diff --git a/lib/utils/money.dart b/lib/utils/money.dart index 3f5b24dff..5dbef3ea8 100644 --- a/lib/utils/money.dart +++ b/lib/utils/money.dart @@ -1,4 +1,7 @@ +// Package imports: import 'package:built_collection/built_collection.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/static/currency_model.dart'; diff --git a/lib/utils/oauth.dart b/lib/utils/oauth.dart index b4ba80f21..a8a3c33b8 100644 --- a/lib/utils/oauth.dart +++ b/lib/utils/oauth.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:google_sign_in/google_sign_in.dart'; final GoogleSignIn _googleSignIn = GoogleSignIn( diff --git a/lib/utils/platforms.dart b/lib/utils/platforms.dart index 73ac5c79e..574b56504 100644 --- a/lib/utils/platforms.dart +++ b/lib/utils/platforms.dart @@ -1,13 +1,20 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + +// Project imports: import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; + import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; diff --git a/lib/utils/serialization.dart b/lib/utils/serialization.dart index b63dbe9a8..8eddcd9cd 100644 --- a/lib/utils/serialization.dart +++ b/lib/utils/serialization.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:invoiceninja_flutter/data/models/serializers.dart'; class SerializationUtils { diff --git a/lib/utils/templates.dart b/lib/utils/templates.dart index 3edb1ff4e..3999ab40b 100644 --- a/lib/utils/templates.dart +++ b/lib/utils/templates.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:convert'; + +// Flutter imports: import 'package:flutter/cupertino.dart'; + +// Package imports: import 'package:flutter_redux/flutter_redux.dart'; + +// Project imports: +import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/data/models/invoice_model.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; -import 'package:invoiceninja_flutter/.env.dart'; import 'dialogs.dart'; void loadEmailTemplate({ diff --git a/lib/utils/web.dart b/lib/utils/web.dart index 54039caab..88127babf 100644 --- a/lib/utils/web.dart +++ b/lib/utils/web.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:convert'; import 'dart:html'; import 'dart:typed_data'; import 'dart:ui' as ui; + +// Package imports: import 'package:file_picker/file_picker.dart'; import 'package:http/http.dart'; +import 'package:redux/redux.dart'; + +// Project imports: import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart'; -import 'package:redux/redux.dart'; class WebUtils { static String get browserUrl { diff --git a/lib/utils/web_stub.dart b/lib/utils/web_stub.dart index bf603f8f4..c57c6484b 100644 --- a/lib/utils/web_stub.dart +++ b/lib/utils/web_stub.dart @@ -1,11 +1,15 @@ +// Dart imports: import 'dart:typed_data'; +// Package imports: import 'package:file_picker/file_picker.dart'; import 'package:filepicker_windows/filepicker_windows.dart'; import 'package:http/http.dart'; -import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:redux/redux.dart'; +// Project imports: +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; + class WebUtils { static String get browserUrl => null; diff --git a/pubspec.lock b/pubspec.lock index 70090b9fa..b9d09ae0c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -537,6 +537,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.2.0" + import_sorter: + dependency: "direct dev" + description: + name: import_sorter + url: "https://pub.dartlang.org" + source: hosted + version: "4.6.0" injector: dependency: transitive description: @@ -1137,6 +1144,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" + tint: + dependency: transitive + description: + name: tint + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" typed_data: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b0df1aee2..bf26ca14b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -76,6 +76,7 @@ dev_dependencies: built_value_generator: ^8.1.1 faker: ^2.0.0 msix: ^2.1.3 + import_sorter: ^4.6.0 flutter: diff --git a/test/widget_test.dart b/test/widget_test.dart index ede4a1b8a..4f8941ad8 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -6,7 +6,11 @@ // tree, read text, and verify that the values of widget properties are correct. /* + +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_test/flutter_test.dart'; //import 'package:flutter_client/main.dart'; diff --git a/test_driver/all_it.dart b/test_driver/all_it.dart index 5f6aa8fd9..7c8713822 100644 --- a/test_driver/all_it.dart +++ b/test_driver/all_it.dart @@ -1,4 +1,7 @@ +// Package imports: import 'package:flutter_driver/driver_extension.dart'; + +// Project imports: import 'package:invoiceninja_flutter/main.dart' as app; void main() { diff --git a/test_driver/all_it_test.dart b/test_driver/all_it_test.dart index a4980431d..2d09ee5f1 100644 --- a/test_driver/all_it_test.dart +++ b/test_driver/all_it_test.dart @@ -1,3 +1,4 @@ +// Project imports: import 'clients_it_test.dart' as clients; import 'invoices_it_test.dart' as invoices; import 'login_it_test.dart' as login; diff --git a/test_driver/clients_it.dart b/test_driver/clients_it.dart index 8b3c41a49..506ca72ce 100644 --- a/test_driver/clients_it.dart +++ b/test_driver/clients_it.dart @@ -1,4 +1,7 @@ +// Package imports: import 'package:flutter_driver/driver_extension.dart'; + +// Project imports: import 'package:invoiceninja_flutter/main.dart' as app; void main() { diff --git a/test_driver/clients_it_test.dart b/test_driver/clients_it_test.dart index ece0b43df..b193638cc 100644 --- a/test_driver/clients_it_test.dart +++ b/test_driver/clients_it_test.dart @@ -1,7 +1,9 @@ +// Package imports: import 'package:faker/faker.dart'; import 'package:flutter_driver/flutter_driver.dart'; import 'package:test/test.dart'; +// Project imports: import 'utils/common_actions.dart'; import 'utils/localizations.dart'; diff --git a/test_driver/invoices_it.dart b/test_driver/invoices_it.dart index 8b3c41a49..506ca72ce 100644 --- a/test_driver/invoices_it.dart +++ b/test_driver/invoices_it.dart @@ -1,4 +1,7 @@ +// Package imports: import 'package:flutter_driver/driver_extension.dart'; + +// Project imports: import 'package:invoiceninja_flutter/main.dart' as app; void main() { diff --git a/test_driver/invoices_it_test.dart b/test_driver/invoices_it_test.dart index d2e048b33..947e28d96 100644 --- a/test_driver/invoices_it_test.dart +++ b/test_driver/invoices_it_test.dart @@ -1,7 +1,9 @@ +// Package imports: import 'package:faker/faker.dart'; import 'package:flutter_driver/flutter_driver.dart'; import 'package:test/test.dart'; +// Project imports: import 'utils/common_actions.dart'; import 'utils/localizations.dart'; diff --git a/test_driver/login_it.dart b/test_driver/login_it.dart index 8b3c41a49..506ca72ce 100644 --- a/test_driver/login_it.dart +++ b/test_driver/login_it.dart @@ -1,4 +1,7 @@ +// Package imports: import 'package:flutter_driver/driver_extension.dart'; + +// Project imports: import 'package:invoiceninja_flutter/main.dart' as app; void main() { diff --git a/test_driver/login_it_test.dart b/test_driver/login_it_test.dart index 85708f15d..efe1d5cc7 100644 --- a/test_driver/login_it_test.dart +++ b/test_driver/login_it_test.dart @@ -1,9 +1,13 @@ // Import Flutter Driver API + +// Dart imports: import 'dart:async'; +// Package imports: import 'package:flutter_driver/flutter_driver.dart'; import 'package:test/test.dart'; +// Project imports: import 'utils/common_actions.dart'; import 'utils/localizations.dart'; diff --git a/test_driver/products_it.dart b/test_driver/products_it.dart index 8b3c41a49..506ca72ce 100644 --- a/test_driver/products_it.dart +++ b/test_driver/products_it.dart @@ -1,4 +1,7 @@ +// Package imports: import 'package:flutter_driver/driver_extension.dart'; + +// Project imports: import 'package:invoiceninja_flutter/main.dart' as app; void main() { diff --git a/test_driver/products_it_test.dart b/test_driver/products_it_test.dart index f500e03d1..7c7f1cf56 100644 --- a/test_driver/products_it_test.dart +++ b/test_driver/products_it_test.dart @@ -1,7 +1,9 @@ +// Package imports: import 'package:faker/faker.dart'; import 'package:flutter_driver/flutter_driver.dart'; import 'package:test/test.dart'; +// Project imports: import 'utils/common_actions.dart'; import 'utils/localizations.dart'; diff --git a/test_driver/quotes_it.dart b/test_driver/quotes_it.dart index 8b3c41a49..506ca72ce 100644 --- a/test_driver/quotes_it.dart +++ b/test_driver/quotes_it.dart @@ -1,4 +1,7 @@ +// Package imports: import 'package:flutter_driver/driver_extension.dart'; + +// Project imports: import 'package:invoiceninja_flutter/main.dart' as app; void main() { diff --git a/test_driver/quotes_it_test.dart b/test_driver/quotes_it_test.dart index c9d8df7df..87c71ec17 100644 --- a/test_driver/quotes_it_test.dart +++ b/test_driver/quotes_it_test.dart @@ -1,7 +1,9 @@ +// Package imports: import 'package:faker/faker.dart'; import 'package:flutter_driver/flutter_driver.dart'; import 'package:test/test.dart'; +// Project imports: import 'utils/common_actions.dart'; import 'utils/localizations.dart'; diff --git a/test_driver/utils/common_actions.dart b/test_driver/utils/common_actions.dart index 984ccd1cb..ecabaef68 100644 --- a/test_driver/utils/common_actions.dart +++ b/test_driver/utils/common_actions.dart @@ -1,10 +1,13 @@ +// Dart imports: import 'dart:math'; +// Package imports: import 'package:faker/faker.dart'; import 'package:flutter_driver/flutter_driver.dart'; + +// Project imports: import 'package:invoiceninja_flutter/.env.dart'; import 'package:invoiceninja_flutter/constants.dart'; - import 'localizations.dart'; class Keys { diff --git a/test_driver/utils/localizations.dart b/test_driver/utils/localizations.dart index a3e6c71a0..488dda718 100644 --- a/test_driver/utils/localizations.dart +++ b/test_driver/utils/localizations.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:invoiceninja_flutter/utils/i18n.dart'; class TestLocalization extends LocaleCodeAware with LocalizationsProvider { diff --git a/test_driver/vendors_it.dart b/test_driver/vendors_it.dart index 8b3c41a49..506ca72ce 100644 --- a/test_driver/vendors_it.dart +++ b/test_driver/vendors_it.dart @@ -1,4 +1,7 @@ +// Package imports: import 'package:flutter_driver/driver_extension.dart'; + +// Project imports: import 'package:invoiceninja_flutter/main.dart' as app; void main() { diff --git a/test_driver/vendors_it_test.dart b/test_driver/vendors_it_test.dart index d70661966..177ff0d7f 100644 --- a/test_driver/vendors_it_test.dart +++ b/test_driver/vendors_it_test.dart @@ -1,7 +1,9 @@ +// Package imports: import 'package:faker/faker.dart'; import 'package:flutter_driver/flutter_driver.dart'; import 'package:test/test.dart'; +// Project imports: import 'utils/common_actions.dart'; import 'utils/localizations.dart';