From d46667b0971a072d73a1fa5737322dcd2853ef33 Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Tue, 9 Nov 2021 21:32:16 +0100 Subject: [PATCH] refactor: Pages folder structure --- docs/code_style.md | 16 +++-- lib/config/routes.dart | 52 ++++++++-------- lib/pages/{ => archive}/archive.dart | 2 +- .../{views => archive}/archive_view.dart | 4 +- .../{ => bootstrap}/bootstrap_dialog.dart | 2 +- lib/pages/{ => chat}/chat.dart | 16 ++--- lib/pages/{views => chat}/chat_view.dart | 12 ++-- .../chat}/encryption_button.dart | 2 +- .../chat/events}/audio_player.dart | 2 +- .../chat/events}/html_message.dart | 12 ++-- .../chat/events}/image_bubble.dart | 6 +- .../chat/events}/map_bubble.dart | 0 .../chat/events}/message.dart | 10 ++-- .../chat/events}/message_content.dart | 16 ++--- .../events}/message_download_content.dart | 0 .../chat/events}/message_reactions.dart | 2 +- .../chat/events}/reply_content.dart | 2 +- .../chat/events}/state_message.dart | 2 +- .../chat/events}/sticker.dart | 2 +- .../events}/verification_request_content.dart | 2 +- lib/{widgets => pages/chat}/input_bar.dart | 4 +- lib/pages/{ => chat}/recording_dialog.dart | 0 .../{ => chat}/sticker_picker_dialog.dart | 6 +- .../{ => chat_details}/chat_details.dart | 2 +- .../chat_details_view.dart | 4 +- .../chat_details}/participant_list_item.dart | 4 +- .../chat_encryption_settings.dart | 4 +- .../chat_encryption_settings_view.dart | 2 +- lib/pages/{ => chat_list}/chat_list.dart | 14 ++--- .../chat_list}/chat_list_item.dart | 6 +- .../{views => chat_list}/chat_list_view.dart | 4 +- .../chat_permissions_settings.dart | 4 +- .../chat_permissions_settings_view.dart | 4 +- .../permission_list_tile.dart | 0 .../device_settings.dart | 6 +- .../device_settings_view.dart | 4 +- .../user_device_list_item.dart | 2 +- .../homeserver_picker.dart | 6 +- .../homeserver_picker_view.dart | 2 +- .../{ => image_viewer}/image_viewer.dart | 4 +- .../image_viewer_view.dart | 4 +- .../invitation_selection.dart | 4 +- .../invitation_selection_view.dart | 2 +- .../key_verification_dialog.dart | 4 +- lib/pages/{ => login}/login.dart | 8 +-- lib/pages/{views => login}/login_view.dart | 2 +- lib/pages/{ => new_group}/new_group.dart | 2 +- .../{views => new_group}/new_group_view.dart | 2 +- .../new_private_chat.dart | 4 +- .../new_private_chat_view.dart | 2 +- .../qr_scanner_modal.dart | 0 .../send_file_dialog.dart | 6 +- .../send_location_dialog.dart | 2 +- lib/pages/{ => new_space}/new_space.dart | 2 +- .../{views => new_space}/new_space_view.dart | 2 +- lib/pages/{ => search}/search.dart | 2 +- lib/pages/{views => search}/search_view.dart | 4 +- lib/pages/{ => settings}/settings.dart | 4 +- .../{views => settings}/settings_view.dart | 2 +- .../{ => settings_3pid}/settings_3pid.dart | 2 +- .../settings_3pid_view.dart | 2 +- .../settings_account.dart | 2 +- .../settings_account_view.dart | 2 +- .../{ => settings_chat}/settings_chat.dart | 2 +- .../settings_chat_view.dart | 2 +- .../settings_emotes.dart | 6 +- .../settings_emotes_view.dart | 2 +- .../settings_ignore_list.dart | 4 +- .../settings_ignore_list_view.dart | 2 +- .../settings_multiple_emotes.dart | 2 +- .../settings_multiple_emotes_view.dart | 2 +- .../settings_notifications.dart | 4 +- .../settings_notifications_view.dart | 2 +- .../settings_security.dart | 4 +- .../settings_security_view.dart | 2 +- .../{ => settings_style}/settings_style.dart | 4 +- .../settings_style_view.dart | 2 +- lib/pages/{ => sign_up}/signup.dart | 4 +- lib/pages/{views => sign_up}/signup_view.dart | 2 +- .../user_bottom_sheet.dart | 6 +- .../user_bottom_sheet_view.dart | 2 +- .../{ => video_viewer}/video_viewer.dart | 8 +-- .../video_viewer_view.dart | 2 +- .../layouts/empty_page.dart} | 0 lib/widgets/layouts/loading_view.dart | 2 +- .../list_items/public_room_list_item.dart | 60 ------------------- lib/widgets/matrix.dart | 2 +- .../permission_slider_dialog.dart | 0 88 files changed, 188 insertions(+), 250 deletions(-) rename lib/pages/{ => archive}/archive.dart (96%) rename lib/pages/{views => archive}/archive_view.dart (94%) rename lib/pages/{ => bootstrap}/bootstrap_dialog.dart (99%) rename lib/pages/{ => chat}/chat.dart (97%) rename lib/pages/{views => chat}/chat_view.dart (99%) rename lib/{widgets => pages/chat}/encryption_button.dart (99%) rename lib/{widgets/event_content => pages/chat/events}/audio_player.dart (98%) rename lib/{widgets/event_content => pages/chat/events}/html_message.dart (94%) rename lib/{widgets/event_content => pages/chat/events}/image_bubble.dart (98%) rename lib/{widgets/event_content => pages/chat/events}/map_bubble.dart (100%) rename lib/{widgets/event_content => pages/chat/events}/message.dart (97%) rename lib/{widgets/event_content => pages/chat/events}/message_content.dart (96%) rename lib/{widgets/event_content => pages/chat/events}/message_download_content.dart (100%) rename lib/{widgets/event_content => pages/chat/events}/message_reactions.dart (99%) rename lib/{widgets/event_content => pages/chat/events}/reply_content.dart (98%) rename lib/{widgets/event_content => pages/chat/events}/state_message.dart (98%) rename lib/{widgets/event_content => pages/chat/events}/sticker.dart (97%) rename lib/{widgets/event_content => pages/chat/events}/verification_request_content.dart (98%) rename lib/{widgets => pages/chat}/input_bar.dart (99%) rename lib/pages/{ => chat}/recording_dialog.dart (100%) rename lib/pages/{ => chat}/sticker_picker_dialog.dart (97%) rename lib/pages/{ => chat_details}/chat_details.dart (99%) rename lib/pages/{views => chat_details}/chat_details_view.dart (99%) rename lib/{widgets/list_items => pages/chat_details}/participant_list_item.dart (95%) rename lib/pages/{ => chat_encryption_settings}/chat_encryption_settings.dart (92%) rename lib/pages/{views => chat_encryption_settings}/chat_encryption_settings_view.dart (98%) rename lib/pages/{ => chat_list}/chat_list.dart (97%) rename lib/{widgets/list_items => pages/chat_list}/chat_list_item.dart (98%) rename lib/pages/{views => chat_list}/chat_list_view.dart (99%) rename lib/pages/{ => chat_permissions_settings}/chat_permissions_settings.dart (95%) rename lib/pages/{views => chat_permissions_settings}/chat_permissions_settings_view.dart (96%) rename lib/{widgets/list_items => pages/chat_permissions_settings}/permission_list_tile.dart (100%) rename lib/pages/{ => device_settings}/device_settings.dart (95%) rename lib/pages/{views => device_settings}/device_settings_view.dart (97%) rename lib/{widgets/list_items => pages/device_settings}/user_device_list_item.dart (99%) rename lib/pages/{ => homeserver_picker}/homeserver_picker.dart (97%) rename lib/pages/{views => homeserver_picker}/homeserver_picker_view.dart (99%) rename lib/pages/{ => image_viewer}/image_viewer.dart (89%) rename lib/pages/{views => image_viewer}/image_viewer_view.dart (94%) rename lib/pages/{ => invitation_selection}/invitation_selection.dart (96%) rename lib/pages/{views => invitation_selection}/invitation_selection_view.dart (97%) rename lib/pages/{ => key_verification}/key_verification_dialog.dart (99%) rename lib/pages/{ => login}/login.dart (98%) rename lib/pages/{views => login}/login_view.dart (99%) rename lib/pages/{ => new_group}/new_group.dart (96%) rename lib/pages/{views => new_group}/new_group_view.dart (96%) rename lib/pages/{ => new_private_chat}/new_private_chat.dart (92%) rename lib/pages/{views => new_private_chat}/new_private_chat_view.dart (98%) rename lib/pages/{ => new_private_chat}/qr_scanner_modal.dart (100%) rename lib/pages/{ => new_private_chat}/send_file_dialog.dart (94%) rename lib/pages/{ => new_private_chat}/send_location_dialog.dart (98%) rename lib/pages/{ => new_space}/new_space.dart (95%) rename lib/pages/{views => new_space}/new_space_view.dart (98%) rename lib/pages/{ => search}/search.dart (99%) rename lib/pages/{views => search}/search_view.dart (99%) rename lib/pages/{ => settings}/settings.dart (98%) rename lib/pages/{views => settings}/settings_view.dart (99%) rename lib/pages/{ => settings_3pid}/settings_3pid.dart (98%) rename lib/pages/{views => settings_3pid}/settings_3pid_view.dart (98%) rename lib/pages/{ => settings_account}/settings_account.dart (98%) rename lib/pages/{views => settings_account}/settings_account_view.dart (98%) rename lib/pages/{ => settings_chat}/settings_chat.dart (89%) rename lib/pages/{views => settings_chat}/settings_chat_view.dart (98%) rename lib/pages/{ => settings_emotes}/settings_emotes.dart (98%) rename lib/pages/{views => settings_emotes}/settings_emotes_view.dart (99%) rename lib/pages/{ => settings_ignore_list}/settings_ignore_list.dart (92%) rename lib/pages/{views => settings_ignore_list}/settings_ignore_list_view.dart (98%) rename lib/pages/{ => settings_multiple_emotes}/settings_multiple_emotes.dart (91%) rename lib/pages/{views => settings_multiple_emotes}/settings_multiple_emotes_view.dart (95%) rename lib/pages/{ => settings_notifications}/settings_notifications.dart (97%) rename lib/pages/{views => settings_notifications}/settings_notifications_view.dart (99%) rename lib/pages/{ => settings_security}/settings_security.dart (97%) rename lib/pages/{views => settings_security}/settings_security_view.dart (98%) rename lib/pages/{ => settings_style}/settings_style.dart (96%) rename lib/pages/{views => settings_style}/settings_style_view.dart (99%) rename lib/pages/{ => sign_up}/signup.dart (96%) rename lib/pages/{views => sign_up}/signup_view.dart (99%) rename lib/pages/{ => user_bottom_sheet}/user_bottom_sheet.dart (96%) rename lib/pages/{views => user_bottom_sheet}/user_bottom_sheet_view.dart (99%) rename lib/pages/{ => video_viewer}/video_viewer.dart (93%) rename lib/pages/{views => video_viewer}/video_viewer_view.dart (98%) rename lib/{pages/views/empty_page_view.dart => widgets/layouts/empty_page.dart} (100%) delete mode 100644 lib/widgets/list_items/public_room_list_item.dart rename lib/{pages => widgets}/permission_slider_dialog.dart (100%) diff --git a/docs/code_style.md b/docs/code_style.md index fc5dd75e..88d7eb38 100644 --- a/docs/code_style.md +++ b/docs/code_style.md @@ -13,17 +13,15 @@ FluffyChat tries to be as minimal as possible even in the code style. We try to - handy_function.dart - ...Helper functions and extensions - /pages - - /ui - - home_view.dart - - details_view.dart - - settings_view.dart - - home.dart - - details.dart - - settings.dart + - /chat + - chat.dart + - chat_view.dart + - /chat_list + - chat_list.dart + - chat_list_view.dart - ...The pages of the app separated in Controllers and Views - /widgets - - /dialogs - - /list_items + - /layouts - ...Custom widgets created for this project - main.dart diff --git a/lib/config/routes.dart b/lib/config/routes.dart index d64ae96f..81dcf5ef 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -2,32 +2,32 @@ import 'package:flutter/material.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/archive.dart'; -import 'package:fluffychat/pages/chat.dart'; -import 'package:fluffychat/pages/chat_details.dart'; -import 'package:fluffychat/pages/chat_encryption_settings.dart'; -import 'package:fluffychat/pages/chat_list.dart'; -import 'package:fluffychat/pages/chat_permissions_settings.dart'; -import 'package:fluffychat/pages/device_settings.dart'; -import 'package:fluffychat/pages/homeserver_picker.dart'; -import 'package:fluffychat/pages/invitation_selection.dart'; -import 'package:fluffychat/pages/login.dart'; -import 'package:fluffychat/pages/new_group.dart'; -import 'package:fluffychat/pages/new_private_chat.dart'; -import 'package:fluffychat/pages/new_space.dart'; -import 'package:fluffychat/pages/search.dart'; -import 'package:fluffychat/pages/settings.dart'; -import 'package:fluffychat/pages/settings_3pid.dart'; -import 'package:fluffychat/pages/settings_account.dart'; -import 'package:fluffychat/pages/settings_chat.dart'; -import 'package:fluffychat/pages/settings_emotes.dart'; -import 'package:fluffychat/pages/settings_ignore_list.dart'; -import 'package:fluffychat/pages/settings_multiple_emotes.dart'; -import 'package:fluffychat/pages/settings_notifications.dart'; -import 'package:fluffychat/pages/settings_security.dart'; -import 'package:fluffychat/pages/settings_style.dart'; -import 'package:fluffychat/pages/signup.dart'; -import 'package:fluffychat/pages/views/empty_page_view.dart'; +import 'package:fluffychat/pages/archive/archive.dart'; +import 'package:fluffychat/pages/chat/chat.dart'; +import 'package:fluffychat/pages/chat_details/chat_details.dart'; +import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings.dart'; +import 'package:fluffychat/pages/chat_list/chat_list.dart'; +import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings.dart'; +import 'package:fluffychat/pages/device_settings/device_settings.dart'; +import 'package:fluffychat/pages/homeserver_picker/homeserver_picker.dart'; +import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart'; +import 'package:fluffychat/pages/login/login.dart'; +import 'package:fluffychat/pages/new_group/new_group.dart'; +import 'package:fluffychat/pages/new_private_chat/new_private_chat.dart'; +import 'package:fluffychat/pages/new_space/new_space.dart'; +import 'package:fluffychat/pages/search/search.dart'; +import 'package:fluffychat/pages/settings/settings.dart'; +import 'package:fluffychat/pages/settings_3pid/settings_3pid.dart'; +import 'package:fluffychat/pages/settings_account/settings_account.dart'; +import 'package:fluffychat/pages/settings_chat/settings_chat.dart'; +import 'package:fluffychat/pages/settings_emotes/settings_emotes.dart'; +import 'package:fluffychat/pages/settings_ignore_list/settings_ignore_list.dart'; +import 'package:fluffychat/pages/settings_multiple_emotes/settings_multiple_emotes.dart'; +import 'package:fluffychat/pages/settings_notifications/settings_notifications.dart'; +import 'package:fluffychat/pages/settings_security/settings_security.dart'; +import 'package:fluffychat/pages/settings_style/settings_style.dart'; +import 'package:fluffychat/pages/sign_up/signup.dart'; +import 'package:fluffychat/widgets/layouts/empty_page.dart'; import 'package:fluffychat/widgets/layouts/loading_view.dart'; import 'package:fluffychat/widgets/layouts/side_view_layout.dart'; import 'package:fluffychat/widgets/layouts/two_column_layout.dart'; diff --git a/lib/pages/archive.dart b/lib/pages/archive/archive.dart similarity index 96% rename from lib/pages/archive.dart rename to lib/pages/archive/archive.dart index a4534faf..30d20237 100644 --- a/lib/pages/archive.dart +++ b/lib/pages/archive/archive.dart @@ -5,7 +5,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/views/archive_view.dart'; +import 'package:fluffychat/pages/archive/archive_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; class Archive extends StatefulWidget { diff --git a/lib/pages/views/archive_view.dart b/lib/pages/archive/archive_view.dart similarity index 94% rename from lib/pages/views/archive_view.dart rename to lib/pages/archive/archive_view.dart index a560eb2f..42395425 100644 --- a/lib/pages/views/archive_view.dart +++ b/lib/pages/archive/archive_view.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/archive.dart'; -import 'package:fluffychat/widgets/list_items/chat_list_item.dart'; +import 'package:fluffychat/pages/archive/archive.dart'; +import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; class ArchiveView extends StatelessWidget { final ArchiveController controller; diff --git a/lib/pages/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart similarity index 99% rename from lib/pages/bootstrap_dialog.dart rename to lib/pages/bootstrap/bootstrap_dialog.dart index 7df3750f..fcc72817 100644 --- a/lib/pages/bootstrap_dialog.dart +++ b/lib/pages/bootstrap/bootstrap_dialog.dart @@ -12,7 +12,7 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/adaptive_flat_button.dart'; -import 'key_verification_dialog.dart'; +import '../key_verification/key_verification_dialog.dart'; class BootstrapDialog extends StatefulWidget { final bool wipe; diff --git a/lib/pages/chat.dart b/lib/pages/chat/chat.dart similarity index 97% rename from lib/pages/chat.dart rename to lib/pages/chat/chat.dart index 8912718c..9f0cfbde 100644 --- a/lib/pages/chat.dart +++ b/lib/pages/chat/chat.dart @@ -20,17 +20,17 @@ import 'package:url_launcher/url_launcher.dart'; import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/recording_dialog.dart'; -import 'package:fluffychat/pages/views/chat_view.dart'; +import 'package:fluffychat/pages/chat/chat_view.dart'; +import 'package:fluffychat/pages/chat/recording_dialog.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../utils/account_bundles.dart'; -import '../utils/localized_exception_extension.dart'; -import '../utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart'; -import '../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; -import 'send_file_dialog.dart'; -import 'send_location_dialog.dart'; +import '../../utils/account_bundles.dart'; +import '../../utils/localized_exception_extension.dart'; +import '../../utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart'; +import '../../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; +import '../new_private_chat/send_file_dialog.dart'; +import '../new_private_chat/send_location_dialog.dart'; import 'sticker_picker_dialog.dart'; class Chat extends StatefulWidget { diff --git a/lib/pages/views/chat_view.dart b/lib/pages/chat/chat_view.dart similarity index 99% rename from lib/pages/views/chat_view.dart rename to lib/pages/chat/chat_view.dart index ea06537e..9973c528 100644 --- a/lib/pages/views/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -15,21 +15,21 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/app_emojis.dart'; import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat.dart'; -import 'package:fluffychat/pages/user_bottom_sheet.dart'; +import 'package:fluffychat/pages/chat/chat.dart'; +import 'package:fluffychat/pages/chat/encryption_button.dart'; +import 'package:fluffychat/pages/chat/input_bar.dart'; +import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/room_status_extension.dart'; import 'package: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/encryption_button.dart'; -import 'package:fluffychat/widgets/event_content/message.dart'; -import 'package:fluffychat/widgets/event_content/reply_content.dart'; -import 'package:fluffychat/widgets/input_bar.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/unread_badge_back_button.dart'; import '../../utils/stream_extension.dart'; +import 'events/message.dart'; +import 'events/reply_content.dart'; class ChatView extends StatelessWidget { final ChatController controller; diff --git a/lib/widgets/encryption_button.dart b/lib/pages/chat/encryption_button.dart similarity index 99% rename from lib/widgets/encryption_button.dart rename to lib/pages/chat/encryption_button.dart index c779c938..1cc82ca4 100644 --- a/lib/widgets/encryption_button.dart +++ b/lib/pages/chat/encryption_button.dart @@ -8,7 +8,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'matrix.dart'; +import '../../widgets/matrix.dart'; class EncryptionButton extends StatefulWidget { final Room room; diff --git a/lib/widgets/event_content/audio_player.dart b/lib/pages/chat/events/audio_player.dart similarity index 98% rename from lib/widgets/event_content/audio_player.dart rename to lib/pages/chat/events/audio_player.dart index b169c318..c5a7f1bd 100644 --- a/lib/widgets/event_content/audio_player.dart +++ b/lib/pages/chat/events/audio_player.dart @@ -10,7 +10,7 @@ import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; import 'package:fluffychat/utils/sentry_controller.dart'; -import '../../utils/matrix_sdk_extensions.dart/event_extension.dart'; +import '../../../utils/matrix_sdk_extensions.dart/event_extension.dart'; class AudioPlayerWidget extends StatefulWidget { final Color color; diff --git a/lib/widgets/event_content/html_message.dart b/lib/pages/chat/events/html_message.dart similarity index 94% rename from lib/widgets/event_content/html_message.dart rename to lib/pages/chat/events/html_message.dart index 2b1f1598..4e2f3613 100644 --- a/lib/widgets/event_content/html_message.dart +++ b/lib/pages/chat/events/html_message.dart @@ -4,12 +4,12 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_matrix_html/flutter_html.dart'; import 'package:matrix/matrix.dart'; -import '../../config/app_config.dart'; -import '../../config/setting_keys.dart'; -import '../../pages/image_viewer.dart'; -import '../../utils/matrix_sdk_extensions.dart/matrix_locals.dart'; -import '../../utils/url_launcher.dart'; -import '../matrix.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import '../../../config/app_config.dart'; +import '../../../config/setting_keys.dart'; +import '../../../pages/image_viewer/image_viewer.dart'; +import '../../../utils/matrix_sdk_extensions.dart/matrix_locals.dart'; +import '../../../utils/url_launcher.dart'; class HtmlMessage extends StatelessWidget { final String html; diff --git a/lib/widgets/event_content/image_bubble.dart b/lib/pages/chat/events/image_bubble.dart similarity index 98% rename from lib/widgets/event_content/image_bubble.dart rename to lib/pages/chat/events/image_bubble.dart index 9178e1d3..c433d155 100644 --- a/lib/widgets/event_content/image_bubble.dart +++ b/lib/pages/chat/events/image_bubble.dart @@ -10,9 +10,9 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:lottie/lottie.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/image_viewer.dart'; -import '../../utils/matrix_sdk_extensions.dart/event_extension.dart'; -import '../matrix.dart'; +import 'package:fluffychat/pages/image_viewer/image_viewer.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import '../../../utils/matrix_sdk_extensions.dart/event_extension.dart'; class ImageBubble extends StatefulWidget { final Event event; diff --git a/lib/widgets/event_content/map_bubble.dart b/lib/pages/chat/events/map_bubble.dart similarity index 100% rename from lib/widgets/event_content/map_bubble.dart rename to lib/pages/chat/events/map_bubble.dart diff --git a/lib/widgets/event_content/message.dart b/lib/pages/chat/events/message.dart similarity index 97% rename from lib/widgets/event_content/message.dart rename to lib/pages/chat/events/message.dart index b886863c..b73ab1a3 100644 --- a/lib/widgets/event_content/message.dart +++ b/lib/pages/chat/events/message.dart @@ -6,12 +6,12 @@ import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; import 'package:fluffychat/utils/string_color.dart'; -import 'package:fluffychat/widgets/event_content/message_content.dart'; -import 'package:fluffychat/widgets/event_content/reply_content.dart'; -import '../../config/app_config.dart'; -import '../avatar.dart'; -import '../matrix.dart'; +import 'package:fluffychat/widgets/avatar.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import '../../../config/app_config.dart'; +import 'message_content.dart'; import 'message_reactions.dart'; +import 'reply_content.dart'; import 'state_message.dart'; import 'verification_request_content.dart'; diff --git a/lib/widgets/event_content/message_content.dart b/lib/pages/chat/events/message_content.dart similarity index 96% rename from lib/widgets/event_content/message_content.dart rename to lib/pages/chat/events/message_content.dart index 2b5e7ac3..f9e36aed 100644 --- a/lib/widgets/event_content/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -7,17 +7,17 @@ import 'package:matrix/matrix.dart'; import 'package:matrix_link_text/link_text.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:fluffychat/pages/key_verification_dialog.dart'; +import 'package:fluffychat/pages/key_verification/key_verification_dialog.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; -import 'package:fluffychat/widgets/event_content/audio_player.dart'; -import 'package:fluffychat/widgets/event_content/image_bubble.dart'; -import '../../config/app_config.dart'; -import '../../pages/video_viewer.dart'; -import '../../utils/platform_infos.dart'; -import '../../utils/url_launcher.dart'; -import '../matrix.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import '../../../config/app_config.dart'; +import '../../../pages/video_viewer/video_viewer.dart'; +import '../../../utils/platform_infos.dart'; +import '../../../utils/url_launcher.dart'; +import 'audio_player.dart'; import 'html_message.dart'; +import 'image_bubble.dart'; import 'map_bubble.dart'; import 'message_download_content.dart'; import 'sticker.dart'; diff --git a/lib/widgets/event_content/message_download_content.dart b/lib/pages/chat/events/message_download_content.dart similarity index 100% rename from lib/widgets/event_content/message_download_content.dart rename to lib/pages/chat/events/message_download_content.dart diff --git a/lib/widgets/event_content/message_reactions.dart b/lib/pages/chat/events/message_reactions.dart similarity index 99% rename from lib/widgets/event_content/message_reactions.dart rename to lib/pages/chat/events/message_reactions.dart index e5b9c765..e8f9cb50 100644 --- a/lib/widgets/event_content/message_reactions.dart +++ b/lib/pages/chat/events/message_reactions.dart @@ -8,7 +8,7 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/avatar.dart'; -import '../matrix.dart'; +import 'package:fluffychat/widgets/matrix.dart'; class MessageReactions extends StatelessWidget { final Event event; diff --git a/lib/widgets/event_content/reply_content.dart b/lib/pages/chat/events/reply_content.dart similarity index 98% rename from lib/widgets/event_content/reply_content.dart rename to lib/pages/chat/events/reply_content.dart index 64ef327d..b864485e 100644 --- a/lib/widgets/event_content/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -4,7 +4,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; -import '../../config/app_config.dart'; +import '../../../config/app_config.dart'; import 'html_message.dart'; class ReplyContent extends StatelessWidget { diff --git a/lib/widgets/event_content/state_message.dart b/lib/pages/chat/events/state_message.dart similarity index 98% rename from lib/widgets/event_content/state_message.dart rename to lib/pages/chat/events/state_message.dart index a58bfc4e..88e0c4ca 100644 --- a/lib/widgets/event_content/state_message.dart +++ b/lib/pages/chat/events/state_message.dart @@ -4,7 +4,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; -import '../../config/app_config.dart'; +import '../../../config/app_config.dart'; class StateMessage extends StatelessWidget { final Event event; diff --git a/lib/widgets/event_content/sticker.dart b/lib/pages/chat/events/sticker.dart similarity index 97% rename from lib/widgets/event_content/sticker.dart rename to lib/pages/chat/events/sticker.dart index 89c90390..c937b3ab 100644 --- a/lib/widgets/event_content/sticker.dart +++ b/lib/pages/chat/events/sticker.dart @@ -4,7 +4,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import '../../config/app_config.dart'; +import '../../../config/app_config.dart'; import 'image_bubble.dart'; class Sticker extends StatefulWidget { diff --git a/lib/widgets/event_content/verification_request_content.dart b/lib/pages/chat/events/verification_request_content.dart similarity index 98% rename from lib/widgets/event_content/verification_request_content.dart rename to lib/pages/chat/events/verification_request_content.dart index 23a5e41e..4d912e68 100644 --- a/lib/widgets/event_content/verification_request_content.dart +++ b/lib/pages/chat/events/verification_request_content.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import '../../config/app_config.dart'; +import '../../../config/app_config.dart'; class VerificationRequestContent extends StatelessWidget { final Event event; diff --git a/lib/widgets/input_bar.dart b/lib/pages/chat/input_bar.dart similarity index 99% rename from lib/widgets/input_bar.dart rename to lib/pages/chat/input_bar.dart index d4aee133..42a0ebd6 100644 --- a/lib/widgets/input_bar.dart +++ b/lib/pages/chat/input_bar.dart @@ -10,8 +10,8 @@ import 'package:slugify/slugify.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import 'avatar.dart'; -import 'matrix.dart'; +import '../../widgets/avatar.dart'; +import '../../widgets/matrix.dart'; class InputBar extends StatelessWidget { final Room room; diff --git a/lib/pages/recording_dialog.dart b/lib/pages/chat/recording_dialog.dart similarity index 100% rename from lib/pages/recording_dialog.dart rename to lib/pages/chat/recording_dialog.dart diff --git a/lib/pages/sticker_picker_dialog.dart b/lib/pages/chat/sticker_picker_dialog.dart similarity index 97% rename from lib/pages/sticker_picker_dialog.dart rename to lib/pages/chat/sticker_picker_dialog.dart index 5d6d52de..f12dd644 100644 --- a/lib/pages/sticker_picker_dialog.dart +++ b/lib/pages/chat/sticker_picker_dialog.dart @@ -4,9 +4,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import '../widgets/avatar.dart'; -import '../widgets/default_app_bar_search_field.dart'; -import '../widgets/event_content/image_bubble.dart'; +import '../../widgets/avatar.dart'; +import '../../widgets/default_app_bar_search_field.dart'; +import 'events/image_bubble.dart'; class StickerPickerDialog extends StatefulWidget { final Room room; diff --git a/lib/pages/chat_details.dart b/lib/pages/chat_details/chat_details.dart similarity index 99% rename from lib/pages/chat_details.dart rename to lib/pages/chat_details/chat_details.dart index bf8fe797..cea6b247 100644 --- a/lib/pages/chat_details.dart +++ b/lib/pages/chat_details/chat_details.dart @@ -9,7 +9,7 @@ import 'package:image_picker/image_picker.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/views/chat_details_view.dart'; +import 'package:fluffychat/pages/chat_details/chat_details_view.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/views/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart similarity index 99% rename from lib/pages/views/chat_details_view.dart rename to lib/pages/chat_details/chat_details_view.dart index 6de736a0..d762bf6b 100644 --- a/lib/pages/views/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -6,14 +6,14 @@ import 'package:matrix_link_text/link_text.dart'; import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/chat_details.dart'; +import 'package:fluffychat/pages/chat_details/chat_details.dart'; +import 'package:fluffychat/pages/chat_details/participant_list_item.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/widgets/avatar.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/widgets/matrix.dart'; import '../../utils/url_launcher.dart'; diff --git a/lib/widgets/list_items/participant_list_item.dart b/lib/pages/chat_details/participant_list_item.dart similarity index 95% rename from lib/widgets/list_items/participant_list_item.dart rename to lib/pages/chat_details/participant_list_item.dart index 7e150506..de911604 100644 --- a/lib/widgets/list_items/participant_list_item.dart +++ b/lib/pages/chat_details/participant_list_item.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import '../../pages/user_bottom_sheet.dart'; -import '../avatar.dart'; +import '../../widgets/avatar.dart'; +import '../user_bottom_sheet/user_bottom_sheet.dart'; class ParticipantListItem extends StatelessWidget { final User user; diff --git a/lib/pages/chat_encryption_settings.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings.dart similarity index 92% rename from lib/pages/chat_encryption_settings.dart rename to lib/pages/chat_encryption_settings/chat_encryption_settings.dart index 49a25456..d70f9e83 100644 --- a/lib/pages/chat_encryption_settings.dart +++ b/lib/pages/chat_encryption_settings/chat_encryption_settings.dart @@ -4,9 +4,9 @@ import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/views/chat_encryption_settings_view.dart'; +import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'key_verification_dialog.dart'; +import '../key_verification/key_verification_dialog.dart'; class ChatEncryptionSettings extends StatefulWidget { const ChatEncryptionSettings({Key key}) : super(key: key); diff --git a/lib/pages/views/chat_encryption_settings_view.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart similarity index 98% rename from lib/pages/views/chat_encryption_settings_view.dart rename to lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart index 708bd622..2caff933 100644 --- a/lib/pages/views/chat_encryption_settings_view.dart +++ b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart @@ -4,7 +4,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/chat_encryption_settings.dart'; +import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/chat_list.dart b/lib/pages/chat_list/chat_list.dart similarity index 97% rename from lib/pages/chat_list.dart rename to lib/pages/chat_list/chat_list.dart index 88334ad2..e196a161 100644 --- a/lib/pages/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -15,16 +15,16 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/pages/views/chat_list_view.dart'; +import 'package:fluffychat/pages/chat_list/chat_list_view.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/flutter_matrix_hive_database.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import '../../utils/account_bundles.dart'; -import '../main.dart'; -import '../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; -import '../utils/url_launcher.dart'; -import '../widgets/matrix.dart'; -import 'bootstrap_dialog.dart'; +import '../../../utils/account_bundles.dart'; +import '../../main.dart'; +import '../../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; +import '../../utils/url_launcher.dart'; +import '../../widgets/matrix.dart'; +import '../bootstrap/bootstrap_dialog.dart'; enum SelectMode { normal, share, select } enum PopupMenuAction { diff --git a/lib/widgets/list_items/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart similarity index 98% rename from lib/widgets/list_items/chat_list_item.dart rename to lib/pages/chat_list/chat_list_item.dart index 6fa1e38b..f6748aa9 100644 --- a/lib/widgets/list_items/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -11,10 +11,10 @@ import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart'; import 'package:fluffychat/utils/room_status_extension.dart'; -import '../../pages/send_file_dialog.dart'; import '../../utils/date_time_extension.dart'; -import '../avatar.dart'; -import '../matrix.dart'; +import '../../widgets/avatar.dart'; +import '../../widgets/matrix.dart'; +import '../new_private_chat/send_file_dialog.dart'; enum ArchivedRoomAction { delete, rejoin } diff --git a/lib/pages/views/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart similarity index 99% rename from lib/pages/views/chat_list_view.dart rename to lib/pages/chat_list/chat_list_view.dart index 65371bc3..2aeb744f 100644 --- a/lib/pages/views/chat_list_view.dart +++ b/lib/pages/chat_list/chat_list_view.dart @@ -12,10 +12,10 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat_list.dart'; +import 'package:fluffychat/pages/chat_list/chat_list.dart'; +import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/connection_status_header.dart'; -import 'package:fluffychat/widgets/list_items/chat_list_item.dart'; import '../../utils/account_bundles.dart'; import '../../utils/stream_extension.dart'; import '../../widgets/matrix.dart'; diff --git a/lib/pages/chat_permissions_settings.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings.dart similarity index 95% rename from lib/pages/chat_permissions_settings.dart rename to lib/pages/chat_permissions_settings/chat_permissions_settings.dart index ab04ce67..a02d4280 100644 --- a/lib/pages/chat_permissions_settings.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings.dart @@ -8,9 +8,9 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/permission_slider_dialog.dart'; -import 'package:fluffychat/pages/views/chat_permissions_settings_view.dart'; +import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; +import 'package:fluffychat/widgets/permission_slider_dialog.dart'; class ChatPermissionsSettings extends StatefulWidget { const ChatPermissionsSettings({Key key}) : super(key: key); diff --git a/lib/pages/views/chat_permissions_settings_view.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart similarity index 96% rename from lib/pages/views/chat_permissions_settings_view.dart rename to lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart index 07dbd6ee..94561a28 100644 --- a/lib/pages/views/chat_permissions_settings_view.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart @@ -4,9 +4,9 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/chat_permissions_settings.dart'; +import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings.dart'; +import 'package:fluffychat/pages/chat_permissions_settings/permission_list_tile.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/list_items/permission_list_tile.dart'; import 'package:fluffychat/widgets/matrix.dart'; class ChatPermissionsSettingsView extends StatelessWidget { diff --git a/lib/widgets/list_items/permission_list_tile.dart b/lib/pages/chat_permissions_settings/permission_list_tile.dart similarity index 100% rename from lib/widgets/list_items/permission_list_tile.dart rename to lib/pages/chat_permissions_settings/permission_list_tile.dart diff --git a/lib/pages/device_settings.dart b/lib/pages/device_settings/device_settings.dart similarity index 95% rename from lib/pages/device_settings.dart rename to lib/pages/device_settings/device_settings.dart index 90d6ac67..5edd6d2b 100644 --- a/lib/pages/device_settings.dart +++ b/lib/pages/device_settings/device_settings.dart @@ -6,9 +6,9 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/encryption/utils/key_verification.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/key_verification_dialog.dart'; -import 'package:fluffychat/pages/views/device_settings_view.dart'; -import '../widgets/matrix.dart'; +import 'package:fluffychat/pages/device_settings/device_settings_view.dart'; +import 'package:fluffychat/pages/key_verification/key_verification_dialog.dart'; +import '../../widgets/matrix.dart'; class DevicesSettings extends StatefulWidget { const DevicesSettings({Key key}) : super(key: key); diff --git a/lib/pages/views/device_settings_view.dart b/lib/pages/device_settings/device_settings_view.dart similarity index 97% rename from lib/pages/views/device_settings_view.dart rename to lib/pages/device_settings/device_settings_view.dart index 92043462..e8506160 100644 --- a/lib/pages/views/device_settings_view.dart +++ b/lib/pages/device_settings/device_settings_view.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:fluffychat/pages/device_settings.dart'; +import 'package:fluffychat/pages/device_settings/device_settings.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import '../../widgets/list_items/user_device_list_item.dart'; +import 'user_device_list_item.dart'; class DevicesSettingsView extends StatelessWidget { final DevicesSettingsController controller; diff --git a/lib/widgets/list_items/user_device_list_item.dart b/lib/pages/device_settings/user_device_list_item.dart similarity index 99% rename from lib/widgets/list_items/user_device_list_item.dart rename to lib/pages/device_settings/user_device_list_item.dart index 5e3fbc1b..7e2290c3 100644 --- a/lib/widgets/list_items/user_device_list_item.dart +++ b/lib/pages/device_settings/user_device_list_item.dart @@ -6,7 +6,7 @@ import 'package:matrix/matrix.dart'; import '../../utils/date_time_extension.dart'; import '../../utils/matrix_sdk_extensions.dart/device_extension.dart'; -import '../matrix.dart'; +import '../../widgets/matrix.dart'; enum UserDeviceListItemAction { rename, diff --git a/lib/pages/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart similarity index 97% rename from lib/pages/homeserver_picker.dart rename to lib/pages/homeserver_picker/homeserver_picker.dart index 37bf0a49..8b59fe48 100644 --- a/lib/pages/homeserver_picker.dart +++ b/lib/pages/homeserver_picker/homeserver_picker.dart @@ -13,12 +13,12 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/pages/views/homeserver_picker_view.dart'; +import 'package:fluffychat/pages/homeserver_picker/homeserver_picker_view.dart'; import 'package:fluffychat/utils/famedlysdk_store.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../main.dart'; -import '../utils/localized_exception_extension.dart'; +import '../../main.dart'; +import '../../utils/localized_exception_extension.dart'; class HomeserverPicker extends StatefulWidget { const HomeserverPicker({Key key}) : super(key: key); diff --git a/lib/pages/views/homeserver_picker_view.dart b/lib/pages/homeserver_picker/homeserver_picker_view.dart similarity index 99% rename from lib/pages/views/homeserver_picker_view.dart rename to lib/pages/homeserver_picker/homeserver_picker_view.dart index dafab0a0..b8606199 100644 --- a/lib/pages/views/homeserver_picker_view.dart +++ b/lib/pages/homeserver_picker/homeserver_picker_view.dart @@ -15,7 +15,7 @@ import 'package:fluffychat/widgets/fluffy_banner.dart'; import 'package:fluffychat/widgets/layouts/one_page_card.dart'; import 'package:fluffychat/widgets/matrix.dart'; import '../../utils/localized_exception_extension.dart'; -import '../homeserver_picker.dart'; +import 'homeserver_picker.dart'; class HomeserverPickerView extends StatelessWidget { final HomeserverPickerController controller; diff --git a/lib/pages/image_viewer.dart b/lib/pages/image_viewer/image_viewer.dart similarity index 89% rename from lib/pages/image_viewer.dart rename to lib/pages/image_viewer/image_viewer.dart index 2fa1d0c6..6c63e22f 100644 --- a/lib/pages/image_viewer.dart +++ b/lib/pages/image_viewer/image_viewer.dart @@ -3,10 +3,10 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/views/image_viewer_view.dart'; +import 'package:fluffychat/pages/image_viewer/image_viewer_view.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../utils/matrix_sdk_extensions.dart/event_extension.dart'; +import '../../utils/matrix_sdk_extensions.dart/event_extension.dart'; class ImageViewer extends StatefulWidget { final Event event; diff --git a/lib/pages/views/image_viewer_view.dart b/lib/pages/image_viewer/image_viewer_view.dart similarity index 94% rename from lib/pages/views/image_viewer_view.dart rename to lib/pages/image_viewer/image_viewer_view.dart index 884b2468..9d42842f 100644 --- a/lib/pages/views/image_viewer_view.dart +++ b/lib/pages/image_viewer/image_viewer_view.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:fluffychat/widgets/event_content/image_bubble.dart'; -import '../image_viewer.dart'; +import 'package:fluffychat/pages/chat/events/image_bubble.dart'; +import 'image_viewer.dart'; class ImageViewerView extends StatelessWidget { final ImageViewerController controller; diff --git a/lib/pages/invitation_selection.dart b/lib/pages/invitation_selection/invitation_selection.dart similarity index 96% rename from lib/pages/invitation_selection.dart rename to lib/pages/invitation_selection/invitation_selection.dart index 5cbe0ddf..1e971320 100644 --- a/lib/pages/invitation_selection.dart +++ b/lib/pages/invitation_selection/invitation_selection.dart @@ -7,9 +7,9 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/views/invitation_selection_view.dart'; +import 'package:fluffychat/pages/invitation_selection/invitation_selection_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../utils/localized_exception_extension.dart'; +import '../../utils/localized_exception_extension.dart'; class InvitationSelection extends StatefulWidget { const InvitationSelection({Key key}) : super(key: key); diff --git a/lib/pages/views/invitation_selection_view.dart b/lib/pages/invitation_selection/invitation_selection_view.dart similarity index 97% rename from lib/pages/views/invitation_selection_view.dart rename to lib/pages/invitation_selection/invitation_selection_view.dart index a5364aba..02cff19d 100644 --- a/lib/pages/views/invitation_selection_view.dart +++ b/lib/pages/invitation_selection/invitation_selection_view.dart @@ -4,7 +4,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/invitation_selection.dart'; +import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/default_app_bar_search_field.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; diff --git a/lib/pages/key_verification_dialog.dart b/lib/pages/key_verification/key_verification_dialog.dart similarity index 99% rename from lib/pages/key_verification_dialog.dart rename to lib/pages/key_verification/key_verification_dialog.dart index 23ed3e24..0a458a15 100644 --- a/lib/pages/key_verification_dialog.dart +++ b/lib/pages/key_verification/key_verification_dialog.dart @@ -13,8 +13,8 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/avatar.dart'; -import '../utils/beautify_string_extension.dart'; -import '../widgets/adaptive_flat_button.dart'; +import '../../utils/beautify_string_extension.dart'; +import '../../widgets/adaptive_flat_button.dart'; class KeyVerificationDialog extends StatefulWidget { Future show(BuildContext context) => PlatformInfos.isCupertinoStyle diff --git a/lib/pages/login.dart b/lib/pages/login/login.dart similarity index 98% rename from lib/pages/login.dart rename to lib/pages/login/login.dart index fad92b33..4afbdc06 100644 --- a/lib/pages/login.dart +++ b/lib/pages/login/login.dart @@ -9,10 +9,10 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../config/app_config.dart'; -import '../config/setting_keys.dart'; -import '../utils/platform_infos.dart'; -import 'views/login_view.dart'; +import '../../config/app_config.dart'; +import '../../config/setting_keys.dart'; +import '../../utils/platform_infos.dart'; +import 'login_view.dart'; class Login extends StatefulWidget { const Login({Key key}) : super(key: key); diff --git a/lib/pages/views/login_view.dart b/lib/pages/login/login_view.dart similarity index 99% rename from lib/pages/views/login_view.dart rename to lib/pages/login/login_view.dart index 20cabf78..b8de732b 100644 --- a/lib/pages/views/login_view.dart +++ b/lib/pages/login/login_view.dart @@ -4,7 +4,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:fluffychat/widgets/layouts/one_page_card.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../login.dart'; +import 'login.dart'; class LoginView extends StatelessWidget { final LoginController controller; diff --git a/lib/pages/new_group.dart b/lib/pages/new_group/new_group.dart similarity index 96% rename from lib/pages/new_group.dart rename to lib/pages/new_group/new_group.dart index aaa5f3f4..b25a7869 100644 --- a/lib/pages/new_group.dart +++ b/lib/pages/new_group/new_group.dart @@ -4,7 +4,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart' as sdk; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/views/new_group_view.dart'; +import 'package:fluffychat/pages/new_group/new_group_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; class NewGroup extends StatefulWidget { diff --git a/lib/pages/views/new_group_view.dart b/lib/pages/new_group/new_group_view.dart similarity index 96% rename from lib/pages/views/new_group_view.dart rename to lib/pages/new_group/new_group_view.dart index 31f67cf7..02b7a238 100644 --- a/lib/pages/views/new_group_view.dart +++ b/lib/pages/new_group/new_group_view.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:fluffychat/pages/new_group.dart'; +import 'package:fluffychat/pages/new_group/new_group.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; class NewGroupView extends StatelessWidget { diff --git a/lib/pages/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart similarity index 92% rename from lib/pages/new_private_chat.dart rename to lib/pages/new_private_chat/new_private_chat.dart index e079f06d..8a355da8 100644 --- a/lib/pages/new_private_chat.dart +++ b/lib/pages/new_private_chat/new_private_chat.dart @@ -4,8 +4,8 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:fluffychat/pages/qr_scanner_modal.dart'; -import 'package:fluffychat/pages/views/new_private_chat_view.dart'; +import 'package:fluffychat/pages/new_private_chat/new_private_chat_view.dart'; +import 'package:fluffychat/pages/new_private_chat/qr_scanner_modal.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/utils/url_launcher.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/views/new_private_chat_view.dart b/lib/pages/new_private_chat/new_private_chat_view.dart similarity index 98% rename from lib/pages/views/new_private_chat_view.dart rename to lib/pages/new_private_chat/new_private_chat_view.dart index 87d88eaa..15cf447e 100644 --- a/lib/pages/views/new_private_chat_view.dart +++ b/lib/pages/new_private_chat/new_private_chat_view.dart @@ -7,7 +7,7 @@ import 'package:qr_flutter/qr_flutter.dart'; import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/new_private_chat.dart'; +import 'package:fluffychat/pages/new_private_chat/new_private_chat.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/qr_scanner_modal.dart b/lib/pages/new_private_chat/qr_scanner_modal.dart similarity index 100% rename from lib/pages/qr_scanner_modal.dart rename to lib/pages/new_private_chat/qr_scanner_modal.dart diff --git a/lib/pages/send_file_dialog.dart b/lib/pages/new_private_chat/send_file_dialog.dart similarity index 94% rename from lib/pages/send_file_dialog.dart rename to lib/pages/new_private_chat/send_file_dialog.dart index d0d6d4d2..14cd8520 100644 --- a/lib/pages/send_file_dialog.dart +++ b/lib/pages/new_private_chat/send_file_dialog.dart @@ -4,9 +4,9 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; -import '../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; -import '../utils/resize_image.dart'; -import '../utils/room_send_file_extension.dart'; +import '../../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart'; +import '../../utils/resize_image.dart'; +import '../../utils/room_send_file_extension.dart'; class SendFileDialog extends StatefulWidget { final Room room; diff --git a/lib/pages/send_location_dialog.dart b/lib/pages/new_private_chat/send_location_dialog.dart similarity index 98% rename from lib/pages/send_location_dialog.dart rename to lib/pages/new_private_chat/send_location_dialog.dart index 33431471..5abd36b2 100644 --- a/lib/pages/send_location_dialog.dart +++ b/lib/pages/new_private_chat/send_location_dialog.dart @@ -8,8 +8,8 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:geolocator/geolocator.dart'; import 'package:matrix/matrix.dart'; +import 'package:fluffychat/pages/chat/events/map_bubble.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import '../widgets/event_content/map_bubble.dart'; class SendLocationDialog extends StatefulWidget { final Room room; diff --git a/lib/pages/new_space.dart b/lib/pages/new_space/new_space.dart similarity index 95% rename from lib/pages/new_space.dart rename to lib/pages/new_space/new_space.dart index 39515d3b..0f17d7c7 100644 --- a/lib/pages/new_space.dart +++ b/lib/pages/new_space/new_space.dart @@ -5,7 +5,7 @@ import 'package:matrix/matrix.dart' as sdk; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/views/new_space_view.dart'; +import 'package:fluffychat/pages/new_space/new_space_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; class NewSpace extends StatefulWidget { diff --git a/lib/pages/views/new_space_view.dart b/lib/pages/new_space/new_space_view.dart similarity index 98% rename from lib/pages/views/new_space_view.dart rename to lib/pages/new_space/new_space_view.dart index 06b489c6..0e9b3d1a 100644 --- a/lib/pages/views/new_space_view.dart +++ b/lib/pages/new_space/new_space_view.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import '../new_space.dart'; +import 'new_space.dart'; class NewSpaceView extends StatelessWidget { final NewSpaceController controller; diff --git a/lib/pages/search.dart b/lib/pages/search/search.dart similarity index 99% rename from lib/pages/search.dart rename to lib/pages/search/search.dart index eeb02331..92a55da9 100644 --- a/lib/pages/search.dart +++ b/lib/pages/search/search.dart @@ -9,7 +9,7 @@ import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'views/search_view.dart'; +import 'search_view.dart'; class Search extends StatefulWidget { const Search({Key key}) : super(key: key); diff --git a/lib/pages/views/search_view.dart b/lib/pages/search/search_view.dart similarity index 99% rename from lib/pages/views/search_view.dart rename to lib/pages/search/search_view.dart index aefac0d6..4ce906c0 100644 --- a/lib/pages/views/search_view.dart +++ b/lib/pages/search/search_view.dart @@ -5,14 +5,14 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; +import 'package:fluffychat/pages/chat_list/chat_list_item.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 '../../utils/localized_exception_extension.dart'; import '../../utils/platform_infos.dart'; -import '../search.dart'; +import 'search.dart'; class SearchView extends StatelessWidget { final SearchController controller; diff --git a/lib/pages/settings.dart b/lib/pages/settings/settings.dart similarity index 98% rename from lib/pages/settings.dart rename to lib/pages/settings/settings.dart index f22a82dc..2c39568d 100644 --- a/lib/pages/settings.dart +++ b/lib/pages/settings/settings.dart @@ -11,8 +11,8 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/sentry_controller.dart'; -import '../widgets/matrix.dart'; -import 'views/settings_view.dart'; +import '../../widgets/matrix.dart'; +import 'settings_view.dart'; class Settings extends StatefulWidget { const Settings({Key key}) : super(key: key); diff --git a/lib/pages/views/settings_view.dart b/lib/pages/settings/settings_view.dart similarity index 99% rename from lib/pages/views/settings_view.dart rename to lib/pages/settings/settings_view.dart index 8ab0be66..2b5472ba 100644 --- a/lib/pages/views/settings_view.dart +++ b/lib/pages/settings/settings_view.dart @@ -8,7 +8,7 @@ import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import '../../config/app_config.dart'; import '../../widgets/content_banner.dart'; -import '../settings.dart'; +import 'settings.dart'; class SettingsView extends StatelessWidget { final SettingsController controller; diff --git a/lib/pages/settings_3pid.dart b/lib/pages/settings_3pid/settings_3pid.dart similarity index 98% rename from lib/pages/settings_3pid.dart rename to lib/pages/settings_3pid/settings_3pid.dart index 05e5049a..46afaf60 100644 --- a/lib/pages/settings_3pid.dart +++ b/lib/pages/settings_3pid/settings_3pid.dart @@ -6,7 +6,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'views/settings_3pid_view.dart'; +import 'settings_3pid_view.dart'; class Settings3Pid extends StatefulWidget { static int sendAttempt = 0; diff --git a/lib/pages/views/settings_3pid_view.dart b/lib/pages/settings_3pid/settings_3pid_view.dart similarity index 98% rename from lib/pages/views/settings_3pid_view.dart rename to lib/pages/settings_3pid/settings_3pid_view.dart index d72858b2..544d720a 100644 --- a/lib/pages/views/settings_3pid_view.dart +++ b/lib/pages/settings_3pid/settings_3pid_view.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/settings_3pid.dart'; +import 'package:fluffychat/pages/settings_3pid/settings_3pid.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/settings_account.dart b/lib/pages/settings_account/settings_account.dart similarity index 98% rename from lib/pages/settings_account.dart rename to lib/pages/settings_account/settings_account.dart index 582da393..19b9e878 100644 --- a/lib/pages/settings_account.dart +++ b/lib/pages/settings_account/settings_account.dart @@ -8,7 +8,7 @@ import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/setting_keys.dart'; -import 'package:fluffychat/pages/views/settings_account_view.dart'; +import 'package:fluffychat/pages/settings_account/settings_account_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; class SettingsAccount extends StatefulWidget { diff --git a/lib/pages/views/settings_account_view.dart b/lib/pages/settings_account/settings_account_view.dart similarity index 98% rename from lib/pages/views/settings_account_view.dart rename to lib/pages/settings_account/settings_account_view.dart index 85c7b89d..f5b10ea2 100644 --- a/lib/pages/views/settings_account_view.dart +++ b/lib/pages/settings_account/settings_account_view.dart @@ -8,7 +8,7 @@ import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../settings_account.dart'; +import 'settings_account.dart'; class SettingsAccountView extends StatelessWidget { final SettingsAccountController controller; diff --git a/lib/pages/settings_chat.dart b/lib/pages/settings_chat/settings_chat.dart similarity index 89% rename from lib/pages/settings_chat.dart rename to lib/pages/settings_chat/settings_chat.dart index 4304c7ea..78fc14ca 100644 --- a/lib/pages/settings_chat.dart +++ b/lib/pages/settings_chat/settings_chat.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'views/settings_chat_view.dart'; +import 'settings_chat_view.dart'; class SettingsChat extends StatefulWidget { const SettingsChat({Key key}) : super(key: key); diff --git a/lib/pages/views/settings_chat_view.dart b/lib/pages/settings_chat/settings_chat_view.dart similarity index 98% rename from lib/pages/views/settings_chat_view.dart rename to lib/pages/settings_chat/settings_chat_view.dart index 247f2764..fd957d86 100644 --- a/lib/pages/views/settings_chat_view.dart +++ b/lib/pages/settings_chat/settings_chat_view.dart @@ -8,7 +8,7 @@ import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/settings_switch_list_tile.dart'; -import '../settings_chat.dart'; +import 'settings_chat.dart'; class SettingsChatView extends StatelessWidget { final SettingsChatController controller; diff --git a/lib/pages/settings_emotes.dart b/lib/pages/settings_emotes/settings_emotes.dart similarity index 98% rename from lib/pages/settings_emotes.dart rename to lib/pages/settings_emotes/settings_emotes.dart index f5d2fe60..b576587e 100644 --- a/lib/pages/settings_emotes.dart +++ b/lib/pages/settings_emotes/settings_emotes.dart @@ -8,9 +8,9 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import '../utils/resize_image.dart'; -import '../widgets/matrix.dart'; -import 'views/settings_emotes_view.dart'; +import '../../utils/resize_image.dart'; +import '../../widgets/matrix.dart'; +import 'settings_emotes_view.dart'; class EmotesSettings extends StatefulWidget { const EmotesSettings({Key key}) : super(key: key); diff --git a/lib/pages/views/settings_emotes_view.dart b/lib/pages/settings_emotes/settings_emotes_view.dart similarity index 99% rename from lib/pages/views/settings_emotes_view.dart rename to lib/pages/settings_emotes/settings_emotes_view.dart index e8c820bb..7480c872 100644 --- a/lib/pages/views/settings_emotes_view.dart +++ b/lib/pages/settings_emotes/settings_emotes_view.dart @@ -9,7 +9,7 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import '../../widgets/matrix.dart'; -import '../settings_emotes.dart'; +import 'settings_emotes.dart'; class EmotesSettingsView extends StatelessWidget { final EmotesSettingsController controller; diff --git a/lib/pages/settings_ignore_list.dart b/lib/pages/settings_ignore_list/settings_ignore_list.dart similarity index 92% rename from lib/pages/settings_ignore_list.dart rename to lib/pages/settings_ignore_list/settings_ignore_list.dart index 58971616..9d320a94 100644 --- a/lib/pages/settings_ignore_list.dart +++ b/lib/pages/settings_ignore_list/settings_ignore_list.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import '../widgets/matrix.dart'; -import 'views/settings_ignore_list_view.dart'; +import '../../widgets/matrix.dart'; +import 'settings_ignore_list_view.dart'; class SettingsIgnoreList extends StatefulWidget { final String initialUserId; diff --git a/lib/pages/views/settings_ignore_list_view.dart b/lib/pages/settings_ignore_list/settings_ignore_list_view.dart similarity index 98% rename from lib/pages/views/settings_ignore_list_view.dart rename to lib/pages/settings_ignore_list/settings_ignore_list_view.dart index 43781409..86ff8291 100644 --- a/lib/pages/views/settings_ignore_list_view.dart +++ b/lib/pages/settings_ignore_list/settings_ignore_list_view.dart @@ -7,7 +7,7 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import '../../widgets/matrix.dart'; -import '../settings_ignore_list.dart'; +import 'settings_ignore_list.dart'; class SettingsIgnoreListView extends StatelessWidget { final SettingsIgnoreListController controller; diff --git a/lib/pages/settings_multiple_emotes.dart b/lib/pages/settings_multiple_emotes/settings_multiple_emotes.dart similarity index 91% rename from lib/pages/settings_multiple_emotes.dart rename to lib/pages/settings_multiple_emotes/settings_multiple_emotes.dart index 9e5d657e..9584f253 100644 --- a/lib/pages/settings_multiple_emotes.dart +++ b/lib/pages/settings_multiple_emotes/settings_multiple_emotes.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:vrouter/vrouter.dart'; -import 'views/settings_multiple_emotes_view.dart'; +import 'settings_multiple_emotes_view.dart'; class MultipleEmotesSettings extends StatefulWidget { const MultipleEmotesSettings({Key key}) : super(key: key); diff --git a/lib/pages/views/settings_multiple_emotes_view.dart b/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart similarity index 95% rename from lib/pages/views/settings_multiple_emotes_view.dart rename to lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart index 5ef8eb03..efaf4fde 100644 --- a/lib/pages/views/settings_multiple_emotes_view.dart +++ b/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart @@ -4,7 +4,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/settings_multiple_emotes.dart'; +import 'package:fluffychat/pages/settings_multiple_emotes/settings_multiple_emotes.dart'; import 'package:fluffychat/widgets/matrix.dart'; class MultipleEmotesSettingsView extends StatelessWidget { diff --git a/lib/pages/settings_notifications.dart b/lib/pages/settings_notifications/settings_notifications.dart similarity index 97% rename from lib/pages/settings_notifications.dart rename to lib/pages/settings_notifications/settings_notifications.dart index 07bf7fa7..56703097 100644 --- a/lib/pages/settings_notifications.dart +++ b/lib/pages/settings_notifications/settings_notifications.dart @@ -7,8 +7,8 @@ import 'package:matrix/matrix.dart'; import 'package:open_noti_settings/open_noti_settings.dart'; import 'package:fluffychat/config/app_config.dart'; -import '../widgets/matrix.dart'; -import 'views/settings_notifications_view.dart'; +import '../../widgets/matrix.dart'; +import 'settings_notifications_view.dart'; class NotificationSettingsItem { final PushRuleKind type; diff --git a/lib/pages/views/settings_notifications_view.dart b/lib/pages/settings_notifications/settings_notifications_view.dart similarity index 99% rename from lib/pages/views/settings_notifications_view.dart rename to lib/pages/settings_notifications/settings_notifications_view.dart index 15a52bfc..a6fe7263 100644 --- a/lib/pages/views/settings_notifications_view.dart +++ b/lib/pages/settings_notifications/settings_notifications_view.dart @@ -10,7 +10,7 @@ import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import '../../utils/localized_exception_extension.dart'; import '../../widgets/matrix.dart'; -import '../settings_notifications.dart'; +import 'settings_notifications.dart'; class SettingsNotificationsView extends StatelessWidget { final SettingsNotificationsController controller; diff --git a/lib/pages/settings_security.dart b/lib/pages/settings_security/settings_security.dart similarity index 97% rename from lib/pages/settings_security.dart rename to lib/pages/settings_security/settings_security.dart index fbe3e39c..3a7dbafc 100644 --- a/lib/pages/settings_security.dart +++ b/lib/pages/settings_security/settings_security.dart @@ -8,8 +8,8 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'bootstrap_dialog.dart'; -import 'views/settings_security_view.dart'; +import '../bootstrap/bootstrap_dialog.dart'; +import 'settings_security_view.dart'; class SettingsSecurity extends StatefulWidget { const SettingsSecurity({Key key}) : super(key: key); diff --git a/lib/pages/views/settings_security_view.dart b/lib/pages/settings_security/settings_security_view.dart similarity index 98% rename from lib/pages/views/settings_security_view.dart rename to lib/pages/settings_security/settings_security_view.dart index 637602c0..48bc5ba4 100644 --- a/lib/pages/views/settings_security_view.dart +++ b/lib/pages/settings_security/settings_security_view.dart @@ -8,7 +8,7 @@ import 'package:fluffychat/utils/beautify_string_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../settings_security.dart'; +import 'settings_security.dart'; class SettingsSecurityView extends StatelessWidget { final SettingsSecurityController controller; diff --git a/lib/pages/settings_style.dart b/lib/pages/settings_style/settings_style.dart similarity index 96% rename from lib/pages/settings_style.dart rename to lib/pages/settings_style/settings_style.dart index a5cfe774..dd674856 100644 --- a/lib/pages/settings_style.dart +++ b/lib/pages/settings_style/settings_style.dart @@ -7,8 +7,8 @@ import 'package:file_picker_cross/file_picker_cross.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/setting_keys.dart'; -import '../widgets/matrix.dart'; -import 'views/settings_style_view.dart'; +import '../../widgets/matrix.dart'; +import 'settings_style_view.dart'; class SettingsStyle extends StatefulWidget { const SettingsStyle({Key key}) : super(key: key); diff --git a/lib/pages/views/settings_style_view.dart b/lib/pages/settings_style/settings_style_view.dart similarity index 99% rename from lib/pages/views/settings_style_view.dart rename to lib/pages/settings_style/settings_style_view.dart index c6ae9433..1cf49f94 100644 --- a/lib/pages/views/settings_style_view.dart +++ b/lib/pages/settings_style/settings_style_view.dart @@ -6,7 +6,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import '../../config/app_config.dart'; import '../../widgets/matrix.dart'; -import '../settings_style.dart'; +import 'settings_style.dart'; class SettingsStyleView extends StatelessWidget { final SettingsStyleController controller; diff --git a/lib/pages/signup.dart b/lib/pages/sign_up/signup.dart similarity index 96% rename from lib/pages/signup.dart rename to lib/pages/sign_up/signup.dart index 6836409a..f4c839b7 100644 --- a/lib/pages/signup.dart +++ b/lib/pages/sign_up/signup.dart @@ -3,10 +3,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/views/signup_view.dart'; +import 'package:fluffychat/pages/sign_up/signup_view.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import '../utils/localized_exception_extension.dart'; +import '../../utils/localized_exception_extension.dart'; class SignupPage extends StatefulWidget { const SignupPage({Key key}) : super(key: key); diff --git a/lib/pages/views/signup_view.dart b/lib/pages/sign_up/signup_view.dart similarity index 99% rename from lib/pages/views/signup_view.dart rename to lib/pages/sign_up/signup_view.dart index 2a563ab0..7832e219 100644 --- a/lib/pages/views/signup_view.dart +++ b/lib/pages/sign_up/signup_view.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:fluffychat/widgets/layouts/one_page_card.dart'; -import '../signup.dart'; +import 'signup.dart'; class SignupPageView extends StatelessWidget { final SignupPageController controller; diff --git a/lib/pages/user_bottom_sheet.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet.dart similarity index 96% rename from lib/pages/user_bottom_sheet.dart rename to lib/pages/user_bottom_sheet/user_bottom_sheet.dart index 5276cd5f..e96de0a2 100644 --- a/lib/pages/user_bottom_sheet.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet.dart @@ -6,9 +6,9 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/permission_slider_dialog.dart'; -import '../widgets/matrix.dart'; -import 'views/user_bottom_sheet_view.dart'; +import 'package:fluffychat/widgets/permission_slider_dialog.dart'; +import '../../widgets/matrix.dart'; +import 'user_bottom_sheet_view.dart'; class UserBottomSheet extends StatefulWidget { final User user; diff --git a/lib/pages/views/user_bottom_sheet_view.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart similarity index 99% rename from lib/pages/views/user_bottom_sheet_view.dart rename to lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart index 6c226db7..00adb73d 100644 --- a/lib/pages/views/user_bottom_sheet_view.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart @@ -10,7 +10,7 @@ import 'package:fluffychat/utils/fluffy_share.dart'; import '../../utils/matrix_sdk_extensions.dart/presence_extension.dart'; import '../../widgets/content_banner.dart'; import '../../widgets/matrix.dart'; -import '../user_bottom_sheet.dart'; +import 'user_bottom_sheet.dart'; class UserBottomSheetView extends StatelessWidget { final UserBottomSheetController controller; diff --git a/lib/pages/video_viewer.dart b/lib/pages/video_viewer/video_viewer.dart similarity index 93% rename from lib/pages/video_viewer.dart rename to lib/pages/video_viewer/video_viewer.dart index 0eb68215..c67096ad 100644 --- a/lib/pages/video_viewer.dart +++ b/lib/pages/video_viewer/video_viewer.dart @@ -8,10 +8,10 @@ import 'package:path_provider/path_provider.dart'; import 'package:video_player/video_player.dart'; import 'package:vrouter/vrouter.dart'; -import '../utils/matrix_sdk_extensions.dart/event_extension.dart'; -import '../utils/platform_infos.dart'; -import '../widgets/matrix.dart'; -import 'views/video_viewer_view.dart'; +import '../../utils/matrix_sdk_extensions.dart/event_extension.dart'; +import '../../utils/platform_infos.dart'; +import '../../widgets/matrix.dart'; +import 'video_viewer_view.dart'; class VideoViewer extends StatefulWidget { final Event event; diff --git a/lib/pages/views/video_viewer_view.dart b/lib/pages/video_viewer/video_viewer_view.dart similarity index 98% rename from lib/pages/views/video_viewer_view.dart rename to lib/pages/video_viewer/video_viewer_view.dart index 718e15a2..78adc34b 100644 --- a/lib/pages/views/video_viewer_view.dart +++ b/lib/pages/video_viewer/video_viewer_view.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:chewie/chewie.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import '../video_viewer.dart'; +import 'video_viewer.dart'; class VideoViewerView extends StatelessWidget { final VideoViewerController controller; diff --git a/lib/pages/views/empty_page_view.dart b/lib/widgets/layouts/empty_page.dart similarity index 100% rename from lib/pages/views/empty_page_view.dart rename to lib/widgets/layouts/empty_page.dart diff --git a/lib/widgets/layouts/loading_view.dart b/lib/widgets/layouts/loading_view.dart index 67705358..571b596e 100644 --- a/lib/widgets/layouts/loading_view.dart +++ b/lib/widgets/layouts/loading_view.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; -import 'package:fluffychat/pages/views/empty_page_view.dart'; +import 'package:fluffychat/widgets/layouts/empty_page.dart'; import 'package:fluffychat/widgets/matrix.dart'; class LoadingView extends StatelessWidget { diff --git a/lib/widgets/list_items/public_room_list_item.dart b/lib/widgets/list_items/public_room_list_item.dart deleted file mode 100644 index 420f7527..00000000 --- a/lib/widgets/list_items/public_room_list_item.dart +++ /dev/null @@ -1,60 +0,0 @@ -import 'package:flutter/material.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:matrix/matrix.dart'; -import 'package:vrouter/vrouter.dart'; - -import '../avatar.dart'; -import '../matrix.dart'; - -class PublicRoomListItem extends StatelessWidget { - final PublicRoomsChunk publicRoomEntry; - - const PublicRoomListItem(this.publicRoomEntry, {Key key}) : super(key: key); - - void joinAction(BuildContext context) async { - final success = await showFutureLoadingDialog( - context: context, - future: () => _joinRoomAndWait(context), - ); - if (success.error == null) { - VRouter.of(context).toSegments(['rooms', success.result]); - } - } - - Future _joinRoomAndWait(BuildContext context) async { - final roomId = - await Matrix.of(context).client.joinRoom(publicRoomEntry.roomId); - if (Matrix.of(context).client.getRoomById(roomId) == null) { - await Matrix.of(context) - .client - .onSync - .stream - .firstWhere((u) => u.rooms?.join?.containsKey(roomId) ?? false); - } - return roomId; - } - - @override - Widget build(BuildContext context) { - final hasTopic = - publicRoomEntry.topic != null && publicRoomEntry.topic.isNotEmpty; - return ListTile( - leading: Avatar(publicRoomEntry.avatarUrl, publicRoomEntry.name), - title: Text(hasTopic - ? '${publicRoomEntry.name} (${publicRoomEntry.numJoinedMembers})' - : publicRoomEntry.name), - subtitle: Text( - hasTopic - ? publicRoomEntry.topic - : publicRoomEntry.numJoinedMembers == null - ? L10n.of(context).joinRoom - : L10n.of(context).countParticipants( - publicRoomEntry.numJoinedMembers.toString()), - maxLines: 1, - ), - onTap: () => joinAction(context), - ); - } -} diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index a2e0e678..9b9afef5 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -24,7 +24,7 @@ import 'package:fluffychat/utils/sentry_controller.dart'; import 'package:fluffychat/utils/uia_request_manager.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; -import '../pages/key_verification_dialog.dart'; +import '../pages/key_verification/key_verification_dialog.dart'; import '../utils/account_bundles.dart'; import '../utils/background_push.dart'; import '../utils/famedlysdk_store.dart'; diff --git a/lib/pages/permission_slider_dialog.dart b/lib/widgets/permission_slider_dialog.dart similarity index 100% rename from lib/pages/permission_slider_dialog.dart rename to lib/widgets/permission_slider_dialog.dart