From 613e74ea33ea5a06e853f05b5a2ba4bac7937d52 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 19 May 2026 19:25:41 -0400 Subject: [PATCH] remove chat_page directory, move relevant files --- lib/helpers/extensions/show_user_popover.dart | 2 +- lib/pages/chat_page.dart | 4 ++-- lib/widgets/{chat_page => }/composer/chat_box.dart | 6 +++--- .../{chat_page => }/composer/mention_overlay.dart | 0 .../{chat_page => }/composer/relation_preview.dart | 4 ++-- lib/widgets/{chat_page => }/emoji_picker_button.dart | 0 lib/widgets/{chat_page => }/expandable_image.dart | 0 lib/widgets/{chat_page => }/html/code_block.dart | 0 lib/widgets/{chat_page => }/html/html.dart | 10 +++++----- lib/widgets/{chat_page => }/html/mention_chip.dart | 0 lib/widgets/{chat_page => }/html/quoted.dart | 0 lib/widgets/{chat_page => }/html/spoiler_text.dart | 0 lib/widgets/{chat_page => }/join_dialog.dart | 0 .../{chat_page => }/lazy_loading/message_avatar.dart | 0 .../lazy_loading/message_displayname.dart | 0 lib/widgets/{chat_page => }/member_list.dart | 0 lib/widgets/renderers/event.dart | 10 +++++----- lib/widgets/renderers/membership.dart | 2 +- lib/widgets/{chat_page => }/room_appbar.dart | 4 ++-- lib/widgets/{chat_page => }/room_chat.dart | 10 +++++----- lib/widgets/{chat_page => }/room_menu.dart | 0 lib/widgets/{chat_page => }/sidebar.dart | 4 ++-- lib/widgets/{chat_page => }/user_popover.dart | 2 +- .../{chat_page => }/wrappers/event_wrapper.dart | 2 +- lib/widgets/{chat_page => }/wrappers/reaction_row.dart | 0 25 files changed, 30 insertions(+), 30 deletions(-) rename lib/widgets/{chat_page => }/composer/chat_box.dart (97%) rename lib/widgets/{chat_page => }/composer/mention_overlay.dart (100%) rename lib/widgets/{chat_page => }/composer/relation_preview.dart (94%) rename lib/widgets/{chat_page => }/emoji_picker_button.dart (100%) rename lib/widgets/{chat_page => }/expandable_image.dart (100%) rename lib/widgets/{chat_page => }/html/code_block.dart (100%) rename lib/widgets/{chat_page => }/html/html.dart (93%) rename lib/widgets/{chat_page => }/html/mention_chip.dart (100%) rename lib/widgets/{chat_page => }/html/quoted.dart (100%) rename lib/widgets/{chat_page => }/html/spoiler_text.dart (100%) rename lib/widgets/{chat_page => }/join_dialog.dart (100%) rename lib/widgets/{chat_page => }/lazy_loading/message_avatar.dart (100%) rename lib/widgets/{chat_page => }/lazy_loading/message_displayname.dart (100%) rename lib/widgets/{chat_page => }/member_list.dart (100%) rename lib/widgets/{chat_page => }/room_appbar.dart (95%) rename lib/widgets/{chat_page => }/room_chat.dart (97%) rename lib/widgets/{chat_page => }/room_menu.dart (100%) rename lib/widgets/{chat_page => }/sidebar.dart (98%) rename lib/widgets/{chat_page => }/user_popover.dart (99%) rename lib/widgets/{chat_page => }/wrappers/event_wrapper.dart (94%) rename lib/widgets/{chat_page => }/wrappers/reaction_row.dart (100%) diff --git a/lib/helpers/extensions/show_user_popover.dart b/lib/helpers/extensions/show_user_popover.dart index 1ef68e9..1826037 100644 --- a/lib/helpers/extensions/show_user_popover.dart +++ b/lib/helpers/extensions/show_user_popover.dart @@ -1,7 +1,7 @@ import "package:flutter/material.dart"; import "package:nexus/helpers/extensions/show_context_menu.dart"; import "package:nexus/models/content/membership.dart"; -import "package:nexus/widgets/chat_page/user_popover.dart"; +import "package:nexus/widgets/user_popover.dart"; extension ShowUserPopover on BuildContext { void showUserPopover( diff --git a/lib/pages/chat_page.dart b/lib/pages/chat_page.dart index 671891c..a8ec584 100644 --- a/lib/pages/chat_page.dart +++ b/lib/pages/chat_page.dart @@ -2,8 +2,8 @@ import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/init_complete_controller.dart"; import "package:nexus/widgets/appbar.dart"; -import "package:nexus/widgets/chat_page/sidebar.dart"; -import "package:nexus/widgets/chat_page/room_chat.dart"; +import "package:nexus/widgets/sidebar.dart"; +import "package:nexus/widgets/room_chat.dart"; import "package:nexus/widgets/loading.dart"; class ChatPage extends ConsumerWidget { diff --git a/lib/widgets/chat_page/composer/chat_box.dart b/lib/widgets/composer/chat_box.dart similarity index 97% rename from lib/widgets/chat_page/composer/chat_box.dart rename to lib/widgets/composer/chat_box.dart index e0aaca9..71033f9 100644 --- a/lib/widgets/chat_page/composer/chat_box.dart +++ b/lib/widgets/composer/chat_box.dart @@ -8,9 +8,9 @@ import "package:nexus/models/configs/power_level_config.dart"; import "package:nexus/models/content/content.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/relation_type.dart"; -import "package:nexus/widgets/chat_page/composer/mention_overlay.dart"; -import "package:nexus/widgets/chat_page/composer/relation_preview.dart"; -import "package:nexus/widgets/chat_page/emoji_picker_button.dart"; +import "package:nexus/widgets/composer/mention_overlay.dart"; +import "package:nexus/widgets/composer/relation_preview.dart"; +import "package:nexus/widgets/emoji_picker_button.dart"; class ChatBox extends HookConsumerWidget { final Event? relatedEvent; diff --git a/lib/widgets/chat_page/composer/mention_overlay.dart b/lib/widgets/composer/mention_overlay.dart similarity index 100% rename from lib/widgets/chat_page/composer/mention_overlay.dart rename to lib/widgets/composer/mention_overlay.dart diff --git a/lib/widgets/chat_page/composer/relation_preview.dart b/lib/widgets/composer/relation_preview.dart similarity index 94% rename from lib/widgets/chat_page/composer/relation_preview.dart rename to lib/widgets/composer/relation_preview.dart index fff95b2..028e412 100644 --- a/lib/widgets/chat_page/composer/relation_preview.dart +++ b/lib/widgets/composer/relation_preview.dart @@ -3,8 +3,8 @@ import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/relation_type.dart"; import "package:nexus/widgets/renderers/event.dart"; -import "package:nexus/widgets/chat_page/lazy_loading/message_avatar.dart"; -import "package:nexus/widgets/chat_page/lazy_loading/message_displayname.dart"; +import "package:nexus/widgets/lazy_loading/message_avatar.dart"; +import "package:nexus/widgets/lazy_loading/message_displayname.dart"; class RelationPreview extends ConsumerWidget { final Event? relatedEvent; diff --git a/lib/widgets/chat_page/emoji_picker_button.dart b/lib/widgets/emoji_picker_button.dart similarity index 100% rename from lib/widgets/chat_page/emoji_picker_button.dart rename to lib/widgets/emoji_picker_button.dart diff --git a/lib/widgets/chat_page/expandable_image.dart b/lib/widgets/expandable_image.dart similarity index 100% rename from lib/widgets/chat_page/expandable_image.dart rename to lib/widgets/expandable_image.dart diff --git a/lib/widgets/chat_page/html/code_block.dart b/lib/widgets/html/code_block.dart similarity index 100% rename from lib/widgets/chat_page/html/code_block.dart rename to lib/widgets/html/code_block.dart diff --git a/lib/widgets/chat_page/html/html.dart b/lib/widgets/html/html.dart similarity index 93% rename from lib/widgets/chat_page/html/html.dart rename to lib/widgets/html/html.dart index 2f93264..e889aff 100644 --- a/lib/widgets/chat_page/html/html.dart +++ b/lib/widgets/html/html.dart @@ -9,11 +9,11 @@ import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/link_to_mention.dart"; import "package:nexus/helpers/extensions/mxc_to_https.dart"; import "package:nexus/helpers/launch_helper.dart"; -import "package:nexus/widgets/chat_page/expandable_image.dart"; -import "package:nexus/widgets/chat_page/html/mention_chip.dart"; -import "package:nexus/widgets/chat_page/html/spoiler_text.dart"; -import "package:nexus/widgets/chat_page/html/code_block.dart"; -import "package:nexus/widgets/chat_page/html/quoted.dart"; +import "package:nexus/widgets/expandable_image.dart"; +import "package:nexus/widgets/html/mention_chip.dart"; +import "package:nexus/widgets/html/spoiler_text.dart"; +import "package:nexus/widgets/html/code_block.dart"; +import "package:nexus/widgets/html/quoted.dart"; class Html extends ConsumerWidget { final String html; diff --git a/lib/widgets/chat_page/html/mention_chip.dart b/lib/widgets/html/mention_chip.dart similarity index 100% rename from lib/widgets/chat_page/html/mention_chip.dart rename to lib/widgets/html/mention_chip.dart diff --git a/lib/widgets/chat_page/html/quoted.dart b/lib/widgets/html/quoted.dart similarity index 100% rename from lib/widgets/chat_page/html/quoted.dart rename to lib/widgets/html/quoted.dart diff --git a/lib/widgets/chat_page/html/spoiler_text.dart b/lib/widgets/html/spoiler_text.dart similarity index 100% rename from lib/widgets/chat_page/html/spoiler_text.dart rename to lib/widgets/html/spoiler_text.dart diff --git a/lib/widgets/chat_page/join_dialog.dart b/lib/widgets/join_dialog.dart similarity index 100% rename from lib/widgets/chat_page/join_dialog.dart rename to lib/widgets/join_dialog.dart diff --git a/lib/widgets/chat_page/lazy_loading/message_avatar.dart b/lib/widgets/lazy_loading/message_avatar.dart similarity index 100% rename from lib/widgets/chat_page/lazy_loading/message_avatar.dart rename to lib/widgets/lazy_loading/message_avatar.dart diff --git a/lib/widgets/chat_page/lazy_loading/message_displayname.dart b/lib/widgets/lazy_loading/message_displayname.dart similarity index 100% rename from lib/widgets/chat_page/lazy_loading/message_displayname.dart rename to lib/widgets/lazy_loading/message_displayname.dart diff --git a/lib/widgets/chat_page/member_list.dart b/lib/widgets/member_list.dart similarity index 100% rename from lib/widgets/chat_page/member_list.dart rename to lib/widgets/member_list.dart diff --git a/lib/widgets/renderers/event.dart b/lib/widgets/renderers/event.dart index 860e07f..b2272f3 100644 --- a/lib/widgets/renderers/event.dart +++ b/lib/widgets/renderers/event.dart @@ -17,10 +17,10 @@ import "package:nexus/models/content/encrypted.dart"; import "package:nexus/models/content/membership.dart"; import "package:nexus/models/content/message.dart"; import "package:nexus/models/event.dart"; -import "package:nexus/widgets/chat_page/expandable_image.dart"; -import "package:nexus/widgets/chat_page/html/html.dart"; -import "package:nexus/widgets/chat_page/lazy_loading/message_avatar.dart"; -import "package:nexus/widgets/chat_page/lazy_loading/message_displayname.dart"; +import "package:nexus/widgets/expandable_image.dart"; +import "package:nexus/widgets/html/html.dart"; +import "package:nexus/widgets/lazy_loading/message_avatar.dart"; +import "package:nexus/widgets/lazy_loading/message_displayname.dart"; import "package:nexus/widgets/link_preview.dart"; import "package:nexus/widgets/loading.dart"; import "package:nexus/widgets/players/video.dart"; @@ -239,7 +239,7 @@ class EventRenderer extends ConsumerWidget { ) => AudioPlayer(url, info), // FileMessageContent(:final info) => - // FileCard(url, info), + // FileRenderer(url, info), ImageMessageContent(:final info) => ExpandableImage( url.toString(), child: ClipRRect( diff --git a/lib/widgets/renderers/membership.dart b/lib/widgets/renderers/membership.dart index 37c61c4..5330fea 100644 --- a/lib/widgets/renderers/membership.dart +++ b/lib/widgets/renderers/membership.dart @@ -4,7 +4,7 @@ import "package:nexus/helpers/extensions/show_user_popover.dart"; import "package:nexus/models/content/membership.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/membership_status.dart"; -import "package:nexus/widgets/chat_page/lazy_loading/message_displayname.dart"; +import "package:nexus/widgets/lazy_loading/message_displayname.dart"; class MembershipRenderer extends StatelessWidget { final Event event; diff --git a/lib/widgets/chat_page/room_appbar.dart b/lib/widgets/room_appbar.dart similarity index 95% rename from lib/widgets/chat_page/room_appbar.dart rename to lib/widgets/room_appbar.dart index 62e282d..52cf0ec 100644 --- a/lib/widgets/chat_page/room_appbar.dart +++ b/lib/widgets/room_appbar.dart @@ -4,8 +4,8 @@ import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/selected_room_controller.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; -import "package:nexus/widgets/chat_page/expandable_image.dart"; -import "package:nexus/widgets/chat_page/room_menu.dart"; +import "package:nexus/widgets/expandable_image.dart"; +import "package:nexus/widgets/room_menu.dart"; class RoomAppbar extends ConsumerWidget implements PreferredSizeWidget { final bool isDesktop; diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/room_chat.dart similarity index 97% rename from lib/widgets/chat_page/room_chat.dart rename to lib/widgets/room_chat.dart index 0876982..5d9cf09 100644 --- a/lib/widgets/chat_page/room_chat.dart +++ b/lib/widgets/room_chat.dart @@ -16,12 +16,12 @@ import "package:nexus/models/content/message.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/relation_type.dart"; import "package:nexus/models/requests/report_request.dart"; -import "package:nexus/widgets/chat_page/composer/chat_box.dart"; -import "package:nexus/widgets/chat_page/emoji_picker_button.dart"; +import "package:nexus/widgets/composer/chat_box.dart"; +import "package:nexus/widgets/emoji_picker_button.dart"; import "package:nexus/widgets/renderers/event.dart"; -import "package:nexus/widgets/chat_page/member_list.dart"; -import "package:nexus/widgets/chat_page/room_appbar.dart"; -import "package:nexus/widgets/chat_page/wrappers/event_wrapper.dart"; +import "package:nexus/widgets/member_list.dart"; +import "package:nexus/widgets/room_appbar.dart"; +import "package:nexus/widgets/wrappers/event_wrapper.dart"; import "package:nexus/widgets/error_dialog.dart"; import "package:nexus/widgets/form_text_input.dart"; import "package:nexus/main.dart"; diff --git a/lib/widgets/chat_page/room_menu.dart b/lib/widgets/room_menu.dart similarity index 100% rename from lib/widgets/chat_page/room_menu.dart rename to lib/widgets/room_menu.dart diff --git a/lib/widgets/chat_page/sidebar.dart b/lib/widgets/sidebar.dart similarity index 98% rename from lib/widgets/chat_page/sidebar.dart rename to lib/widgets/sidebar.dart index 77b8cd6..e200801 100644 --- a/lib/widgets/chat_page/sidebar.dart +++ b/lib/widgets/sidebar.dart @@ -4,8 +4,8 @@ import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/selected_space_controller.dart"; import "package:nexus/controllers/spaces_controller.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; -import "package:nexus/widgets/chat_page/join_dialog.dart"; -import "package:nexus/widgets/chat_page/room_menu.dart"; +import "package:nexus/widgets/join_dialog.dart"; +import "package:nexus/widgets/room_menu.dart"; class Sidebar extends HookConsumerWidget { final bool isDesktop; diff --git a/lib/widgets/chat_page/user_popover.dart b/lib/widgets/user_popover.dart similarity index 99% rename from lib/widgets/chat_page/user_popover.dart rename to lib/widgets/user_popover.dart index 5d438ff..508a038 100644 --- a/lib/widgets/chat_page/user_popover.dart +++ b/lib/widgets/user_popover.dart @@ -16,7 +16,7 @@ import "package:nexus/models/requests/membership_action.dart"; import "package:nexus/models/requests/set_membership_request.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/main.dart"; -import "package:nexus/widgets/chat_page/expandable_image.dart"; +import "package:nexus/widgets/expandable_image.dart"; import "package:nexus/widgets/form_text_input.dart"; class UserPopover extends ConsumerWidget { diff --git a/lib/widgets/chat_page/wrappers/event_wrapper.dart b/lib/widgets/wrappers/event_wrapper.dart similarity index 94% rename from lib/widgets/chat_page/wrappers/event_wrapper.dart rename to lib/widgets/wrappers/event_wrapper.dart index d131e66..c032d52 100644 --- a/lib/widgets/chat_page/wrappers/event_wrapper.dart +++ b/lib/widgets/wrappers/event_wrapper.dart @@ -1,6 +1,6 @@ import "package:flutter/material.dart"; import "package:nexus/models/event.dart"; -import "package:nexus/widgets/chat_page/wrappers/reaction_row.dart"; +import "package:nexus/widgets/wrappers/reaction_row.dart"; class EventWrapper extends StatelessWidget { final Event event; diff --git a/lib/widgets/chat_page/wrappers/reaction_row.dart b/lib/widgets/wrappers/reaction_row.dart similarity index 100% rename from lib/widgets/chat_page/wrappers/reaction_row.dart rename to lib/widgets/wrappers/reaction_row.dart