WIP

libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/SafeChildrenTransitionScope.kt

@@ -186,6 +186,7 @@ class SafeChildrenTransitionScope<T : Any, S>(
 }
 
 @OptIn(ExperimentalSharedTransitionApi::class)
+@Suppress("ContentSlotReused")
 @Composable
 inline fun <reified NavTarget : Any, State> ParentNode<NavTarget>.SafeChildren(
     navModel: NavModel<NavTarget, State>,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ModalBottomSheet.kt

@@ -24,6 +24,8 @@ import androidx.compose.material3.SheetState
 import androidx.compose.material3.contentColorFor
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.movableContentOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
@@ -88,14 +90,15 @@ fun ModalBottomSheet(
         dragHandle = dragHandle,
         contentWindowInsets = contentWindowInsets,
     ) {
+        val movableContent = remember { movableContentOf { content() } }
         if (scrollable) {
             Column(
                 modifier = Modifier.verticalScroll(rememberScrollState()),
             ) {
-                content()
+                movableContent()
             }
         } else {
-            content()
+            movableContent()
         }
     }
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarPickerView.kt

@@ -184,6 +184,7 @@ private fun PickButton(
     }
 }
 
+@Suppress("ModifierClickableOrder")
 @Composable
 private fun BoxScope.OverlayEditButton(
     onClick: () -> Unit,

libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeCameraView.kt

@@ -114,7 +114,7 @@ fun QrCodeCameraView(
     Box(modifier.clipToBounds()) {
         if (LocalInspectionMode.current) {
             Box(
-                modifier = modifier
+                modifier = Modifier
                     .background(color = ElementTheme.colors.bgSubtlePrimary),
                 contentAlignment = Alignment.Center,
             ) {