Nexus/nexus
Nexus/nexus
4
4
Fork 5
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Better Member List #36

Manually merged
Henry-Hiles merged 7 commits from better-member-list into main 2026-06-05 18:39:14 -04:00
Conversation 0 Commits 7 Files changed 18 +132 -85
3 changed files with 132 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f46dcbbb29 - Show all commits

use M3EToggleButtonGroup

Prev Next
Henry Hiles 2026-06-05 15:40:20 -04:00
commit f46dcbbb29
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs

194
lib/widgets/member_list.dart
View file

@ -1,6 +1,8 @@
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_hooks/flutter_hooks.dart"; import "package:flutter_hooks/flutter_hooks.dart";
import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:m3e_buttons/m3e_buttons.dart";
import "package:material_segmented_list/material_segmented_list.dart"; import "package:material_segmented_list/material_segmented_list.dart";
import "package:nexus/controllers/members_grouped_controller.dart"; import "package:nexus/controllers/members_grouped_controller.dart";
import "package:nexus/helpers/extensions/get_localpart.dart"; import "package:nexus/helpers/extensions/get_localpart.dart";
@ -20,6 +22,18 @@ class MemberList extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final status = useState(MembershipStatus.join); final status = useState(MembershipStatus.join);
final membersData = ref.watch(
MembersGroupedController.provider(
.new(roomId: roomId, status: status.value),
),
);
final options = {
"Joined": MembershipStatus.join,
"Invited": MembershipStatus.invite,
"Banned": MembershipStatus.ban,
};
return Drawer( return Drawer(
shape: Border(), shape: Border(),
child: Column( child: Column(
@ -38,99 +52,107 @@ class MemberList extends HookConsumerWidget {
), ),
], ],
), ),
Wrap( M3EToggleButtonGroup(
alignment: .center, type: M3EButtonGroupType.connected,
spacing: 8, selectedIndex: options.values.toIList().indexOf(status.value),
runSpacing: 8, onSelectedIndexChanged: (index) =>
children: [ status.value = options.values.elementAt(index ?? 0),
FilterChip( // overflow: M3EButtonGroupOverflow.menu,
label: Text("Joined"), actions: options
onSelected: (value) => status.value = .join, .mapTo(
selected: status.value == .join, (name, value) => M3EToggleButtonGroupAction(
), checkedLabel: Text(
FilterChip( "$name${switch (membersData) {
label: Text("Invited"), AsyncData(:final value) || AsyncLoading(:final value?) => " (${value.values.expand((element) => element).length})",
onSelected: (value) => status.value = .invite, _ => "",
selected: status.value == .invite, }}",
), ),
FilterChip( label: Text(name),
label: Text("Banned"), ),
onSelected: (value) => status.value = .ban, )
selected: status.value == .ban, .toList(),
),
],
), ),
switch (ref.watch(
MembersGroupedController.provider( switch (membersData) {
.new(roomId: roomId, status: status.value),
),
)) {
AsyncError(:final error, :final stackTrace) => ErrorDialog( AsyncError(:final error, :final stackTrace) => ErrorDialog(
error, error,
stackTrace, stackTrace,
), ),
AsyncData(:final value) || AsyncLoading(:final value?) => Expanded( AsyncData(:final value) || AsyncLoading(:final value?) =>
child: ListView( value.isEmpty
padding: .all(12), ? Center(
children: [ child: Padding(
for (final MapEntry(key: powerLevel, value: members) padding: .symmetric(vertical: 18),
in value.toEntryIList( child: Text(
compare: (a, b) => (b?.key ?? double.infinity) "No ${options.keys.toIList()[options.values.toIList().indexOf(status.value)]} Members",
.compareTo(a?.key ?? double.infinity), style: Theme.of(context).textTheme.headlineSmall,
)) ...[ ),
Padding( ),
padding: EdgeInsets.symmetric(horizontal: 4), )
child: DividerText( : Expanded(
powerLevel == null child: ListView(
? "Creators" padding: .all(12),
: "Power Level $powerLevel", children: [
for (final MapEntry(key: powerLevel, value: members)
in value.toEntryIList(
compare: (a, b) => (b?.key ?? double.infinity)
.compareTo(a?.key ?? double.infinity),
)) ...[
Padding(
padding: EdgeInsets.symmetric(horizontal: 4),
child: DividerText(
powerLevel == null
? "Creators"
: "Power Level $powerLevel",
),
),
SegmentedListSection(
children: members
.map(
(member) => switch (member.content) {
MembershipContent(
:final avatarUrl,
:final displayName,
) =>
SegmentedListTile(
onTap: () {},
// context.showUserPopover(
// member.content as MembershipContent,
// member.stateKey!,
// roomId: roomId,
// globalPosition: details.globalPosition,
// ),
title: Text(
displayName ??
member.stateKey!.localpart,
overflow: .ellipsis,
style: .new(
color: member.stateKey!.colorHash,
fontWeight: .bold,
),
),
subtitle: Text(
member.stateKey!,
overflow: .ellipsis,
),
leading: AvatarOrHash(
avatarUrl,
displayName ??
member.sender.localpart,
),
),
_ => throw Exception(
"Member content was not MembershipContent",
),
},
)
.toList(),
),
SizedBox(height: 4),
],
],
), ),
), ),
SegmentedListSection(
children: members
.map(
(member) => switch (member.content) {
MembershipContent(
:final avatarUrl,
:final displayName,
) =>
SegmentedListTile(
onTap: () {},
// context.showUserPopover(
// member.content as MembershipContent,
// member.stateKey!,
// roomId: roomId,
// globalPosition: details.globalPosition,
// ),
title: Text(
displayName ?? member.stateKey!.localpart,
overflow: .ellipsis,
style: .new(
color: member.stateKey!.colorHash,
fontWeight: .bold,
),
),
subtitle: Text(
member.stateKey!,
overflow: .ellipsis,
),
leading: AvatarOrHash(
avatarUrl,
displayName ?? member.sender.localpart,
),
),
_ => throw Exception(
"Member content was not MembershipContent",
),
},
)
.toList(),
),
SizedBox(height: 4),
],
],
),
),
AsyncLoading _ => Loading(), AsyncLoading _ => Loading(),
}, },
], ],

