From 92b7069da96bd5d9ae1ff7eb8ea8ea5130be45c2 Mon Sep 17 00:00:00 2001 From: fricyo <30796677+fricyo@users.noreply.github.com> Date: Wed, 21 Aug 2019 19:31:22 +0800 Subject: [PATCH 01/20] Update Translation --- app/src/main/res/values-zh-rTW/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1245421a..8660c0da 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -96,7 +96,7 @@ 搜尋聯絡人 搜尋我的最愛 - Search groups + 搜尋群組 匯入聯絡人 From 2df33cdb6681351d34a9c3e5a679f6353f49fa7c Mon Sep 17 00:00:00 2001 From: spkprs Date: Wed, 21 Aug 2019 19:53:40 +0300 Subject: [PATCH 02/20] Update strings.xml --- app/src/main/res/values-el/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 8448594e..c3950232 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -18,7 +18,7 @@ Δημιουργία νέας Επαφής Προσθήκη σε μια υπάρχουσα Επαφή Θα πρέπει να οριστεί προεπιλεγμένη εφαρμογή για χρησιμοποίηση αποκλεισμένων αριθμών. - Ορισμός προεπιλεγμένης + Ορισμός ως προεπιλογής Δεν βρέθηκαν Επαφές @@ -96,7 +96,7 @@ Αναζήτηση επαφών Αναζήτηση αγαπημένων - Search groups + Αναζήτηση ομάδων Εισαγωγή επαφών From 1c972f5fe8c7e6c7e7a49623345fe2d573280de8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 25 Aug 2019 14:53:36 +0200 Subject: [PATCH 03/20] updating kotlin, commons, gradle --- app/build.gradle | 2 +- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d372ae24..1662c466 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.16.7' + implementation 'com.simplemobiletools:commons:5.16.14' implementation 'joda-time:joda-time:2.10.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' diff --git a/build.gradle b/build.gradle index b4fdb49c..fea01513 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.41' + ext.kotlin_version = '1.3.50' repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d913a229..d43658d7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu May 02 12:41:18 CEST 2019 +#Sun Aug 25 14:49:07 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From a06ed027cdc65dce608998ad31f3e5e2b86690f9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 25 Aug 2019 14:53:45 +0200 Subject: [PATCH 04/20] adding a crashfix --- .../contacts/pro/activities/ViewContactActivity.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt index 7e820937..6c92f793 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt @@ -134,6 +134,10 @@ class ViewContactActivity : ContactActivity() { } private fun gotContact() { + if (isDestroyed || isFinishing) { + return + } + contact_scrollview.beVisible() setupViewContact() contact_send_sms.beVisibleIf(contact!!.phoneNumbers.isNotEmpty()) From 42ff471748b5420ee668e206d12041d0c22254d1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 25 Aug 2019 21:29:08 +0200 Subject: [PATCH 05/20] fix some filtering issues, show more contacts rather than less --- .../simplemobiletools/contacts/pro/helpers/ContactsHelper.kt | 2 +- .../com/simplemobiletools/contacts/pro/models/Contact.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt index 468980a0..1c10cd73 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt @@ -66,7 +66,7 @@ class ContactsHelper(val context: Context) { it.getHashToCompare() } as ArrayList - tempContacts.groupBy { "${it.getNameToDisplay().toLowerCase()}${it.emails}" }.values.forEach { + tempContacts.filter { displayContactSources.contains(it.source) }.groupBy { "${it.getNameToDisplay().toLowerCase()}${it.emails}" }.values.forEach { it -> if (it.size == 1) { resultContacts.add(it.first()) } else { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt index e602c289..cc8ee32f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt @@ -112,9 +112,8 @@ data class Contact(var id: Int, var prefix: String, var firstName: String, var m emails.mapTo(newEmails) { Email(it.value, 0, "") } return copy(id = 0, prefix = "", firstName = getNameToDisplay().toLowerCase(), middleName = "", surname = "", suffix = "", nickname = "", photoUri = "", - phoneNumbers = ArrayList(), events = ArrayList(), addresses = ArrayList(), emails = newEmails, source = "", starred = 0, - contactId = 0, thumbnailUri = "", notes = "", groups = ArrayList(), websites = ArrayList(), organization = Organization("", ""), - IMs = ArrayList()).toString() + phoneNumbers = ArrayList(), events = ArrayList(), addresses = ArrayList(), emails = newEmails, starred = 0, contactId = 0, + thumbnailUri = "", notes = "", groups = ArrayList(), websites = ArrayList(), organization = Organization("", ""), IMs = ArrayList()).toString() } fun getHashToCompare() = getStringToCompare().hashCode() From 899971aa2a7cbeb1e40890e43b002794b32f735e Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 25 Aug 2019 22:15:54 +0200 Subject: [PATCH 06/20] improve deleting multiple contacts at once --- app/build.gradle | 2 +- .../contacts/pro/adapters/ContactsAdapter.kt | 16 +++++++++------- .../contacts/pro/helpers/ContactsHelper.kt | 2 +- .../contacts/pro/helpers/LocalContactsHelper.kt | 7 ++++--- .../contacts/pro/interfaces/ContactsDao.kt | 3 +++ 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1662c466..bfcdd1bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.16.14' + implementation 'com.simplemobiletools:commons:5.16.16' implementation 'joda-time:joda-time:2.10.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt index 1c82ee22..02199b49 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt @@ -167,14 +167,16 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList) { - val localContacts = contacts.filter { it.isPrivate() }.map { it.id }.toTypedArray() + val localContacts = contacts.filter { it.isPrivate() }.map { it.id.toLong() }.toMutableList() LocalContactsHelper(context).deleteContactIds(localContacts) try { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt index b67b2405..ef0d4daf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt @@ -5,6 +5,7 @@ import android.graphics.Bitmap import android.graphics.BitmapFactory import android.net.Uri import android.provider.MediaStore +import com.simplemobiletools.commons.extensions.getChoppedList import com.simplemobiletools.contacts.pro.extensions.contactsDB import com.simplemobiletools.contacts.pro.extensions.getByteArray import com.simplemobiletools.contacts.pro.extensions.getEmptyContact @@ -45,9 +46,9 @@ class LocalContactsHelper(val context: Context) { } } - fun deleteContactIds(ids: Array) { - ids.forEach { - context.contactsDB.deleteContactId(it) + fun deleteContactIds(ids: MutableList) { + ids.getChoppedList().forEach { + context.contactsDB.deleteContactIds(it) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/ContactsDao.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/ContactsDao.kt index 373df2d3..cc869362 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/ContactsDao.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/ContactsDao.kt @@ -22,4 +22,7 @@ interface ContactsDao { @Query("DELETE FROM contacts WHERE id = :id") fun deleteContactId(id: Int) + + @Query("DELETE FROM contacts WHERE id IN (:ids)") + fun deleteContactIds(ids: List) } From 4e88bf518f1b727bdc9ed3c7c2d1184b85c7f1bb Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 25 Aug 2019 22:29:33 +0200 Subject: [PATCH 07/20] properly select the contact source for importing, if empty --- .../contacts/pro/dialogs/ImportContactsDialog.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt index 3640391d..3eb9a0d6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt @@ -10,6 +10,7 @@ import com.simplemobiletools.contacts.pro.activities.SimpleActivity import com.simplemobiletools.contacts.pro.extensions.config import com.simplemobiletools.contacts.pro.extensions.getPublicContactSource import com.simplemobiletools.contacts.pro.extensions.showContactSourcePicker +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE import com.simplemobiletools.contacts.pro.helpers.VcfImporter import com.simplemobiletools.contacts.pro.helpers.VcfImporter.ImportResult.IMPORT_FAIL @@ -23,6 +24,17 @@ class ImportContactsDialog(val activity: SimpleActivity, val path: String, priva targetContactSource = activity.config.lastUsedContactSource activity.getPublicContactSource(targetContactSource) { import_contacts_title.text = it + if (it.isEmpty()) { + ContactsHelper(activity).getContactSources { + val localSource = it.firstOrNull { it.name == SMT_PRIVATE } + if (localSource != null) { + targetContactSource = localSource.name + activity.runOnUiThread { + import_contacts_title.text = localSource.publicName + } + } + } + } } import_contacts_title.setOnClickListener { From 0342035b27bdc6a6de295e90f53f8f249ff741b3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 25 Aug 2019 22:34:30 +0200 Subject: [PATCH 08/20] handle null names at importing gracefully --- .../com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt index 290327c1..9a959764 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt @@ -135,7 +135,7 @@ class VcfImporter(val activity: SimpleActivity) { targetContactSource, starred, contactId, thumbnailUri, photo, notes, groups, organization, websites, IMs) // if there is no N and ORG fields at the given contact, only FN, treat it as an organization - if (contact.getNameToDisplay().isEmpty() && contact.organization.isEmpty() && ezContact.formattedName.value.isNotEmpty()) { + if (contact.getNameToDisplay().isEmpty() && contact.organization.isEmpty() && ezContact.formattedName?.value?.isNotEmpty() == true) { contact.organization.company = ezContact.formattedName.value } From e6c031885c82735ce6b7dc760e44d6200e85eaae Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 26 Aug 2019 15:45:13 +0200 Subject: [PATCH 09/20] do not allow confirming the import/export dialogs multiple times --- .../contacts/pro/dialogs/ExportContactsDialog.kt | 4 +++- .../contacts/pro/dialogs/ImportContactsDialog.kt | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt index c02a4516..7939b743 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt @@ -16,6 +16,7 @@ import java.util.* class ExportContactsDialog(val activity: SimpleActivity, val path: String, private val callback: (file: File, ignoredContactSources: HashSet) -> Unit) { private var contactSources = ArrayList() + private var ignoreClicks = false init { val view = (activity.layoutInflater.inflate(R.layout.dialog_export_contacts, null) as ViewGroup).apply { @@ -36,7 +37,7 @@ class ExportContactsDialog(val activity: SimpleActivity, val path: String, priva .create().apply { activity.setupDialogStuff(view, this, R.string.export_contacts) { getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { - if (view.export_contacts_list.adapter == null) { + if (view.export_contacts_list.adapter == null || ignoreClicks) { return@setOnClickListener } @@ -50,6 +51,7 @@ class ExportContactsDialog(val activity: SimpleActivity, val path: String, priva return@setOnClickListener } + ignoreClicks = true ensureBackgroundThread { val selectedSources = (view.export_contacts_list.adapter as FilterContactSourcesAdapter).getSelectedContactSources() val ignoredSources = contactSources.filter { !selectedSources.contains(it) }.map { it.getFullIdentifier() }.toHashSet() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt index 3eb9a0d6..a8157579 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt @@ -18,6 +18,7 @@ import kotlinx.android.synthetic.main.dialog_import_contacts.view.* class ImportContactsDialog(val activity: SimpleActivity, val path: String, private val callback: (refreshView: Boolean) -> Unit) { private var targetContactSource = "" + private var ignoreClicks = false init { val view = (activity.layoutInflater.inflate(R.layout.dialog_import_contacts, null) as ViewGroup).apply { @@ -53,6 +54,11 @@ class ImportContactsDialog(val activity: SimpleActivity, val path: String, priva .create().apply { activity.setupDialogStuff(view, this, R.string.import_contacts) { getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { + if (ignoreClicks) { + return@setOnClickListener + } + + ignoreClicks = true activity.toast(R.string.importing) ensureBackgroundThread { val result = VcfImporter(activity).importContacts(path, targetContactSource) From d856649618c2ffeea6850516512ba3c14fb0aab8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 26 Aug 2019 15:46:09 +0200 Subject: [PATCH 10/20] properly export all contacts as appropriate --- .../contacts/pro/activities/MainActivity.kt | 2 +- .../contacts/pro/extensions/Context.kt | 4 ++-- .../contacts/pro/helpers/ContactsHelper.kt | 19 ++++++++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt index 4e4392d8..37edb2b6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt @@ -496,7 +496,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private fun exportContacts() { FilePickerDialog(this, pickFile = false, showFAB = true) { ExportContactsDialog(this, it) { file, ignoredContactSources -> - ContactsHelper(this).getContacts(ignoredContactSources) { contacts -> + ContactsHelper(this).getContacts(true, ignoredContactSources) { contacts -> if (contacts.isEmpty()) { toast(R.string.no_entries_for_exporting) } else { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt index e505e4ed..59868db0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt @@ -307,10 +307,10 @@ fun Context.getVisibleContactSources(): ArrayList { .map { it.name }.toMutableList() as ArrayList } -fun Context.getAllContactSources(): List { +fun Context.getAllContactSources(): ArrayList { val sources = ContactsHelper(this).getDeviceContactSources() sources.add(getPrivateContactSource()) - return sources.toMutableList() + return sources.toMutableList() as ArrayList } @TargetApi(Build.VERSION_CODES.N) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt index ecc2ff98..30d247d9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt @@ -25,17 +25,22 @@ import java.util.* import kotlin.collections.ArrayList class ContactsHelper(val context: Context) { - private val BATCH_SIZE = 100 + private val BATCH_SIZE = 50 private var displayContactSources = ArrayList() - fun getContacts(ignoredContactSources: HashSet = HashSet(), callback: (ArrayList) -> Unit) { + fun getContacts(isExporting: Boolean = false, ignoredContactSources: HashSet = HashSet(), callback: (ArrayList) -> Unit) { ensureBackgroundThread { val contacts = SparseArray() displayContactSources = context.getVisibleContactSources() - if (ignoredContactSources.isNotEmpty()) { - displayContactSources = context.getAllContactSources().filter { - it.getFullIdentifier().isNotEmpty() && !ignoredContactSources.contains(it.getFullIdentifier()) - }.map { it.getFullIdentifier() }.toMutableList() as ArrayList + + if (isExporting) { + displayContactSources = if (ignoredContactSources.isEmpty()) { + context.getAllContactSources().map { it.getFullIdentifier() }.toMutableList() as ArrayList + } else { + context.getAllContactSources().filter { + it.getFullIdentifier().isNotEmpty() && !ignoredContactSources.contains(it.getFullIdentifier()) + }.map { it.getFullIdentifier() }.toMutableList() as ArrayList + } } getDeviceContacts(contacts, ignoredContactSources) @@ -61,7 +66,7 @@ class ContactsHelper(val context: Context) { contacts.valueAt(it) } - if (ignoredContactSources.isEmpty() && context.config.filterDuplicates) { + if (ignoredContactSources.isEmpty() && context.config.filterDuplicates && !isExporting) { tempContacts = tempContacts.distinctBy { it.getHashToCompare() } as ArrayList From 18c94cfa63d10de1ec21ac7ad7cf15ff5e24f141 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 26 Aug 2019 16:39:33 +0200 Subject: [PATCH 11/20] at dialpad search at organization name too, not just contact name --- .../contacts/pro/activities/DialpadActivity.kt | 3 ++- .../com/simplemobiletools/contacts/pro/models/Contact.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt index 4227fd30..201bca43 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt @@ -174,7 +174,8 @@ class DialpadActivity : SimpleActivity() { (dialpad_list.adapter as? ContactsAdapter)?.finishActMode() val filtered = contacts.filter { val convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(it.getNameToDisplay()) - it.doesContainPhoneNumber(text, showLetters) || (showLetters && convertedName.contains(text, true)) + val company = PhoneNumberUtils.convertKeypadLettersToDigits(it.getFullCompany()) + it.doesContainPhoneNumber(text, showLetters) || (showLetters && (convertedName.contains(text, true) || company.contains(text, true))) }.sortedWith(compareBy { if (showLetters) { !it.doesContainPhoneNumber(text, showLetters) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt index cc8ee32f..1662cf78 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt @@ -118,7 +118,7 @@ data class Contact(var id: Int, var prefix: String, var firstName: String, var m fun getHashToCompare() = getStringToCompare().hashCode() - private fun getFullCompany(): String { + fun getFullCompany(): String { var fullOrganization = if (organization.company.isEmpty()) "" else "${organization.company}, " fullOrganization += organization.jobPosition return fullOrganization.trim().trimEnd(',') From 67a3103688615a990018fbdd073393a24d4767c4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 26 Aug 2019 17:08:39 +0200 Subject: [PATCH 12/20] move the Select All menu item lower in the priority --- app/src/main/res/menu/cab.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/res/menu/cab.xml b/app/src/main/res/menu/cab.xml index c2bdb997..5f2c9981 100644 --- a/app/src/main/res/menu/cab.xml +++ b/app/src/main/res/menu/cab.xml @@ -1,49 +1,49 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> - + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> From 0abeaec79cbdab6766fb485e141714ecd87751b9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 26 Aug 2019 17:17:22 +0200 Subject: [PATCH 13/20] add some strings related to specifying contact/group deletion --- app/src/main/res/values-ar/strings.xml | 14 ++++++++++++++ app/src/main/res/values-az/strings.xml | 14 ++++++++++++++ app/src/main/res/values-cy/strings.xml | 14 ++++++++++++++ app/src/main/res/values-da/strings.xml | 14 ++++++++++++++ app/src/main/res/values-de/strings.xml | 14 ++++++++++++++ app/src/main/res/values-el/strings.xml | 14 ++++++++++++++ app/src/main/res/values-eu/strings.xml | 14 ++++++++++++++ app/src/main/res/values-fi/strings.xml | 14 ++++++++++++++ app/src/main/res/values-fr/strings.xml | 14 ++++++++++++++ app/src/main/res/values-hr/strings.xml | 14 ++++++++++++++ app/src/main/res/values-hu/strings.xml | 14 ++++++++++++++ app/src/main/res/values-id/strings.xml | 14 ++++++++++++++ app/src/main/res/values-in/strings.xml | 14 ++++++++++++++ app/src/main/res/values-it/strings.xml | 14 ++++++++++++++ app/src/main/res/values-ja/strings.xml | 14 ++++++++++++++ app/src/main/res/values-ko-rKR/strings.xml | 14 ++++++++++++++ app/src/main/res/values-lt/strings.xml | 14 ++++++++++++++ app/src/main/res/values-nl/strings.xml | 14 ++++++++++++++ app/src/main/res/values-pl/strings.xml | 14 ++++++++++++++ app/src/main/res/values-pt-rBR/strings.xml | 14 ++++++++++++++ app/src/main/res/values-pt/strings.xml | 14 ++++++++++++++ app/src/main/res/values-ru/strings.xml | 14 ++++++++++++++ app/src/main/res/values-sk/strings.xml | 16 ++++++++++++++++ app/src/main/res/values-sv/strings.xml | 14 ++++++++++++++ app/src/main/res/values-tr/strings.xml | 14 ++++++++++++++ app/src/main/res/values-uk/strings.xml | 14 ++++++++++++++ app/src/main/res/values-zh-rCN/strings.xml | 14 ++++++++++++++ app/src/main/res/values-zh-rTW/strings.xml | 14 ++++++++++++++ app/src/main/res/values/strings.xml | 14 ++++++++++++++ 29 files changed, 408 insertions(+) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ca5f49e3..07c24211 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -144,6 +144,20 @@ حظر أرقام أرقام محظورة + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + I want to change what fields are visible at contacts. Can I do it? Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 6e60255e..63ddbdaa 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -144,6 +144,20 @@ Block numbers Blocked numbers + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + I want to change what fields are visible at contacts. Can I do it? Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index fe4b38ac..6212f761 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -144,6 +144,20 @@ Rhwystro rhifau Rhifau wedi\'u rhwystro + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Hoffwn newid pa feysydd sydd i\'w gweld ar gyfer cysylltiadau. Ydy hyn yn bosib? Ydy. Y cwbl sy\'n rhaid gwneud ydy mynd i Gosodiadau -> Rheoli pa feysydd cysylltiadau i\'w dangos. Yna, gellir dewis pa feysydd sydd i\'w gweld. Bydd rhai wedi eu gosod i beidio ymddangos fel arfer, felly mae\'n bosib byddi\'n dod o hyd i rai newydd yno. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f543309e..4e7e5a01 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -144,6 +144,20 @@ Blokér numre Blokerede numre + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Jeg vil ændre, hvilke felter der er synlige ved kontakter. Kan jeg gøre det? Ja, alt hvad du skal gøre er at gå i Indstillinger -> Administrer viste kontaktfelter. Der kan du vælge, hvilke felter der skal være synlige. Nogle af dem er endda deaktiveret som standard, så du kan muligvis finde nogle nye der. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index af2fa22e..69f542bd 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -144,6 +144,20 @@ Nummern blockieren Blockierte Nummern + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Ich möchte die sichtbaren Kontaktfelder ändern. Kann ich das machen? Ja, alles, was Sie tun müssen ist folgendes: Gehen Sie zu Einstellungen -> Bearbeite sichtbare Kontaktfelder. Hier können die sichtbaren Felder ausgewählt werden. Einige sind standardmäßig deaktiviert, weshalb hier neue gefunden werden können. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c3950232..4571d1e0 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -144,6 +144,20 @@ Αποκλεισμό αριθμών Αποκλεισμένοι αριθμοί + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Θέλω να αλλάξω τα πεδία που θα είναι ορατά στις επαφές. Μπορώ να το κάνω? Ναι, το μόνο που έχετε να κάνετε είναι να μεταβείτε στις Ρυθμίσεις -> Διαχείριση εμφανιζόμενων πεδίων επαφής. Εκεί μπορείτε να επιλέξετε ποια πεδία θα πρέπει να είναι ορατά. Κάποια από αυτά είναι ακόμη και απενεργοποιημένα από προεπιλογή, επομένως ίσως βρείτε κάποια νέα εκεί. diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 3007e798..3a876325 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -144,6 +144,20 @@ Block numbers Blocked numbers + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Aldatu ditzaket kontaktuetan ikusgarri dauden eremuak? Bai, joan hona: Ezarpenak -> Kudeatu erakutsitako kontaktu eremuan. Hor hautatu dezakezu zein eremu nahi duzun ikusgarri izatea. Batzuk desaktibatuta daude era lehenetsian, berri batzuk aurkitu ditzakezu. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index effde482..622c5425 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -144,6 +144,20 @@ Estä numeroja Estetyt numerot + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Haluan muuttaa sitä mitkä palkit ovat näkyviä kontakteissa. Onko tämä mahdollista? Kyllä, mene asetuksiin -> Muuta näytettyjä kontaktialueita. Siellä voit valita mitkä palkit haluat näkyviin. Jotkin niistä ovat piilossa oletuksena, joten saatat löytää sieltä uusia. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f33d57bd..65551d6f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -144,6 +144,20 @@ Numéros bloquer Numéros bloquer + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Je veux modifier les champs affichés sur les fiches de mes contacts. Puis-je le faire ? Oui, tout ce que vous avez à faire c\'est d\'aller dans \"Paramètres\" -> \"Configurer l\'affichage des champs de contact\". Sélectionnez les champs à afficher. Certains champs sont désactivés par défaut. diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 50f8acf4..1f62984b 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -144,6 +144,20 @@ Blokiraj brojeve Blokirani brojevi + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Želim promijeniti polja koja su vidljiva na kontaktima. Mogu li to napraviti? Da, sve što morate učiniti je otići u Postavke -> Upravljanje poljima za prikaz. Tamo možete odabrati polja koja bi trebala biti vidljiva. Neka od njih su čak i onemogućena prema zadanim postavkama, tako da možete pronaći neke nove. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 52f01ca6..46f82306 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -144,6 +144,20 @@ Telefonszámok zárolása Zárolt telefonszámok + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Szeretném módosítani a névjegyekhez megjelenített mezők listáját. Lehetséges ez? Igen. Navigálj a Beállítások -> A megjelenő mezők kiválasztása menűpontra. Itt kiválaszhatod a megjelenítendő mezőket. Néhány már alapértelmezés szerint sem jelenik meg, de itt más mezőket is találhatsz. diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 3ed0c306..dcfb6b60 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -144,6 +144,20 @@ Blokir nomor Nomor yang diblokir + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Saya ingin mengubah ruas yang ditampilkan pada kontak. Bisakah saya melakukannya? Ya, yang perlu anda lakukan adalah kunjungi Pengaturan -> Kelola ruas kontak yang ditampilkan. Lalu anda bisa memilih ruas yang ingin ditampilkan. Beberapa ruas dinonaktifkan secara bawaan, jadi anda mungkin akan menemukan yang baru di sana. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 3ed0c306..dcfb6b60 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -144,6 +144,20 @@ Blokir nomor Nomor yang diblokir + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Saya ingin mengubah ruas yang ditampilkan pada kontak. Bisakah saya melakukannya? Ya, yang perlu anda lakukan adalah kunjungi Pengaturan -> Kelola ruas kontak yang ditampilkan. Lalu anda bisa memilih ruas yang ingin ditampilkan. Beberapa ruas dinonaktifkan secara bawaan, jadi anda mungkin akan menemukan yang baru di sana. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d2e62748..f330ea8c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -144,6 +144,20 @@ Blocca numeri Numeri bloccati + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Voglio cambiare i campi visibili ai contatti. Come posso fare? Si può farlo andando in Impostazioni -> Gestisci i campi mostrati. Qui si possono selezionare i campi che saranno visibili, alcuni sono disabilitati in maniera predefinita, quindi si possono trovare campi aggiuntivi. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8fad71b6..753fdfe5 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -144,6 +144,20 @@ Block numbers Blocked numbers + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + 連絡先に表示される項目(フィールド)を変更することはできますか？ 可能です。[設定] -> [連絡先に表示するフィールドを管理] から、表示されるフィールドを選択することができます。これらの中にはデフォルトで無効になっているものもあるので、あなたは新しいものを見つけるかもしれません。 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 7560f900..5088238d 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -144,6 +144,20 @@ Block numbers Blocked numbers + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + I want to change what fields are visible at contacts. Can I do it? Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 8f750c9d..6aa55c79 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -144,6 +144,20 @@ Block numbers Blocked numbers + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Noriu pakeisti, kokie laukai yra matomi kontaktuose. Ar galiu tai padaryti? Taip, viskas, ką jums reikia padaryti, tai eiti į Nustatymai -> Tvarkyti rodomus kontaktų laukus. Čia galite pasirinkti, kurie laukai turėtų būti matomi. Kai kurie iš jų netgi yra išjungiami pagal numatytuosius nustatymus, todėl ten galite rasti naujų. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f441b308..806a4619 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -144,6 +144,20 @@ Nummers blokkeren Geblokkeerde nummers + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Ik wil de zichtbare contactvelden aanpassen. Kan ik dit doen? Ja, dat kan via Instellingen -> Contactvelden tonen/verbergen. Sommige velden zijn standaard verborgen, dus er zijn via deze optie meer velden te ontdekken. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ea547b9a..a33e8e1d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -144,6 +144,20 @@ Zablokuj numery Zablokowane numery + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Chcę zmienić, które pola są widoczne w kontaktach. Czy mogę to zrobić? Tak, wszystko, co musisz zrobić, to wejść do Ustawień -> Zarządzaj pokazywanymi polami kontaktu. Możesz tam wybrać, które pola mają być wyświetlane. Niektóre z nich są nawet domyślnie wyłączone, więc możesz znaleźć tam wiele z nich nowych. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ce4ae00f..616c1a33 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -144,6 +144,20 @@ Bloquear números Números bloqueados + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Quero alterar os campos visíveis dos contatos. Posso fazer isso? Sim, você só precisa modificar as definições em Configurações -> Gerenciar os campos visíveis. Alguns campos estão desmarcados por padrão, então você encontrará alguns novos por lá. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 04f8f4cc..82a67c4d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -144,6 +144,20 @@ Bloquear números Números bloqueados + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + I want to change what fields are visible at contacts. Can I do it? Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1fbd9034..0e4a82f9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -144,6 +144,20 @@ Блокируемые номера Заблокированные номера + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Я хочу изменить поля, отображаемые у контактов. Могу ли я это сделать? Да, всё, что вам нужно сделать, это зайти в \"Настройки\" → \"Управление отображаемыми полями контактов\". Там вы сможете выбрать, какие поля должны быть видимы. Некоторые из них даже отключены по умолчанию, так что вы можете найти некоторые новые. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index b3d0d640..293d5b26 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -144,6 +144,22 @@ Blokovať čísla Blokované čísla + + Ste si istý, že chcete vymazať %s? + + + + %d kontakt + %d kontakty + %d kontaktov + + + + %d skupinu + %d skupiny + %d skupín + + Chcem upraviť viditeľné polia kontaktov. Dá sa to? Áno, stačí ísť do Nastavenia -> Spravovať zobrazené polia kontaktov. Tam si viete zvoliť, ktoré polia majú byť viditeľné. Niektoré sú v predvolenom stave vypnuté, čiže tam môžete objaviť aj nové. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index abcfb01b..9e85a22b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -144,6 +144,20 @@ Blockera nummer Blockerade nummer + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + I want to change what fields are visible at contacts. Can I do it? Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a1472bdd..d0bdd0e2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -144,6 +144,20 @@ Block numbers Blocked numbers + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Rehberde görüntülenecek alanları değiştirmek istiyorum. Bunu yapabilir miyim? Evet, tek yapmanız gereken Ayarlar -> Görüntülenecek kişi alanlarını yönet\'e gitmek. Orada hangi alanların görüntüleneceğini seçebilirsiniz. Bazıları varsayılan olarak devre dışı bile olsa, orada bazı yenilerini bulabilirsiniz. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4f0eb85d..8cf27893 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -144,6 +144,20 @@ Блокувати номери Заблоковані номери + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + Я хочу змінити налаштування видимих полів контактних даних. Чи можу я це зробити? Так, вам необхідно перейти у Налаштування -> Керування полями контактів, що відображаються. Там ви можете обрати поля, що відображатимуться. Деякі з них у стандартному режимі деактивовано, а отже ви можете знайти там нові. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e186c877..661e6c3c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -144,6 +144,20 @@ 加入黑名单 黑名单 + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + 我想要更改在通讯录会看到哪些栏位。我能这么做吗? 可以，你要做的是到[设置] -> [管理显示的联系人栏位]。在那里，你可以选择应该看到什么栏位。其中有些甚至默认是关闭的，所以你可能会在那里发现一些新的。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8660c0da..99febf65 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -144,6 +144,20 @@ 封鎖號碼 黑名單 + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + 我想要更改在通訊錄會看到哪些欄位。我能這麼做嗎? 可以，你要做的是到[設定] -> [管理顯示的聯絡人欄位]。在那裡，你可以選擇應該看到什麼欄位。其中有些甚至預設是關閉的，所以你可能會在那裡發現一些新的。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ab34515..8e28dcb8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -144,6 +144,20 @@ Block numbers Blocked numbers + + Are you sure you want to delete %s? + + + + %d contact + %d contacts + + + + %d group + %d groups + + I want to change what fields are visible at contacts. Can I do it? Yes, all you have to do is go in Settings -> Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there. From ed063f4380580516e6e9418b12e2b1e4d5f820bb Mon Sep 17 00:00:00 2001 From: spkprs Date: Mon, 26 Aug 2019 18:58:32 +0300 Subject: [PATCH 14/20] Update strings.xml --- app/src/main/res/values-el/strings.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4571d1e0..e7a49e29 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1,5 +1,5 @@ - Simple Contacts + Απλές Επαφές Επαφές Διεύθυνση Εισαγωγή… @@ -43,7 +43,7 @@ Δεν υπάρχουν ομάδες επαφών στη συσκευή Δημιουργία ομάδας Προσθήκη σε ομάδα - Δημιουργία ομάδας υπο ενός λογαριασμού + Δημιουργία ομάδας υπό ενός λογαριασμού Λήψη φωτογραφίας @@ -109,7 +109,7 @@ Πληκτρολόγιο - Προσθήκη αριθμού σε επαφή + Προσθήκη επαφής σε αριθμό Πληκτρολόγιο @@ -145,17 +145,17 @@ Αποκλεισμένοι αριθμοί - Are you sure you want to delete %s? + Θέλετε σίγουρα να διαγράψετε %s? - %d contact - %d contacts + %d επαφή + %d επαφές - %d group - %d groups + %d ομάδα + %d ομάδες From 35cd4722d99272784a788bd393e971d2b2279dfe Mon Sep 17 00:00:00 2001 From: Guillaume Date: Mon, 26 Aug 2019 19:16:13 +0200 Subject: [PATCH 15/20] Dutch --- app/src/main/res/values-nl/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 806a4619..5e316618 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -145,17 +145,17 @@ Geblokkeerde nummers - Are you sure you want to delete %s? + %s verwijderen? %d contact - %d contacts + %d contacten - %d group - %d groups + %d groep + %d groepen From 853a6a8e879a13a3b52319fed1a7f32b03a11bd2 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 27 Aug 2019 11:02:56 +0200 Subject: [PATCH 16/20] fix #391, show more detailed info at deleting elements --- .../contacts/pro/adapters/ContactsAdapter.kt | 13 ++++++++++++- .../contacts/pro/adapters/GroupsAdapter.kt | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt index 02199b49..c1e19c88 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt @@ -151,7 +151,18 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList, 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, val } } + private fun getSelectedItems() = groups.filter { selectedKeys.contains(it.id?.toInt()) } as ArrayList + private fun setupView(view: View, group: Group) { view.apply { group_frame?.isSelected = selectedKeys.contains(group.id!!.toInt()) From 2974d828a8821353baf1ba6f43c05d5692e2632d Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 27 Aug 2019 11:19:00 +0200 Subject: [PATCH 17/20] update commons to 5.16.17 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index bfcdd1bf..2746ad86 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.16.16' + implementation 'com.simplemobiletools:commons:5.16.17' implementation 'joda-time:joda-time:2.10.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' From d4d759266604090e932f28345a0cd9dea39fed11 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 27 Aug 2019 11:29:21 +0200 Subject: [PATCH 18/20] normalize names at the dialpad letter search --- .../contacts/pro/activities/DialpadActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt index 201bca43..aeeabe56 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt @@ -173,8 +173,8 @@ class DialpadActivity : SimpleActivity() { val showLetters = config.showDialpadLetters (dialpad_list.adapter as? ContactsAdapter)?.finishActMode() val filtered = contacts.filter { - val convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(it.getNameToDisplay()) - val company = PhoneNumberUtils.convertKeypadLettersToDigits(it.getFullCompany()) + val convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(it.getNameToDisplay().normalizeString()) + val company = PhoneNumberUtils.convertKeypadLettersToDigits(it.getFullCompany().normalizeString()) it.doesContainPhoneNumber(text, showLetters) || (showLetters && (convertedName.contains(text, true) || company.contains(text, true))) }.sortedWith(compareBy { if (showLetters) { From 29012806f1e33b7ba9648525efbbaffcc5d73a19 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 27 Aug 2019 11:58:27 +0200 Subject: [PATCH 19/20] update version to 6.3.5 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2746ad86..0fa1c71d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.simplemobiletools.contacts.pro" minSdkVersion 21 targetSdkVersion 28 - versionCode 45 - versionName "6.3.4" + versionCode 46 + versionName "6.3.5" setProperty("archivesBaseName", "contacts") } From 58f401e192b9a0946edb9b17eff1b03501283d2b Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 27 Aug 2019 11:58:31 +0200 Subject: [PATCH 20/20] updating changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e89dff30..76f705a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ Changelog ========== +Version 6.3.5 *(2019-08-27)* +---------------------------- + + * Fixed some issues with some contacts being wrongly filtered out + * Show a more detailed confirmation dialog at deleting contacts/groups + * Fixed some glitches related to exporting contacts + * Search organizations with dialpad letters too, not just names + * Properly handle searching names with accents with dialpad letters + * Misc stability/performance/translation improvements + Version 6.3.4 *(2019-08-14)* ----------------------------