From e94295bef8b77e4745beab37c7ada201495b9acb Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 7 Jul 2023 14:16:52 +0200
Subject: [PATCH 1/3] LoadingRoomNode : fix windowInsets...

---
 .../android/appnav/room/LoadingRoomNodeView.kt        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt
index b684d21703..ccc80c7ad6 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt
@@ -72,7 +72,8 @@ fun LoadingRoomNodeView(
                 modifier = Modifier
                     .fillMaxSize()
                     .padding(padding)
-                    .padding(16.dp), contentAlignment = Alignment.Center
+                    .padding(16.dp),
+                contentAlignment = Alignment.Center
             ) {
                 if (state is LoadingRoomState.Error) {
                     Text(
@@ -90,9 +91,12 @@ fun LoadingRoomNodeView(
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun LoadingRoomTopBar(onBackClicked: () -> Unit) {
+private fun LoadingRoomTopBar(
+    onBackClicked: () -> Unit,
+    modifier: Modifier = Modifier
+) {
     TopAppBar(
-        modifier = Modifier,
+        modifier = modifier,
         navigationIcon = {
             BackButton(onClick = onBackClicked)
         },
@@ -112,6 +116,7 @@ private fun LoadingRoomTopBar(onBackClicked: () -> Unit) {
                 PlaceholderAtom(width = 45.dp, height = 7.dp)
             }
         },
+        windowInsets = WindowInsets(0.dp),
     )
 }
 

From 8af99fe2807211f294d1b9b7eddc2c0e6dd28167 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 10 Jul 2023 15:13:32 +0200
Subject: [PATCH 2/3] LoadingRoomNodeView: ConsumeWindowInsets...

---
 .../io/element/android/appnav/room/LoadingRoomNodeView.kt     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt
index ccc80c7ad6..e5ccfc9dbb 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt
@@ -19,9 +19,11 @@ package io.element.android.appnav.room
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -51,6 +53,7 @@ import io.element.android.libraries.designsystem.theme.placeholderBackground
 import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun LoadingRoomNodeView(
     state: LoadingRoomState,
@@ -72,6 +75,7 @@ fun LoadingRoomNodeView(
                 modifier = Modifier
                     .fillMaxSize()
                     .padding(padding)
+                    .consumeWindowInsets(padding)
                     .padding(16.dp),
                 contentAlignment = Alignment.Center
             ) {

From 5d1be53ff4f15b261b98181ac7a6835abef7daaf Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 10 Jul 2023 15:33:32 +0200
Subject: [PATCH 3/3] RoomNodeView: remove contentWindowInsets=systemBars as
 it's default one

---
 .../io/element/android/appnav/room/LoadingRoomNodeView.kt       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt
index e5ccfc9dbb..362767e12d 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt
@@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -63,7 +62,6 @@ fun LoadingRoomNodeView(
 ) {
     Scaffold(
         modifier = modifier,
-        contentWindowInsets = WindowInsets.systemBars,
         topBar = {
             Column {
                 ConnectivityIndicatorView(isOnline = hasNetworkConnection)