24
pubspec.lock
View file

@ -299,6 +299,14 @@ packages:
url: "https://github.com/Henry-Hiles/emoji_text_field" url: "https://github.com/Henry-Hiles/emoji_text_field"
source: git source: git
version: "1.0.0" version: "1.0.0"
equatable:
dependency: transitive
description:
name: equatable
sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
url: "https://pub.dev"
source: hosted
version: "2.0.8"
fake_async: fake_async:
dependency: transitive dependency: transitive
description: description:
@ -744,6 +752,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.0" version: "1.3.0"
m3e_buttons:
dependency: "direct main"
description:
name: m3e_buttons
sha256: "50cdf9ba30fb3ab529afafb0e837484549f8599f1f109ac07da50951febaace1"
url: "https://pub.dev"
source: hosted
version: "0.0.3"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
@ -856,6 +872,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.0.0" version: "2.0.0"
motor:
dependency: transitive
description:
name: motor
sha256: cbd49f21b00e568c2b1a55f134ed803614a107782f4fea7769693bca32940c58
url: "https://pub.dev"
source: hosted
version: "1.1.0"
native_toolchain_c: native_toolchain_c:
dependency: transitive dependency: transitive
description: description:

1
pubspec.yaml
View file

@ -65,6 +65,7 @@ dependencies:
media_kit_libs_video: 1.0.7 media_kit_libs_video: 1.0.7
measure_size: ^5.0.2 measure_size: ^5.0.2
material_segmented_list: ^1.0.5 material_segmented_list: ^1.0.5
m3e_buttons: ^0.0.3
dev_dependencies: dev_dependencies:
build_runner: 2.15.0 build_runner: 2.15.0