refactor: widgets dir

lib/config/routes.dart

@@ -1,6 +1,6 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:fluffychat/views/archive.dart';
 import 'package:fluffychat/views/chat.dart';
 import 'package:fluffychat/views/chat_details.dart';

lib/main.dart

@@ -16,7 +16,7 @@ import 'package:flutter_app_lock/flutter_app_lock.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:universal_html/prefer_universal/html.dart' as html;
 
-import 'components/matrix.dart';
+import 'views/widgets/matrix.dart';
 import 'config/themes.dart';
 import 'app_config.dart';
 import 'utils/fluffy_client.dart';

lib/utils/platform_infos.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:fluffychat/components/sentry_switch_list_tile.dart';
+import 'package:fluffychat/views/widgets/sentry_switch_list_tile.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:package_info/package_info.dart';

lib/utils/url_launcher.dart

@@ -2,7 +2,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:fluffychat/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';

lib/views/archive.dart

@@ -1,6 +1,6 @@
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/list_items/chat_list_item.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/list_items/chat_list_item.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/chat.dart

@@ -9,19 +9,19 @@ import 'package:emoji_picker/emoji_picker.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:file_picker_cross/file_picker_cross.dart';
 import 'package:fluffychat/app_config.dart';
-import 'package:fluffychat/components/avatar.dart';
-import 'package:fluffychat/components/chat_settings_popup_menu.dart';
-import 'package:fluffychat/components/connection_status_header.dart';
-import 'package:fluffychat/components/dialogs/recording_dialog.dart';
-import 'package:fluffychat/components/unread_badge_back_button.dart';
+import 'package:fluffychat/views/widgets/avatar.dart';
+import 'package:fluffychat/views/widgets/chat_settings_popup_menu.dart';
+import 'package:fluffychat/views/widgets/connection_status_header.dart';
+import 'package:fluffychat/views/widgets/dialogs/recording_dialog.dart';
+import 'package:fluffychat/views/widgets/unread_badge_back_button.dart';
 import 'package:fluffychat/config/themes.dart';
 
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/encryption_button.dart';
-import 'package:fluffychat/components/list_items/message.dart';
-import 'package:fluffychat/components/matrix.dart';
-import 'package:fluffychat/components/reply_content.dart';
-import 'package:fluffychat/components/user_bottom_sheet.dart';
+import 'package:fluffychat/views/widgets/encryption_button.dart';
+import 'package:fluffychat/views/widgets/list_items/message.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/views/widgets/reply_content.dart';
+import 'package:fluffychat/views/widgets/user_bottom_sheet.dart';
 import 'package:fluffychat/config/app_emojis.dart';
 import 'package:fluffychat/utils/matrix_locals.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
@@ -39,8 +39,8 @@ import 'package:swipe_to_action/swipe_to_action.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../components/dialogs/send_file_dialog.dart';
-import '../components/input_bar.dart';
+import '../views/widgets/dialogs/send_file_dialog.dart';
+import '../views/widgets/input_bar.dart';
 import '../utils/filtered_timeline_extension.dart';
 import '../utils/matrix_file_extension.dart';
 

lib/views/chat_details.dart

@@ -1,17 +1,17 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:fluffychat/app_config.dart';
-import 'package:fluffychat/components/avatar.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/avatar.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
 
 import 'package:famedlysdk/famedlysdk.dart';
 
 import 'package:file_picker_cross/file_picker_cross.dart';
-import 'package:fluffychat/components/chat_settings_popup_menu.dart';
-import 'package:fluffychat/components/content_banner.dart';
+import 'package:fluffychat/views/widgets/chat_settings_popup_menu.dart';
+import 'package:fluffychat/views/widgets/content_banner.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/list_items/participant_list_item.dart';
+import 'package:fluffychat/views/widgets/list_items/participant_list_item.dart';
 import 'package:fluffychat/utils/matrix_locals.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/material.dart';

lib/views/chat_encryption_settings.dart

@@ -1,10 +1,10 @@
 import 'package:famedlysdk/encryption.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/avatar.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/avatar.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import '../components/dialogs/key_verification_dialog.dart';
