Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cherry pick fixes

Browse Source
This commit is contained in:
Jobobby04 2022-11-16 13:52:17 -05:00
parent 0fc9cf6779
commit 9c78e37802
19 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt
View File

@ -50,7 +50,7 @@ import eu.kanade.presentation.components.LoadingScreen
import eu.kanade.presentation.components.MangaCover import eu.kanade.presentation.components.MangaCover
import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.ScrollbarLazyColumn
import eu.kanade.presentation.util.plus 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.R
import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.ui.browse.feed.FeedPresenter import eu.kanade.tachiyomi.ui.browse.feed.FeedPresenter
@ -145,7 +145,7 @@ fun FeedList(
onClickManga: (Manga) -> Unit, onClickManga: (Manga) -> Unit,
) { ) {
ScrollbarLazyColumn( ScrollbarLazyColumn(
contentPadding = contentPadding + topPaddingValues, contentPadding = contentPadding + topSmallPaddingValues,
) { ) {
items( items(
state.items.orEmpty(), state.items.orEmpty(),

4
app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt
View File

@ -32,7 +32,7 @@ import eu.kanade.presentation.components.Scaffold
import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.ScrollbarLazyColumn
import eu.kanade.presentation.components.SearchToolbar import eu.kanade.presentation.components.SearchToolbar
import eu.kanade.presentation.util.plus 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.R
import eu.kanade.tachiyomi.ui.browse.source.feed.SourceFeedPresenter import eu.kanade.tachiyomi.ui.browse.source.feed.SourceFeedPresenter
import exh.savedsearches.models.FeedSavedSearch import exh.savedsearches.models.FeedSavedSearch
@ -152,7 +152,7 @@ fun SourceFeedList(
onClickManga: (Manga) -> Unit, onClickManga: (Manga) -> Unit,
) { ) {
ScrollbarLazyColumn( ScrollbarLazyColumn(
contentPadding = paddingValues + topPaddingValues, contentPadding = paddingValues + topSmallPaddingValues,
) { ) {
items( items(
state.items.orEmpty(), state.items.orEmpty(),

2
app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
View File

@ -353,7 +353,7 @@ fun SourceCategoriesDialog(
Text( Text(
text = it, text = it,
modifier = Modifier.padding(horizontal = horizontalPadding), modifier = Modifier.padding(horizontal = MaterialTheme.padding.medium),
) )
} }
} }

7
app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt
View File

@ -3,6 +3,7 @@ package eu.kanade.presentation.category
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource 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.AppBar
import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EmptyScreen
import eu.kanade.presentation.components.Scaffold 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.plus
import eu.kanade.presentation.util.topPaddingValues import eu.kanade.presentation.util.topSmallPaddingValues
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesScreenState import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesScreenState
import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem
@ -52,7 +53,7 @@ fun BiometricTimesScreen(
BiometricTimesContent( BiometricTimesContent(
timeRanges = state.timeRanges, timeRanges = state.timeRanges,
lazyListState = lazyListState, lazyListState = lazyListState,
paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding), paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium),
onClickDelete = onClickDelete, onClickDelete = onClickDelete,
) )
} }

7
app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt
View File

@ -3,6 +3,7 @@ package eu.kanade.presentation.category
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource 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.AppBar
import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EmptyScreen
import eu.kanade.presentation.components.Scaffold 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.plus
import eu.kanade.presentation.util.topPaddingValues import eu.kanade.presentation.util.topSmallPaddingValues
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.category.genre.SortTagScreenState import eu.kanade.tachiyomi.ui.category.genre.SortTagScreenState
@ -53,7 +54,7 @@ fun SortTagScreen(
SortTagContent( SortTagContent(
tags = state.tags, tags = state.tags,
lazyListState = lazyListState, lazyListState = lazyListState,
paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding), paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium),
onClickDelete = onClickDelete, onClickDelete = onClickDelete,
onMoveUp = onClickMoveUp, onMoveUp = onClickMoveUp,
onMoveDown = onClickMoveDown, onMoveDown = onClickMoveDown,

7
app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt
View File

@ -3,6 +3,7 @@ package eu.kanade.presentation.category
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource 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.AppBar
import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EmptyScreen
import eu.kanade.presentation.components.Scaffold 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.plus
import eu.kanade.presentation.util.topPaddingValues import eu.kanade.presentation.util.topSmallPaddingValues
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryScreenState import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryScreenState
@ -52,7 +53,7 @@ fun SourceCategoryScreen(
SourceCategoryContent( SourceCategoryContent(
categories = state.categories, categories = state.categories,
lazyListState = lazyListState, lazyListState = lazyListState,
paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding), paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium),
onClickRename = onClickRename, onClickRename = onClickRename,
onClickDelete = onClickDelete, onClickDelete = onClickDelete,
) )

7
app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt
View File

@ -3,6 +3,7 @@ package eu.kanade.presentation.category
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource 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.AppBar
import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EmptyScreen
import eu.kanade.presentation.components.Scaffold 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.plus
import eu.kanade.presentation.util.topPaddingValues import eu.kanade.presentation.util.topSmallPaddingValues
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.category.repos.RepoScreenState import eu.kanade.tachiyomi.ui.category.repos.RepoScreenState
@ -51,7 +52,7 @@ fun SourceRepoScreen(
SourceRepoContent( SourceRepoContent(
repos = state.repos, repos = state.repos,
lazyListState = lazyListState, lazyListState = lazyListState,
paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding), paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium),
onClickDelete = onClickDelete, onClickDelete = onClickDelete,
) )
} }

7
app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt
View File

@ -10,11 +10,12 @@ import androidx.compose.material.icons.outlined.Label
import androidx.compose.material3.ElevatedCard import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier 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 import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem
@Composable @Composable
@ -29,11 +30,11 @@ fun BiometricTimesListItem(
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(start = horizontalPadding, top = horizontalPadding, end = horizontalPadding), .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
Icon(imageVector = Icons.Outlined.Label, contentDescription = "") 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 { Row {
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))

7
app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt
View File

@ -12,11 +12,12 @@ import androidx.compose.material.icons.outlined.Label
import androidx.compose.material3.ElevatedCard import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import eu.kanade.presentation.util.horizontalPadding import eu.kanade.presentation.util.padding
@Composable @Composable
fun SortTagListItem( fun SortTagListItem(
@ -34,11 +35,11 @@ fun SortTagListItem(
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(start = horizontalPadding, top = horizontalPadding, end = horizontalPadding), .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
Icon(imageVector = Icons.Outlined.Label, contentDescription = "") 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 { Row {
IconButton( IconButton(

7
app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt
View File

@ -10,11 +10,12 @@ import androidx.compose.material.icons.outlined.Label
import androidx.compose.material3.ElevatedCard import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import eu.kanade.presentation.util.horizontalPadding import eu.kanade.presentation.util.padding
@Composable @Composable
fun SourceRepoListItem( fun SourceRepoListItem(
@ -28,11 +29,11 @@ fun SourceRepoListItem(
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(start = horizontalPadding, top = horizontalPadding, end = horizontalPadding), .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
Icon(imageVector = Icons.Outlined.Label, contentDescription = "") 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 { Row {
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))

7
app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt
View File

@ -12,11 +12,12 @@ import androidx.compose.material.icons.outlined.Label
import androidx.compose.material3.ElevatedCard import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import eu.kanade.presentation.util.horizontalPadding import eu.kanade.presentation.util.padding
@Composable @Composable
fun SourceCategoryListItem( fun SourceCategoryListItem(
@ -32,11 +33,11 @@ fun SourceCategoryListItem(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clickable { onRename() } .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, verticalAlignment = Alignment.CenterVertically,
) { ) {
Icon(imageVector = Icons.Outlined.Label, contentDescription = "") 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 { Row {
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))

1
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
View File

@ -34,6 +34,7 @@ import androidx.compose.ui.util.fastMap
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.currentOrThrow
import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.Router
import com.commandiron.wheel_picker_compose.WheelPicker
import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.UnsortedPreferences
import eu.kanade.domain.category.interactor.GetCategories import eu.kanade.domain.category.interactor.GetCategories
import eu.kanade.domain.category.interactor.ResetCategoryFlags import eu.kanade.domain.category.interactor.ResetCategoryFlags

5
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt
View File

@ -19,6 +19,7 @@ import androidx.compose.material3.Button
import androidx.compose.material3.Checkbox import androidx.compose.material3.Checkbox
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
@ -43,7 +44,7 @@ import androidx.compose.ui.window.DialogProperties
import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.UnsortedPreferences
import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.source.service.SourcePreferences
import eu.kanade.presentation.more.settings.Preference 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.R
import eu.kanade.tachiyomi.data.library.LibraryUpdateService import eu.kanade.tachiyomi.data.library.LibraryUpdateService
import eu.kanade.tachiyomi.source.online.all.MangaDex import eu.kanade.tachiyomi.source.online.all.MangaDex
@ -331,7 +332,7 @@ class SettingsMangadexScreen : SearchableSettings {
Text( Text(
text = followOption, text = followOption,
modifier = Modifier.padding(horizontal = horizontalPadding), modifier = Modifier.padding(horizontal = MaterialTheme.padding.medium),
) )
} }
} }

1
app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
View File

@ -39,7 +39,6 @@ class TrackManager(context: Context) {
val mangaUpdates = MangaUpdates(context, MANGA_UPDATES) val mangaUpdates = MangaUpdates(context, MANGA_UPDATES)
val kavita = Kavita(context, KAVITA) val kavita = Kavita(context, KAVITA)
val services = listOf(mdList, myAnimeList, aniList, kitsu, shikimori, bangumi, komga, mangaUpdates, kavita) val services = listOf(mdList, myAnimeList, aniList, kitsu, shikimori, bangumi, komga, mangaUpdates, kavita)
fun getService(id: Long) = services.find { it.id == id } fun getService(id: Long) = services.find { it.id == id }

2
app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
View File

@ -270,7 +270,7 @@ class LocalSource(
val comicInfo = AndroidXmlReader(stream, StandardCharsets.UTF_8.name()).use { val comicInfo = AndroidXmlReader(stream, StandardCharsets.UTF_8.name()).use {
xml.decodeFromReader<ComicInfo>(it) xml.decodeFromReader<ComicInfo>(it)
} }
manga.copyFromComicInfo(comicInfo) manga.copyFromComicInfo(comicInfo)
} }

2
app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
View File

@ -243,7 +243,7 @@ class EHentai(
.any { "next" in it.attr("href") } .any { "next" in it.attr("href") }
} }
val nextPage = if (parsedLocation?.pathSegments?.contains("toplist.php") == true) { 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) { } else if (hasNextPage) {
parsedMangas.let { if (isReversed) it.first() else it.last() } parsedMangas.let { if (isReversed) it.first() else it.last() }
.manga .manga

4
app/src/main/java/exh/debug/SettingsDebugController.kt
View File

@ -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.TextPreferenceWidget
import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer
import eu.kanade.presentation.util.plus 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 eu.kanade.tachiyomi.ui.base.controller.BasicFullComposeController
import exh.util.capitalize import exh.util.capitalize
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -116,7 +116,7 @@ class SettingsDebugController : BasicFullComposeController() {
Modifier.fillMaxSize(), Modifier.fillMaxSize(),
contentPadding = paddingValues + contentPadding = paddingValues +
WindowInsets.navigationBars.only(WindowInsetsSides.Vertical).asPaddingValues() + WindowInsets.navigationBars.only(WindowInsetsSides.Vertical).asPaddingValues() +
topPaddingValues, topSmallPaddingValues,
) { ) {
item { item {
Text( Text(

4
app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt
View File

@ -38,7 +38,7 @@ import eu.kanade.presentation.components.Scaffold
import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.ScrollbarLazyColumn
import eu.kanade.presentation.manga.components.PagePreview import eu.kanade.presentation.manga.components.PagePreview
import eu.kanade.presentation.util.plus 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.R
import exh.pagepreview.PagePreviewState import exh.pagepreview.PagePreviewState
import exh.util.floor import exh.util.floor
@ -84,7 +84,7 @@ fun PagePreviewScreen(
ScrollbarLazyColumn( ScrollbarLazyColumn(
state = lazyListState, state = lazyListState,
modifier = Modifier, modifier = Modifier,
contentPadding = paddingValues + topPaddingValues, contentPadding = paddingValues + topSmallPaddingValues,
verticalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp),
) { ) {
items(items) { items(items) {

4
app/src/main/java/exh/ui/metadata/MetadataViewController.kt
View File

@ -29,7 +29,7 @@ import eu.kanade.presentation.components.Scaffold
import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.ScrollbarLazyColumn
import eu.kanade.presentation.util.clickableNoIndication import eu.kanade.presentation.util.clickableNoIndication
import eu.kanade.presentation.util.plus 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.R
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
@ -86,7 +86,7 @@ class MetadataViewController : FullComposeController<MetadataViewPresenter> {
val context = LocalContext.current val context = LocalContext.current
val items = remember(state.meta) { state.meta.getExtraInfoPairs(context) } val items = remember(state.meta) { state.meta.getExtraInfoPairs(context) }
ScrollbarLazyColumn( ScrollbarLazyColumn(
contentPadding = paddingValues + WindowInsets.navigationBars.asPaddingValues() + topPaddingValues, contentPadding = paddingValues + WindowInsets.navigationBars.asPaddingValues() + topSmallPaddingValues,
) { ) {
items(items) { (title, text) -> items(items) { (title, text) ->
Row( Row(