Henry-Hiles/nexus
2
2
Fork 2
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

wip mention overlay

Browse source
This commit is contained in:
Henry Hiles 2026-01-30 09:21:41 +01:00
commit 07b492d0f4
No known key found for this signature in database
2 changed files with 112 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/widgets/chat_page/chat_box.dart
View file

@ -8,6 +8,7 @@ import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:nexus/controllers/room_chat_controller.dart";
import "package:nexus/models/relation_type.dart";
import "package:nexus/models/room.dart";
import "package:nexus/widgets/chat_page/mention_overlay.dart";
import "package:nexus/widgets/chat_page/relation_preview.dart";
class ChatBox extends HookConsumerWidget {
@ -108,16 +109,15 @@ class ChatBox extends HookConsumerWidget {
Expanded(
child: FlutterTagger(
triggerStrategy: TriggerStrategy.eager,
overlay: SizedBox.shrink(),
// MentionOverlay( TODO: Fix
// room,
// query: query.value,
// triggerCharacter: triggerCharacter.value,
// addTag: ({required id, required name}) {
// controller.value.addTag(id: id, name: name);
// node.requestFocus();
// },
// ),
overlay: MentionOverlay(
room,
query: query.value,
triggerCharacter: triggerCharacter.value,
addTag: ({required id, required name}) {
controller.value.addTag(id: id, name: name);
node.requestFocus();
},
),
controller: controller.value,
onSearch: (newQuery, newTriggerCharacter) {
triggerCharacter.value = newTriggerCharacter;

95
lib/widgets/chat_page/mention_overlay.dart
View file

@ -1,12 +1,9 @@
import "package:flutter/material.dart";
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:matrix/matrix.dart";
import "package:nexus/controllers/avatar_controller.dart";
import "package:nexus/controllers/members_controller.dart";
import "package:nexus/controllers/rooms_controller.dart";
import "package:nexus/helpers/extensions/better_when.dart";
import "package:nexus/helpers/extensions/get_headers.dart";
import "package:nexus/widgets/avatar_or_hash.dart";
import "package:nexus/models/room.dart";
import "package:nexus/widgets/loading.dart";
class MentionOverlay extends ConsumerWidget {
@ -23,7 +20,10 @@ class MentionOverlay extends ConsumerWidget {
});
@override
Widget build(BuildContext context, WidgetRef ref) => Padding(
Widget build(BuildContext context, WidgetRef ref) {
final rooms = ref.watch(RoomsController.provider);
return Padding(
padding: EdgeInsets.all(8),
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(12)),
@ -41,9 +41,9 @@ class MentionOverlay extends ConsumerWidget {
? members
: members.where(
(member) =>
member.senderId.toLowerCase().contains(
query.toLowerCase(),
) ||
member.authorId
.toLowerCase()
.contains(query.toLowerCase()) ||
(member.content["displayname"]
as String?)
?.toLowerCase()
@ -54,25 +54,25 @@ class MentionOverlay extends ConsumerWidget {
))
.map(
(member) => ListTile(
leading: AvatarOrHash(
ref
.watch(
AvatarController.provider(
member.content["avatar_url"]
.toString(),
),
)
.whenOrNull(data: (data) => data),
member.content["displayname"].toString(),
headers: room.client.headers,
),
// leading: AvatarOrHash( TODO: Images
// ref
// .watch(
// AvatarController.provider(
// member.content["avatar_url"]
// .toString(),
// ),
// )
// .whenOrNull(data: (data) => data),
// member.content["displayname"].toString(),
// headers: room.client.headers,
// ),
title: Text(
member.content["displayname"] as String? ??
member.senderId,
member.authorId,
),
onTap: () => addTag(
id: member.senderId,
name: member.senderId
id: member.authorId,
name: member.authorId
.substring(1)
.split(":")
.first,
@ -82,49 +82,46 @@ class MentionOverlay extends ConsumerWidget {
.toList(),
),
),
"#" =>
ref
.watch(RoomsController.provider)
.betterWhen(
data: (rooms) => ListView(
"#" => ListView(
children:
(query.isEmpty
? rooms
: rooms.where(
(room) => room.title.toLowerCase().contains(
query.toLowerCase(),
),
? rooms.values
: rooms.values.where(
(room) => (room.metadata?.name ?? "Unnamed Room")
.toLowerCase()
.contains(query.toLowerCase()),
))
.map(
(room) => ListTile(
leading: AvatarOrHash(
room.avatar,
room.title,
fallback: Icon(Icons.numbers),
headers: room.roomData.client.headers,
),
title: Text(room.title),
subtitle: room.roomData.topic.isEmpty
// leading: AvatarOrHash( TODO: Images
// room.avatar,
// room.title,
// fallback: Icon(Icons.numbers),
// headers: room.roomData.client.headers,
// ),
title: Text(room.metadata?.name ?? "Unnamed Room"),
subtitle: room.metadata?.topic == null
? null
: Text(room.roomData.topic, maxLines: 1),
: Text(room.metadata!.topic!, maxLines: 1),
onTap: () => addTag(
id: "[#${room.roomData.getLocalizedDisplayname()}](https://matrix.to/#/${room.roomData.id})",
id: "[#${room.metadata?.name ?? "Unnamed Room"}](https://matrix.to/#/${room.metadata?.id})",
name:
(room.roomData.canonicalAlias.isEmpty
? room.roomData.id
: room.roomData.canonicalAlias)
.substring(1)
(room.metadata?.canonicalAlias ??
room.metadata?.id)
?.substring(1)
.split(":")
.first,
.first ??
"",
),
),
)
.toList(),
),
),
_ => Loading(),
},
),
),
);
}
}