diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt index 29f9e6d5..6dee4c5f 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt @@ -19,12 +19,14 @@ package presentation.feature.conversationinfo import android.os.Bundle +import android.support.v7.app.AlertDialog import android.support.v7.widget.LinearLayoutManager import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent +import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.conversation_info_activity.* import presentation.common.base.QkThemedActivity import javax.inject.Inject @@ -35,6 +37,7 @@ class ConversationInfoActivity : QkThemedActivity(), override val notificationsIntent by lazy { notifications.clicks() } override val archiveIntent by lazy { archive.clicks() } override val deleteIntent by lazy { delete.clicks() } + override val confirmDeleteIntent: PublishSubject = PublishSubject.create() @Inject lateinit var recipientAdapter: ConversationRecipientAdapter @@ -65,10 +68,19 @@ class ConversationInfoActivity : QkThemedActivity(), recipientAdapter.data = state.recipients - archive.title = getString(when(state.archived) { + archive.title = getString(when (state.archived) { true -> R.string.info_unarchive false -> R.string.info_archive }) } + override fun showDeleteDialog() { + AlertDialog.Builder(this) + .setTitle(R.string.dialog_delete_title) + .setMessage(R.string.dialog_delete_message) + .setPositiveButton(R.string.button_delete, { _, _ -> confirmDeleteIntent.onNext(Unit) }) + .setNegativeButton(R.string.button_cancel, null) + .show() + } + } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt index 3855cb75..d45a3e35 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt @@ -26,5 +26,8 @@ interface ConversationInfoView : QkView { val notificationsIntent: Observable val archiveIntent: Observable val deleteIntent: Observable + val confirmDeleteIntent: Observable + + fun showDeleteDialog() } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt index 47baf1b7..75b53da8 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt @@ -102,8 +102,13 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel conversation }) .autoDisposable(view.scope()) .subscribe { conversation -> deleteConversation.execute(conversation.id) } diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index ef6523d1..63cc93e7 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -80,6 +80,7 @@ class MainActivity : QkThemedActivity(), MainView { override val conversationClickIntent by lazy { conversationsAdapter.clicks } override val conversationLongClickIntent by lazy { conversationsAdapter.longClicks } override val conversationMenuItemIntent by lazy { menuItemAdapter.menuItemClicks } + override val confirmDeleteIntent: Subject = PublishSubject.create() override val swipeConversationIntent by lazy { itemTouchCallback.swipes } override val undoSwipeConversationIntent: Subject = PublishSubject.create() @@ -269,6 +270,15 @@ class MainActivity : QkThemedActivity(), MainView { toolbarSearch.text = null } + override fun showDeleteDialog() { + AlertDialog.Builder(this) + .setTitle(R.string.dialog_delete_title) + .setMessage(R.string.dialog_delete_message) + .setPositiveButton(R.string.button_delete, { _, _ -> confirmDeleteIntent.onNext(Unit) }) + .setNegativeButton(R.string.button_cancel, null) + .show() + } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.main, menu) return super.onCreateOptionsMenu(menu) diff --git a/qksms/src/main/java/presentation/feature/main/MainView.kt b/qksms/src/main/java/presentation/feature/main/MainView.kt index 3ff54570..e6e2dba5 100644 --- a/qksms/src/main/java/presentation/feature/main/MainView.kt +++ b/qksms/src/main/java/presentation/feature/main/MainView.kt @@ -32,10 +32,12 @@ interface MainView : QkView { val conversationClickIntent: Observable val conversationLongClickIntent: Observable val conversationMenuItemIntent: Subject + val confirmDeleteIntent: Subject val swipeConversationIntent: Observable val undoSwipeConversationIntent: Subject fun clearSearch() + fun showDeleteDialog() } diff --git a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt index 26b56f6c..e6a8bac5 100644 --- a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt @@ -206,12 +206,18 @@ class MainViewModel : QkViewModel(MainState()) { when (actionId) { menuArchive.actionId -> markArchived.execute(threadId) menuUnarchive.actionId -> markUnarchived.execute(threadId) - menuDelete.actionId -> deleteConversation.execute(threadId) + menuDelete.actionId -> view.showDeleteDialog() } }) .autoDisposable(view.scope()) .subscribe() + // Delete the conversation + view.confirmDeleteIntent + .withLatestFrom(view.conversationLongClickIntent, { _, threadId -> threadId }) + .autoDisposable(view.scope()) + .subscribe { threadId -> deleteConversation.execute(threadId) } + val swipedConversation = view.swipeConversationIntent .withLatestFrom(conversations.toObservable(), { position, conversations -> conversations[position] }) .map { pair -> pair.conversation } diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 0775daee..cb522161 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -64,6 +64,9 @@ Your scheduled messages will appear here Your blocked senders will appear here + Delete + Are you sure you would like to delete this conversation? + Details Notifications Archive @@ -127,8 +130,10 @@ Reply Mark read - Undo + Yes Cancel + Delete + Undo More Copied