From 179e470154f198bad972da88997b90e549fd364b Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 12 Jul 2023 11:08:02 +0800 Subject: [PATCH] Make DownloadScreen scrollable --- .../com/hippo/ehviewer/ui/settings/DownloadScreen.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt index 261722775..6d0654c6c 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt @@ -5,7 +5,11 @@ import android.content.Intent.FLAG_GRANT_WRITE_URI_PERMISSION import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material3.Icon @@ -69,8 +73,8 @@ fun DownloadScreen() { ) }, snackbarHost = { SnackbarHost(snackbarHostState) }, - ) { padding -> - Column(modifier = Modifier.padding(padding).nestedScroll(scrollBehavior.nestedScrollConnection)) { + ) { paddingValues -> + Column(modifier = Modifier.padding(top = paddingValues.calculateTopPadding()).nestedScroll(scrollBehavior.nestedScrollConnection).verticalScroll(rememberScrollState())) { var downloadLocationState by ::downloadLocation.observed val cannotGetDownloadLocation = stringResource(id = R.string.settings_download_cant_get_download_location) val selectDownloadDirLauncher = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocumentTree()) { treeUri -> @@ -228,6 +232,7 @@ fun DownloadScreen() { it.printStackTrace() } } + Spacer(modifier = Modifier.size(paddingValues.calculateBottomPadding())) } } }