refactor: Structure files in more directories

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';
 

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;

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';

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';
 

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;

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';
 

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';

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;

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';

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';
 

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 {

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';

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 {

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<Event> getFilteredEvents({Set<String> unfolded = const {}}) {

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;

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) {

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';
 

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 {

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;

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;

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;

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 {

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 {

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;

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;

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;

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';
 

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';

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,

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 {

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<FluffyClient> testClient({
   bool loggedIn = false,