From 3187371d86ebcf73f95102ff81f2d574ae7ace7f Mon Sep 17 00:00:00 2001
From: Nadezhda-Gurova <84003815+Nadezhda-Gurova@users.noreply.github.com>
Date: Wed, 19 Feb 2025 21:36:55 +0100
Subject: [PATCH] DROID-3300 Sets | Enhancement | Update Bottom Sheet Set Edit
 View and Bottom Sheet Files Storage Screen for Landscape Mode (#2112)

Co-authored-by: Evgenii Kozlov <ubuphobos@gmail.com>
---
 .../anytype/core_ui/widgets/dv/ViewerEditWidget.kt     |  7 +++++--
 .../anytype/ui_settings/fstorage/FilesStorageScreen.kt | 10 ++++++++--
 2 files changed, 13 insertions(+), 4 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..1ef007bfcf 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
@@ -1,5 +1,6 @@
 package com.anytypeio.anytype.core_ui.widgets.dv
 
+import android.content.res.Configuration
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
@@ -10,6 +11,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
@@ -41,6 +43,7 @@ import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.boundsInRoot
 import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.SoftwareKeyboardController
@@ -50,7 +53,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
@@ -86,7 +88,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..a67be95f4a 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
@@ -13,12 +13,16 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Card
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
@@ -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