Draggable Space Ordering and Space Folders

commet/lib/client/client_manager.dart

@@ -9,6 +9,7 @@ import 'package:commet/client/matrix/matrix_client.dart';
 import 'package:commet/client/stale_info.dart';
 import 'package:commet/client/tasks/client_connection_status_task.dart';
 import 'package:commet/main.dart';
+import 'package:commet/client/sidebar/sidebar_manager.dart';
 import 'package:commet/utils/notifying_list.dart';
 
 class ClientManager {
@@ -22,10 +23,12 @@ class ClientManager {
   late CallManager callManager;
 
   late final DirectMessagesAggregator directMessages;
+  late final SidebarManager sidebarManager;
 
   ClientManager() {
     directMessages = DirectMessagesAggregator(this);
     callManager = CallManager(this);
+    sidebarManager = SidebarManager(this);
   }
 
   List<Room> get rooms => _rooms;
@@ -99,6 +102,8 @@ class ClientManager {
           isBackgroundService: isBackgroundService),
     ]);
 
+    newClientManager.sidebarManager.init();
+
     return newClientManager;
   }
 
@@ -229,6 +234,7 @@ class ClientManager {
   }
 
   Future<void> close() async {
+    sidebarManager.dispose();
     for (var client in _clients.values) {
       client.close();
     }

commet/lib/client/sidebar/resolved_sidebar_item.dart

@@ -0,0 +1,24 @@
+import 'package:commet/client/client.dart';
+
+sealed class ResolvedSidebarItem {
+  const ResolvedSidebarItem();
+}
+
+class ResolvedSpace extends ResolvedSidebarItem {
+  final Space space;
+  const ResolvedSpace(this.space);
+}
+
+class ResolvedFolder extends ResolvedSidebarItem {
+  final String id;
+  final String name;
+  final List<Space> spaces;
+  final bool isExpanded;
+
+  const ResolvedFolder({
+    required this.id,
+    required this.name,
+    required this.spaces,
+    this.isExpanded = false,
+  });
+}

commet/lib/client/sidebar/sidebar_data.dart

@@ -0,0 +1,61 @@
+import 'package:commet/client/sidebar/sidebar_model.dart';
+
+class SidebarData {
+  static const String accountDataType = 'im.commet.space_sidebar';
+  static const int currentVersion = 1;
+
+  final int version;
+  final List<SidebarItem> items;
+
+  const SidebarData({this.version = currentVersion, this.items = const []});
+
+  factory SidebarData.fromJson(Map<String, dynamic> json) {
+    final version = json['version'] as int? ?? currentVersion;
+    final rawItems = json['items'] as List<dynamic>? ?? [];
+
+    final items = <SidebarItem>[];
+    for (final raw in rawItems) {
+      if (raw is! Map<String, dynamic>) continue;
+
+      final type = raw['type'] as String?;
+      switch (type) {
+        case 'space':
+          final id = raw['id'] as String?;
+          if (id != null) items.add(SidebarSpace(id));
+          break;
+        case 'folder':
+          final id = raw['id'] as String?;
+          final name = raw['name'] as String? ?? '';
+          final children = (raw['children'] as List<dynamic>?)
+                  ?.whereType<String>()
+                  .toList() ??
+              [];
+          if (id != null && children.isNotEmpty) {
+            items.add(SidebarFolder(id: id, name: name, children: children));
+          }
+          break;
+      }
+    }
+
+    return SidebarData(version: version, items: items);
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'version': version,
+      'items': items.map((item) {
+        return switch (item) {
+          SidebarSpace s => {'type': 'space', 'id': s.spaceId},
+          SidebarFolder f => {
+              'type': 'folder',
+              'id': f.id,
+              'name': f.name,
+              'children': f.children,
+            },
+        };
+      }).toList(),
+    };
+  }
+
+  static SidebarData empty() => const SidebarData();
+}