allow using saved-search while migration source search
also fix keyboard always show up when migration source search
This commit is contained in:
parent
3383a835dd
commit
e2ca729277
1 changed files with 12 additions and 3 deletions
|
|
@ -8,6 +8,7 @@ import androidx.compose.runtime.collectAsState
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.platform.LocalConfiguration
|
import androidx.compose.ui.platform.LocalConfiguration
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.platform.LocalUriHandler
|
import androidx.compose.ui.platform.LocalUriHandler
|
||||||
import androidx.paging.compose.collectAsLazyPagingItems
|
import androidx.paging.compose.collectAsLazyPagingItems
|
||||||
import cafe.adriel.voyager.core.model.rememberScreenModel
|
import cafe.adriel.voyager.core.model.rememberScreenModel
|
||||||
|
|
@ -29,6 +30,7 @@ import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel
|
||||||
import eu.kanade.tachiyomi.ui.browse.source.browse.SourceFilterDialog
|
import eu.kanade.tachiyomi.ui.browse.source.browse.SourceFilterDialog
|
||||||
import eu.kanade.tachiyomi.ui.manga.MangaScreen
|
import eu.kanade.tachiyomi.ui.manga.MangaScreen
|
||||||
import eu.kanade.tachiyomi.ui.webview.WebViewScreen
|
import eu.kanade.tachiyomi.ui.webview.WebViewScreen
|
||||||
|
import eu.kanade.tachiyomi.util.system.toast
|
||||||
import exh.ui.ifSourcesLoaded
|
import exh.ui.ifSourcesLoaded
|
||||||
import kotlinx.collections.immutable.persistentListOf
|
import kotlinx.collections.immutable.persistentListOf
|
||||||
import tachiyomi.core.common.Constants
|
import tachiyomi.core.common.Constants
|
||||||
|
|
@ -64,6 +66,8 @@ data class SourceSearchScreen(
|
||||||
val snackbarHostState = remember { SnackbarHostState() }
|
val snackbarHostState = remember { SnackbarHostState() }
|
||||||
|
|
||||||
// KMK -->
|
// KMK -->
|
||||||
|
val context = LocalContext.current
|
||||||
|
|
||||||
val bulkFavoriteScreenModel = rememberScreenModel { BulkFavoriteScreenModel() }
|
val bulkFavoriteScreenModel = rememberScreenModel { BulkFavoriteScreenModel() }
|
||||||
val bulkFavoriteState by bulkFavoriteScreenModel.state.collectAsState()
|
val bulkFavoriteState by bulkFavoriteScreenModel.state.collectAsState()
|
||||||
|
|
||||||
|
|
@ -93,7 +97,7 @@ data class SourceSearchScreen(
|
||||||
} else {
|
} else {
|
||||||
// KMK <--
|
// KMK <--
|
||||||
SearchToolbar(
|
SearchToolbar(
|
||||||
searchQuery = state.toolbarQuery ?: "",
|
searchQuery = state.toolbarQuery,
|
||||||
onChangeSearchQuery = screenModel::setToolbarQuery,
|
onChangeSearchQuery = screenModel::setToolbarQuery,
|
||||||
onClickCloseSearch = navigator::pop,
|
onClickCloseSearch = navigator::pop,
|
||||||
onSearch = screenModel::search,
|
onSearch = screenModel::search,
|
||||||
|
|
@ -184,10 +188,15 @@ data class SourceSearchScreen(
|
||||||
// SY -->
|
// SY -->
|
||||||
startExpanded = screenModel.startExpanded,
|
startExpanded = screenModel.startExpanded,
|
||||||
onSave = {},
|
onSave = {},
|
||||||
savedSearches = persistentListOf(),
|
|
||||||
onSavedSearch = {},
|
|
||||||
// KMK -->
|
// KMK -->
|
||||||
|
savedSearches = state.savedSearches,
|
||||||
|
onSavedSearch = { search ->
|
||||||
|
screenModel.onSavedSearch(search) {
|
||||||
|
context.toast(it)
|
||||||
|
}
|
||||||
|
},
|
||||||
onSavedSearchPressDesc = stringResource(SYMR.strings.saved_searches),
|
onSavedSearchPressDesc = stringResource(SYMR.strings.saved_searches),
|
||||||
|
shouldShowSavingButton = false,
|
||||||
// KMK <--
|
// KMK <--
|
||||||
onSavedSearchPress = {},
|
onSavedSearchPress = {},
|
||||||
openMangaDexRandom = null,
|
openMangaDexRandom = null,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue