diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt index bbb0c9f6..c2ae4c0d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt @@ -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() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 4ada050e..e129b0fb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -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() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt index 38171d7d..555df29a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt @@ -43,7 +43,7 @@ interface MainView : QkView { fun requestPermissions() fun clearSearch() fun clearSelection() - fun showDeleteDialog() + fun showDeleteDialog(count: Int) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 3106c01c..85727f18 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -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) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index c6d26d9c..a3a34280 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -79,7 +79,10 @@ DISMISS Delete - Are you sure you would like to delete this conversation? + + Are you sure you would like to delete this conversation? + Are you sure you would like to delete %d conversations? + Copy text