From e3a1b5f4ed3c1dc87407dc7297a3b2efb8e00dba Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Apr 2024 18:34:10 +0200
Subject: [PATCH] Fix non-scrollable screens.

---
 .../permissions/ChangeRoomPermissionsView.kt  | 53 +++++++++++--------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
index 1d57545a0b..c9e09c7c68 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
@@ -17,8 +17,9 @@
 package io.element.android.features.roomdetails.impl.rolesandpermissions.permissions
 
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -80,29 +81,35 @@ fun ChangeRoomPermissionsView(
             )
         }
     ) { padding ->
-        Column(modifier = Modifier.padding(padding)) {
+        LazyColumn(
+            modifier = Modifier
+                .padding(padding)
+                .fillMaxSize()
+        ) {
             for ((index, permissionItem) in state.items.withIndex()) {
-                ListSectionHeader(titleForSection(item = permissionItem), hasDivider = index > 0)
-                SelectRoleItem(
-                    permissionsItem = permissionItem,
-                    role = RoomMember.Role.ADMIN,
-                    currentPermissions = state.currentPermissions
-                ) { item, role ->
-                    state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(item, role))
-                }
-                SelectRoleItem(
-                    permissionsItem = permissionItem,
-                    role = RoomMember.Role.MODERATOR,
-                    currentPermissions = state.currentPermissions
-                ) { item, role ->
-                    state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(item, role))
-                }
-                SelectRoleItem(
-                    permissionsItem = permissionItem,
-                    role = RoomMember.Role.USER,
-                    currentPermissions = state.currentPermissions
-                ) { item, role ->
-                    state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(item, role))
+                item {
+                    ListSectionHeader(titleForSection(item = permissionItem), hasDivider = index > 0)
+                    SelectRoleItem(
+                        permissionsItem = permissionItem,
+                        role = RoomMember.Role.ADMIN,
+                        currentPermissions = state.currentPermissions
+                    ) { item, role ->
+                        state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(item, role))
+                    }
+                    SelectRoleItem(
+                        permissionsItem = permissionItem,
+                        role = RoomMember.Role.MODERATOR,
+                        currentPermissions = state.currentPermissions
+                    ) { item, role ->
+                        state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(item, role))
+                    }
+                    SelectRoleItem(
+                        permissionsItem = permissionItem,
+                        role = RoomMember.Role.USER,
+                        currentPermissions = state.currentPermissions
+                    ) { item, role ->
+                        state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(item, role))
+                    }
                 }
             }
         }