ui improvments

commetchat · Jul 3, 2024 · 9ec83e6 · 9ec83e6
1 parent d93d68e
commit 9ec83e6
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 45 deletions.
diff --git a/commet/lib/ui/atoms/space_list.dart b/commet/lib/ui/atoms/space_list.dart
@@ -80,36 +80,35 @@ class _SpaceListState extends State<SpaceList> {
 
   @override
   Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      child: Column(
-        children: [
-          if (subSpaces.isNotEmpty)
-            Padding(
-                padding: const EdgeInsets.fromLTRB(0, 12, 0, 0),
-                child: ImplicitlyAnimatedList(
-                  itemData: subSpaces,
-                  shrinkWrap: true,
-                  initialAnimation: false,
-                  itemBuilder: (context, data) {
-                    return tiamat.TextButtonExpander(data.displayName,
-                        initiallyExpanded: true,
-                        iconColor: Theme.of(context).colorScheme.secondary,
-                        textColor: Theme.of(context).colorScheme.secondary,
-                        icon: Icons.format_list_bulleted,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.fromLTRB(0, 0, 0, 8),
-                            child: SpaceList(
-                              data,
-                              onRoomSelected: widget.onRoomSelected,
-                            ),
-                          )
-                        ]);
-                  },
-                )),
-          if (widget.space.rooms.isNotEmpty) roomsList()
-        ],
-      ),
+    return Column(
+      children: [
+        if (subSpaces.isNotEmpty)
+          Padding(
+              padding: const EdgeInsets.fromLTRB(0, 12, 0, 0),
+              child: ImplicitlyAnimatedList(
+                itemData: subSpaces,
+                shrinkWrap: true,
+                physics: const NeverScrollableScrollPhysics(),
+                padding: const EdgeInsets.all(0),
+                initialAnimation: false,
+                itemBuilder: (context, data) {
+                  return tiamat.TextButtonExpander(data.displayName,
+                      initiallyExpanded: true,
+                      iconColor: Theme.of(context).colorScheme.secondary,
+                      textColor: Theme.of(context).colorScheme.secondary,
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.fromLTRB(0, 0, 0, 8),
+                          child: SpaceList(
+                            data,
+                            onRoomSelected: widget.onRoomSelected,
+                          ),
+                        )
+                      ]);
+                },
+              )),
+        if (widget.space.rooms.isNotEmpty) roomsList()
+      ],
     );
   }
 
@@ -133,11 +132,13 @@ class _SpaceListState extends State<SpaceList> {
   Widget buildRoomsList() {
     return ImplicitlyAnimatedList(
       itemData: widget.space.rooms,
+      physics: const NeverScrollableScrollPhysics(),
       shrinkWrap: true,
+      padding: const EdgeInsets.all(0),
       initialAnimation: false,
       itemBuilder: (context, data) {
         return SizedBox(
-            height: 30,
+            height: 37,
             child: RoomTextButton(
               data,
               onTap: widget.onRoomSelected,

diff --git a/commet/lib/ui/organisms/space_summary/space_summary_view.dart b/commet/lib/ui/organisms/space_summary/space_summary_view.dart
@@ -257,6 +257,7 @@ class SpaceSummaryViewState extends State<SpaceSummaryView> {
           ListView.builder(
             shrinkWrap: true,
             itemCount: widget.spaces!.length,
+            physics: const NeverScrollableScrollPhysics(),
             itemBuilder: (context, index) {
               var space = widget.spaces![index];
               return RoomPanel(

diff --git a/commet/lib/ui/pages/main/main_page_view_mobile.dart b/commet/lib/ui/pages/main/main_page_view_mobile.dart
@@ -336,20 +336,16 @@ class _MainPageViewMobileState extends State<MainPageViewMobile> {
               onTap: clearSelectedRoom,
             ),
             Expanded(
-                child: Padding(
-              padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
-              child: SpaceViewer(
-                widget.state.currentSpace!,
-                key: ValueKey(
-                    "space-view-key-${widget.state.currentSpace!.localId}"),
-                onChildAdded: widget.state.clientManager.onSpaceAdded,
-                onChildRemoved: widget.state.clientManager.onSpaceRemoved,
-                onChildUpdated:
-                    widget.state.clientManager.onSpaceUpdated.stream,
-                onRoomSelected: (room) async {
-                  selectRoom(room);
-                },
-              ),
+                child: SpaceViewer(
+              widget.state.currentSpace!,
+              key: ValueKey(
+                  "space-view-key-${widget.state.currentSpace!.localId}"),
+              onChildAdded: widget.state.clientManager.onSpaceAdded,
+              onChildRemoved: widget.state.clientManager.onSpaceRemoved,
+              onChildUpdated: widget.state.clientManager.onSpaceUpdated.stream,
+              onRoomSelected: (room) async {
+                selectRoom(room);
+              },
             )),
           ],
         ),