Skip to content

Use pointers instead of recalc'ing next filter #2005

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

Merged
jocmp merged 1 commit into from
Apr 8, 2026
Merged

Use pointers instead of recalc'ing next filter #2005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion app/src/main/java/com/capyreader/app/preferences/ArticleListVerticalSwipe.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import com.capyreader.app.R

enum class ArticleListVerticalSwipe {
DISABLED,
NEXT_FEED;
NEXT_FEED,
MARK_ALL_READ;

val translationKey: Int
get() = when (this) {
DISABLED -> R.string.article_list_swipe_disabled
NEXT_FEED -> R.string.article_list_swipe_next_feed
MARK_ALL_READ -> R.string.article_list_swipe_mark_all_read
}

companion object {
Expand Down
245 changes: 140 additions & 105 deletions app/src/main/java/com/capyreader/app/ui/articles/ArticleScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ import androidx.paging.compose.collectAsLazyPagingItems
import com.capyreader.app.R
import com.capyreader.app.common.Media
import com.capyreader.app.common.Saver
import com.capyreader.app.common.asState
import com.capyreader.app.preferences.AfterReadAllBehavior
import com.capyreader.app.preferences.AppPreferences
import com.capyreader.app.preferences.ArticleListVerticalSwipe
import com.capyreader.app.refresher.RefreshInterval
import com.capyreader.app.ui.LocalBadgeStyle
import com.capyreader.app.ui.LocalConnectivity
Expand All @@ -69,8 +71,10 @@ import com.capyreader.app.ui.articles.feeds.SavedSearchActions
import com.capyreader.app.ui.articles.list.ArticleListTopBar
import com.capyreader.app.ui.articles.list.EmptyOnboardingView
import com.capyreader.app.ui.articles.list.LabelBottomSheet
import com.capyreader.app.ui.articles.list.LocalMarkAllRead
import com.capyreader.app.ui.articles.list.MarkAllReadButton
import com.capyreader.app.ui.articles.list.PullToNextFeedBox
import com.capyreader.app.ui.articles.list.MarkAllReadDialog
import com.capyreader.app.ui.articles.list.SwipeUpActionBox
import com.capyreader.app.ui.articles.list.resetScrollBehaviorListener
import com.capyreader.app.ui.articles.media.ArticleMediaView
import com.capyreader.app.ui.collectChangesWithCurrent
Expand Down Expand Up @@ -120,14 +124,19 @@ fun ArticleScreen(
val searchQuery by viewModel.searchQuery.collectAsStateWithLifecycle("")
val searchState by viewModel.searchState.collectAsStateWithLifecycle(SearchState.INACTIVE)
val nextFilter by viewModel.nextFilter.collectAsStateWithLifecycle(initialValue = null)
val swipeBottom by viewModel.listSwipeBottom.collectAsStateWithLifecycle()
val afterReadAll by viewModel.afterReadAll.collectAsStateWithLifecycle()
val hideReadArticles by viewModel.hideReadArticles.collectAsStateWithLifecycle()
val scope = rememberCoroutineScope()
val refreshInterval by appPreferences
.refreshInterval
.collectChangesWithDefault(appPreferences.refreshInterval.get())

val canSwipeToNextFeed = nextFilter != null
val canSwipeBottom = when (swipeBottom) {
ArticleListVerticalSwipe.DISABLED -> false
ArticleListVerticalSwipe.NEXT_FEED -> nextFilter != null
ArticleListVerticalSwipe.MARK_ALL_READ -> true
}
val context = LocalContext.current

val canSaveExternally by viewModel.canSaveArticleExternally.collectAsStateWithLifecycle()
Expand Down Expand Up @@ -156,9 +165,6 @@ fun ArticleScreen(
drawerState.open()
}
},
searches = savedSearches,
folders = folders,
feeds = feeds,
range = range,
)
}
Expand All @@ -175,6 +181,9 @@ fun ArticleScreen(

val snackbarHostState = remember { SnackbarHostState() }

val confirmMarkAllReadEnabled by appPreferences.articleListOptions.confirmMarkAllRead.asState()
var isMarkAllReadDialogOpen by remember { mutableStateOf(false) }

CompositionLocalProvider(
LocalFullContent provides fullContent,
LocalArticleActions provides articleActions,
Expand Down Expand Up @@ -280,17 +289,14 @@ fun ArticleScreen(
scaffoldNavigator.navigateTo(ListDetailPaneScaffoldRole.List)
}

fun requestNextFeed() {
coroutineScope.launchUI {
openNextStatus {
viewModel.requestNextFeed()
}
fun markAllRead(range: MarkRead) {
if (range == MarkRead.All && confirmMarkAllReadEnabled) {
isMarkAllReadDialogOpen = true
return
}
}

fun markAllRead(range: MarkRead) {
val animateMarkRead = openNextFeedOnReadAll &&
canSwipeToNextFeed &&
nextFilter != null &&
canOpenNextFeed(filter, range)

if (animateMarkRead) {
Expand All @@ -304,6 +310,24 @@ fun ArticleScreen(
}
}

fun onSwipeUp() {
when (swipeBottom) {
ArticleListVerticalSwipe.NEXT_FEED -> {
coroutineScope.launchUI {
openNextStatus {
viewModel.requestNextFeed()
}
}
}

ArticleListVerticalSwipe.MARK_ALL_READ -> {
markAllRead(MarkRead.All)
}

ArticleListVerticalSwipe.DISABLED -> {}
}
}

val refreshPagination = {
coroutineScope.launch {
resetScrollBehaviorOffset()
Expand Down Expand Up @@ -510,107 +534,106 @@ fun ArticleScreen(
val keyboardManager = LocalSoftwareKeyboardController.current
val markReadPosition = LocalMarkAllReadButtonPosition.current

Scaffold(
modifier = Modifier
.nestedScroll(scrollBehavior.nestedScrollConnection)
.nestedScroll(object : NestedScrollConnection {
override fun onPostScroll(
consumed: Offset,
available: Offset,
source: NestedScrollSource
): Offset {
if (search.isActive) {
keyboardManager?.hide()
}
CompositionLocalProvider(
LocalMarkAllRead provides { markAllRead(MarkRead.All) },
) {
Scaffold(
modifier = Modifier
.nestedScroll(scrollBehavior.nestedScrollConnection)
.nestedScroll(object : NestedScrollConnection {
override fun onPostScroll(
consumed: Offset,
available: Offset,
source: NestedScrollSource
): Offset {
if (search.isActive) {
keyboardManager?.hide()
}

return Offset.Zero
}
}),
topBar = {
ArticleListTopBar(
onRequestJumpToTop = { scrollToTop() },
onNavigateToDrawer = { openDrawer() },
scrollBehavior = scrollBehavior,
onMarkAllRead = { markAllRead(MarkRead.All) },
search = search,
filter = filter,
feeds = allFeeds,
savedSearches = savedSearches,
folders = allFolders,
hideReadArticles = hideReadArticles,
onToggleHideReadArticles = { viewModel.toggleHideReadArticles() },
)
},
snackbarHost = {
SnackbarHost(hostState = snackbarHostState)
},
floatingActionButton = {
if (markReadPosition == MarkReadPosition.FLOATING_ACTION_BUTTON) {
MarkAllReadButton(
onMarkAllRead = {
markAllRead(MarkRead.All)
},
position = MarkReadPosition.FLOATING_ACTION_BUTTON,
)
}
},
bottomBar = {
audioEnclosure?.let { audio ->
FloatingAudioPlayer(
audio = audio,
controller = audioController,
onDismiss = {
audioController.dismiss()
},
return Offset.Zero
}
}),
topBar = {
ArticleListTopBar(
onRequestJumpToTop = { scrollToTop() },
onNavigateToDrawer = { openDrawer() },
scrollBehavior = scrollBehavior,
search = search,
filter = filter,
feeds = allFeeds,
savedSearches = savedSearches,
folders = allFolders,
hideReadArticles = hideReadArticles,
onToggleHideReadArticles = { viewModel.toggleHideReadArticles() },
)
}
}
) { innerPadding ->
ArticleListScaffold(
padding = innerPadding,
showOnboarding = showOnboarding,
onboarding = {
EmptyOnboardingView {
AddFeedButton(
onComplete = {
onFeedAdded(it)
}
},
snackbarHost = {
SnackbarHost(hostState = snackbarHostState)
},
floatingActionButton = {
if (markReadPosition == MarkReadPosition.FLOATING_ACTION_BUTTON) {
MarkAllReadButton(
position = MarkReadPosition.FLOATING_ACTION_BUTTON,
)
}
},
) {
PullToRefreshBox(
isRefreshing = isPullToRefreshing,
onRefresh = {
refreshFeeds()
bottomBar = {
audioEnclosure?.let { audio ->
FloatingAudioPlayer(
audio = audio,
controller = audioController,
onDismiss = {
audioController.dismiss()
},
)
}
}
) { innerPadding ->
ArticleListScaffold(
padding = innerPadding,
showOnboarding = showOnboarding,
onboarding = {
EmptyOnboardingView {
AddFeedButton(
onComplete = {
onFeedAdded(it)
}
)
}
},
modifier = Modifier.fillMaxSize()
) {
PullToNextFeedBox(
modifier = Modifier.fillMaxSize(),
enabled = canSwipeToNextFeed,
onRequestNext = {
requestNextFeed()
PullToRefreshBox(
isRefreshing = isPullToRefreshing,
onRefresh = {
refreshFeeds()
},
modifier = Modifier.fillMaxSize()
) {
if (isRefreshInitialized && articles.itemCount == 0) {
ArticleListEmptyView()
} else {
ArticleList(
articles = articles,
selectedArticleKey = article?.id,
listState = listState,
enableMarkReadOnScroll = enableMarkReadOnScroll,
refreshingAll = viewModel.refreshingAll,
dimReadArticles = filter !is ArticleFilter.Starred,
showIcons = !filter.isReadLaterFeed(readLaterFeed),
onMarkAllRead = { range ->
onMarkAllRead(range)
},
onSelect = { articleID ->
selectArticle(articleID)
},
)
SwipeUpActionBox(
modifier = Modifier.fillMaxSize(),
enabled = canSwipeBottom,
onRequestNext = {
onSwipeUp()
},
) {
if (isRefreshInitialized && articles.itemCount == 0) {
ArticleListEmptyView()
} else {
ArticleList(
articles = articles,
selectedArticleKey = article?.id,
listState = listState,
enableMarkReadOnScroll = enableMarkReadOnScroll,
refreshingAll = viewModel.refreshingAll,
dimReadArticles = filter !is ArticleFilter.Starred,
onMarkAllRead = { range ->
onMarkAllRead(range)
},
onSelect = { articleID ->
selectArticle(articleID)
},
)
}
}
}
}
Expand Down Expand Up @@ -687,6 +710,18 @@ fun ArticleScreen(
}


if (isMarkAllReadDialogOpen) {
MarkAllReadDialog(
onConfirm = {
isMarkAllReadDialogOpen = false
onMarkAllRead(MarkRead.All)
},
onDismissRequest = {
isMarkAllReadDialogOpen = false
},
)
}

if (viewModel.showUnauthorizedMessage) {
UnauthorizedAlertDialog(
onConfirm = openUpdatePasswordDialog,
Expand Down
Loading
Loading