diff --git a/lib/controllers/members_grouped_controller.dart b/lib/controllers/members_grouped_controller.dart index e07bcf3..7cec625 100644 --- a/lib/controllers/members_grouped_controller.dart +++ b/lib/controllers/members_grouped_controller.dart @@ -8,13 +8,12 @@ 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>>> { +class MembersGroupedController extends AsyncNotifier>> { final MembersByStatusConfig config; MembersGroupedController(this.config); @override - Future>>> build() async { + Future>> build() async { final room = ref.watch( RoomsController.provider.select((value) => value[config.roomId]), ); @@ -43,28 +42,23 @@ class MembersGroupedController 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 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}), - ); - }) - .toEntryIList( - compare: (a, b) => - (b?.key ?? double.infinity).compareTo(a?.key ?? double.infinity), - ); + return result.update( + groupKey, + (value) => value.add(event), + ifAbsent: () => .new({event}), + ); + }); } static final provider = AsyncNotifierProvider.family< MembersGroupedController, - IList>>, + IMap>, MembersByStatusConfig >(MembersGroupedController.new); } diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces_controller.dart index 03a6b8a..26e1487 100644 --- a/lib/controllers/spaces_controller.dart +++ b/lib/controllers/spaces_controller.dart @@ -6,9 +6,7 @@ import "package:nexus/controllers/account_data_controller.dart"; import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/controllers/top_level_spaces_controller.dart"; import "package:nexus/controllers/space_edges_controller.dart"; -import "package:nexus/models/room.dart"; import "package:nexus/models/space.dart"; -import "package:nexus/models/subspace.dart"; class SpacesController extends Notifier> { @override @@ -16,115 +14,107 @@ class SpacesController extends Notifier> { final rooms = ref.watch(RoomsController.provider); final topLevelSpaceIds = ref.watch(TopLevelSpacesController.provider); final spaceEdges = ref.watch(SpaceEdgesController.provider); - final accountData = ref.watch(AccountDataController.provider); - final childrenById = { - for (final entry in spaceEdges.entries) - entry.key: entry.value.map((e) => e.childId).toList(), - }; + final childRoomsBySpaceId = IMap.fromEntries( + topLevelSpaceIds.map((spaceId) { + ISet walk(String currentId) { + final children = spaceEdges[currentId] ?? .new(); - Set collectDescendants(String startId) { - final visited = {}; - final stack = [startId]; + return children.fold>(.new(), (acc, edge) { + final childId = edge.childId; + final isSpace = spaceEdges.containsKey(childId); - while (stack.isNotEmpty) { - final current = stack.removeLast(); - final children = childrenById[current] ?? const []; - - for (final child in children) { - if (visited.add(child)) { - stack.add(child); - } + return acc + .addAll(!isSpace ? ISet([childId]) : const .empty()) + .addAll(isSpace ? walk(childId) : const .empty()); + }); } - } - return visited; - } + return MapEntry( + spaceId, + walk(spaceId).map((id) => rooms[id]).nonNulls.toIList(), + ); + }), + ); - Space buildSpace(String spaceId) { - final space = rooms[spaceId]; - final directChildrenIds = childrenById[spaceId] ?? const []; - - final directRooms = []; - final subSpaces = []; - - for (final childId in directChildrenIds) { - final room = rooms[childId]; - if (room == null) continue; - - if (childrenById.containsKey(childId)) { - final descendants = collectDescendants(childId); - - subSpaces.add( - .new( - room: room, - children: .new(descendants.map((id) => rooms[id]).nonNulls), - ), - ); - } else { - directRooms.add(room); - } - } - - return .new( - id: spaceId, - room: space, - title: space?.metadata?.name ?? "Unnamed Space", - children: .new(directRooms), - subSpaces: .new(subSpaces), - ); - } - - final spaces = topLevelSpaceIds.map(buildSpace).toIList(); - - final usedRoomIds = { - for (final space in spaces) ...[ - ...space.children.map((r) => r.metadata?.id), - ...space.subSpaces.expand((s) => s.children.map((r) => r.metadata?.id)), - ], - }.nonNulls.toISet(); - - final directMessages = IMap( - accountData["m.direct"]?.content ?? {}, - ).values.expand((e) => e).toISet(); + final allNestedRoomIds = childRoomsBySpaceId.values + .expand((l) => l) + .map( + (room) => rooms.entries + .firstWhere( + (entry) => entry.value.metadata?.id == room.metadata?.id, + ) + .key, + ) + .toISet(); final otherRooms = rooms.entries .where( (e) => - !usedRoomIds.contains(e.key) && + !allNestedRoomIds.contains(e.key) && !topLevelSpaceIds.contains(e.key) && - !childrenById.containsKey(e.key), + !spaceEdges.containsKey(e.key), ) - .map((e) => e.value) - .toIList(); + .map((e) => e.value); + + final accountData = ref.watch(AccountDataController.provider); + + final directMessages = IMap( + accountData["m.direct"]?.content ?? {}, + ).values.expand((element) => element); final homeRooms = otherRooms - .where((r) => !directMessages.contains(r.metadata?.id)) + .where( + (room) => + directMessages.any( + (directMessage) => directMessage == room.metadata?.id, + ) == + false, + ) .toIList(); final dmRooms = otherRooms - .where((r) => directMessages.contains(r.metadata?.id)) + .where( + (room) => directMessages.any( + (directMessage) => directMessage == room.metadata?.id, + ), + ) .toIList(); - final allSpaces = [ - .new( - id: "home", - title: "Home", - icon: Icons.home, - children: homeRooms, - subSpaces: .new(), - ), - .new( - id: "dms", - title: "Direct Messages", - icon: Icons.people, - children: dmRooms, - subSpaces: .new(), - ), - ...spaces, - ]; + final topLevelSpacesList = topLevelSpaceIds + .map((id) { + final room = rooms[id]; + if (room == null) return null; - return allSpaces + final children = childRoomsBySpaceId[id] ?? .new(); + return Space( + subSpaces: const IList.empty(), // TODO + id: id, + title: room.metadata?.name ?? "Unnamed Room", + room: room, + children: children, + ); + }) + .nonNulls + .toIList(); + + return [ + .new( + id: "home", + title: "Home", + icon: Icons.home, + children: homeRooms, + subSpaces: .new(), + ), + .new( + id: "dms", + title: "Direct Messages", + icon: Icons.people, + children: dmRooms, + subSpaces: .new(), + ), + ...topLevelSpacesList, + ] .map( (space) => space.copyWith( children: .new( diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index 5c9d53d..4969287 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -80,9 +80,6 @@ class LoginPage extends HookConsumerWidget { validator: requiredValidator, controller: password, obscureText: true, - onFieldSubmitted: (_) => tryLogin(), - // Don't defocus on submit - onEditingComplete: () {}, ), ], ), diff --git a/lib/pages/verify_page.dart b/lib/pages/verify_page.dart index bf5c9f3..a2089e3 100644 --- a/lib/pages/verify_page.dart +++ b/lib/pages/verify_page.dart @@ -15,22 +15,6 @@ class VerifyPage extends HookConsumerWidget { final inputError = useState(null); final formKey = useRef(GlobalKey()); - Future verify() async { - isLoading.value = true; - - try { - if (formKey.value.currentState?.validate() != true) { - return; - } - - inputError.value = await ref - .watch(ClientController.provider.notifier) - .verify(passphraseController.text); - } finally { - isLoading.value = false; - } - } - return Scaffold( appBar: Appbar(), body: AlertDialog( @@ -56,16 +40,29 @@ class VerifyPage extends HookConsumerWidget { label: Text("Recovery Key or Passphrase"), errorText: inputError.value, ), - onFieldSubmitted: (_) => verify(), - // Don't defocus on submit - onEditingComplete: () {}, ), ], ), ), actions: [ TextButton( - onPressed: isLoading.value ? null : verify, + onPressed: isLoading.value + ? null + : () async { + isLoading.value = true; + + try { + if (formKey.value.currentState?.validate() != true) { + return; + } + + inputError.value = await ref + .watch(ClientController.provider.notifier) + .verify(passphraseController.text); + } finally { + isLoading.value = false; + } + }, child: Text("Verify"), ), ], diff --git a/lib/widgets/html/mention_chip.dart b/lib/widgets/html/mention_chip.dart index c757c3f..141d5a0 100644 --- a/lib/widgets/html/mention_chip.dart +++ b/lib/widgets/html/mention_chip.dart @@ -36,9 +36,7 @@ class MentionChip extends ConsumerWidget { child: IgnorePointer( child: Chip( label: Text( - (membership?.displayName == null - ? null - : "@${membership!.displayName}") ?? + (membership == null ? null : "@${membership.displayName}") ?? mention, style: .new( fontWeight: .bold, diff --git a/lib/widgets/member_list.dart b/lib/widgets/member_list.dart index d3c21b6..bdac414 100644 --- a/lib/widgets/member_list.dart +++ b/lib/widgets/member_list.dart @@ -3,8 +3,7 @@ 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:m3e_card_list/m3e_card_list.dart"; -import "package:nexus/controllers/members_by_status_controller.dart"; +import "package:material_segmented_list/material_segmented_list.dart"; import "package:nexus/controllers/members_grouped_controller.dart"; import "package:nexus/helpers/extensions/get_localpart.dart"; import "package:nexus/helpers/extensions/string_to_color.dart"; @@ -21,60 +20,60 @@ class MemberList extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final statusIndex = useState(0); + final status = useState(MembershipStatus.join); + + final membersData = ref.watch( + MembersGroupedController.provider( + .new(roomId: roomId, status: status.value), + ), + ); final options = { "Joined": .join, "Invited": .invite, "Banned": .ban, }; - final status = options.values.toIList()[statusIndex.value]; return Drawer( shape: Border(), child: Column( children: [ - if (Scaffold.of(context).hasEndDrawer) - AppBar( - scrolledUnderElevation: 0, - leading: Icon(Icons.people), - title: Text("Members"), - actionsPadding: .only(right: 4), - actions: [ + AppBar( + scrolledUnderElevation: 0, + leading: Icon(Icons.people), + title: Text("Members"), + actionsPadding: .only(right: 4), + actions: [ + if (Scaffold.of(context).hasEndDrawer) IconButton( onPressed: Scaffold.of(context).closeEndDrawer, icon: Icon(Icons.close), tooltip: "Close member list", ), - ], - ), - Padding( - padding: .symmetric(vertical: 8), - child: M3EToggleButtonGroup( - selectedIndex: statusIndex.value, - onSelectedIndexChanged: (index) => - statusIndex.value = index ?? statusIndex.value, - actions: options - .mapTo( - (name, value) => M3EToggleButtonGroupAction( - checkedLabel: Text( - "$name${switch (ref.watch(MembersByStatusController.provider(.new(roomId: roomId, status: value)))) { - AsyncData(:final value) || AsyncLoading(:final value?) => " (${value.length})", - _ => "", - }}", - ), - label: Text(name), + ], + ), + M3EToggleButtonGroup( + type: .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})", + _ => "", + }}", ), - ) - .toList(), - ), + label: Text(name), + ), + ) + .toList(), ), - switch (ref.watch( - MembersGroupedController.provider( - .new(roomId: roomId, status: status), - ), - )) { + switch (membersData) { AsyncError(:final error, :final stackTrace) => ErrorDialog( error, stackTrace, @@ -85,76 +84,71 @@ class MemberList extends HookConsumerWidget { child: Padding( padding: .symmetric(vertical: 18), child: Text( - "No ${options.keys.toIList()[statusIndex.value]} Members", + "No ${options.keys.toIList()[options.values.toIList().indexOf(status.value)]} Members", style: Theme.of(context).textTheme.headlineSmall, ), ), ) : Expanded( - child: CustomScrollView( - slivers: [ + child: ListView( + padding: .all(12), + children: [ for (final MapEntry(key: powerLevel, value: members) - in value) ...[ - SliverToBoxAdapter( - child: Padding( - padding: .symmetric(horizontal: 16), - child: DividerText( - powerLevel == null - ? "Creators" - : "Power Level $powerLevel", - ), + in value.toEntryIList( + compare: (a, b) => (b?.key ?? double.infinity) + .compareTo(a?.key ?? double.infinity), + )) ...[ + Padding( + padding: .symmetric(horizontal: 4), + child: DividerText( + powerLevel == null + ? "Creators" + : "Power Level $powerLevel", ), ), - SliverM3ECardList( - padding: .all(4), - color: Theme.of( - context, - ).colorScheme.surfaceContainerHigh, - margin: .symmetric(horizontal: 12, vertical: 4), - itemCount: members.length, - itemBuilder: (context, index) => - switch (members[index].content) { - MembershipContent( - :final avatarUrl, - :final displayName, - ) => - ListTile( - title: Text( - displayName ?? - members[index] - .stateKey! - .localpart, - overflow: .ellipsis, - style: .new( - color: members[index] - .stateKey! - .colorHash, - fontWeight: .bold, + 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, ), ), - subtitle: Text( - members[index].stateKey!, - overflow: .ellipsis, - ), - leading: AvatarOrHash( - avatarUrl, - displayName ?? - members[index].sender.localpart, - ), + _ => throw Exception( + "Member content was not MembershipContent", ), - _ => throw Exception( - "Member content was not MembershipContent", - ), - }, - onTap: (index) { - // context.showUserPopover( - // member.content as MembershipContent, - // member.stateKey!, - // roomId: roomId, - // globalPosition: details.globalPosition, - // ), - }, + }, + ) + .toList(), ), + SizedBox(height: 4), ], ], ), diff --git a/lib/widgets/sidebar.dart b/lib/widgets/sidebar.dart index abe9a0a..d3f76ae 100644 --- a/lib/widgets/sidebar.dart +++ b/lib/widgets/sidebar.dart @@ -67,7 +67,7 @@ class Sidebar extends HookConsumerWidget { .toList(); return Drawer( - width: 330, + width: 340, shape: Border(), child: Row( children: [ @@ -206,20 +206,19 @@ class Sidebar extends HookConsumerWidget { ], ), child: NavigationRailM3E( - expandedWidth: double.infinity, + expandedWidth: 360, scrollable: true, background: Colors.transparent, type: .alwaysExpand, selectedIndex: selectedRoomIndex ?? 0, sections: [ .new( - header: selectedSpace.room == null ? null : Text("Rooms"), destinations: roomsToDestinations(selectedSpace.children), ), for (final subSpace in selectedSpace.subSpaces) .new( header: Text( - subSpace.room.metadata?.name ?? "Unnamed Space", + subSpace.room.metadata?.name ?? "Unnamed Room", ), destinations: roomsToDestinations(subSpace.children), ), diff --git a/linux/nix/pkg/default.nix b/linux/nix/pkg/default.nix index c879f24..7e7b427 100644 --- a/linux/nix/pkg/default.nix +++ b/linux/nix/pkg/default.nix @@ -32,7 +32,7 @@ flutter.buildFlutterApplication { window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM="; emoji_text_field = "sha256-3TOys09EP2GRo6pUBGPXaqBlE39O2Cmwt42Hs1cTDKo="; linkify = "sha256-mxV/XHLxF9cn7sUPr2SUNjVmDr5lbxkuGCbNdyiZi2c="; - navigation_rail_m3e = "sha256-+2awDTQnK58gGRY1nuHckG/jjxarsYSRu9ovR4i4TEc="; + navigation_rail_m3e = "sha256-Zkqo8RkNSWiELB+Bk6iLsgft9THuJiMtysEwXNS/ZgY="; }; postInstall = '' diff --git a/pubspec.lock b/pubspec.lock index 4e30e17..f44a05d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -783,14 +783,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.3" - m3e_card_list: - dependency: "direct main" - description: - name: m3e_card_list - sha256: d4aba0123cccda40ac80789befa8d355e1dc16aa7dcee910157690b0546d78d6 - url: "https://pub.dev" - source: hosted - version: "0.1.0" m3e_design: dependency: transitive description: @@ -815,6 +807,14 @@ 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: @@ -993,7 +993,7 @@ packages: source: hosted version: "2.1.5" path_provider_android: - dependency: transitive + dependency: "direct main" description: name: path_provider_android sha256: "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba" diff --git a/pubspec.yaml b/pubspec.yaml index da8b1ec..7c95a5a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -27,6 +27,7 @@ dependencies: intl: 0.20.2 fast_immutable_collections: 11.2.0 path_provider: 2.1.5 + path_provider_android: 2.2.23 url_launcher: 6.3.2 freezed_annotation: 3.1.0 image_picker: 1.2.2 @@ -61,12 +62,12 @@ 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 navigation_rail_m3e: git: url: https://github.com/Henry-Hiles/material_3_expressive path: packages/navigation_rail_m3e - m3e_card_list: ^0.1.0 dev_dependencies: build_runner: 2.15.0