From c9ab69a15b76dc3569dc6694467582ad3c127912 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Fri, 9 Apr 2021 16:15:03 +0200 Subject: [PATCH] refactor: widgets dir --- lib/config/routes.dart | 2 +- lib/main.dart | 2 +- lib/utils/platform_infos.dart | 2 +- lib/utils/url_launcher.dart | 2 +- lib/views/archive.dart | 4 ++-- lib/views/chat.dart | 24 +++++++++---------- lib/views/chat_details.dart | 10 ++++---- lib/views/chat_encryption_settings.dart | 6 ++--- lib/views/chat_list.dart | 6 ++--- lib/views/chat_permissions_settings.dart | 4 ++-- lib/views/homeserver_picker.dart | 8 +++---- lib/views/image_view.dart | 4 ++-- lib/views/invitation_selection.dart | 6 ++--- lib/views/loading_view.dart | 2 +- lib/views/login.dart | 4 ++-- lib/views/new_group.dart | 2 +- lib/views/new_private_chat.dart | 6 ++--- lib/views/search_view.dart | 10 ++++---- lib/views/settings.dart | 10 ++++---- lib/views/settings_3pid.dart | 2 +- lib/views/settings_devices.dart | 4 ++-- lib/views/settings_emotes.dart | 2 +- lib/views/settings_ignore_list.dart | 4 ++-- lib/views/settings_multiple_emotes.dart | 2 +- lib/views/settings_notifications.dart | 2 +- lib/views/settings_style.dart | 2 +- lib/views/sign_up.dart | 6 ++--- lib/views/sign_up_password.dart | 4 ++-- .../widgets}/audio_player.dart | 6 ++--- lib/{components => views/widgets}/avatar.dart | 0 .../widgets}/chat_settings_popup_menu.dart | 0 .../widgets}/connection_status_header.dart | 0 .../widgets}/contacts_list.dart | 8 +++---- .../widgets}/content_banner.dart | 0 .../default_app_bar_search_field.dart | 2 +- .../dialogs/adaptive_flat_button.dart | 0 .../widgets}/dialogs/bootstrap_dialog.dart | 2 +- .../dialogs/key_verification_dialog.dart | 4 ++-- .../dialogs/permission_slider_dialog.dart | 2 +- .../widgets}/dialogs/recording_dialog.dart | 0 .../widgets}/dialogs/send_file_dialog.dart | 6 ++--- .../widgets}/encryption_button.dart | 0 .../widgets}/fluffy_banner.dart | 0 .../widgets}/html_message.dart | 4 ++-- .../widgets}/image_bubble.dart | 2 +- .../widgets}/input_bar.dart | 0 .../widgets}/list_items/chat_list_item.dart | 2 +- .../widgets}/list_items/message.dart | 6 ++--- .../list_items/participant_list_item.dart | 0 .../list_items/public_room_list_item.dart | 0 .../widgets}/list_items/state_message.dart | 2 +- lib/{components => views/widgets}/matrix.dart | 16 ++++++------- .../widgets}/message_content.dart | 10 ++++---- .../widgets}/message_download_content.dart | 0 .../widgets}/message_reactions.dart | 0 .../widgets}/mouse_over_builder.dart | 0 .../widgets}/one_page_card.dart | 0 .../widgets}/reply_content.dart | 2 +- .../widgets}/sentry_switch_list_tile.dart | 0 .../widgets}/settings_switch_list_tile.dart | 0 .../widgets}/unread_badge_back_button.dart | 2 +- .../widgets}/user_bottom_sheet.dart | 4 ++-- 62 files changed, 111 insertions(+), 111 deletions(-) rename lib/{components => views/widgets}/audio_player.dart (96%) rename lib/{components => views/widgets}/avatar.dart (100%) rename lib/{components => views/widgets}/chat_settings_popup_menu.dart (100%) rename lib/{components => views/widgets}/connection_status_header.dart (100%) rename lib/{components => views/widgets}/contacts_list.dart (93%) rename lib/{components => views/widgets}/content_banner.dart (100%) rename lib/{components => views/widgets}/default_app_bar_search_field.dart (99%) rename lib/{components => views/widgets}/dialogs/adaptive_flat_button.dart (100%) rename lib/{components => views/widgets}/dialogs/bootstrap_dialog.dart (99%) rename lib/{components => views/widgets}/dialogs/key_verification_dialog.dart (99%) rename lib/{components => views/widgets}/dialogs/permission_slider_dialog.dart (97%) rename lib/{components => views/widgets}/dialogs/recording_dialog.dart (100%) rename lib/{components => views/widgets}/dialogs/send_file_dialog.dart (95%) rename lib/{components => views/widgets}/encryption_button.dart (100%) rename lib/{components => views/widgets}/fluffy_banner.dart (100%) rename lib/{components => views/widgets}/html_message.dart (98%) rename lib/{components => views/widgets}/image_bubble.dart (99%) rename lib/{components => views/widgets}/input_bar.dart (100%) rename lib/{components => views/widgets}/list_items/chat_list_item.dart (99%) rename lib/{components => views/widgets}/list_items/message.dart (98%) rename lib/{components => views/widgets}/list_items/participant_list_item.dart (100%) rename lib/{components => views/widgets}/list_items/public_room_list_item.dart (100%) rename lib/{components => views/widgets}/list_items/state_message.dart (98%) rename lib/{components => views/widgets}/matrix.dart (97%) rename lib/{components => views/widgets}/message_content.dart (96%) rename lib/{components => views/widgets}/message_download_content.dart (100%) rename lib/{components => views/widgets}/message_reactions.dart (100%) rename lib/{components => views/widgets}/mouse_over_builder.dart (100%) rename lib/{components => views/widgets}/one_page_card.dart (100%) rename lib/{components => views/widgets}/reply_content.dart (98%) rename lib/{components => views/widgets}/sentry_switch_list_tile.dart (100%) rename lib/{components => views/widgets}/settings_switch_list_tile.dart (100%) rename lib/{components => views/widgets}/unread_badge_back_button.dart (98%) rename lib/{components => views/widgets}/user_bottom_sheet.dart (98%) diff --git a/lib/config/routes.dart b/lib/config/routes.dart index d43f8227..9c0710a8 100644 --- a/lib/config/routes.dart +++ b/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'; diff --git a/lib/main.dart b/lib/main.dart index 1dda643e..911fc121 100644 --- a/lib/main.dart +++ b/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'; diff --git a/lib/utils/platform_infos.dart b/lib/utils/platform_infos.dart index 50f83b29..dd6e0ced 100644 --- a/lib/utils/platform_infos.dart +++ b/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'; diff --git a/lib/utils/url_launcher.dart b/lib/utils/url_launcher.dart index 06a565bb..b4521dcb 100644 --- a/lib/utils/url_launcher.dart +++ b/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'; diff --git a/lib/views/archive.dart b/lib/views/archive.dart index 7b41b1e0..b51d6a9e 100644 --- a/lib/views/archive.dart +++ b/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'; diff --git a/lib/views/chat.dart b/lib/views/chat.dart index c1b86a0c..23206c26 100644 --- a/lib/views/chat.dart +++ b/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'; diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart index eb0f72e6..e7f49789 100644 --- a/lib/views/chat_details.dart +++ b/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'; diff --git a/lib/views/chat_encryption_settings.dart b/lib/views/chat_encryption_settings.dart index cd08f838..ecf23c3f 100644 --- a/lib/views/chat_encryption_settings.dart +++ b/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 { diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart index 77fc3a4d..e4a84ccb 100644 --- a/lib/views/chat_list.dart +++ b/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'; diff --git a/lib/views/chat_permissions_settings.dart b/lib/views/chat_permissions_settings.dart index e3cdbe91..4b08f519 100644 --- a/lib/views/chat_permissions_settings.dart +++ b/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'; diff --git a/lib/views/homeserver_picker.dart b/lib/views/homeserver_picker.dart index 62e2025c..d81f1996 100644 --- a/lib/views/homeserver_picker.dart +++ b/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'; diff --git a/lib/views/image_view.dart b/lib/views/image_view.dart index 8bb7e6a5..c0dd5172 100644 --- a/lib/views/image_view.dart +++ b/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'; diff --git a/lib/views/invitation_selection.dart b/lib/views/invitation_selection.dart index 32a87724..8b87c238 100644 --- a/lib/views/invitation_selection.dart +++ b/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'; diff --git a/lib/views/loading_view.dart b/lib/views/loading_view.dart index e222bca5..3791262e 100644 --- a/lib/views/loading_view.dart +++ b/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 { diff --git a/lib/views/login.dart b/lib/views/login.dart index 95dd4f73..6cd89e5c 100644 --- a/lib/views/login.dart +++ b/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'; diff --git a/lib/views/new_group.dart b/lib/views/new_group.dart index a3a6270b..7ff8e1f7 100644 --- a/lib/views/new_group.dart +++ b/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'; diff --git a/lib/views/new_private_chat.dart b/lib/views/new_private_chat.dart index 544f2631..364274e0 100644 --- a/lib/views/new_private_chat.dart +++ b/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'; diff --git a/lib/views/search_view.dart b/lib/views/search_view.dart index 1e48c3e0..a0f50a45 100644 --- a/lib/views/search_view.dart +++ b/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'; diff --git a/lib/views/settings.dart b/lib/views/settings.dart index 4c4904f7..69aa73de 100644 --- a/lib/views/settings.dart +++ b/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'; diff --git a/lib/views/settings_3pid.dart b/lib/views/settings_3pid.dart index 54ab0c7b..1b484ef5 100644 --- a/lib/views/settings_3pid.dart +++ b/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'; diff --git a/lib/views/settings_devices.dart b/lib/views/settings_devices.dart index 7a51101f..91776b63 100644 --- a/lib/views/settings_devices.dart +++ b/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'; diff --git a/lib/views/settings_emotes.dart b/lib/views/settings_emotes.dart index 3de055b2..b8ded23e 100644 --- a/lib/views/settings_emotes.dart +++ b/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; diff --git a/lib/views/settings_ignore_list.dart b/lib/views/settings_ignore_list.dart index 8542280a..eaed55e2 100644 --- a/lib/views/settings_ignore_list.dart +++ b/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; diff --git a/lib/views/settings_multiple_emotes.dart b/lib/views/settings_multiple_emotes.dart index e761cf6b..7885d5b9 100644 --- a/lib/views/settings_multiple_emotes.dart +++ b/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'; diff --git a/lib/views/settings_notifications.dart b/lib/views/settings_notifications.dart index 2ad2ec9e..d0998975 100644 --- a/lib/views/settings_notifications.dart +++ b/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; diff --git a/lib/views/settings_style.dart b/lib/views/settings_style.dart index 6a7c7ed5..a1becbf5 100644 --- a/lib/views/settings_style.dart +++ b/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 diff --git a/lib/views/sign_up.dart b/lib/views/sign_up.dart index a78092fe..ee44d481 100644 --- a/lib/views/sign_up.dart +++ b/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'; diff --git a/lib/views/sign_up_password.dart b/lib/views/sign_up_password.dart index 33feccef..fbd612be 100644 --- a/lib/views/sign_up_password.dart +++ b/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'; diff --git a/lib/components/audio_player.dart b/lib/views/widgets/audio_player.dart similarity index 96% rename from lib/components/audio_player.dart rename to lib/views/widgets/audio_player.dart index 17d00803..2e92f338 100644 --- a/lib/components/audio_player.dart +++ b/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; diff --git a/lib/components/avatar.dart b/lib/views/widgets/avatar.dart similarity index 100% rename from lib/components/avatar.dart rename to lib/views/widgets/avatar.dart diff --git a/lib/components/chat_settings_popup_menu.dart b/lib/views/widgets/chat_settings_popup_menu.dart similarity index 100% rename from lib/components/chat_settings_popup_menu.dart rename to lib/views/widgets/chat_settings_popup_menu.dart diff --git a/lib/components/connection_status_header.dart b/lib/views/widgets/connection_status_header.dart similarity index 100% rename from lib/components/connection_status_header.dart rename to lib/views/widgets/connection_status_header.dart diff --git a/lib/components/contacts_list.dart b/lib/views/widgets/contacts_list.dart similarity index 93% rename from lib/components/contacts_list.dart rename to lib/views/widgets/contacts_list.dart index 841c45fa..c28ea4e8 100644 --- a/lib/components/contacts_list.dart +++ b/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 { diff --git a/lib/components/content_banner.dart b/lib/views/widgets/content_banner.dart similarity index 100% rename from lib/components/content_banner.dart rename to lib/views/widgets/content_banner.dart diff --git a/lib/components/default_app_bar_search_field.dart b/lib/views/widgets/default_app_bar_search_field.dart similarity index 99% rename from lib/components/default_app_bar_search_field.dart rename to lib/views/widgets/default_app_bar_search_field.dart index df59e382..0830bf34 100644 --- a/lib/components/default_app_bar_search_field.dart +++ b/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; diff --git a/lib/components/dialogs/adaptive_flat_button.dart b/lib/views/widgets/dialogs/adaptive_flat_button.dart similarity index 100% rename from lib/components/dialogs/adaptive_flat_button.dart rename to lib/views/widgets/dialogs/adaptive_flat_button.dart diff --git a/lib/components/dialogs/bootstrap_dialog.dart b/lib/views/widgets/dialogs/bootstrap_dialog.dart similarity index 99% rename from lib/components/dialogs/bootstrap_dialog.dart rename to lib/views/widgets/dialogs/bootstrap_dialog.dart index d3211ad7..28a21d74 100644 --- a/lib/components/dialogs/bootstrap_dialog.dart +++ b/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'; diff --git a/lib/components/dialogs/key_verification_dialog.dart b/lib/views/widgets/dialogs/key_verification_dialog.dart similarity index 99% rename from lib/components/dialogs/key_verification_dialog.dart rename to lib/views/widgets/dialogs/key_verification_dialog.dart index 4d220f0d..bde5c663 100644 --- a/lib/components/dialogs/key_verification_dialog.dart +++ b/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 show(BuildContext context) => PlatformInfos.isCupertinoStyle diff --git a/lib/components/dialogs/permission_slider_dialog.dart b/lib/views/widgets/dialogs/permission_slider_dialog.dart similarity index 97% rename from lib/components/dialogs/permission_slider_dialog.dart rename to lib/views/widgets/dialogs/permission_slider_dialog.dart index 572e868c..44a522cb 100644 --- a/lib/components/dialogs/permission_slider_dialog.dart +++ b/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'; diff --git a/lib/components/dialogs/recording_dialog.dart b/lib/views/widgets/dialogs/recording_dialog.dart similarity index 100% rename from lib/components/dialogs/recording_dialog.dart rename to lib/views/widgets/dialogs/recording_dialog.dart diff --git a/lib/components/dialogs/send_file_dialog.dart b/lib/views/widgets/dialogs/send_file_dialog.dart similarity index 95% rename from lib/components/dialogs/send_file_dialog.dart rename to lib/views/widgets/dialogs/send_file_dialog.dart index 8166b861..eb5d91e5 100644 --- a/lib/components/dialogs/send_file_dialog.dart +++ b/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; diff --git a/lib/components/encryption_button.dart b/lib/views/widgets/encryption_button.dart similarity index 100% rename from lib/components/encryption_button.dart rename to lib/views/widgets/encryption_button.dart diff --git a/lib/components/fluffy_banner.dart b/lib/views/widgets/fluffy_banner.dart similarity index 100% rename from lib/components/fluffy_banner.dart rename to lib/views/widgets/fluffy_banner.dart diff --git a/lib/components/html_message.dart b/lib/views/widgets/html_message.dart similarity index 98% rename from lib/components/html_message.dart rename to lib/views/widgets/html_message.dart index 0828cbd6..c259e1d4 100644 --- a/lib/components/html_message.dart +++ b/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'; diff --git a/lib/components/image_bubble.dart b/lib/views/widgets/image_bubble.dart similarity index 99% rename from lib/components/image_bubble.dart rename to lib/views/widgets/image_bubble.dart index aa3d0f00..10cd412f 100644 --- a/lib/components/image_bubble.dart +++ b/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; diff --git a/lib/components/input_bar.dart b/lib/views/widgets/input_bar.dart similarity index 100% rename from lib/components/input_bar.dart rename to lib/views/widgets/input_bar.dart diff --git a/lib/components/list_items/chat_list_item.dart b/lib/views/widgets/list_items/chat_list_item.dart similarity index 99% rename from lib/components/list_items/chat_list_item.dart rename to lib/views/widgets/list_items/chat_list_item.dart index e906b5a7..0966e251 100644 --- a/lib/components/list_items/chat_list_item.dart +++ b/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'; diff --git a/lib/components/list_items/message.dart b/lib/views/widgets/list_items/message.dart similarity index 98% rename from lib/components/list_items/message.dart rename to lib/views/widgets/list_items/message.dart index 4b5bd6aa..21048925 100644 --- a/lib/components/list_items/message.dart +++ b/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'; diff --git a/lib/components/list_items/participant_list_item.dart b/lib/views/widgets/list_items/participant_list_item.dart similarity index 100% rename from lib/components/list_items/participant_list_item.dart rename to lib/views/widgets/list_items/participant_list_item.dart diff --git a/lib/components/list_items/public_room_list_item.dart b/lib/views/widgets/list_items/public_room_list_item.dart similarity index 100% rename from lib/components/list_items/public_room_list_item.dart rename to lib/views/widgets/list_items/public_room_list_item.dart diff --git a/lib/components/list_items/state_message.dart b/lib/views/widgets/list_items/state_message.dart similarity index 98% rename from lib/components/list_items/state_message.dart rename to lib/views/widgets/list_items/state_message.dart index a2ec03e9..7e382da7 100644 --- a/lib/components/list_items/state_message.dart +++ b/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; diff --git a/lib/components/matrix.dart b/lib/views/widgets/matrix.dart similarity index 97% rename from lib/components/matrix.dart rename to lib/views/widgets/matrix.dart index f87449d9..dec8faf2 100644 --- a/lib/components/matrix.dart +++ b/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'; diff --git a/lib/components/message_content.dart b/lib/views/widgets/message_content.dart similarity index 96% rename from lib/components/message_content.dart rename to lib/views/widgets/message_content.dart index 5f6bba1a..214fd9e8 100644 --- a/lib/components/message_content.dart +++ b/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'; diff --git a/lib/components/message_download_content.dart b/lib/views/widgets/message_download_content.dart similarity index 100% rename from lib/components/message_download_content.dart rename to lib/views/widgets/message_download_content.dart diff --git a/lib/components/message_reactions.dart b/lib/views/widgets/message_reactions.dart similarity index 100% rename from lib/components/message_reactions.dart rename to lib/views/widgets/message_reactions.dart diff --git a/lib/components/mouse_over_builder.dart b/lib/views/widgets/mouse_over_builder.dart similarity index 100% rename from lib/components/mouse_over_builder.dart rename to lib/views/widgets/mouse_over_builder.dart diff --git a/lib/components/one_page_card.dart b/lib/views/widgets/one_page_card.dart similarity index 100% rename from lib/components/one_page_card.dart rename to lib/views/widgets/one_page_card.dart diff --git a/lib/components/reply_content.dart b/lib/views/widgets/reply_content.dart similarity index 98% rename from lib/components/reply_content.dart rename to lib/views/widgets/reply_content.dart index 36a9c638..99d1ac24 100644 --- a/lib/components/reply_content.dart +++ b/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; diff --git a/lib/components/sentry_switch_list_tile.dart b/lib/views/widgets/sentry_switch_list_tile.dart similarity index 100% rename from lib/components/sentry_switch_list_tile.dart rename to lib/views/widgets/sentry_switch_list_tile.dart diff --git a/lib/components/settings_switch_list_tile.dart b/lib/views/widgets/settings_switch_list_tile.dart similarity index 100% rename from lib/components/settings_switch_list_tile.dart rename to lib/views/widgets/settings_switch_list_tile.dart diff --git a/lib/components/unread_badge_back_button.dart b/lib/views/widgets/unread_badge_back_button.dart similarity index 98% rename from lib/components/unread_badge_back_button.dart rename to lib/views/widgets/unread_badge_back_button.dart index 92ced8d6..8cbc2ec7 100644 --- a/lib/components/unread_badge_back_button.dart +++ b/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 { diff --git a/lib/components/user_bottom_sheet.dart b/lib/views/widgets/user_bottom_sheet.dart similarity index 98% rename from lib/components/user_bottom_sheet.dart rename to lib/views/widgets/user_bottom_sheet.dart index 2be75ac4..5484ad1b 100644 --- a/lib/components/user_bottom_sheet.dart +++ b/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 {