Nexus/nexus
Nexus/nexus
3
2
Fork 4
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Refactor dialog stuff

Browse source
This commit is contained in:
Henry Hiles 2026-04-04 18:26:19 -04:00
commit a8383951ba
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
6 changed files with 83 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/widgets/chat_page/html/mention_chip.dart
View file

@ -10,11 +10,9 @@ class MentionChip extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final mention = label.mention;
final membership =
mention?.startsWith("@") == true || label.startsWith("@") == true
final membership = label.mention.startsWith("@") == true
? ref
.watch(UserController.provider(mention ?? label))
.watch(UserController.provider(label.mention))
.whenOrNull(data: (data) => data)
: null;
@ -31,8 +29,7 @@ class MentionChip extends ConsumerWidget {
child: Chip(
label: Text(
(membership == null ? null : "@${membership.displayName}") ??
mention ??
label,
label.mention,
style: TextStyle(
fontWeight: FontWeight.bold,
color: Theme.of(context).colorScheme.onPrimary,

46
lib/widgets/chat_page/join_dialog.dart Normal file
View file

@ -0,0 +1,46 @@
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/helpers/extensions/join_room_with_snackbars.dart";
import "package:nexus/widgets/form_text_input.dart";
class JoinDialog extends HookConsumerWidget {
const JoinDialog({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final roomAlias = useTextEditingController();
return AlertDialog(
title: Text("Join a Room"),
content: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Enter the room alias, ID, or a Matrix.to link."),
SizedBox(height: 12),
FormTextInput(
required: false,
capitalize: true,
controller: roomAlias,
title: "#room:server",
),
],
),
actions: [
TextButton(onPressed: Navigator.of(context).pop, child: Text("Cancel")),
TextButton(
onPressed: () async {
Navigator.of(context).pop();
final client = ref.watch(ClientController.provider.notifier);
if (context.mounted) {
client.joinRoomWithSnackBars(context, roomAlias.text, ref);
}
},
child: Text("Join"),
),
],
);
}
}

53
lib/widgets/chat_page/sidebar.dart
View file

@ -1,14 +1,11 @@
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/selected_space_controller.dart";
import "package:nexus/controllers/spaces_controller.dart";
import "package:nexus/helpers/extensions/join_room_with_snackbars.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/form_text_input.dart";
class Sidebar extends HookConsumerWidget {
final bool isDesktop;
@ -91,53 +88,7 @@ class Sidebar extends HookConsumerWidget {
PopupMenuItem(
onTap: () => showDialog(
context: context,
builder: (alertContext) => HookBuilder(
builder: (_) {
final roomAlias = useTextEditingController();
return AlertDialog(
title: Text("Join a Room"),
content: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"Enter the room alias, ID, or a Matrix.to link.",
),
SizedBox(height: 12),
FormTextInput(
required: false,
capitalize: true,
controller: roomAlias,
title: "#room:server",
),
],
),
actions: [
TextButton(
onPressed: Navigator.of(context).pop,
child: Text("Cancel"),
),
TextButton(
onPressed: () async {
Navigator.of(alertContext).pop();
final client = ref.watch(
ClientController.provider.notifier,
);
if (context.mounted) {
client.joinRoomWithSnackBars(
context,
roomAlias.text,
ref,
);
}
},
child: Text("Join"),
),
],
);
},
),
builder: (_) => JoinDialog(),
),
child: ListTile(
title: Text("Join an existing room (or space)"),