Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ internal fun FeedRoute(
onUnpublishClick = viewModel::diaryUnpublish,
onReportClick = { context.launchCustomTabs(UrlConstant.FEEDBACK_REPORT) },
readAllFeed = viewModel::readAllFeed,
isScrollingDown = viewModel::isScrollingDown
)
}
}
Expand All @@ -185,7 +184,6 @@ private fun FeedScreen(
onReportClick: () -> Unit,
readAllFeed: () -> Unit,
onFeedRefresh: (FeedTab) -> Unit,
isScrollingDown: (FeedScrollState?, FeedScrollState) -> Boolean,
modifier: Modifier = Modifier
) {
val coroutineScope = rememberCoroutineScope()
Expand Down Expand Up @@ -239,14 +237,14 @@ private fun FeedScreen(
LaunchedEffect(pagerState.currentPage) {
snapshotFlow {
FeedScrollState(
firstVisibleItemIndex = currentListState.firstVisibleItemIndex,
firstVisibleItemScrollOffset = currentListState.firstVisibleItemScrollOffset
itemIndex = currentListState.firstVisibleItemIndex,
scrollOffset = currentListState.firstVisibleItemScrollOffset
)
}
.pairwise()
.collect { (previous, current) ->
if (currentListState.isScrollInProgress &&
isScrollingDown(previous, current) &&
current.isScrollingDownFrom(previous) &&
isAtBottom
) {
latestReadAllFeed()
Expand Down Expand Up @@ -349,8 +347,18 @@ private fun FeedScreenPreview() {
hasFollowing = false,
recommendRefreshing = false,
followingRefreshing = false,
onFeedRefresh = {},
isScrollingDown = { _, _ -> false }
onFeedRefresh = {}
)
}
}

private data class FeedScrollState(
val itemIndex: Int,
val scrollOffset: Int
) {
fun isScrollingDownFrom(previous: FeedScrollState?): Boolean {
if (previous == null) return false
return itemIndex > previous.itemIndex ||
(itemIndex == previous.itemIndex && scrollOffset > previous.scrollOffset)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,6 @@ internal class FeedViewModel @Inject constructor(
}
}

fun isScrollingDown(previous: FeedScrollState?, current: FeedScrollState): Boolean {
if (previous == null) return false

return current.firstVisibleItemIndex > previous.firstVisibleItemIndex ||
(
current.firstVisibleItemIndex == previous.firstVisibleItemIndex &&
current.firstVisibleItemScrollOffset > previous.firstVisibleItemScrollOffset
)
}

private fun UiState<ImmutableList<FeedItemUiModel>>.updateIfSuccess(
transform: (ImmutableList<FeedItemUiModel>) -> ImmutableList<FeedItemUiModel>
): UiState<ImmutableList<FeedItemUiModel>> {
Expand Down Expand Up @@ -246,11 +236,6 @@ internal class FeedViewModel @Inject constructor(
}
}

internal data class FeedScrollState(
val firstVisibleItemIndex: Int,
val firstVisibleItemScrollOffset: Int
)

sealed interface FeedSideEffect {
data class ShowErrorDialog(val onRetry: () -> Unit) : FeedSideEffect

Expand Down