Mark as Read on Open and Scroll

app/src/main/java/com/jerboa/MainActivity.kt

@@ -46,6 +46,7 @@ import com.jerboa.model.AccountViewModelFactory
 import com.jerboa.model.AppSettingsViewModel
 import com.jerboa.model.AppSettingsViewModelFactory
 import com.jerboa.model.CommunityViewModel
+import com.jerboa.model.HomeViewModel
 import com.jerboa.model.ReplyItem
 import com.jerboa.model.SiteViewModel
 import com.jerboa.ui.components.comment.edit.CommentEditActivity
@@ -108,9 +109,13 @@ class MainActivity : AppCompatActivity() {
 
         setContent {
             val ctx = LocalContext.current
-            val accountViewModel: AccountViewModel = viewModel(factory = AccountViewModelFactory.Factory)
-            val appSettingsViewModel: AppSettingsViewModel = viewModel(factory = AppSettingsViewModelFactory.Factory)
-            val accountSettingsViewModel: AccountSettingsViewModel = viewModel(factory = AccountSettingsViewModelFactory.Factory)
+            val accountViewModel: AccountViewModel =
+                viewModel(factory = AccountViewModelFactory.Factory)
+            val appSettingsViewModel: AppSettingsViewModel =
+                viewModel(factory = AppSettingsViewModelFactory.Factory)
+            val accountSettingsViewModel: AccountSettingsViewModel =
+                viewModel(factory = AccountSettingsViewModelFactory.Factory)
+            val homeViewModel: HomeViewModel = viewModel()
 
             API.errorHandler = {
                 Log.e("jerboa", it.toString())
@@ -154,9 +159,13 @@ class MainActivity : AppCompatActivity() {
                         BackConfirmationMode.Toast -> {
                             [email protected](navController, ctx)
                         }
+
                         BackConfirmationMode.Dialog -> {
-                            [email protected](navController) { showConfirmationDialog.value = true }
+                            [email protected](navController) {
+                                showConfirmationDialog.value = true
+                            }
                         }
+
                         BackConfirmationMode.None -> {}
                     }
 
@@ -178,13 +187,18 @@ class MainActivity : AppCompatActivity() {
                 when (val siteRes = siteViewModel.siteRes) {
                     is ApiState.Success -> {
                         val siteVersion = siteRes.data.version
-                        if (compareVersions(siteVersion, MINIMUM_API_VERSION) < 0 && !serverVersionOutdatedViewed.value) {
+                        if (compareVersions(
+                                siteVersion,
+                                MINIMUM_API_VERSION,
+                            ) < 0 && !serverVersionOutdatedViewed.value
+                        ) {
                             ShowOutdatedServerDialog(
                                 siteVersion = siteVersion,
                                 onConfirm = { serverVersionOutdatedViewed.value = true },
                             )
                         }
                     }
+
                     else -> {}
                 }
 
@@ -241,6 +255,7 @@ class MainActivity : AppCompatActivity() {
                             appSettingsViewModel = appSettingsViewModel,
                             appSettings = appSettings,
                             drawerState = drawerState,
+                            homeViewModel = homeViewModel,
                         )
                     }
 
@@ -272,6 +287,7 @@ class MainActivity : AppCompatActivity() {
                                 useCustomTabs = appSettings.useCustomTabs,
                                 usePrivateTabs = appSettings.usePrivateTabs,
                                 blurNSFW = appSettings.blurNSFW,
+                                markAsReadOnScroll = appSettings.markAsReadOnScroll,
                             )
                         }
 
@@ -304,6 +320,7 @@ class MainActivity : AppCompatActivity() {
                                 useCustomTabs = appSettings.useCustomTabs,
                                 usePrivateTabs = appSettings.usePrivateTabs,
                                 blurNSFW = appSettings.blurNSFW,
+                                markAsReadOnScroll = appSettings.markAsReadOnScroll,
                             )
                         }
 
@@ -372,6 +389,7 @@ class MainActivity : AppCompatActivity() {
                             blurNSFW = appSettings.blurNSFW,
                             drawerState = drawerState,
                             openImageViewer = navController::toView,
+                            markAsReadOnScroll = appSettings.markAsReadOnScroll,
                         )
                     }
 
@@ -405,6 +423,7 @@ class MainActivity : AppCompatActivity() {
                             blurNSFW = appSettings.blurNSFW,
                             drawerState = drawerState,
                             openImageViewer = navController::toView,
+                            markAsReadOnScroll = appSettings.markAsReadOnScroll,
                         )
                     }
 
