diff --git a/lib/config/routes.dart b/lib/config/routes.dart index 6dfc676f..d212aec5 100644 --- a/lib/config/routes.dart +++ b/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'; diff --git a/lib/main.dart b/lib/main.dart index a03ea399..7a35173a 100644 --- a/lib/main.dart +++ b/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'; diff --git a/lib/utils/platform_infos.dart b/lib/utils/platform_infos.dart index 963067c1..98874757 100644 --- a/lib/utils/platform_infos.dart +++ b/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'; diff --git a/lib/utils/url_launcher.dart b/lib/utils/url_launcher.dart index 60f893b5..7da17221 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/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'; diff --git a/lib/views/archive.dart b/lib/views/archive.dart index 4e97923b..6c48a1a6 100644 --- a/lib/views/archive.dart +++ b/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'; diff --git a/lib/views/bootstrap_dialog.dart b/lib/views/bootstrap_dialog.dart index b65eaf11..91fd4da3 100644 --- a/lib/views/bootstrap_dialog.dart +++ b/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'; diff --git a/lib/views/chat.dart b/lib/views/chat.dart index cb01a1c0..70faf049 100644 --- a/lib/views/chat.dart +++ b/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'; diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart index 1bbec043..221197e4 100644 --- a/lib/views/chat_details.dart +++ b/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'; diff --git a/lib/views/chat_encryption_settings.dart b/lib/views/chat_encryption_settings.dart index 40828c3f..6e923f8e 100644 --- a/lib/views/chat_encryption_settings.dart +++ b/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'; diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart index 79660da1..aea4e8db 100644 --- a/lib/views/chat_list.dart +++ b/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'; diff --git a/lib/views/chat_permissions_settings.dart b/lib/views/chat_permissions_settings.dart index 06f87d45..041b5d9a 100644 --- a/lib/views/chat_permissions_settings.dart +++ b/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'; diff --git a/lib/views/device_settings.dart b/lib/views/device_settings.dart index 19e7f65d..9c2cf531 100644 --- a/lib/views/device_settings.dart +++ b/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 diff --git a/lib/views/homeserver_picker.dart b/lib/views/homeserver_picker.dart index da498e3f..c8cfd25e 100644 --- a/lib/views/homeserver_picker.dart +++ b/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'; diff --git a/lib/views/image_viewer.dart b/lib/views/image_viewer.dart index e120ec21..3f5bb636 100644 --- a/lib/views/image_viewer.dart +++ b/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'; diff --git a/lib/views/invitation_selection.dart b/lib/views/invitation_selection.dart index 4b4540b8..0a25d707 100644 --- a/lib/views/invitation_selection.dart +++ b/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'; diff --git a/lib/views/key_verification_dialog.dart b/lib/views/key_verification_dialog.dart index 4652d00d..61e5ece6 100644 --- a/lib/views/key_verification_dialog.dart +++ b/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'; diff --git a/lib/views/new_group.dart b/lib/views/new_group.dart index a0384e38..479f1c7e 100644 --- a/lib/views/new_group.dart +++ b/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 { diff --git a/lib/views/new_private_chat.dart b/lib/views/new_private_chat.dart index 99b317c7..a08e4530 100644 --- a/lib/views/new_private_chat.dart +++ b/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'; diff --git a/lib/views/permission_slider_dialog.dart b/lib/views/permission_slider_dialog.dart index deb91f9c..fe1fac59 100644 --- a/lib/views/permission_slider_dialog.dart +++ b/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'; diff --git a/lib/views/search.dart b/lib/views/search.dart index 21278797..59ea1f40 100644 --- a/lib/views/search.dart +++ b/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'; diff --git a/lib/views/settings.dart b/lib/views/settings.dart index bd116618..2bf9a056 100644 --- a/lib/views/settings.dart +++ b/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'; diff --git a/lib/views/settings_3pid.dart b/lib/views/settings_3pid.dart index aad3eb9a..06fd5a75 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/views/widgets/matrix.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/settings_emotes.dart b/lib/views/settings_emotes.dart index ec8c2849..fb733466 100644 --- a/lib/views/settings_emotes.dart +++ b/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; diff --git a/lib/views/settings_ignore_list.dart b/lib/views/settings_ignore_list.dart index f3261dc3..caa0af56 100644 --- a/lib/views/settings_ignore_list.dart +++ b/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; diff --git a/lib/views/settings_notifications.dart b/lib/views/settings_notifications.dart index de6c54b0..e773f2e1 100644 --- a/lib/views/settings_notifications.dart +++ b/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; diff --git a/lib/views/settings_style.dart b/lib/views/settings_style.dart index f2b6bfcd..db2e82f9 100644 --- a/lib/views/settings_style.dart +++ b/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 diff --git a/lib/views/sign_up.dart b/lib/views/sign_up.dart index 6da2c732..92ff36ea 100644 --- a/lib/views/sign_up.dart +++ b/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'; diff --git a/lib/views/sign_up_password.dart b/lib/views/sign_up_password.dart index 141db3d6..2fc9a569 100644 --- a/lib/views/sign_up_password.dart +++ b/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'; diff --git a/lib/views/ui/archive_ui.dart b/lib/views/ui/archive_ui.dart index 74736dff..bb37fa23 100644 --- a/lib/views/ui/archive_ui.dart +++ b/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'; diff --git a/lib/views/ui/chat_details_ui.dart b/lib/views/ui/chat_details_ui.dart index a467195c..3c4f9978 100644 --- a/lib/views/ui/chat_details_ui.dart +++ b/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'; diff --git a/lib/views/ui/chat_encryption_settings_ui.dart b/lib/views/ui/chat_encryption_settings_ui.dart index 1058d255..7c469956 100644 --- a/lib/views/ui/chat_encryption_settings_ui.dart +++ b/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'; diff --git a/lib/views/ui/chat_list_ui.dart b/lib/views/ui/chat_list_ui.dart index c2a1ce66..daae6ff8 100644 --- a/lib/views/ui/chat_list_ui.dart +++ b/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 { diff --git a/lib/views/ui/chat_permissions_settings_ui.dart b/lib/views/ui/chat_permissions_settings_ui.dart index 2498bc3e..95f04d62 100644 --- a/lib/views/ui/chat_permissions_settings_ui.dart +++ b/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'; diff --git a/lib/views/ui/chat_ui.dart b/lib/views/ui/chat_ui.dart index 9b45ff9c..071df4d1 100644 --- a/lib/views/ui/chat_ui.dart +++ b/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'; diff --git a/lib/views/ui/device_settings_ui.dart b/lib/views/ui/device_settings_ui.dart index 8f3b908f..e2c32ad7 100644 --- a/lib/views/ui/device_settings_ui.dart +++ b/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; diff --git a/lib/views/ui/homeserver_picker_ui.dart b/lib/views/ui/homeserver_picker_ui.dart index c545bdbf..0483fd6a 100644 --- a/lib/views/ui/homeserver_picker_ui.dart +++ b/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'; diff --git a/lib/views/ui/image_viewer_ui.dart b/lib/views/ui/image_viewer_ui.dart index 3951dd24..7c997d10 100644 --- a/lib/views/ui/image_viewer_ui.dart +++ b/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'; diff --git a/lib/views/ui/invitation_selection_ui.dart b/lib/views/ui/invitation_selection_ui.dart index 030f2c2e..b24e9064 100644 --- a/lib/views/ui/invitation_selection_ui.dart +++ b/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'; diff --git a/lib/views/ui/login_ui.dart b/lib/views/ui/login_ui.dart index 85df505b..a8ffab96 100644 --- a/lib/views/ui/login_ui.dart +++ b/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'; diff --git a/lib/views/ui/new_group_ui.dart b/lib/views/ui/new_group_ui.dart index 2b1bad72..d8e635a8 100644 --- a/lib/views/ui/new_group_ui.dart +++ b/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'; diff --git a/lib/views/ui/new_private_chat_ui.dart b/lib/views/ui/new_private_chat_ui.dart index 1a36882d..050d7cba 100644 --- a/lib/views/ui/new_private_chat_ui.dart +++ b/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'; diff --git a/lib/views/ui/search_ui.dart b/lib/views/ui/search_ui.dart index 517fe1b4..2873fded 100644 --- a/lib/views/ui/search_ui.dart +++ b/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'; diff --git a/lib/views/ui/settings_3pid_ui.dart b/lib/views/ui/settings_3pid_ui.dart index 70c90524..7dd48398 100644 --- a/lib/views/ui/settings_3pid_ui.dart +++ b/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'; diff --git a/lib/views/ui/settings_emotes_ui.dart b/lib/views/ui/settings_emotes_ui.dart index d2865550..ac2810d6 100644 --- a/lib/views/ui/settings_emotes_ui.dart +++ b/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 { diff --git a/lib/views/ui/settings_ignore_list_ui.dart b/lib/views/ui/settings_ignore_list_ui.dart index 4353c1f7..56bb4489 100644 --- a/lib/views/ui/settings_ignore_list_ui.dart +++ b/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; diff --git a/lib/views/ui/settings_multiple_emotes_ui.dart b/lib/views/ui/settings_multiple_emotes_ui.dart index a536af75..b35552ce 100644 --- a/lib/views/ui/settings_multiple_emotes_ui.dart +++ b/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'; diff --git a/lib/views/ui/settings_notifications_ui.dart b/lib/views/ui/settings_notifications_ui.dart index 074a26f9..80749f93 100644 --- a/lib/views/ui/settings_notifications_ui.dart +++ b/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; diff --git a/lib/views/ui/settings_style_ui.dart b/lib/views/ui/settings_style_ui.dart index b49216de..ed18e4f7 100644 --- a/lib/views/ui/settings_style_ui.dart +++ b/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 { diff --git a/lib/views/ui/settings_ui.dart b/lib/views/ui/settings_ui.dart index a6524f72..abb91036 100644 --- a/lib/views/ui/settings_ui.dart +++ b/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'; diff --git a/lib/views/ui/sign_up_password_ui.dart b/lib/views/ui/sign_up_password_ui.dart index 7699653b..989b0919 100644 --- a/lib/views/ui/sign_up_password_ui.dart +++ b/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'; diff --git a/lib/views/ui/sign_up_ui.dart b/lib/views/ui/sign_up_ui.dart index 5dd3b0d0..46558482 100644 --- a/lib/views/ui/sign_up_ui.dart +++ b/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'; diff --git a/lib/views/ui/user_bottom_sheet_ui.dart b/lib/views/ui/user_bottom_sheet_ui.dart index 9ab172b4..513a4506 100644 --- a/lib/views/ui/user_bottom_sheet_ui.dart +++ b/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'; diff --git a/lib/views/widgets/adaptive_flat_button.dart b/lib/widgets/adaptive_flat_button.dart similarity index 100% rename from lib/views/widgets/adaptive_flat_button.dart rename to lib/widgets/adaptive_flat_button.dart diff --git a/lib/views/widgets/audio_player.dart b/lib/widgets/audio_player.dart similarity index 97% rename from lib/views/widgets/audio_player.dart rename to lib/widgets/audio_player.dart index 1b929566..f449f4b1 100644 --- a/lib/views/widgets/audio_player.dart +++ b/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; diff --git a/lib/views/widgets/avatar.dart b/lib/widgets/avatar.dart similarity index 100% rename from lib/views/widgets/avatar.dart rename to lib/widgets/avatar.dart diff --git a/lib/views/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart similarity index 100% rename from lib/views/widgets/chat_settings_popup_menu.dart rename to lib/widgets/chat_settings_popup_menu.dart diff --git a/lib/views/widgets/connection_status_header.dart b/lib/widgets/connection_status_header.dart similarity index 100% rename from lib/views/widgets/connection_status_header.dart rename to lib/widgets/connection_status_header.dart diff --git a/lib/views/widgets/contacts_list.dart b/lib/widgets/contacts_list.dart similarity index 93% rename from lib/views/widgets/contacts_list.dart rename to lib/widgets/contacts_list.dart index c28ea4e8..e5a404c5 100644 --- a/lib/views/widgets/contacts_list.dart +++ b/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 { diff --git a/lib/views/widgets/content_banner.dart b/lib/widgets/content_banner.dart similarity index 100% rename from lib/views/widgets/content_banner.dart rename to lib/widgets/content_banner.dart diff --git a/lib/views/widgets/default_app_bar_search_field.dart b/lib/widgets/default_app_bar_search_field.dart similarity index 98% rename from lib/views/widgets/default_app_bar_search_field.dart rename to lib/widgets/default_app_bar_search_field.dart index f72fa0b3..4ec1a7f9 100644 --- a/lib/views/widgets/default_app_bar_search_field.dart +++ b/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; diff --git a/lib/views/widgets/encryption_button.dart b/lib/widgets/encryption_button.dart similarity index 100% rename from lib/views/widgets/encryption_button.dart rename to lib/widgets/encryption_button.dart diff --git a/lib/views/widgets/fluffy_banner.dart b/lib/widgets/fluffy_banner.dart similarity index 100% rename from lib/views/widgets/fluffy_banner.dart rename to lib/widgets/fluffy_banner.dart diff --git a/lib/views/widgets/html_message.dart b/lib/widgets/html_message.dart similarity index 98% rename from lib/views/widgets/html_message.dart rename to lib/widgets/html_message.dart index 736c30d9..23e1208b 100644 --- a/lib/views/widgets/html_message.dart +++ b/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'; diff --git a/lib/views/widgets/image_bubble.dart b/lib/widgets/image_bubble.dart similarity index 99% rename from lib/views/widgets/image_bubble.dart rename to lib/widgets/image_bubble.dart index 3bbfaad3..1a62cb81 100644 --- a/lib/views/widgets/image_bubble.dart +++ b/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; diff --git a/lib/views/widgets/input_bar.dart b/lib/widgets/input_bar.dart similarity index 100% rename from lib/views/widgets/input_bar.dart rename to lib/widgets/input_bar.dart diff --git a/lib/views/widgets/layouts/loading_view.dart b/lib/widgets/layouts/loading_view.dart similarity index 89% rename from lib/views/widgets/layouts/loading_view.dart rename to lib/widgets/layouts/loading_view.dart index 3791262e..391dc76d 100644 --- a/lib/views/widgets/layouts/loading_view.dart +++ b/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 { diff --git a/lib/views/widgets/layouts/max_width_body.dart b/lib/widgets/layouts/max_width_body.dart similarity index 100% rename from lib/views/widgets/layouts/max_width_body.dart rename to lib/widgets/layouts/max_width_body.dart diff --git a/lib/views/widgets/layouts/one_page_card.dart b/lib/widgets/layouts/one_page_card.dart similarity index 100% rename from lib/views/widgets/layouts/one_page_card.dart rename to lib/widgets/layouts/one_page_card.dart diff --git a/lib/views/widgets/list_items/chat_list_item.dart b/lib/widgets/list_items/chat_list_item.dart similarity index 99% rename from lib/views/widgets/list_items/chat_list_item.dart rename to lib/widgets/list_items/chat_list_item.dart index 4fd85e1b..c67a5725 100644 --- a/lib/views/widgets/list_items/chat_list_item.dart +++ b/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'; diff --git a/lib/views/widgets/list_items/message.dart b/lib/widgets/list_items/message.dart similarity index 98% rename from lib/views/widgets/list_items/message.dart rename to lib/widgets/list_items/message.dart index 0ec5a368..0283d588 100644 --- a/lib/views/widgets/list_items/message.dart +++ b/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'; diff --git a/lib/views/widgets/list_items/participant_list_item.dart b/lib/widgets/list_items/participant_list_item.dart similarity index 97% rename from lib/views/widgets/list_items/participant_list_item.dart rename to lib/widgets/list_items/participant_list_item.dart index 0c577ee4..bda9e0f8 100644 --- a/lib/views/widgets/list_items/participant_list_item.dart +++ b/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; diff --git a/lib/views/widgets/list_items/permission_list_tile.dart b/lib/widgets/list_items/permission_list_tile.dart similarity index 100% rename from lib/views/widgets/list_items/permission_list_tile.dart rename to lib/widgets/list_items/permission_list_tile.dart diff --git a/lib/views/widgets/list_items/public_room_list_item.dart b/lib/widgets/list_items/public_room_list_item.dart similarity index 100% rename from lib/views/widgets/list_items/public_room_list_item.dart rename to lib/widgets/list_items/public_room_list_item.dart diff --git a/lib/views/widgets/list_items/state_message.dart b/lib/widgets/list_items/state_message.dart similarity index 98% rename from lib/views/widgets/list_items/state_message.dart rename to lib/widgets/list_items/state_message.dart index 240e0d79..f0c5357d 100644 --- a/lib/views/widgets/list_items/state_message.dart +++ b/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; diff --git a/lib/views/widgets/list_items/user_device_list_item.dart b/lib/widgets/list_items/user_device_list_item.dart similarity index 96% rename from lib/views/widgets/list_items/user_device_list_item.dart rename to lib/widgets/list_items/user_device_list_item.dart index 149511f3..805fa216 100644 --- a/lib/views/widgets/list_items/user_device_list_item.dart +++ b/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, diff --git a/lib/views/widgets/lock_screen.dart b/lib/widgets/lock_screen.dart similarity index 100% rename from lib/views/widgets/lock_screen.dart rename to lib/widgets/lock_screen.dart diff --git a/lib/views/widgets/log_view.dart b/lib/widgets/log_view.dart similarity index 100% rename from lib/views/widgets/log_view.dart rename to lib/widgets/log_view.dart diff --git a/lib/views/widgets/matrix.dart b/lib/widgets/matrix.dart similarity index 97% rename from lib/views/widgets/matrix.dart rename to lib/widgets/matrix.dart index 3bc1dcff..a6564994 100644 --- a/lib/views/widgets/matrix.dart +++ b/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'; diff --git a/lib/views/widgets/message_content.dart b/lib/widgets/message_content.dart similarity index 97% rename from lib/views/widgets/message_content.dart rename to lib/widgets/message_content.dart index cd680eb5..d930f80e 100644 --- a/lib/views/widgets/message_content.dart +++ b/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'; diff --git a/lib/views/widgets/message_download_content.dart b/lib/widgets/message_download_content.dart similarity index 100% rename from lib/views/widgets/message_download_content.dart rename to lib/widgets/message_download_content.dart diff --git a/lib/views/widgets/message_reactions.dart b/lib/widgets/message_reactions.dart similarity index 100% rename from lib/views/widgets/message_reactions.dart rename to lib/widgets/message_reactions.dart diff --git a/lib/views/widgets/mouse_over_builder.dart b/lib/widgets/mouse_over_builder.dart similarity index 100% rename from lib/views/widgets/mouse_over_builder.dart rename to lib/widgets/mouse_over_builder.dart diff --git a/lib/views/widgets/reply_content.dart b/lib/widgets/reply_content.dart similarity index 98% rename from lib/views/widgets/reply_content.dart rename to lib/widgets/reply_content.dart index 89ad004b..f47b2d2d 100644 --- a/lib/views/widgets/reply_content.dart +++ b/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; diff --git a/lib/views/widgets/sentry_switch_list_tile.dart b/lib/widgets/sentry_switch_list_tile.dart similarity index 100% rename from lib/views/widgets/sentry_switch_list_tile.dart rename to lib/widgets/sentry_switch_list_tile.dart diff --git a/lib/views/widgets/settings_switch_list_tile.dart b/lib/widgets/settings_switch_list_tile.dart similarity index 100% rename from lib/views/widgets/settings_switch_list_tile.dart rename to lib/widgets/settings_switch_list_tile.dart diff --git a/lib/views/widgets/unread_badge_back_button.dart b/lib/widgets/unread_badge_back_button.dart similarity index 97% rename from lib/views/widgets/unread_badge_back_button.dart rename to lib/widgets/unread_badge_back_button.dart index dd1367c6..9bd7f904 100644 --- a/lib/views/widgets/unread_badge_back_button.dart +++ b/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 {