#1221 - Display appropriate message when deleting multiple conversations

This commit is contained in:
Moez Bhatti
2018-07-24 15:23:14 -04:00
parent 27ff7f1ad4
commit 8a2df45c12
5 changed files with 12 additions and 9 deletions
@@ -18,11 +18,11 @@
*/
package com.moez.QKSMS.feature.conversationinfo
import android.os.Bundle
import android.text.InputFilter
import androidx.appcompat.app.AlertDialog
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import android.text.InputFilter
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator
@@ -137,7 +137,7 @@ class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView {
override fun showDeleteDialog() {
AlertDialog.Builder(this)
.setTitle(R.string.dialog_delete_title)
.setMessage(R.string.dialog_delete_message)
.setMessage(resources.getQuantityString(R.plurals.dialog_delete_message, 1))
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(Unit) }
.setNegativeButton(R.string.button_cancel, null)
.show()
@@ -292,10 +292,10 @@ class MainActivity : QkThemedActivity(), MainView {
conversationsAdapter.clearSelection()
}
override fun showDeleteDialog() {
override fun showDeleteDialog(count: Int) {
AlertDialog.Builder(this)
.setTitle(R.string.dialog_delete_title)
.setMessage(R.string.dialog_delete_message)
.setMessage(resources.getQuantityString(R.plurals.dialog_delete_message, count, count))
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(Unit) }
.setNegativeButton(R.string.button_cancel, null)
.show()
@@ -43,7 +43,7 @@ interface MainView : QkView<MainState> {
fun requestPermissions()
fun clearSearch()
fun clearSelection()
fun showDeleteDialog()
fun showDeleteDialog(count: Int)
}
@@ -219,7 +219,7 @@ class MainViewModel @Inject constructor(
view.clearSelection()
}
R.id.delete -> view.showDeleteDialog()
R.id.delete -> view.showDeleteDialog(conversations.size)
R.id.pin -> {
markPinned.execute(conversations)
+4 -1
View File
@@ -79,7 +79,10 @@
<string name="rate_dismiss">DISMISS</string>
<string name="dialog_delete_title">Delete</string>
<string name="dialog_delete_message">Are you sure you would like to delete this conversation?</string>
<plurals name="dialog_delete_message">
<item quantity="one">Are you sure you would like to delete this conversation?</item>
<item quantity="other">Are you sure you would like to delete %d conversations?</item>
</plurals>
<string-array name="message_options">
<item>Copy text</item>