Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): fix performance & data loading issues with sticky headers disabled #642

Merged
merged 2 commits into from
Jun 2, 2024
Merged

fix(ui): fix performance & data loading issues with sticky headers disabled #642

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
494f469
fix(ui): fix performance & data loading issues with sticky headers di…
JunkFood02 Mar 10, 2024
0ec1dd9
revert: "Disbale sticky headers by default"
JunkFood02 Jun 2, 2024
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
79 changes: 66 additions & 13 deletions app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.itemContentType
import androidx.paging.compose.itemKey
import me.ash.reader.domain.model.article.ArticleFlowItem
import me.ash.reader.domain.model.article.ArticleWithFeed

Expand All @@ -27,10 +29,17 @@ fun LazyListScope.ArticleList(
onMarkBelowAsRead: ((ArticleWithFeed) -> Unit)? = null,
onShare: ((ArticleWithFeed) -> Unit)? = null,
) {
for (index in 0 until pagingItems.itemCount) {
when (val item = pagingItems.peek(index)) {
is ArticleFlowItem.Article -> {
item(key = item.articleWithFeed.article.id) {
// https://issuetracker.google.com/issues/193785330
// FIXME: Using sticky header with paging-compose need to iterate through the entire list
// to figure out where to add sticky headers, which significantly impacts the performance
if (!isShowStickyHeader) {
items(
count = pagingItems.itemCount,
key = pagingItems.itemKey(::key),
contentType = pagingItems.itemContentType(::contentType)
) { index ->
when (val item = pagingItems[index]) {
is ArticleFlowItem.Article -> {
SwipeableArticleItem(
articleWithFeed = item.articleWithFeed,
isFilterUnread = isFilterUnread,
Expand All @@ -45,22 +54,66 @@ fun LazyListScope.ArticleList(
onShare = onShare
)
}

is ArticleFlowItem.Date -> {
if (item.showSpacer) {
Spacer(modifier = Modifier.height(40.dp))
}
StickyHeader(item.date, isShowFeedIcon, articleListTonalElevation)
}

else -> {}
}
}
} else {
for (index in 0 until pagingItems.itemCount) {
when (val item = pagingItems.peek(index)) {
is ArticleFlowItem.Article -> {
item(key = key(item), contentType = contentType(item)) {
SwipeableArticleItem(
articleWithFeed = item.articleWithFeed,
isFilterUnread = isFilterUnread,
articleListTonalElevation = articleListTonalElevation,
onClick = onClick,
isSwipeEnabled = isSwipeEnabled,
isMenuEnabled = isMenuEnabled,
onToggleStarred = onToggleStarred,
onToggleRead = onToggleRead,
onMarkAboveAsRead = if (index == 1) null else onMarkAboveAsRead, // index == 0 -> ArticleFlowItem.Date
onMarkBelowAsRead = if (index == pagingItems.itemCount - 1) null else onMarkBelowAsRead,
onShare = onShare
)
}
}

is ArticleFlowItem.Date -> {
if (item.showSpacer) item { Spacer(modifier = Modifier.height(40.dp)) }
if (isShowStickyHeader) {
stickyHeader(key = item.date) {
StickyHeader(item.date, isShowFeedIcon, articleListTonalElevation)
is ArticleFlowItem.Date -> {
if (item.showSpacer) {
item { Spacer(modifier = Modifier.height(40.dp)) }
}
} else {
item(key = item.date) {
stickyHeader(key = key(item), contentType = contentType(item)) {
StickyHeader(item.date, isShowFeedIcon, articleListTonalElevation)
}
}
}

else -> {}
else -> {}
}
}
}
}

private fun key(item: ArticleFlowItem): String {
return when (item) {
is ArticleFlowItem.Article -> item.articleWithFeed.article.id
is ArticleFlowItem.Date -> item.date
}
}

private fun contentType(item: ArticleFlowItem): Int {
return when (item) {
is ArticleFlowItem.Article -> ARTICLE
is ArticleFlowItem.Date -> DATE
}
}

private const val ARTICLE = 1
private const val DATE = 2
Loading