diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt index 84306cc5..a6fc64a5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt @@ -8,6 +8,7 @@ open class Conversation : RealmObject() { @PrimaryKey var id: Long = 0 var contacts: RealmList = RealmList() + var archived: Boolean = false fun getTitle(): String { var title = "" diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 774915a9..b8a18d3e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -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() diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkArchived.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkArchived.kt new file mode 100644 index 00000000..84bdb684 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkArchived.kt @@ -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() { + + override fun buildObservable(params: Long): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markArchived(params) } + } + +} \ No newline at end of file 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 e23682ba..6e8ed113 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 @@ -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(), 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() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -63,6 +67,9 @@ class MainActivity : QkActivity(), 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(), 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) + } } 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 7571a7e1..bb8d86e4 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 @@ -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 { @@ -12,5 +13,6 @@ interface MainView : QkView { val scheduledIntent: Observable val blockedIntent: Observable val settingsIntent: Observable + val archivedConversationIntent: PublishSubject } \ No newline at end of file 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 618521ef..54491916 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 @@ -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(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(MainState()) { navigator.showSettings() newState { it.copy(drawerOpen = false) } } + + intents += view.archivedConversationIntent.subscribe { threadId -> + markArchived.execute(threadId) + } + } } \ No newline at end of file