99d5d8b91f
* 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
82 lines
2.8 KiB
Kotlin
82 lines
2.8 KiB
Kotlin
package eu.kanade.presentation.browse
|
|
|
|
import androidx.compose.material3.SnackbarHost
|
|
import androidx.compose.material3.SnackbarHostState
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.getValue
|
|
import androidx.compose.runtime.remember
|
|
import androidx.compose.ui.platform.LocalUriHandler
|
|
import androidx.paging.compose.collectAsLazyPagingItems
|
|
import eu.kanade.domain.manga.model.Manga
|
|
import eu.kanade.presentation.browse.components.BrowseSourceSearchToolbar
|
|
import eu.kanade.presentation.components.Scaffold
|
|
import eu.kanade.tachiyomi.source.LocalSource
|
|
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter
|
|
import eu.kanade.tachiyomi.ui.more.MoreController
|
|
|
|
@Composable
|
|
fun SourceSearchScreen(
|
|
presenter: BrowseSourcePresenter,
|
|
navigateUp: () -> Unit,
|
|
onFabClick: () -> Unit,
|
|
onMangaClick: (Manga) -> Unit,
|
|
onWebViewClick: () -> Unit,
|
|
) {
|
|
val columns by presenter.getColumnsPreferenceForCurrentOrientation()
|
|
|
|
val mangaList = presenter.getMangaList().collectAsLazyPagingItems()
|
|
|
|
val snackbarHostState = remember { SnackbarHostState() }
|
|
|
|
val uriHandler = LocalUriHandler.current
|
|
|
|
val onHelpClick = {
|
|
uriHandler.openUri(LocalSource.HELP_URL)
|
|
}
|
|
|
|
Scaffold(
|
|
topBar = { scrollBehavior ->
|
|
BrowseSourceSearchToolbar(
|
|
searchQuery = presenter.searchQuery ?: "",
|
|
onSearchQueryChanged = { presenter.searchQuery = it },
|
|
navigateUp = navigateUp,
|
|
onResetClick = { presenter.searchQuery = "" },
|
|
onSearchClick = { presenter.search() },
|
|
scrollBehavior = scrollBehavior,
|
|
)
|
|
},
|
|
floatingActionButton = {
|
|
BrowseSourceFloatingActionButton(
|
|
isVisible = presenter.filters.isNotEmpty(),
|
|
onFabClick = onFabClick,
|
|
)
|
|
},
|
|
snackbarHost = {
|
|
SnackbarHost(hostState = snackbarHostState)
|
|
},
|
|
) { paddingValues ->
|
|
BrowseSourceContent(
|
|
state = presenter,
|
|
mangaList = mangaList,
|
|
getMangaState = { presenter.getManga(it) },
|
|
// SY -->
|
|
getMetadataState = { manga, metadata ->
|
|
presenter.getRaisedSearchMetadata(manga, metadata)
|
|
},
|
|
// SY <--
|
|
columns = columns,
|
|
// SY -->
|
|
ehentaiBrowseDisplayMode = presenter.ehentaiBrowseDisplayMode,
|
|
// SY <--
|
|
displayMode = presenter.displayMode,
|
|
snackbarHostState = snackbarHostState,
|
|
contentPadding = paddingValues,
|
|
onWebViewClick = onWebViewClick,
|
|
onHelpClick = { uriHandler.openUri(MoreController.URL_HELP) },
|
|
onLocalSourceHelpClick = onHelpClick,
|
|
onMangaClick = onMangaClick,
|
|
onMangaLongClick = onMangaClick,
|
|
)
|
|
}
|
|
}
|