refactor: Use same patterns as Notifications* implementation (#1222)

The modifications to the Notifications* classes highlighted different
(and better) ways of writing the code that manages status timelines.
Follow those practices here.

Changes include:

- Move `pachliAccountId` in to `IStatusViewData` so the adapter does not
need to be initialised with the information. This allows the parameter
to be removed from functions that operate on `IStatusViewData`, and the
adapter does not need to be marked `lateinit`.

- Convert Fragment/ViewModel communication to use the `uiResult`
pattern instead of separate `uiSuccess` and `uiError`.

- Show a `LinearProgressIndicator` when refreshing the list.

- Restore the reading position more smoothly by responding when the
first page of results is loaded.

- Save the reading position to `RemoteKeyEntity` instead of a dedicated
property in `AccountEntity`.

- Fixed queries for returning the row number of a notification or
status in the database.

Fixes #238, #872, #928, #1190

app/src/main/java/app/pachli/adapter/FilterableStatusViewHolder.kt

@@ -35,28 +35,26 @@ open class FilterableStatusViewHolder<T : IStatusViewData>(
     var matchedFilter: Filter? = null
 
     override fun setupWithStatus(
-        pachliAccountId: Long,
         viewData: T,
         listener: StatusActionListener<T>,
         statusDisplayOptions: StatusDisplayOptions,
         payloads: Any?,
     ) {
-        super.setupWithStatus(pachliAccountId, viewData, listener, statusDisplayOptions, payloads)
-        setupFilterPlaceholder(pachliAccountId, viewData, listener)
+        super.setupWithStatus(viewData, listener, statusDisplayOptions, payloads)
+        setupFilterPlaceholder(viewData, listener)
     }
 
     private fun setupFilterPlaceholder(
-        pachliAccountId: Long,
-        status: T,
+        viewData: T,
         listener: StatusActionListener<T>,
     ) {
-        if (status.contentFilterAction !== FilterAction.WARN) {
+        if (viewData.contentFilterAction !== FilterAction.WARN) {
             matchedFilter = null
             setPlaceholderVisibility(false)
             return
         }
 
-        status.actionable.filtered?.find { it.filter.filterAction === NetworkFilterAction.WARN }?.let { result ->
+        viewData.actionable.filtered?.find { it.filter.filterAction === NetworkFilterAction.WARN }?.let { result ->
             this.matchedFilter = result.filter
             setPlaceholderVisibility(true)
 
@@ -71,10 +69,10 @@ open class FilterableStatusViewHolder<T : IStatusViewData>(
             binding.statusFilteredPlaceholder.statusFilterLabel.text = label
 
             binding.statusFilteredPlaceholder.statusFilterShowAnyway.setOnClickListener {
-                listener.clearContentFilter(pachliAccountId, status)
+                listener.clearContentFilter(viewData)
             }
             binding.statusFilteredPlaceholder.statusFilterEditFilter.setOnClickListener {
-                listener.onEditFilterById(pachliAccountId, result.filter.id)
+                listener.onEditFilterById(viewData.pachliAccountId, result.filter.id)
             }
         } ?: {
             matchedFilter = null

app/src/main/java/app/pachli/adapter/StatusBaseViewHolder.kt

@@ -145,7 +145,6 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
     }
 
     protected fun setSpoilerAndContent(
-        pachliAccountId: Long,
         viewData: T,
         statusDisplayOptions: StatusDisplayOptions,
         listener: StatusActionListener<T>,
@@ -165,7 +164,6 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
             setContentWarningButtonText(expanded)
             contentWarningButton.setOnClickListener {
                 toggleExpandedState(
-                    pachliAccountId,
                     viewData,
                     true,
                     !expanded,
@@ -197,19 +195,17 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
     }
 
     protected open fun toggleExpandedState(
-        pachliAccountId: Long,
         viewData: T,
         sensitive: Boolean,
         expanded: Boolean,
         statusDisplayOptions: StatusDisplayOptions,
         listener: StatusActionListener<T>,
     ) {
         contentWarningDescription.invalidate()
-        listener.onExpandedChange(pachliAccountId, viewData, expanded)
+        listener.onExpandedChange(viewData, expanded)
         setContentWarningButtonText(expanded)
         setTextVisible(sensitive, expanded, viewData, statusDisplayOptions, listener)
         setupCard(
-            pachliAccountId,
             viewData,
             expanded,
             statusDisplayOptions.cardViewMode,
@@ -466,7 +462,6 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
     }
 
     protected fun setMediaPreviews(
-        pachliAccountId: Long,
         viewData: T,
         attachments: List<Attachment>,
         sensitive: Boolean,
@@ -498,7 +493,7 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
             } else {
                 imageView.foreground = null
             }
-            setAttachmentClickListener(pachliAccountId, viewData, imageView, listener, i, attachment, true)
+            setAttachmentClickListener(viewData, imageView, listener, i, attachment, true)
             if (sensitive) {
                 sensitiveMediaWarning.setText(R.string.post_sensitive_media_title)
             } else {
@@ -509,13 +504,13 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
             descriptionIndicator.visibility =
                 if (hasDescription && showingContent) View.VISIBLE else View.GONE
             sensitiveMediaShow.setOnClickListener { v: View ->
-                listener.onContentHiddenChange(pachliAccountId, viewData, false)
+                listener.onContentHiddenChange(viewData, false)
                 v.visibility = View.GONE
                 sensitiveMediaWarning.visibility = View.VISIBLE
                 descriptionIndicator.visibility = View.GONE
             }
             sensitiveMediaWarning.setOnClickListener { v: View ->
-                listener.onContentHiddenChange(pachliAccountId, viewData, true)
+                listener.onContentHiddenChange(viewData, true)
                 v.visibility = View.GONE
                 sensitiveMediaShow.visibility = View.VISIBLE
                 descriptionIndicator.visibility = if (hasDescription) View.VISIBLE else View.GONE
@@ -530,7 +525,6 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
     }
 
     protected fun setMediaLabel(
-        pachliAccountId: Long,
         viewData: T,
         attachments: List<Attachment>,
         sensitive: Boolean,
@@ -548,15 +542,14 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
                 // Set the icon next to the label.
                 val drawableId = attachments[0].iconResource()
                 mediaLabel.setCompoundDrawablesRelativeWithIntrinsicBounds(drawableId, 0, 0, 0)
-                setAttachmentClickListener(pachliAccountId, viewData, mediaLabel, listener, i, attachment, false)
+                setAttachmentClickListener(viewData, mediaLabel, listener, i, attachment, false)
             } else {
                 mediaLabel.visibility = View.GONE
             }
         }
     }
 
     private fun setAttachmentClickListener(
-        pachliAccountId: Long,
         viewData: T,
         view: View,
         listener: StatusActionListener<T>,
@@ -566,7 +559,7 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
     ) {
         view.setOnClickListener { v: View? ->
             if (sensitiveMediaWarning.visibility == View.VISIBLE) {
-                listener.onContentHiddenChange(pachliAccountId, viewData, true)
+                listener.onContentHiddenChange(viewData, true)
             } else {
                 listener.onViewMedia(viewData, index, if (animateTransition) v else null)
             }
@@ -584,7 +577,6 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
     }
 
     protected fun setupButtons(
-        pachliAccountId: Long,
         viewData: T,
         listener: StatusActionListener<T>,
         accountId: String,
@@ -594,7 +586,7 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
         avatar.setOnClickListener(profileButtonClickListener)
         displayName.setOnClickListener(profileButtonClickListener)
         replyButton.setOnClickListener {
-            listener.onReply(pachliAccountId, viewData)
+            listener.onReply(viewData)
         }
         reblogButton?.setEventListener { _: SparkButton?, buttonState: Boolean ->
             // return true to play animation
@@ -683,7 +675,6 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
     }
 
     open fun setupWithStatus(
-        pachliAccountId: Long,
         viewData: T,
         listener: StatusActionListener<T>,
         statusDisplayOptions: StatusDisplayOptions,
@@ -715,7 +706,6 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
             val sensitive = actionable.sensitive
             if (statusDisplayOptions.mediaPreviewEnabled && hasPreviewableAttachment(attachments)) {
                 setMediaPreviews(
-                    pachliAccountId,
                     viewData,
                     attachments,
                     sensitive,
@@ -731,28 +721,26 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
                     mediaLabel.visibility = View.GONE
                 }
             } else {
-                setMediaLabel(pachliAccountId, viewData, attachments, sensitive, listener, viewData.isShowingContent)
+                setMediaLabel(viewData, attachments, sensitive, listener, viewData.isShowingContent)
                 // Hide all unused views.
                 mediaPreview.visibility = View.GONE
                 hideSensitiveMediaWarning()
             }
             setupCard(
-                pachliAccountId,
                 viewData,
                 viewData.isExpanded,
                 statusDisplayOptions.cardViewMode,
                 statusDisplayOptions,
                 listener,
             )
             setupButtons(
-                pachliAccountId,
                 viewData,
                 listener,
                 actionable.account.id,
                 statusDisplayOptions,
             )
             setRebloggingEnabled(actionable.rebloggingAllowed(), actionable.visibility)
-            setSpoilerAndContent(pachliAccountId, viewData, statusDisplayOptions, listener)
+            setSpoilerAndContent(viewData, statusDisplayOptions, listener)
             setContentDescriptionForStatus(viewData, statusDisplayOptions)
 
             // Workaround for RecyclerView 1.0.0 / androidx.core 1.0.0
@@ -876,7 +864,6 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
     }
 
     protected fun setupCard(
-        pachliAccountId: Long,
         viewData: T,
         expanded: Boolean,
         cardViewMode: CardViewMode,
@@ -898,13 +885,13 @@ abstract class StatusBaseViewHolder<T : IStatusViewData> protected constructor(
             cardView.bind(card, viewData.actionable.sensitive, statusDisplayOptions, false) { card, target ->
                 if (target == PreviewCardView.Target.BYLINE) {
                     card.authors?.firstOrNull()?.account?.id?.let {
-                        context.startActivity(AccountActivityIntent(context, pachliAccountId, it))
+                        context.startActivity(AccountActivityIntent(context, viewData.pachliAccountId, it))
                     }
                     return@bind
                 }
 
                 if (card.kind == PreviewCardKind.PHOTO && card.embedUrl.isNotEmpty() && target == PreviewCardView.Target.IMAGE) {
-                    context.startActivity(ViewMediaActivityIntent(context, pachliAccountId, viewData.actionable.account.username, card.embedUrl))
+                    context.startActivity(ViewMediaActivityIntent(context, viewData.pachliAccountId, viewData.actionable.account.username, card.embedUrl))
                     return@bind
                 }
 

app/src/main/java/app/pachli/adapter/StatusDetailedViewHolder.kt

@@ -106,26 +106,24 @@ class StatusDetailedViewHolder(
     }
 
     override fun setupWithStatus(
-        pachliAccountId: Long,
         viewData: StatusViewData,
         listener: StatusActionListener<StatusViewData>,
         statusDisplayOptions: StatusDisplayOptions,
         payloads: Any?,
     ) {
         // We never collapse statuses in the detail view
-        val uncollapsedStatus =
+        val uncollapsedViewdata =
             if (viewData.isCollapsible && viewData.isCollapsed) viewData.copy(isCollapsed = false) else viewData
-        super.setupWithStatus(pachliAccountId, uncollapsedStatus, listener, statusDisplayOptions, payloads)
+        super.setupWithStatus(uncollapsedViewdata, listener, statusDisplayOptions, payloads)
         setupCard(
-            pachliAccountId,
-            uncollapsedStatus,
+            uncollapsedViewdata,
             viewData.isExpanded,
             CardViewMode.FULL_WIDTH,
             statusDisplayOptions,
             listener,
         ) // Always show card for detailed status
         if (payloads == null) {
-            val (_, _, _, _, _, _, _, _, _, _, reblogsCount, favouritesCount) = uncollapsedStatus.actionable
+            val (_, _, _, _, _, _, _, _, _, _, reblogsCount, favouritesCount) = uncollapsedViewdata.actionable
             if (!statusDisplayOptions.hideStats) {
                 setReblogAndFavCount(viewData, reblogsCount, favouritesCount, listener)
             } else {

app/src/main/java/app/pachli/adapter/StatusViewHolder.kt

@@ -41,7 +41,6 @@ open class StatusViewHolder<T : IStatusViewData>(
 ) : StatusBaseViewHolder<T>(root ?: binding.root) {
 
     override fun setupWithStatus(
-        pachliAccountId: Long,
         viewData: T,
         listener: StatusActionListener<T>,
         statusDisplayOptions: StatusDisplayOptions,
@@ -50,7 +49,7 @@ open class StatusViewHolder<T : IStatusViewData>(
         if (payloads == null) {
             val sensitive = !TextUtils.isEmpty(viewData.actionable.spoilerText)
             val expanded = viewData.isExpanded
-            setupCollapsedState(pachliAccountId, viewData, sensitive, expanded, listener)
+            setupCollapsedState(viewData, sensitive, expanded, listener)
             val reblogging = viewData.rebloggingStatus
             if (reblogging == null || viewData.contentFilterAction === FilterAction.WARN) {
                 statusInfo.hide()
@@ -70,7 +69,7 @@ open class StatusViewHolder<T : IStatusViewData>(
         statusFavouritesCount.visible(statusDisplayOptions.showStatsInline)
         setFavouritedCount(viewData.actionable.favouritesCount)
         setReblogsCount(viewData.actionable.reblogsCount)
-        super.setupWithStatus(pachliAccountId, viewData, listener, statusDisplayOptions, payloads)
+        super.setupWithStatus(viewData, listener, statusDisplayOptions, payloads)
     }
 
     private fun setRebloggedByDisplayName(
@@ -108,7 +107,6 @@ open class StatusViewHolder<T : IStatusViewData>(
     }
 
     private fun setupCollapsedState(
-        pachliAccountId: Long,
         viewData: T,
         sensitive: Boolean,
         expanded: Boolean,
@@ -117,7 +115,7 @@ open class StatusViewHolder<T : IStatusViewData>(
         /* input filter for TextViews have to be set before text */
         if (viewData.isCollapsible && (!sensitive || expanded)) {
             buttonToggleContent.setOnClickListener {
-                listener.onContentCollapsedChange(pachliAccountId, viewData, !viewData.isCollapsed)
+                listener.onContentCollapsedChange(viewData, !viewData.isCollapsed)
             }
             buttonToggleContent.show()
             if (viewData.isCollapsed) {
@@ -139,15 +137,14 @@ open class StatusViewHolder<T : IStatusViewData>(
     }
 
     override fun toggleExpandedState(
-        pachliAccountId: Long,
         viewData: T,
         sensitive: Boolean,
         expanded: Boolean,
         statusDisplayOptions: StatusDisplayOptions,
         listener: StatusActionListener<T>,
     ) {
-        setupCollapsedState(pachliAccountId, viewData, sensitive, expanded, listener)
-        super.toggleExpandedState(pachliAccountId, viewData, sensitive, expanded, statusDisplayOptions, listener)
+        setupCollapsedState(viewData, sensitive, expanded, listener)
+        super.toggleExpandedState(viewData, sensitive, expanded, statusDisplayOptions, listener)
     }
 
     companion object {

app/src/main/java/app/pachli/components/conversation/ConversationAdapter.kt

@@ -26,7 +26,6 @@ import app.pachli.core.data.model.StatusDisplayOptions
 import app.pachli.interfaces.StatusActionListener
 
 class ConversationAdapter(
-    private val pachliAccountId: Long,
     private var statusDisplayOptions: StatusDisplayOptions,
     private val listener: StatusActionListener<ConversationViewData>,
 ) : PagingDataAdapter<ConversationViewData, ConversationViewHolder>(CONVERSATION_COMPARATOR) {
@@ -54,7 +53,7 @@ class ConversationAdapter(
         payloads: List<Any>,
     ) {
         getItem(position)?.let { conversationViewData ->
-            holder.setupWithConversation(pachliAccountId, conversationViewData, payloads.firstOrNull())
+            holder.setupWithConversation(conversationViewData, payloads.firstOrNull())
         }
     }
 

app/src/main/java/app/pachli/components/conversation/ConversationViewData.kt

@@ -35,12 +35,12 @@ data class ConversationViewData(
     val lastStatus: StatusViewData,
 ) : IStatusViewData by lastStatus {
     companion object {
-        fun from(conversationEntity: ConversationEntity) = ConversationViewData(
+        fun from(pachliAccountId: Long, conversationEntity: ConversationEntity) = ConversationViewData(
             id = conversationEntity.id,
             order = conversationEntity.order,
             accounts = conversationEntity.accounts,
             unread = conversationEntity.unread,
-            lastStatus = StatusViewData.from(conversationEntity.lastStatus),
+            lastStatus = StatusViewData.from(pachliAccountId, conversationEntity.lastStatus),
         )
     }
 }