forked from upstream-mirrors/quik
Don't keep references to conversations and archivedConversations realmResults in MainViewModel
This commit is contained in:
@@ -26,14 +26,14 @@ import javax.inject.Inject
|
|||||||
|
|
||||||
class ConversationItemTouchCallback @Inject constructor() : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
|
class ConversationItemTouchCallback @Inject constructor() : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
|
||||||
|
|
||||||
val swipes: Subject<Int> = PublishSubject.create()
|
val swipes: Subject<Long> = PublishSubject.create()
|
||||||
|
|
||||||
override fun onMove(recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder?, target: RecyclerView.ViewHolder?): Boolean {
|
override fun onMove(recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder?, target: RecyclerView.ViewHolder?): Boolean {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
|
override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
|
||||||
swipes.onNext(viewHolder.adapterPosition)
|
swipes.onNext(viewHolder.itemId)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -49,6 +49,11 @@ class ConversationsAdapter @Inject constructor(
|
|||||||
val longClicks: Subject<Long> = PublishSubject.create()
|
val longClicks: Subject<Long> = PublishSubject.create()
|
||||||
|
|
||||||
private val disposables = CompositeDisposable()
|
private val disposables = CompositeDisposable()
|
||||||
|
private var attachedRecyclerViews = 0
|
||||||
|
|
||||||
|
init {
|
||||||
|
setHasStableIds(true)
|
||||||
|
}
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||||
val layoutRes = when (viewType) {
|
val layoutRes = when (viewType) {
|
||||||
@@ -67,8 +72,16 @@ class ConversationsAdapter @Inject constructor(
|
|||||||
return QkViewHolder(view)
|
return QkViewHolder(view)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun isAttachedToRecyclerView() = attachedRecyclerViews > 0
|
||||||
|
|
||||||
|
override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
|
||||||
|
super.onAttachedToRecyclerView(recyclerView)
|
||||||
|
attachedRecyclerViews++
|
||||||
|
}
|
||||||
|
|
||||||
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
|
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
|
||||||
super.onDetachedFromRecyclerView(recyclerView)
|
super.onDetachedFromRecyclerView(recyclerView)
|
||||||
|
attachedRecyclerViews--
|
||||||
disposables.clear()
|
disposables.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,6 +101,10 @@ class ConversationsAdapter @Inject constructor(
|
|||||||
view.snippet.text = if (message.isMe()) "You: ${message.getSummary()}" else message.getSummary()
|
view.snippet.text = if (message.isMe()) "You: ${message.getSummary()}" else message.getSummary()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun getItemId(index: Int): Long {
|
||||||
|
return getItem(index)!!.conversation!!.id
|
||||||
|
}
|
||||||
|
|
||||||
override fun getItemViewType(position: Int): Int {
|
override fun getItemViewType(position: Int): Int {
|
||||||
return if (getItem(position)!!.read) 0 else 1
|
return if (getItem(position)!!.read) 0 else 1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import android.support.v7.widget.helper.ItemTouchHelper
|
|||||||
import android.view.Gravity
|
import android.view.Gravity
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
|
import android.view.View
|
||||||
import com.jakewharton.rxbinding2.support.v4.widget.drawerOpen
|
import com.jakewharton.rxbinding2.support.v4.widget.drawerOpen
|
||||||
import com.jakewharton.rxbinding2.view.clicks
|
import com.jakewharton.rxbinding2.view.clicks
|
||||||
import com.jakewharton.rxbinding2.widget.textChanges
|
import com.jakewharton.rxbinding2.widget.textChanges
|
||||||
@@ -181,6 +182,12 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
|||||||
override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
|
override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
|
||||||
onItemRangeInserted(positionStart, itemCount)
|
onItemRangeInserted(positionStart, itemCount)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onChanged() {
|
||||||
|
if (conversationsAdapter.isAttachedToRecyclerView()) {
|
||||||
|
empty.setVisible(conversationsAdapter.itemCount == 0, View.INVISIBLE)
|
||||||
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -203,7 +210,6 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
|||||||
itemTouchHelper.attachToRecyclerView(recyclerView)
|
itemTouchHelper.attachToRecyclerView(recyclerView)
|
||||||
menuItemAdapter.data = state.page.menu
|
menuItemAdapter.data = state.page.menu
|
||||||
empty.setText(R.string.inbox_empty_text)
|
empty.setText(R.string.inbox_empty_text)
|
||||||
empty.setVisible(state.page.empty && !state.syncing)
|
|
||||||
compose.setVisible(true)
|
compose.setVisible(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -214,7 +220,6 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
|||||||
itemTouchHelper.attachToRecyclerView(null)
|
itemTouchHelper.attachToRecyclerView(null)
|
||||||
menuItemAdapter.data = state.page.menu
|
menuItemAdapter.data = state.page.menu
|
||||||
empty.setText(R.string.archived_empty_text)
|
empty.setText(R.string.archived_empty_text)
|
||||||
empty.setVisible(state.page.empty && !state.syncing)
|
|
||||||
compose.setVisible(true)
|
compose.setVisible(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -224,7 +229,6 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
|||||||
itemTouchHelper.attachToRecyclerView(null)
|
itemTouchHelper.attachToRecyclerView(null)
|
||||||
menuItemAdapter.data = ArrayList()
|
menuItemAdapter.data = ArrayList()
|
||||||
empty.setText(R.string.scheduled_empty_text)
|
empty.setText(R.string.scheduled_empty_text)
|
||||||
empty.setVisible(state.page.empty && !state.syncing)
|
|
||||||
compose.setVisible(false)
|
compose.setVisible(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,15 +33,12 @@ sealed class MainPage
|
|||||||
data class Inbox(
|
data class Inbox(
|
||||||
val showClearButton: Boolean = false,
|
val showClearButton: Boolean = false,
|
||||||
val data: RealmResults<Message>? = null,
|
val data: RealmResults<Message>? = null,
|
||||||
val empty: Boolean = false,
|
|
||||||
val menu: List<MenuItem> = ArrayList(),
|
val menu: List<MenuItem> = ArrayList(),
|
||||||
val showArchivedSnackbar: Boolean = false) : MainPage()
|
val showArchivedSnackbar: Boolean = false) : MainPage()
|
||||||
|
|
||||||
data class Archived(
|
data class Archived(
|
||||||
val data: RealmResults<Message>? = null,
|
val data: RealmResults<Message>? = null,
|
||||||
val empty: Boolean = false,
|
|
||||||
val menu: List<MenuItem> = ArrayList()) : MainPage()
|
val menu: List<MenuItem> = ArrayList()) : MainPage()
|
||||||
|
|
||||||
data class Scheduled(
|
data class Scheduled(
|
||||||
val data: Any? = null,
|
val data: Any? = null) : MainPage()
|
||||||
val empty: Boolean = false) : MainPage()
|
|
||||||
@@ -18,8 +18,8 @@
|
|||||||
*/
|
*/
|
||||||
package feature.main
|
package feature.main
|
||||||
|
|
||||||
import io.reactivex.Observable
|
|
||||||
import common.base.QkView
|
import common.base.QkView
|
||||||
|
import io.reactivex.Observable
|
||||||
|
|
||||||
interface MainView : QkView<MainState> {
|
interface MainView : QkView<MainState> {
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ interface MainView : QkView<MainState> {
|
|||||||
val conversationLongClickIntent: Observable<Long>
|
val conversationLongClickIntent: Observable<Long>
|
||||||
val conversationMenuItemIntent: Observable<Int>
|
val conversationMenuItemIntent: Observable<Int>
|
||||||
val confirmDeleteIntent: Observable<Unit>
|
val confirmDeleteIntent: Observable<Unit>
|
||||||
val swipeConversationIntent: Observable<Int>
|
val swipeConversationIntent: Observable<Long>
|
||||||
val undoSwipeConversationIntent: Observable<Unit>
|
val undoSwipeConversationIntent: Observable<Unit>
|
||||||
|
|
||||||
fun clearSearch()
|
fun clearSearch()
|
||||||
|
|||||||
@@ -44,9 +44,6 @@ import io.realm.Realm
|
|||||||
import model.SyncLog
|
import model.SyncLog
|
||||||
import repository.MessageRepository
|
import repository.MessageRepository
|
||||||
import util.Preferences
|
import util.Preferences
|
||||||
import util.extensions.asObservable
|
|
||||||
import util.extensions.mapNotNull
|
|
||||||
import util.extensions.toFlowable
|
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@@ -64,30 +61,6 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
|||||||
@Inject lateinit var partialSync: PartialSync
|
@Inject lateinit var partialSync: PartialSync
|
||||||
@Inject lateinit var prefs: Preferences
|
@Inject lateinit var prefs: Preferences
|
||||||
|
|
||||||
private val conversations by lazy {
|
|
||||||
messageRepo.getConversations().also {
|
|
||||||
it.asFlowable()
|
|
||||||
.withLatestFrom(state.toFlowable(), { conversations, state ->
|
|
||||||
(state.page as? Inbox)?.let { page ->
|
|
||||||
newState { it.copy(page = page.copy(empty = conversations.isEmpty())) }
|
|
||||||
}
|
|
||||||
conversations
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val archivedConversations by lazy {
|
|
||||||
messageRepo.getConversations(true).also {
|
|
||||||
it.asFlowable()
|
|
||||||
.withLatestFrom(state.toFlowable(), { conversations, state ->
|
|
||||||
(state.page as? Archived)?.let { page ->
|
|
||||||
newState { it.copy(page = page.copy(empty = conversations.isEmpty())) }
|
|
||||||
}
|
|
||||||
conversations
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val menuArchive by lazy { MenuItem(context.getString(R.string.menu_archive), 0) }
|
private val menuArchive by lazy { MenuItem(context.getString(R.string.menu_archive), 0) }
|
||||||
private val menuUnarchive by lazy { MenuItem(context.getString(R.string.menu_unarchive), 1) }
|
private val menuUnarchive by lazy { MenuItem(context.getString(R.string.menu_unarchive), 1) }
|
||||||
private val menuDelete by lazy { MenuItem(context.getString(R.string.menu_delete), 2) }
|
private val menuDelete by lazy { MenuItem(context.getString(R.string.menu_delete), 2) }
|
||||||
@@ -113,7 +86,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
|||||||
.distinctUntilChanged()
|
.distinctUntilChanged()
|
||||||
.subscribe { syncing -> newState { it.copy(syncing = syncing) } }
|
.subscribe { syncing -> newState { it.copy(syncing = syncing) } }
|
||||||
|
|
||||||
newState { it.copy(page = Inbox(data = conversations)) }
|
newState { it.copy(page = Inbox(data = messageRepo.getConversations())) }
|
||||||
|
|
||||||
// Migrate the preferences from 2.7.3 if necessary
|
// Migrate the preferences from 2.7.3 if necessary
|
||||||
migratePreferences.execute(Unit)
|
migratePreferences.execute(Unit)
|
||||||
@@ -141,13 +114,11 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
|||||||
.debounce(200, TimeUnit.MILLISECONDS)
|
.debounce(200, TimeUnit.MILLISECONDS)
|
||||||
.withLatestFrom(state, { query, state ->
|
.withLatestFrom(state, { query, state ->
|
||||||
if (state.page is Inbox) {
|
if (state.page is Inbox) {
|
||||||
val conversations = when {
|
/*val conversations = messageRepo.getConversationsSnapshot()
|
||||||
query.isEmpty() -> conversations
|
.filter { conversationFilter.filter(it, query) }
|
||||||
else -> conversations.filter { conversationFilter.filter(it, query) }
|
|
||||||
}
|
|
||||||
|
|
||||||
//val page = state.page.copy(showClearButton = query.isNotEmpty(), data = conversations)
|
val page = state.page.copy(showClearButton = query.isNotEmpty(), data = conversations)
|
||||||
//newState { it.copy(page = page) }
|
newState { it.copy(page = page) }*/
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
@@ -173,8 +144,8 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
|||||||
.distinctUntilChanged()
|
.distinctUntilChanged()
|
||||||
.doOnNext {
|
.doOnNext {
|
||||||
when (it) {
|
when (it) {
|
||||||
DrawerItem.INBOX -> newState { it.copy(page = Inbox(data = conversations)) }
|
DrawerItem.INBOX -> newState { it.copy(page = Inbox(data = messageRepo.getConversations())) }
|
||||||
DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(archivedConversations)) }
|
DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(messageRepo.getConversations(true))) }
|
||||||
DrawerItem.SCHEDULED -> newState { it.copy(page = Scheduled()) }
|
DrawerItem.SCHEDULED -> newState { it.copy(page = Scheduled()) }
|
||||||
else -> {
|
else -> {
|
||||||
} // Do nothing
|
} // Do nothing
|
||||||
@@ -235,11 +206,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
|||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { threadId -> deleteConversation.execute(threadId) }
|
.subscribe { threadId -> deleteConversation.execute(threadId) }
|
||||||
|
|
||||||
val swipedConversation = view.swipeConversationIntent
|
view.swipeConversationIntent
|
||||||
.withLatestFrom(conversations.asObservable(), { position, conversations -> conversations[position] })
|
|
||||||
.mapNotNull { message -> message?.conversation?.id }
|
|
||||||
|
|
||||||
swipedConversation
|
|
||||||
.withLatestFrom(state, { threadId, state ->
|
.withLatestFrom(state, { threadId, state ->
|
||||||
markArchived.execute(threadId) {
|
markArchived.execute(threadId) {
|
||||||
if (state.page is Inbox) {
|
if (state.page is Inbox) {
|
||||||
@@ -261,7 +228,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
|||||||
.subscribe()
|
.subscribe()
|
||||||
|
|
||||||
view.undoSwipeConversationIntent
|
view.undoSwipeConversationIntent
|
||||||
.withLatestFrom(swipedConversation, { _, threadId -> threadId })
|
.withLatestFrom(view.swipeConversationIntent, { _, threadId -> threadId })
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { threadId -> markUnarchived.execute(threadId) }
|
.subscribe { threadId -> markUnarchived.execute(threadId) }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,7 +96,7 @@
|
|||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/toolbar"
|
app:layout_constraintTop_toBottomOf="@id/toolbar"
|
||||||
tools:text="Your conversations will appear here"
|
tools:text="Your conversations will appear here"
|
||||||
tools:visibility="gone" />
|
tools:visibility="invisible" />
|
||||||
|
|
||||||
<android.support.v7.widget.RecyclerView
|
<android.support.v7.widget.RecyclerView
|
||||||
android:id="@+id/recyclerView"
|
android:id="@+id/recyclerView"
|
||||||
|
|||||||
Reference in New Issue
Block a user