only swipe to remove artile with unread filter

Ashinch · Oct 18, 2023 · c35fe96 · c35fe96
1 parent a3c8ec2
commit c35fe96
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
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
@@ -163,17 +163,18 @@ fun ArticleItem(
 @ExperimentalMaterialApi
 @Composable
 fun swipeToDismiss(
-        articleWithFeed: ArticleWithFeed,
-        onClick: (ArticleWithFeed) -> Unit = {},
-        onSwipeOut: (ArticleWithFeed) -> Unit = {},
+    articleWithFeed: ArticleWithFeed,
+    isFilterUnread: Boolean,
+    onClick: (ArticleWithFeed) -> Unit = {},
+    onSwipeOut: (ArticleWithFeed) -> Unit = {},
 ) {
     var isArticleVisible by remember { mutableStateOf(true) }
     val dismissState = rememberDismissState(initialValue = DismissValue.Default, confirmStateChange = {
         if (it == DismissValue.DismissedToEnd) {
-            isArticleVisible = false
+            isArticleVisible = !isFilterUnread
             onSwipeOut(articleWithFeed)
         }
-       true
+        isFilterUnread
     })
     if (isArticleVisible) {
         SwipeToDismiss(

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
@@ -15,6 +15,7 @@ import me.ash.reader.domain.model.article.ArticleWithFeed
 @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterialApi::class)
 fun LazyListScope.ArticleList(
     pagingItems: LazyPagingItems<ArticleFlowItem>,
+    isFilterUnread: Boolean,
     isShowFeedIcon: Boolean,
     isShowStickyHeader: Boolean,
     articleListTonalElevation: Int,
@@ -27,6 +28,7 @@ fun LazyListScope.ArticleList(
                 item(key = item.articleWithFeed.article.id) {
                     swipeToDismiss(
                         articleWithFeed = (pagingItems[index] as ArticleFlowItem.Article).articleWithFeed,
+                        isFilterUnread = isFilterUnread,
                         onClick = { onClick(it) },
                         onSwipeOut = { onSwipeOut(it) }
                     )

diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt
@@ -23,6 +23,8 @@ import androidx.work.WorkInfo
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import me.ash.reader.R
+import me.ash.reader.domain.model.article.ArticleFlowItem
+import me.ash.reader.domain.model.general.Filter
 import me.ash.reader.domain.model.general.MarkAsReadConditions
 import me.ash.reader.infrastructure.preference.*
 import me.ash.reader.ui.component.FilterBar
@@ -232,6 +234,7 @@ fun FlowPage(
                     }
                     ArticleList(
                         pagingItems = pagingItems,
+                        isFilterUnread = filterUiState.filter == Filter.Unread,
                         isShowFeedIcon = articleListFeedIcon.value,
                         isShowStickyHeader = articleListDateStickyHeader.value,
                         articleListTonalElevation = articleListTonalElevation.value,