electria/nexus
Watch
1
0
Fork
You've already forked nexus
 0
forked from Nexus/nexus
Code Pull requests Activity

refactor overlay system

Browse source
This commit is contained in:
Henry Hiles 2026-09-16 16:27:10 -04:00
commit dca0b7dd7d
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
5 changed files with 166 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ 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";
import "package:nexus/widgets/composer/mention_overlay.dart";
import "package:nexus/widgets/composer/overlays/tagger_overlay.dart";
import "package:nexus/widgets/composer/relation_preview.dart";
import "package:nexus/main.dart";
@ -195,7 +195,7 @@ class const Composer(
Expanded(
child: FlutterTagger(
triggerStrategy: .eager,
overlay: MentionOverlay(
overlay: TaggerOverlay(
roomId,
query: query.value,
triggerCharacter: triggerCharacter.value,
@ -212,6 +212,7 @@ class const Composer(
triggerCharacterAndStyles: {
"@": style,
"#": style,
":": style,
},
builder: (context, key) => Focus(
onKeyEvent: (_, event) {

153
lib/widgets/composer/mention_overlay.dart
View file

@ -1,153 +0,0 @@
import "package:material_ui/material_ui.dart";
import "package:hooks_riverpod/hooks_riverpod.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";
import "package:nexus/widgets/avatar_or_hash.dart";
import "package:nexus/widgets/loading.dart";
class const MentionOverlay(
final String roomId, {
required final String query,
required final void Function({required String id, required String name})
addTag,
required final String? triggerCharacter,
super.key,
}) extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final rooms = ref.watch(RoomsController.provider);
return Padding(
padding: .all(8),
child: ClipRRect(
borderRadius: .all(.circular(12)),
child: Container(
color: Theme.of(context).colorScheme.surfaceContainerHigh,
padding: .all(8),
child: switch (triggerCharacter) {
"@" =>
ref
.watch(
MembersByStatusController.provider(
.new(roomId: roomId, status: .join),
),
)
.betterWhen(
data: (members) => ListView(
children:
(query.isEmpty
? members
: members.where(
(member) =>
member.stateKey
?.toLowerCase()
.contains(
query.toLowerCase(),
) ==
true ||
switch (member.content) {
MembershipContent(
:final displayName,
) =>
displayName
?.toLowerCase()
.contains(
query.toLowerCase(),
) ==
true,
_ => false,
},
))
.map(
(member) => switch (member.content) {
MembershipContent(
:final displayName,
:final avatarUrl,
) =>
Material(
color: Colors.transparent,
child: ListTile(
leading: AvatarOrHash(
avatarUrl,
displayName ??
member.stateKey!.localpart,
),
title: Text(
displayName ??
member.stateKey!.localpart,
),
subtitle: Text(member.stateKey!),
onTap: () => addTag(
id: "[@$displayName](matrix:u/${member.stateKey!.substring(1)})",
name: member.stateKey!.localpart,
),
),
),
_ => SizedBox.shrink(),
},
)
.toList(),
),
),
"#" => ListView(
children:
(query.isEmpty
? rooms.values
: rooms.values.where(
(room) =>
(room.metadata?.name ??
room.metadata?.id ??
"")
.toLowerCase()
.contains(query.toLowerCase()),
))
.map((room) {
final name =
room.metadata?.name ??
room.metadata?.canonicalAlias ??
room.metadata?.id ??
"Unknown Room";
return Material(
color: Colors.transparent,
child: ListTile(
leading: AvatarOrHash(
room.metadata?.avatar,
name,
fallback: Icon(Icons.numbers),
),
title: Text(name),
subtitle: room.metadata?.topic == null
? null
: Text(room.metadata!.topic!, maxLines: 1),
onTap: () {
final vias = ref.watch(
ViaController.provider(room),
);
addTag(
id: "[#$name](matrix:roomid/${room.metadata?.id.substring(1)}$vias)",
name:
(room.metadata?.canonicalAlias ??
room.metadata?.id)
?.substring(1)
.split(":")
.first ??
"",
);
},
),
);
})
.toList(),
),
_ => Loading(),
},
),
),
);
}
}

62
lib/widgets/composer/overlays/room_overlay.dart Normal file
View file

@ -0,0 +1,62 @@
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:nexus/controllers/rooms.dart";
import "package:nexus/controllers/via.dart";
import "package:nexus/widgets/avatar_or_hash.dart";
class const RoomOverlay(
final String roomId, {
required final String query,
required final void Function({required String id, required String name})
addTag,
super.key,
}) extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final rooms = ref.watch(RoomsController.provider);
return ListView(
children:
(query.isEmpty
? rooms.values
: rooms.values.where(
(room) => (room.metadata?.name ?? room.metadata?.id ?? "")
.toLowerCase()
.contains(query.toLowerCase()),
))
.map((room) {
final name =
room.metadata?.name ??
room.metadata?.canonicalAlias ??
room.metadata?.id ??
"Unknown Room";
return Material(
color: Colors.transparent,
child: ListTile(
leading: AvatarOrHash(
room.metadata?.avatar,
name,
fallback: Icon(Icons.numbers),
),
title: Text(name),
subtitle: room.metadata?.topic == null
? null
: Text(room.metadata!.topic!, maxLines: 1),
onTap: () {
final vias = ref.watch(ViaController.provider(room));
addTag(
id: "[#$name](matrix:roomid/${room.metadata?.id.substring(1)}$vias)",
name:
(room.metadata?.canonicalAlias ?? room.metadata?.id)
?.substring(1)
.split(":")
.first ??
"",
);
},
),
);
})
.toList(),
);
}
}

34
lib/widgets/composer/overlays/tagger_overlay.dart Normal file
View file

@ -0,0 +1,34 @@
import "package:material_ui/material_ui.dart";
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:nexus/widgets/composer/overlays/room_overlay.dart";
import "package:nexus/widgets/composer/overlays/user_overlay.dart";
import "package:nexus/widgets/loading.dart";
class const TaggerOverlay(
final String roomId, {
required final String query,
required final void Function({required String id, required String name})
addTag,
required final String? triggerCharacter,
super.key,
}) extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
return Padding(
padding: .all(8),
child: ClipRRect(
borderRadius: .all(.circular(12)),
child: Container(
color: Theme.of(context).colorScheme.surfaceContainerHigh,
padding: .all(8),
child: switch (triggerCharacter) {
"@" => UserOverlay(roomId, query: query, addTag: addTag),
"#" => RoomOverlay(roomId, query: query, addTag: addTag),
_ => Loading(),
},
),
),
);
}
}

67
lib/widgets/composer/overlays/user_overlay.dart Normal file
View file

@ -0,0 +1,67 @@
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:nexus/controllers/members_by_status.dart";
import "package:nexus/helpers/extensions/better_when.dart";
import "package:nexus/helpers/extensions/get_localpart.dart";
import "package:nexus/models/content/membership.dart";
import "package:nexus/widgets/avatar_or_hash.dart";
class const UserOverlay(
final String roomId, {
required final String query,
required final void Function({required String id, required String name})
addTag,
super.key,
}) extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) => ref
.watch(
MembersByStatusController.provider(.new(roomId: roomId, status: .join)),
)
.betterWhen(
data: (members) => ListView(
children:
(query.isEmpty
? members
: members.where(
(member) =>
member.stateKey?.toLowerCase().contains(
query.toLowerCase(),
) ==
true ||
switch (member.content) {
MembershipContent(:final displayName) =>
displayName?.toLowerCase().contains(
query.toLowerCase(),
) ==
true,
_ => false,
},
))
.map(
(member) => switch (member.content) {
MembershipContent(:final displayName, :final avatarUrl) =>
Material(
color: Colors.transparent,
child: ListTile(
leading: AvatarOrHash(
avatarUrl,
displayName ?? member.stateKey!.localpart,
),
title: Text(
displayName ?? member.stateKey!.localpart,
),
subtitle: Text(member.stateKey!),
onTap: () => addTag(
id: "[@$displayName](matrix:u/${member.stateKey!.substring(1)})",
name: member.stateKey!.localpart,
),
),
),
_ => SizedBox.shrink(),
},
)
.toList(),
),
);
}