mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 11:38:51 +01:00
Show Snackbar when archiving conversation
This commit is contained in:
@@ -13,6 +13,8 @@ abstract class FlowableAdapter<T> : QkAdapter<T>() {
|
||||
|
||||
var flowable: Flowable<List<T>>? = null
|
||||
set(value) {
|
||||
if (field == value) return
|
||||
|
||||
field = value
|
||||
|
||||
// Stop listening for updates on the old flowable
|
||||
|
||||
@@ -7,6 +7,7 @@ import android.content.res.ColorStateList
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.graphics.drawable.StateListDrawable
|
||||
import android.os.Bundle
|
||||
import android.support.design.widget.Snackbar
|
||||
import android.support.v7.app.ActionBarDrawerToggle
|
||||
import android.support.v7.widget.LinearLayoutManager
|
||||
import android.support.v7.widget.helper.ItemTouchHelper
|
||||
@@ -59,6 +60,7 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
||||
}
|
||||
|
||||
private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) }
|
||||
private val archiveSnackbar by lazy { Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_INDEFINITE) }
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
@@ -159,6 +161,11 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
||||
}
|
||||
}
|
||||
|
||||
when (state.page is Inbox && state.page.showArchivedSnackbar) {
|
||||
true -> archiveSnackbar.show()
|
||||
false -> archiveSnackbar.dismiss()
|
||||
}
|
||||
|
||||
inbox.isSelected = state.page is Inbox
|
||||
inboxIcon.isSelected = state.page is Inbox
|
||||
archived.isSelected = state.page is Archived
|
||||
|
||||
@@ -10,7 +10,7 @@ data class MainState(
|
||||
|
||||
sealed class MainPage
|
||||
|
||||
data class Inbox(val data: Flowable<List<InboxItem>>?) : MainPage()
|
||||
data class Inbox(val data: Flowable<List<InboxItem>>?, val showArchivedSnackbar: Boolean = false) : MainPage()
|
||||
|
||||
data class Archived(val data: Flowable<List<InboxItem>>?) : MainPage()
|
||||
|
||||
|
||||
@@ -12,8 +12,10 @@ import com.moez.QKSMS.domain.interactor.PartialSync
|
||||
import com.moez.QKSMS.presentation.Navigator
|
||||
import com.moez.QKSMS.presentation.common.base.QkViewModel
|
||||
import io.reactivex.BackpressureStrategy
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
|
||||
@@ -97,7 +99,24 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
.subscribe { threadId -> deleteConversation.execute(threadId) }
|
||||
|
||||
intents += view.archiveConversationIntent
|
||||
.subscribe { threadId -> markArchived.execute(threadId) }
|
||||
.withLatestFrom(state, { threadId, state ->
|
||||
markArchived.execute(threadId) {
|
||||
if (state.page is Inbox) {
|
||||
val page = state.page.copy(showArchivedSnackbar = true)
|
||||
newState { it.copy(page = page) }
|
||||
}
|
||||
}
|
||||
})
|
||||
.flatMap { Observable.timer(2750, TimeUnit.MILLISECONDS) }
|
||||
.withLatestFrom(state, { threadId, state ->
|
||||
markArchived.execute(threadId) {
|
||||
if (state.page is Inbox) {
|
||||
val page = state.page.copy(showArchivedSnackbar = false)
|
||||
newState { it.copy(page = page) }
|
||||
}
|
||||
}
|
||||
})
|
||||
.subscribe()
|
||||
}
|
||||
|
||||
}
|
||||
@@ -46,7 +46,7 @@
|
||||
<string name="notification_read">Mark read</string>
|
||||
|
||||
<string name="toast_copied">Copied</string>
|
||||
<string name="toast_archived">Archived</string>
|
||||
<string name="toast_archived">Archived conversation</string>
|
||||
<string name="toast_unarchived">Moved to inbox</string>
|
||||
|
||||
<string-array name="conversation_options">
|
||||
|
||||
Reference in New Issue
Block a user