refactor: Move widgets to lib

lib/config/routes.dart

@@ -7,15 +7,15 @@ import 'package:fluffychat/views/settings_emotes.dart';
 import 'package:fluffychat/views/settings_multiple_emotes.dart';
 import 'package:fluffychat/views/sign_up.dart';
 import 'package:fluffychat/views/sign_up_password.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:fluffychat/views/chat.dart';
 import 'package:fluffychat/views/chat_details.dart';
 import 'package:fluffychat/views/chat_encryption_settings.dart';
 import 'package:fluffychat/views/chat_list.dart';
 import 'package:fluffychat/views/chat_permissions_settings.dart';
 import 'package:fluffychat/views/ui/empty_page_ui.dart';
-import 'package:fluffychat/views/widgets/layouts/loading_view.dart';
-import 'package:fluffychat/views/widgets/log_view.dart';
+import 'package:fluffychat/widgets/layouts/loading_view.dart';
+import 'package:fluffychat/widgets/log_view.dart';
 import 'package:fluffychat/views/ui/login_ui.dart';
 import 'package:fluffychat/views/new_group.dart';
 import 'package:fluffychat/views/new_private_chat.dart';

lib/main.dart

@@ -15,8 +15,8 @@ import 'package:flutter_app_lock/flutter_app_lock.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:universal_html/html.dart' as html;
 
-import 'views/widgets/lock_screen.dart';
-import 'views/widgets/matrix.dart';
+import 'widgets/lock_screen.dart';
+import 'widgets/matrix.dart';
 import 'config/themes.dart';
 import 'config/app_config.dart';
 import 'utils/fluffy_client.dart';

lib/utils/platform_infos.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:fluffychat/views/widgets/sentry_switch_list_tile.dart';
+import 'package:fluffychat/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/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';

lib/views/archive.dart

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

lib/views/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/views/widgets/adaptive_flat_button.dart';
+import 'package:fluffychat/widgets/adaptive_flat_button.dart';
 import 'package:flutter/services.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/cupertino.dart';

lib/views/chat.dart

@@ -11,7 +11,7 @@ import 'package:fluffychat/views/recording_dialog.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:fluffychat/utils/matrix_locals.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/foundation.dart';

lib/views/chat_details.dart

@@ -5,7 +5,7 @@ import 'package:famedlysdk/famedlysdk.dart';
 
 import 'package:file_picker_cross/file_picker_cross.dart';
 import 'package:fluffychat/views/ui/chat_details_ui.dart';
-import 'package:fluffychat/views/widgets/matrix.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';

lib/views/chat_encryption_settings.dart

@@ -1,7 +1,7 @@
 import 'package:famedlysdk/encryption.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/views/ui/chat_encryption_settings_ui.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'key_verification_dialog.dart';
 

lib/views/chat_list.dart

@@ -15,7 +15,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:uni_links/uni_links.dart';
 import '../main.dart';
-import 'widgets/matrix.dart';
+import '../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

@@ -5,7 +5,7 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:fluffychat/views/ui/chat_permissions_settings_ui.dart';
 import 'package:fluffychat/views/permission_slider_dialog.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/device_settings.dart

