Nexus/nexus
Nexus/nexus
Watch
3
6
Fork
You've already forked nexus
 8
Code Issues 22 Pull requests Releases 8 Activity

extract adaptive sheets into their own library material_adaptive_sheets

Browse source
This commit is contained in:
Henry Hiles 2026-11-03 14:53:53 -05:00
commit b4d5a632dd
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
59 changed files with 59 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/controllers/room_settings_sections.dart
View file

@ -2,6 +2,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter_hooks/flutter_hooks.dart";
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/client.dart";
import "package:nexus/controllers/client_state.dart";
import "package:nexus/controllers/local_aliases.dart";
@ -11,7 +12,6 @@ import "package:nexus/controllers/room_image_packs.dart";
import "package:nexus/controllers/room_power_levels.dart";
import "package:nexus/controllers/rooms.dart";
import "package:nexus/controllers/space_edges.dart";
import "package:nexus/helpers/extensions/show_adaptive_sheet.dart";
import "package:nexus/helpers/extensions/join_rule_name.dart";
import "package:nexus/helpers/file_dialog_helper.dart";
import "package:nexus/helpers/hooks/saving.dart";

2
lib/controllers/settings_sections.dart
View file

@ -7,6 +7,7 @@ import "package:material_ui/material_ui.dart";
import "package:intl/intl.dart";
import "package:m3e_buttons/m3e_buttons.dart";
import "package:multi_state_switch/multi_state_switch.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/account_data.dart";
import "package:nexus/controllers/client.dart";
import "package:nexus/controllers/client_state.dart";
@ -43,7 +44,6 @@ import "package:nexus/widgets/settings/enable_image_packs_sheet.dart";
import "package:nexus/widgets/settings/keyword_field.dart";
import "package:nexus/widgets/user_bottom_sheet.dart";
import "package:nexus/widgets/reset_encryption_sheet.dart";
import "package:nexus/helpers/extensions/show_adaptive_sheet.dart";
class SettingsSectionsController
extends AsyncNotifier<IMap<String, IList<SettingsCategory>>> {

4
lib/helpers/extensions/build_event_options.dart
View file

@ -1,9 +1,9 @@
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:material_ui/material_ui.dart";
import "package:nexus/widgets/sheet_layout.dart";
import "package:flutter/services.dart";
import "package:flutter_hooks/flutter_hooks.dart";
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/client.dart";
import "package:nexus/controllers/pinned_ids.dart";
import "package:nexus/controllers/power_level.dart";
@ -12,8 +12,6 @@ import "package:nexus/controllers/rooms.dart";
import "package:nexus/controllers/room_chat.dart";
import "package:nexus/controllers/via.dart";
import "package:nexus/helpers/extensions/event_id_is_fake.dart";
import "package:nexus/helpers/extensions/is_desktop.dart";
import "package:nexus/helpers/extensions/show_adaptive_sheet.dart";
import "package:nexus/models/content/message.dart";
import "package:nexus/models/event.dart";
import "package:nexus/models/relation_type.dart";

23
lib/helpers/extensions/global_rect.dart
View file

@ -1,23 +0,0 @@
import "package:material_ui/material_ui.dart";
extension GlobalRect on BuildContext {
/// Where the widget this context belongs to is on screen, e.g. to open a
/// menu or popover next to it.
Rect get globalRect {
final overlay = Overlay.of(this).context.findRenderObject() as RenderBox;
return switch (findRenderObject()) {
final RenderBox box =>
box.localToGlobal(.zero, ancestor: overlay) & box.size,
_ => Rect.zero,
};
}
/// [position] on screen as an empty rect, like where text was tapped, to
/// open a popover there.
Rect globalRectAt(Offset position) {
final overlay = Overlay.of(this).context.findRenderObject() as RenderBox;
return overlay.globalToLocal(position) & .zero;
}
}

7
lib/helpers/extensions/is_desktop.dart
View file

@ -1,7 +0,0 @@
import "package:material_ui/material_ui.dart";
extension IsDesktop on BuildContext {
/// Whether the window is wide enough for the desktop layout, with the
/// sidebar always visible, menus instead of bottom sheets, etc.
bool get isDesktop => MediaQuery.sizeOf(this).width > 650;
}

2
lib/helpers/extensions/open_link_info.dart
View file

@ -1,10 +1,10 @@
import "package:material_ui/material_ui.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/event.dart";
import "package:nexus/controllers/room_summary.dart";
import "package:nexus/helpers/extensions/focus_room.dart";
import "package:nexus/helpers/extensions/get_link_info.dart";
import "package:nexus/helpers/extensions/show_adaptive_sheet.dart";
import "package:nexus/helpers/extensions/show_user_popover.dart";
import "package:nexus/models/room_summary.dart";
import "package:nexus/widgets/room_summary_sheet.dart";

3
lib/helpers/extensions/show_about_sheet.dart
View file

@ -1,9 +1,8 @@
import "package:material_ui/material_ui.dart";
import "package:nexus/helpers/extensions/show_adaptive_sheet.dart";
import "package:nexus/widgets/sheet_layout.dart";
import "package:flutter_svg/flutter_svg.dart";
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:m3e_card_list/m3e_card_list.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/helpers/launch_helper.dart";
import "package:package_info_plus/package_info_plus.dart";

52
lib/helpers/extensions/show_adaptive_menu.dart
View file

@ -1,52 +0,0 @@
import "package:material_ui/material_ui.dart";
import "package:nexus/helpers/extensions/global_rect.dart";
import "package:nexus/helpers/extensions/is_desktop.dart";
extension ShowAdaptiveMenu on BuildContext {
/// Shows [items] in a popup menu on desktop, or a bottom sheet on mobile.
///
/// On desktop, the menu opens at [globalPosition] if given (e.g. where the
/// user right clicked), or over the widget this context belongs to.
Future<void> showAdaptiveMenu(
List<PopupMenuEntry> items, {
Offset? globalPosition,
}) async {
if (!isDesktop) {
await showModalBottomSheet(
context: this,
isScrollControlled: true,
showDragHandle: true,
builder: (context) => SafeArea(
child: SingleChildScrollView(
padding: const .only(bottom: 8),
// PopupMenuItems must be inside something with the menu role
child: Semantics(
role: .menu,
explicitChildNodes: true,
child: ListTileTheme.merge(
contentPadding: const .symmetric(horizontal: 24),
minTileHeight: 48,
titleTextStyle: Theme.of(context).textTheme.titleMedium,
child: Column(mainAxisSize: .min, children: items),
),
),
),
),
);
return;
}
final overlay = Overlay.of(this).context.findRenderObject() as RenderBox;
final anchor = switch (globalPosition) {
final position? => position & Size.zero,
null => globalRect,
};
await showMenu(
context: this,
constraints: .loose(.infinite),
position: .fromRect(anchor, Offset.zero & overlay.size),
items: items,
);
}
}

35
lib/helpers/extensions/show_adaptive_popover.dart
View file

@ -1,35 +0,0 @@
import "package:material_ui/material_ui.dart";
import "package:nexus/helpers/extensions/global_rect.dart";
import "package:nexus/helpers/extensions/is_desktop.dart";
import "package:nexus/helpers/extensions/show_adaptive_sheet.dart";
import "package:nexus/widgets/popover_layout.dart";
extension ShowAdaptivePopover on BuildContext {
/// Shows the widget from [builder] in a popover next to [anchor], or the
/// widget this context belongs to, on desktop, or a bottom sheet on mobile.
/// Use the context passed to [builder] to close it.
Future<void> showAdaptivePopover(WidgetBuilder builder, {Rect? anchor}) {
if (!isDesktop) return showAdaptiveSheet(builder);
final rect = anchor ?? globalRect;
return showDialog(
context: this,
barrierColor: Colors.transparent,
useSafeArea: false,
builder: (context) => CustomSingleChildLayout(
delegate: PopoverLayout(rect),
child: ConstrainedBox(
constraints: const .new(maxWidth: 420, maxHeight: 600),
child: Material(
elevation: 8,
clipBehavior: .antiAlias,
color: Theme.of(context).colorScheme.surfaceContainer,
borderRadius: .circular(16),
child: Builder(builder: builder),
),
),
),
);
}
}

28
lib/helpers/extensions/show_adaptive_sheet.dart
View file

@ -1,28 +0,0 @@
import "package:material_ui/material_ui.dart";
import "package:nexus/helpers/extensions/is_desktop.dart";
extension ShowAdaptiveSheet on BuildContext {
/// Shows the widget from [builder] in a dialog on desktop, or a bottom sheet
/// on mobile. Use the context passed to [builder] to close it.
Future<T?> showAdaptiveSheet<T>(
WidgetBuilder builder, {
bool enableDrag = true,
}) => isDesktop
? showDialog<T>(
context: this,
builder: (context) => Dialog(
clipBehavior: .antiAlias,
child: ConstrainedBox(
constraints: const .new(maxWidth: 450, maxHeight: 600),
child: Builder(builder: builder),
),
),
)
: showModalBottomSheet<T>(
context: this,
isScrollControlled: true,
enableDrag: enableDrag,
constraints: .new(maxHeight: MediaQuery.sizeOf(this).height - 80),
builder: (context) => SafeArea(child: builder(context)),
);
}

3
lib/helpers/extensions/show_leave_room_sheet.dart
View file

@ -1,9 +1,8 @@
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/client.dart";
import "package:nexus/helpers/extensions/show_adaptive_sheet.dart";
import "package:nexus/helpers/extensions/with_progress_snackbar.dart";
import "package:nexus/widgets/sheet_layout.dart";
extension ShowLeaveRoomSheet on BuildContext {
/// Asks the user to confirm leaving the room, then leaves it.

2
lib/helpers/extensions/show_user_popover.dart
View file

@ -1,5 +1,5 @@
import "package:material_ui/material_ui.dart";
import "package:nexus/helpers/extensions/show_adaptive_popover.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/widgets/user_bottom_sheet.dart";
extension ShowUserPopover on BuildContext {

4
lib/widgets/account_switcher.dart
View file

@ -1,12 +1,12 @@
import "package:collection/collection.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/accounts.dart";
import "package:nexus/controllers/active_account.dart";
import "package:nexus/helpers/extensions/log_out.dart";
import "package:nexus/main.dart";
import "package:nexus/models/account.dart";
import "package:nexus/widgets/adaptive_menu_button.dart";
import "package:nexus/widgets/avatar_or_hash.dart";
/// Switches between, adds and logs out of accounts. With [onlyWithOthers], it's
@ -45,7 +45,7 @@ class const AccountSwitcher({final bool onlyWithOthers = false, super.key})
final loggingOut = ref.watch(LogOut.mutation).isPending;
return AdaptiveMenuButton(
return AdaptiveMenuButton<void>(
tooltip: loggingOut ? "Logging out..." : "Switch account",
enabled: !loggingOut,
icon: loggingOut

21
lib/widgets/adaptive_menu_button.dart
View file

@ -1,21 +0,0 @@
import "package:material_ui/material_ui.dart";
import "package:nexus/helpers/extensions/show_adaptive_menu.dart";
/// Like [PopupMenuButton], but shows a bottom sheet on mobile.
class const AdaptiveMenuButton({
required final Widget icon,
required final List<PopupMenuEntry> Function(BuildContext context)
itemBuilder,
final String? tooltip,
final bool enabled = true,
super.key,
}) extends StatelessWidget {
@override
Widget build(BuildContext context) => IconButton(
icon: icon,
tooltip: tooltip,
onPressed: enabled
? () => context.showAdaptiveMenu(itemBuilder(context))
: null,
);
}

2
lib/widgets/add_space_rooms_sheet.dart
View file

@ -3,6 +3,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter_hooks/flutter_hooks.dart";
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/client.dart";
import "package:nexus/controllers/client_state.dart";
import "package:nexus/controllers/rooms.dart";
@ -15,7 +16,6 @@ import "package:nexus/models/content/content.dart";
import "package:nexus/models/content/space_child.dart";
import "package:nexus/widgets/avatar_or_hash.dart";
import "package:nexus/widgets/settings/search_chooser.dart";
import "package:nexus/widgets/sheet_layout.dart";
/// Chooses rooms to add to the space [spaceId], then adds them.
class const AddSpaceRoomsSheet(

3
lib/widgets/composer/composer.dart
View file

@ -2,6 +2,7 @@ import "dart:io";
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:collection/collection.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/bot_argument_suggestions.dart";
import "package:nexus/controllers/bot_command_draft.dart";
import "package:nexus/controllers/bot_commands.dart";
@ -14,8 +15,6 @@ import "package:nexus/widgets/composer/bot_command_panel.dart";
import "package:nexus/widgets/emoji_picker.dart";
import "package:nexus/helpers/extensions/get_filename.dart";
import "package:nexus/helpers/extensions/is_media.dart";
import "package:nexus/helpers/extensions/show_adaptive_sheet.dart";
import "package:nexus/widgets/adaptive_menu_button.dart";
import "package:material_ui/material_ui.dart";
import "package:flutter/services.dart";
import "package:flutter_hooks/flutter_hooks.dart";

2
lib/widgets/create_poll_sheet.dart
View file

@ -2,8 +2,8 @@ import "package:collection/collection.dart";
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter_hooks/flutter_hooks.dart";
import "package:material_ui/material_ui.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/models/content/poll_start.dart";
import "package:nexus/widgets/sheet_layout.dart";
class const CreatePollSheet({
required final void Function(PollStart poll) onCreate,

2
lib/widgets/create_room_sheet.dart
View file

@ -1,10 +1,10 @@
import "package:flutter_hooks/flutter_hooks.dart";
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/client_state.dart";
import "package:nexus/helpers/extensions/create_room.dart";
import "package:nexus/helpers/extensions/get_localpart.dart";
import "package:nexus/widgets/sheet_layout.dart";
class const CreateRoomSheet({super.key}) extends HookConsumerWidget {
@override

2
lib/widgets/editable_avatar.dart
View file

@ -1,7 +1,7 @@
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/client.dart";
import "package:nexus/helpers/extensions/show_adaptive_menu.dart";
import "package:nexus/helpers/file_dialog_helper.dart";
import "package:nexus/helpers/hooks/saving.dart";
import "package:nexus/main.dart";

3
lib/widgets/invites_list.dart
View file

@ -1,7 +1,6 @@
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:nexus/helpers/extensions/show_adaptive_sheet.dart";
import "package:nexus/widgets/sheet_layout.dart";
import "package:material_adaptive_sheets/material_adaptive_sheets.dart";
import "package:nexus/controllers/invites.dart";
import "package:nexus/helpers/extensions/get_localpart.dart";
import "package:nexus/main.dart";

Some files were not shown because too many files have changed in this diff Show more