mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-20 20:58:54 +01:00
#1221 - Display appropriate message when deleting multiple conversations
This commit is contained in:
+4
-4
@@ -18,11 +18,11 @@
|
|||||||
*/
|
*/
|
||||||
package com.moez.QKSMS.feature.conversationinfo
|
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.ViewModelProvider
|
||||||
import androidx.lifecycle.ViewModelProviders
|
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.jakewharton.rxbinding2.view.clicks
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.common.Navigator
|
import com.moez.QKSMS.common.Navigator
|
||||||
@@ -137,7 +137,7 @@ class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView {
|
|||||||
override fun showDeleteDialog() {
|
override fun showDeleteDialog() {
|
||||||
AlertDialog.Builder(this)
|
AlertDialog.Builder(this)
|
||||||
.setTitle(R.string.dialog_delete_title)
|
.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) }
|
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(Unit) }
|
||||||
.setNegativeButton(R.string.button_cancel, null)
|
.setNegativeButton(R.string.button_cancel, null)
|
||||||
.show()
|
.show()
|
||||||
|
|||||||
@@ -292,10 +292,10 @@ class MainActivity : QkThemedActivity(), MainView {
|
|||||||
conversationsAdapter.clearSelection()
|
conversationsAdapter.clearSelection()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun showDeleteDialog() {
|
override fun showDeleteDialog(count: Int) {
|
||||||
AlertDialog.Builder(this)
|
AlertDialog.Builder(this)
|
||||||
.setTitle(R.string.dialog_delete_title)
|
.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) }
|
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(Unit) }
|
||||||
.setNegativeButton(R.string.button_cancel, null)
|
.setNegativeButton(R.string.button_cancel, null)
|
||||||
.show()
|
.show()
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ interface MainView : QkView<MainState> {
|
|||||||
fun requestPermissions()
|
fun requestPermissions()
|
||||||
fun clearSearch()
|
fun clearSearch()
|
||||||
fun clearSelection()
|
fun clearSelection()
|
||||||
fun showDeleteDialog()
|
fun showDeleteDialog(count: Int)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -219,7 +219,7 @@ class MainViewModel @Inject constructor(
|
|||||||
view.clearSelection()
|
view.clearSelection()
|
||||||
}
|
}
|
||||||
|
|
||||||
R.id.delete -> view.showDeleteDialog()
|
R.id.delete -> view.showDeleteDialog(conversations.size)
|
||||||
|
|
||||||
R.id.pin -> {
|
R.id.pin -> {
|
||||||
markPinned.execute(conversations)
|
markPinned.execute(conversations)
|
||||||
|
|||||||
@@ -79,7 +79,10 @@
|
|||||||
<string name="rate_dismiss">DISMISS</string>
|
<string name="rate_dismiss">DISMISS</string>
|
||||||
|
|
||||||
<string name="dialog_delete_title">Delete</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">
|
<string-array name="message_options">
|
||||||
<item>Copy text</item>
|
<item>Copy text</item>
|
||||||
|
|||||||
Reference in New Issue
Block a user