From 39ae1eb5d76cba607df31a78464fddc9667bdc50 Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Wed, 27 Oct 2021 14:42:11 -0700 Subject: [PATCH] Fix imports --- README.md | 2 +- example/lib/Pages/MainPage.dart | 2 +- example/lib/Views/ImagePreview.dart | 2 +- example/lib/Views/ImageUploader.dart | 2 +- example/lib/Views/SignInView.dart | 2 +- example/lib/Views/SignUpView.dart | 2 +- example/lib/Views/UserView.dart | 2 +- example/lib/main.dart | 2 +- .../example/lib/main.dart | 2 +- .../lib/amplify_analytics_pinpoint.dart | 2 +- .../lib/{ => src}/method_channel_amplify.dart | 2 +- .../integration_test/graph_ql_tests.dart | 2 +- .../example/integration_test/main_test.dart | 2 +- .../example/lib/graphql_api_view.dart | 2 +- packages/amplify_api/example/lib/main.dart | 2 +- .../example/lib/rest_api_view.dart | 2 +- packages/amplify_api/lib/amplify_api.dart | 2 +- packages/amplify_api/lib/src/auth_token.dart | 2 +- .../graphql/graphql_subscription_event.dart | 0 .../graphql_subscription_transformer.dart | 0 .../lib/{ => src}/method_channel_api.dart | 10 +-- .../amplify_api/test/auth_providers_test.dart | 2 +- .../integration_test/fetch_session_test.dart | 2 +- .../get_current_user_test.dart | 2 +- .../integration_test/hub_events_test.dart | 2 +- .../example/integration_test/main_test.dart | 2 +- .../sign_in_sign_out_test.dart | 2 +- .../integration_test/sign_up_test.dart | 2 +- .../update_password_test.dart | 2 +- .../user_attributes_test.dart | 2 +- .../integration_test/utils/setup_utils.dart | 2 +- .../lib/Widgets/ConfirmResetWidget.dart | 2 +- .../lib/Widgets/ConfirmSignInWidget.dart | 2 +- .../lib/Widgets/ConfirmSignUpWidget.dart | 2 +- .../lib/Widgets/ConfirmUserAttribute.dart | 2 +- .../example/lib/Widgets/SignInWidget.dart | 2 +- .../example/lib/Widgets/SignUpWidget.dart | 2 +- .../lib/Widgets/UpdatePasswordWidget.dart | 2 +- .../lib/Widgets/UpdateUserAttribute.dart | 2 +- .../lib/Widgets/UpdateUserAttributes.dart | 2 +- .../lib/Widgets/ViewUserAttributes.dart | 2 +- .../example/lib/main.dart | 2 +- .../example/integration_test/clear_test.dart | 2 +- .../integration_test/observe_query_test.dart | 2 +- .../integration_test/observe_test.dart | 2 +- .../query_test/pagination_test.dart | 2 +- .../bool_query_predicate_test.dart | 2 +- .../compound_query_predicate_test.dart | 2 +- .../double_query_predicate_test.dart | 2 +- .../enum_query_predicate_test.dart | 2 +- .../int_query_predicate_test.dart | 2 +- .../string_query_predicate_test.dart | 2 +- .../query_test/sort_order_test.dart | 2 +- .../standard_query_operations_test.dart | 2 +- .../relationship_type_test.dart | 2 +- .../example/integration_test/save_test.dart | 2 +- .../utils/model_test_operation_utils.dart | 2 +- .../utils/query_predicate_utils.dart | 2 +- .../integration_test/utils/setup_utils.dart | 2 +- .../utils/sort_order_utils.dart | 2 +- .../amplify_datastore/example/lib/main.dart | 2 +- .../types/query/query_field_operators.dart | 66 ------------------- .../example/integration_test/config_test.dart | 2 +- .../amplify_flutter/example/lib/main.dart | 2 +- .../{amplify.dart => amplify_flutter.dart} | 0 .../amplify_flutter/lib/src/amplify_hub.dart | 2 +- .../amplify_datastore_category.dart | 29 ++------ .../test/amplify_analytics_plugin_test.dart | 2 +- .../test/amplify_api_plugin_test.dart | 2 +- .../test/amplify_auth_plugin_test.dart | 2 +- .../test/amplify_hub_test.dart | 2 +- .../test/amplify_storage_plugin_test.dart | 2 +- .../amplify_flutter/test/amplify_test.dart | 2 +- .../example/integration_test/main_test.dart | 2 +- .../amplify_storage_s3/example/lib/main.dart | 2 +- packages/amplify_test/analysis_options.yaml | 2 +- 76 files changed, 81 insertions(+), 164 deletions(-) rename packages/amplify_analytics_pinpoint/lib/{ => src}/method_channel_amplify.dart (98%) rename packages/amplify_api/lib/{ => src}/graphql/graphql_subscription_event.dart (100%) rename packages/amplify_api/lib/{ => src}/graphql/graphql_subscription_transformer.dart (100%) rename packages/amplify_api/lib/{ => src}/method_channel_api.dart (97%) rename packages/amplify_flutter/lib/{amplify.dart => amplify_flutter.dart} (100%) diff --git a/README.md b/README.md index ac12b0e52a..a67eb495b5 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ flutter pub get ```dart import 'package:flutter/material.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; diff --git a/example/lib/Pages/MainPage.dart b/example/lib/Pages/MainPage.dart index abb2b1fd0d..b51514695e 100644 --- a/example/lib/Pages/MainPage.dart +++ b/example/lib/Pages/MainPage.dart @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_storage_s3/amplify_storage_s3.dart'; import 'package:flutter/material.dart'; import 'package:sample_app/Views/ImageLineItem.dart'; diff --git a/example/lib/Views/ImagePreview.dart b/example/lib/Views/ImagePreview.dart index da6fdf5595..9786da967f 100644 --- a/example/lib/Views/ImagePreview.dart +++ b/example/lib/Views/ImagePreview.dart @@ -1,5 +1,5 @@ import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_storage_s3/amplify_storage_s3.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/Views/ImageUploader.dart b/example/lib/Views/ImageUploader.dart index 75c3a2f81c..0ca1f20373 100644 --- a/example/lib/Views/ImageUploader.dart +++ b/example/lib/Views/ImageUploader.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'dart:io'; import 'package:file_picker/file_picker.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_storage_s3/amplify_storage_s3.dart'; class ImageUploader extends StatelessWidget { diff --git a/example/lib/Views/SignInView.dart b/example/lib/Views/SignInView.dart index b36874706a..52b5d2cc25 100644 --- a/example/lib/Views/SignInView.dart +++ b/example/lib/Views/SignInView.dart @@ -14,7 +14,7 @@ */ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; import 'ErrorView.dart'; diff --git a/example/lib/Views/SignUpView.dart b/example/lib/Views/SignUpView.dart index 239df89d8e..e56ecbffbf 100644 --- a/example/lib/Views/SignUpView.dart +++ b/example/lib/Views/SignUpView.dart @@ -14,7 +14,7 @@ */ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; import 'package:sample_app/Views/ErrorView.dart'; diff --git a/example/lib/Views/UserView.dart b/example/lib/Views/UserView.dart index f7646d4fc9..dba07c70f2 100644 --- a/example/lib/Views/UserView.dart +++ b/example/lib/Views/UserView.dart @@ -14,7 +14,7 @@ */ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; import 'package:sample_app/Pages/LandingPage.dart'; diff --git a/example/lib/main.dart b/example/lib/main.dart index d39b4b44d3..4c6f9a0399 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -15,7 +15,7 @@ import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_storage_s3/amplify_storage_s3.dart'; import 'package:flutter/material.dart'; import 'package:sample_app/Pages/LoadingPage.dart'; diff --git a/packages/amplify_analytics_pinpoint/example/lib/main.dart b/packages/amplify_analytics_pinpoint/example/lib/main.dart index 2c4906743a..9363cfc9ca 100644 --- a/packages/amplify_analytics_pinpoint/example/lib/main.dart +++ b/packages/amplify_analytics_pinpoint/example/lib/main.dart @@ -1,7 +1,7 @@ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:flutter/material.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart'; import 'amplifyconfiguration.dart'; diff --git a/packages/amplify_analytics_pinpoint/lib/amplify_analytics_pinpoint.dart b/packages/amplify_analytics_pinpoint/lib/amplify_analytics_pinpoint.dart index e18f3ef409..a082c422a6 100644 --- a/packages/amplify_analytics_pinpoint/lib/amplify_analytics_pinpoint.dart +++ b/packages/amplify_analytics_pinpoint/lib/amplify_analytics_pinpoint.dart @@ -18,7 +18,7 @@ library amplify_analytics_pinpoint; import 'package:amplify_analytics_plugin_interface/amplify_analytics_plugin_interface.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; -import './method_channel_amplify.dart'; +import 'src/method_channel_amplify.dart'; export 'package:amplify_analytics_plugin_interface/src/types.dart'; diff --git a/packages/amplify_analytics_pinpoint/lib/method_channel_amplify.dart b/packages/amplify_analytics_pinpoint/lib/src/method_channel_amplify.dart similarity index 98% rename from packages/amplify_analytics_pinpoint/lib/method_channel_amplify.dart rename to packages/amplify_analytics_pinpoint/lib/src/method_channel_amplify.dart index 8c986dd96a..8c2fc3fcef 100644 --- a/packages/amplify_analytics_pinpoint/lib/method_channel_amplify.dart +++ b/packages/amplify_analytics_pinpoint/lib/src/method_channel_amplify.dart @@ -17,7 +17,7 @@ import 'package:amplify_analytics_plugin_interface/amplify_analytics_plugin_inte import 'package:amplify_core/amplify_core.dart'; import 'package:flutter/services.dart'; -import 'amplify_analytics_pinpoint.dart'; +import '../amplify_analytics_pinpoint.dart'; const MethodChannel _channel = MethodChannel('com.amazonaws.amplify/analytics_pinpoint'); diff --git a/packages/amplify_api/example/integration_test/graph_ql_tests.dart b/packages/amplify_api/example/integration_test/graph_ql_tests.dart index 1ba39555f3..f07020fe94 100644 --- a/packages/amplify_api/example/integration_test/graph_ql_tests.dart +++ b/packages/amplify_api/example/integration_test/graph_ql_tests.dart @@ -17,7 +17,7 @@ import 'dart:convert'; import 'package:amplify_api/amplify_api.dart'; import 'package:amplify_api_example/amplifyconfiguration.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; diff --git a/packages/amplify_api/example/integration_test/main_test.dart b/packages/amplify_api/example/integration_test/main_test.dart index d5e5a88b24..6ed6cf8b8d 100644 --- a/packages/amplify_api/example/integration_test/main_test.dart +++ b/packages/amplify_api/example/integration_test/main_test.dart @@ -15,7 +15,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_api/amplify_api.dart'; import 'package:amplify_api_example/amplifyconfiguration.dart'; diff --git a/packages/amplify_api/example/lib/graphql_api_view.dart b/packages/amplify_api/example/lib/graphql_api_view.dart index eec3d05cf6..7e1d59a74b 100644 --- a/packages/amplify_api/example/lib/graphql_api_view.dart +++ b/packages/amplify_api/example/lib/graphql_api_view.dart @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; import 'package:amplify_api/amplify_api.dart'; diff --git a/packages/amplify_api/example/lib/main.dart b/packages/amplify_api/example/lib/main.dart index 439d22b74e..ca530b9e1c 100644 --- a/packages/amplify_api/example/lib/main.dart +++ b/packages/amplify_api/example/lib/main.dart @@ -17,7 +17,7 @@ import 'package:amplify_api/amplify_api.dart'; import 'package:amplify_api_example/graphql_api_view.dart'; import 'package:amplify_api_example/rest_api_view.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; import 'amplifyconfiguration.dart'; diff --git a/packages/amplify_api/example/lib/rest_api_view.dart b/packages/amplify_api/example/lib/rest_api_view.dart index b4f3db7307..30f5afb2a4 100644 --- a/packages/amplify_api/example/lib/rest_api_view.dart +++ b/packages/amplify_api/example/lib/rest_api_view.dart @@ -16,7 +16,7 @@ import 'dart:convert'; import 'package:amplify_api/amplify_api.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; class RestApiView extends StatefulWidget { diff --git a/packages/amplify_api/lib/amplify_api.dart b/packages/amplify_api/lib/amplify_api.dart index 1332a6aa8b..50a66417e7 100644 --- a/packages/amplify_api/lib/amplify_api.dart +++ b/packages/amplify_api/lib/amplify_api.dart @@ -17,7 +17,7 @@ library amplify_api_plugin; import 'package:amplify_api_plugin_interface/amplify_api_plugin_interface.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; -import './method_channel_api.dart'; +import 'src/method_channel_api.dart'; export 'package:amplify_api_plugin_interface/src/types.dart'; diff --git a/packages/amplify_api/lib/src/auth_token.dart b/packages/amplify_api/lib/src/auth_token.dart index 4a85be90e5..ed24a456ea 100644 --- a/packages/amplify_api/lib/src/auth_token.dart +++ b/packages/amplify_api/lib/src/auth_token.dart @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -part of '../method_channel_api.dart'; +part of 'method_channel_api.dart'; /// {@template auth_token} /// An authorization token for use by an [APIAuthProvider]. diff --git a/packages/amplify_api/lib/graphql/graphql_subscription_event.dart b/packages/amplify_api/lib/src/graphql/graphql_subscription_event.dart similarity index 100% rename from packages/amplify_api/lib/graphql/graphql_subscription_event.dart rename to packages/amplify_api/lib/src/graphql/graphql_subscription_event.dart diff --git a/packages/amplify_api/lib/graphql/graphql_subscription_transformer.dart b/packages/amplify_api/lib/src/graphql/graphql_subscription_transformer.dart similarity index 100% rename from packages/amplify_api/lib/graphql/graphql_subscription_transformer.dart rename to packages/amplify_api/lib/src/graphql/graphql_subscription_transformer.dart diff --git a/packages/amplify_api/lib/method_channel_api.dart b/packages/amplify_api/lib/src/method_channel_api.dart similarity index 97% rename from packages/amplify_api/lib/method_channel_api.dart rename to packages/amplify_api/lib/src/method_channel_api.dart index 08ebb07825..c5e6a373db 100644 --- a/packages/amplify_api/lib/method_channel_api.dart +++ b/packages/amplify_api/lib/src/method_channel_api.dart @@ -16,14 +16,16 @@ import 'dart:async'; import 'dart:typed_data'; +import 'package:amplify_api/graphql/graphql_subscription_event.dart'; +import 'package:amplify_api/graphql/graphql_subscription_transformer.dart'; +import 'package:amplify_api_plugin_interface/amplify_api_plugin_interface.dart'; import 'package:amplify_core/amplify_core.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:amplify_api_plugin_interface/amplify_api_plugin_interface.dart'; -import 'amplify_api.dart'; +import '../amplify_api.dart'; -part 'src/auth_token.dart'; +part 'auth_token.dart'; const MethodChannel _channel = MethodChannel('com.amazonaws.amplify/api'); @@ -72,7 +74,7 @@ class AmplifyAPIMethodChannel extends AmplifyAPI { }, ); - final Map _subscriptions = {}; + final Map> _subscriptions = {}; /// The registered [APIAuthProvider] instances. final Map _authProviders = {}; diff --git a/packages/amplify_api/test/auth_providers_test.dart b/packages/amplify_api/test/auth_providers_test.dart index 6871a85232..0573740de5 100644 --- a/packages/amplify_api/test/auth_providers_test.dart +++ b/packages/amplify_api/test/auth_providers_test.dart @@ -1,5 +1,5 @@ import 'package:amplify_api/amplify_api.dart'; -import 'package:amplify_api/method_channel_api.dart'; +import 'package:amplify_api/src/method_channel_api.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; diff --git a/packages/amplify_auth_cognito/example/integration_test/fetch_session_test.dart b/packages/amplify_auth_cognito/example/integration_test/fetch_session_test.dart index 4ab3afcd8c..041cf41597 100644 --- a/packages/amplify_auth_cognito/example/integration_test/fetch_session_test.dart +++ b/packages/amplify_auth_cognito/example/integration_test/fetch_session_test.dart @@ -15,7 +15,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'utils/mock_data.dart'; diff --git a/packages/amplify_auth_cognito/example/integration_test/get_current_user_test.dart b/packages/amplify_auth_cognito/example/integration_test/get_current_user_test.dart index 26e9d9ce6a..57164cc4cb 100644 --- a/packages/amplify_auth_cognito/example/integration_test/get_current_user_test.dart +++ b/packages/amplify_auth_cognito/example/integration_test/get_current_user_test.dart @@ -15,7 +15,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'utils/mock_data.dart'; diff --git a/packages/amplify_auth_cognito/example/integration_test/hub_events_test.dart b/packages/amplify_auth_cognito/example/integration_test/hub_events_test.dart index a36f801efd..6094438f9d 100644 --- a/packages/amplify_auth_cognito/example/integration_test/hub_events_test.dart +++ b/packages/amplify_auth_cognito/example/integration_test/hub_events_test.dart @@ -15,7 +15,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'utils/mock_data.dart'; diff --git a/packages/amplify_auth_cognito/example/integration_test/main_test.dart b/packages/amplify_auth_cognito/example/integration_test/main_test.dart index f76272cbfc..f77bca8b79 100644 --- a/packages/amplify_auth_cognito/example/integration_test/main_test.dart +++ b/packages/amplify_auth_cognito/example/integration_test/main_test.dart @@ -15,7 +15,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_auth_cognito_example/amplifyconfiguration.dart'; diff --git a/packages/amplify_auth_cognito/example/integration_test/sign_in_sign_out_test.dart b/packages/amplify_auth_cognito/example/integration_test/sign_in_sign_out_test.dart index a3bed844db..c6eeff2f01 100644 --- a/packages/amplify_auth_cognito/example/integration_test/sign_in_sign_out_test.dart +++ b/packages/amplify_auth_cognito/example/integration_test/sign_in_sign_out_test.dart @@ -15,7 +15,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'utils/mock_data.dart'; diff --git a/packages/amplify_auth_cognito/example/integration_test/sign_up_test.dart b/packages/amplify_auth_cognito/example/integration_test/sign_up_test.dart index 3fec15d792..b1bbaa19d2 100644 --- a/packages/amplify_auth_cognito/example/integration_test/sign_up_test.dart +++ b/packages/amplify_auth_cognito/example/integration_test/sign_up_test.dart @@ -15,7 +15,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'utils/mock_data.dart'; diff --git a/packages/amplify_auth_cognito/example/integration_test/update_password_test.dart b/packages/amplify_auth_cognito/example/integration_test/update_password_test.dart index 099800f486..ced64ce1b6 100644 --- a/packages/amplify_auth_cognito/example/integration_test/update_password_test.dart +++ b/packages/amplify_auth_cognito/example/integration_test/update_password_test.dart @@ -15,7 +15,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'utils/mock_data.dart'; diff --git a/packages/amplify_auth_cognito/example/integration_test/user_attributes_test.dart b/packages/amplify_auth_cognito/example/integration_test/user_attributes_test.dart index de874af9ad..f32f7dbff6 100644 --- a/packages/amplify_auth_cognito/example/integration_test/user_attributes_test.dart +++ b/packages/amplify_auth_cognito/example/integration_test/user_attributes_test.dart @@ -15,7 +15,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'utils/mock_data.dart'; import 'utils/setup_utils.dart'; diff --git a/packages/amplify_auth_cognito/example/integration_test/utils/setup_utils.dart b/packages/amplify_auth_cognito/example/integration_test/utils/setup_utils.dart index e36dd71d08..51fa169a73 100644 --- a/packages/amplify_auth_cognito/example/integration_test/utils/setup_utils.dart +++ b/packages/amplify_auth_cognito/example/integration_test/utils/setup_utils.dart @@ -1,6 +1,6 @@ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_auth_cognito_example/amplifyconfiguration.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; Future configureAuth() async { if (!Amplify.isConfigured) { diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmResetWidget.dart b/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmResetWidget.dart index 3ac586c1d4..8e532f1abc 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmResetWidget.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmResetWidget.dart @@ -1,6 +1,6 @@ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; // ignore_for_file: public_member_api_docs diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmSignInWidget.dart b/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmSignInWidget.dart index 1623f9d145..42320d357e 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmSignInWidget.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmSignInWidget.dart @@ -1,5 +1,5 @@ import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; // ignore_for_file: public_member_api_docs diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmSignUpWidget.dart b/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmSignUpWidget.dart index 608f8d7a8d..e933408496 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmSignUpWidget.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmSignUpWidget.dart @@ -1,5 +1,5 @@ import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; // ignore_for_file: public_member_api_docs diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmUserAttribute.dart b/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmUserAttribute.dart index 66a80e2bb4..dc462814a2 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmUserAttribute.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/ConfirmUserAttribute.dart @@ -1,5 +1,5 @@ import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; // ignore_for_file: public_member_api_docs diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/SignInWidget.dart b/packages/amplify_auth_cognito/example/lib/Widgets/SignInWidget.dart index 9bbe530988..b383e70793 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/SignInWidget.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/SignInWidget.dart @@ -1,6 +1,6 @@ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; // ignore_for_file: public_member_api_docs diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/SignUpWidget.dart b/packages/amplify_auth_cognito/example/lib/Widgets/SignUpWidget.dart index feff007b68..f59515e8c7 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/SignUpWidget.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/SignUpWidget.dart @@ -1,6 +1,6 @@ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; // ignore_for_file: public_member_api_docs diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/UpdatePasswordWidget.dart b/packages/amplify_auth_cognito/example/lib/Widgets/UpdatePasswordWidget.dart index adbf952141..64c22ef993 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/UpdatePasswordWidget.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/UpdatePasswordWidget.dart @@ -1,5 +1,5 @@ import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; // ignore_for_file: public_member_api_docs diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/UpdateUserAttribute.dart b/packages/amplify_auth_cognito/example/lib/Widgets/UpdateUserAttribute.dart index 02e0da8438..9143d978c0 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/UpdateUserAttribute.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/UpdateUserAttribute.dart @@ -1,5 +1,5 @@ import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; import 'ConfirmUserAttribute.dart'; diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/UpdateUserAttributes.dart b/packages/amplify_auth_cognito/example/lib/Widgets/UpdateUserAttributes.dart index aeb96672fb..04dcf8d11c 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/UpdateUserAttributes.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/UpdateUserAttributes.dart @@ -1,6 +1,6 @@ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; // ignore_for_file: public_member_api_docs diff --git a/packages/amplify_auth_cognito/example/lib/Widgets/ViewUserAttributes.dart b/packages/amplify_auth_cognito/example/lib/Widgets/ViewUserAttributes.dart index 520a8d82ee..bf1cde2939 100644 --- a/packages/amplify_auth_cognito/example/lib/Widgets/ViewUserAttributes.dart +++ b/packages/amplify_auth_cognito/example/lib/Widgets/ViewUserAttributes.dart @@ -1,5 +1,5 @@ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/material.dart'; import 'UpdateUserAttributes.dart'; diff --git a/packages/amplify_auth_cognito/example/lib/main.dart b/packages/amplify_auth_cognito/example/lib/main.dart index 1c18bc9c34..9153989484 100644 --- a/packages/amplify_auth_cognito/example/lib/main.dart +++ b/packages/amplify_auth_cognito/example/lib/main.dart @@ -18,7 +18,7 @@ import 'dart:async'; import 'package:amplify_core/amplify_core.dart'; import 'package:flutter/material.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'Widgets/ConfirmResetWidget.dart'; import 'Widgets/ConfirmSignInWidget.dart'; import 'Widgets/ConfirmSignUpWidget.dart'; diff --git a/packages/amplify_datastore/example/integration_test/clear_test.dart b/packages/amplify_datastore/example/integration_test/clear_test.dart index 654d690215..e7ce8ca8e0 100644 --- a/packages/amplify_datastore/example/integration_test/clear_test.dart +++ b/packages/amplify_datastore/example/integration_test/clear_test.dart @@ -16,7 +16,7 @@ import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/observe_query_test.dart b/packages/amplify_datastore/example/integration_test/observe_query_test.dart index a960d06229..497b0474b5 100644 --- a/packages/amplify_datastore/example/integration_test/observe_query_test.dart +++ b/packages/amplify_datastore/example/integration_test/observe_query_test.dart @@ -16,7 +16,7 @@ import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/observe_test.dart b/packages/amplify_datastore/example/integration_test/observe_test.dart index f3cb1998b3..bf604f9934 100644 --- a/packages/amplify_datastore/example/integration_test/observe_test.dart +++ b/packages/amplify_datastore/example/integration_test/observe_test.dart @@ -17,7 +17,7 @@ import 'package:amplify_datastore/amplify_datastore.dart'; import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/query_test/pagination_test.dart b/packages/amplify_datastore/example/integration_test/query_test/pagination_test.dart index 7c37c11a7c..e15d4728fd 100644 --- a/packages/amplify_datastore/example/integration_test/query_test/pagination_test.dart +++ b/packages/amplify_datastore/example/integration_test/query_test/pagination_test.dart @@ -18,7 +18,7 @@ import 'package:amplify_datastore/amplify_datastore.dart'; import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import '../utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/bool_query_predicate_test.dart b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/bool_query_predicate_test.dart index 8fa9c66317..d89167c149 100644 --- a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/bool_query_predicate_test.dart +++ b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/bool_query_predicate_test.dart @@ -16,7 +16,7 @@ import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import '../../utils/query_predicate_utils.dart'; import '../../utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/compound_query_predicate_test.dart b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/compound_query_predicate_test.dart index 1fcbe6ed15..ac5957d03d 100644 --- a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/compound_query_predicate_test.dart +++ b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/compound_query_predicate_test.dart @@ -16,7 +16,7 @@ import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import '../../utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/double_query_predicate_test.dart b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/double_query_predicate_test.dart index cb11c7c25f..cba40b8e21 100644 --- a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/double_query_predicate_test.dart +++ b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/double_query_predicate_test.dart @@ -18,7 +18,7 @@ import 'dart:math'; import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import '../../utils/query_predicate_utils.dart'; import '../../utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/enum_query_predicate_test.dart b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/enum_query_predicate_test.dart index 78f016555d..39146b34cd 100644 --- a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/enum_query_predicate_test.dart +++ b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/enum_query_predicate_test.dart @@ -16,7 +16,7 @@ import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import '../../utils/query_predicate_utils.dart'; import '../../utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/int_query_predicate_test.dart b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/int_query_predicate_test.dart index 3e20b9eed7..a72bf25b07 100644 --- a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/int_query_predicate_test.dart +++ b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/int_query_predicate_test.dart @@ -16,7 +16,7 @@ import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import '../../utils/constants.dart'; import '../../utils/query_predicate_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/string_query_predicate_test.dart b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/string_query_predicate_test.dart index 57b7ff5eac..a8f0a7331b 100644 --- a/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/string_query_predicate_test.dart +++ b/packages/amplify_datastore/example/integration_test/query_test/query_predicate_test/string_query_predicate_test.dart @@ -16,7 +16,7 @@ import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import '../../utils/query_predicate_utils.dart'; import '../../utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/query_test/sort_order_test.dart b/packages/amplify_datastore/example/integration_test/query_test/sort_order_test.dart index 3551c5444a..194a3b276d 100644 --- a/packages/amplify_datastore/example/integration_test/query_test/sort_order_test.dart +++ b/packages/amplify_datastore/example/integration_test/query_test/sort_order_test.dart @@ -20,7 +20,7 @@ import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:collection/collection.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import '../utils/constants.dart'; import '../utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/query_test/standard_query_operations_test.dart b/packages/amplify_datastore/example/integration_test/query_test/standard_query_operations_test.dart index fb58936592..cff1db3f76 100644 --- a/packages/amplify_datastore/example/integration_test/query_test/standard_query_operations_test.dart +++ b/packages/amplify_datastore/example/integration_test/query_test/standard_query_operations_test.dart @@ -18,7 +18,7 @@ import 'package:amplify_datastore/amplify_datastore.dart'; import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import '../utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/relationship_type_test.dart b/packages/amplify_datastore/example/integration_test/relationship_type_test.dart index d5c13755a2..a2fcf42482 100644 --- a/packages/amplify_datastore/example/integration_test/relationship_type_test.dart +++ b/packages/amplify_datastore/example/integration_test/relationship_type_test.dart @@ -18,7 +18,7 @@ import 'package:amplify_datastore/amplify_datastore.dart'; import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/save_test.dart b/packages/amplify_datastore/example/integration_test/save_test.dart index 0d62644cf0..52b5c0dbca 100644 --- a/packages/amplify_datastore/example/integration_test/save_test.dart +++ b/packages/amplify_datastore/example/integration_test/save_test.dart @@ -16,7 +16,7 @@ import 'package:amplify_datastore_example/models/ModelProvider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'utils/setup_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/utils/model_test_operation_utils.dart b/packages/amplify_datastore/example/integration_test/utils/model_test_operation_utils.dart index e9b90b028d..4b857439c4 100644 --- a/packages/amplify_datastore/example/integration_test/utils/model_test_operation_utils.dart +++ b/packages/amplify_datastore/example/integration_test/utils/model_test_operation_utils.dart @@ -1,6 +1,6 @@ import 'package:amplify_datastore/amplify_datastore.dart'; import 'package:amplify_datastore_plugin_interface/amplify_datastore_plugin_interface.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter_test/flutter_test.dart'; import 'model_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/utils/query_predicate_utils.dart b/packages/amplify_datastore/example/integration_test/utils/query_predicate_utils.dart index ac97edd6bc..1d70d4e532 100644 --- a/packages/amplify_datastore/example/integration_test/utils/query_predicate_utils.dart +++ b/packages/amplify_datastore/example/integration_test/utils/query_predicate_utils.dart @@ -1,6 +1,6 @@ import 'package:amplify_datastore/amplify_datastore.dart'; import 'package:amplify_datastore_plugin_interface/amplify_datastore_plugin_interface.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter_test/flutter_test.dart'; import 'model_utils.dart'; diff --git a/packages/amplify_datastore/example/integration_test/utils/setup_utils.dart b/packages/amplify_datastore/example/integration_test/utils/setup_utils.dart index 3e4665d8bc..791be89322 100644 --- a/packages/amplify_datastore/example/integration_test/utils/setup_utils.dart +++ b/packages/amplify_datastore/example/integration_test/utils/setup_utils.dart @@ -1,7 +1,7 @@ import 'package:amplify_datastore/amplify_datastore.dart'; import 'package:amplify_datastore_example/amplifyconfiguration.dart'; import 'package:amplify_datastore_example/models/ModelProvider.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; Future configureDataStore() async { if (!Amplify.isConfigured) { diff --git a/packages/amplify_datastore/example/integration_test/utils/sort_order_utils.dart b/packages/amplify_datastore/example/integration_test/utils/sort_order_utils.dart index 065abd8256..63b1945a55 100644 --- a/packages/amplify_datastore/example/integration_test/utils/sort_order_utils.dart +++ b/packages/amplify_datastore/example/integration_test/utils/sort_order_utils.dart @@ -1,7 +1,7 @@ import 'package:amplify_datastore/amplify_datastore.dart'; import 'package:amplify_datastore_plugin_interface/amplify_datastore_plugin_interface.dart'; import 'package:amplify_datastore_example/models/ModelProvider.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter_test/flutter_test.dart'; import 'model_utils.dart'; diff --git a/packages/amplify_datastore/example/lib/main.dart b/packages/amplify_datastore/example/lib/main.dart index 1656fa47d8..ffa972664d 100644 --- a/packages/amplify_datastore/example/lib/main.dart +++ b/packages/amplify_datastore/example/lib/main.dart @@ -23,7 +23,7 @@ import 'package:amplify_datastore/amplify_datastore.dart'; // Uncomment the below line to enable online sync //import 'package:amplify_api/amplify_api.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'amplifyconfiguration.dart'; diff --git a/packages/amplify_datastore_plugin_interface/lib/src/types/query/query_field_operators.dart b/packages/amplify_datastore_plugin_interface/lib/src/types/query/query_field_operators.dart index 788cb4cc87..645181b672 100644 --- a/packages/amplify_datastore_plugin_interface/lib/src/types/query/query_field_operators.dart +++ b/packages/amplify_datastore_plugin_interface/lib/src/types/query/query_field_operators.dart @@ -78,11 +78,6 @@ class EqualQueryOperator extends QueryFieldOperator { return other == value; } - @override - bool evaluate(T? other) { - return other == value; - } - @override Map serializeAsMap() { return serializeAsMapWithOperator( @@ -101,11 +96,6 @@ class NotEqualQueryOperator extends QueryFieldOperator { return other != value; } - @override - bool evaluate(T? other) { - return other != value; - } - @override Map serializeAsMap() { return serializeAsMapWithOperator( @@ -128,14 +118,6 @@ class LessOrEqualQueryOperator return other.compareTo(value) <= 0; } - @override - bool evaluate(T? other) { - if (other == null) { - return false; - } - return other.compareTo(value) <= 0; - } - @override Map serializeAsMap() { return serializeAsMapWithOperator( @@ -158,14 +140,6 @@ class LessThanQueryOperator return other.compareTo(value) < 0; } - @override - bool evaluate(T? other) { - if (other == null) { - return false; - } - return other.compareTo(value) < 0; - } - @override Map serializeAsMap() { return serializeAsMapWithOperator( @@ -188,14 +162,6 @@ class GreaterOrEqualQueryOperator return other.compareTo(value) >= 0; } - @override - bool evaluate(T? other) { - if (other == null) { - return false; - } - return other.compareTo(value) >= 0; - } - @override Map serializeAsMap() { return serializeAsMapWithOperator( @@ -218,14 +184,6 @@ class GreaterThanQueryOperator return other.compareTo(value) > 0; } - @override - bool evaluate(T? other) { - if (other == null) { - return false; - } - return other.compareTo(value) > 0; - } - @override Map serializeAsMap() { return serializeAsMapWithOperator( @@ -247,14 +205,6 @@ class ContainsQueryOperator extends QueryFieldOperator { return other.contains(value); } - @override - bool evaluate(String? other) { - if (other == null) { - return false; - } - return other.contains(value); - } - @override Map serializeAsMap() { return serializeAsMapWithOperator( @@ -277,14 +227,6 @@ class BetweenQueryOperator extends QueryFieldOperator { return other.compareTo(start) >= 0 && other.compareTo(end) <= 0; } - @override - bool evaluate(T? other) { - if (other == null) { - return false; - } - return other.compareTo(start) >= 0 && other.compareTo(end) <= 0; - } - @override Map serializeAsMap() { return { @@ -309,14 +251,6 @@ class BeginsWithQueryOperator extends QueryFieldOperator { return other.startsWith(value); } - @override - bool evaluate(String? other) { - if (other == null) { - return false; - } - return other.startsWith(value); - } - @override Map serializeAsMap() { return serializeAsMapWithOperator( diff --git a/packages/amplify_flutter/example/integration_test/config_test.dart b/packages/amplify_flutter/example/integration_test/config_test.dart index 2a39f7d1c4..333853cb8f 100644 --- a/packages/amplify_flutter/example/integration_test/config_test.dart +++ b/packages/amplify_flutter/example/integration_test/config_test.dart @@ -4,7 +4,7 @@ import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart'; import 'package:amplify_api/amplify_api.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_datastore/amplify_datastore.dart'; -import 'package:amplify_flutter/amplify.dart' hide Amplify; +import 'package:amplify_flutter/amplify_flutter.dart' hide Amplify; import 'package:amplify_flutter/src/amplify_impl.dart'; import 'package:amplify_flutter/src/categories/amplify_categories.dart'; import 'package:amplify_storage_s3/amplify_storage_s3.dart'; diff --git a/packages/amplify_flutter/example/lib/main.dart b/packages/amplify_flutter/example/lib/main.dart index ba9eb23a5f..2f4ca9b603 100644 --- a/packages/amplify_flutter/example/lib/main.dart +++ b/packages/amplify_flutter/example/lib/main.dart @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/packages/amplify_flutter/lib/amplify.dart b/packages/amplify_flutter/lib/amplify_flutter.dart similarity index 100% rename from packages/amplify_flutter/lib/amplify.dart rename to packages/amplify_flutter/lib/amplify_flutter.dart diff --git a/packages/amplify_flutter/lib/src/amplify_hub.dart b/packages/amplify_flutter/lib/src/amplify_hub.dart index 5600f6b4be..d0788d1c60 100644 --- a/packages/amplify_flutter/lib/src/amplify_hub.dart +++ b/packages/amplify_flutter/lib/src/amplify_hub.dart @@ -17,7 +17,7 @@ import 'dart:async'; import 'package:amplify_core/amplify_core.dart'; -import '../amplify.dart'; +import '../amplify_flutter.dart'; typedef Listener = void Function(HubEvent event); diff --git a/packages/amplify_flutter/lib/src/categories/amplify_datastore_category.dart b/packages/amplify_flutter/lib/src/categories/amplify_datastore_category.dart index f51f6923fb..49035fd390 100644 --- a/packages/amplify_flutter/lib/src/categories/amplify_datastore_category.dart +++ b/packages/amplify_flutter/lib/src/categories/amplify_datastore_category.dart @@ -42,8 +42,10 @@ class DataStoreCategory { throw AmplifyException.fromMap(Map.from(e.details)); } } else { - throw AmplifyException( - 'DataStore plugin has already been added, multiple plugins for DataStore category are currently not supported.'); + throw const AmplifyException( + 'DataStore plugin has already been added, multiple plugins for ' + 'DataStore category are currently not supported.', + ); } } @@ -140,27 +142,6 @@ class DataStoreCategory { sortBy: sortBy, throttleOptions: throttleOptions, ) - : throw _pluginNotAddedException("DataStore"); - } - - /// Observe the result set of a given Query - /// - /// Emits an initial [QuerySnapshot] with data from the local store, as well as - /// subsequent events with data synced over the network - Stream> observeQuery( - ModelType modelType, { - QueryPredicate? where, - List? sortBy, - ObserveQueryThrottleOptions throttleOptions = - const ObserveQueryThrottleOptions.defaults(), - }) { - return plugins.length == 1 - ? plugins[0].observeQuery( - modelType, - where: where, - sortBy: sortBy, - throttleOptions: throttleOptions, - ) - : throw _pluginNotAddedException("DataStore"); + : throw _pluginNotAddedException('DataStore'); } } diff --git a/packages/amplify_flutter/test/amplify_analytics_plugin_test.dart b/packages/amplify_flutter/test/amplify_analytics_plugin_test.dart index 37329ec6e9..2e1ff3e1b6 100644 --- a/packages/amplify_flutter/test/amplify_analytics_plugin_test.dart +++ b/packages/amplify_flutter/test/amplify_analytics_plugin_test.dart @@ -15,7 +15,7 @@ import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart'; import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_flutter/src/amplify_impl.dart'; import 'package:amplify_flutter/src/categories/amplify_categories.dart'; import 'package:flutter/services.dart'; diff --git a/packages/amplify_flutter/test/amplify_api_plugin_test.dart b/packages/amplify_flutter/test/amplify_api_plugin_test.dart index 7d3ad3a70e..9545f34b65 100644 --- a/packages/amplify_flutter/test/amplify_api_plugin_test.dart +++ b/packages/amplify_flutter/test/amplify_api_plugin_test.dart @@ -15,7 +15,7 @@ import 'package:amplify_api/amplify_api.dart'; import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_flutter/src/amplify_impl.dart'; import 'package:amplify_flutter/src/categories/amplify_categories.dart'; import 'package:flutter/services.dart'; diff --git a/packages/amplify_flutter/test/amplify_auth_plugin_test.dart b/packages/amplify_flutter/test/amplify_auth_plugin_test.dart index ce875e0fe5..3720ed64f7 100644 --- a/packages/amplify_flutter/test/amplify_auth_plugin_test.dart +++ b/packages/amplify_flutter/test/amplify_auth_plugin_test.dart @@ -15,7 +15,7 @@ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_flutter/src/amplify_impl.dart'; import 'package:amplify_flutter/src/categories/amplify_categories.dart'; import 'package:flutter/services.dart'; diff --git a/packages/amplify_flutter/test/amplify_hub_test.dart b/packages/amplify_flutter/test/amplify_hub_test.dart index 31e523207f..635e127a7a 100644 --- a/packages/amplify_flutter/test/amplify_hub_test.dart +++ b/packages/amplify_flutter/test/amplify_hub_test.dart @@ -16,7 +16,7 @@ import 'dart:async'; import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/amplify_flutter/test/amplify_storage_plugin_test.dart b/packages/amplify_flutter/test/amplify_storage_plugin_test.dart index c2c3c46e5c..166cdb090a 100644 --- a/packages/amplify_flutter/test/amplify_storage_plugin_test.dart +++ b/packages/amplify_flutter/test/amplify_storage_plugin_test.dart @@ -14,7 +14,7 @@ */ import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_flutter/src/amplify_impl.dart'; import 'package:amplify_flutter/src/categories/amplify_categories.dart'; import 'package:amplify_storage_s3/amplify_storage_s3.dart'; diff --git a/packages/amplify_flutter/test/amplify_test.dart b/packages/amplify_flutter/test/amplify_test.dart index e7eab3aaf6..339c67d31a 100644 --- a/packages/amplify_flutter/test/amplify_test.dart +++ b/packages/amplify_flutter/test/amplify_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_core/amplify_core.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_flutter/src/amplify_impl.dart'; import 'package:amplify_flutter/src/categories/amplify_categories.dart'; import 'package:flutter/services.dart'; diff --git a/packages/amplify_storage_s3/example/integration_test/main_test.dart b/packages/amplify_storage_s3/example/integration_test/main_test.dart index 6d4fa9b683..f824937205 100644 --- a/packages/amplify_storage_s3/example/integration_test/main_test.dart +++ b/packages/amplify_storage_s3/example/integration_test/main_test.dart @@ -17,7 +17,7 @@ import 'package:path_provider/path_provider.dart'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:amplify_storage_s3/amplify_storage_s3.dart'; import 'package:amplify_storage_s3_example/amplifyconfiguration.dart'; diff --git a/packages/amplify_storage_s3/example/lib/main.dart b/packages/amplify_storage_s3/example/lib/main.dart index 8595373414..b37ffbe2ce 100644 --- a/packages/amplify_storage_s3/example/lib/main.dart +++ b/packages/amplify_storage_s3/example/lib/main.dart @@ -17,7 +17,7 @@ import 'package:amplify_auth_cognito/amplify_auth_cognito.dart'; import 'package:flutter/material.dart'; import 'dart:io'; import 'package:file_picker/file_picker.dart'; -import 'package:amplify_flutter/amplify.dart'; +import 'package:amplify_flutter/amplify_flutter.dart'; import 'package:amplify_storage_s3/amplify_storage_s3.dart'; import 'amplifyconfiguration.dart'; diff --git a/packages/amplify_test/analysis_options.yaml b/packages/amplify_test/analysis_options.yaml index 6360ced429..220850c27c 100644 --- a/packages/amplify_test/analysis_options.yaml +++ b/packages/amplify_test/analysis_options.yaml @@ -1 +1 @@ -include: package:amplify_lints/flutter_lib.yaml +include: package:amplify_lints/dart.yaml