@@ -497,6 +516,7 @@ class MainActivity : AppCompatActivity() {
                             PostActivity(
                                 id = Either.Left(args.id),
                                 accountViewModel = accountViewModel,
+                                homeViewModel = homeViewModel,
                                 navController = navController,
                                 showCollapsedCommentContent = appSettings.showCollapsedCommentContent,
                                 showActionBarByDefault = appSettings.showCommentActionBarByDefault,
@@ -515,7 +535,9 @@ class MainActivity : AppCompatActivity() {
                     composable(
                         route = Route.COMMENT,
                         deepLinks = DEFAULT_LEMMY_INSTANCES.map { instance ->
-                            navDeepLink { uriPattern = "$instance/comment/{${Route.CommentArgs.ID}}" }
+                            navDeepLink {
+                                uriPattern = "$instance/comment/{${Route.CommentArgs.ID}}"
+                            }
                         },
                         arguments = listOf(
                             navArgument(Route.CommentArgs.ID) {
@@ -527,6 +549,7 @@ class MainActivity : AppCompatActivity() {
                         PostActivity(
                             id = Either.Right(args.id),
                             accountViewModel = accountViewModel,
+                            homeViewModel = homeViewModel,
                             navController = navController,
                             useCustomTabs = appSettings.useCustomTabs,
                             usePrivateTabs = appSettings.usePrivateTabs,

app/src/main/java/com/jerboa/api/Http.kt

@@ -53,6 +53,12 @@ interface API {
     @POST("post/like")
     suspend fun likePost(@Body form: CreatePostLike): Response<PostResponse>
 
+    /**
+     * Mark post as read.
+     */
+    @POST("post/mark_as_read")
+    suspend fun markAsRead(@Body form: MarkPostAsRead): Response<PostResponse>
+
     /**
      * Like / vote on a comment.
      */
@@ -290,7 +296,12 @@ interface API {
                             .build()
                     }
                 }
-                .addInterceptor(CustomHttpLoggingInterceptor(REDACTED_QUERY_PARAMS, REDACTED_BODY_FIELDS))
+                .addInterceptor(
+                    CustomHttpLoggingInterceptor(
+                        REDACTED_QUERY_PARAMS,
+                        REDACTED_BODY_FIELDS,
+                    ),
+                )
                 .build()
 
             return Retrofit.Builder()

app/src/main/java/com/jerboa/db/AppDB.kt

@@ -34,6 +34,7 @@ val APP_SETTINGS_DEFAULT = AppSettings(
     blurNSFW = true,
     showTextDescriptionsInNavbar = true,
     backConfirmationMode = 1,
+    markAsReadOnScroll = false,
 )
 
 @Database(

app/src/main/java/com/jerboa/db/AppDBMigrations.kt

@@ -261,6 +261,15 @@ val MIGRATION_19_20 = object : Migration(19, 20) {
     }
 }
 
+val MIGRATION_20_21 = object : Migration(19, 20) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL(UPDATE_APP_CHANGELOG_UNVIEWED)
+        database.execSQL(
+            "ALTER TABLE AppSettings ADD COLUMN markAsReadOnScroll INTEGER NOT NULL DEFAULT 0",
+        )
+    }
+}
+
 // Don't forget to test your migration with `./gradlew app:connectAndroidTest`
 val MIGRATIONS_LIST = arrayOf(
     MIGRATION_1_2,
@@ -282,4 +291,5 @@ val MIGRATIONS_LIST = arrayOf(
     MIGRATION_17_18,
     MIGRATION_18_19,
     MIGRATION_19_20,
+    MIGRATION_20_21,
 )

app/src/main/java/com/jerboa/db/entity/AppSettings.kt

@@ -88,6 +88,11 @@ data class AppSettings(
         defaultValue = "1",
     )
     val showTextDescriptionsInNavbar: Boolean,
+    @ColumnInfo(
+        name = "markAsReadOnScroll",
+        defaultValue = "0",
+    )
+    val markAsReadOnScroll: Boolean,
     @ColumnInfo(
         name = "backConfirmationMode",
         defaultValue = "1",

app/src/main/java/com/jerboa/model/CommunityViewModel.kt

@@ -7,31 +7,11 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.jerboa.*
 import com.jerboa.api.API
 import com.jerboa.api.ApiState
 import com.jerboa.api.apiWrapper
-import com.jerboa.datatypes.types.BlockCommunity
-import com.jerboa.datatypes.types.BlockCommunityResponse
-import com.jerboa.datatypes.types.BlockPerson
-import com.jerboa.datatypes.types.BlockPersonResponse
-import com.jerboa.datatypes.types.CommunityId
-import com.jerboa.datatypes.types.CommunityResponse
-import com.jerboa.datatypes.types.CreatePostLike
-import com.jerboa.datatypes.types.DeletePost
-import com.jerboa.datatypes.types.FollowCommunity
-import com.jerboa.datatypes.types.GetCommunity
-import com.jerboa.datatypes.types.GetCommunityResponse
-import com.jerboa.datatypes.types.GetPosts
-import com.jerboa.datatypes.types.GetPostsResponse
-import com.jerboa.datatypes.types.PostResponse
-import com.jerboa.datatypes.types.PostView
-import com.jerboa.datatypes.types.SavePost
-import com.jerboa.datatypes.types.SortType
-import com.jerboa.findAndUpdatePost
-import com.jerboa.mergePosts
-import com.jerboa.serializeToMap
-import com.jerboa.showBlockCommunityToast
-import com.jerboa.showBlockPersonToast
+import com.jerboa.datatypes.types.*
 import com.jerboa.ui.components.common.Initializable
 import kotlinx.coroutines.launch
 
@@ -53,6 +33,7 @@ class CommunityViewModel : ViewModel(), Initializable {
     private var blockCommunityRes: ApiState<BlockCommunityResponse> by
         mutableStateOf(ApiState.Empty)
     private var blockPersonRes: ApiState<BlockPersonResponse> by mutableStateOf(ApiState.Empty)
+    private var markPostRes: ApiState<PostResponse> by mutableStateOf(ApiState.Empty)
 
     var sortType by mutableStateOf(SortType.Active)
         private set
@@ -118,8 +99,16 @@ class CommunityViewModel : ViewModel(), Initializable {
                     if (newRes.data.posts.isEmpty()) { // Hit the end of the posts
                         prevPage()
                     }
-                    ApiState.Success(GetPostsResponse(mergePosts(oldRes.data.posts, newRes.data.posts)))
+                    ApiState.Success(
+                        GetPostsResponse(
+                            mergePosts(
+                                oldRes.data.posts,
+                                newRes.data.posts,
+                            ),
+                        ),
+                    )
                 }
+
                 else -> {
                     prevPage()
                     oldRes
@@ -247,4 +236,19 @@ class CommunityViewModel : ViewModel(), Initializable {
             else -> {}
         }
     }
+
+    fun markPostAsRead(form: MarkPostAsRead) {
+        viewModelScope.launch {
+            markPostRes = ApiState.Loading
+            markPostRes = apiWrapper(API.getInstance().markAsRead(form))
+
+            when (val markRes = markPostRes) {
+                is ApiState.Success -> {
+                    updatePost(markRes.data.post_view)
+                }
+
+                else -> {}
+            }
+        }
+    }
 }

app/src/main/java/com/jerboa/model/HomeViewModel.kt

@@ -16,9 +16,12 @@ import com.jerboa.datatypes.types.BlockPerson
 import com.jerboa.datatypes.types.BlockPersonResponse
 import com.jerboa.datatypes.types.CreatePostLike
 import com.jerboa.datatypes.types.DeletePost
+import com.jerboa.datatypes.types.GetPost
+import com.jerboa.datatypes.types.GetPostResponse
 import com.jerboa.datatypes.types.GetPosts
 import com.jerboa.datatypes.types.GetPostsResponse
 import com.jerboa.datatypes.types.ListingType
+import com.jerboa.datatypes.types.MarkPostAsRead
 import com.jerboa.datatypes.types.PostResponse
 import com.jerboa.datatypes.types.PostView
 import com.jerboa.datatypes.types.SavePost
@@ -38,11 +41,14 @@ class HomeViewModel : ViewModel(), Initializable {
     var postsRes: ApiState<GetPostsResponse> by mutableStateOf(ApiState.Empty)
         private set
 
+    private var postRes: ApiState<GetPostResponse> by mutableStateOf(ApiState.Empty)
+
     private var likePostRes: ApiState<PostResponse> by mutableStateOf(ApiState.Empty)
     private var savePostRes: ApiState<PostResponse> by mutableStateOf(ApiState.Empty)
     private var deletePostRes: ApiState<PostResponse> by mutableStateOf(ApiState.Empty)
     private var blockCommunityRes: ApiState<BlockCommunityResponse> by mutableStateOf(ApiState.Empty)
     private var blockPersonRes: ApiState<BlockPersonResponse> by mutableStateOf(ApiState.Empty)
+    private var markPostRes: ApiState<PostResponse> by mutableStateOf(ApiState.Empty)
 
     var sortType by mutableStateOf(SortType.Active)
         private set
@@ -97,8 +103,16 @@ class HomeViewModel : ViewModel(), Initializable {
                     if (newRes.data.posts.isEmpty()) { // Hit the end of the posts
                         prevPage()
                     }
-                    ApiState.Success(GetPostsResponse(mergePosts(oldRes.data.posts, newRes.data.posts)))
+                    ApiState.Success(
+                        GetPostsResponse(
+                            mergePosts(
+                                oldRes.data.posts,
+                                newRes.data.posts,
+                            ),
+                        ),
+                    )
                 }
+
                 else -> {
                     prevPage()
                     oldRes
@@ -169,7 +183,28 @@ class HomeViewModel : ViewModel(), Initializable {
 
     fun updateFromAccount(account: Account) {
         updateSortType(SortType.values().getOrElse(account.defaultSortType) { sortType })
-        updateListingType(ListingType.values().getOrElse(account.defaultListingType) { listingType })
+        updateListingType(
+            ListingType.values().getOrElse(account.defaultListingType) { listingType },
+        )
+    }
+
+    fun refreshSinglePost(id: Int, account: Account) {
+        viewModelScope.launch {
+            val postForm = GetPost(id = id, auth = account.jwt)
+            postRes = apiWrapper(API.getInstance().getPost(postForm.serializeToMap()))
+            val refreshedPost = postRes
+            val existing = postsRes
+            when {
+                refreshedPost is ApiState.Success && existing is ApiState.Success -> {
+                    val refreshedPosts =
+                        findAndUpdatePost(existing.data.posts, refreshedPost.data.post_view)
+                    val newPosts = ApiState.Success(existing.data.copy(posts = refreshedPosts))
+                    postsRes = newPosts
+                }
+
+                else -> {}
+            }
+        }
     }
 
     fun updatePost(postView: PostView) {
@@ -179,6 +214,7 @@ class HomeViewModel : ViewModel(), Initializable {
                 val newRes = ApiState.Success(existing.data.copy(posts = newPosts))
                 postsRes = newRes
             }
+
             else -> {}
         }
     }
@@ -216,4 +252,19 @@ class HomeViewModel : ViewModel(), Initializable {
             auth = jwt,
         )
     }
+
+    fun markPostAsRead(form: MarkPostAsRead) {
+        viewModelScope.launch {
+            markPostRes = ApiState.Loading
+            markPostRes = apiWrapper(API.getInstance().markAsRead(form))
+
+            when (val markRes = markPostRes) {
+                is ApiState.Success -> {
+                    updatePost(markRes.data.post_view)
+                }
+
+                else -> {}
+            }
+        }
+    }
 }