parent
7007c9af89
commit
b55a6e0e83
3 changed files with 42 additions and 22 deletions
|
|
@ -17,7 +17,9 @@ class SelectedRoomController extends Notifier<String?> {
|
|||
(space) => space?.allChildRooms
|
||||
.map((room) => room.metadata?.id)
|
||||
.nonNulls
|
||||
.toIList(),
|
||||
.toIList()
|
||||
// Real spaces have a timeline of their own
|
||||
.addAll([?space.room?.metadata?.id]),
|
||||
),
|
||||
);
|
||||
if (roomIds == null) return roomId;
|
||||
|
|
|
|||
|
|
@ -4,20 +4,28 @@ import "package:navigation_rail_m3e/navigation_rail_m3e.dart";
|
|||
import "package:nexus/models/room.dart";
|
||||
import "package:nexus/widgets/avatar_or_hash.dart";
|
||||
|
||||
extension RoomDestination on Room {
|
||||
NavigationRailM3EDestination toDestination({
|
||||
required bool isDm,
|
||||
String? label,
|
||||
Widget? icon,
|
||||
}) => NavigationRailM3EDestination(
|
||||
label: label ?? metadata?.name ?? "Unnamed Room",
|
||||
badgeCount: switch (metadata?.unreadNotifications) {
|
||||
0 || null => metadata?.unreadMessages == 0 ? null : 0,
|
||||
int unread => unread,
|
||||
},
|
||||
icon:
|
||||
icon ??
|
||||
AvatarOrHash(
|
||||
metadata?.avatar,
|
||||
metadata?.name ?? "Unnamed Room",
|
||||
fallback: isDm ? null : const Icon(Icons.numbers),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
extension RoomDestinations on IList<Room> {
|
||||
List<NavigationRailM3EDestination> toDestinations({required bool isDm}) =>
|
||||
map(
|
||||
(room) => NavigationRailM3EDestination(
|
||||
label: room.metadata?.name ?? "Unnamed Room",
|
||||
badgeCount: switch (room.metadata?.unreadNotifications) {
|
||||
0 || null => room.metadata?.unreadMessages == 0 ? null : 0,
|
||||
int unread => unread,
|
||||
},
|
||||
icon: AvatarOrHash(
|
||||
room.metadata?.avatar,
|
||||
room.metadata?.name ?? "Unnamed Room",
|
||||
fallback: isDm ? null : const Icon(Icons.numbers),
|
||||
),
|
||||
),
|
||||
).toList();
|
||||
map((room) => room.toDestination(isDm: isDm)).toList();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import "dart:math";
|
||||
|
||||
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||
import "package:hooks_riverpod/hooks_riverpod.dart";
|
||||
import "package:material_ui/material_ui.dart";
|
||||
import "package:m3e_design/m3e_design.dart";
|
||||
|
|
@ -222,6 +223,9 @@ class const RoomsPane({super.key}) extends ConsumerWidget {
|
|||
final selectedSpace = ref.watch(SelectedSpaceController.provider)!;
|
||||
final isDm = selectedSpace.id == "dms";
|
||||
final spaceMetadata = selectedSpace.room?.metadata;
|
||||
// In the order the rail shows them, with the space's own timeline first
|
||||
final destinationIds = IList<String?>([?spaceMetadata?.id])
|
||||
.addAll(selectedSpace.allChildRooms.map((room) => room.metadata?.id));
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: Colors.transparent,
|
||||
|
|
@ -287,13 +291,19 @@ class const RoomsPane({super.key}) extends ConsumerWidget {
|
|||
scrollable: true,
|
||||
background: Colors.transparent,
|
||||
type: .alwaysExpand,
|
||||
selectedIndex: max(
|
||||
0,
|
||||
selectedSpace.allChildRooms.indexWhere(
|
||||
(room) => room.metadata?.id == selectedRoomId,
|
||||
),
|
||||
),
|
||||
selectedIndex: max(0, destinationIds.indexOf(selectedRoomId)),
|
||||
sections: [
|
||||
if (selectedSpace.room case final room?
|
||||
when spaceMetadata != null)
|
||||
.new(
|
||||
destinations: [
|
||||
room.toDestination(
|
||||
isDm: isDm,
|
||||
label: "Space timeline",
|
||||
icon: const Icon(Icons.forum),
|
||||
),
|
||||
],
|
||||
),
|
||||
.new(
|
||||
header: selectedSpace.room == null
|
||||
? null
|
||||
|
|
@ -339,7 +349,7 @@ class const RoomsPane({super.key}) extends ConsumerWidget {
|
|||
KeyController.provider(KeyController.roomKey)
|
||||
.notifier,
|
||||
)
|
||||
.set(selectedSpace.allChildRooms[value].metadata?.id);
|
||||
.set(destinationIds[value]);
|
||||
if (Navigator.of(context).canPop()) {
|
||||
Navigator.of(context).pop();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue