From c9f4904d99729b33ab56b3c4798903f246173ea4 Mon Sep 17 00:00:00 2001 From: Krille Date: Fri, 30 Dec 2022 17:54:01 +0100 Subject: [PATCH] refactor: Remove dart from folder name --- lib/pages/add_story/add_story.dart | 4 ++-- lib/pages/add_story/invite_story_page.dart | 2 +- lib/pages/chat/chat.dart | 8 ++++---- lib/pages/chat/chat_app_bar_title.dart | 2 +- lib/pages/chat/chat_event_list.dart | 2 +- lib/pages/chat/events/audio_player.dart | 2 +- lib/pages/chat/events/html_message.dart | 2 +- lib/pages/chat/events/message_content.dart | 2 +- lib/pages/chat/events/message_download_content.dart | 2 +- lib/pages/chat/events/reply_content.dart | 2 +- lib/pages/chat/events/state_message.dart | 2 +- lib/pages/chat/events/video_player.dart | 2 +- lib/pages/chat/pinned_events.dart | 2 +- lib/pages/chat/reply_display.dart | 2 +- lib/pages/chat_details/chat_details.dart | 2 +- lib/pages/chat_details/chat_details_view.dart | 2 +- lib/pages/chat_list/chat_list.dart | 4 ++-- lib/pages/chat_list/chat_list_body.dart | 2 +- lib/pages/chat_list/chat_list_item.dart | 2 +- lib/pages/chat_list/stories_header.dart | 2 +- lib/pages/device_settings/user_device_list_item.dart | 2 +- lib/pages/image_viewer/image_viewer.dart | 2 +- lib/pages/settings_stories/settings_stories.dart | 2 +- lib/pages/story/story_page.dart | 4 ++-- lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart | 2 +- lib/utils/background_push.dart | 2 +- lib/utils/client_manager.dart | 2 +- .../client_stories_extension.dart | 0 .../device_extension.dart | 0 .../event_extension.dart | 0 .../filtered_timeline_extension.dart | 0 .../flutter_hive_collections_database.dart | 0 .../ios_badge_client_extension.dart | 0 .../matrix_file_extension.dart | 0 .../matrix_locals.dart | 0 .../presence_extension.dart | 0 lib/utils/push_helper.dart | 2 +- lib/widgets/local_notifications_extension.dart | 2 +- lib/widgets/mxc_image.dart | 2 +- test/utils/test_client.dart | 2 +- 40 files changed, 37 insertions(+), 37 deletions(-) rename lib/utils/{matrix_sdk_extensions.dart => matrix_sdk_extensions}/client_stories_extension.dart (100%) rename lib/utils/{matrix_sdk_extensions.dart => matrix_sdk_extensions}/device_extension.dart (100%) rename lib/utils/{matrix_sdk_extensions.dart => matrix_sdk_extensions}/event_extension.dart (100%) rename lib/utils/{matrix_sdk_extensions.dart => matrix_sdk_extensions}/filtered_timeline_extension.dart (100%) rename lib/utils/{matrix_sdk_extensions.dart => matrix_sdk_extensions}/flutter_hive_collections_database.dart (100%) rename lib/utils/{matrix_sdk_extensions.dart => matrix_sdk_extensions}/ios_badge_client_extension.dart (100%) rename lib/utils/{matrix_sdk_extensions.dart => matrix_sdk_extensions}/matrix_file_extension.dart (100%) rename lib/utils/{matrix_sdk_extensions.dart => matrix_sdk_extensions}/matrix_locals.dart (100%) rename lib/utils/{matrix_sdk_extensions.dart => matrix_sdk_extensions}/presence_extension.dart (100%) diff --git a/lib/pages/add_story/add_story.dart b/lib/pages/add_story/add_story.dart index 5a875e53..a09c6f7b 100644 --- a/lib/pages/add_story/add_story.dart +++ b/lib/pages/add_story/add_story.dart @@ -12,12 +12,12 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/pages/add_story/add_story_view.dart'; import 'package:fluffychat/pages/add_story/invite_story_page.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; import 'package:fluffychat/utils/resize_image.dart'; import 'package:fluffychat/utils/story_theme_data.dart'; import 'package:fluffychat/utils/string_color.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../../utils/matrix_sdk_extensions.dart/client_stories_extension.dart'; +import '../../utils/matrix_sdk_extensions/client_stories_extension.dart'; class AddStoryPage extends StatefulWidget { const AddStoryPage({Key? key}) : super(key: key); diff --git a/lib/pages/add_story/invite_story_page.dart b/lib/pages/add_story/invite_story_page.dart index 1c091fe5..2b397774 100644 --- a/lib/pages/add_story/invite_story_page.dart +++ b/lib/pages/add_story/invite_story_page.dart @@ -6,7 +6,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/client_stories_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 07bc9fec..ecfbee41 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -22,14 +22,14 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/pages/chat/chat_view.dart'; import 'package:fluffychat/pages/chat/event_info_dialog.dart'; import 'package:fluffychat/pages/chat/recording_dialog.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/ios_badge_client_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/ios_badge_client_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; import '../../utils/account_bundles.dart'; import '../../utils/localized_exception_extension.dart'; -import '../../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; +import '../../utils/matrix_sdk_extensions/matrix_file_extension.dart'; import 'send_file_dialog.dart'; import 'send_location_dialog.dart'; import 'sticker_picker_dialog.dart'; diff --git a/lib/pages/chat/chat_app_bar_title.dart b/lib/pages/chat/chat_app_bar_title.dart index 91a770f0..ba6dc187 100644 --- a/lib/pages/chat/chat_app_bar_title.dart +++ b/lib/pages/chat/chat_app_bar_title.dart @@ -5,7 +5,7 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/widgets/avatar.dart'; class ChatAppBarTitle extends StatelessWidget { diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart index 44daa4f9..15eeb79f 100644 --- a/lib/pages/chat/chat_event_list.dart +++ b/lib/pages/chat/chat_event_list.dart @@ -10,7 +10,7 @@ import 'package:fluffychat/pages/chat/events/message.dart'; import 'package:fluffychat/pages/chat/seen_by_row.dart'; import 'package:fluffychat/pages/chat/typing_indicators.dart'; import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/filtered_timeline_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; class ChatEventList extends StatelessWidget { diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart index bf9f60b7..e024e4ab 100644 --- a/lib/pages/chat/events/audio_player.dart +++ b/lib/pages/chat/events/audio_player.dart @@ -10,7 +10,7 @@ import 'package:path_provider/path_provider.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; -import '../../../utils/matrix_sdk_extensions.dart/event_extension.dart'; +import '../../../utils/matrix_sdk_extensions/event_extension.dart'; class AudioPlayerWidget extends StatefulWidget { final Color color; diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart index 7fbe9139..448d1f9e 100644 --- a/lib/pages/chat/events/html_message.dart +++ b/lib/pages/chat/events/html_message.dart @@ -8,7 +8,7 @@ import 'package:fluffychat/widgets/matrix.dart'; import '../../../config/app_config.dart'; import '../../../config/setting_keys.dart'; import '../../../pages/image_viewer/image_viewer.dart'; -import '../../../utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import '../../../utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../../utils/url_launcher.dart'; class HtmlMessage extends StatelessWidget { diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index 320fd910..873a2575 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -6,7 +6,7 @@ import 'package:matrix_link_text/link_text.dart'; import 'package:fluffychat/pages/chat/events/video_player.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; import '../../../config/app_config.dart'; diff --git a/lib/pages/chat/events/message_download_content.dart b/lib/pages/chat/events/message_download_content.dart index 7ed6e660..fd16dc35 100644 --- a/lib/pages/chat/events/message_download_content.dart +++ b/lib/pages/chat/events/message_download_content.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; class MessageDownloadContent extends StatelessWidget { final Event event; diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index 6716bae9..56833f67 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../../config/app_config.dart'; import 'html_message.dart'; diff --git a/lib/pages/chat/events/state_message.dart b/lib/pages/chat/events/state_message.dart index 62da6263..35b34cf5 100644 --- a/lib/pages/chat/events/state_message.dart +++ b/lib/pages/chat/events/state_message.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../../config/app_config.dart'; class StateMessage extends StatelessWidget { diff --git a/lib/pages/chat/events/video_player.dart b/lib/pages/chat/events/video_player.dart index c7c197f9..ad6fb075 100644 --- a/lib/pages/chat/events/video_player.dart +++ b/lib/pages/chat/events/video_player.dart @@ -13,7 +13,7 @@ import 'package:video_player/video_player.dart'; import 'package:fluffychat/pages/chat/events/image_bubble.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; class EventVideoPlayer extends StatefulWidget { final Event event; diff --git a/lib/pages/chat/pinned_events.dart b/lib/pages/chat/pinned_events.dart index 02e72c8f..5f8b8e16 100644 --- a/lib/pages/chat/pinned_events.dart +++ b/lib/pages/chat/pinned_events.dart @@ -9,7 +9,7 @@ import 'package:matrix_link_text/link_text.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/url_launcher.dart'; class PinnedEvents extends StatelessWidget { diff --git a/lib/pages/chat/reply_display.dart b/lib/pages/chat/reply_display.dart index ccb6e6a7..a801e944 100644 --- a/lib/pages/chat/reply_display.dart +++ b/lib/pages/chat/reply_display.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'chat.dart'; import 'events/reply_content.dart'; diff --git a/lib/pages/chat_details/chat_details.dart b/lib/pages/chat_details/chat_details.dart index b4afab8b..1678441c 100644 --- a/lib/pages/chat_details/chat_details.dart +++ b/lib/pages/chat_details/chat_details.dart @@ -11,7 +11,7 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/pages/chat_details/chat_details_view.dart'; import 'package:fluffychat/pages/settings/settings.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index f3d4aafe..ef301c7c 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -9,7 +9,7 @@ import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pages/chat_details/chat_details.dart'; import 'package:fluffychat/pages/chat_details/participant_list_item.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/chat_settings_popup_menu.dart'; import 'package:fluffychat/widgets/content_banner.dart'; diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index cc3ebd33..44a7dd6f 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -17,10 +17,10 @@ import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list_view.dart'; import 'package:fluffychat/utils/famedlysdk_store.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/client_stories_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import '../../../utils/account_bundles.dart'; -import '../../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; +import '../../utils/matrix_sdk_extensions/matrix_file_extension.dart'; import '../../utils/url_launcher.dart'; import '../../utils/voip/callkeep_manager.dart'; import '../../widgets/fluffy_chat_app.dart'; diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart index 3f425602..97c6e8f1 100644 --- a/lib/pages/chat_list/chat_list_body.dart +++ b/lib/pages/chat_list/chat_list_body.dart @@ -9,7 +9,7 @@ import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; import 'package:fluffychat/pages/chat_list/search_title.dart'; import 'package:fluffychat/pages/chat_list/space_view.dart'; import 'package:fluffychat/pages/chat_list/stories_header.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/client_stories_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; import 'package:fluffychat/utils/stream_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/profile_bottom_sheet.dart'; diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 75d24cf7..e27f5f05 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -7,7 +7,7 @@ import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/room_status_extension.dart'; import '../../utils/date_time_extension.dart'; import '../../widgets/avatar.dart'; diff --git a/lib/pages/chat_list/stories_header.dart b/lib/pages/chat_list/stories_header.dart index f07162bc..97b819a8 100644 --- a/lib/pages/chat_list/stories_header.dart +++ b/lib/pages/chat_list/stories_header.dart @@ -7,7 +7,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/client_stories_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/device_settings/user_device_list_item.dart b/lib/pages/device_settings/user_device_list_item.dart index e65dc6db..013b7e82 100644 --- a/lib/pages/device_settings/user_device_list_item.dart +++ b/lib/pages/device_settings/user_device_list_item.dart @@ -5,7 +5,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import '../../utils/date_time_extension.dart'; -import '../../utils/matrix_sdk_extensions.dart/device_extension.dart'; +import '../../utils/matrix_sdk_extensions/device_extension.dart'; import '../../widgets/matrix.dart'; enum UserDeviceListItemAction { diff --git a/lib/pages/image_viewer/image_viewer.dart b/lib/pages/image_viewer/image_viewer.dart index 3e8f6290..5d822d0b 100644 --- a/lib/pages/image_viewer/image_viewer.dart +++ b/lib/pages/image_viewer/image_viewer.dart @@ -6,7 +6,7 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/pages/image_viewer/image_viewer_view.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../../utils/matrix_sdk_extensions.dart/event_extension.dart'; +import '../../utils/matrix_sdk_extensions/event_extension.dart'; class ImageViewer extends StatefulWidget { final Event event; diff --git a/lib/pages/settings_stories/settings_stories.dart b/lib/pages/settings_stories/settings_stories.dart index b0a4818d..6459349a 100644 --- a/lib/pages/settings_stories/settings_stories.dart +++ b/lib/pages/settings_stories/settings_stories.dart @@ -5,7 +5,7 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/settings_stories/settings_stories_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../../utils/matrix_sdk_extensions.dart/client_stories_extension.dart'; +import '../../utils/matrix_sdk_extensions/client_stories_extension.dart'; class SettingsStories extends StatefulWidget { const SettingsStories({Key? key}) : super(key: key); diff --git a/lib/pages/story/story_page.dart b/lib/pages/story/story_page.dart index 3d4fb411..6c553c2b 100644 --- a/lib/pages/story/story_page.dart +++ b/lib/pages/story/story_page.dart @@ -15,8 +15,8 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/pages/story/story_view.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/client_stories_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/ios_badge_client_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/ios_badge_client_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/room_status_extension.dart'; import 'package:fluffychat/utils/story_theme_data.dart'; diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart index bac02425..ba1bd2fc 100644 --- a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart @@ -7,7 +7,7 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; -import '../../utils/matrix_sdk_extensions.dart/presence_extension.dart'; +import '../../utils/matrix_sdk_extensions/presence_extension.dart'; import '../../widgets/content_banner.dart'; import '../../widgets/m2_popup_menu_button.dart'; import '../../widgets/matrix.dart'; diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 2f8fdc36..49d8178b 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -32,7 +32,7 @@ import 'package:matrix/matrix.dart'; import 'package:unifiedpush/unifiedpush.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/client_stories_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; import 'package:fluffychat/utils/push_helper.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart index b8ec31bc..d68f3fb3 100644 --- a/lib/utils/client_manager.dart +++ b/lib/utils/client_manager.dart @@ -9,7 +9,7 @@ import 'package:path_provider/path_provider.dart'; import 'package:fluffychat/utils/custom_http_client.dart'; import 'package:fluffychat/utils/custom_image_resizer.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'famedlysdk_store.dart'; diff --git a/lib/utils/matrix_sdk_extensions.dart/client_stories_extension.dart b/lib/utils/matrix_sdk_extensions/client_stories_extension.dart similarity index 100% rename from lib/utils/matrix_sdk_extensions.dart/client_stories_extension.dart rename to lib/utils/matrix_sdk_extensions/client_stories_extension.dart diff --git a/lib/utils/matrix_sdk_extensions.dart/device_extension.dart b/lib/utils/matrix_sdk_extensions/device_extension.dart similarity index 100% rename from lib/utils/matrix_sdk_extensions.dart/device_extension.dart rename to lib/utils/matrix_sdk_extensions/device_extension.dart diff --git a/lib/utils/matrix_sdk_extensions.dart/event_extension.dart b/lib/utils/matrix_sdk_extensions/event_extension.dart similarity index 100% rename from lib/utils/matrix_sdk_extensions.dart/event_extension.dart rename to lib/utils/matrix_sdk_extensions/event_extension.dart diff --git a/lib/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart similarity index 100% rename from lib/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart rename to lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart diff --git a/lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart b/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart similarity index 100% rename from lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart rename to lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart diff --git a/lib/utils/matrix_sdk_extensions.dart/ios_badge_client_extension.dart b/lib/utils/matrix_sdk_extensions/ios_badge_client_extension.dart similarity index 100% rename from lib/utils/matrix_sdk_extensions.dart/ios_badge_client_extension.dart rename to lib/utils/matrix_sdk_extensions/ios_badge_client_extension.dart diff --git a/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart similarity index 100% rename from lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart rename to lib/utils/matrix_sdk_extensions/matrix_file_extension.dart diff --git a/lib/utils/matrix_sdk_extensions.dart/matrix_locals.dart b/lib/utils/matrix_sdk_extensions/matrix_locals.dart similarity index 100% rename from lib/utils/matrix_sdk_extensions.dart/matrix_locals.dart rename to lib/utils/matrix_sdk_extensions/matrix_locals.dart diff --git a/lib/utils/matrix_sdk_extensions.dart/presence_extension.dart b/lib/utils/matrix_sdk_extensions/presence_extension.dart similarity index 100% rename from lib/utils/matrix_sdk_extensions.dart/presence_extension.dart rename to lib/utils/matrix_sdk_extensions/presence_extension.dart diff --git a/lib/utils/push_helper.dart b/lib/utils/push_helper.dart index 1ded6a05..04106010 100644 --- a/lib/utils/push_helper.dart +++ b/lib/utils/push_helper.dart @@ -11,7 +11,7 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/voip/callkeep_manager.dart'; diff --git a/lib/widgets/local_notifications_extension.dart b/lib/widgets/local_notifications_extension.dart index 54546ed9..fb6b071f 100644 --- a/lib/widgets/local_notifications_extension.dart +++ b/lib/widgets/local_notifications_extension.dart @@ -12,7 +12,7 @@ import 'package:universal_html/html.dart' as html; import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart index 3907c86c..2414ae2d 100644 --- a/lib/widgets/mxc_image.dart +++ b/lib/widgets/mxc_image.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; import 'package:fluffychat/widgets/matrix.dart'; class MxcImage extends StatefulWidget { diff --git a/test/utils/test_client.dart b/test/utils/test_client.dart index 0cd21f29..c2e1314c 100644 --- a/test/utils/test_client.dart +++ b/test/utils/test_client.dart @@ -4,7 +4,7 @@ import 'package:matrix/encryption/utils/key_verification.dart'; import 'package:matrix/matrix.dart'; import 'package:matrix_api_lite/fake_matrix_api.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart'; Future prepareTestClient({ bool loggedIn = false,