mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Swipe to archive (#5)
This commit is contained in:
@@ -8,6 +8,7 @@ open class Conversation : RealmObject() {
|
||||
|
||||
@PrimaryKey var id: Long = 0
|
||||
var contacts: RealmList<Contact> = RealmList()
|
||||
var archived: Boolean = false
|
||||
|
||||
fun getTitle(): String {
|
||||
var title = ""
|
||||
|
||||
@@ -62,6 +62,17 @@ class MessageRepository @Inject constructor(
|
||||
.findAllSorted("date")
|
||||
}
|
||||
|
||||
fun markArchived(threadId: Long) {
|
||||
val realm = Realm.getDefaultInstance()
|
||||
val conversation = realm.where(Conversation::class.java)
|
||||
.equalTo("id", threadId)
|
||||
.equalTo("archived", false)
|
||||
.findFirst()
|
||||
|
||||
conversation?.archived = true
|
||||
realm.close()
|
||||
}
|
||||
|
||||
fun markAllSeen() {
|
||||
val realm = Realm.getDefaultInstance()
|
||||
val messages = realm.where(Message::class.java).equalTo("seen", false).findAll()
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.moez.QKSMS.domain.interactor
|
||||
|
||||
import com.moez.QKSMS.data.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkArchived @Inject constructor(val messageRepo: MessageRepository) : Interactor<Unit, Long>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markArchived(params) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,6 +5,8 @@ import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.support.v7.app.ActionBarDrawerToggle
|
||||
import android.support.v7.widget.LinearLayoutManager
|
||||
import android.support.v7.widget.RecyclerView
|
||||
import android.support.v7.widget.helper.ItemTouchHelper
|
||||
import android.view.Gravity
|
||||
import com.jakewharton.rxbinding2.support.v4.widget.drawerOpen
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
@@ -19,6 +21,7 @@ import com.moez.QKSMS.common.util.ThemeManager
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.presentation.Navigator
|
||||
import com.moez.QKSMS.presentation.base.QkActivity
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.drawer_view.*
|
||||
import kotlinx.android.synthetic.main.main_activity.*
|
||||
import kotlinx.android.synthetic.main.toolbar.*
|
||||
@@ -38,6 +41,7 @@ class MainActivity : QkActivity<MainViewModel, MainState>(), MainView {
|
||||
override val scheduledIntent by lazy { scheduled.clicks() }
|
||||
override val blockedIntent by lazy { blocked.clicks() }
|
||||
override val settingsIntent by lazy { settings.clicks() }
|
||||
override val archivedConversationIntent = PublishSubject.create<Long>()
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
@@ -63,6 +67,9 @@ class MainActivity : QkActivity<MainViewModel, MainState>(), MainView {
|
||||
override fun render(state: MainState) {
|
||||
if (conversationList.adapter != state.adapter) {
|
||||
conversationList.adapter = state.adapter
|
||||
if (state.adapter is ConversationsAdapter) {
|
||||
setConversationListItemTouchListener(state.adapter)
|
||||
}
|
||||
}
|
||||
|
||||
inbox.setBackgroundResource(getRowBackground(state.page == MainPage.INBOX))
|
||||
@@ -100,4 +107,19 @@ class MainActivity : QkActivity<MainViewModel, MainState>(), MainView {
|
||||
})
|
||||
.check()
|
||||
}
|
||||
|
||||
private fun setConversationListItemTouchListener(adapter: ConversationsAdapter) {
|
||||
val itemTouchCallBack = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
|
||||
override fun onMove(recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder?): Boolean {
|
||||
return false
|
||||
}
|
||||
override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
|
||||
adapter.getItem(viewHolder.adapterPosition)?.threadId?.let { threadId ->
|
||||
archivedConversationIntent.onNext(threadId)
|
||||
}
|
||||
}
|
||||
}
|
||||
val itemTouchHelper = ItemTouchHelper(itemTouchCallBack)
|
||||
itemTouchHelper.attachToRecyclerView(conversationList)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.moez.QKSMS.presentation.main
|
||||
|
||||
import com.moez.QKSMS.presentation.base.QkView
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
|
||||
interface MainView : QkView<MainState> {
|
||||
|
||||
@@ -12,5 +13,6 @@ interface MainView : QkView<MainState> {
|
||||
val scheduledIntent: Observable<Unit>
|
||||
val blockedIntent: Observable<Unit>
|
||||
val settingsIntent: Observable<Unit>
|
||||
val archivedConversationIntent: PublishSubject<Long>
|
||||
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package com.moez.QKSMS.presentation.main
|
||||
import com.moez.QKSMS.common.di.AppComponentManager
|
||||
import com.moez.QKSMS.data.repository.MessageRepository
|
||||
import com.moez.QKSMS.domain.interactor.MarkAllSeen
|
||||
import com.moez.QKSMS.domain.interactor.MarkArchived
|
||||
import com.moez.QKSMS.presentation.Navigator
|
||||
import com.moez.QKSMS.presentation.base.QkViewModel
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
@@ -13,6 +14,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var messageRepo: MessageRepository
|
||||
@Inject lateinit var markAllSeen: MarkAllSeen
|
||||
@Inject lateinit var markArchived: MarkArchived
|
||||
|
||||
init {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
@@ -75,6 +77,11 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
navigator.showSettings()
|
||||
newState { it.copy(drawerOpen = false) }
|
||||
}
|
||||
|
||||
intents += view.archivedConversationIntent.subscribe { threadId ->
|
||||
markArchived.execute(threadId)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user