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

Mark as Read on Open and Scroll #1025

Merged
merged 27 commits into from
Aug 3, 2023
Merged

Mark as Read on Open and Scroll #1025

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
beb6fba
Mark as read on open and scroll option
IzakJoubert Jul 12, 2023
897a447
Mark as read on open and scroll option
IzakJoubert Jul 12, 2023
a62f335
Merge branch 'main' into issue/403
ZJouba Jul 12, 2023
286175b
Fixing mark all
IzakJoubert Jul 12, 2023
d1df954
Merge branch 'issue/403' of https://github.com/ZJouba/jerboa into iss…
IzakJoubert Jul 12, 2023
cdb4ee1
Merge branch 'main' into issue/403
IzakJoubert Jul 12, 2023
1a9860f
Update Http.kt
ZJouba Jul 12, 2023
8a23a7e
Merge branch 'main' into issue/403
ZJouba Jul 13, 2023
96f35c3
Update Home in PostActivity
IzakJoubert Jul 13, 2023
37b251c
Merge branch 'main' into issue/403
ZJouba Jul 13, 2023
6dab5b6
Updates and merge conflict fixes
IzakJoubert Jul 20, 2023
f297596
Merged main
IzakJoubert Jul 20, 2023
c6aa4a9
Merge remote-tracking branch 'upstream/main' into issue/403
IzakJoubert Jul 24, 2023
4d4375f
Merge branch 'main' into issue/403
ZJouba Jul 27, 2023
ccd7f46
Check if read first and use appState to launch coroutine
IzakJoubert Jul 27, 2023
7d6c6d8
Adding back migration
IzakJoubert Jul 27, 2023
1083197
Removing dev
IzakJoubert Jul 27, 2023
29dd480
Removing unused functions
IzakJoubert Jul 28, 2023
e7987ee
Merge branch 'main' into issue/403
ZJouba Jul 28, 2023
94190d1
Merge remote-tracking branch 'upstream/main' into issue/403
IzakJoubert Aug 3, 2023
2d964eb
Fixing merge conflicts
IzakJoubert Aug 3, 2023
b5de940
Fixing migration
IzakJoubert Aug 3, 2023
74300ac
New account check
IzakJoubert Aug 3, 2023
942b810
Merging ifs
IzakJoubert Aug 3, 2023
92d3a96
Removed manual mark as read
IzakJoubert Aug 3, 2023
0e2576c
Only for Accounts
IzakJoubert Aug 3, 2023
690f4b5
Trigger woodpecker
IzakJoubert Aug 3, 2023
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
3 changes: 2 additions & 1 deletion app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ import com.jerboa.datatypes.types.PostId
import com.jerboa.datatypes.types.PostView
import com.jerboa.datatypes.types.SaveComment
import com.jerboa.datatypes.types.SavePost
import com.jerboa.db.entity.isAnon
import com.jerboa.getCommentParentId
import com.jerboa.getDepthFromComment
import com.jerboa.getLocalizedCommentSortTypeName
Expand Down Expand Up @@ -309,7 +310,7 @@ fun PostActivity(
is ApiState.Failure -> ApiErrorText(postRes.msg)
is ApiState.Success -> {
val postView = postRes.data.post_view
appState.addReturn(PostViewReturn.POST_VIEW, postView.copy(read = true))
if (!account.isAnon()) appState.addReturn(PostViewReturn.POST_VIEW, postView.copy(read = true))
MV-GH marked this conversation as resolved.
Show resolved Hide resolved
LazyColumn(
state = listState,
modifier = Modifier
Expand Down