diff --git a/lib/controllers/members_grouped_controller.dart b/lib/controllers/members_grouped_controller.dart deleted file mode 100644 index 7cec625..0000000 --- a/lib/controllers/members_grouped_controller.dart +++ /dev/null @@ -1,64 +0,0 @@ -import "package:fast_immutable_collections/fast_immutable_collections.dart"; -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/members_by_status_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/models/configs/members_by_status_config.dart"; -import "package:nexus/models/content/content.dart"; -import "package:nexus/models/content/create.dart"; -import "package:nexus/models/content/power_levels.dart"; -import "package:nexus/models/event.dart"; - -class MembersGroupedController extends AsyncNotifier>> { - final MembersByStatusConfig config; - MembersGroupedController(this.config); - - @override - Future>> build() async { - final room = ref.watch( - RoomsController.provider.select((value) => value[config.roomId]), - ); - - final createRowId = room?.state[EventType.create.type]?[""]; - final createEvent = createRowId == null ? null : room?.events[createRowId]; - final createEventContent = switch (createEvent?.content) { - CreateContent content => content, - _ => null, - }; - final creators = createEventContent?.additionalCreatorIds.add( - createEvent!.sender, - ); - - final powerLevelsRowId = room?.state[EventType.powerLevels.type]?[""]; - final powerLevelsEvent = powerLevelsRowId == null - ? null - : room?.events[powerLevelsRowId]; - - final content = switch (powerLevelsEvent?.content) { - PowerLevelsContent content => content, - _ => PowerLevelsContent(), - }; - - final members = await ref.watch( - MembersByStatusController.provider(config).future, - ); - - return members.fold>>(.new(), (result, event) { - final groupKey = creators?.contains(event.stateKey!) == true - ? null - : content.users[event.stateKey!] ?? content.usersDefault; - - return result.update( - groupKey, - (value) => value.add(event), - ifAbsent: () => .new({event}), - ); - }); - } - - static final provider = - AsyncNotifierProvider.family< - MembersGroupedController, - IMap>, - MembersByStatusConfig - >(MembersGroupedController.new); -} diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 7cd79b8..84ac7b0 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -24,8 +24,9 @@ class RoomChatController extends AsyncNotifier> { final room = ref.watch( RoomsController.provider.select((rooms) => rooms[roomId]), ); + if (room == null) return .new(); - if (!room!.hasFetchedState) { + if (!room.hasFetchedState) { final state = await client.getRoomState(.new(roomId: roomId)); await ref.read(RoomsController.provider.notifier).addState(roomId, state); diff --git a/lib/models/content/create.dart b/lib/models/content/create.dart index c534558..6921c04 100644 --- a/lib/models/content/create.dart +++ b/lib/models/content/create.dart @@ -8,6 +8,8 @@ part "create.g.dart"; abstract class CreateContent extends Content with _$CreateContent { CreateContent._(); factory CreateContent({ + @JsonKey(name: "creator") String? creatorId, + @JsonKey(name: "additional_creators") @Default(IList.empty()) IList additionalCreatorIds, diff --git a/lib/widgets/member_list.dart b/lib/widgets/member_list.dart index fbb3555..00633a7 100644 --- a/lib/widgets/member_list.dart +++ b/lib/widgets/member_list.dart @@ -1,16 +1,13 @@ -import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.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:nexus/controllers/members_grouped_controller.dart"; +import "package:nexus/controllers/members_by_status_controller.dart"; import "package:nexus/helpers/extensions/get_localpart.dart"; +import "package:nexus/helpers/extensions/show_user_popover.dart"; import "package:nexus/helpers/extensions/string_to_color.dart"; import "package:nexus/models/content/membership.dart"; import "package:nexus/models/membership_status.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; -import "package:nexus/widgets/divider_text.dart"; import "package:nexus/widgets/error_dialog.dart"; import "package:nexus/widgets/loading.dart"; @@ -21,19 +18,12 @@ class MemberList extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final status = useState(MembershipStatus.join); - - final membersData = ref.watch( - MembersGroupedController.provider( + final membersProvider = ref.watch( + MembersByStatusController.provider( .new(roomId: roomId, status: status.value), ), ); - final options = { - "Joined": MembershipStatus.join, - "Invited": MembershipStatus.invite, - "Banned": MembershipStatus.ban, - }; - return Drawer( shape: Border(), child: Column( @@ -52,107 +42,74 @@ class MemberList extends HookConsumerWidget { ), ], ), - M3EToggleButtonGroup( - type: M3EButtonGroupType.connected, - selectedIndex: options.values.toIList().indexOf(status.value), - onSelectedIndexChanged: (index) => - status.value = options.values.elementAt(index ?? 0), - // overflow: M3EButtonGroupOverflow.menu, - actions: options - .mapTo( - (name, value) => M3EToggleButtonGroupAction( - checkedLabel: Text( - "$name${switch (membersData) { - AsyncData(:final value) || AsyncLoading(:final value?) => " (${value.values.expand((element) => element).length})", - _ => "", - }}", - ), - label: Text(name), - ), - ) - .toList(), + Wrap( + alignment: .center, + spacing: 8, + runSpacing: 8, + children: [ + FilterChip( + label: Text("Joined"), + onSelected: (value) => status.value = .join, + selected: status.value == .join, + ), + FilterChip( + label: Text("Invited"), + onSelected: (value) => status.value = .invite, + selected: status.value == .invite, + ), + FilterChip( + label: Text("Banned"), + onSelected: (value) => status.value = .ban, + selected: status.value == .ban, + ), + ], ), - - switch (membersData) { + switch (membersProvider) { AsyncError(:final error, :final stackTrace) => ErrorDialog( error, stackTrace, ), - AsyncData(:final value) || AsyncLoading(:final value?) => - value.isEmpty - ? Center( - child: Padding( - padding: .symmetric(vertical: 18), - child: Text( - "No ${options.keys.toIList()[options.values.toIList().indexOf(status.value)]} Members", - style: Theme.of(context).textTheme.headlineSmall, - ), - ), - ) - : Expanded( - child: ListView( - padding: .all(12), - 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", + AsyncData(:final value) || AsyncLoading(:final value?) => Expanded( + child: ListView( + children: value + .map( + (member) => switch (member.content) { + MembershipContent( + :final avatarUrl, + :final displayName, + ) => + InkWell( + onTapUp: (details) => context.showUserPopover( + member.content as MembershipContent, + member.stateKey!, + roomId: roomId, + globalPosition: details.globalPosition, + ), + child: ListTile( + leading: AvatarOrHash( + avatarUrl, + displayName ?? member.sender.localpart, + ), + title: Text( + displayName ?? member.stateKey!.localpart, + overflow: .ellipsis, + style: .new( + color: member.stateKey!.colorHash, + fontWeight: .bold, + ), + ), + subtitle: Text( + member.stateKey!, + overflow: .ellipsis, ), ), - 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), - ], - ], - ), - ), + ), + _ => SizedBox.shrink(), + }, + ) + .toList(), + ), + ), AsyncLoading _ => Loading(), }, ], diff --git a/pubspec.lock b/pubspec.lock index 385367d..108474b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -299,14 +299,6 @@ packages: url: "https://github.com/Henry-Hiles/emoji_text_field" source: git version: "1.0.0" - equatable: - dependency: transitive - description: - name: equatable - sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b" - url: "https://pub.dev" - source: hosted - version: "2.0.8" fake_async: dependency: transitive description: @@ -752,14 +744,6 @@ packages: url: "https://pub.dev" source: hosted 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: dependency: transitive description: @@ -776,14 +760,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" - material_segmented_list: - dependency: "direct main" - description: - name: material_segmented_list - sha256: "384bfd41a78e745397ceff1dd39700961e6a5419ad911d1797bcc13ea3824241" - url: "https://pub.dev" - source: hosted - version: "1.0.5" measure_size: dependency: "direct main" description: @@ -872,14 +848,6 @@ packages: url: "https://pub.dev" source: hosted 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: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 37b4ed4..0ce2a30 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,8 +64,6 @@ dependencies: media_kit_video: 2.0.1 media_kit_libs_video: 1.0.7 measure_size: ^5.0.2 - material_segmented_list: ^1.0.5 - m3e_buttons: ^0.0.3 dev_dependencies: build_runner: 2.15.0