From 9ebb72b1b23a3e190270eeeeff5cace74f255790 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 4 Mar 2018 10:06:40 +0100 Subject: [PATCH 1/7] always fetch all contact info to make sure Search works well --- .../contacts/activities/MainActivity.kt | 2 +- .../activities/SelectContactActivity.kt | 2 +- .../contacts/adapters/ContactsAdapter.kt | 2 +- .../contacts/helpers/ContactsHelper.kt | 50 +++++++++---------- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index 023ee693..0dee0381 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -361,7 +361,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { FilePickerDialog(this, pickFile = false, showFAB = true) { ExportContactsDialog(this, it) { file, contactSources -> Thread { - ContactsHelper(this).getContacts(true) { + ContactsHelper(this).getContacts { val contacts = it.filter { contactSources.contains(it.source) } if (contacts.isEmpty()) { toast(R.string.no_entries_for_exporting) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SelectContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SelectContactActivity.kt index c6b82f3e..b7a10501 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SelectContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SelectContactActivity.kt @@ -75,7 +75,7 @@ class SelectContactActivity : SimpleActivity() { } private fun initContacts() { - ContactsHelper(this).getContacts(true) { + ContactsHelper(this).getContacts { if (isActivityDestroyed()) { return@getContacts } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt index 0f8207a8..7b704bb6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt @@ -168,7 +168,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList activity.shareContacts(filtered) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt index e0d6b711..c1423506 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt @@ -29,7 +29,7 @@ import com.simplemobiletools.contacts.extensions.getPhotoThumbnailSize import com.simplemobiletools.contacts.models.* class ContactsHelper(val activity: BaseSimpleActivity) { - fun getContacts(addOptionalFields: Boolean = false, callback: (ArrayList) -> Unit) { + fun getContacts(callback: (ArrayList) -> Unit) { val contacts = SparseArray() Thread { val uri = ContactsContract.Data.CONTENT_URI @@ -75,34 +75,32 @@ class ContactsHelper(val activity: BaseSimpleActivity) { contacts[key]?.phoneNumbers = phoneNumbers.valueAt(i) } - if (addOptionalFields) { - val emails = getEmails() - size = emails.size() - for (i in 0 until size) { - val key = emails.keyAt(i) - contacts[key]?.emails = emails.valueAt(i) - } + val emails = getEmails() + size = emails.size() + for (i in 0 until size) { + val key = emails.keyAt(i) + contacts[key]?.emails = emails.valueAt(i) + } - val addresses = getAddresses() - size = addresses.size() - for (i in 0 until size) { - val key = addresses.keyAt(i) - contacts[key]?.addresses = addresses.valueAt(i) - } + val addresses = getAddresses() + size = addresses.size() + for (i in 0 until size) { + val key = addresses.keyAt(i) + contacts[key]?.addresses = addresses.valueAt(i) + } - val events = getEvents() - size = events.size() - for (i in 0 until size) { - val key = events.keyAt(i) - contacts[key]?.events = events.valueAt(i) - } + val events = getEvents() + size = events.size() + for (i in 0 until size) { + val key = events.keyAt(i) + contacts[key]?.events = events.valueAt(i) + } - val notes = getNotes() - size = notes.size() - for (i in 0 until size) { - val key = notes.keyAt(i) - contacts[key]?.notes = notes.valueAt(i) - } + val notes = getNotes() + size = notes.size() + for (i in 0 until size) { + val key = notes.keyAt(i) + contacts[key]?.notes = notes.valueAt(i) } activity.dbHelper.getContacts().forEach { From 1bd9355d92d598f986b88b6797f527aac35cd2b3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 4 Mar 2018 10:07:02 +0100 Subject: [PATCH 2/7] search at Notes and addresses too --- .../contacts/fragments/MyViewPagerFragment.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt index 2b078409..7c767a66 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt @@ -171,7 +171,9 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) val filtered = contactsIgnoringSearch.filter { it.getFullName(startNameWithSurname).contains(text, true) || it.phoneNumbers.any { it.value.contains(text, true) } || - it.emails.any { it.value.contains(text, true) } + it.emails.any { it.value.contains(text, true) } || + it.addresses.any { it.value.contains(text, true) } || + it.notes.contains(text, true) } as ArrayList Contact.sorting = config.sorting @@ -188,7 +190,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) } fun onSearchOpened() { - contactsIgnoringSearch = (fragment_list?.adapter as? ContactsAdapter)?.contactItems as? ArrayList ?: ArrayList() + contactsIgnoringSearch = (fragment_list?.adapter as? ContactsAdapter)?.contactItems ?: ArrayList() } fun onSearchClosed() { From 6802faaa40e4cf90ddfecf05970b1ce92fcb9c7f Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 4 Mar 2018 10:07:49 +0100 Subject: [PATCH 3/7] update version to 3.3.3 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 55010296..16c50719 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.simplemobiletools.contacts" minSdkVersion 16 targetSdkVersion 27 - versionCode 13 - versionName "3.3.2" + versionCode 14 + versionName "3.3.3" setProperty("archivesBaseName", "contacts") } From b8c087bd3f46ada0b58e5987e85253bf6314de43 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 4 Mar 2018 10:07:54 +0100 Subject: [PATCH 4/7] updating changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60391fe8..43d342aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 3.3.3 *(2018-03-04)* +---------------------------- + + * Make sure Search searches address and Notes too + Version 3.3.2 *(2018-03-04)* ---------------------------- From fbbee420cde32ee19c21e5f5d8180f445b3d0124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Sun, 4 Mar 2018 22:40:26 +0000 Subject: [PATCH 5/7] Update strings.xml --- app/src/main/res/values-pt/strings.xml | 84 +++++++++++++------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 17b3cd75..700270e2 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1,70 +1,70 @@ Simple Contacts Contactos - Address - Inserting… - Updating… - Phone storage - Phone storage (not visible by other apps) + Enederço + A inserir… + A atualizar… + Armazenamento do telefone + Armazenamento do telefone (não visível por outras alicações) Novo contacto Editar contacto - Select contact - Select contacts - First name - Middle name - Surname + Selecionar contacto + Selecionar contactos + Primeiro nome + Segundo nome + Apelido - Take photo - Choose photo - Remove photo + Tirar foto + Escolher foto + Remover foto - Start name with surname - Show phone numbers on the main screen - Show contact thumbnails - On contact click - Call contact - View contact details + Ordenar por apelido + Mostrar número de telefone no ecrã principal + Mostrar miniatura do contacto + Ao clicar no contacto + Ligar + Ver detalhes E-mail - Home - Work - Other + Pessoal + Profissional + Outro Número - Mobile - Main - Work Fax - Home Fax + Telemóvel + Principal + Fax profissional + Fax pessoal Pager - No phone number has been found + Número de telefone não encontrado - Birthday - Anniversary + Data de nascimento + Aniversário - Seems like you haven\'t added any favorite contacts yet. - Add favorites - Add to favorites - Remove from favorites + Parece que ainda não adicionou contactos como favoritos. + Adicionar favoritos + Adicionar aos favoritos + Remover dos favoritos - Search contacts - Search favorites + Pesquisar contactosstring> + Pesquisar favoritos - Import contacts - Export contacts - Import contacts from a .vcf file - Export contacts to a .vcf file - Target contact source - Include contact sources - Filename (without .vcf) + Importar contactos + Exportar contactos + Importar contactos de um ficheiro .vcf + Exportar contactos para um ficheiro .vcf + Destino da fonte do contacto + Incluir fontes dos contactos + Nome do ficheiro (sem .vcf) From 148541775dfc1b81cb78725b7afb25ae9e975931 Mon Sep 17 00:00:00 2001 From: fricyo <30796677+fricyo@users.noreply.github.com> Date: Thu, 8 Mar 2018 16:12:11 +0800 Subject: [PATCH 6/7] Creat Chinese(TW) Translation --- app/src/main/res/values-zh-rTW/strings.xml | 86 ++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 app/src/main/res/values-zh-rTW/strings.xml diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml new file mode 100644 index 00000000..061e7bc3 --- /dev/null +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -0,0 +1,86 @@ + + 簡易通訊錄 + 簡易通訊錄 + 地址 + 添加中… + 更新中… + 手機空間 + 手機空間 (其他程式不可見) + + 新聯絡人 + 編輯聯絡人 + 選擇聯絡人 + 選擇聯絡人 + 名字 + 中間名 + 姓氏 + + + 拍照 + 選擇相片 + 移除相片 + + + 姓氏在前 + 主畫面顯示電話號碼 + 顯示聯絡人縮圖 + 點擊聯絡人 + 打電話給聯絡人 + 顯示聯絡人資料 + + + 信箱 + 住家 + 工作 + 其它 + + + 號碼 + 手機 + 主用 + 工作傳真 + 住家傳真 + 呼叫器 + 未發現電話號碼 + + + 生日 + 紀念日 + + + 你似乎還沒加入任何我的最愛聯絡人。 + 添加我的最愛 + 加入我的最愛 + 從我的最愛移除 + + + 搜尋聯絡人 + 搜尋我的最愛 + + + 匯入聯絡人 + 匯出聯絡人 + 從.vcf檔案匯入聯絡人 + 匯出聯絡人成.vcf檔案 + 聯絡人來源 + 包含聯絡人來源 + 檔案名稱 (不含.vcf) + + + + 一個用來管理聯絡人，且沒有廣告的通訊錄應用程式。 + + 一個用來從任何來源建立或管理聯絡人的簡易應用程式。聯絡人只能儲存於你的裝置上，不過也能透過Google或其他帳號來同步。你能將我的最愛聯絡人顯示在獨立名單上。 + + 你也能用來管理使用者信箱和活動。它能夠以多項參數來排序/篩選，以及選擇將姓氏顯示在名字前面。 + + 不包含廣告及非必要的權限，而且完全開放原始碼，並提供自訂顏色。 + + 這程式只是一系列眾多應用程式的其中一項，你可以在這發現更多 http://www.simplemobiletools.com + + + + From aa8186af56c4635b3641dd9f810bca168c532012 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 8 Mar 2018 12:52:13 +0100 Subject: [PATCH 7/7] properly closing a string tag --- app/src/main/res/values-pt/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 700270e2..d932c2b0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -54,7 +54,7 @@ Remover dos favoritos - Pesquisar contactosstring> + Pesquisar contactos Pesquisar favoritos