@@ -7,7 +7,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import 'widgets/matrix.dart';
+import '../widgets/matrix.dart';
 
 class DevicesSettings extends StatefulWidget {
   @override

lib/views/homeserver_picker.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/views/ui/homeserver_picker_ui.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/setting_keys.dart';
 import 'package:fluffychat/utils/platform_infos.dart';

lib/views/image_viewer.dart

@@ -2,7 +2,7 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/views/ui/image_viewer_ui.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 
 import '../utils/event_extension.dart';

lib/views/invitation_selection.dart

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

lib/views/key_verification_dialog.dart

@@ -5,7 +5,7 @@ import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'widgets/adaptive_flat_button.dart';
+import '../widgets/adaptive_flat_button.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import '../utils/string_color.dart';
 import '../utils/beautify_string_extension.dart';

lib/views/new_group.dart

@@ -2,7 +2,7 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart' as sdk;
 import 'package:fluffychat/views/ui/new_group_ui.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 
 class NewGroup extends StatefulWidget {

lib/views/new_private_chat.dart

@@ -5,7 +5,7 @@ import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
 import 'package:fluffychat/views/ui/new_private_chat_ui.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/permission_slider_dialog.dart

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

lib/views/search.dart

@@ -3,7 +3,7 @@ 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/views/widgets/matrix.dart';
+import 'package:fluffychat/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

@@ -17,7 +17,7 @@ import 'package:image_picker/image_picker.dart';
 import 'ui/settings_ui.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'bootstrap_dialog.dart';
-import 'widgets/matrix.dart';
+import '../widgets/matrix.dart';
 import '../config/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/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/settings_emotes.dart

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

lib/views/settings_ignore_list.dart

@@ -2,7 +2,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:flutter/material.dart';
 
 import 'ui/settings_ignore_list_ui.dart';
-import 'widgets/matrix.dart';
+import '../widgets/matrix.dart';
 
 class SettingsIgnoreList extends StatefulWidget {
   final String initialUserId;

lib/views/settings_notifications.dart

@@ -7,7 +7,7 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:open_noti_settings/open_noti_settings.dart';
 
 import 'ui/settings_notifications_ui.dart';
-import 'widgets/matrix.dart';
+import '../widgets/matrix.dart';
 
 class NotificationSettingsItem {
   final PushRuleKind type;

lib/views/settings_style.dart

@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 
 import 'ui/settings_style_ui.dart';
-import 'widgets/matrix.dart';
+import '../widgets/matrix.dart';
 
 class SettingsStyle extends StatefulWidget {
   @override

lib/views/sign_up.dart

@@ -3,7 +3,7 @@ import 'package:famedlysdk/famedlysdk.dart';
 import 'package:file_picker_cross/file_picker_cross.dart';
 import 'package:fluffychat/views/ui/sign_up_ui.dart';
 
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.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

@@ -6,7 +6,7 @@ import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/utils/get_client_secret.dart';
 import 'package:fluffychat/views/ui/sign_up_password_ui.dart';
 
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import '../utils/platform_infos.dart';

lib/views/ui/archive_ui.dart

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

lib/views/ui/chat_details_ui.dart

@@ -1,16 +1,16 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/views/chat_details.dart';
-import 'package:fluffychat/views/widgets/avatar.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/avatar.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
 
 import 'package:famedlysdk/famedlysdk.dart';
 
-import 'package:fluffychat/views/widgets/chat_settings_popup_menu.dart';
-import 'package:fluffychat/views/widgets/content_banner.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
-import 'package:fluffychat/views/widgets/list_items/participant_list_item.dart';
+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:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/ui/chat_encryption_settings_ui.dart

@@ -1,8 +1,8 @@
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/views/chat_encryption_settings.dart';
-import 'package:fluffychat/views/widgets/avatar.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/avatar.dart';
+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';

lib/views/ui/chat_list_ui.dart

@@ -1,13 +1,13 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/views/chat_list.dart';
-import 'package:fluffychat/views/widgets/connection_status_header.dart';
-import 'package:fluffychat/views/widgets/list_items/chat_list_item.dart';
+import 'package:fluffychat/widgets/connection_status_header.dart';
+import 'package:fluffychat/widgets/list_items/chat_list_item.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import '../widgets/matrix.dart';
+import '../../widgets/matrix.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 class ChatListUI extends StatelessWidget {

lib/views/ui/chat_permissions_settings_ui.dart

@@ -1,7 +1,7 @@
 import 'package:fluffychat/views/chat_permissions_settings.dart';
-import 'package:fluffychat/views/widgets/list_items/permission_list_tile.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/list_items/permission_list_tile.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/ui/chat_ui.dart

@@ -5,18 +5,18 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/views/chat.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/input_bar.dart';
-import 'package:fluffychat/views/widgets/unread_badge_back_button.dart';
+import 'package:fluffychat/widgets/avatar.dart';
+import 'package:fluffychat/widgets/chat_settings_popup_menu.dart';
+import 'package:fluffychat/widgets/connection_status_header.dart';
+import 'package:fluffychat/widgets/input_bar.dart';
+import 'package:fluffychat/widgets/unread_badge_back_button.dart';
 import 'package:fluffychat/config/themes.dart';
 
 import 'package:future_loading_dialog/future_loading_dialog.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/widgets/encryption_button.dart';
+import 'package:fluffychat/widgets/list_items/message.dart';
+import 'package:fluffychat/widgets/matrix.dart';
+import 'package:fluffychat/widgets/reply_content.dart';
 import 'package:fluffychat/views/user_bottom_sheet.dart';
 import 'package:fluffychat/config/app_emojis.dart';
 import 'package:fluffychat/utils/matrix_locals.dart';

lib/views/ui/device_settings_ui.dart

@@ -1,9 +1,9 @@
 import 'package:fluffychat/views/device_settings.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../widgets/list_items/user_device_list_item.dart';
+import '../../widgets/list_items/user_device_list_item.dart';
 
 class DevicesSettingsUI extends StatelessWidget {
   final DevicesSettingsController controller;

lib/views/ui/homeserver_picker_ui.dart

@@ -1,8 +1,8 @@
 import '../homeserver_picker.dart';
-import 'package:fluffychat/views/widgets/default_app_bar_search_field.dart';
-import 'package:fluffychat/views/widgets/fluffy_banner.dart';
+import 'package:fluffychat/widgets/default_app_bar_search_field.dart';
+import 'package:fluffychat/widgets/fluffy_banner.dart';
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/views/widgets/layouts/one_page_card.dart';
+import 'package:fluffychat/widgets/layouts/one_page_card.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 
 import 'package:flutter/foundation.dart';

lib/views/ui/image_viewer_ui.dart

@@ -1,5 +1,5 @@
 import '../image_viewer.dart';
-import 'package:fluffychat/views/widgets/image_bubble.dart';
+import 'package:fluffychat/widgets/image_bubble.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/ui/invitation_selection_ui.dart

@@ -1,10 +1,10 @@
 import 'package:fluffychat/views/invitation_selection.dart';
-import 'package:fluffychat/views/widgets/default_app_bar_search_field.dart';
+import 'package:fluffychat/widgets/default_app_bar_search_field.dart';
 
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/views/widgets/avatar.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/avatar.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/ui/login_ui.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/views/widgets/layouts/one_page_card.dart';
+import 'package:fluffychat/widgets/layouts/one_page_card.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/ui/new_group_ui.dart

@@ -1,5 +1,5 @@
 import 'package:fluffychat/views/new_group.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/ui/new_private_chat_ui.dart

@@ -1,9 +1,9 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:fluffychat/views/new_private_chat.dart';
-import 'package:fluffychat/views/widgets/avatar.dart';
-import 'package:fluffychat/views/widgets/contacts_list.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
-import 'package:fluffychat/views/widgets/matrix.dart';
+import 'package:fluffychat/widgets/avatar.dart';
+import 'package:fluffychat/widgets/contacts_list.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:famedlysdk/famedlysdk.dart';

lib/views/ui/search_ui.dart

@@ -1,10 +1,10 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:famedlysdk/famedlysdk.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:fluffychat/widgets/avatar.dart';
+import 'package:fluffychat/widgets/contacts_list.dart';
+import 'package:fluffychat/widgets/default_app_bar_search_field.dart';
+import 'package:fluffychat/widgets/list_items/chat_list_item.dart';
+import 'package:fluffychat/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/ui/settings_3pid_ui.dart

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

lib/views/ui/settings_emotes_ui.dart

@@ -1,10 +1,10 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import '../widgets/matrix.dart';
+import '../../widgets/matrix.dart';
 import '../settings_emotes.dart';
 
 class EmotesSettingsUI extends StatelessWidget {

lib/views/ui/settings_ignore_list_ui.dart

@@ -1,12 +1,12 @@
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/views/widgets/avatar.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/avatar.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../settings_ignore_list.dart';
-import '../widgets/matrix.dart';
+import '../../widgets/matrix.dart';
 
 class SettingsIgnoreListUI extends StatelessWidget {
   final SettingsIgnoreListController controller;

lib/views/ui/settings_multiple_emotes_ui.dart

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

lib/views/ui/settings_notifications_ui.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -9,7 +9,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import '../../utils/localized_exception_extension.dart';
 
 import '../settings_notifications.dart';
-import '../widgets/matrix.dart';
+import '../../widgets/matrix.dart';
 
 class SettingsNotificationsUI extends StatelessWidget {
   final SettingsNotificationsController controller;

lib/views/ui/settings_style_ui.dart

@@ -1,10 +1,10 @@
 import 'package:adaptive_theme/adaptive_theme.dart';
-import 'package:fluffychat/views/widgets/layouts/max_width_body.dart';
+import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../../config/app_config.dart';
-import '../widgets/matrix.dart';
+import '../../widgets/matrix.dart';
 import '../settings_style.dart';
 
 class SettingsStyleUI extends StatelessWidget {

lib/views/ui/settings_ui.dart

@@ -1,7 +1,7 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
-import 'package:fluffychat/views/widgets/sentry_switch_list_tile.dart';
-import 'package:fluffychat/views/widgets/settings_switch_list_tile.dart';
+import 'package:fluffychat/widgets/sentry_switch_list_tile.dart';
+import 'package:fluffychat/widgets/settings_switch_list_tile.dart';
 
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/utils/beautify_string_extension.dart';
@@ -12,8 +12,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../widgets/content_banner.dart';
-import '../widgets/matrix.dart';
+import '../../widgets/content_banner.dart';
+import '../../widgets/matrix.dart';
 import '../../config/app_config.dart';
 import '../../config/setting_keys.dart';
 import '../settings.dart';

lib/views/ui/sign_up_password_ui.dart

@@ -1,6 +1,6 @@
 import 'package:fluffychat/views/sign_up_password.dart';
 
-import 'package:fluffychat/views/widgets/layouts/one_page_card.dart';
+import 'package:fluffychat/widgets/layouts/one_page_card.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 

lib/views/ui/sign_up_ui.dart

@@ -1,9 +1,9 @@
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 import 'package:fluffychat/views/sign_up.dart';
-import 'package:fluffychat/views/widgets/fluffy_banner.dart';
+import 'package:fluffychat/widgets/fluffy_banner.dart';
 
-import 'package:fluffychat/views/widgets/matrix.dart';
-import 'package:fluffychat/views/widgets/layouts/one_page_card.dart';
+import 'package:fluffychat/widgets/matrix.dart';
+import 'package:fluffychat/widgets/layouts/one_page_card.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/views/ui/user_bottom_sheet_ui.dart

@@ -4,7 +4,7 @@ import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
 import 'package:flutter/material.dart';
-import '../widgets/content_banner.dart';
+import '../../widgets/content_banner.dart';
 import '../user_bottom_sheet.dart';
 import '../../utils/presence_extension.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

lib/widgets/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/views/widgets/message_download_content.dart';
+import 'package:fluffychat/widgets/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 '../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 AudioPlayerWidget extends StatefulWidget {
   final Color color;

lib/widgets/contacts_list.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:famedlysdk/famedlysdk.dart';
-import 'package:fluffychat/views/widgets/avatar.dart';
-import 'package:fluffychat/views/widgets/matrix.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/client_presence_extension.dart';
+import '../utils/presence_extension.dart';
 import 'package:adaptive_page_layout/adaptive_page_layout.dart';
 
 class ContactsList extends StatefulWidget {

lib/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 '../../config/app_config.dart';
+import '../config/app_config.dart';
 
 class DefaultAppBarSearchField extends StatefulWidget {
   final TextEditingController searchController;

lib/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/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/widgets/layouts/loading_view.dart

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

lib/widgets/list_items/chat_list_item.dart

@@ -10,9 +10,9 @@ 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 '../../send_file_dialog.dart';
+import '../../views/send_file_dialog.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import '../matrix.dart';
 import '../mouse_over_builder.dart';

lib/widgets/list_items/message.dart

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

lib/widgets/list_items/participant_list_item.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../avatar.dart';
-import '../../user_bottom_sheet.dart';
+import '../../views/user_bottom_sheet.dart';
 
 class ParticipantListItem extends StatelessWidget {
   final User user;

lib/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 '../../../config/app_config.dart';
+import '../../config/app_config.dart';
 
 class StateMessage extends StatelessWidget {
   final Event event;

lib/widgets/list_items/user_device_list_item.dart

@@ -3,9 +3,9 @@ import 'package:famedlysdk/famedlysdk.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../../../views/widgets/matrix.dart';
-import '../../../utils/date_time_extension.dart';
-import '../../../utils/device_extension.dart';
+import '../matrix.dart';
+import '../../utils/date_time_extension.dart';
+import '../../utils/device_extension.dart';
 
 enum UserDeviceListItemAction {
   rename,

lib/widgets/matrix.dart

@@ -21,15 +21,15 @@ import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.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 '../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/background_push.dart';
+import '../utils/beautify_string_extension.dart';
+import '../utils/localized_exception_extension.dart';
+import '../utils/famedlysdk_store.dart';
+import '../views/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/background_push.dart';
 
 class Matrix extends StatefulWidget {
   static const String callNamespace = 'chat.fluffy.jitsi_call';

lib/widgets/message_content.dart

@@ -1,9 +1,9 @@
 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/views/widgets/audio_player.dart';
+import 'package:fluffychat/widgets/audio_player.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'package:fluffychat/views/widgets/image_bubble.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/views/key_verification_dialog.dart';
@@ -13,8 +13,8 @@ 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 'message_download_content.dart';

lib/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 '../../config/app_config.dart';
+import '../config/app_config.dart';
 
 class ReplyContent extends StatelessWidget {
   final Event replyEvent;

lib/widgets/unread_badge_back_button.dart

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