From ebc598a0ae2a38e1a19e4606b3a14451663d81fb Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sat, 22 May 2021 09:24:39 +0200 Subject: [PATCH] refactor: Structure files in more directories --- lib/main.dart | 2 +- lib/pages/chat.dart | 6 +++--- lib/pages/chat_details.dart | 2 +- lib/pages/chat_list.dart | 2 +- lib/pages/image_viewer.dart | 2 +- lib/pages/send_file_dialog.dart | 2 +- lib/pages/views/chat_details_view.dart | 2 +- lib/pages/views/chat_encryption_settings_view.dart | 2 +- lib/pages/views/chat_view.dart | 6 +++--- lib/pages/views/image_viewer_view.dart | 2 +- lib/pages/views/user_bottom_sheet_view.dart | 2 +- lib/utils/background_push.dart | 4 ++-- .../client_presence_extension.dart | 0 .../device_extension.dart | 0 .../event_extension.dart | 2 +- .../filtered_timeline_extension.dart | 2 +- .../fluffy_client.dart | 4 ++-- .../matrix_file_extension.dart | 0 .../matrix_locals.dart | 0 .../presence_extension.dart | 2 +- lib/utils/room_status_extension.dart | 2 +- lib/widgets/contacts_list.dart | 4 ++-- lib/widgets/{ => event_content}/audio_player.dart | 8 ++++---- lib/widgets/{ => event_content}/html_message.dart | 6 +++--- lib/widgets/{ => event_content}/image_bubble.dart | 2 +- .../{list_items => event_content}/message.dart | 8 ++++---- .../{ => event_content}/message_content.dart | 14 +++++++------- .../message_download_content.dart | 2 +- .../{ => event_content}/message_reactions.dart | 2 +- lib/widgets/{ => event_content}/reply_content.dart | 4 ++-- .../state_message.dart | 2 +- lib/widgets/list_items/chat_list_item.dart | 4 ++-- lib/widgets/list_items/user_device_list_item.dart | 2 +- lib/widgets/matrix.dart | 4 ++-- test/utils/test_client.dart | 2 +- 35 files changed, 55 insertions(+), 55 deletions(-) rename lib/utils/{ => matrix_sdk_extensions.dart}/client_presence_extension.dart (100%) rename lib/utils/{ => matrix_sdk_extensions.dart}/device_extension.dart (100%) rename lib/utils/{ => matrix_sdk_extensions.dart}/event_extension.dart (98%) rename lib/utils/{ => matrix_sdk_extensions.dart}/filtered_timeline_extension.dart (98%) rename lib/utils/{ => matrix_sdk_extensions.dart}/fluffy_client.dart (94%) rename lib/utils/{ => matrix_sdk_extensions.dart}/matrix_file_extension.dart (100%) rename lib/utils/{ => matrix_sdk_extensions.dart}/matrix_locals.dart (100%) rename lib/utils/{ => matrix_sdk_extensions.dart}/presence_extension.dart (96%) rename lib/widgets/{ => event_content}/audio_player.dart (96%) rename lib/widgets/{ => event_content}/html_message.dart (97%) rename lib/widgets/{ => event_content}/image_bubble.dart (99%) rename lib/widgets/{list_items => event_content}/message.dart (97%) rename lib/widgets/{ => event_content}/message_content.dart (94%) rename lib/widgets/{ => event_content}/message_download_content.dart (94%) rename lib/widgets/{ => event_content}/message_reactions.dart (99%) rename lib/widgets/{ => event_content}/reply_content.dart (96%) rename lib/widgets/{list_items => event_content}/state_message.dart (96%) diff --git a/lib/main.dart b/lib/main.dart index 7a35173a..9823808e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -19,7 +19,7 @@ import 'widgets/lock_screen.dart'; import 'widgets/matrix.dart'; import 'config/themes.dart'; import 'config/app_config.dart'; -import 'utils/fluffy_client.dart'; +import 'utils/matrix_sdk_extensions.dart/fluffy_client.dart'; import 'utils/platform_infos.dart'; import 'utils/background_push.dart'; diff --git a/lib/pages/chat.dart b/lib/pages/chat.dart index fabbd5cd..7c12b254 100644 --- a/lib/pages/chat.dart +++ b/lib/pages/chat.dart @@ -12,7 +12,7 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -25,8 +25,8 @@ import 'package:scroll_to_index/scroll_to_index.dart'; import 'package:url_launcher/url_launcher.dart'; import 'send_file_dialog.dart'; -import '../utils/filtered_timeline_extension.dart'; -import '../utils/matrix_file_extension.dart'; +import '../utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart'; +import '../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; class Chat extends StatefulWidget { final String id; diff --git a/lib/pages/chat_details.dart b/lib/pages/chat_details.dart index 812e9989..e6a58aa6 100644 --- a/lib/pages/chat_details.dart +++ b/lib/pages/chat_details.dart @@ -8,7 +8,7 @@ import 'package:fluffychat/pages/views/chat_details_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/services.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/pages/chat_list.dart b/lib/pages/chat_list.dart index 6a80ae68..8363c050 100644 --- a/lib/pages/chat_list.dart +++ b/lib/pages/chat_list.dart @@ -16,7 +16,7 @@ import 'package:receive_sharing_intent/receive_sharing_intent.dart'; import 'package:uni_links/uni_links.dart'; import '../main.dart'; import '../widgets/matrix.dart'; -import '../utils/matrix_file_extension.dart'; +import '../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; import '../utils/url_launcher.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/pages/image_viewer.dart b/lib/pages/image_viewer.dart index 2618f02e..c3ca1287 100644 --- a/lib/pages/image_viewer.dart +++ b/lib/pages/image_viewer.dart @@ -5,7 +5,7 @@ import 'package:fluffychat/pages/views/image_viewer_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; -import '../utils/event_extension.dart'; +import '../utils/matrix_sdk_extensions.dart/event_extension.dart'; class ImageViewer extends StatefulWidget { final Event event; diff --git a/lib/pages/send_file_dialog.dart b/lib/pages/send_file_dialog.dart index 5e6842a6..d2b87e5d 100644 --- a/lib/pages/send_file_dialog.dart +++ b/lib/pages/send_file_dialog.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import '../utils/matrix_file_extension.dart'; +import '../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; import '../utils/room_send_file_extension.dart'; import '../utils/resize_image.dart'; diff --git a/lib/pages/views/chat_details_view.dart b/lib/pages/views/chat_details_view.dart index 2830ecff..f873ef60 100644 --- a/lib/pages/views/chat_details_view.dart +++ b/lib/pages/views/chat_details_view.dart @@ -11,7 +11,7 @@ import 'package:fluffychat/widgets/chat_settings_popup_menu.dart'; import 'package:fluffychat/widgets/content_banner.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/list_items/participant_list_item.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix_link_text/link_text.dart'; diff --git a/lib/pages/views/chat_encryption_settings_view.dart b/lib/pages/views/chat_encryption_settings_view.dart index d4c3535b..f66d31a6 100644 --- a/lib/pages/views/chat_encryption_settings_view.dart +++ b/lib/pages/views/chat_encryption_settings_view.dart @@ -5,7 +5,7 @@ import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import '../../utils/device_extension.dart'; +import '../../utils/matrix_sdk_extensions.dart/device_extension.dart'; class ChatEncryptionSettingsView extends StatelessWidget { final ChatEncryptionSettingsController controller; diff --git a/lib/pages/views/chat_view.dart b/lib/pages/views/chat_view.dart index 7a87e7d7..2654d243 100644 --- a/lib/pages/views/chat_view.dart +++ b/lib/pages/views/chat_view.dart @@ -14,12 +14,12 @@ import 'package:fluffychat/config/themes.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/widgets/encryption_button.dart'; -import 'package:fluffychat/widgets/list_items/message.dart'; +import 'package:fluffychat/widgets/event_content/message.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/reply_content.dart'; +import 'package:fluffychat/widgets/event_content/reply_content.dart'; import 'package:fluffychat/pages/user_bottom_sheet.dart'; import 'package:fluffychat/config/app_emojis.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/room_status_extension.dart'; import 'package:flutter/foundation.dart'; diff --git a/lib/pages/views/image_viewer_view.dart b/lib/pages/views/image_viewer_view.dart index cecfdfe6..5caac3c7 100644 --- a/lib/pages/views/image_viewer_view.dart +++ b/lib/pages/views/image_viewer_view.dart @@ -1,5 +1,5 @@ import '../image_viewer.dart'; -import 'package:fluffychat/widgets/image_bubble.dart'; +import 'package:fluffychat/widgets/event_content/image_bubble.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/pages/views/user_bottom_sheet_view.dart b/lib/pages/views/user_bottom_sheet_view.dart index cc9f915e..25e78cf9 100644 --- a/lib/pages/views/user_bottom_sheet_view.dart +++ b/lib/pages/views/user_bottom_sheet_view.dart @@ -6,7 +6,7 @@ import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:flutter/material.dart'; import '../../widgets/content_banner.dart'; import '../user_bottom_sheet.dart'; -import '../../utils/presence_extension.dart'; +import '../../utils/matrix_sdk_extensions.dart/presence_extension.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; class UserBottomSheetView extends StatelessWidget { diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 8d0b1266..663d2cdc 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -38,8 +38,8 @@ import 'platform_infos.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; import 'famedlysdk_store.dart'; -import 'fluffy_client.dart'; -import 'matrix_locals.dart'; +import 'matrix_sdk_extensions.dart/fluffy_client.dart'; +import 'matrix_sdk_extensions.dart/matrix_locals.dart'; class NoTokenException implements Exception { String get cause => 'Cannot get firebase token'; diff --git a/lib/utils/client_presence_extension.dart b/lib/utils/matrix_sdk_extensions.dart/client_presence_extension.dart similarity index 100% rename from lib/utils/client_presence_extension.dart rename to lib/utils/matrix_sdk_extensions.dart/client_presence_extension.dart diff --git a/lib/utils/device_extension.dart b/lib/utils/matrix_sdk_extensions.dart/device_extension.dart similarity index 100% rename from lib/utils/device_extension.dart rename to lib/utils/matrix_sdk_extensions.dart/device_extension.dart diff --git a/lib/utils/event_extension.dart b/lib/utils/matrix_sdk_extensions.dart/event_extension.dart similarity index 98% rename from lib/utils/event_extension.dart rename to lib/utils/matrix_sdk_extensions.dart/event_extension.dart index 08dd9ebc..8a56f097 100644 --- a/lib/utils/event_extension.dart +++ b/lib/utils/matrix_sdk_extensions.dart/event_extension.dart @@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'matrix_file_extension.dart'; -import '../pages/image_viewer.dart'; +import '../../pages/image_viewer.dart'; extension LocalizedBody on Event { void openFile(BuildContext context, {bool downloadOnly = false}) async { diff --git a/lib/utils/filtered_timeline_extension.dart b/lib/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart similarity index 98% rename from lib/utils/filtered_timeline_extension.dart rename to lib/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart index 8dfc46ef..08e69225 100644 --- a/lib/utils/filtered_timeline_extension.dart +++ b/lib/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart @@ -1,6 +1,6 @@ import 'package:famedlysdk/famedlysdk.dart'; -import '../config/app_config.dart'; +import '../../config/app_config.dart'; extension FilteredTimelineExtension on Timeline { List getFilteredEvents({Set unfolded = const {}}) { diff --git a/lib/utils/fluffy_client.dart b/lib/utils/matrix_sdk_extensions.dart/fluffy_client.dart similarity index 94% rename from lib/utils/fluffy_client.dart rename to lib/utils/matrix_sdk_extensions.dart/fluffy_client.dart index 82f3ab61..337e3bef 100644 --- a/lib/utils/fluffy_client.dart +++ b/lib/utils/matrix_sdk_extensions.dart/fluffy_client.dart @@ -1,8 +1,8 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/encryption.dart'; import 'package:matrix_api_lite/fake_matrix_api.dart'; -import 'platform_infos.dart'; -import 'famedlysdk_store.dart'; +import '../platform_infos.dart'; +import '../famedlysdk_store.dart'; class FluffyClient extends Client { static FluffyClient _instance; diff --git a/lib/utils/matrix_file_extension.dart b/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart similarity index 100% rename from lib/utils/matrix_file_extension.dart rename to lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart diff --git a/lib/utils/matrix_locals.dart b/lib/utils/matrix_sdk_extensions.dart/matrix_locals.dart similarity index 100% rename from lib/utils/matrix_locals.dart rename to lib/utils/matrix_sdk_extensions.dart/matrix_locals.dart diff --git a/lib/utils/presence_extension.dart b/lib/utils/matrix_sdk_extensions.dart/presence_extension.dart similarity index 96% rename from lib/utils/presence_extension.dart rename to lib/utils/matrix_sdk_extensions.dart/presence_extension.dart index d3f4a274..4dab9e84 100644 --- a/lib/utils/presence_extension.dart +++ b/lib/utils/matrix_sdk_extensions.dart/presence_extension.dart @@ -2,7 +2,7 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'date_time_extension.dart'; +import '../date_time_extension.dart'; extension PresenceExtension on Presence { String getLocalizedLastActiveAgo(BuildContext context) { diff --git a/lib/utils/room_status_extension.dart b/lib/utils/room_status_extension.dart index 97cf6b4e..b3bf8e9f 100644 --- a/lib/utils/room_status_extension.dart +++ b/lib/utils/room_status_extension.dart @@ -1,7 +1,7 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'filtered_timeline_extension.dart'; +import 'matrix_sdk_extensions.dart/filtered_timeline_extension.dart'; import '../config/app_config.dart'; import 'date_time_extension.dart'; diff --git a/lib/widgets/contacts_list.dart b/lib/widgets/contacts_list.dart index e5a404c5..80da865e 100644 --- a/lib/widgets/contacts_list.dart +++ b/lib/widgets/contacts_list.dart @@ -4,8 +4,8 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; -import '../utils/client_presence_extension.dart'; -import '../utils/presence_extension.dart'; +import '../utils/matrix_sdk_extensions.dart/client_presence_extension.dart'; +import '../utils/matrix_sdk_extensions.dart/presence_extension.dart'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; class ContactsList extends StatefulWidget { diff --git a/lib/widgets/audio_player.dart b/lib/widgets/event_content/audio_player.dart similarity index 96% rename from lib/widgets/audio_player.dart rename to lib/widgets/event_content/audio_player.dart index f449f4b1..e5a27b0c 100644 --- a/lib/widgets/audio_player.dart +++ b/lib/widgets/event_content/audio_player.dart @@ -5,16 +5,16 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:audioplayers/audioplayers.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:fluffychat/utils/sentry_controller.dart'; -import 'package:fluffychat/widgets/message_download_content.dart'; +import 'package:fluffychat/widgets/event_content/message_download_content.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:path_provider/path_provider.dart'; import 'package:universal_html/html.dart' as html; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import '../utils/ui_fake.dart' if (dart.library.html) 'dart:ui' as ui; -import 'matrix.dart'; -import '../utils/event_extension.dart'; +import '../../utils/ui_fake.dart' if (dart.library.html) 'dart:ui' as ui; +import '../matrix.dart'; +import '../../utils/matrix_sdk_extensions.dart/event_extension.dart'; class AudioPlayerWidget extends StatefulWidget { final Color color; diff --git a/lib/widgets/html_message.dart b/lib/widgets/event_content/html_message.dart similarity index 97% rename from lib/widgets/html_message.dart rename to lib/widgets/event_content/html_message.dart index 23e1208b..d221cc2c 100644 --- a/lib/widgets/html_message.dart +++ b/lib/widgets/event_content/html_message.dart @@ -1,10 +1,10 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:flutter_matrix_html/flutter_html.dart'; import 'package:flutter/material.dart'; -import '../utils/url_launcher.dart'; -import '../config/setting_keys.dart'; +import '../../utils/url_launcher.dart'; +import '../../config/setting_keys.dart'; -import 'matrix.dart'; +import '../matrix.dart'; class HtmlMessage extends StatelessWidget { final String html; diff --git a/lib/widgets/image_bubble.dart b/lib/widgets/event_content/image_bubble.dart similarity index 99% rename from lib/widgets/image_bubble.dart rename to lib/widgets/event_content/image_bubble.dart index 86655d34..0f25f7cc 100644 --- a/lib/widgets/image_bubble.dart +++ b/lib/widgets/event_content/image_bubble.dart @@ -6,7 +6,7 @@ import 'package:flutter_blurhash/flutter_blurhash.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import '../utils/event_extension.dart'; +import '../../utils/matrix_sdk_extensions.dart/event_extension.dart'; class ImageBubble extends StatefulWidget { final Event event; diff --git a/lib/widgets/list_items/message.dart b/lib/widgets/event_content/message.dart similarity index 97% rename from lib/widgets/list_items/message.dart rename to lib/widgets/event_content/message.dart index 0283d588..c1183f8f 100644 --- a/lib/widgets/list_items/message.dart +++ b/lib/widgets/event_content/message.dart @@ -1,16 +1,16 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/widgets/message_content.dart'; -import 'package:fluffychat/widgets/reply_content.dart'; +import 'package:fluffychat/widgets/event_content/message_content.dart'; +import 'package:fluffychat/widgets/event_content/reply_content.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; -import 'package:fluffychat/utils/event_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; import 'package:fluffychat/utils/string_color.dart'; import 'package:flutter/material.dart'; import '../../config/app_config.dart'; import '../avatar.dart'; import '../matrix.dart'; -import '../message_reactions.dart'; +import 'message_reactions.dart'; import 'state_message.dart'; class Message extends StatelessWidget { diff --git a/lib/widgets/message_content.dart b/lib/widgets/event_content/message_content.dart similarity index 94% rename from lib/widgets/message_content.dart rename to lib/widgets/event_content/message_content.dart index b08c7025..a35d07a1 100644 --- a/lib/widgets/message_content.dart +++ b/lib/widgets/event_content/message_content.dart @@ -1,11 +1,11 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/encryption/utils/key_verification.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/widgets/audio_player.dart'; +import 'package:fluffychat/widgets/event_content/audio_player.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:fluffychat/widgets/image_bubble.dart'; -import 'package:fluffychat/utils/event_extension.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:fluffychat/widgets/event_content/image_bubble.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/pages/key_verification_dialog.dart'; import 'package:flutter/material.dart'; @@ -13,10 +13,10 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix_link_text/link_text.dart'; import 'package:url_launcher/url_launcher.dart'; -import '../utils/url_launcher.dart'; -import '../config/app_config.dart'; +import '../../utils/url_launcher.dart'; +import '../../config/app_config.dart'; import 'html_message.dart'; -import 'matrix.dart'; +import '../matrix.dart'; import 'message_download_content.dart'; class MessageContent extends StatelessWidget { diff --git a/lib/widgets/message_download_content.dart b/lib/widgets/event_content/message_download_content.dart similarity index 94% rename from lib/widgets/message_download_content.dart rename to lib/widgets/event_content/message_download_content.dart index 64dcd749..40fd22ce 100644 --- a/lib/widgets/message_download_content.dart +++ b/lib/widgets/event_content/message_download_content.dart @@ -1,6 +1,6 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:flutter/material.dart'; -import 'package:fluffychat/utils/event_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; class MessageDownloadContent extends StatelessWidget { final Event event; diff --git a/lib/widgets/message_reactions.dart b/lib/widgets/event_content/message_reactions.dart similarity index 99% rename from lib/widgets/message_reactions.dart rename to lib/widgets/event_content/message_reactions.dart index e965584e..a807eb65 100644 --- a/lib/widgets/message_reactions.dart +++ b/lib/widgets/event_content/message_reactions.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:characters/characters.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'matrix.dart'; +import '../matrix.dart'; class MessageReactions extends StatelessWidget { final Event event; diff --git a/lib/widgets/reply_content.dart b/lib/widgets/event_content/reply_content.dart similarity index 96% rename from lib/widgets/reply_content.dart rename to lib/widgets/event_content/reply_content.dart index f47b2d2d..2e040c66 100644 --- a/lib/widgets/reply_content.dart +++ b/lib/widgets/event_content/reply_content.dart @@ -1,10 +1,10 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'html_message.dart'; -import '../config/app_config.dart'; +import '../../config/app_config.dart'; class ReplyContent extends StatelessWidget { final Event replyEvent; diff --git a/lib/widgets/list_items/state_message.dart b/lib/widgets/event_content/state_message.dart similarity index 96% rename from lib/widgets/list_items/state_message.dart rename to lib/widgets/event_content/state_message.dart index f0c5357d..fc160943 100644 --- a/lib/widgets/list_items/state_message.dart +++ b/lib/widgets/event_content/state_message.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/widgets/list_items/chat_list_item.dart b/lib/widgets/list_items/chat_list_item.dart index ec5c9cee..91ad3ce5 100644 --- a/lib/widgets/list_items/chat_list_item.dart +++ b/lib/widgets/list_items/chat_list_item.dart @@ -2,8 +2,8 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/event_extension.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/utils/room_status_extension.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/list_items/user_device_list_item.dart b/lib/widgets/list_items/user_device_list_item.dart index 805fa216..5db9ebb3 100644 --- a/lib/widgets/list_items/user_device_list_item.dart +++ b/lib/widgets/list_items/user_device_list_item.dart @@ -5,7 +5,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import '../matrix.dart'; import '../../utils/date_time_extension.dart'; -import '../../utils/device_extension.dart'; +import '../../utils/matrix_sdk_extensions.dart/device_extension.dart'; enum UserDeviceListItemAction { rename, diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index 54810974..e86c3eac 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -6,7 +6,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/matrix_locals.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/sentry_controller.dart'; import 'package:flutter/foundation.dart'; @@ -28,7 +28,7 @@ import '../pages/key_verification_dialog.dart'; import '../utils/platform_infos.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; -import '../utils/fluffy_client.dart'; +import '../utils/matrix_sdk_extensions.dart/fluffy_client.dart'; import '../utils/background_push.dart'; class Matrix extends StatefulWidget { diff --git a/test/utils/test_client.dart b/test/utils/test_client.dart index 49d6e8ec..535a4c9b 100644 --- a/test/utils/test_client.dart +++ b/test/utils/test_client.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/utils/fluffy_client.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions.dart/fluffy_client.dart'; Future testClient({ bool loggedIn = false,