From d9e5c0279e1568f2ed1ea319f3d6bc2da6949b01 Mon Sep 17 00:00:00 2001
From: nvgurova <nyud91@gmail.com>
Date: Wed, 19 Feb 2025 20:02:22 +0100
Subject: [PATCH] DROID-3300 - Data Management Bottom Sheet now supports
 scrolling in landscape mode. - Applied .systemBarsPadding() to Set Edit View
 to prevent overlap with system buttons.Adjusted padding for better layout
 handling.

---
 .../anytype/core_ui/widgets/dv/ViewerEditWidget.kt     |  4 +++-
 .../anytype/ui_settings/fstorage/FilesStorageScreen.kt | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ViewerEditWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ViewerEditWidget.kt
index 53386a982a..a128118a67 100644
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ViewerEditWidget.kt
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ViewerEditWidget.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentWidth
@@ -86,7 +87,8 @@ fun ViewerEditWidget(
         ModalBottomSheet(
             modifier = Modifier
                 .windowInsetsPadding(WindowInsets.ime)
-                .padding(start = 8.dp, end = 8.dp, bottom = 30.dp)
+                .padding(start = 8.dp, end = 8.dp, bottom = 8.dp)
+                .systemBarsPadding()
                 .fillMaxWidth()
                 .wrapContentHeight(),
             scrimColor = colorResource(id = R.color.modal_screen_outside_background),
diff --git a/feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/fstorage/FilesStorageScreen.kt b/feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/fstorage/FilesStorageScreen.kt
index 5f045c9e5f..1267abbee8 100644
--- a/feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/fstorage/FilesStorageScreen.kt
+++ b/feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/fstorage/FilesStorageScreen.kt
@@ -33,6 +33,10 @@ import com.anytypeio.anytype.core_ui.views.ButtonWarning
 import com.anytypeio.anytype.core_ui.views.PreviewTitle2Medium
 import com.anytypeio.anytype.core_ui.views.Relations3
 import com.anytypeio.anytype.core_ui.views.Title1
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import com.anytypeio.anytype.presentation.settings.FilesStorageViewModel.ScreenState
 import com.anytypeio.anytype.ui_settings.R
 import com.anytypeio.anytype.ui_settings.fstorage.MockFileStorage.mockData
@@ -44,14 +48,16 @@ fun LocalStorageScreen(
     onDeleteAccountClicked: () -> Unit
 ) {
     Card(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier.fillMaxSize()
+            .nestedScroll(rememberNestedScrollInteropConnection()),
         shape = RoundedCornerShape(16.dp),
         backgroundColor = colorResource(id = R.color.background_secondary)
     ) {
         Column(
             modifier = Modifier
                 .fillMaxSize()
-                .padding(start = 20.dp, end = 20.dp),
+                .padding(start = 20.dp, end = 20.dp)
+                .verticalScroll(rememberScrollState())
         ) {
             Box(
                 modifier = Modifier