From b1b96a9cfd2ff3628b612725f744540818cd5474 Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:34:42 -0500 Subject: [PATCH] fix: dart formatting (#1590) --- lib/main.dart | 15 ++++++++------- .../activity_planner/activity_list_view.dart | 17 ++++++++--------- .../activity_mode_list_repo.dart | 6 +++--- .../activity_planner/activity_plan_card.dart | 11 +++++++---- .../activity_plan_generation_repo.dart | 5 ++--- ...activity_plan_page_launch_icon_button.dart | 6 ++++-- .../activity_planner_page.dart | 8 +++++--- ...tivity_planner_settings_search_widget.dart | 1 + .../bookmarked_activities_repo.dart | 5 ++++- lib/pangea/activity_planner/media_enum.dart | 1 + .../suggestion_form_field.dart | 3 ++- .../common/controllers/pangea_controller.dart | 9 +++++---- .../extensions/pangea_room_extension.dart | 19 ++++++++++--------- 13 files changed, 60 insertions(+), 46 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index dc819eaf8..3e11711be 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,12 @@ +import 'package:flutter/material.dart'; + import 'package:collection/collection.dart'; +import 'package:flutter_dotenv/flutter_dotenv.dart'; +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; +import 'package:get_storage/get_storage.dart'; +import 'package:matrix/matrix.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/common/config/environment.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; @@ -7,13 +15,6 @@ import 'package:fluffychat/pangea/learning_settings/utils/language_list_util.dar import 'package:fluffychat/utils/client_manager.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/error_widget.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; -import 'package:flutter_secure_storage/flutter_secure_storage.dart'; -import 'package:get_storage/get_storage.dart'; -import 'package:matrix/matrix.dart'; -import 'package:shared_preferences/shared_preferences.dart'; - import 'config/setting_keys.dart'; import 'utils/background_push.dart'; import 'widgets/fluffy_chat_app.dart'; diff --git a/lib/pangea/activity_planner/activity_list_view.dart b/lib/pangea/activity_planner/activity_list_view.dart index e6659a8e7..91ca48486 100644 --- a/lib/pangea/activity_planner/activity_list_view.dart +++ b/lib/pangea/activity_planner/activity_list_view.dart @@ -1,5 +1,11 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + import 'package:fluffychat/pangea/activity_planner/activity_plan_generation_repo.dart'; import 'package:fluffychat/pangea/activity_planner/activity_plan_model.dart'; import 'package:fluffychat/pangea/activity_planner/activity_plan_request.dart'; @@ -9,11 +15,6 @@ import 'package:fluffychat/pangea/common/constants/model_keys.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; - import 'activity_plan_card.dart'; class ActivityListView extends StatefulWidget { @@ -29,10 +30,10 @@ class ActivityListView extends StatefulWidget { }); @override - _ActivityListViewState createState() => _ActivityListViewState(); + ActivityListViewState createState() => ActivityListViewState(); } -class _ActivityListViewState extends State { +class ActivityListViewState extends State { bool get showBookmarkedActivities => widget.activityPlanRequest == null; Future> get savedActivities => @@ -95,8 +96,6 @@ class _ActivityListViewState extends State { if (snapshot.connectionState == ConnectionState.waiting) { return const Center(child: CircularProgressIndicator()); } else if (snapshot.hasError) { - print(snapshot.error); - print(snapshot.stackTrace); // debugger(when: kDebugMode); ErrorHandler.logError( e: snapshot.error, diff --git a/lib/pangea/activity_planner/activity_mode_list_repo.dart b/lib/pangea/activity_planner/activity_mode_list_repo.dart index 66d6220d8..9b4db5172 100644 --- a/lib/pangea/activity_planner/activity_mode_list_repo.dart +++ b/lib/pangea/activity_planner/activity_mode_list_repo.dart @@ -1,12 +1,12 @@ import 'dart:convert'; +import 'package:get_storage/get_storage.dart'; +import 'package:http/http.dart'; + import 'package:fluffychat/pangea/activity_planner/list_request_schema.dart'; import 'package:fluffychat/pangea/common/config/environment.dart'; import 'package:fluffychat/pangea/common/network/urls.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:get_storage/get_storage.dart'; -import 'package:http/http.dart'; - import '../common/network/requests.dart'; class ActivityModeListRepo { diff --git a/lib/pangea/activity_planner/activity_plan_card.dart b/lib/pangea/activity_planner/activity_plan_card.dart index dbf7e83a6..ecb9cd6a9 100644 --- a/lib/pangea/activity_planner/activity_plan_card.dart +++ b/lib/pangea/activity_planner/activity_plan_card.dart @@ -1,12 +1,14 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:material_symbols_icons/symbols.dart'; + import 'package:fluffychat/pangea/activity_planner/activity_plan_model.dart'; import 'package:fluffychat/pangea/activity_planner/bookmarked_activities_repo.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:material_symbols_icons/symbols.dart'; class ActivityPlanCard extends StatefulWidget { final ActivityPlanModel activity; @@ -79,6 +81,7 @@ class ActivityPlanCardState extends State { BookmarkedActivitiesRepo.save(activity).catchError((e, stack) { debugger(when: kDebugMode); ErrorHandler.logError(e: e, s: stack, data: activity.toJson()); + return activity; // Return the original activity in case of error }).whenComplete(() { setState(() {}); }); diff --git a/lib/pangea/activity_planner/activity_plan_generation_repo.dart b/lib/pangea/activity_planner/activity_plan_generation_repo.dart index c693c92ac..70e079e85 100644 --- a/lib/pangea/activity_planner/activity_plan_generation_repo.dart +++ b/lib/pangea/activity_planner/activity_plan_generation_repo.dart @@ -1,11 +1,10 @@ import 'dart:convert'; -import 'package:fluffychat/pangea/activity_planner/activity_plan_request.dart'; -import 'package:fluffychat/pangea/activity_planner/activity_plan_response.dart'; import 'package:get_storage/get_storage.dart'; import 'package:http/http.dart'; -import 'package:fluffychat/pangea/activity_planner/media_enum.dart'; +import 'package:fluffychat/pangea/activity_planner/activity_plan_request.dart'; +import 'package:fluffychat/pangea/activity_planner/activity_plan_response.dart'; import 'package:fluffychat/pangea/common/config/environment.dart'; import 'package:fluffychat/pangea/common/network/urls.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pangea/activity_planner/activity_plan_page_launch_icon_button.dart b/lib/pangea/activity_planner/activity_plan_page_launch_icon_button.dart index e48925836..f4c6855c2 100644 --- a/lib/pangea/activity_planner/activity_plan_page_launch_icon_button.dart +++ b/lib/pangea/activity_planner/activity_plan_page_launch_icon_button.dart @@ -1,9 +1,11 @@ -import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; +import 'package:fluffychat/pages/chat/chat.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; + class ActivityPlanPageLaunchIconButton extends StatelessWidget { const ActivityPlanPageLaunchIconButton({ super.key, diff --git a/lib/pangea/activity_planner/activity_planner_page.dart b/lib/pangea/activity_planner/activity_planner_page.dart index a9ef2e3b7..123de95b5 100644 --- a/lib/pangea/activity_planner/activity_planner_page.dart +++ b/lib/pangea/activity_planner/activity_planner_page.dart @@ -1,4 +1,9 @@ +import 'package:flutter/material.dart'; + import 'package:dropdown_button2/dropdown_button2.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + import 'package:fluffychat/pangea/activity_planner/activity_list_view.dart'; import 'package:fluffychat/pangea/activity_planner/activity_mode_list_repo.dart'; import 'package:fluffychat/pangea/activity_planner/activity_plan_request.dart'; @@ -13,9 +18,6 @@ import 'package:fluffychat/pangea/instructions/instructions_inline_tooltip.dart' import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; import 'package:fluffychat/pangea/learning_settings/widgets/p_language_dropdown.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; enum _PageMode { settings, diff --git a/lib/pangea/activity_planner/activity_planner_settings_search_widget.dart b/lib/pangea/activity_planner/activity_planner_settings_search_widget.dart index 8b8d4da3a..cc1c38c3b 100644 --- a/lib/pangea/activity_planner/activity_planner_settings_search_widget.dart +++ b/lib/pangea/activity_planner/activity_planner_settings_search_widget.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; + import 'package:flutter_gen/gen_l10n/l10n.dart'; class ActivityPlannerSettingsSearchWidget extends StatelessWidget { diff --git a/lib/pangea/activity_planner/bookmarked_activities_repo.dart b/lib/pangea/activity_planner/bookmarked_activities_repo.dart index 5bf5192b6..fd91ac9b9 100644 --- a/lib/pangea/activity_planner/bookmarked_activities_repo.dart +++ b/lib/pangea/activity_planner/bookmarked_activities_repo.dart @@ -1,7 +1,10 @@ -import 'package:fluffychat/pangea/activity_planner/activity_plan_model.dart'; +// ignore_for_file: depend_on_referenced_packages + import 'package:get_storage/get_storage.dart'; import 'package:uuid/uuid.dart'; +import 'package:fluffychat/pangea/activity_planner/activity_plan_model.dart'; + class BookmarkedActivitiesRepo { static final GetStorage _storage = GetStorage('bookmarked_activities'); static const Uuid _uuid = Uuid(); diff --git a/lib/pangea/activity_planner/media_enum.dart b/lib/pangea/activity_planner/media_enum.dart index 3e1e11a3c..3849d76b4 100644 --- a/lib/pangea/activity_planner/media_enum.dart +++ b/lib/pangea/activity_planner/media_enum.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; + import 'package:flutter_gen/gen_l10n/l10n.dart'; enum MediaEnum { diff --git a/lib/pangea/activity_planner/suggestion_form_field.dart b/lib/pangea/activity_planner/suggestion_form_field.dart index 8f4dc4eab..5d8538c01 100644 --- a/lib/pangea/activity_planner/suggestion_form_field.dart +++ b/lib/pangea/activity_planner/suggestion_form_field.dart @@ -1,6 +1,7 @@ -import 'package:fluffychat/pangea/activity_planner/list_request_schema.dart'; import 'package:flutter/material.dart'; +import 'package:fluffychat/pangea/activity_planner/list_request_schema.dart'; + class SuggestionFormField extends StatelessWidget { final Future> suggestions; final String? Function(String?)? validator; diff --git a/lib/pangea/common/controllers/pangea_controller.dart b/lib/pangea/common/controllers/pangea_controller.dart index 18f0ee0ee..3336a579c 100644 --- a/lib/pangea/common/controllers/pangea_controller.dart +++ b/lib/pangea/common/controllers/pangea_controller.dart @@ -2,6 +2,11 @@ import 'dart:async'; import 'dart:developer'; import 'dart:math'; +import 'package:flutter/foundation.dart'; + +import 'package:matrix/matrix.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:fluffychat/pangea/analytics/controllers/get_analytics_controller.dart'; import 'package:fluffychat/pangea/analytics/controllers/put_analytics_controller.dart'; import 'package:fluffychat/pangea/bot/utils/bot_name.dart'; @@ -25,10 +30,6 @@ import 'package:fluffychat/pangea/toolbar/controllers/text_to_speech_controller. import 'package:fluffychat/pangea/user/controllers/permissions_controller.dart'; import 'package:fluffychat/pangea/user/controllers/user_controller.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../../config/app_config.dart'; import '../../choreographer/controllers/it_feedback_controller.dart'; import '../utils/firebase_analytics.dart'; diff --git a/lib/pangea/extensions/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension.dart index 771c1fe25..dad9f71eb 100644 --- a/lib/pangea/extensions/pangea_room_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension.dart @@ -4,8 +4,18 @@ import 'dart:async'; import 'dart:convert'; import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:html_unescape/html_unescape.dart'; +import 'package:matrix/matrix.dart' as matrix; +import 'package:matrix/matrix.dart'; +import 'package:matrix/src/utils/markdown.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:fluffychat/pangea/analytics/models/constructs_event.dart'; import 'package:fluffychat/pangea/analytics/models/constructs_model.dart'; import 'package:fluffychat/pangea/bot/utils/bot_name.dart'; @@ -19,15 +29,6 @@ import 'package:fluffychat/pangea/spaces/constants/space_constants.dart'; import 'package:fluffychat/pangea/spaces/models/space_model.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:html_unescape/html_unescape.dart'; -import 'package:matrix/matrix.dart' as matrix; -import 'package:matrix/matrix.dart'; -import 'package:matrix/src/utils/markdown.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../choreographer/models/choreo_record.dart'; import '../events/constants/pangea_event_types.dart'; import '../events/models/representation_content_model.dart';