From e812a93442b38870b2280d0dc91f7f0f87ce4e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20F=C4=B1r=C4=B1nc=C4=B1?= Date: Thu, 7 May 2020 00:58:40 +0300 Subject: [PATCH 01/19] Update strings.xml --- app/src/main/res/values-tr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7fd42ff4..e7aaa84f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -18,7 +18,7 @@ Mevcut bir kişiye ekle this link. Thanks! + Uygulamanın Çağrı işlemeden sorumlu kısmı, ayrı Basit Çevirici adlı yeni bir uygulamaya taşındı, lütfen bu bağlantıdan indirin. Teşekkürler! ]]> From 01c14a470ddd995a067d57cdc7facaea36528fb8 Mon Sep 17 00:00:00 2001 From: spkprs Date: Thu, 7 May 2020 13:43:53 +0300 Subject: [PATCH 02/19] Update strings.xml --- app/src/main/res/values-el/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 6ca1a659..5cf9e069 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -18,7 +18,7 @@ Προσθήκη σε μια υπάρχουσα Επαφή this link. Thanks! + Η ενότητα της εφαρμογής που είναι υπεύθυνη για το χειρισμό κλήσεων έπρεπε να μετακινηθεί σε μια ξεχωριστή νέα εφαρμογή Simple Dialer, κάνετε λήψη από αυτόν τον σύνδεσμο. Ευχαριστώ! ]]> From 2a05147c1656f1c11f38f123cb7b0de4683b6255 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Thu, 7 May 2020 17:37:56 +0200 Subject: [PATCH 03/19] Dutch --- app/src/main/res/values-nl/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 6fa515ea..c1ab4283 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -160,19 +160,19 @@ Eenvoudig Adresboek Pro - Snel contacten beheren - Easy and quick contact management with no ads, handles groups and favorites too. + Eenvoudig en snel contactbeheer met groepen en favorieten, zonder advertenties - A lightweight app for managing your contacts loved by millions of people. The contacts can be stored on your device only, but also synchronized via Google, or other accounts. + Een eenvoudige app om contacten aan te maken en te beheren. Contacten kunnen lokaal opgeslagen worden, of gesynchroniseerd via Google en andere accounts. - You can use it for managing user emails and events too. It has the ability to sort/filter by multiple parameters, optionally display surname as the first name. + De app is ook te gebruiken voor het beheren van e-mailadressen en gebeurtenissen gekoppeld aan contacten. Sorteren en filteren is mogelijk op basis van verschillende parameters en zowel voor- als achternaam kan als eerste worden getoond. - You can display your favorite contacts or groups on a separate list. Groups can be used for sending out batch emails or SMS, to save you some time, you can rename them easily. + Favoriete contacten kunnen in een aparte lijst worden getoond. E-mails of sms'jes kunnen naar hele groepen worden gestuurd om tijd te besparen. - It contains handy buttons for calling, or texting your contacts. All visible fields can be customized as you wish, you can easily hide the unused ones. The search function will search the given string at every visible contact field, to make you find your desired contact easily. + Er zijn knoppen om direct een contacpersoon te bellen of te sms'en. De zichtbaarheid van de gegevensvelden zijn naar voorkeur aan te passen, zodat ongebruikte velden geen ruimte in beslag nemen. De zoekfunctie zal in alle zichtbare velden speuren naar de opgegeven tekst. - There is a lightweight dialpad at your service too, with smart contact suggestions. + De app bevat ook een lichtgewicht telefoonkiezer met snelle contactsuggesties tijdens het invoeren. - It supports exporting/importing contacts in vCard format to .vcf files, for easy migrations or backing up your data. + Het importeren/exporteren van contacten in vCard-formaat (.vcf) wordt ondersteund voor het gemakkelijk overzetten of backuppen van de gegevens. With this modern and stable contacts manager you can protect your contacts by not sharing them with other apps, so you can keep your contacts private. From 0689a77a211fb967ff57990ad562ae136f49db43 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 7 May 2020 21:13:06 +0200 Subject: [PATCH 04/19] updating the russian long app description --- .../metadata/android/ru/full_description.txt | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/fastlane/metadata/android/ru/full_description.txt b/fastlane/metadata/android/ru/full_description.txt index cfe8c074..956518b1 100644 --- a/fastlane/metadata/android/ru/full_description.txt +++ b/fastlane/metadata/android/ru/full_description.txt @@ -1,7 +1,39 @@ -Простое приложение для создания и управления контактами из любого источника. Контакты могут быть сохранены только на вашем устройстве, а также синхронизированы через Google или другие учётные записи. Вы можете отображать свои любимые контакты в отдельном списке. +Лёгкое приложение для управления контактами, которое нравится миллионам людей. Контакты могут храниться только на устройстве, но также синхронизироваться через Google или другие аккаунты. -Вы можете использовать его для управления электронной почтой и событиями контактов. Приложение имеет возможность сортировать/фильтровать по нескольким параметрам, по желанию отображать фамилию в качестве имени. +Вы также можете использовать его для управления электронной почтой и событиями контактов. Есть возможность сортировать/фильтровать по нескольким параметрам, при необходимости отображать фамилию в качестве имени. -Не содержит рекламы или ненужных разрешений, полностью с открытым исходным кодом. Есть возможность настраивать цвета. +Избранные контакты или группы можно отобразить в отдельном списке. Группы можно использовать для для экономии времени при множественной отправке электронных писем или SMS. Для удобства группы можно переименовывать. -Это приложение — всего лишь частица из большой серии приложений. Вы можете найти остальные на https://www.simplemobiletools.com +В приложении есть удобные кнопки для вызова или отправки текстовых сообщений вашим контактам. Все отображаемые поля настраиваются по вашему усмотрению, можно скрыть неиспользуемые. Функция поиска будет искать заданную строку в каждом отображаемом поле контакта, чтобы вы могли быстро найти нужный контакт. + +К вашим услугам также имеется функция простого набора номера с умными предложениями по контактам. + +Приложение поддерживает экспорт/импорт контактов в формате vCard в файлы .vcf для облегчения миграции или резервного копирования данных. + +С помощью этого современного и стабильного менеджера вы можете защитить свои контакты, не передавая их другим приложениям, что поможет сохранить свои контакты в тайне. + +Как и в случае с источником контактов, вы также можете легко изменить имя контакта, его электронную почту, номер телефона, адрес, организацию, группы и многие другие настраиваемые поля. Вы также можете использовать приложение для хранения событий контактов, таких как дни рождения, юбилеи или любые другие пользовательские события. + +Этот простой редактор контактов имеет множество удобных настроек, таких как отображение телефонных номеров на главном экране, переключение видимости фотографий контактов, отображение только контактов с телефонными номерами, отображение диалога подтверждения перед началом вызова. Содержит быстрый номеронабиратель, который также использует буквы. + +Чтобы улучшить взаимодействие с пользователем, вы можете настроить, что будет происходить при нажатии на контакт. Можно либо инициировать вызов, либо перейти на экран просмотра сведений, либо отредактировать выбранный контакт. + +Вы можете легко заблокировать телефонные номера, чтобы избежать нежелательных входящих звонков. + +Чтобы избежать отображения потенциально нежелательных контактов, приложение имеет мощную встроенную функцию слияния дубликатов контактов. + +Приложение выпускается с материальным дизайном и тёмной темой по умолчанию, что обеспечивает удобное использование. Отсутствие доступа в интернет обеспечивает вам больше приватности, безопасности и стабильности, чем в других приложениях. + +Не содержит рекламы или ненужных разрешений, полностью с открытым исходным кодом. Есть возможность настраивать цвета интерфейса. + +Ознакомьтесь с полным набором приложений серии Simple здесь: +https://www.simplemobiletools.com + +Сайт приложения Simple Contacts Pro: +https://www.simplemobiletools.com/contacts + +Facebook: +https://www.facebook.com/simplemobiletools + +Reddit: +https://www.reddit.com/r/SimpleMobileTools From 080401bc3718a7e1103214346b977c349a98da9b Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 8 May 2020 10:23:29 +0200 Subject: [PATCH 05/19] moving some shared layout files into Commons --- app/build.gradle | 3 +- .../pro/activities/ContactActivity.kt | 4 +- .../pro/activities/EditContactActivity.kt | 2 +- .../contacts/pro/activities/MainActivity.kt | 3 +- .../contacts/pro/adapters/ContactsAdapter.kt | 39 +++++++----- .../contacts/pro/adapters/GroupsAdapter.kt | 7 ++- .../pro/adapters/SelectContactsAdapter.kt | 8 ++- .../contacts/pro/helpers/CallManager.kt | 7 +-- .../res/layout/item_contact_with_number.xml | 59 ------------------- .../layout/item_contact_without_number.xml | 46 --------------- app/src/main/res/values/dimens.xml | 1 - 11 files changed, 44 insertions(+), 135 deletions(-) delete mode 100644 app/src/main/res/layout/item_contact_with_number.xml delete mode 100644 app/src/main/res/layout/item_contact_without_number.xml diff --git a/app/build.gradle b/app/build.gradle index 40d1e1e1..d28dbb9b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,9 +57,8 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.27.7' + implementation 'com.simplemobiletools:commons:5.27.13' implementation 'joda-time:joda-time:2.10.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt index 28671ddb..ba752d46 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt @@ -16,7 +16,6 @@ import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.getContactLetterIcon import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.extensions.sendEmailIntent @@ -31,7 +30,8 @@ abstract class ContactActivity : SimpleActivity() { protected var currentContactPhotoPath = "" fun showPhotoPlaceholder(photoView: ImageView) { - val placeholder = BitmapDrawable(resources, getContactLetterIcon(contact?.getNameToDisplay() ?: "A")) + val placeholder = BitmapDrawable(resources, com.simplemobiletools.commons.helpers.ContactsHelper(this).getContactLetterIcon(contact?.getNameToDisplay() + ?: "A")) photoView.setImageDrawable(placeholder) currentContactPhotoPath = "" contact?.photo = null diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt index c3039ba5..0c561e04 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt @@ -183,7 +183,7 @@ class EditContactActivity : ContactActivity() { if (((contact!!.id == 0 && action == Intent.ACTION_INSERT) || action == ADD_NEW_CONTACT_NUMBER) && intent.extras != null) { val phoneNumber = getPhoneNumberFromIntent(intent) if (phoneNumber != null) { - contact!!.phoneNumbers.add(PhoneNumber(phoneNumber, DEFAULT_PHONE_NUMBER_TYPE, "", phoneNumber.normalizeNumber())) + contact!!.phoneNumbers.add(PhoneNumber(phoneNumber, DEFAULT_PHONE_NUMBER_TYPE, "", phoneNumber.normalizePhoneNumber())) if (phoneNumber.isNotEmpty() && action == ADD_NEW_CONTACT_NUMBER) { highlightLastPhoneNumber = true } 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 0eec4cbd..b569dce4 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 @@ -36,6 +36,7 @@ import com.simplemobiletools.contacts.pro.extensions.getTempFile import com.simplemobiletools.contacts.pro.extensions.handleGenericContactClick import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment import com.simplemobiletools.contacts.pro.helpers.* +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener import com.simplemobiletools.contacts.pro.models.Contact import kotlinx.android.synthetic.main.activity_main.* @@ -71,8 +72,8 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) appLaunched(BuildConfig.APPLICATION_ID) - setupTabColors() + setupTabColors() checkContactPermissions() storeStateVariables() checkWhatsNewDialog() 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 7d44abcc..b3cfc30f 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 @@ -5,6 +5,9 @@ import android.util.TypedValue import android.view.Menu import android.view.View import android.view.ViewGroup +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.TextView import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.request.RequestOptions @@ -12,7 +15,10 @@ import com.bumptech.glide.signature.ObjectKey import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.extensions.beVisibleIf +import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor +import com.simplemobiletools.commons.extensions.getTextSize +import com.simplemobiletools.commons.extensions.highlightTextPart import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.views.FastScroller @@ -25,7 +31,6 @@ import com.simplemobiletools.contacts.pro.helpers.* import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener import com.simplemobiletools.contacts.pro.interfaces.RemoveFromGroupListener import com.simplemobiletools.contacts.pro.models.Contact -import kotlinx.android.synthetic.main.item_contact_with_number.view.* import java.util.* class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList, private val refreshListener: RefreshContactsListener?, @@ -255,15 +260,15 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList(R.id.item_contact_image)) } } private fun setupView(view: View, contact: Contact) { view.apply { - contact_frame?.isSelected = selectedKeys.contains(contact.id) + findViewById(R.id.item_contact_frame)?.isSelected = selectedKeys.contains(contact.id) val fullName = contact.getNameToDisplay() - contact_name.text = if (textToHighlight.isEmpty()) fullName else { + findViewById(R.id.item_contact_name).text = if (textToHighlight.isEmpty()) fullName else { if (fullName.contains(textToHighlight, true)) { fullName.highlightTextPart(textToHighlight, adjustedPrimaryColor) } else { @@ -271,10 +276,12 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList(R.id.item_contact_name).apply { + setTextColor(textColor) + setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize) + } - if (contact_number != null) { + if (findViewById(R.id.item_contact_number) != null) { val phoneNumberToUse = if (textToHighlight.isEmpty()) { contact.phoneNumbers.firstOrNull() } else { @@ -282,17 +289,19 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList(R.id.item_contact_number).apply { + text = if (textToHighlight.isEmpty()) numberText else numberText.highlightTextPart(textToHighlight, adjustedPrimaryColor, false, true) + setTextColor(textColor) + setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize) + } } - contact_tmb.beVisibleIf(showContactThumbnails) + findViewById(R.id.item_contact_image).beVisibleIf(showContactThumbnails) if (showContactThumbnails) { - val placeholderImage = BitmapDrawable(resources, context.getContactLetterIcon(fullName)) + val placeholderImage = BitmapDrawable(resources, com.simplemobiletools.commons.helpers.ContactsHelper(context).getContactLetterIcon(fullName)) if (contact.photoUri.isEmpty() && contact.photo == null) { - contact_tmb.setImageDrawable(placeholderImage) + findViewById(R.id.item_contact_image).setImageDrawable(placeholderImage) } else { val options = RequestOptions() .signature(ObjectKey(contact.getSignatureKey())) @@ -310,7 +319,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList(R.id.item_contact_image)) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt index 9b9c0235..5f6f4130 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt @@ -6,7 +6,10 @@ import android.view.View import android.view.ViewGroup import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.extensions.beVisibleIf +import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor +import com.simplemobiletools.commons.extensions.getTextSize +import com.simplemobiletools.commons.extensions.highlightTextPart import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView @@ -167,7 +170,7 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList, val group_tmb.beVisibleIf(showContactThumbnails) if (showContactThumbnails) { - group_tmb.setImageDrawable(activity.getColoredGroupIcon(group.title)) + group_tmb.setImageDrawable(com.simplemobiletools.commons.helpers.ContactsHelper(activity).getColoredGroupIcon(group.title)) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt index 65e2025e..571ec3f3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt @@ -10,7 +10,11 @@ import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.signature.ObjectKey -import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.extensions.beVisibleIf +import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor +import com.simplemobiletools.commons.extensions.getTextSize +import com.simplemobiletools.commons.extensions.highlightTextPart +import com.simplemobiletools.commons.helpers.ContactsHelper import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.contacts.pro.R @@ -146,7 +150,7 @@ class SelectContactsAdapter(val activity: SimpleActivity, var contacts: ArrayLis else -> contact.firstName } - val placeholderImage = BitmapDrawable(resources, context.getContactLetterIcon(avatarName)) + val placeholderImage = BitmapDrawable(resources, ContactsHelper(context).getContactLetterIcon(avatarName)) if (contact.photoUri.isEmpty() && contact.photo == null) { contact_tmb.setImageDrawable(placeholderImage) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/CallManager.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/CallManager.kt index eebc769d..541105c3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/CallManager.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/CallManager.kt @@ -5,8 +5,6 @@ import android.content.Context import android.net.Uri import android.telecom.Call import android.telecom.VideoProfile -import com.simplemobiletools.commons.extensions.getNameFromPhoneNumber -import com.simplemobiletools.commons.extensions.getPhotoUriFromPhoneNumber import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.contacts.pro.extensions.contactsDB import com.simplemobiletools.contacts.pro.models.CallContact @@ -61,10 +59,11 @@ class CallManager { val uri = Uri.decode(call!!.details.handle.toString()) if (uri.startsWith("tel:")) { + val contactsHelper = com.simplemobiletools.commons.helpers.ContactsHelper(context) val number = uri.substringAfter("tel:") callContact.number = number - callContact.name = context.getNameFromPhoneNumber(number) - callContact.photoUri = context.getPhotoUriFromPhoneNumber(number) + callContact.name = contactsHelper.getNameFromPhoneNumber(number) + callContact.photoUri = contactsHelper.getPhotoUriFromPhoneNumber(number) if (callContact.name == callContact.number) { ensureBackgroundThread { diff --git a/app/src/main/res/layout/item_contact_with_number.xml b/app/src/main/res/layout/item_contact_with_number.xml deleted file mode 100644 index 663ad5b7..00000000 --- a/app/src/main/res/layout/item_contact_with_number.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_contact_without_number.xml b/app/src/main/res/layout/item_contact_without_number.xml deleted file mode 100644 index 86e22567..00000000 --- a/app/src/main/res/layout/item_contact_without_number.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index e817ce66..e4a6c4ad 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -3,7 +3,6 @@ 88dp 48dp 40dp - 60dp 60dp 72dp 30dp From 3bebf4445e24c4a4529e12815f166aa48a8ba761 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 8 May 2020 22:04:25 +0200 Subject: [PATCH 06/19] moving some View Contact intent related things in Commons --- app/build.gradle | 2 +- .../contacts/pro/activities/ContactActivity.kt | 4 ++-- .../pro/activities/ViewContactActivity.kt | 11 ++--------- .../contacts/pro/adapters/ContactsAdapter.kt | 3 ++- .../contacts/pro/adapters/GroupsAdapter.kt | 3 ++- .../pro/adapters/SelectContactsAdapter.kt | 4 ++-- .../contacts/pro/extensions/Context.kt | 3 ++- .../contacts/pro/helpers/CallManager.kt | 6 +++--- .../contacts/pro/helpers/ContactsHelper.kt | 18 ------------------ 9 files changed, 16 insertions(+), 38 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d28dbb9b..f4b848a5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.27.13' + implementation 'com.simplemobiletools:commons:5.27.17' implementation 'joda-time:joda-time:2.10.1' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt index ba752d46..fe03b1cb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt @@ -16,6 +16,7 @@ import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog +import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.extensions.sendEmailIntent @@ -30,8 +31,7 @@ abstract class ContactActivity : SimpleActivity() { protected var currentContactPhotoPath = "" fun showPhotoPlaceholder(photoView: ImageView) { - val placeholder = BitmapDrawable(resources, com.simplemobiletools.commons.helpers.ContactsHelper(this).getContactLetterIcon(contact?.getNameToDisplay() - ?: "A")) + val placeholder = BitmapDrawable(resources, SimpleContactsHelper(this).getContactLetterIcon(contact?.getNameToDisplay() ?: "A")) photoView.setImageDrawable(placeholder) currentContactPhotoPath = "" contact?.photo = null 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 73dd99bf..56eedce1 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 @@ -244,15 +244,8 @@ class ViewContactActivity : ContactActivity() { } private fun openWith() { - Intent().apply { - action = ContactsContract.QuickContact.ACTION_QUICK_CONTACT - data = getContactPublicUri(contact!!) - if (resolveActivity(packageManager) != null) { - startActivity(this) - } else { - toast(R.string.no_app_found) - } - } + val uri = getContactPublicUri(contact!!) + launchViewContactIntent(uri) } private fun setupFavorite() { 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 b3cfc30f..124f15aa 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 @@ -19,6 +19,7 @@ import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getTextSize import com.simplemobiletools.commons.extensions.highlightTextPart +import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.views.FastScroller @@ -299,7 +300,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList(R.id.item_contact_image).beVisibleIf(showContactThumbnails) if (showContactThumbnails) { - val placeholderImage = BitmapDrawable(resources, com.simplemobiletools.commons.helpers.ContactsHelper(context).getContactLetterIcon(fullName)) + val placeholderImage = BitmapDrawable(resources, SimpleContactsHelper(context).getContactLetterIcon(fullName)) if (contact.photoUri.isEmpty() && contact.photo == null) { findViewById(R.id.item_contact_image).setImageDrawable(placeholderImage) } else { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt index 5f6f4130..b310880f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt @@ -10,6 +10,7 @@ import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getTextSize import com.simplemobiletools.commons.extensions.highlightTextPart +import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView @@ -170,7 +171,7 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList, val group_tmb.beVisibleIf(showContactThumbnails) if (showContactThumbnails) { - group_tmb.setImageDrawable(com.simplemobiletools.commons.helpers.ContactsHelper(activity).getColoredGroupIcon(group.title)) + group_tmb.setImageDrawable(SimpleContactsHelper(activity).getColoredGroupIcon(group.title)) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt index 571ec3f3..9c1748e7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt @@ -14,7 +14,7 @@ import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getTextSize import com.simplemobiletools.commons.extensions.highlightTextPart -import com.simplemobiletools.commons.helpers.ContactsHelper +import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.contacts.pro.R @@ -150,7 +150,7 @@ class SelectContactsAdapter(val activity: SimpleActivity, var contacts: ArrayLis else -> contact.firstName } - val placeholderImage = BitmapDrawable(resources, ContactsHelper(context).getContactLetterIcon(avatarName)) + val placeholderImage = BitmapDrawable(resources, SimpleContactsHelper(context).getContactLetterIcon(avatarName)) if (contact.photoUri.isEmpty() && contact.photo == null) { contact_tmb.setImageDrawable(placeholderImage) 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 ca8dd026..edefd50a 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 @@ -17,6 +17,7 @@ import com.simplemobiletools.commons.extensions.telecomManager import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CONTACTS +import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.contacts.pro.BuildConfig import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.activities.EditContactActivity @@ -310,7 +311,7 @@ fun Context.getContactPublicUri(contact: Contact): Uri { val lookupKey = if (contact.isPrivate()) { "local_${contact.id}" } else { - ContactsHelper(this).getContactLookupKey(contact.id.toString()) + SimpleContactsHelper(this).getContactLookupKey(contact.id.toString()) } return Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, lookupKey) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/CallManager.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/CallManager.kt index 541105c3..5c26710d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/CallManager.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/CallManager.kt @@ -5,6 +5,7 @@ import android.content.Context import android.net.Uri import android.telecom.Call import android.telecom.VideoProfile +import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.contacts.pro.extensions.contactsDB import com.simplemobiletools.contacts.pro.models.CallContact @@ -59,11 +60,10 @@ class CallManager { val uri = Uri.decode(call!!.details.handle.toString()) if (uri.startsWith("tel:")) { - val contactsHelper = com.simplemobiletools.commons.helpers.ContactsHelper(context) val number = uri.substringAfter("tel:") callContact.number = number - callContact.name = contactsHelper.getNameFromPhoneNumber(number) - callContact.photoUri = contactsHelper.getPhotoUriFromPhoneNumber(number) + callContact.name = SimpleContactsHelper(context).getNameFromPhoneNumber(number) + callContact.photoUri = SimpleContactsHelper(context).getPhotoUriFromPhoneNumber(number) if (callContact.name == callContact.number) { ensureBackgroundThread { 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 0643b4a8..47ce8f27 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 @@ -1351,24 +1351,6 @@ class ContactsHelper(val context: Context) { fileDescriptor.close() } - fun getContactLookupKey(contactId: String): String { - val uri = Data.CONTENT_URI - val projection = arrayOf(Data.CONTACT_ID, Data.LOOKUP_KEY) - val selection = "${Data.MIMETYPE} = ? AND ${Data.RAW_CONTACT_ID} = ?" - val selectionArgs = arrayOf(StructuredName.CONTENT_ITEM_TYPE, contactId) - - val cursor = context.contentResolver.query(uri, projection, selection, selectionArgs, null) - cursor?.use { - if (cursor.moveToFirst()) { - val id = cursor.getIntValue(Data.CONTACT_ID) - val lookupKey = cursor.getStringValue(Data.LOOKUP_KEY) - return "$lookupKey/$id" - } - } - - return "" - } - fun getContactMimeTypeId(contactId: String, mimeType: String): String { val uri = Data.CONTENT_URI val projection = arrayOf(Data._ID, Data.RAW_CONTACT_ID, Data.MIMETYPE) From cd8d73b8e44aa4e6e5590909b65a5ae89205f8c3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 8 May 2020 22:34:42 +0200 Subject: [PATCH 07/19] moving the Launch ACTION_CALL intent handling in Commons --- app/build.gradle | 2 +- .../contacts/pro/extensions/Activity.kt | 20 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f4b848a5..a73bb305 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.27.17' + implementation 'com.simplemobiletools:commons:5.27.18' implementation 'joda-time:joda-time:2.10.1' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt index 99f13307..6c9943ec 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt @@ -9,7 +9,6 @@ import android.telecom.TelecomManager import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.PERMISSION_CALL_PHONE import com.simplemobiletools.commons.helpers.PERMISSION_READ_PHONE_STATE import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.contacts.pro.BuildConfig @@ -30,25 +29,6 @@ fun SimpleActivity.startCallIntent(recipient: String) { } } -fun SimpleActivity.launchCallIntent(recipient: String, handle: PhoneAccountHandle?) { - handlePermission(PERMISSION_CALL_PHONE) { - val action = if (it) Intent.ACTION_CALL else Intent.ACTION_DIAL - Intent(action).apply { - data = Uri.fromParts("tel", recipient, null) - - if (handle != null) { - putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, handle) - } - - if (resolveActivity(packageManager) != null) { - startActivity(this) - } else { - toast(R.string.no_app_found) - } - } - } -} - fun SimpleActivity.tryStartCall(contact: Contact) { if (config.showCallConfirmation) { CallConfirmationDialog(this, contact.getNameToDisplay()) { From 680ecff49e057d1ac76f781e25a3f0172f9ae42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Sat, 9 May 2020 13:49:56 +0100 Subject: [PATCH 08/19] Update strings.xml --- app/src/main/res/values-pt/strings.xml | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2a8bf3cf..e09f8480 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -15,10 +15,10 @@ Enviar e-mail para o grupo Ligar a %s Criar novo contacto - Adicionar a contacto existente + Adicionar a um contacto existente this link. Thanks! + A parte da aplicação responsável pela gestão de chamadas foi movida para uma nova aplicação com o nome Simple Dialer. Pode descarregar a aplicação aqui. Obrigado! ]]> @@ -104,20 +104,20 @@ Marcador - Adicionar número a um contacto + Adicionar número a um contacto existente Marcador - Accept - Decline - Unknown Caller - Is Calling… - Dialing… - Call Ended - Call Ending - Ongoing Call - Select a SIM for this call - Always use this SIM for this number + Aceitar + Recusar + Desconhecido + Está a chamar… + A ligar… + Chamada terminada + A terminar chamada + Chamada em curso + Selecione um SIM para esta chamada + Utilizar sempre este SIM para ligar a este número Ligação rápida @@ -190,10 +190,10 @@ Não contém anúncios ou permissões desnecessárias. É totalmente open source e permite personalização de cores. - Check out the full suite of Simple Tools here: + Consulte todas as aplicações Simple Tools aqui: https://www.simplemobiletools.com - Standalone website of Simple Contacts Pro: + Site da aplicação Simple Contacts Pro: https://www.simplemobiletools.com/contacts Facebook: From d82d9805be3af82510afea5523a8d215d9cb6326 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 9 May 2020 23:05:06 +0200 Subject: [PATCH 09/19] moving some helper functions into Commons --- app/build.gradle | 2 +- .../pro/activities/EditContactActivity.kt | 2 +- .../contacts/pro/adapters/ContactsAdapter.kt | 7 ++----- .../pro/adapters/SelectContactsAdapter.kt | 8 ++------ .../contacts/pro/extensions/String.kt | 3 --- .../contacts/pro/helpers/Constants.kt | 19 ------------------- .../contacts/pro/helpers/ContactsHelper.kt | 2 +- .../contacts/pro/helpers/VcfImporter.kt | 4 ++-- .../contacts/pro/models/Contact.kt | 10 +++++----- 9 files changed, 14 insertions(+), 43 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a73bb305..75390a84 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.27.18' + implementation 'com.simplemobiletools:commons:5.27.20' implementation 'joda-time:joda-time:2.10.1' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt index 0c561e04..e95350fa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt @@ -911,7 +911,7 @@ class EditContactActivity : ContactActivity() { val numberLabel = if (numberType == Phone.TYPE_CUSTOM) numberHolder.contact_number_type.value else "" if (number.isNotEmpty()) { - phoneNumbers.add(PhoneNumber(number, numberType, numberLabel, number.normalizeNumber())) + phoneNumbers.add(PhoneNumber(number, numberType, numberLabel, number.normalizePhoneNumber())) } } return phoneNumbers 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 124f15aa..08b10cd8 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 @@ -15,10 +15,7 @@ import com.bumptech.glide.signature.ObjectKey import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor -import com.simplemobiletools.commons.extensions.getTextSize -import com.simplemobiletools.commons.extensions.highlightTextPart +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.models.RadioItem @@ -273,7 +270,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList val id = cursor.getIntValue(Data.RAW_CONTACT_ID) val number = cursor.getStringValue(Phone.NUMBER) ?: return@queryCursor - val normalizedNumber = cursor.getStringValue(Phone.NORMALIZED_NUMBER) ?: number.normalizeNumber() + val normalizedNumber = cursor.getStringValue(Phone.NORMALIZED_NUMBER) ?: number.normalizePhoneNumber() val type = cursor.getIntValue(Phone.TYPE) val label = cursor.getStringValue(Phone.LABEL) ?: "" 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 fedde9e3..58d219d5 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 @@ -5,12 +5,12 @@ import android.graphics.BitmapFactory import android.provider.ContactsContract.CommonDataKinds import android.provider.ContactsContract.CommonDataKinds.* import android.widget.Toast +import com.simplemobiletools.commons.extensions.normalizePhoneNumber import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.contacts.pro.activities.SimpleActivity import com.simplemobiletools.contacts.pro.extensions.getCachePhoto import com.simplemobiletools.contacts.pro.extensions.getCachePhotoUri import com.simplemobiletools.contacts.pro.extensions.groupsDB -import com.simplemobiletools.contacts.pro.extensions.normalizeNumber import com.simplemobiletools.contacts.pro.helpers.VcfImporter.ImportResult.* import com.simplemobiletools.contacts.pro.models.* import com.simplemobiletools.contacts.pro.models.Email @@ -60,7 +60,7 @@ class VcfImporter(val activity: SimpleActivity) { "" } - phoneNumbers.add(PhoneNumber(number, type, label, number.normalizeNumber())) + phoneNumbers.add(PhoneNumber(number, type, label, number.normalizePhoneNumber())) } val emails = ArrayList() 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 cbe82e81..ab8eba32 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 @@ -2,11 +2,11 @@ package com.simplemobiletools.contacts.pro.models import android.graphics.Bitmap import android.telephony.PhoneNumberUtils +import com.simplemobiletools.commons.extensions.normalizePhoneNumber import com.simplemobiletools.commons.extensions.normalizeString import com.simplemobiletools.commons.helpers.SORT_BY_FIRST_NAME import com.simplemobiletools.commons.helpers.SORT_BY_MIDDLE_NAME import com.simplemobiletools.commons.helpers.SORT_DESCENDING -import com.simplemobiletools.contacts.pro.extensions.normalizeNumber import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE data class Contact(var id: Int, var prefix: String, var firstName: String, var middleName: String, var surname: String, var suffix: String, var nickname: String, @@ -109,8 +109,8 @@ data class Contact(var id: Int, var prefix: String, var firstName: String, var m fun getStringToCompare(): String { return copy(id = 0, prefix = "", firstName = getNameToDisplay().toLowerCase(), middleName = "", surname = "", suffix = "", nickname = "", photoUri = "", - phoneNumbers = ArrayList(), emails = ArrayList(), events = ArrayList(), source = "", addresses = ArrayList(), starred = 0, contactId = 0, - thumbnailUri = "", notes = "", groups = ArrayList(), websites = ArrayList(), organization = Organization("", ""), IMs = ArrayList()).toString() + phoneNumbers = ArrayList(), emails = ArrayList(), events = ArrayList(), source = "", addresses = ArrayList(), starred = 0, contactId = 0, + thumbnailUri = "", notes = "", groups = ArrayList(), websites = ArrayList(), organization = Organization("", ""), IMs = ArrayList()).toString() } fun getHashToCompare() = getStringToCompare().hashCode() @@ -125,12 +125,12 @@ data class Contact(var id: Int, var prefix: String, var firstName: String, var m fun doesContainPhoneNumber(text: String, convertLetters: Boolean): Boolean { return if (text.isNotEmpty()) { - val normalizedText = if (convertLetters) text.normalizeNumber() else text + val normalizedText = if (convertLetters) text.normalizePhoneNumber() else text phoneNumbers.any { PhoneNumberUtils.compare(it.normalizedNumber, normalizedText) || it.value.contains(text) || it.normalizedNumber?.contains(normalizedText) == true || - it.value.normalizeNumber().contains(normalizedText) + it.value.normalizePhoneNumber().contains(normalizedText) } } else { false From b03bcaddd2874160302c092a9792fe618ef03743 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Sun, 10 May 2020 22:43:52 +0200 Subject: [PATCH 10/19] Dutch Question! When is "is_calling" used and when "dialling"? --- app/src/main/res/values-nl/strings.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c1ab4283..40759b8b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -18,7 +18,7 @@ Aan bestaand contact toevoegen this link. Thanks! + Het gedeelte om telefoongesprekken te beheren moest worden afgesplitst naar een aparte app genaamd Eenvoudige Telefoon. Download de app via this link. Bedankt! ]]> @@ -108,16 +108,16 @@ Bellen - Accept - Decline - Unknown Caller - Is Calling… - Dialing… - Call Ended - Call Ending - Ongoing Call - Select a SIM for this call - Always use this SIM for this number + Beantwoorden + Weigeren + Nummer onbekend + Bellen… + Bellen… + Gesprek beëindigd + Gesprek beëindigen + Gesprek gaande + Selecteer de SIM-kaart voor dit gesprek + Voor dit nummer altijd deze SIM-kaart gebruiken Snelkiezer From c99c9d61cfaaff7f355008866e1a3be004980ad9 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Mon, 11 May 2020 22:10:54 +0200 Subject: [PATCH 11/19] Dutch fix --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 40759b8b..6a9a8598 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -111,7 +111,7 @@ Beantwoorden Weigeren Nummer onbekend - Bellen… + Inkomend gesprek… Bellen… Gesprek beëindigd Gesprek beëindigen From 2c4b1fc4e4b95579cd5a85abde5574c6440e4413 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 12 May 2020 12:07:09 +0200 Subject: [PATCH 12/19] moving some things in Commons --- app/build.gradle | 2 +- .../contacts/pro/adapters/ContactsAdapter.kt | 2 +- .../contacts/pro/adapters/SpeedDialAdapter.kt | 2 +- .../fragments/InsertOrEditContactsFragment.kt | 10 ---- .../contacts/pro/helpers/ContactsHelper.kt | 4 +- .../contacts/pro/overloads/String.kt | 9 ---- app/src/main/res/layout/activity_settings.xml | 46 +++++++++---------- app/src/main/res/menu/cab_speed_dial.xml | 9 ---- app/src/main/res/values-ar/strings.xml | 6 --- app/src/main/res/values-az/strings.xml | 6 --- app/src/main/res/values-cs/strings.xml | 7 --- app/src/main/res/values-cy/strings.xml | 6 --- app/src/main/res/values-da/strings.xml | 6 --- app/src/main/res/values-de/strings.xml | 6 --- app/src/main/res/values-el/strings.xml | 6 --- app/src/main/res/values-es/strings.xml | 6 --- app/src/main/res/values-eu/strings.xml | 6 --- app/src/main/res/values-fi/strings.xml | 6 --- app/src/main/res/values-fr/strings.xml | 6 --- app/src/main/res/values-hr/strings.xml | 6 --- app/src/main/res/values-hu/strings.xml | 6 --- app/src/main/res/values-id/strings.xml | 6 --- app/src/main/res/values-in/strings.xml | 6 --- app/src/main/res/values-it/strings.xml | 6 --- app/src/main/res/values-ja/strings.xml | 6 --- app/src/main/res/values-ko-rKR/strings.xml | 6 --- app/src/main/res/values-lt/strings.xml | 6 --- app/src/main/res/values-nl/strings.xml | 10 +--- app/src/main/res/values-pl/strings.xml | 6 --- app/src/main/res/values-pt-rBR/strings.xml | 6 --- app/src/main/res/values-pt/strings.xml | 6 --- app/src/main/res/values-ru/strings.xml | 7 --- app/src/main/res/values-sk/strings.xml | 7 --- app/src/main/res/values-sv/strings.xml | 6 --- app/src/main/res/values-tr/strings.xml | 6 --- app/src/main/res/values-uk/strings.xml | 6 --- app/src/main/res/values-zh-rCN/strings.xml | 6 --- app/src/main/res/values-zh-rTW/strings.xml | 6 --- app/src/main/res/values/strings.xml | 6 --- 39 files changed, 30 insertions(+), 247 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/InsertOrEditContactsFragment.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/pro/overloads/String.kt delete mode 100644 app/src/main/res/menu/cab_speed_dial.xml diff --git a/app/build.gradle b/app/build.gradle index 75390a84..04f77290 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.27.20' + implementation 'com.simplemobiletools:commons:5.27.25' implementation 'joda-time:joda-time:2.10.1' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a' 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 08b10cd8..bb51e5eb 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 @@ -317,7 +317,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList(R.id.item_contact_image)) + .into(findViewById(R.id.item_contact_image)) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt index 78e2fbfb..b2cc64d3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt @@ -19,7 +19,7 @@ class SpeedDialAdapter(activity: SimpleActivity, var speedDialValues: ArrayList< setupDragListener(true) } - override fun getActionMenuId() = R.menu.cab_speed_dial + override fun getActionMenuId() = R.menu.cab_delete_only override fun prepareActionMode(menu: Menu) {} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/InsertOrEditContactsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/InsertOrEditContactsFragment.kt deleted file mode 100644 index 99d5f28f..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/InsertOrEditContactsFragment.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.simplemobiletools.contacts.pro.fragments - -import android.content.Context -import android.util.AttributeSet - -class InsertOrEditContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) { - override fun fabClicked() {} - - override fun placeholderClicked() {} -} 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 12af86d7..f0b2ae1a 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 @@ -14,13 +14,13 @@ import android.text.TextUtils import android.util.SparseArray import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* +import com.simplemobiletools.commons.overloads.times import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.extensions.* import com.simplemobiletools.contacts.pro.models.* import com.simplemobiletools.contacts.pro.models.Email import com.simplemobiletools.contacts.pro.models.Event import com.simplemobiletools.contacts.pro.models.Organization -import com.simplemobiletools.contacts.pro.overloads.times import java.util.* import kotlin.collections.ArrayList @@ -516,7 +516,7 @@ class ContactsHelper(val context: Context) { return groups } - private fun getQuestionMarks() = "?,".times(displayContactSources.filter { it.isNotEmpty() }.size).trimEnd(',') + private fun getQuestionMarks() = ("?," * displayContactSources.filter { it.isNotEmpty() }.size).trimEnd(',') private fun getSourcesSelection(addMimeType: Boolean = false, addContactId: Boolean = false, useRawContactId: Boolean = true): String { val strings = ArrayList() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/overloads/String.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/overloads/String.kt deleted file mode 100644 index 74944090..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/overloads/String.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.simplemobiletools.contacts.pro.overloads - -operator fun String.times(x: Int): String { - val stringBuilder = StringBuilder() - for (i in 1..x) { - stringBuilder.append(this) - } - return stringBuilder.toString() -} diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 457755c9..fbfd5d15 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -33,6 +33,29 @@ + + + + + + - - - - - - - - - diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 901fc2d9..89feae1d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index bd20cb6d..940e1306 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7b0609b3..cdba00db 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -141,13 +141,6 @@ Kontakt bude vymazán ze všech zdrojů kontaktů. - - - %d kontakt - %d kontakty - %d kontaktů - - %d skupinu %d skupiny diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 11602e22..43056421 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c0212f24..12d4f26a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dc060179..1c1f3db5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -141,12 +141,6 @@ Der Kontakt wird von allen Kontaktquellen entfernt. - - - %d Kontakt - %d Kontakte - - %d Gruppe %d Gruppen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 5cf9e069..86503fab 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -141,12 +141,6 @@ Η επαφή θα καταργηθεί από όλες τις πηγές επαφών. - - - %d επαφή - %d επαφές - - %d ομάδα %d ομάδες diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d0394e0f..b9765ed4 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -141,12 +141,6 @@ El contacto será eliminado de todos los orígenes de contactos. - - - %d contacto - %d contactos - - %d groupo %d groupos diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 7fe18ad5..4b527475 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2f01bc7f..2e851c43 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fb0ded42..5a7e3c24 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 2c34e9e3..9d6cc640 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index de1cb189..728dfc2c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 0be1075f..7c4cc1db 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -141,12 +141,6 @@ Kontak akan dihapus dari semua sumber kontak. - - - %d kontak - %d kontak - - %d grup %d grup diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 0be1075f..7c4cc1db 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -141,12 +141,6 @@ Kontak akan dihapus dari semua sumber kontak. - - - %d kontak - %d kontak - - %d grup %d grup diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6fc646ac..9f08e68b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 71564ea2..314ec449 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %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 25a109e9..d7c488c1 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index f01d13f1..6624eecf 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 6a9a8598..97dec696 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -141,12 +141,6 @@ De contactpersoon zal worden verwijderd uit alle accounts. - - - %d contact - %d contacten - - %d groep %d groepen @@ -166,9 +160,9 @@ De app is ook te gebruiken voor het beheren van e-mailadressen en gebeurtenissen gekoppeld aan contacten. Sorteren en filteren is mogelijk op basis van verschillende parameters en zowel voor- als achternaam kan als eerste worden getoond. - Favoriete contacten kunnen in een aparte lijst worden getoond. E-mails of sms'jes kunnen naar hele groepen worden gestuurd om tijd te besparen. + Favoriete contacten kunnen in een aparte lijst worden getoond. E-mails of sms\'jes kunnen naar hele groepen worden gestuurd om tijd te besparen. - Er zijn knoppen om direct een contacpersoon te bellen of te sms'en. De zichtbaarheid van de gegevensvelden zijn naar voorkeur aan te passen, zodat ongebruikte velden geen ruimte in beslag nemen. De zoekfunctie zal in alle zichtbare velden speuren naar de opgegeven tekst. + Er zijn knoppen om direct een contacpersoon te bellen of te sms\'en. De zichtbaarheid van de gegevensvelden zijn naar voorkeur aan te passen, zodat ongebruikte velden geen ruimte in beslag nemen. De zoekfunctie zal in alle zichtbare velden speuren naar de opgegeven tekst. De app bevat ook een lichtgewicht telefoonkiezer met snelle contactsuggesties tijdens het invoeren. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 77b68af1..13d54fc1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c717fa04..b2d27bea 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -141,12 +141,6 @@ O contato será removido de todas removido de todas as fontes de contato. - - - %d contato - %d contatos - - %d grupo %d grupos diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e09f8480..15fceada 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -141,12 +141,6 @@ O contacto será apagado de todas as origens. - - - %d contacto - %d contactos - - %d grupo %d grupos diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5bab82be..ab7acf8a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -141,13 +141,6 @@ Контакт будет удалён из всех источников контактов. - - - %d контакт - %d контакта - %d контактов - - %d группу %d группы diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 512c32b6..43f33845 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -141,13 +141,6 @@ Kontakt bude vymazaný zo všetkých zdrojov kontaktov. - - - %d kontakt - %d kontakty - %d kontaktov - - %d skupinu %d skupiny diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 9c52278d..862f7a00 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -141,12 +141,6 @@ Kontakten kommer att tas bort från alla kontaktkällor. - - - %d kontakt - %d kontakter - - %d grupp %d grupper diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e7aaa84f..ebfac76c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -141,12 +141,6 @@ Kişi tüm kişi kaynaklarından kaldırılacak. - - - %d kişi - %d kişi - - %d grup %d grup diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c85cf98b..d248f7c1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %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 167590a2..e53e47de 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %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 275a1662..9ec21711 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -141,12 +141,6 @@ 這聯絡人將從全部通訊錄來源移除。 - - - %d個聯絡人 - %d個聯絡人 - - %d個群組 %d個群組 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8cda4ff5..be199ddf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -141,12 +141,6 @@ The contact will be removed from all contact sources. - - - %d contact - %d contacts - - %d group %d groups From cfebcfee5eade8436ebe226fa46b79995f700461 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 13 May 2020 23:16:05 +0200 Subject: [PATCH 13/19] moving a constant into Commons --- app/build.gradle | 2 +- .../contacts/pro/activities/DialpadActivity.kt | 2 +- .../contacts/pro/activities/InsertOrEditContactActivity.kt | 1 + .../simplemobiletools/contacts/pro/activities/SimpleActivity.kt | 2 +- .../com/simplemobiletools/contacts/pro/helpers/Constants.kt | 1 - 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 04f77290..d20046f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.27.25' + implementation 'com.simplemobiletools:commons:5.28.1' implementation 'joda-time:joda-time:2.10.1' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a' 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 a7e09793..45562442 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 @@ -14,6 +14,7 @@ import android.view.Menu import android.view.MenuItem import android.view.View import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.KEY_PHONE import com.simplemobiletools.commons.helpers.REQUEST_CODE_SET_DEFAULT_DIALER import com.simplemobiletools.commons.helpers.isOreoPlus import com.simplemobiletools.contacts.pro.R @@ -21,7 +22,6 @@ import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter import com.simplemobiletools.contacts.pro.dialogs.CallConfirmationDialog import com.simplemobiletools.contacts.pro.extensions.* import com.simplemobiletools.contacts.pro.helpers.ContactsHelper -import com.simplemobiletools.contacts.pro.helpers.KEY_PHONE import com.simplemobiletools.contacts.pro.helpers.LOCATION_DIALPAD import com.simplemobiletools.contacts.pro.models.Contact import com.simplemobiletools.contacts.pro.models.SpeedDial diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt index a26c63cf..6710812a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt @@ -13,6 +13,7 @@ import androidx.appcompat.widget.SearchView import androidx.core.view.MenuItemCompat import androidx.viewpager.widget.ViewPager import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.KEY_PHONE import com.simplemobiletools.commons.helpers.PERMISSION_GET_ACCOUNTS import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CONTACTS diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt index 54fed533..a6ac0829 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt @@ -6,10 +6,10 @@ import android.graphics.drawable.Drawable import android.net.Uri import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor +import com.simplemobiletools.commons.helpers.KEY_PHONE import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.extensions.config import com.simplemobiletools.contacts.pro.helpers.KEY_MAILTO -import com.simplemobiletools.contacts.pro.helpers.KEY_PHONE import com.simplemobiletools.contacts.pro.helpers.LOCATION_CONTACTS_TAB import com.simplemobiletools.contacts.pro.helpers.LOCATION_FAVORITES_TAB diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt index 360ad3e0..3fdf1044 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt @@ -36,7 +36,6 @@ const val ACCEPT_CALL = PATH + "accept_call" const val DECLINE_CALL = PATH + "decline_call" // extras used at third party intents -const val KEY_PHONE = "phone" const val KEY_NAME = "name" const val KEY_EMAIL = "email" const val KEY_MAILTO = "mailto" From e646d88a2e8136bedc946b1f157331fdfe9ae0af Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Fri, 15 May 2020 10:50:39 +0200 Subject: [PATCH 14/19] fix #557, fixing a changelog typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26af8c2d..0b682a31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ========== -Version 6.10.1 *(2020-05-06)* +Version 6.10.2 *(2020-05-06)* ---------------------------- * Removing the READ_CALL_LOG permission From c23800f28bfe849d5ca556117e2d8c05cd58a2a5 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 15 May 2020 12:08:52 +0200 Subject: [PATCH 15/19] make sure the Call and SMS buttons are shown when necessary --- app/build.gradle | 2 +- .../contacts/pro/activities/ViewContactActivity.kt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d20046f3..6eb98b50 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.28.1' + implementation 'com.simplemobiletools:commons:5.28.2' implementation 'joda-time:joda-time:2.10.1' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a' 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 56eedce1..c17708ec 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 @@ -338,6 +338,12 @@ class ViewContactActivity : ContactActivity() { contact_numbers_image.beGone() contact_numbers_holder.beGone() } + + // make sure the Call and SMS buttons are visible if any phone number is shown + if (phoneNumbers.isNotEmpty()) { + contact_send_sms.beVisible() + contact_start_call.beVisible() + } } // a contact cannot have different emails per contact source. Such contacts are handled as separate ones, not duplicates of each other From d0a7ffc954ed15d4f70b4fb3f12b813709c34abf Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 15 May 2020 12:29:03 +0200 Subject: [PATCH 16/19] adding a setting item for showing private contacts to suite apps --- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-cy/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-eu/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-id/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko-rKR/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 31 files changed, 31 insertions(+) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 89feae1d..f586bdab 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -66,6 +66,7 @@ إظهار مربع حوار تأكيد الاتصال قبل بدء مكالمة إظهار جهات الإتصال التي لديها أرقام هواتف فقط عرض الحروف على لوحة الاتصال + Show private contacts to Simple Dialer and Simple SMS Messenger المنزل diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 940e1306..5cc441e2 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -66,6 +66,7 @@ Zəngə başlamazdan əvvəl zəng təsdiq pəncərəsi göstər Show only contacts with phone numbers Show letters on the dialpad + Show private contacts to Simple Dialer and Simple SMS Messenger Ev diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index cdba00db..d7563cc9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -66,6 +66,7 @@ Před zahájením hovoru zobrazit potvrzovací dialog Zobrazit jen kontakty s telefonními čísly Zobrazit na číselníku písmena + Show private contacts to Simple Dialer and Simple SMS Messenger Domov diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 43056421..4217b248 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -66,6 +66,7 @@ Dangos deialog i gadarnhau cyn gwneud galwad Dangos dim ond cysylltiadau gyda rhifau ffôn Dangos llythrennau ar y pad deialu + Show private contacts to Simple Dialer and Simple SMS Messenger Cartref diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 12d4f26a..6b1f2396 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -66,6 +66,7 @@ Vis en opkaldsbekræftelsesdialog før du starter et opkald Vis kun kontakter med telefonnumre Vis bogstaver på tastaturet + Show private contacts to Simple Dialer and Simple SMS Messenger Hjem diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1c1f3db5..f9781ed0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -66,6 +66,7 @@ Bestätigungsdialog zeigen, bevor ein Anruf durchgeführt wird Nur Kontakte mit Telefonnummern anzeigen Buchstaben im Wahlfeld anzeigen + Show private contacts to Simple Dialer and Simple SMS Messenger Privat diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 86503fab..5eeba855 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -66,6 +66,7 @@ Εμφάνιση διαλόγου επιβεβαίωσης πριν από την έναρξη μιας κλήσης Προβολή όλων των Επαφών με αριθμούς τηλεφώνου Εμφάνιση γραμμάτων στην πληκτρολόγιο + Show private contacts to Simple Dialer and Simple SMS Messenger Οικία diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b9765ed4..63225a9a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -66,6 +66,7 @@ Mostrar un cuadro de confirmación antes de iniciar una llamada Solo mostrar contactos con números telefónicos Mostrar letras en el teclado de marcación + Show private contacts to Simple Dialer and Simple SMS Messenger Casa diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 4b527475..3681c434 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -66,6 +66,7 @@ Erakutsi egiaztatze mezua dei bat hasi baino lehen Show only contacts with phone numbers Show letters on the dialpad + Show private contacts to Simple Dialer and Simple SMS Messenger Etxea diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2e851c43..c36bb398 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -66,6 +66,7 @@ Näytä puhelun vahvistusruutu Näytä ainoastaan numerolliset kontaktit Näytä kirjaimet puhelimessa + Show private contacts to Simple Dialer and Simple SMS Messenger Koti diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5a7e3c24..804d67ac 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -66,6 +66,7 @@ Afficher une demande de confirmation avant de démarrer un appel Afficher uniquement les contacts avec un numéro de téléphone Show letters on the dialpad + Show private contacts to Simple Dialer and Simple SMS Messenger Maison diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 9d6cc640..b2ef9df5 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -66,6 +66,7 @@ Pokažite dijaloški okvir za potvrdu poziva prije pokretanja poziva Prikaži samo kontakte s telefonskim brojevima Prikaži slova na telefonskoj tipkovnici + Show private contacts to Simple Dialer and Simple SMS Messenger Kućni diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 728dfc2c..e30bb0e0 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -66,6 +66,7 @@ Jóváhagyás kérése telefonhívás indítása előtt Csak telefonszámot tartalmazó névjegyek kijelzése Betűk kijelzése a tárcsázón + Show private contacts to Simple Dialer and Simple SMS Messenger Otthon diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 7c4cc1db..33beec77 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -66,6 +66,7 @@ Tampilkan dialog konfirmasi panggilan sebelum melakukan panggilan Hanya tampilkan kontak dengan nomor telepon Tampilkan huruf pada tombol dial + Show private contacts to Simple Dialer and Simple SMS Messenger Rumah diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7c4cc1db..33beec77 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -66,6 +66,7 @@ Tampilkan dialog konfirmasi panggilan sebelum melakukan panggilan Hanya tampilkan kontak dengan nomor telepon Tampilkan huruf pada tombol dial + Show private contacts to Simple Dialer and Simple SMS Messenger Rumah diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9f08e68b..9db3a36e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -66,6 +66,7 @@ Mostra un messaggio di conferma prima di iniziare una chiamata Mostra solamente i contatti con almeno un numero telefonico Mostra lettere nel compositore + Show private contacts to Simple Dialer and Simple SMS Messenger Casa diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 314ec449..e0a7981f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -66,6 +66,7 @@ 発信する前に確認ダイアログを表示する 電話番号が登録された連絡先のみ表示する Show letters on the dialpad + Show private contacts to Simple Dialer and Simple SMS Messenger 自宅 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index d7c488c1..1311cf74 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -66,6 +66,7 @@ Show a call confirmation dialog before initiating a call Show only contacts with phone numbers Show letters on the dialpad + Show private contacts to Simple Dialer and Simple SMS Messenger 집 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 6624eecf..6e298abd 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -66,6 +66,7 @@ Show a call confirmation dialog before initiating a call Show only contacts with phone numbers Show letters on the dialpad + Show private contacts to Simple Dialer and Simple SMS Messenger Namų diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 97dec696..cefcd82e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -66,6 +66,7 @@ Om bevestiging vragen voor het bellen Alleen contacten met telefoonnummers tonen Letters op het toetsenblok tonen + Show private contacts to Simple Dialer and Simple SMS Messenger Thuis diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 13d54fc1..82013eff 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -66,6 +66,7 @@ Pokazuj okno potwierdzenia zadzwonienia przed zainicjonowaniem połączenia Pokazuj wyłącznie kontakty z numerami telefonów Pokazuj litery na panelu wybierania + Show private contacts to Simple Dialer and Simple SMS Messenger Dom diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b2d27bea..9b26500d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -66,6 +66,7 @@ Mostrar diálogo para confirmar a chamada antes de ligar Mostar apenas os contatos com número de telefone Mostrar letras no discador + Show private contacts to Simple Dialer and Simple SMS Messenger Residencial diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 15fceada..3ad0404a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -66,6 +66,7 @@ Mostrar diálogo para confirmar a chamada Mostrar apenas contactos com número de telefone Mostrar letras no marcador + Show private contacts to Simple Dialer and Simple SMS Messenger Pessoal diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ab7acf8a..f43e1fac 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -66,6 +66,7 @@ Показывать диалог подтверждения вызова Показывать только контакты с номерами телефонов Показывать буквы на кнопках набора номера + Show private contacts to Simple Dialer and Simple SMS Messenger Домашний diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 43f33845..01a3eb19 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -66,6 +66,7 @@ Zobraziť pred spustením hovoru okno na jeho potvrdenie Zobraziť iba kontakty s telefónnymi číslami Zobraziť na číselníku písmená + Zobraziť súkromné kontakty Jednoduchému Telefónu a Jednoduchému Správcovi Súborov Domov diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 862f7a00..f9d3da3d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -66,6 +66,7 @@ Visa en bekräftelsedialogruta före uppringning Visa bara kontakter med telefonnummer Visa bokstäver på knappsatsen + Show private contacts to Simple Dialer and Simple SMS Messenger Hem diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ebfac76c..2c84f8b7 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -66,6 +66,7 @@ Arama başlatmadan önce arama onayı penceresi göster Sadece telefon numaralarını içeren kişileri göster Tuş takımında harfleri göster + Show private contacts to Simple Dialer and Simple SMS Messenger Ev diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d248f7c1..0be8b340 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -66,6 +66,7 @@ Показувати діалог підтвердження виклику Показувати лише контакти з телефонними номерами Показувати літери на панелі набору + Show private contacts to Simple Dialer and Simple SMS Messenger Домашній diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e53e47de..416866b7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -66,6 +66,7 @@ 开始通话前显示通话确认框 只显示含有电话话码的联系人 在拨号界面上显示字母 + Show private contacts to Simple Dialer and Simple SMS Messenger 住家 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9ec21711..e1ea7e75 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -66,6 +66,7 @@ 開始通話前顯示通話確認框 只顯示含有電話話碼的聯絡人 在撥號畫面上顯示字母 + Show private contacts to Simple Dialer and Simple SMS Messenger 住家 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index be199ddf..ff8a0308 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -66,6 +66,7 @@ Show a call confirmation dialog before initiating a call Show only contacts with phone numbers Show letters on the dialpad + Show private contacts to Simple Dialer and Simple SMS Messenger Home From fe735bfc6e2935ed977cbc671dab5d21e568c6a2 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Fri, 15 May 2020 15:58:41 +0200 Subject: [PATCH 17/19] Dutch --- app/src/main/res/values-nl/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index cefcd82e..10f1a0f5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -66,7 +66,7 @@ Om bevestiging vragen voor het bellen Alleen contacten met telefoonnummers tonen Letters op het toetsenblok tonen - Show private contacts to Simple Dialer and Simple SMS Messenger + Privécontacten in Eenvoudige Telefoon en Eenvoudige Berichten tonen Thuis @@ -169,7 +169,7 @@ Het importeren/exporteren van contacten in vCard-formaat (.vcf) wordt ondersteund voor het gemakkelijk overzetten of backuppen van de gegevens. - With this modern and stable contacts manager you can protect your contacts by not sharing them with other apps, so you can keep your contacts private. + Met deze moderne en stabiele app kunnen contactpersonen worden beschermd door ze niet te delen met andere apps en zo privé te houden. Like the contact source, you can also easily change the contact name, email, phone number, address, organization, groups and many other customizable fields. You can use it for storing contact events too, like birthdays, anniversaries, or any other custom ones. From afb4cc66f0b641ace3276cf6d000b1a16a2e00f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20F=C4=B1r=C4=B1nc=C4=B1?= Date: Fri, 15 May 2020 17:02:28 +0300 Subject: [PATCH 18/19] Update strings.xml --- app/src/main/res/values-tr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 2c84f8b7..783e66cd 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -66,7 +66,7 @@ Arama başlatmadan önce arama onayı penceresi göster Sadece telefon numaralarını içeren kişileri göster Tuş takımında harfleri göster - Show private contacts to Simple Dialer and Simple SMS Messenger + Özel kişileri Basit Çevirici ve Basit SMS Messenger\'a göster Ev From bc9336e8715a600c0e1c4f8f4d1f3d96a278a936 Mon Sep 17 00:00:00 2001 From: spkprs Date: Fri, 15 May 2020 17:27:36 +0300 Subject: [PATCH 19/19] Update strings.xml --- app/src/main/res/values-el/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 5eeba855..c7fac1a2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -66,7 +66,7 @@ Εμφάνιση διαλόγου επιβεβαίωσης πριν από την έναρξη μιας κλήσης Προβολή όλων των Επαφών με αριθμούς τηλεφώνου Εμφάνιση γραμμάτων στην πληκτρολόγιο - Show private contacts to Simple Dialer and Simple SMS Messenger + Εμφάνιση ιδιωτικών επαφών σε Simple Dialer και Simple SMS Messenger Οικία