+import '../views/widgets/dialogs/key_verification_dialog.dart';
 import '../utils/device_extension.dart';
 
 class ChatEncryptionSettings extends StatefulWidget {

lib/views/chat_list.dart

@@ -4,8 +4,8 @@ import 'dart:io';
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/connection_status_header.dart';
-import 'package:fluffychat/components/list_items/chat_list_item.dart';
+import 'package:fluffychat/views/widgets/connection_status_header.dart';
+import 'package:fluffychat/views/widgets/list_items/chat_list_item.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:fluffychat/app_config.dart';
@@ -14,7 +14,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
-import '../components/matrix.dart';
+import '../views/widgets/matrix.dart';
 import '../utils/matrix_file_extension.dart';
 import '../utils/url_launcher.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/chat_permissions_settings.dart

@@ -2,9 +2,9 @@ import 'dart:developer';
 
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
-import 'package:fluffychat/components/dialogs/permission_slider_dialog.dart';
+import 'package:fluffychat/views/widgets/dialogs/permission_slider_dialog.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/homeserver_picker.dart

@@ -2,11 +2,11 @@ import 'dart:async';
 
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/default_app_bar_search_field.dart';
-import 'package:fluffychat/components/fluffy_banner.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/default_app_bar_search_field.dart';
+import 'package:fluffychat/views/widgets/fluffy_banner.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:fluffychat/app_config.dart';
-import 'package:fluffychat/components/one_page_card.dart';
+import 'package:fluffychat/views/widgets/one_page_card.dart';
 import 'package:fluffychat/config/setting_keys.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 

lib/views/image_view.dart

@@ -1,7 +1,7 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/image_bubble.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/image_bubble.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import '../utils/event_extension.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/invitation_selection.dart

@@ -1,12 +1,12 @@
 import 'dart:async';
 
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
-import 'package:fluffychat/components/default_app_bar_search_field.dart';
+import 'package:fluffychat/views/widgets/default_app_bar_search_field.dart';
 
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/avatar.dart';
+import 'package:fluffychat/views/widgets/avatar.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/loading_view.dart

@@ -1,5 +1,5 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 
 class LoadingView extends StatelessWidget {

lib/views/login.dart

@@ -3,9 +3,9 @@ import 'dart:async';
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/one_page_card.dart';
+import 'package:fluffychat/views/widgets/one_page_card.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/new_group.dart

@@ -1,7 +1,7 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart' as sdk;
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/new_private_chat.dart

@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/avatar.dart';
-import 'package:fluffychat/components/contacts_list.dart';
+import 'package:fluffychat/views/widgets/avatar.dart';
+import 'package:fluffychat/views/widgets/contacts_list.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/search_view.dart

@@ -3,11 +3,11 @@ import 'dart:async';
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/avatar.dart';
-import 'package:fluffychat/components/contacts_list.dart';
-import 'package:fluffychat/components/default_app_bar_search_field.dart';
-import 'package:fluffychat/components/list_items/chat_list_item.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/avatar.dart';
+import 'package:fluffychat/views/widgets/contacts_list.dart';
+import 'package:fluffychat/views/widgets/default_app_bar_search_field.dart';
+import 'package:fluffychat/views/widgets/list_items/chat_list_item.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';

lib/views/settings.dart

@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
-import 'package:fluffychat/components/dialogs/bootstrap_dialog.dart';
-import 'package:fluffychat/components/sentry_switch_list_tile.dart';
-import 'package:fluffychat/components/settings_switch_list_tile.dart';
+import 'package:fluffychat/views/widgets/dialogs/bootstrap_dialog.dart';
+import 'package:fluffychat/views/widgets/sentry_switch_list_tile.dart';
+import 'package:fluffychat/views/widgets/settings_switch_list_tile.dart';
 
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:file_picker_cross/file_picker_cross.dart';
@@ -21,9 +21,9 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../components/content_banner.dart';
+import '../views/widgets/content_banner.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import '../components/matrix.dart';
+import '../views/widgets/matrix.dart';
 import '../app_config.dart';
 import '../config/setting_keys.dart';
 

lib/views/settings_3pid.dart

@@ -1,7 +1,7 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/settings_devices.dart

@@ -1,12 +1,12 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:famedlysdk/encryption/utils/key_verification.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/dialogs/key_verification_dialog.dart';
+import 'package:fluffychat/views/widgets/dialogs/key_verification_dialog.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../components/matrix.dart';
+import '../views/widgets/matrix.dart';
 import '../utils/date_time_extension.dart';
 import '../utils/device_extension.dart';
 

lib/views/settings_emotes.dart

@@ -12,7 +12,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:image_picker/image_picker.dart';
 
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import '../components/matrix.dart';
+import '../views/widgets/matrix.dart';
 
 class EmotesSettings extends StatefulWidget {
   final Room room;

lib/views/settings_ignore_list.dart

@@ -1,10 +1,10 @@
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/avatar.dart';
+import 'package:fluffychat/views/widgets/avatar.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../components/matrix.dart';
+import '../views/widgets/matrix.dart';
 
 class SettingsIgnoreList extends StatefulWidget {
   final String initialUserId;

lib/views/settings_multiple_emotes.dart

@@ -1,5 +1,5 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/settings_notifications.dart

@@ -10,7 +10,7 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:open_noti_settings/open_noti_settings.dart';
 import '../utils/localized_exception_extension.dart';
 
-import '../components/matrix.dart';
+import '../views/widgets/matrix.dart';
 
 class NotificationSettingsItem {
   final PushRuleKind type;

lib/views/settings_style.dart

@@ -7,7 +7,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:image_picker/image_picker.dart';
 
 import '../app_config.dart';
-import '../components/matrix.dart';
+import '../views/widgets/matrix.dart';
 
 class SettingsStyle extends StatefulWidget {
   @override

lib/views/sign_up.dart

@@ -1,10 +1,10 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:file_picker_cross/file_picker_cross.dart';
-import 'package:fluffychat/components/fluffy_banner.dart';
+import 'package:fluffychat/views/widgets/fluffy_banner.dart';
 
-import 'package:fluffychat/components/matrix.dart';
-import 'package:fluffychat/components/one_page_card.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/views/widgets/one_page_card.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/sign_up_password.dart

@@ -3,8 +3,8 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 
 import 'package:famedlysdk/famedlysdk.dart';
 
-import 'package:fluffychat/components/matrix.dart';
-import 'package:fluffychat/components/one_page_card.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/views/widgets/one_page_card.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:url_launcher/url_launcher.dart';

lib/views/widgets/audio_player.dart

@@ -3,16 +3,16 @@ import 'dart:typed_data';
 
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/message_download_content.dart';
+import 'package:fluffychat/views/widgets/message_download_content.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_sound_lite/flutter_sound.dart';
 import 'package:universal_html/prefer_universal/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 '../../utils/ui_fake.dart' if (dart.library.html) 'dart:ui' as ui;
 import 'matrix.dart';
-import '../utils/event_extension.dart';
+import '../../utils/event_extension.dart';
 
 class AudioPlayer extends StatefulWidget {
   final Color color;

lib/views/widgets/contacts_list.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/avatar.dart';
-import 'package:fluffychat/components/matrix.dart';
+import 'package:fluffychat/views/widgets/avatar.dart';
+import 'package:fluffychat/views/widgets/matrix.dart';
 import 'package:flutter/material.dart';
-import '../utils/client_presence_extension.dart';
-import '../utils/presence_extension.dart';
+import '../../utils/client_presence_extension.dart';
+import '../../utils/presence_extension.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 
 class ContactsList extends StatefulWidget {

lib/views/widgets/default_app_bar_search_field.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../app_config.dart';
+import '../../app_config.dart';
 
 class DefaultAppBarSearchField extends StatefulWidget {
   final TextEditingController searchController;

lib/views/widgets/dialogs/bootstrap_dialog.dart

@@ -2,7 +2,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:famedlysdk/encryption.dart';
 import 'package:famedlysdk/encryption/utils/bootstrap.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/dialogs/adaptive_flat_button.dart';
+import 'package:fluffychat/views/widgets/dialogs/adaptive_flat_button.dart';
 import 'package:flutter/services.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/cupertino.dart';

lib/views/widgets/dialogs/key_verification_dialog.dart

@@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'adaptive_flat_button.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import '../../utils/string_color.dart';
-import '../../utils/beautify_string_extension.dart';
+import '../../../utils/string_color.dart';
+import '../../../utils/beautify_string_extension.dart';
 
 class KeyVerificationDialog extends StatefulWidget {
   Future<void> show(BuildContext context) => PlatformInfos.isCupertinoStyle

lib/views/widgets/dialogs/permission_slider_dialog.dart

@@ -1,4 +1,4 @@
-import 'package:fluffychat/components/dialogs/adaptive_flat_button.dart';
+import 'package:fluffychat/views/widgets/dialogs/adaptive_flat_button.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';

lib/views/widgets/dialogs/send_file_dialog.dart

@@ -3,9 +3,9 @@ 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/room_send_file_extension.dart';
-import '../../utils/resize_image.dart';
+import '../../../utils/matrix_file_extension.dart';
+import '../../../utils/room_send_file_extension.dart';
+import '../../../utils/resize_image.dart';
 
 class SendFileDialog extends StatefulWidget {
   final Room room;

lib/views/widgets/html_message.dart

@@ -1,8 +1,8 @@
 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';
 

lib/views/widgets/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/event_extension.dart';
 
 class ImageBubble extends StatefulWidget {
   final Event event;

lib/views/widgets/list_items/chat_list_item.dart

@@ -11,7 +11,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:pedantic/pedantic.dart';
 
-import '../../utils/date_time_extension.dart';
+import '../../../utils/date_time_extension.dart';
 import '../avatar.dart';
 import '../dialogs/send_file_dialog.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';

lib/views/widgets/list_items/message.dart

@@ -1,13 +1,13 @@
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/message_content.dart';
-import 'package:fluffychat/components/reply_content.dart';
+import 'package:fluffychat/views/widgets/message_content.dart';
+import 'package:fluffychat/views/widgets/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/string_color.dart';
 import 'package:flutter/material.dart';
 
-import '../../app_config.dart';
+import '../../../app_config.dart';
 import '../avatar.dart';
 import '../matrix.dart';
 import '../message_reactions.dart';

lib/views/widgets/list_items/state_message.dart

@@ -3,7 +3,7 @@ import 'package:fluffychat/utils/matrix_locals.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../../app_config.dart';
+import '../../../app_config.dart';
 
 class StateMessage extends StatelessWidget {
   final Event event;

lib/views/widgets/matrix.dart

@@ -24,15 +24,15 @@ import 'package:fluffychat/app_config.dart';
 import 'package:dbus/dbus.dart';
 import 'package:desktop_notifications/desktop_notifications.dart';*/
 
-import '../utils/beautify_string_extension.dart';
-import '../utils/localized_exception_extension.dart';
-import '../utils/famedlysdk_store.dart';
+import '../../utils/beautify_string_extension.dart';
+import '../../utils/localized_exception_extension.dart';
+import '../../utils/famedlysdk_store.dart';
 import 'dialogs/key_verification_dialog.dart';
-import '../utils/platform_infos.dart';
-import '../app_config.dart';
-import '../config/setting_keys.dart';
-import '../utils/fluffy_client.dart';
-import '../utils/background_push.dart';
+import '../../utils/platform_infos.dart';
+import '../../app_config.dart';
+import '../../config/setting_keys.dart';
+import '../../utils/fluffy_client.dart';
+import '../../utils/background_push.dart';
 
 class Matrix extends StatefulWidget {
   static const String callNamespace = 'chat.fluffy.jitsi_call';

lib/views/widgets/message_content.dart

@@ -1,20 +1,20 @@
 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/components/audio_player.dart';
+import 'package:fluffychat/views/widgets/audio_player.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/components/image_bubble.dart';
+import 'package:fluffychat/views/widgets/image_bubble.dart';
 import 'package:fluffychat/utils/event_extension.dart';
 import 'package:fluffychat/utils/matrix_locals.dart';
-import 'package:fluffychat/components/dialogs/key_verification_dialog.dart';
+import 'package:fluffychat/views/widgets/dialogs/key_verification_dialog.dart';
 
 import 'package:flutter/material.dart';
 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 '../app_config.dart';
+import '../../utils/url_launcher.dart';
+import '../../app_config.dart';
 import 'html_message.dart';
 import 'matrix.dart';
 import 'message_download_content.dart';

lib/views/widgets/reply_content.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import 'html_message.dart';
-import '../app_config.dart';
+import '../../app_config.dart';
 
 class ReplyContent extends StatelessWidget {
   final Event replyEvent;

lib/views/widgets/unread_badge_back_button.dart

@@ -1,7 +1,7 @@
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:flutter/material.dart';
 
-import '../app_config.dart';
+import '../../app_config.dart';
 import 'matrix.dart';
 
 class UnreadBadgeBackButton extends StatelessWidget {

lib/views/widgets/user_bottom_sheet.dart

@@ -3,14 +3,14 @@ import 'dart:math';
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/components/dialogs/permission_slider_dialog.dart';
+import 'package:fluffychat/views/widgets/dialogs/permission_slider_dialog.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
 import 'package:flutter/material.dart';
 import 'content_banner.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../utils/presence_extension.dart';
+import '../../utils/presence_extension.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 
 class UserBottomSheet extends StatelessWidget {