From 9c78e378023fa85e326546aaafb0de6645c155e4 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Wed, 16 Nov 2022 13:52:17 -0500 Subject: [PATCH] Cherry pick fixes --- .../main/java/eu/kanade/presentation/browse/FeedScreen.kt | 4 ++-- .../java/eu/kanade/presentation/browse/SourceFeedScreen.kt | 4 ++-- .../java/eu/kanade/presentation/browse/SourcesScreen.kt | 2 +- .../kanade/presentation/category/BiometricTimesScreen.kt | 7 ++++--- .../java/eu/kanade/presentation/category/SortTagScreen.kt | 7 ++++--- .../kanade/presentation/category/SourceCategoryScreen.kt | 7 ++++--- .../eu/kanade/presentation/category/SourceRepoScreen.kt | 7 ++++--- .../components/biometric/BiometricTimesListItem.kt | 7 ++++--- .../category/components/genre/SortTagListItem.kt | 7 ++++--- .../category/components/repo/SourceRepoListItem.kt | 7 ++++--- .../category/components/sources/SourceCategoryListItem.kt | 7 ++++--- .../more/settings/screen/SettingsLibraryScreen.kt | 1 + .../more/settings/screen/SettingsMangadexScreen.kt | 5 +++-- .../java/eu/kanade/tachiyomi/data/track/TrackManager.kt | 1 - .../main/java/eu/kanade/tachiyomi/source/LocalSource.kt | 2 +- .../java/eu/kanade/tachiyomi/source/online/all/EHentai.kt | 2 +- app/src/main/java/exh/debug/SettingsDebugController.kt | 4 ++-- .../java/exh/pagepreview/components/PagePreviewScreen.kt | 4 ++-- .../main/java/exh/ui/metadata/MetadataViewController.kt | 4 ++-- 19 files changed, 49 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt index c65cb3f79..897504775 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt @@ -50,7 +50,7 @@ import eu.kanade.presentation.components.LoadingScreen import eu.kanade.presentation.components.MangaCover import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.topPaddingValues +import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.browse.feed.FeedPresenter @@ -145,7 +145,7 @@ fun FeedList( onClickManga: (Manga) -> Unit, ) { ScrollbarLazyColumn( - contentPadding = contentPadding + topPaddingValues, + contentPadding = contentPadding + topSmallPaddingValues, ) { items( state.items.orEmpty(), diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt index 6dc3d4604..db9e98f29 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt @@ -32,7 +32,7 @@ import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.SearchToolbar import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.topPaddingValues +import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.source.feed.SourceFeedPresenter import exh.savedsearches.models.FeedSavedSearch @@ -152,7 +152,7 @@ fun SourceFeedList( onClickManga: (Manga) -> Unit, ) { ScrollbarLazyColumn( - contentPadding = paddingValues + topPaddingValues, + contentPadding = paddingValues + topSmallPaddingValues, ) { items( state.items.orEmpty(), diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt index 57fefe45e..18c8de792 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt @@ -353,7 +353,7 @@ fun SourceCategoriesDialog( Text( text = it, - modifier = Modifier.padding(horizontal = horizontalPadding), + modifier = Modifier.padding(horizontal = MaterialTheme.padding.medium), ) } } diff --git a/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt b/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt index 2da4ddd0c..9e3cf45de 100644 --- a/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt @@ -3,6 +3,7 @@ package eu.kanade.presentation.category import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -11,9 +12,9 @@ import eu.kanade.presentation.category.components.biometric.BiometricTimesConten import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.Scaffold -import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.topPaddingValues +import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesScreenState import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem @@ -52,7 +53,7 @@ fun BiometricTimesScreen( BiometricTimesContent( timeRanges = state.timeRanges, lazyListState = lazyListState, - paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding), + paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium), onClickDelete = onClickDelete, ) } diff --git a/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt b/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt index f5ab3ec8f..e8df01801 100644 --- a/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt @@ -3,6 +3,7 @@ package eu.kanade.presentation.category import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -11,9 +12,9 @@ import eu.kanade.presentation.category.components.genre.SortTagContent import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.Scaffold -import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.topPaddingValues +import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.genre.SortTagScreenState @@ -53,7 +54,7 @@ fun SortTagScreen( SortTagContent( tags = state.tags, lazyListState = lazyListState, - paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding), + paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium), onClickDelete = onClickDelete, onMoveUp = onClickMoveUp, onMoveDown = onClickMoveDown, diff --git a/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt b/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt index 797c7801f..a2546c490 100644 --- a/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt @@ -3,6 +3,7 @@ package eu.kanade.presentation.category import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -11,9 +12,9 @@ import eu.kanade.presentation.category.components.sources.SourceCategoryContent import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.Scaffold -import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.topPaddingValues +import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryScreenState @@ -52,7 +53,7 @@ fun SourceCategoryScreen( SourceCategoryContent( categories = state.categories, lazyListState = lazyListState, - paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding), + paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium), onClickRename = onClickRename, onClickDelete = onClickDelete, ) diff --git a/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt b/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt index 6490c3c4b..fca82ea35 100644 --- a/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt @@ -3,6 +3,7 @@ package eu.kanade.presentation.category import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -11,9 +12,9 @@ import eu.kanade.presentation.category.components.repo.SourceRepoContent import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.Scaffold -import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.topPaddingValues +import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.repos.RepoScreenState @@ -51,7 +52,7 @@ fun SourceRepoScreen( SourceRepoContent( repos = state.repos, lazyListState = lazyListState, - paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding), + paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium), onClickDelete = onClickDelete, ) } diff --git a/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt b/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt index fd666ac43..d67a43f41 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt @@ -10,11 +10,12 @@ import androidx.compose.material.icons.outlined.Label import androidx.compose.material3.ElevatedCard import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.padding import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem @Composable @@ -29,11 +30,11 @@ fun BiometricTimesListItem( Row( modifier = Modifier .fillMaxWidth() - .padding(start = horizontalPadding, top = horizontalPadding, end = horizontalPadding), + .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium), verticalAlignment = Alignment.CenterVertically, ) { Icon(imageVector = Icons.Outlined.Label, contentDescription = "") - Text(text = timeRange.formattedString, modifier = Modifier.padding(start = horizontalPadding)) + Text(text = timeRange.formattedString, modifier = Modifier.padding(start = MaterialTheme.padding.medium)) } Row { Spacer(modifier = Modifier.weight(1f)) diff --git a/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt b/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt index 3c8655541..a9a7fbeee 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt @@ -12,11 +12,12 @@ import androidx.compose.material.icons.outlined.Label import androidx.compose.material3.ElevatedCard import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.padding @Composable fun SortTagListItem( @@ -34,11 +35,11 @@ fun SortTagListItem( Row( modifier = Modifier .fillMaxWidth() - .padding(start = horizontalPadding, top = horizontalPadding, end = horizontalPadding), + .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium), verticalAlignment = Alignment.CenterVertically, ) { Icon(imageVector = Icons.Outlined.Label, contentDescription = "") - Text(text = tag, modifier = Modifier.padding(start = horizontalPadding)) + Text(text = tag, modifier = Modifier.padding(start = MaterialTheme.padding.medium)) } Row { IconButton( diff --git a/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt b/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt index ecfb57783..eb5c01e24 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt @@ -10,11 +10,12 @@ import androidx.compose.material.icons.outlined.Label import androidx.compose.material3.ElevatedCard import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.padding @Composable fun SourceRepoListItem( @@ -28,11 +29,11 @@ fun SourceRepoListItem( Row( modifier = Modifier .fillMaxWidth() - .padding(start = horizontalPadding, top = horizontalPadding, end = horizontalPadding), + .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium), verticalAlignment = Alignment.CenterVertically, ) { Icon(imageVector = Icons.Outlined.Label, contentDescription = "") - Text(text = repo, modifier = Modifier.padding(start = horizontalPadding)) + Text(text = repo, modifier = Modifier.padding(start = MaterialTheme.padding.medium)) } Row { Spacer(modifier = Modifier.weight(1f)) diff --git a/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt b/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt index 892caa079..a7129c0e9 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt @@ -12,11 +12,12 @@ import androidx.compose.material.icons.outlined.Label import androidx.compose.material3.ElevatedCard import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.padding @Composable fun SourceCategoryListItem( @@ -32,11 +33,11 @@ fun SourceCategoryListItem( modifier = Modifier .fillMaxWidth() .clickable { onRename() } - .padding(start = horizontalPadding, top = horizontalPadding, end = horizontalPadding), + .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium), verticalAlignment = Alignment.CenterVertically, ) { Icon(imageVector = Icons.Outlined.Label, contentDescription = "") - Text(text = category, modifier = Modifier.padding(start = horizontalPadding)) + Text(text = category, modifier = Modifier.padding(start = MaterialTheme.padding.medium)) } Row { Spacer(modifier = Modifier.weight(1f)) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt index 974f09588..cb3a4a3a2 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt @@ -34,6 +34,7 @@ import androidx.compose.ui.util.fastMap import androidx.core.content.ContextCompat import cafe.adriel.voyager.navigator.currentOrThrow import com.bluelinelabs.conductor.Router +import com.commandiron.wheel_picker_compose.WheelPicker import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.category.interactor.GetCategories import eu.kanade.domain.category.interactor.ResetCategoryFlags diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt index 85d97188a..823182500 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt @@ -19,6 +19,7 @@ import androidx.compose.material3.Button import androidx.compose.material3.Checkbox import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -43,7 +44,7 @@ import androidx.compose.ui.window.DialogProperties import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.presentation.more.settings.Preference -import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.padding import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.library.LibraryUpdateService import eu.kanade.tachiyomi.source.online.all.MangaDex @@ -331,7 +332,7 @@ class SettingsMangadexScreen : SearchableSettings { Text( text = followOption, - modifier = Modifier.padding(horizontal = horizontalPadding), + modifier = Modifier.padding(horizontal = MaterialTheme.padding.medium), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt index 70470caab..00bdbc1b9 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt @@ -39,7 +39,6 @@ class TrackManager(context: Context) { val mangaUpdates = MangaUpdates(context, MANGA_UPDATES) val kavita = Kavita(context, KAVITA) - val services = listOf(mdList, myAnimeList, aniList, kitsu, shikimori, bangumi, komga, mangaUpdates, kavita) fun getService(id: Long) = services.find { it.id == id } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt index d66f50595..f89c72786 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt @@ -270,7 +270,7 @@ class LocalSource( val comicInfo = AndroidXmlReader(stream, StandardCharsets.UTF_8.name()).use { xml.decodeFromReader(it) } - + manga.copyFromComicInfo(comicInfo) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index 8cc3633cc..978d379ed 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -243,7 +243,7 @@ class EHentai( .any { "next" in it.attr("href") } } val nextPage = if (parsedLocation?.pathSegments?.contains("toplist.php") == true) { - ((parsedLocation!!.queryParameter("p")?.toLong() ?: 0) + 2).takeIf { it <= 200 } + ((parsedLocation.queryParameter("p")?.toLong() ?: 0) + 2).takeIf { it <= 200 } } else if (hasNextPage) { parsedMangas.let { if (isReversed) it.first() else it.last() } .manga diff --git a/app/src/main/java/exh/debug/SettingsDebugController.kt b/app/src/main/java/exh/debug/SettingsDebugController.kt index 2c1985410..856332c9b 100644 --- a/app/src/main/java/exh/debug/SettingsDebugController.kt +++ b/app/src/main/java/exh/debug/SettingsDebugController.kt @@ -52,7 +52,7 @@ import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.topPaddingValues +import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.ui.base.controller.BasicFullComposeController import exh.util.capitalize import kotlinx.coroutines.Dispatchers @@ -116,7 +116,7 @@ class SettingsDebugController : BasicFullComposeController() { Modifier.fillMaxSize(), contentPadding = paddingValues + WindowInsets.navigationBars.only(WindowInsetsSides.Vertical).asPaddingValues() + - topPaddingValues, + topSmallPaddingValues, ) { item { Text( diff --git a/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt b/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt index 619b4f175..5c9b3274f 100644 --- a/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt +++ b/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt @@ -38,7 +38,7 @@ import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.manga.components.PagePreview import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.topPaddingValues +import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import exh.pagepreview.PagePreviewState import exh.util.floor @@ -84,7 +84,7 @@ fun PagePreviewScreen( ScrollbarLazyColumn( state = lazyListState, modifier = Modifier, - contentPadding = paddingValues + topPaddingValues, + contentPadding = paddingValues + topSmallPaddingValues, verticalArrangement = Arrangement.spacedBy(8.dp), ) { items(items) { diff --git a/app/src/main/java/exh/ui/metadata/MetadataViewController.kt b/app/src/main/java/exh/ui/metadata/MetadataViewController.kt index 9e7a4e4ff..a4f2b1c9a 100644 --- a/app/src/main/java/exh/ui/metadata/MetadataViewController.kt +++ b/app/src/main/java/exh/ui/metadata/MetadataViewController.kt @@ -29,7 +29,7 @@ import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.util.clickableNoIndication import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.topPaddingValues +import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceManager @@ -86,7 +86,7 @@ class MetadataViewController : FullComposeController { val context = LocalContext.current val items = remember(state.meta) { state.meta.getExtraInfoPairs(context) } ScrollbarLazyColumn( - contentPadding = paddingValues + WindowInsets.navigationBars.asPaddingValues() + topPaddingValues, + contentPadding = paddingValues + WindowInsets.navigationBars.asPaddingValues() + topSmallPaddingValues, ) { items(items) { (title, text) -> Row(