diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt index e4c61a42..4a03aa15 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt @@ -13,6 +13,8 @@ abstract class FlowableAdapter : QkAdapter() { var flowable: Flowable>? = null set(value) { + if (field == value) return + field = value // Stop listening for updates on the old flowable diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 82b41d43..2be07a18 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -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(), 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(), 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 diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt index d3ba3c9a..40a1ffd5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt @@ -10,7 +10,7 @@ data class MainState( sealed class MainPage -data class Inbox(val data: Flowable>?) : MainPage() +data class Inbox(val data: Flowable>?, val showArchivedSnackbar: Boolean = false) : MainPage() data class Archived(val data: Flowable>?) : MainPage() diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index 792f300b..cf2ce6b2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -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(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() } } \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 3233d1d4..24882e91 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -46,7 +46,7 @@ Mark read Copied - Archived + Archived conversation Moved to inbox