From 2c4b1fc4e4b95579cd5a85abde5574c6440e4413 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 12 May 2020 12:07:09 +0200 Subject: [PATCH] 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