* Merge Voyager screens * cleanups (cherry picked from commit 3d66eaea8373b6ab5d8e8423be227e0452cb0743) # Conflicts: # app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.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/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt # app/src/main/res/layout/main_activity.xml
75 lines
3 KiB
Kotlin
75 lines
3 KiB
Kotlin
package exh.recs
|
|
|
|
import androidx.compose.material3.SnackbarHost
|
|
import androidx.compose.material3.SnackbarHostState
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.collectAsState
|
|
import androidx.compose.runtime.getValue
|
|
import androidx.compose.runtime.remember
|
|
import androidx.compose.ui.platform.LocalConfiguration
|
|
import androidx.paging.compose.collectAsLazyPagingItems
|
|
import cafe.adriel.voyager.core.model.rememberScreenModel
|
|
import cafe.adriel.voyager.core.screen.Screen
|
|
import cafe.adriel.voyager.navigator.LocalNavigator
|
|
import cafe.adriel.voyager.navigator.Navigator
|
|
import cafe.adriel.voyager.navigator.currentOrThrow
|
|
import eu.kanade.domain.manga.model.Manga
|
|
import eu.kanade.presentation.browse.BrowseSourceContent
|
|
import eu.kanade.presentation.browse.components.BrowseSourceSimpleToolbar
|
|
import eu.kanade.presentation.components.Scaffold
|
|
import eu.kanade.tachiyomi.ui.browse.source.SourcesScreen
|
|
|
|
class RecommendsScreen(val mangaId: Long, val sourceId: Long) : Screen {
|
|
|
|
@Composable
|
|
override fun Content() {
|
|
val screenModel = rememberScreenModel { RecommendsScreenModel(mangaId, sourceId) }
|
|
val state by screenModel.state.collectAsState()
|
|
val navigator = LocalNavigator.currentOrThrow
|
|
|
|
val onMangaClick: (Manga) -> Unit = { manga ->
|
|
openSmartSearch(navigator, manga.ogTitle)
|
|
}
|
|
|
|
val snackbarHostState = remember { SnackbarHostState() }
|
|
|
|
Scaffold(
|
|
topBar = { scrollBehavior ->
|
|
BrowseSourceSimpleToolbar(
|
|
navigateUp = navigator::pop,
|
|
title = screenModel.manga.title,
|
|
displayMode = screenModel.displayMode,
|
|
onDisplayModeChange = { screenModel.displayMode = it },
|
|
scrollBehavior = scrollBehavior,
|
|
)
|
|
},
|
|
snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
|
|
) { paddingValues ->
|
|
val mangaList = remember(state.currentFilter) {
|
|
screenModel.getMangaListFlow(state.currentFilter)
|
|
}.collectAsLazyPagingItems()
|
|
|
|
BrowseSourceContent(
|
|
source = screenModel.source,
|
|
mangaList = mangaList,
|
|
columns = screenModel.getColumnsPreference(LocalConfiguration.current.orientation),
|
|
// SY -->
|
|
ehentaiBrowseDisplayMode = false,
|
|
// SY <--
|
|
displayMode = screenModel.displayMode,
|
|
snackbarHostState = snackbarHostState,
|
|
contentPadding = paddingValues,
|
|
onWebViewClick = null,
|
|
onHelpClick = null,
|
|
onLocalSourceHelpClick = null,
|
|
onMangaClick = onMangaClick,
|
|
onMangaLongClick = onMangaClick,
|
|
)
|
|
}
|
|
}
|
|
|
|
private fun openSmartSearch(navigator: Navigator, title: String) {
|
|
val smartSearchConfig = SourcesScreen.SmartSearchConfig(title)
|
|
navigator.push(SourcesScreen(smartSearchConfig))
|
|
}
|
|
}
|