修复
This commit is contained in:
3 files changed
+11
-33
No files matched your search
@@ -267,6 +267,17 @@ class SearchViewModel(
|
|||||||
}
|
}
|
||||||
|
|
||||||
is SearchIntent.OpenExpandedSourceBook -> {
|
is SearchIntent.OpenExpandedSourceBook -> {
|
||||||
|
_uiState.update {
|
||||||
|
it.copy(
|
||||||
|
expandedSourceUrl = null,
|
||||||
|
expandedSourceName = null,
|
||||||
|
expandedSourceBooks = persistentListOf(),
|
||||||
|
expandedSourceLoading = false,
|
||||||
|
expandedSourceEnd = false,
|
||||||
|
expandedSourceError = null,
|
||||||
|
expandedSourcePage = 1,
|
||||||
|
)
|
||||||
|
}
|
||||||
emitEffect(
|
emitEffect(
|
||||||
SearchEffect.OpenBookInfo(
|
SearchEffect.OpenBookInfo(
|
||||||
name = intent.book.name,
|
name = intent.book.name,
|
||||||
|
|||||||
@@ -68,17 +68,6 @@ fun BannerModule(
|
|||||||
.combinedClickable(
|
.combinedClickable(
|
||||||
onClick = { onClick(book, sharedCoverKey) },
|
onClick = { onClick(book, sharedCoverKey) },
|
||||||
onLongClick = onLongClick?.let { cb -> { cb(book, sharedCoverKey) } }
|
onLongClick = onLongClick?.let { cb -> { cb(book, sharedCoverKey) } }
|
||||||
)
|
|
||||||
.then(
|
|
||||||
with(sharedTransitionScope) {
|
|
||||||
if (this != null) {
|
|
||||||
Modifier.sharedBounds(
|
|
||||||
sharedContentState = rememberSharedContentState("preview:${book.bookUrl}"),
|
|
||||||
animatedVisibilityScope = animatedVisibilityScope
|
|
||||||
?: return@with Modifier,
|
|
||||||
)
|
|
||||||
} else Modifier
|
|
||||||
}
|
|
||||||
),
|
),
|
||||||
sharedTransitionScope = sharedTransitionScope,
|
sharedTransitionScope = sharedTransitionScope,
|
||||||
animatedVisibilityScope = animatedVisibilityScope,
|
animatedVisibilityScope = animatedVisibilityScope,
|
||||||
|
|||||||
@@ -64,17 +64,6 @@ fun SearchBookListItem(
|
|||||||
) else Modifier
|
) else Modifier
|
||||||
)
|
)
|
||||||
.then(if (showPadding) Modifier.adaptiveHorizontalPadding(vertical = 8.dp) else Modifier)
|
.then(if (showPadding) Modifier.adaptiveHorizontalPadding(vertical = 8.dp) else Modifier)
|
||||||
.then(
|
|
||||||
with(sharedTransitionScope) {
|
|
||||||
if (this != null) {
|
|
||||||
Modifier.sharedBounds(
|
|
||||||
sharedContentState = rememberSharedContentState("preview:${book.bookUrl}"),
|
|
||||||
animatedVisibilityScope = animatedVisibilityScope
|
|
||||||
?: return@with Modifier,
|
|
||||||
)
|
|
||||||
} else Modifier
|
|
||||||
}
|
|
||||||
)
|
|
||||||
) {
|
) {
|
||||||
Box(modifier = Modifier
|
Box(modifier = Modifier
|
||||||
.width(72.dp)
|
.width(72.dp)
|
||||||
@@ -204,17 +193,6 @@ fun SearchBookGridItem(
|
|||||||
onClick = onClick,
|
onClick = onClick,
|
||||||
onLongClick = onLongClick?.let { cb -> { cb(book, sharedCoverKey) } }
|
onLongClick = onLongClick?.let { cb -> { cb(book, sharedCoverKey) } }
|
||||||
)
|
)
|
||||||
.then(
|
|
||||||
with(sharedTransitionScope) {
|
|
||||||
if (this != null) {
|
|
||||||
Modifier.sharedBounds(
|
|
||||||
sharedContentState = rememberSharedContentState("preview:${book.bookUrl}"),
|
|
||||||
animatedVisibilityScope = animatedVisibilityScope
|
|
||||||
?: return@with Modifier,
|
|
||||||
)
|
|
||||||
} else Modifier
|
|
||||||
}
|
|
||||||
)
|
|
||||||
) {
|
) {
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
|||||||
Reference in new issue
Block a user