* Merge Latest and Browse into one * Add back Latest button * Change context to IO instead of launching a job * Use loading screen when loading initial page (cherry picked from commit cc6aef693e1a15f695ffa7eebd968004a6557010) # Conflicts: # app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt # app/src/main/java/eu/kanade/presentation/browse/BrowseLatestScreen.kt # app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/presentation/browse/SourceSearchScreen.kt # app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt # app/src/main/java/eu/kanade/presentation/browse/components/BrowseLatestToolbar.kt # app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt # app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowsePagingSource.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesPresenter.kt
57 lines
2.0 KiB
Kotlin
57 lines
2.0 KiB
Kotlin
package eu.kanade.presentation.browse
|
|
|
|
import androidx.compose.material3.SnackbarHostState
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.getValue
|
|
import androidx.compose.runtime.remember
|
|
import androidx.paging.compose.collectAsLazyPagingItems
|
|
import eu.kanade.domain.manga.model.Manga
|
|
import eu.kanade.presentation.browse.components.BrowseSourceSimpleToolbar
|
|
import eu.kanade.presentation.components.Scaffold
|
|
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter
|
|
|
|
@Composable
|
|
fun BrowseRecommendationsScreen(
|
|
presenter: BrowseSourcePresenter,
|
|
navigateUp: () -> Unit,
|
|
title: String,
|
|
onMangaClick: (Manga) -> Unit,
|
|
) {
|
|
val columns by presenter.getColumnsPreferenceForCurrentOrientation()
|
|
|
|
Scaffold(
|
|
topBar = { scrollBehavior ->
|
|
BrowseSourceSimpleToolbar(
|
|
navigateUp = navigateUp,
|
|
title = title,
|
|
displayMode = presenter.displayMode,
|
|
onDisplayModeChange = { presenter.displayMode = it },
|
|
scrollBehavior = scrollBehavior,
|
|
)
|
|
},
|
|
) { paddingValues ->
|
|
BrowseSourceContent(
|
|
state = presenter,
|
|
mangaList = presenter.getMangaList().collectAsLazyPagingItems(),
|
|
getMangaState = { presenter.getManga(it) },
|
|
// SY -->
|
|
getMetadataState = { manga, metadata ->
|
|
presenter.getRaisedSearchMetadata(manga, metadata)
|
|
},
|
|
// SY <--
|
|
columns = columns,
|
|
// SY -->
|
|
ehentaiBrowseDisplayMode = false,
|
|
// SY <--
|
|
displayMode = presenter.displayMode,
|
|
snackbarHostState = remember { SnackbarHostState() },
|
|
contentPadding = paddingValues,
|
|
onWebViewClick = null,
|
|
onHelpClick = null,
|
|
onLocalSourceHelpClick = null,
|
|
onMangaClick = onMangaClick,
|
|
onMangaLongClick = onMangaClick,
|
|
)
|
|
}
|
|
}
|