Bookmarks (#1560)

* add bookmarks to timelines

* add Bookmarks to main menu

* cleanup

* handle BookmarkEvent

* fix tests

* fix bookmark handling in NotificationsFragment

* add bookmark accessibility actions

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt

@@ -69,6 +69,7 @@ data class ConversationStatusEntity(
         val emojis: List<Emoji>,
         val favouritesCount: Int,
         val favourited: Boolean,
+        val bookmarked: Boolean,
         val sensitive: Boolean,
         val spoilerText: String,
         val attachments: ArrayList<Attachment>,
@@ -148,6 +149,7 @@ data class ConversationStatusEntity(
                 favouritesCount = favouritesCount,
                 reblogged = false,
                 favourited = favourited,
+                bookmarked = bookmarked,
                 sensitive= sensitive,
                 spoilerText = spoilerText,
                 visibility = Status.Visibility.DIRECT,
@@ -172,7 +174,7 @@ fun Account.toEntity() =
 fun Status.toEntity() =
         ConversationStatusEntity(
                 id, url, inReplyToId, inReplyToAccountId, account.toEntity(), content,
-                createdAt, emojis, favouritesCount, favourited, sensitive,
+                createdAt, emojis, favouritesCount, favourited, bookmarked, sensitive,
                 spoilerText, attachments, mentions,
                 false,
                 false,

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java

@@ -83,6 +83,7 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
         setCreatedAt(status.getCreatedAt());
         setIsReply(status.getInReplyToId() != null);
         setFavourited(status.getFavourited());
+        setBookmarked(status.getBookmarked());
         List<Attachment> attachments = status.getAttachments();
         boolean sensitive = status.getSensitive();
         if(mediaPreviewEnabled && !hasAudioAttachment(attachments)) {

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt

@@ -117,6 +117,10 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
         viewModel.favourite(favourite, position)
     }
 
+    override fun onBookmark(favourite: Boolean, position: Int) {
+        viewModel.bookmark(favourite, position)
+    }
+
     override fun onMore(view: View, position: Int) {
         viewModel.conversations.value?.getOrNull(position)?.lastStatus?.let {
             more(it.toStatus(), view, position)

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt

@@ -66,6 +66,24 @@ class ConversationsViewModel @Inject constructor(
 
     }
 
+    fun bookmark(bookmark: Boolean, position: Int) {
+        conversations.value?.getOrNull(position)?.let { conversation ->
+            timelineCases.bookmark(conversation.lastStatus.toStatus(), bookmark)
+                    .flatMap {
+                        val newConversation = conversation.copy(
+                                lastStatus = conversation.lastStatus.copy(bookmarked = bookmark)
+                        )
+
+                        database.conversationDao().insert(newConversation)
+                    }
+                    .subscribeOn(Schedulers.io())
+                    .doOnError { t -> Log.w("ConversationViewModel", "Failed to bookmark conversation", t) }
+                    .subscribe()
+                    .addTo(disposables)
+        }
+
+    }
+
     fun voteInPoll(position: Int, choices: MutableList<Int>) {
         conversations.value?.getOrNull(position)?.let { conversation ->
             timelineCases.voteInPoll(conversation.lastStatus.toStatus(), choices)

app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt

@@ -187,6 +187,18 @@ class SearchViewModel @Inject constructor(
                 .subscribe())
     }
 
+    fun bookmark(status: Pair<Status, StatusViewData.Concrete>, isBookmarked: Boolean) {
+        val idx = loadedStatuses.indexOf(status)
+        if (idx >= 0) {
+            val newPair = Pair(status.first, StatusViewData.Builder(status.second).setFavourited(isBookmarked).createStatusViewData())
+            loadedStatuses[idx] = newPair
+            repoResultStatus.value?.refresh?.invoke()
+        }
+        disposables.add(timelineCases.favourite(status.first, isBookmarked)
+                .onErrorReturnItem(status.first)
+                .subscribe())
+    }
+
     fun getAllAccountsOrderedByActive(): List<AccountEntity> {
         return accountManager.getAllAccountsOrderedByActive()
     }

app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt

@@ -94,6 +94,12 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
         }
     }
 
+    override fun onBookmark(bookmark: Boolean, position: Int) {
+        (adapter as? SearchStatusesAdapter)?.getItem(position)?.let { status ->
+            viewModel.bookmark(status, bookmark)
+        }
+    }
+
     override fun onMore(view: View, position: Int) {
         (adapter as? SearchStatusesAdapter)?.getItem(position)?.first?.let {
             more(it, view, position)