fix swipe to mark read article issue (#516)

Ashinch · Jan 12, 2024 · 6aa54a0 · 6aa54a0
1 parent cd135cd
commit 6aa54a0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/me/ash/reader/domain/service/AbstractRssRepository.kt b/app/src/main/java/me/ash/reader/domain/service/AbstractRssRepository.kt
@@ -119,7 +119,7 @@ abstract class AbstractRssRepository(
                 )
             }
 
-            feedId != null -> {
+            feedId != null && articleId == null -> {
                 articleDao.markAllAsReadByFeedId(
                     accountId = accountId,
                     feedId = feedId,

diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleItem.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleItem.kt
@@ -162,7 +162,7 @@ fun ArticleItem(
 }
 @ExperimentalMaterialApi
 @Composable
-fun swipeToDismiss(
+fun SwipeableArticleItem(
         articleWithFeed: ArticleWithFeed,
         onClick: (ArticleWithFeed) -> Unit = {},
         onSwipeOut: (ArticleWithFeed) -> Unit = {},

diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleList.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleList.kt
@@ -25,8 +25,8 @@ fun LazyListScope.ArticleList(
         when (val item = pagingItems.peek(index)) {
             is ArticleFlowItem.Article -> {
                 item(key = item.articleWithFeed.article.id) {
-                    swipeToDismiss(
-                        articleWithFeed = (pagingItems[index] as ArticleFlowItem.Article).articleWithFeed,
+                    SwipeableArticleItem(
+                        articleWithFeed = item.articleWithFeed,
                         onClick = { onClick(it) },
                         onSwipeOut = { onSwipeOut(it) }
                     )