fenix
/
Simple-Contacts
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #391, show more detailed info at deleting elements

This commit is contained in:
tibbi 2019-08-27 11:02:56 +02:00
parent cbead76a0a
commit 853a6a8e87
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
View File

@ -151,7 +151,18 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
}
private fun askConfirmDelete() {
ConfirmationDialog(activity) {
val itemsCnt = selectedKeys.size
val firstItem = getSelectedItems().first()
val items = if (itemsCnt == 1) {
"\"${firstItem.getNameToDisplay()}\""
} else {
resources.getQuantityString(R.plurals.delete_contacts, itemsCnt, itemsCnt)
}
val baseString = R.string.delete_contacts_confirmation
val question = String.format(resources.getString(baseString), items)
ConfirmationDialog(activity, question) {
deleteContacts()
}
}

15
app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
View File

@ -102,7 +102,18 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList<Group>, val
}
private fun askConfirmDelete() {
ConfirmationDialog(activity) {
val itemsCnt = selectedKeys.size
val firstItem = getSelectedItems().first()
val items = if (itemsCnt == 1) {
"\"${firstItem.title}\""
} else {
resources.getQuantityString(R.plurals.delete_groups, itemsCnt, itemsCnt)
}
val baseString = R.string.delete_contacts_confirmation
val question = String.format(resources.getString(baseString), items)
ConfirmationDialog(activity, question) {
ensureBackgroundThread {
deleteGroups()
}
@ -135,6 +146,8 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList<Group>, val
}
}
private fun getSelectedItems() = groups.filter { selectedKeys.contains(it.id?.toInt()) } as ArrayList<Group>
private fun setupView(view: View, group: Group) {
view.apply {
group_frame?.isSelected = selectedKeys.contains(group.id!!.toInt())