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 797bc284..6b81e5fa 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 @@ -55,15 +55,15 @@ class MainActivity : QkActivity(), MainView { settings.clicks().map { DrawerItem.SETTINGS })) } override val deleteConversationIntent: Subject = PublishSubject.create() - override val archiveConversationIntent: Observable by lazy { - itemTouchCallback.swipes - .map { position -> conversationsAdapter.getItem(position) } - .map { pair -> pair.conversation } - .map { conversation -> conversation.id } - } + override val archiveConversationIntent: Observable by lazy { itemTouchCallback.swipes } + override val unarchiveConversationIntent: Subject = PublishSubject.create() private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } - private val archiveSnackbar by lazy { Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_INDEFINITE) } + private val archiveSnackbar by lazy { + Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_INDEFINITE).apply { + setAction(R.string.button_undo, { unarchiveConversationIntent.onNext(Unit) }) + } + } init { appComponent.inject(this) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt index 700e115f..eba1b809 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt @@ -11,7 +11,8 @@ interface MainView : QkView { val drawerOpenIntent: Observable val drawerItemIntent: Observable val deleteConversationIntent: Subject - val archiveConversationIntent: Observable + val archiveConversationIntent: Observable + val unarchiveConversationIntent: Subject } 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 ae30d6cd..6cf8798c 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 @@ -5,10 +5,7 @@ import android.provider.Telephony import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.filter.ConversationFilter import com.moez.QKSMS.data.repository.MessageRepository -import com.moez.QKSMS.domain.interactor.DeleteConversation -import com.moez.QKSMS.domain.interactor.MarkAllSeen -import com.moez.QKSMS.domain.interactor.MarkArchived -import com.moez.QKSMS.domain.interactor.PartialSync +import com.moez.QKSMS.domain.interactor.* import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.common.base.QkViewModel import io.reactivex.BackpressureStrategy @@ -28,6 +25,7 @@ class MainViewModel : QkViewModel(MainState()) { @Inject lateinit var markAllSeen: MarkAllSeen @Inject lateinit var deleteConversation: DeleteConversation @Inject lateinit var markArchived: MarkArchived + @Inject lateinit var markUnarchived: MarkUnarchived @Inject lateinit var partialSync: PartialSync private val conversations by lazy { messageRepo.getConversations() } @@ -88,7 +86,12 @@ class MainViewModel : QkViewModel(MainState()) { intents += view.deleteConversationIntent .subscribe { threadId -> deleteConversation.execute(threadId) } - intents += view.archiveConversationIntent + val archivedConversation = view.archiveConversationIntent + .withLatestFrom(conversations.toObservable(), { position, conversations -> conversations[position] }) + .map { pair -> pair.conversation } + .map { conversation -> conversation.id } + + intents += archivedConversation .withLatestFrom(state, { threadId, state -> markArchived.execute(threadId) { if (state.page is Inbox) { @@ -107,6 +110,10 @@ class MainViewModel : QkViewModel(MainState()) { } }) .subscribe() + + intents += view.unarchiveConversationIntent + .withLatestFrom(archivedConversation, { _, threadId -> threadId }) + .subscribe { threadId -> markUnarchived.execute(threadId) } } } \ No newline at end of file diff --git a/qksms/src/main/res/layout/main_activity.xml b/qksms/src/main/res/layout/main_activity.xml index abf33040..f1da594f 100644 --- a/qksms/src/main/res/layout/main_activity.xml +++ b/qksms/src/main/res/layout/main_activity.xml @@ -4,7 +4,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:animateLayoutChanges="true"> Reply Mark read + Undo + Copied Archived conversation Moved to inbox