Compare commits

..
2 changed files with 39 additions and 45 deletions

2
gomuks

@ -1 +1 @@
Subproject commit bc0f54a0ad1404afbec9ceb65136ec9eeb9b62c4 Subproject commit 3c759ba03a5235deb82cb1559ebc42c36ee0e874

View file

@ -73,23 +73,20 @@ class MentionOverlay extends ConsumerWidget {
:final displayName, :final displayName,
:final avatarUrl, :final avatarUrl,
) => ) =>
Material( ListTile(
color: Colors.transparent, leading: AvatarOrHash(
child: ListTile( avatarUrl,
leading: AvatarOrHash( displayName ??
avatarUrl, member.stateKey!.localpart,
displayName ?? ),
member.stateKey!.localpart, title: Text(
), displayName ??
title: Text( member.stateKey!.localpart,
displayName ?? ),
member.stateKey!.localpart, subtitle: Text(member.stateKey!),
), onTap: () => addTag(
subtitle: Text(member.stateKey!), id: "[@$displayName](matrix:u/${member.stateKey!.substring(1)})",
onTap: () => addTag( name: member.stateKey!.localpart,
id: "[@$displayName](matrix:u/${member.stateKey!.substring(1)})",
name: member.stateKey!.localpart,
),
), ),
), ),
_ => SizedBox.shrink(), _ => SizedBox.shrink(),
@ -116,34 +113,31 @@ class MentionOverlay extends ConsumerWidget {
room.metadata?.canonicalAlias ?? room.metadata?.canonicalAlias ??
room.metadata?.id ?? room.metadata?.id ??
"Unknown Room"; "Unknown Room";
return Material( return ListTile(
color: Colors.transparent, leading: AvatarOrHash(
child: ListTile( room.metadata?.avatar,
leading: AvatarOrHash( name,
room.metadata?.avatar, fallback: Icon(Icons.numbers),
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 ??
"",
);
},
), ),
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(), .toList(),