diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt index 892c8add..ddfb1ebf 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt @@ -24,7 +24,6 @@ interface AppComponent { fun inject(activity: ComposeActivity) fun inject(activity: SettingsActivity) - fun inject(adapter: ConversationsAdapter) fun inject(adapter: MessagesAdapter) fun inject(receiver: DefaultSmsChangedReceiver) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt index b781ba20..4caae78e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt @@ -6,7 +6,6 @@ import android.view.LayoutInflater import android.view.ViewGroup import com.jakewharton.rxbinding2.view.RxView import com.moez.QKSMS.R -import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.data.model.ConversationMessagePair @@ -16,23 +15,23 @@ import com.moez.QKSMS.presentation.base.QkAdapter import com.moez.QKSMS.presentation.base.QkViewHolder import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.conversation_list_item.view.* import javax.inject.Inject -class ConversationsAdapter : QkAdapter() { +class ConversationsAdapter @Inject constructor( + val context: Context, + val navigator: Navigator, + val messageRepo: MessageRepository, + val dateFormatter: DateFormatter, + val colors: Colors +) : QkAdapter() { - @Inject lateinit var context: Context - @Inject lateinit var navigator: Navigator - @Inject lateinit var messageRepo: MessageRepository - @Inject lateinit var dateFormatter: DateFormatter - @Inject lateinit var colors: Colors + val longClicks: Subject = PublishSubject.create() private val disposables = CompositeDisposable() - init { - appComponent.inject(this) - } - override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { val layoutRes = when (viewType) { 0 -> R.layout.conversation_list_item @@ -61,6 +60,7 @@ class ConversationsAdapter : QkAdapter() { val view = viewHolder.itemView RxView.clicks(view).subscribe { navigator.showConversation(message.threadId) } + RxView.longClicks(view).subscribe { longClicks.onNext(conversation.id) } view.avatars.contacts = conversation.contacts view.title.text = conversation.getTitle() 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 69b777e5..08df4305 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 @@ -1,6 +1,7 @@ package com.moez.QKSMS.presentation.main import android.Manifest +import android.app.AlertDialog import android.content.Intent import android.content.res.ColorStateList import android.graphics.drawable.StateListDrawable @@ -19,7 +20,6 @@ import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.extensions.setBackgroundTint -import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.base.QkActivity import io.reactivex.rxkotlin.plusAssign @@ -34,6 +34,7 @@ import javax.inject.Inject class MainActivity : QkActivity(), MainView { @Inject lateinit var navigator: Navigator + @Inject lateinit var conversationsAdapter: ConversationsAdapter @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback override val viewModelClass = MainViewModel::class @@ -44,7 +45,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 deleteConversationIntent: Subject = PublishSubject.create() + override val deleteConversationIntent: Subject = PublishSubject.create() override val archiveConversationIntent by lazy { itemTouchCallback.swipes } private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } @@ -90,6 +91,16 @@ class MainActivity : QkActivity(), MainView { archived.background = rowBackground() scheduled.background = rowBackground() blocked.background = rowBackground() + + conversationsAdapter.longClicks.subscribe { threadId -> + AlertDialog.Builder(this) + .setItems(R.array.conversation_options, { _, row -> + when (row) { + 0 -> deleteConversationIntent.onNext(threadId) + } + }) + .show() + } } override fun onNewIntent(intent: Intent?) { @@ -102,16 +113,14 @@ class MainActivity : QkActivity(), MainView { override fun render(state: MainState) { when (state.page) { MainPage.INBOX -> { - if (recyclerView.adapter !is ConversationsAdapter) recyclerView.adapter = ConversationsAdapter() - val adapter = recyclerView.adapter as ConversationsAdapter - if (adapter.data != state.conversations) adapter.data = state.conversations + if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter + if (conversationsAdapter.data != state.conversations) conversationsAdapter.data = state.conversations itemTouchHelper.attachToRecyclerView(recyclerView) } MainPage.ARCHIVED -> { - if (recyclerView.adapter !is ConversationsAdapter) recyclerView.adapter = ConversationsAdapter() - val adapter = recyclerView.adapter as ConversationsAdapter - if (adapter.data != state.archivedConversations) adapter.data = state.archivedConversations + if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter + if (conversationsAdapter.data != state.archivedConversations) conversationsAdapter.data = state.archivedConversations itemTouchHelper.attachToRecyclerView(null) } 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 4c200a15..20cf5ce9 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 @@ -1,6 +1,5 @@ package com.moez.QKSMS.presentation.main -import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.presentation.base.QkView import io.reactivex.Observable import io.reactivex.subjects.Subject @@ -14,7 +13,7 @@ interface MainView : QkView { val scheduledIntent: Observable val blockedIntent: Observable val settingsIntent: Observable - val deleteConversationIntent: Subject + val deleteConversationIntent: Subject val archiveConversationIntent: Subject } \ 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 be6ad377..ce4b1d10 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 @@ -4,6 +4,7 @@ import android.content.Context import android.provider.Telephony import com.moez.QKSMS.common.di.appComponent 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 @@ -19,6 +20,7 @@ class MainViewModel : QkViewModel(MainState(page = MainPage @Inject lateinit var navigator: Navigator @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var markAllSeen: MarkAllSeen + @Inject lateinit var deleteConversation: DeleteConversation @Inject lateinit var markArchived: MarkArchived @Inject lateinit var partialSync: PartialSync @@ -75,10 +77,13 @@ class MainViewModel : QkViewModel(MainState(page = MainPage newState { it.copy(drawerOpen = false) } } + intents += view.deleteConversationIntent + .subscribe { threadId -> deleteConversation.execute(threadId) } + intents += view.archiveConversationIntent .withLatestFrom(state, { position, state -> state.conversations[position] }) .map { pair -> pair.conversation.id } - .subscribe { threadId -> markArchived.execute(threadId)} + .subscribe { threadId -> markArchived.execute(threadId) } } } \ 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 e7168ab8..f3efa845 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -48,6 +48,10 @@ Archived Moved to inbox + + Delete + + Copy text Forward