parent
b6c6ac35d9
commit
20eed13884
3 changed files with 142 additions and 116 deletions
|
|
@ -3,6 +3,7 @@ import "package:hooks_riverpod/hooks_riverpod.dart";
|
|||
import "package:material_ui/material_ui.dart";
|
||||
import "package:nexus/controllers/all_emoji.dart";
|
||||
import "package:nexus/helpers/extensions/better_when.dart";
|
||||
import "package:nexus/helpers/extensions/weighted_search.dart";
|
||||
import "package:nexus/models/content/image_pack.dart";
|
||||
import "package:nexus/models/image_pack.dart";
|
||||
|
||||
|
|
@ -21,11 +22,13 @@ class const EmojiOverlay(
|
|||
children: emojis
|
||||
.map((element) => element.emojis)
|
||||
.flattened
|
||||
.where(
|
||||
(emoji) =>
|
||||
emoji.aliases.join().contains(query) ||
|
||||
emoji.description.contains(query) ||
|
||||
emoji.tags.join().contains(query),
|
||||
.search(
|
||||
query,
|
||||
(emoji) => [
|
||||
...emoji.aliases.map((alias) => (alias, 3)),
|
||||
...emoji.tags.map((tag) => (tag, 2)),
|
||||
(emoji.description, 1),
|
||||
],
|
||||
)
|
||||
.map(
|
||||
(emoji) => ListTile(
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ 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/helpers/extensions/weighted_search.dart";
|
||||
import "package:nexus/widgets/avatar_or_hash.dart";
|
||||
|
||||
class const RoomOverlay(
|
||||
|
|
@ -14,47 +15,46 @@ class const RoomOverlay(
|
|||
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 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))
|
||||
.viaQuery;
|
||||
addTag(
|
||||
id: "[#$name](matrix:roomid/${room.metadata?.id.substring(1)}$vias)",
|
||||
name:
|
||||
(room.metadata?.canonicalAlias ?? room.metadata?.id)
|
||||
?.substring(1)
|
||||
.split(":")
|
||||
.first ??
|
||||
"",
|
||||
);
|
||||
},
|
||||
children: rooms.values
|
||||
.search(
|
||||
query,
|
||||
(room) => [
|
||||
(room.metadata?.name, 3),
|
||||
(room.metadata?.canonicalAlias, 2),
|
||||
(room.metadata?.id, 1),
|
||||
],
|
||||
)
|
||||
.map((room) {
|
||||
final name =
|
||||
room.metadata?.name ??
|
||||
room.metadata?.canonicalAlias ??
|
||||
room.metadata?.id ??
|
||||
"Unknown Room";
|
||||
return 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)).viaQuery;
|
||||
addTag(
|
||||
id: "[#$name](matrix:roomid/${room.metadata?.id.substring(1)}$vias)",
|
||||
name:
|
||||
(room.metadata?.canonicalAlias ?? room.metadata?.id)
|
||||
?.substring(1)
|
||||
.split(":")
|
||||
.first ??
|
||||
"",
|
||||
);
|
||||
})
|
||||
.toList(),
|
||||
},
|
||||
);
|
||||
})
|
||||
.toList(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ 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/helpers/extensions/weighted_search.dart";
|
||||
import "package:nexus/models/content/membership.dart";
|
||||
import "package:nexus/widgets/avatar_or_hash.dart";
|
||||
|
||||
|
|
@ -20,45 +21,34 @@ class const UserOverlay(
|
|||
)
|
||||
.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) =>
|
||||
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(),
|
||||
children: members
|
||||
.search(
|
||||
query,
|
||||
(member) => [
|
||||
if (member.content case MembershipContent(:final displayName))
|
||||
(displayName, 2),
|
||||
(member.stateKey, 1),
|
||||
],
|
||||
)
|
||||
.map(
|
||||
(member) => switch (member.content) {
|
||||
MembershipContent(:final displayName, :final avatarUrl) =>
|
||||
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(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue