From 7992f0e815f5128c44de84dfa8555f34830d761c Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 18 Jul 2026 12:12:54 -0400 Subject: [PATCH] treewide(refactor): rename files to follow the same style --- ...data_controller.dart => account_data.dart} | 0 .../{author_controller.dart => author.dart} | 2 +- .../{client_controller.dart => client.dart} | 38 +++++++++---------- ...tate_controller.dart => client_state.dart} | 0 ...cache_controller.dart => cross_cache.dart} | 0 .../{emoji_controller.dart => emoji.dart} | 0 .../{event_controller.dart => event.dart} | 6 +-- .../{header_controller.dart => header.dart} | 4 +- ...ete_controller.dart => init_complete.dart} | 0 .../{key_controller.dart => key.dart} | 2 +- .../{members_controller.dart => members.dart} | 6 +-- ...controller.dart => members_by_status.dart} | 4 +- ...d_controller.dart => members_grouped.dart} | 8 ++-- ...er_controller.dart => multi_provider.dart} | 0 ...nts_controller.dart => pinned_events.dart} | 4 +- ...ed_ids_controller.dart => pinned_ids.dart} | 4 +- ...level_controller.dart => power_level.dart} | 8 ++-- .../{profile_controller.dart => profile.dart} | 2 +- ...actions_controller.dart => reactions.dart} | 6 +-- ...om_chat_controller.dart => room_chat.dart} | 8 ++-- ...ors_controller.dart => room_creators.dart} | 0 .../{rooms_controller.dart => rooms.dart} | 0 ...settings_controller.dart => settings.dart} | 2 +- ...ile_controller.dart => settings_file.dart} | 0 ...controller.dart => settings_sections.dart} | 2 +- ...refs_controller.dart => shared_prefs.dart} | 0 ...edges_controller.dart => space_edges.dart} | 0 .../{spaces_controller.dart => spaces.dart} | 8 ++-- ...tatus_controller.dart => sync_status.dart} | 0 ..._controller.dart => top_level_spaces.dart} | 0 ...eview_controller.dart => url_preview.dart} | 4 +- .../{user_controller.dart => user.dart} | 6 +-- .../{via_controller.dart => via.dart} | 2 +- lib/helpers/extensions/get_headers.dart | 2 +- lib/main.dart | 18 ++++----- ...tus_config.dart => members_by_status.dart} | 4 +- ...wer_level_config.dart => power_level.dart} | 4 +- .../{reactions_config.dart => reactions.dart} | 4 +- .../configs/{user_config.dart => user.dart} | 4 +- .../{requests => }/membership_action.dart | 0 ...{get_event_request.dart => get_event.dart} | 4 +- ...s_request.dart => get_related_events.dart} | 4 +- ...state_request.dart => get_room_state.dart} | 4 +- ...{join_room_request.dart => join_room.dart} | 4 +- .../{login_request.dart => login.dart} | 4 +- .../{paginate_request.dart => paginate.dart} | 4 +- lib/models/requests/redact_event.dart | 3 ++ lib/models/requests/redact_event_request.dart | 3 -- .../{report_request.dart => report.dart} | 4 +- ...end_event_request.dart => send_event.dart} | 4 +- ...message_request.dart => send_message.dart} | 4 +- ...rship_request.dart => set_membership.dart} | 6 +-- ...{set_state_request.dart => set_state.dart} | 4 +- lib/pages/{chat_page.dart => chat.dart} | 6 +-- lib/pages/{login_page.dart => login.dart} | 4 +- ...ct_server_page.dart => select_server.dart} | 4 +- .../{settings_page.dart => settings.dart} | 4 +- ...egory_page.dart => settings_category.dart} | 2 +- lib/pages/{verify_page.dart => verify.dart} | 2 +- lib/widgets/appbar.dart | 2 +- lib/widgets/avatar_or_hash.dart | 4 +- lib/widgets/composer/composer.dart | 2 +- lib/widgets/composer/mention_overlay.dart | 6 +-- lib/widgets/emoji_picker_button.dart | 2 +- lib/widgets/expandable_image.dart | 2 +- lib/widgets/html/html.dart | 4 +- lib/widgets/html/mention_chip.dart | 2 +- lib/widgets/join_dialog.dart | 6 +-- lib/widgets/lazy_loading/message_avatar.dart | 2 +- .../lazy_loading/message_displayname.dart | 2 +- lib/widgets/member_list.dart | 4 +- lib/widgets/message_image.dart | 2 +- lib/widgets/pinned_events_drawer.dart | 2 +- lib/widgets/reaction_row.dart | 8 ++-- lib/widgets/renderers/message.dart | 4 +- lib/widgets/room_appbar.dart | 4 +- lib/widgets/room_chat.dart | 16 ++++---- lib/widgets/room_menu.dart | 4 +- lib/widgets/sidebar.dart | 6 +-- lib/widgets/url_preview.dart | 4 +- lib/widgets/user_bottom_sheet.dart | 10 ++--- 81 files changed, 167 insertions(+), 167 deletions(-) rename lib/controllers/{account_data_controller.dart => account_data.dart} (100%) rename lib/controllers/{author_controller.dart => author.dart} (93%) rename lib/controllers/{client_controller.dart => client.dart} (88%) rename lib/controllers/{client_state_controller.dart => client_state.dart} (100%) rename lib/controllers/{cross_cache_controller.dart => cross_cache.dart} (100%) rename lib/controllers/{emoji_controller.dart => emoji.dart} (100%) rename lib/controllers/{event_controller.dart => event.dart} (82%) rename lib/controllers/{header_controller.dart => header.dart} (82%) rename lib/controllers/{init_complete_controller.dart => init_complete.dart} (100%) rename lib/controllers/{key_controller.dart => key.dart} (91%) rename lib/controllers/{members_controller.dart => members.dart} (87%) rename lib/controllers/{members_by_status_controller.dart => members_by_status.dart} (88%) rename lib/controllers/{members_grouped_controller.dart => members_grouped.dart} (88%) rename lib/controllers/{multi_provider_controller.dart => multi_provider.dart} (100%) rename lib/controllers/{pinned_events_controller.dart => pinned_events.dart} (87%) rename lib/controllers/{pinned_ids_controller.dart => pinned_ids.dart} (92%) rename lib/controllers/{power_level_controller.dart => power_level.dart} (90%) rename lib/controllers/{profile_controller.dart => profile.dart} (89%) rename lib/controllers/{reactions_controller.dart => reactions.dart} (90%) rename lib/controllers/{room_chat_controller.dart => room_chat.dart} (96%) rename lib/controllers/{room_creators_controller.dart => room_creators.dart} (100%) rename lib/controllers/{rooms_controller.dart => rooms.dart} (100%) rename lib/controllers/{settings_controller.dart => settings.dart} (92%) rename lib/controllers/{settings_file_controller.dart => settings_file.dart} (100%) rename lib/controllers/{settings_sections_controller.dart => settings_sections.dart} (98%) rename lib/controllers/{shared_prefs_controller.dart => shared_prefs.dart} (100%) rename lib/controllers/{space_edges_controller.dart => space_edges.dart} (100%) rename lib/controllers/{spaces_controller.dart => spaces.dart} (94%) rename lib/controllers/{sync_status_controller.dart => sync_status.dart} (100%) rename lib/controllers/{top_level_spaces_controller.dart => top_level_spaces.dart} (100%) rename lib/controllers/{url_preview_controller.dart => url_preview.dart} (92%) rename lib/controllers/{user_controller.dart => user.dart} (87%) rename lib/controllers/{via_controller.dart => via.dart} (96%) rename lib/models/configs/{members_by_status_config.dart => members_by_status.dart} (83%) rename lib/models/configs/{power_level_config.dart => power_level.dart} (88%) rename lib/models/configs/{reactions_config.dart => reactions.dart} (83%) rename lib/models/configs/{user_config.dart => user.dart} (83%) rename lib/models/{requests => }/membership_action.dart (100%) rename lib/models/requests/{get_event_request.dart => get_event.dart} (85%) rename lib/models/requests/{get_related_events_request.dart => get_related_events.dart} (82%) rename lib/models/requests/{get_room_state_request.dart => get_room_state.dart} (84%) rename lib/models/requests/{join_room_request.dart => join_room.dart} (85%) rename lib/models/requests/{login_request.dart => login.dart} (85%) rename lib/models/requests/{paginate_request.dart => paginate.dart} (84%) create mode 100644 lib/models/requests/redact_event.dart delete mode 100644 lib/models/requests/redact_event_request.dart rename lib/models/requests/{report_request.dart => report.dart} (84%) rename lib/models/requests/{send_event_request.dart => send_event.dart} (88%) rename lib/models/requests/{send_message_request.dart => send_message.dart} (94%) rename lib/models/requests/{set_membership_request.dart => set_membership.dart} (78%) rename lib/models/requests/{set_state_request.dart => set_state.dart} (89%) rename lib/pages/{chat_page.dart => chat.dart} (89%) rename lib/pages/{login_page.dart => login.dart} (97%) rename lib/pages/{select_server_page.dart => select_server.dart} (98%) rename lib/pages/{settings_page.dart => settings.dart} (98%) rename lib/pages/{settings_category_page.dart => settings_category.dart} (97%) rename lib/pages/{verify_page.dart => verify.dart} (97%) diff --git a/lib/controllers/account_data_controller.dart b/lib/controllers/account_data.dart similarity index 100% rename from lib/controllers/account_data_controller.dart rename to lib/controllers/account_data.dart diff --git a/lib/controllers/author_controller.dart b/lib/controllers/author.dart similarity index 93% rename from lib/controllers/author_controller.dart rename to lib/controllers/author.dart index 77202ca..bbbe068 100644 --- a/lib/controllers/author_controller.dart +++ b/lib/controllers/author.dart @@ -1,6 +1,6 @@ import "dart:async"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/user_controller.dart"; +import "package:nexus/controllers/user.dart"; import "package:nexus/models/content/membership.dart"; import "package:nexus/models/event.dart"; diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client.dart similarity index 88% rename from lib/controllers/client_controller.dart rename to lib/controllers/client.dart index d888162..befaf21 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client.dart @@ -5,30 +5,30 @@ import "dart:math"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; -import "package:nexus/controllers/account_data_controller.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/init_complete_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/controllers/space_edges_controller.dart"; -import "package:nexus/controllers/sync_status_controller.dart"; -import "package:nexus/controllers/top_level_spaces_controller.dart"; +import "package:nexus/controllers/account_data.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/init_complete.dart"; +import "package:nexus/controllers/rooms.dart"; +import "package:nexus/controllers/space_edges.dart"; +import "package:nexus/controllers/sync_status.dart"; +import "package:nexus/controllers/top_level_spaces.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/main.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/paginate.dart"; -import "package:nexus/models/requests/get_event_request.dart"; -import "package:nexus/models/requests/get_related_events_request.dart"; -import "package:nexus/models/requests/get_room_state_request.dart"; -import "package:nexus/models/requests/join_room_request.dart"; -import "package:nexus/models/requests/login_request.dart"; +import "package:nexus/models/requests/get_event.dart"; +import "package:nexus/models/requests/get_related_events.dart"; +import "package:nexus/models/requests/get_room_state.dart"; +import "package:nexus/models/requests/join_room.dart"; +import "package:nexus/models/requests/login.dart"; import "package:nexus/models/profile.dart"; -import "package:nexus/models/requests/paginate_request.dart"; -import "package:nexus/models/requests/redact_event_request.dart"; -import "package:nexus/models/requests/report_request.dart"; -import "package:nexus/models/requests/send_event_request.dart"; -import "package:nexus/models/requests/send_message_request.dart"; -import "package:nexus/models/requests/set_membership_request.dart"; -import "package:nexus/models/requests/set_state_request.dart"; +import "package:nexus/models/requests/paginate.dart"; +import "package:nexus/models/requests/redact_event.dart"; +import "package:nexus/models/requests/report.dart"; +import "package:nexus/models/requests/send_event.dart"; +import "package:nexus/models/requests/send_message.dart"; +import "package:nexus/models/requests/set_membership.dart"; +import "package:nexus/models/requests/set_state.dart"; import "package:nexus/models/room.dart"; import "package:nexus/models/sync_data.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; diff --git a/lib/controllers/client_state_controller.dart b/lib/controllers/client_state.dart similarity index 100% rename from lib/controllers/client_state_controller.dart rename to lib/controllers/client_state.dart diff --git a/lib/controllers/cross_cache_controller.dart b/lib/controllers/cross_cache.dart similarity index 100% rename from lib/controllers/cross_cache_controller.dart rename to lib/controllers/cross_cache.dart diff --git a/lib/controllers/emoji_controller.dart b/lib/controllers/emoji.dart similarity index 100% rename from lib/controllers/emoji_controller.dart rename to lib/controllers/emoji.dart diff --git a/lib/controllers/event_controller.dart b/lib/controllers/event.dart similarity index 82% rename from lib/controllers/event_controller.dart rename to lib/controllers/event.dart index 94992ca..b7b417a 100644 --- a/lib/controllers/event_controller.dart +++ b/lib/controllers/event.dart @@ -1,9 +1,9 @@ import "package:collection/collection.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/rooms.dart"; import "package:nexus/models/event.dart"; -import "package:nexus/models/requests/get_event_request.dart"; +import "package:nexus/models/requests/get_event.dart"; class EventController extends AsyncNotifier { final GetEventRequest request; diff --git a/lib/controllers/header_controller.dart b/lib/controllers/header.dart similarity index 82% rename from lib/controllers/header_controller.dart rename to lib/controllers/header.dart index 295cf04..3e173ad 100644 --- a/lib/controllers/header_controller.dart +++ b/lib/controllers/header.dart @@ -1,6 +1,6 @@ import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/client_state.dart"; class HeaderController extends AsyncNotifier> { @override diff --git a/lib/controllers/init_complete_controller.dart b/lib/controllers/init_complete.dart similarity index 100% rename from lib/controllers/init_complete_controller.dart rename to lib/controllers/init_complete.dart diff --git a/lib/controllers/key_controller.dart b/lib/controllers/key.dart similarity index 91% rename from lib/controllers/key_controller.dart rename to lib/controllers/key.dart index 59d49ca..eff3ab2 100644 --- a/lib/controllers/key_controller.dart +++ b/lib/controllers/key.dart @@ -1,5 +1,5 @@ import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/shared_prefs_controller.dart"; +import "package:nexus/controllers/shared_prefs.dart"; class KeyController extends Notifier { final String key; diff --git a/lib/controllers/members_controller.dart b/lib/controllers/members.dart similarity index 87% rename from lib/controllers/members_controller.dart rename to lib/controllers/members.dart index 57fc5be..8566b40 100644 --- a/lib/controllers/members_controller.dart +++ b/lib/controllers/members.dart @@ -1,10 +1,10 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/rooms.dart"; import "package:nexus/models/content/content.dart"; import "package:nexus/models/event.dart"; -import "package:nexus/models/requests/get_room_state_request.dart"; +import "package:nexus/models/requests/get_room_state.dart"; class MembersController extends AsyncNotifier> { final String roomId; diff --git a/lib/controllers/members_by_status_controller.dart b/lib/controllers/members_by_status.dart similarity index 88% rename from lib/controllers/members_by_status_controller.dart rename to lib/controllers/members_by_status.dart index 2b49903..613f7b1 100644 --- a/lib/controllers/members_by_status_controller.dart +++ b/lib/controllers/members_by_status.dart @@ -1,7 +1,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/members_controller.dart"; -import "package:nexus/models/configs/members_by_status_config.dart"; +import "package:nexus/controllers/members.dart"; +import "package:nexus/models/configs/members_by_status.dart"; import "package:nexus/models/content/membership.dart"; import "package:nexus/models/event.dart"; diff --git a/lib/controllers/members_grouped_controller.dart b/lib/controllers/members_grouped.dart similarity index 88% rename from lib/controllers/members_grouped_controller.dart rename to lib/controllers/members_grouped.dart index 85fddb0..6f41e9d 100644 --- a/lib/controllers/members_grouped_controller.dart +++ b/lib/controllers/members_grouped.dart @@ -1,9 +1,9 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/members_by_status_controller.dart"; -import "package:nexus/controllers/room_creators_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/models/configs/members_by_status_config.dart"; +import "package:nexus/controllers/members_by_status.dart"; +import "package:nexus/controllers/room_creators.dart"; +import "package:nexus/controllers/rooms.dart"; +import "package:nexus/models/configs/members_by_status.dart"; import "package:nexus/models/content/content.dart"; import "package:nexus/models/content/power_levels.dart"; import "package:nexus/models/event.dart"; diff --git a/lib/controllers/multi_provider_controller.dart b/lib/controllers/multi_provider.dart similarity index 100% rename from lib/controllers/multi_provider_controller.dart rename to lib/controllers/multi_provider.dart diff --git a/lib/controllers/pinned_events_controller.dart b/lib/controllers/pinned_events.dart similarity index 87% rename from lib/controllers/pinned_events_controller.dart rename to lib/controllers/pinned_events.dart index 402dc30..914a301 100644 --- a/lib/controllers/pinned_events_controller.dart +++ b/lib/controllers/pinned_events.dart @@ -1,7 +1,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/event_controller.dart"; -import "package:nexus/controllers/pinned_ids_controller.dart"; +import "package:nexus/controllers/event.dart"; +import "package:nexus/controllers/pinned_ids.dart"; import "package:nexus/models/event.dart"; class PinnedEventsController extends AsyncNotifier> { diff --git a/lib/controllers/pinned_ids_controller.dart b/lib/controllers/pinned_ids.dart similarity index 92% rename from lib/controllers/pinned_ids_controller.dart rename to lib/controllers/pinned_ids.dart index 4ec5af0..3d1e5da 100644 --- a/lib/controllers/pinned_ids_controller.dart +++ b/lib/controllers/pinned_ids.dart @@ -1,7 +1,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/rooms.dart"; import "package:nexus/models/content/content.dart"; import "package:nexus/models/content/pinned_events.dart"; diff --git a/lib/controllers/power_level_controller.dart b/lib/controllers/power_level.dart similarity index 90% rename from lib/controllers/power_level_controller.dart rename to lib/controllers/power_level.dart index 94e6bd2..2f0c72e 100644 --- a/lib/controllers/power_level_controller.dart +++ b/lib/controllers/power_level.dart @@ -1,8 +1,8 @@ import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/room_creators_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/models/configs/power_level_config.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/room_creators.dart"; +import "package:nexus/controllers/rooms.dart"; +import "package:nexus/models/configs/power_level.dart"; import "package:nexus/models/content/content.dart"; import "package:nexus/models/content/power_levels.dart"; diff --git a/lib/controllers/profile_controller.dart b/lib/controllers/profile.dart similarity index 89% rename from lib/controllers/profile_controller.dart rename to lib/controllers/profile.dart index 9aa0e09..32525a3 100644 --- a/lib/controllers/profile_controller.dart +++ b/lib/controllers/profile.dart @@ -1,5 +1,5 @@ import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client.dart"; import "package:nexus/models/profile.dart"; class ProfileController extends AsyncNotifier { diff --git a/lib/controllers/reactions_controller.dart b/lib/controllers/reactions.dart similarity index 90% rename from lib/controllers/reactions_controller.dart rename to lib/controllers/reactions.dart index db9af9b..615a59d 100644 --- a/lib/controllers/reactions_controller.dart +++ b/lib/controllers/reactions.dart @@ -1,8 +1,8 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/models/configs/reactions_config.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/rooms.dart"; +import "package:nexus/models/configs/reactions.dart"; import "package:nexus/models/content/reaction.dart"; class ReactionsController extends AsyncNotifier>> { diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat.dart similarity index 96% rename from lib/controllers/room_chat_controller.dart rename to lib/controllers/room_chat.dart index e738e09..b79010c 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat.dart @@ -4,14 +4,14 @@ import "package:collection/collection.dart"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:fluttertagger/fluttertagger.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/rooms.dart"; import "package:nexus/models/content/content.dart"; import "package:nexus/models/content/reaction.dart"; import "package:nexus/models/event.dart"; -import "package:nexus/models/requests/redact_event_request.dart"; +import "package:nexus/models/requests/redact_event.dart"; import "package:nexus/models/relation_type.dart"; -import "package:nexus/models/requests/send_message_request.dart"; +import "package:nexus/models/requests/send_message.dart"; import "package:nexus/models/room.dart"; class RoomChatController extends AsyncNotifier?> { diff --git a/lib/controllers/room_creators_controller.dart b/lib/controllers/room_creators.dart similarity index 100% rename from lib/controllers/room_creators_controller.dart rename to lib/controllers/room_creators.dart diff --git a/lib/controllers/rooms_controller.dart b/lib/controllers/rooms.dart similarity index 100% rename from lib/controllers/rooms_controller.dart rename to lib/controllers/rooms.dart diff --git a/lib/controllers/settings_controller.dart b/lib/controllers/settings.dart similarity index 92% rename from lib/controllers/settings_controller.dart rename to lib/controllers/settings.dart index 02e5649..572d2e9 100644 --- a/lib/controllers/settings_controller.dart +++ b/lib/controllers/settings.dart @@ -1,6 +1,6 @@ import "dart:convert"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/settings_file_controller.dart"; +import "package:nexus/controllers/settings_file.dart"; import "package:nexus/models/settings.dart"; class SettingsController extends AsyncNotifier { diff --git a/lib/controllers/settings_file_controller.dart b/lib/controllers/settings_file.dart similarity index 100% rename from lib/controllers/settings_file_controller.dart rename to lib/controllers/settings_file.dart diff --git a/lib/controllers/settings_sections_controller.dart b/lib/controllers/settings_sections.dart similarity index 98% rename from lib/controllers/settings_sections_controller.dart rename to lib/controllers/settings_sections.dart index f0a1d0b..88a9c7e 100644 --- a/lib/controllers/settings_sections_controller.dart +++ b/lib/controllers/settings_sections.dart @@ -3,7 +3,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:intl/intl.dart"; -import "package:nexus/controllers/settings_controller.dart"; +import "package:nexus/controllers/settings.dart"; import "package:nexus/models/settings_category.dart"; import "package:nexus/main.dart"; import "package:nexus/widgets/settings/dialog_list_tile.dart"; diff --git a/lib/controllers/shared_prefs_controller.dart b/lib/controllers/shared_prefs.dart similarity index 100% rename from lib/controllers/shared_prefs_controller.dart rename to lib/controllers/shared_prefs.dart diff --git a/lib/controllers/space_edges_controller.dart b/lib/controllers/space_edges.dart similarity index 100% rename from lib/controllers/space_edges_controller.dart rename to lib/controllers/space_edges.dart diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces.dart similarity index 94% rename from lib/controllers/spaces_controller.dart rename to lib/controllers/spaces.dart index 03a6b8a..24113ad 100644 --- a/lib/controllers/spaces_controller.dart +++ b/lib/controllers/spaces.dart @@ -2,10 +2,10 @@ import "package:collection/collection.dart"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/account_data_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/controllers/top_level_spaces_controller.dart"; -import "package:nexus/controllers/space_edges_controller.dart"; +import "package:nexus/controllers/account_data.dart"; +import "package:nexus/controllers/rooms.dart"; +import "package:nexus/controllers/top_level_spaces.dart"; +import "package:nexus/controllers/space_edges.dart"; import "package:nexus/models/room.dart"; import "package:nexus/models/space.dart"; import "package:nexus/models/subspace.dart"; diff --git a/lib/controllers/sync_status_controller.dart b/lib/controllers/sync_status.dart similarity index 100% rename from lib/controllers/sync_status_controller.dart rename to lib/controllers/sync_status.dart diff --git a/lib/controllers/top_level_spaces_controller.dart b/lib/controllers/top_level_spaces.dart similarity index 100% rename from lib/controllers/top_level_spaces_controller.dart rename to lib/controllers/top_level_spaces.dart diff --git a/lib/controllers/url_preview_controller.dart b/lib/controllers/url_preview.dart similarity index 92% rename from lib/controllers/url_preview_controller.dart rename to lib/controllers/url_preview.dart index 3bdaae7..0f807bb 100644 --- a/lib/controllers/url_preview_controller.dart +++ b/lib/controllers/url_preview.dart @@ -1,8 +1,8 @@ import "dart:convert"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:http/http.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/header_controller.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/header.dart"; import "package:nexus/helpers/extensions/mxc_to_https.dart"; import "package:nexus/models/open_graph_data.dart"; diff --git a/lib/controllers/user_controller.dart b/lib/controllers/user.dart similarity index 87% rename from lib/controllers/user_controller.dart rename to lib/controllers/user.dart index 7d20e90..b366c88 100644 --- a/lib/controllers/user_controller.dart +++ b/lib/controllers/user.dart @@ -1,10 +1,10 @@ import "dart:async"; import "package:collection/collection.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/members_controller.dart"; -import "package:nexus/controllers/profile_controller.dart"; +import "package:nexus/controllers/members.dart"; +import "package:nexus/controllers/profile.dart"; import "package:nexus/helpers/extensions/get_localpart.dart"; -import "package:nexus/models/configs/user_config.dart"; +import "package:nexus/models/configs/user.dart"; import "package:nexus/models/content/membership.dart"; class UserController extends AsyncNotifier { diff --git a/lib/controllers/via_controller.dart b/lib/controllers/via.dart similarity index 96% rename from lib/controllers/via_controller.dart rename to lib/controllers/via.dart index 0b5890a..d9227ba 100644 --- a/lib/controllers/via_controller.dart +++ b/lib/controllers/via.dart @@ -1,7 +1,7 @@ import "package:collection/collection.dart"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/client_state.dart"; import "package:nexus/models/content/content.dart"; import "package:nexus/models/content/membership.dart"; import "package:nexus/models/content/power_levels.dart"; diff --git a/lib/helpers/extensions/get_headers.dart b/lib/helpers/extensions/get_headers.dart index e1bb5f3..0fcec48 100644 --- a/lib/helpers/extensions/get_headers.dart +++ b/lib/helpers/extensions/get_headers.dart @@ -1,5 +1,5 @@ import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/header_controller.dart"; +import "package:nexus/controllers/header.dart"; extension GetHeaders on WidgetRef { Map get headers => diff --git a/lib/main.dart b/lib/main.dart index 6eb349e..df3ed91 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,18 +4,18 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/foundation.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:media_kit/media_kit.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/header_controller.dart"; -import "package:nexus/controllers/multi_provider_controller.dart"; -import "package:nexus/controllers/settings_controller.dart"; -import "package:nexus/controllers/shared_prefs_controller.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/header.dart"; +import "package:nexus/controllers/multi_provider.dart"; +import "package:nexus/controllers/settings.dart"; +import "package:nexus/controllers/shared_prefs.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/scheme_to_theme.dart"; import "package:nexus/helpers/font_licenses.dart"; -import "package:nexus/pages/chat_page.dart"; -import "package:nexus/pages/select_server_page.dart"; -import "package:nexus/pages/verify_page.dart"; +import "package:nexus/pages/chat.dart"; +import "package:nexus/pages/select_server.dart"; +import "package:nexus/pages/verify.dart"; import "package:nexus/widgets/error_dialog.dart"; import "package:nexus/widgets/loading.dart"; import "package:window_manager/window_manager.dart"; diff --git a/lib/models/configs/members_by_status_config.dart b/lib/models/configs/members_by_status.dart similarity index 83% rename from lib/models/configs/members_by_status_config.dart rename to lib/models/configs/members_by_status.dart index 8aef586..29fc471 100644 --- a/lib/models/configs/members_by_status_config.dart +++ b/lib/models/configs/members_by_status.dart @@ -1,7 +1,7 @@ import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/membership_status.dart"; -part "members_by_status_config.freezed.dart"; -part "members_by_status_config.g.dart"; +part "members_by_status.freezed.dart"; +part "members_by_status.g.dart"; @freezed abstract class MembersByStatusConfig with _$MembersByStatusConfig { diff --git a/lib/models/configs/power_level_config.dart b/lib/models/configs/power_level.dart similarity index 88% rename from lib/models/configs/power_level_config.dart rename to lib/models/configs/power_level.dart index 197e171..ed9c5e8 100644 --- a/lib/models/configs/power_level_config.dart +++ b/lib/models/configs/power_level.dart @@ -1,7 +1,7 @@ import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/content/content.dart"; -import "package:nexus/models/requests/membership_action.dart"; -part "power_level_config.freezed.dart"; +import "package:nexus/models/membership_action.dart"; +part "power_level.freezed.dart"; @freezed sealed class PowerLevelConfig with _$PowerLevelConfig { diff --git a/lib/models/configs/reactions_config.dart b/lib/models/configs/reactions.dart similarity index 83% rename from lib/models/configs/reactions_config.dart rename to lib/models/configs/reactions.dart index 5cae859..787b28c 100644 --- a/lib/models/configs/reactions_config.dart +++ b/lib/models/configs/reactions.dart @@ -1,6 +1,6 @@ import "package:freezed_annotation/freezed_annotation.dart"; -part "reactions_config.freezed.dart"; -part "reactions_config.g.dart"; +part "reactions.freezed.dart"; +part "reactions.g.dart"; @freezed abstract class ReactionsConfig with _$ReactionsConfig { diff --git a/lib/models/configs/user_config.dart b/lib/models/configs/user.dart similarity index 83% rename from lib/models/configs/user_config.dart rename to lib/models/configs/user.dart index 4f3f8ff..0331597 100644 --- a/lib/models/configs/user_config.dart +++ b/lib/models/configs/user.dart @@ -1,6 +1,6 @@ import "package:freezed_annotation/freezed_annotation.dart"; -part "user_config.freezed.dart"; -part "user_config.g.dart"; +part "user.freezed.dart"; +part "user.g.dart"; @freezed abstract class UserConfig with _$UserConfig { diff --git a/lib/models/requests/membership_action.dart b/lib/models/membership_action.dart similarity index 100% rename from lib/models/requests/membership_action.dart rename to lib/models/membership_action.dart diff --git a/lib/models/requests/get_event_request.dart b/lib/models/requests/get_event.dart similarity index 85% rename from lib/models/requests/get_event_request.dart rename to lib/models/requests/get_event.dart index 4fcf7b6..0e8f0a5 100644 --- a/lib/models/requests/get_event_request.dart +++ b/lib/models/requests/get_event.dart @@ -1,6 +1,6 @@ import "package:freezed_annotation/freezed_annotation.dart"; -part "get_event_request.freezed.dart"; -part "get_event_request.g.dart"; +part "get_event.freezed.dart"; +part "get_event.g.dart"; @Freezed() abstract class GetEventRequest with _$GetEventRequest { diff --git a/lib/models/requests/get_related_events_request.dart b/lib/models/requests/get_related_events.dart similarity index 82% rename from lib/models/requests/get_related_events_request.dart rename to lib/models/requests/get_related_events.dart index 7e2244f..52d2716 100644 --- a/lib/models/requests/get_related_events_request.dart +++ b/lib/models/requests/get_related_events.dart @@ -1,6 +1,6 @@ import "package:freezed_annotation/freezed_annotation.dart"; -part "get_related_events_request.freezed.dart"; -part "get_related_events_request.g.dart"; +part "get_related_events.freezed.dart"; +part "get_related_events.g.dart"; @freezed abstract class GetRelatedEventsRequest with _$GetRelatedEventsRequest { diff --git a/lib/models/requests/get_room_state_request.dart b/lib/models/requests/get_room_state.dart similarity index 84% rename from lib/models/requests/get_room_state_request.dart rename to lib/models/requests/get_room_state.dart index 8ee05f0..d3f52f7 100644 --- a/lib/models/requests/get_room_state_request.dart +++ b/lib/models/requests/get_room_state.dart @@ -1,6 +1,6 @@ import "package:freezed_annotation/freezed_annotation.dart"; -part "get_room_state_request.freezed.dart"; -part "get_room_state_request.g.dart"; +part "get_room_state.freezed.dart"; +part "get_room_state.g.dart"; @freezed abstract class GetRoomStateRequest with _$GetRoomStateRequest { diff --git a/lib/models/requests/join_room_request.dart b/lib/models/requests/join_room.dart similarity index 85% rename from lib/models/requests/join_room_request.dart rename to lib/models/requests/join_room.dart index d6b411e..8487298 100644 --- a/lib/models/requests/join_room_request.dart +++ b/lib/models/requests/join_room.dart @@ -1,7 +1,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:freezed_annotation/freezed_annotation.dart"; -part "join_room_request.freezed.dart"; -part "join_room_request.g.dart"; +part "join_room.freezed.dart"; +part "join_room.g.dart"; @freezed abstract class JoinRoomRequest with _$JoinRoomRequest { diff --git a/lib/models/requests/login_request.dart b/lib/models/requests/login.dart similarity index 85% rename from lib/models/requests/login_request.dart rename to lib/models/requests/login.dart index b3704fa..37ca819 100644 --- a/lib/models/requests/login_request.dart +++ b/lib/models/requests/login.dart @@ -1,6 +1,6 @@ import "package:freezed_annotation/freezed_annotation.dart"; -part "login_request.freezed.dart"; -part "login_request.g.dart"; +part "login.freezed.dart"; +part "login.g.dart"; @freezed abstract class LoginRequest with _$LoginRequest { diff --git a/lib/models/requests/paginate_request.dart b/lib/models/requests/paginate.dart similarity index 84% rename from lib/models/requests/paginate_request.dart rename to lib/models/requests/paginate.dart index 44cf8ec..ddc62f3 100644 --- a/lib/models/requests/paginate_request.dart +++ b/lib/models/requests/paginate.dart @@ -1,6 +1,6 @@ import "package:freezed_annotation/freezed_annotation.dart"; -part "paginate_request.freezed.dart"; -part "paginate_request.g.dart"; +part "paginate.freezed.dart"; +part "paginate.g.dart"; @freezed abstract class PaginateRequest with _$PaginateRequest { diff --git a/lib/models/requests/redact_event.dart b/lib/models/requests/redact_event.dart new file mode 100644 index 0000000..3a01673 --- /dev/null +++ b/lib/models/requests/redact_event.dart @@ -0,0 +1,3 @@ +import "package:nexus/models/requests/report.dart"; + +typedef RedactEventRequest = ReportRequest; diff --git a/lib/models/requests/redact_event_request.dart b/lib/models/requests/redact_event_request.dart deleted file mode 100644 index fed2255..0000000 --- a/lib/models/requests/redact_event_request.dart +++ /dev/null @@ -1,3 +0,0 @@ -import "package:nexus/models/requests/report_request.dart"; - -typedef RedactEventRequest = ReportRequest; diff --git a/lib/models/requests/report_request.dart b/lib/models/requests/report.dart similarity index 84% rename from lib/models/requests/report_request.dart rename to lib/models/requests/report.dart index 749ad60..f87b1f1 100644 --- a/lib/models/requests/report_request.dart +++ b/lib/models/requests/report.dart @@ -1,6 +1,6 @@ import "package:freezed_annotation/freezed_annotation.dart"; -part "report_request.freezed.dart"; -part "report_request.g.dart"; +part "report.freezed.dart"; +part "report.g.dart"; @freezed abstract class ReportRequest with _$ReportRequest { diff --git a/lib/models/requests/send_event_request.dart b/lib/models/requests/send_event.dart similarity index 88% rename from lib/models/requests/send_event_request.dart rename to lib/models/requests/send_event.dart index 3721998..196c0b5 100644 --- a/lib/models/requests/send_event_request.dart +++ b/lib/models/requests/send_event.dart @@ -1,7 +1,7 @@ import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/content/content.dart"; -part "send_event_request.freezed.dart"; -part "send_event_request.g.dart"; +part "send_event.freezed.dart"; +part "send_event.g.dart"; @freezed abstract class SendEventRequest with _$SendEventRequest { diff --git a/lib/models/requests/send_message_request.dart b/lib/models/requests/send_message.dart similarity index 94% rename from lib/models/requests/send_message_request.dart rename to lib/models/requests/send_message.dart index 883c585..628007f 100644 --- a/lib/models/requests/send_message_request.dart +++ b/lib/models/requests/send_message.dart @@ -1,8 +1,8 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/relation_type.dart"; -part "send_message_request.freezed.dart"; -part "send_message_request.g.dart"; +part "send_message.freezed.dart"; +part "send_message.g.dart"; @freezed abstract class SendMessageRequest with _$SendMessageRequest { diff --git a/lib/models/requests/set_membership_request.dart b/lib/models/requests/set_membership.dart similarity index 78% rename from lib/models/requests/set_membership_request.dart rename to lib/models/requests/set_membership.dart index dd0e1f2..4bbe8a3 100644 --- a/lib/models/requests/set_membership_request.dart +++ b/lib/models/requests/set_membership.dart @@ -1,7 +1,7 @@ import "package:freezed_annotation/freezed_annotation.dart"; -import "package:nexus/models/requests/membership_action.dart"; -part "set_membership_request.freezed.dart"; -part "set_membership_request.g.dart"; +import "package:nexus/models/membership_action.dart"; +part "set_membership.freezed.dart"; +part "set_membership.g.dart"; @freezed abstract class SetMembershipRequest with _$SetMembershipRequest { diff --git a/lib/models/requests/set_state_request.dart b/lib/models/requests/set_state.dart similarity index 89% rename from lib/models/requests/set_state_request.dart rename to lib/models/requests/set_state.dart index 6e426af..c92763d 100644 --- a/lib/models/requests/set_state_request.dart +++ b/lib/models/requests/set_state.dart @@ -1,8 +1,8 @@ import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/content/content.dart"; import "package:nexus/models/ms_duration.dart"; -part "set_state_request.freezed.dart"; -part "set_state_request.g.dart"; +part "set_state.freezed.dart"; +part "set_state.g.dart"; @freezed abstract class SetStateRequest with _$SetStateRequest { diff --git a/lib/pages/chat_page.dart b/lib/pages/chat.dart similarity index 89% rename from lib/pages/chat_page.dart rename to lib/pages/chat.dart index 2c0ef97..235aecc 100644 --- a/lib/pages/chat_page.dart +++ b/lib/pages/chat.dart @@ -1,8 +1,8 @@ import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/emoji_controller.dart"; -import "package:nexus/controllers/init_complete_controller.dart"; -import "package:nexus/controllers/key_controller.dart"; +import "package:nexus/controllers/emoji.dart"; +import "package:nexus/controllers/init_complete.dart"; +import "package:nexus/controllers/key.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/sidebar.dart"; import "package:nexus/widgets/room_chat.dart"; diff --git a/lib/pages/login_page.dart b/lib/pages/login.dart similarity index 97% rename from lib/pages/login_page.dart rename to lib/pages/login.dart index f7a3f1a..5e1e8e8 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login.dart @@ -1,7 +1,7 @@ import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/helpers/required_validator_helper.dart"; @@ -96,4 +96,4 @@ class LoginPage extends HookConsumerWidget { ), ); } -} \ No newline at end of file +} diff --git a/lib/pages/select_server_page.dart b/lib/pages/select_server.dart similarity index 98% rename from lib/pages/select_server_page.dart rename to lib/pages/select_server.dart index 63e369d..a05238f 100644 --- a/lib/pages/select_server_page.dart +++ b/lib/pages/select_server.dart @@ -2,10 +2,10 @@ import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:flutter_svg/flutter_svg.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client.dart"; import "package:nexus/helpers/launch_helper.dart"; import "package:nexus/models/homeserver.dart"; -import "package:nexus/pages/login_page.dart"; +import "package:nexus/pages/login.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/divider_text.dart"; diff --git a/lib/pages/settings_page.dart b/lib/pages/settings.dart similarity index 98% rename from lib/pages/settings_page.dart rename to lib/pages/settings.dart index dd8be10..7d90284 100644 --- a/lib/pages/settings_page.dart +++ b/lib/pages/settings.dart @@ -5,10 +5,10 @@ import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:m3e_card_list/m3e_card_list.dart"; import "package:navigation_rail_m3e/navigation_rail_m3e.dart"; -import "package:nexus/controllers/settings_sections_controller.dart"; +import "package:nexus/controllers/settings_sections.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/show_about_dialog.dart"; -import "package:nexus/pages/settings_category_page.dart"; +import "package:nexus/pages/settings_category.dart"; import "package:nexus/widgets/divider_text.dart"; import "package:nexus/widgets/highlight_wrapper.dart"; import "package:super_sliver_list/super_sliver_list.dart"; diff --git a/lib/pages/settings_category_page.dart b/lib/pages/settings_category.dart similarity index 97% rename from lib/pages/settings_category_page.dart rename to lib/pages/settings_category.dart index 04f1578..ab69558 100644 --- a/lib/pages/settings_category_page.dart +++ b/lib/pages/settings_category.dart @@ -4,7 +4,7 @@ import "package:collection/collection.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/settings_sections_controller.dart"; +import "package:nexus/controllers/settings_sections.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/widgets/highlight_wrapper.dart"; import "package:super_sliver_list/super_sliver_list.dart"; diff --git a/lib/pages/verify_page.dart b/lib/pages/verify.dart similarity index 97% rename from lib/pages/verify_page.dart rename to lib/pages/verify.dart index bf5c9f3..1b4f7ad 100644 --- a/lib/pages/verify_page.dart +++ b/lib/pages/verify.dart @@ -1,7 +1,7 @@ import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/helpers/required_validator_helper.dart"; diff --git a/lib/widgets/appbar.dart b/lib/widgets/appbar.dart index d13fbc8..9da03aa 100644 --- a/lib/widgets/appbar.dart +++ b/lib/widgets/appbar.dart @@ -2,7 +2,7 @@ import "dart:io"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/settings_controller.dart"; +import "package:nexus/controllers/settings.dart"; import "package:window_manager/window_manager.dart"; class Appbar extends ConsumerWidget implements PreferredSizeWidget { diff --git a/lib/widgets/avatar_or_hash.dart b/lib/widgets/avatar_or_hash.dart index 20f4eac..1cca8c6 100644 --- a/lib/widgets/avatar_or_hash.dart +++ b/lib/widgets/avatar_or_hash.dart @@ -2,8 +2,8 @@ import "package:color_hash/color_hash.dart"; import "package:cross_cache/cross_cache.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/cross_cache_controller.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/cross_cache.dart"; import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/mxc_to_https.dart"; diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart index d4c645d..ef91dbe 100644 --- a/lib/widgets/composer/composer.dart +++ b/lib/widgets/composer/composer.dart @@ -4,7 +4,7 @@ import "package:flutter/services.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:fluttertagger/fluttertagger.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/power_level_controller.dart"; +import "package:nexus/controllers/power_level.dart"; import "package:nexus/models/content/message.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/relation_type.dart"; diff --git a/lib/widgets/composer/mention_overlay.dart b/lib/widgets/composer/mention_overlay.dart index ea5dc6a..962ea84 100644 --- a/lib/widgets/composer/mention_overlay.dart +++ b/lib/widgets/composer/mention_overlay.dart @@ -1,8 +1,8 @@ import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/members_by_status_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/controllers/via_controller.dart"; +import "package:nexus/controllers/members_by_status.dart"; +import "package:nexus/controllers/rooms.dart"; +import "package:nexus/controllers/via.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/get_localpart.dart"; import "package:nexus/models/content/membership.dart"; diff --git a/lib/widgets/emoji_picker_button.dart b/lib/widgets/emoji_picker_button.dart index bbe1cdc..2ac906a 100644 --- a/lib/widgets/emoji_picker_button.dart +++ b/lib/widgets/emoji_picker_button.dart @@ -1,7 +1,7 @@ import "package:emoji_text_field/emoji_text_field.dart"; import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/emoji_controller.dart"; +import "package:nexus/controllers/emoji.dart"; class EmojiPickerButton extends HookConsumerWidget { final TextEditingController? controller; diff --git a/lib/widgets/expandable_image.dart b/lib/widgets/expandable_image.dart index fdfabff..4990458 100644 --- a/lib/widgets/expandable_image.dart +++ b/lib/widgets/expandable_image.dart @@ -2,7 +2,7 @@ import "package:cross_cache/cross_cache.dart"; import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:m3e_buttons/m3e_buttons.dart"; -import "package:nexus/controllers/cross_cache_controller.dart"; +import "package:nexus/controllers/cross_cache.dart"; import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/widgets/error_dialog.dart"; diff --git a/lib/widgets/html/html.dart b/lib/widgets/html/html.dart index 85ec9ae..4113eac 100644 --- a/lib/widgets/html/html.dart +++ b/lib/widgets/html/html.dart @@ -3,8 +3,8 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/cross_cache_controller.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/cross_cache.dart"; 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"; diff --git a/lib/widgets/html/mention_chip.dart b/lib/widgets/html/mention_chip.dart index 8e0ce11..f6105e3 100644 --- a/lib/widgets/html/mention_chip.dart +++ b/lib/widgets/html/mention_chip.dart @@ -1,6 +1,6 @@ import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/user_controller.dart"; +import "package:nexus/controllers/user.dart"; import "package:nexus/helpers/extensions/link_to_mention.dart"; import "package:nexus/helpers/extensions/show_user_popover.dart"; diff --git a/lib/widgets/join_dialog.dart b/lib/widgets/join_dialog.dart index d420dea..50b36f2 100644 --- a/lib/widgets/join_dialog.dart +++ b/lib/widgets/join_dialog.dart @@ -2,9 +2,9 @@ import "package:collection/collection.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/key_controller.dart"; -import "package:nexus/controllers/spaces_controller.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/key.dart"; +import "package:nexus/controllers/spaces.dart"; import "package:nexus/helpers/extensions/link_to_mention.dart"; class JoinDialog extends HookWidget { diff --git a/lib/widgets/lazy_loading/message_avatar.dart b/lib/widgets/lazy_loading/message_avatar.dart index b65e377..93c2554 100644 --- a/lib/widgets/lazy_loading/message_avatar.dart +++ b/lib/widgets/lazy_loading/message_avatar.dart @@ -1,6 +1,6 @@ import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/author_controller.dart"; +import "package:nexus/controllers/author.dart"; import "package:nexus/helpers/extensions/get_localpart.dart"; import "package:nexus/helpers/extensions/show_user_popover.dart"; import "package:nexus/models/event.dart"; diff --git a/lib/widgets/lazy_loading/message_displayname.dart b/lib/widgets/lazy_loading/message_displayname.dart index a817122..bd5733c 100644 --- a/lib/widgets/lazy_loading/message_displayname.dart +++ b/lib/widgets/lazy_loading/message_displayname.dart @@ -1,6 +1,6 @@ import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/author_controller.dart"; +import "package:nexus/controllers/author.dart"; import "package:nexus/helpers/extensions/get_localpart.dart"; import "package:nexus/helpers/extensions/show_user_popover.dart"; import "package:nexus/helpers/extensions/string_to_color.dart"; diff --git a/lib/widgets/member_list.dart b/lib/widgets/member_list.dart index 46c56a8..92bb179 100644 --- a/lib/widgets/member_list.dart +++ b/lib/widgets/member_list.dart @@ -4,8 +4,8 @@ import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:m3e_buttons/m3e_buttons.dart"; import "package:m3e_card_list/m3e_card_list.dart"; -import "package:nexus/controllers/members_by_status_controller.dart"; -import "package:nexus/controllers/members_grouped_controller.dart"; +import "package:nexus/controllers/members_by_status.dart"; +import "package:nexus/controllers/members_grouped.dart"; import "package:nexus/helpers/extensions/get_localpart.dart"; import "package:nexus/helpers/extensions/string_to_color.dart"; import "package:nexus/models/content/membership.dart"; diff --git a/lib/widgets/message_image.dart b/lib/widgets/message_image.dart index 654ac27..9a4caaf 100644 --- a/lib/widgets/message_image.dart +++ b/lib/widgets/message_image.dart @@ -2,7 +2,7 @@ import "package:cross_cache/cross_cache.dart"; import "package:flutter/material.dart"; import "package:flutter_blurhash/flutter_blurhash.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/cross_cache_controller.dart"; +import "package:nexus/controllers/cross_cache.dart"; import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/models/info/image.dart" as i; import "package:nexus/widgets/expandable_image.dart"; diff --git a/lib/widgets/pinned_events_drawer.dart b/lib/widgets/pinned_events_drawer.dart index c8f7565..7cb9fe3 100644 --- a/lib/widgets/pinned_events_drawer.dart +++ b/lib/widgets/pinned_events_drawer.dart @@ -1,7 +1,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/pinned_events_controller.dart"; +import "package:nexus/controllers/pinned_events.dart"; import "package:nexus/models/event.dart"; import "package:nexus/widgets/error_dialog.dart"; import "package:nexus/widgets/loading.dart"; diff --git a/lib/widgets/reaction_row.dart b/lib/widgets/reaction_row.dart index 3a73baa..2035b59 100644 --- a/lib/widgets/reaction_row.dart +++ b/lib/widgets/reaction_row.dart @@ -2,10 +2,10 @@ import "package:cross_cache/cross_cache.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/cross_cache_controller.dart"; -import "package:nexus/controllers/reactions_controller.dart"; -import "package:nexus/controllers/room_chat_controller.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/cross_cache.dart"; +import "package:nexus/controllers/reactions.dart"; +import "package:nexus/controllers/room_chat.dart"; import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/mxc_to_https.dart"; import "package:nexus/models/event.dart"; diff --git a/lib/widgets/renderers/message.dart b/lib/widgets/renderers/message.dart index 9ebd09b..b731cd0 100644 --- a/lib/widgets/renderers/message.dart +++ b/lib/widgets/renderers/message.dart @@ -2,8 +2,8 @@ import "package:collection/collection.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:linkify/linkify.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/event_controller.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/event.dart"; import "package:nexus/helpers/extensions/mxc_to_https.dart"; import "package:nexus/models/content/encrypted.dart"; import "package:nexus/models/content/message.dart"; diff --git a/lib/widgets/room_appbar.dart b/lib/widgets/room_appbar.dart index ed7b20c..4598881 100644 --- a/lib/widgets/room_appbar.dart +++ b/lib/widgets/room_appbar.dart @@ -1,11 +1,11 @@ import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/controllers/rooms.dart"; import "package:nexus/helpers/extensions/mxc_to_https.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/expandable_image.dart"; -import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/client_state.dart"; import "package:nexus/widgets/linkified_text.dart"; import "package:nexus/widgets/room_menu.dart"; diff --git a/lib/widgets/room_chat.dart b/lib/widgets/room_chat.dart index 7c6facf..0fdd7c7 100644 --- a/lib/widgets/room_chat.dart +++ b/lib/widgets/room_chat.dart @@ -4,14 +4,14 @@ import "package:flutter/services.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:measure_size/measure_size.dart"; -import "package:nexus/controllers/account_data_controller.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/pinned_ids_controller.dart"; -import "package:nexus/controllers/power_level_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/controllers/room_chat_controller.dart"; -import "package:nexus/controllers/via_controller.dart"; +import "package:nexus/controllers/account_data.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/pinned_ids.dart"; +import "package:nexus/controllers/power_level.dart"; +import "package:nexus/controllers/rooms.dart"; +import "package:nexus/controllers/room_chat.dart"; +import "package:nexus/controllers/via.dart"; import "package:nexus/models/content/message.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/relation_type.dart"; diff --git a/lib/widgets/room_menu.dart b/lib/widgets/room_menu.dart index f4313fa..95936df 100644 --- a/lib/widgets/room_menu.dart +++ b/lib/widgets/room_menu.dart @@ -2,8 +2,8 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter/services.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/via_controller.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/via.dart"; import "package:nexus/models/room.dart"; class RoomMenu extends ConsumerWidget { diff --git a/lib/widgets/sidebar.dart b/lib/widgets/sidebar.dart index f382b97..1bd6cf5 100644 --- a/lib/widgets/sidebar.dart +++ b/lib/widgets/sidebar.dart @@ -3,10 +3,10 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:navigation_rail_m3e/navigation_rail_m3e.dart"; -import "package:nexus/controllers/key_controller.dart"; -import "package:nexus/controllers/spaces_controller.dart"; +import "package:nexus/controllers/key.dart"; +import "package:nexus/controllers/spaces.dart"; import "package:nexus/models/room.dart"; -import "package:nexus/pages/settings_page.dart"; +import "package:nexus/pages/settings.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/divider_widget.dart"; import "package:nexus/widgets/join_dialog.dart"; diff --git a/lib/widgets/url_preview.dart b/lib/widgets/url_preview.dart index 669c756..19fe06b 100644 --- a/lib/widgets/url_preview.dart +++ b/lib/widgets/url_preview.dart @@ -1,8 +1,8 @@ import "package:cross_cache/cross_cache.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/cross_cache_controller.dart"; -import "package:nexus/controllers/url_preview_controller.dart"; +import "package:nexus/controllers/cross_cache.dart"; +import "package:nexus/controllers/url_preview.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/launch_helper.dart"; diff --git a/lib/widgets/user_bottom_sheet.dart b/lib/widgets/user_bottom_sheet.dart index d422e01..55e2502 100644 --- a/lib/widgets/user_bottom_sheet.dart +++ b/lib/widgets/user_bottom_sheet.dart @@ -4,15 +4,15 @@ import "package:flutter_hooks/flutter_hooks.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:intl/intl.dart"; import "package:m3e_buttons/m3e_buttons.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/controllers/client_state_controller.dart"; -import "package:nexus/controllers/power_level_controller.dart"; -import "package:nexus/controllers/profile_controller.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/power_level.dart"; +import "package:nexus/controllers/profile.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/get_localpart.dart"; import "package:nexus/helpers/extensions/mxc_to_https.dart"; import "package:nexus/models/content/membership.dart"; -import "package:nexus/models/requests/membership_action.dart"; +import "package:nexus/models/membership_action.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/main.dart"; import "package:nexus/widgets/expandable_image.dart";