From abf6df635367676a4e294f0a820c77fa3dd4bba8 Mon Sep 17 00:00:00 2001 From: ScratchBuild Date: Wed, 31 Oct 2018 17:22:12 +0900 Subject: [PATCH 01/10] Update Japanese translation --- app/src/main/res/values-ja/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 026ac3bb..d22b12f6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -19,9 +19,9 @@ 既存の連絡先に追加 - No contacts found - No contacts with emails have been found - No contacts with phone numbers have been found + 連絡先が見つかりません + メールアドレスが登録された連絡先が見つかりません + 電話番号が登録された連絡先が見つかりません 新しい連絡先 連絡先を編集 @@ -30,7 +30,7 @@ 名 ミドルネーム 姓 - Nickname + ニックネーム グループなし @@ -62,7 +62,7 @@ お気に入り Recent calls 発信する前に確認ダイアログを表示する - Show only contacts with phone numbers + 電話番号が登録された連絡先のみ表示する メール From b26139b72c3b6bface8700d308ba9a3a5deacd11 Mon Sep 17 00:00:00 2001 From: obibon Date: Sat, 3 Nov 2018 14:23:54 +0100 Subject: [PATCH 02/10] Updated eu (Basque) translation Commit made via Stringlate --- app/src/debug/res/values-eu/strings.xml | 4 + app/src/main/res/values-eu/strings.xml | 124 ++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 app/src/debug/res/values-eu/strings.xml create mode 100644 app/src/main/res/values-eu/strings.xml diff --git a/app/src/debug/res/values-eu/strings.xml b/app/src/debug/res/values-eu/strings.xml new file mode 100644 index 00000000..05206b2f --- /dev/null +++ b/app/src/debug/res/values-eu/strings.xml @@ -0,0 +1,4 @@ + + + Kontaktuak + diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml new file mode 100644 index 00000000..8e942b49 --- /dev/null +++ b/app/src/main/res/values-eu/strings.xml @@ -0,0 +1,124 @@ + + Kontaktu sinpleak + Kontaktuak + Helbidea + Txertatzen... + Eguneratzen... + Telefono memoria + Telefono memoria (beste aplikazioentzat ikustezina) + Enpresa + Lanpostua + Webgunea + Bidali SMSa kontaktuei + Bidali emaila kontaktuei + Bidali SMSa taldera + Bidali emaila taldeari + %s deitu + Eskatu beharrezko baimenak + + Kontaktu berria + Editatu taldea + Hautatu kontaktuak + Hautatu kontaktuak + Izena + Erdiko izena + Abizena + + + Talderik ez + Sortu talde berria + Kendu taldetik + Talde hau hutsik dago + Gehitu kontaktuak + Ez dago kontaktuen talderik gailu honetan + Sortu taldea + Gehitu taldera + Kontu honetarako taldea sortu + + + Atera argazkia + Hautatu argazkia + Kendu argazkia + + + Abizenaren arabera sailkatu + Erakutsi telefono zenbakiak pantaila nagusian + Kontaktu sakatzean + Kontaktua deitu + Ikusi kontaktu detaileak + Kudeatu erakutsitako kontaktu eremuak + Saiatu bikoiztutako kontaktuak iragazten + Kudeatu erakutsitako fitxak + Kontaktuak + Gogokoak + Azken deiak + Erakutsi egiaztatze mezua dei bat hasi baino lehen + + + Emaila + Etxea + Lana + Besterik + + + Zenbakia + Mugikorra + Nagusia + Laneko faxa + Etxeko faxa + Ez da telefono zenbakirik aurkitu + + + Urtebetetzea + Urteurrena + + + Ez duzu oraindik gogokorik gehitu. + Gehitu gogokoak + Gehitu gogokoen zerrendara + Kendu gogokoenetik + Kontaktu bat aldatzeko edizio pantailan egon behar zara + + + Bilatu kontaktuak + Bilatu gogokoak + + + Inportatu kontaktuak + Esportatu kontaktuak + Inportatu .vcf fitxategiko kontaktuak + Esportatu kontaktua .vcf fitxategi batera + Fitxategi izena (.vcf gabe) + + + Hautatu erakusteko eremuak + Aurrizkia + Atzizkia + Telefono zenbakiak + Emailak + Helbideak + Ekitaldiak (urtebetetzeak, urteurrenak) + Oharrak + Erakundea + Webguneak + Taldeak + Kontaktu jatorria + + + Aldatu ditzaket kontaktuetan ikusgarri dauden eremuak? + Bai, joan hona: Ezarpenak -> Kudeatu erakutsitako kontaktu eremuan. Hor hautatu dezakezu zein eremu nahi duzun ikusgarri izatea. Batzuk desaktibatuta daude era lehenetsian, berri batzuk aurkitu ditzakezu. + + + + Kontaktuak kudeatzeko aplikazio iragarkigabea. + Aplikazio sinplea kontaktuak sortu eta kudeatzeko. Kontaktuak zure gailuan baino esin dira gorde, baina sinkronizagarriak dira Google-n edo beste kontuen bitartez. Zure kontaktu gogokoenak zerrenda banandu batean erakutsi ditzakezu.\n + \n + Erabiltzaileen emailak eta ekitaldiak kudeatzeko erabili dezakezu ere. Aukera duzu parametro askoren arabera sailkatzeko, tartean abizena izen gisa erakustea.\n + \n + Ez ditu iragarkirik ezta beharrezkoak ez diren baimenak. Guztiz kode irekikoa da eta koloreak pertsonalizagarriak dira. Aplikazio hau sorta handiago bateko zati bat baino ez da. Gainontzekoak ikusteko, jo https://www.simplemobiletools.com webgunera + + + From 682f1aa35809a3f767b202313dc7336273486c91 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Sat, 3 Nov 2018 14:42:26 +0100 Subject: [PATCH 03/10] Delete strings.xml --- app/src/debug/res/values-eu/strings.xml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 app/src/debug/res/values-eu/strings.xml diff --git a/app/src/debug/res/values-eu/strings.xml b/app/src/debug/res/values-eu/strings.xml deleted file mode 100644 index 05206b2f..00000000 --- a/app/src/debug/res/values-eu/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Kontaktuak - From 86748de12c24eb44b0aae14eb07787930c69b79f Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Sat, 3 Nov 2018 14:42:56 +0100 Subject: [PATCH 04/10] Update strings.xml --- app/src/main/res/values-eu/strings.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 8e942b49..fab37fca 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -111,11 +111,13 @@ Kontaktuak kudeatzeko aplikazio iragarkigabea. - Aplikazio sinplea kontaktuak sortu eta kudeatzeko. Kontaktuak zure gailuan baino esin dira gorde, baina sinkronizagarriak dira Google-n edo beste kontuen bitartez. Zure kontaktu gogokoenak zerrenda banandu batean erakutsi ditzakezu.\n - \n - Erabiltzaileen emailak eta ekitaldiak kudeatzeko erabili dezakezu ere. Aukera duzu parametro askoren arabera sailkatzeko, tartean abizena izen gisa erakustea.\n - \n - Ez ditu iragarkirik ezta beharrezkoak ez diren baimenak. Guztiz kode irekikoa da eta koloreak pertsonalizagarriak dira. Aplikazio hau sorta handiago bateko zati bat baino ez da. Gainontzekoak ikusteko, jo https://www.simplemobiletools.com webgunera + + Aplikazio sinplea kontaktuak sortu eta kudeatzeko. Kontaktuak zure gailuan baino esin dira gorde, baina sinkronizagarriak dira Google-n edo beste kontuen bitartez. Zure kontaktu gogokoenak zerrenda banandu batean erakutsi ditzakezu. + + Erabiltzaileen emailak eta ekitaldiak kudeatzeko erabili dezakezu ere. Aukera duzu parametro askoren arabera sailkatzeko, tartean abizena izen gisa erakustea. + + Ez ditu iragarkirik ezta beharrezkoak ez diren baimenak. Guztiz kode irekikoa da eta koloreak pertsonalizagarriak dira. Aplikazio hau sorta handiago bateko zati bat baino ez da. Gainontzekoak ikusteko, jo https://www.simplemobiletools.com webgunera + - No contacts found - No contacts with emails have been found - No contacts with phone numbers have been found + Kişi bulunamadı + E-posta ile hiç bağlantı bulunamadı + Telefon numaralarını içeren kişi bulunamadı Yeni kişi Kişiyi düzenle @@ -30,7 +30,7 @@ Adı Göbek adı Soyadı - Nickname + Takma adı Grup yok @@ -57,12 +57,12 @@ Kişi bilgilerini göster Görüntülenecek kişi alanlarını yönet Çift kişileri filtrelemeyi dene - Manage shown tabs - Contacts - Favorites - Recent calls - Show a call confirmation dialog before initiating a call - Show only contacts with phone numbers + Gösterilen sekmeleri yönet + Kişiler + Favoriler + Son aramalar + Arama başlatmadan önce arama onayı penceresi göster + Sadece telefon numaralarını içeren kişileri göster E-posta @@ -104,8 +104,8 @@ Dosya adı (.vcf olmadan) - Dialpad - Add number to contact + Tuş takımı + Kişiye numara ekle Görüntülenecek alanları seç @@ -120,7 +120,7 @@ Web siteleri Gruplar Kişi kaynağı - Instant messaging (IM) + Anlık mesajlaşma (IM) Rehberde görüntülenecek alanları değiştirmek istiyorum. Bunu yapabilir miyim? From 80332daa37b65851ed987092869ffa18ff61db98 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 5 Nov 2018 10:24:11 +0100 Subject: [PATCH 06/10] removing "Avoid showing Whats New" option --- app/build.gradle | 2 +- .../contacts/activities/SettingsActivity.kt | 9 ------- app/src/main/res/layout/activity_settings.xml | 24 ------------------- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fcdfe8cf..4eb08352 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,7 +41,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.2.11' + implementation 'com.simplemobiletools:commons:5.3.10' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt index 2df09385..e5f21508 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt @@ -31,7 +31,6 @@ class SettingsActivity : SimpleActivity() { setupManageShownContactFields() setupManageShownTabs() setupUseEnglish() - setupAvoidWhatsNew() setupShowInfoBubble() setupShowContactThumbnails() setupShowPhoneNumbers() @@ -79,14 +78,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupAvoidWhatsNew() { - settings_avoid_whats_new.isChecked = config.avoidWhatsNew - settings_avoid_whats_new_holder.setOnClickListener { - settings_avoid_whats_new.toggle() - config.avoidWhatsNew = settings_avoid_whats_new.isChecked - } - } - private fun setupShowInfoBubble() { settings_show_info_bubble.isChecked = config.showInfoBubble settings_show_info_bubble_holder.setOnClickListener { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 3e231816..1517e579 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -124,30 +124,6 @@ - - - - - - Date: Mon, 5 Nov 2018 10:44:24 +0100 Subject: [PATCH 07/10] replace the Purchase Thank You button with Upgrade To Pro --- app/build.gradle | 2 +- .../contacts/activities/MainActivity.kt | 6 ++++++ .../contacts/activities/SettingsActivity.kt | 15 ++++++--------- app/src/main/res/layout/activity_settings.xml | 6 +++--- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4eb08352..7b4289b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,7 +41,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.3.10' + implementation 'com.simplemobiletools:commons:5.3.11' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index 0270aca2..f22f707a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -15,6 +15,7 @@ import androidx.appcompat.widget.SearchView import androidx.core.view.MenuItemCompat import androidx.viewpager.widget.ViewPager import com.simplemobiletools.commons.dialogs.FilePickerDialog +import com.simplemobiletools.commons.dialogs.UpgradeToProDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.FAQItem @@ -74,6 +75,11 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { storeStateVariables() checkWhatsNewDialog() + + if (!config.wasInitialUpgradeToProShown) { + UpgradeToProDialog(this) + config.wasInitialUpgradeToProShown = true + } } private fun checkContactPermissions() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt index e5f21508..082a834b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt @@ -2,10 +2,7 @@ package com.simplemobiletools.contacts.activities import android.os.Bundle import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.isThankYouInstalled -import com.simplemobiletools.commons.extensions.launchPurchaseThankYouIntent -import com.simplemobiletools.commons.extensions.updateTextColors +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.contacts.R import com.simplemobiletools.contacts.dialogs.ManageVisibleFieldsDialog @@ -26,7 +23,7 @@ class SettingsActivity : SimpleActivity() { override fun onResume() { super.onResume() - setupPurchaseThankYou() + setupUpgradeToPro() setupCustomizeColors() setupManageShownContactFields() setupManageShownTabs() @@ -43,10 +40,10 @@ class SettingsActivity : SimpleActivity() { updateTextColors(settings_holder) } - private fun setupPurchaseThankYou() { - settings_purchase_thank_you_holder.beVisibleIf(config.appRunCount > 10 && !isThankYouInstalled()) - settings_purchase_thank_you_holder.setOnClickListener { - launchPurchaseThankYouIntent() + private fun setupUpgradeToPro() { + settings_upgrade_to_pro_holder.beGoneIf(isAProApp()) + settings_upgrade_to_pro_holder.setOnClickListener { + launchUpgradeToProIntent() } } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 1517e579..06c0d18e 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -13,7 +13,7 @@ android:orientation="vertical"> + android:text="@string/upgrade_to_pro"/> From 17d6c331ab2ddbd2f7c87c86552a9a8e4f9f4064 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 5 Nov 2018 10:47:10 +0100 Subject: [PATCH 08/10] update version to 5.1.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7b4289b4..7d085373 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.simplemobiletools.contacts" minSdkVersion 21 targetSdkVersion 28 - versionCode 34 - versionName "5.1.0" + versionCode 35 + versionName "5.1.1" setProperty("archivesBaseName", "contacts") } From 5cb598dfa810c04849943598a57ba592ea994001 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 5 Nov 2018 10:47:15 +0100 Subject: [PATCH 09/10] updating changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e48516de..d7902ed2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 5.1.1 *(2018-11-05)* +---------------------------- + + * This version of the app is no longer maintained. Please upgrade to the Pro version. It is free till Nov 13 2018. You can find the Upgrade button at the top of the app Settings. + Version 5.1.0 *(2018-10-28)* ---------------------------- From dd259a0bbe05bf7346ee4185e0d4ad4f80fa2338 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 5 Nov 2018 12:36:29 +0100 Subject: [PATCH 10/10] appending .pro to the package name --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../interfaces/RemoveFromGroupListener.kt | 7 ---- .../contacts/{ => pro}/App.kt | 2 +- .../{ => pro}/activities/ContactActivity.kt | 16 ++++---- .../{ => pro}/activities/DialpadActivity.kt | 22 +++++----- .../activities/EditContactActivity.kt | 14 +++---- .../activities/GroupContactsActivity.kt | 24 +++++------ .../activities/InsertOrEditContactActivity.kt | 20 +++++----- .../{ => pro}/activities/MainActivity.kt | 35 +++++++--------- .../activities/SelectContactActivity.kt | 22 +++++----- .../{ => pro}/activities/SettingsActivity.kt | 24 ++++------- .../{ => pro}/activities/SimpleActivity.kt | 4 +- .../{ => pro}/activities/SplashActivity.kt | 2 +- .../activities/ViewContactActivity.kt | 10 ++--- .../{ => pro}/adapters/ContactsAdapter.kt | 18 ++++----- .../adapters/FilterContactSourcesAdapter.kt | 12 +++--- .../{ => pro}/adapters/GroupsAdapter.kt | 20 +++++----- .../{ => pro}/adapters/RecentCallsAdapter.kt | 16 ++++---- .../adapters/SelectContactsAdapter.kt | 12 +++--- .../{ => pro}/adapters/ViewPagerAdapter.kt | 12 +++--- .../dialogs/CallConfirmationDialog.kt | 8 ++-- .../{ => pro}/dialogs/ChangeSortingDialog.kt | 12 +++--- .../{ => pro}/dialogs/CreateNewGroupDialog.kt | 16 ++++---- .../{ => pro}/dialogs/CustomLabelDialog.kt | 4 +- .../{ => pro}/dialogs/ExportContactsDialog.kt | 16 ++++---- .../dialogs/FilterContactSourcesDialog.kt | 18 ++++----- .../{ => pro}/dialogs/ImportContactsDialog.kt | 40 +++++++++---------- .../dialogs/ManageVisibleFieldsDialog.kt | 8 ++-- .../dialogs/ManageVisibleTabsDialog.kt | 8 ++-- .../{ => pro}/dialogs/RenameGroupDialog.kt | 10 ++--- .../{ => pro}/dialogs/SelectContactsDialog.kt | 14 +++---- .../{ => pro}/dialogs/SelectGroupsDialog.kt | 16 ++++---- .../contacts/{ => pro}/extensions/Activity.kt | 16 ++++---- .../contacts/{ => pro}/extensions/Bitmap.kt | 2 +- .../contacts/{ => pro}/extensions/Context.kt | 14 +++---- .../contacts/{ => pro}/extensions/String.kt | 4 +- .../{ => pro}/fragments/ContactsFragment.kt | 4 +- .../{ => pro}/fragments/FavoritesFragment.kt | 10 ++--- .../{ => pro}/fragments/GroupsFragment.kt | 8 ++-- .../fragments/MyViewPagerFragment.kt | 28 ++++++------- .../{ => pro}/fragments/RecentsFragment.kt | 20 +++++----- .../contacts/{ => pro}/helpers/Config.kt | 2 +- .../contacts/{ => pro}/helpers/Constants.kt | 2 +- .../{ => pro}/helpers/ContactsHelper.kt | 10 ++--- .../contacts/{ => pro}/helpers/DBHelper.kt | 12 +++--- .../{ => pro}/helpers/QuotedPrintable.kt | 2 +- .../contacts/{ => pro}/helpers/VcfExporter.kt | 12 +++--- .../contacts/{ => pro}/helpers/VcfImporter.kt | 14 +++---- .../interfaces/RefreshContactsListener.kt | 2 +- .../pro/interfaces/RemoveFromGroupListener.kt | 7 ++++ .../contacts/{ => pro}/models/Address.kt | 2 +- .../contacts/{ => pro}/models/Contact.kt | 4 +- .../{ => pro}/models/ContactSource.kt | 2 +- .../contacts/{ => pro}/models/Email.kt | 2 +- .../contacts/{ => pro}/models/Event.kt | 2 +- .../contacts/{ => pro}/models/Group.kt | 4 +- .../contacts/{ => pro}/models/IM.kt | 2 +- .../contacts/{ => pro}/models/Organization.kt | 2 +- .../contacts/{ => pro}/models/PhoneNumber.kt | 2 +- .../contacts/{ => pro}/models/RecentCall.kt | 2 +- .../contacts/{ => pro}/overloads/String.kt | 2 +- app/src/main/res/layout/activity_settings.xml | 22 ---------- app/src/main/res/layout/fragment_contacts.xml | 4 +- .../main/res/layout/fragment_favorites.xml | 4 +- app/src/main/res/layout/fragment_groups.xml | 4 +- app/src/main/res/layout/fragment_recents.xml | 4 +- build.gradle | 2 +- 68 files changed, 332 insertions(+), 369 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/interfaces/RemoveFromGroupListener.kt rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/App.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/ContactActivity.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/DialpadActivity.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/EditContactActivity.kt (99%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/GroupContactsActivity.kt (85%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/InsertOrEditContactActivity.kt (84%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/MainActivity.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/SelectContactActivity.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/SettingsActivity.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/SimpleActivity.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/SplashActivity.kt (83%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/activities/ViewContactActivity.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/adapters/ContactsAdapter.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/adapters/FilterContactSourcesAdapter.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/adapters/GroupsAdapter.kt (87%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/adapters/RecentCallsAdapter.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/adapters/SelectContactsAdapter.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/adapters/ViewPagerAdapter.kt (80%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/CallConfirmationDialog.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/ChangeSortingDialog.kt (87%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/CreateNewGroupDialog.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/CustomLabelDialog.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/ExportContactsDialog.kt (85%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/FilterContactSourcesDialog.kt (77%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/ImportContactsDialog.kt (59%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/ManageVisibleFieldsDialog.kt (92%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/ManageVisibleTabsDialog.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/RenameGroupDialog.kt (87%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/SelectContactsDialog.kt (85%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/dialogs/SelectGroupsDialog.kt (87%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/extensions/Activity.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/extensions/Bitmap.kt (86%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/extensions/Context.kt (92%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/extensions/String.kt (90%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/fragments/ContactsFragment.kt (78%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/fragments/FavoritesFragment.kt (69%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/fragments/GroupsFragment.kt (66%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/fragments/MyViewPagerFragment.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/fragments/RecentsFragment.kt (81%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/helpers/Config.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/helpers/Constants.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/helpers/ContactsHelper.kt (99%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/helpers/DBHelper.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/helpers/QuotedPrintable.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/helpers/VcfExporter.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/helpers/VcfImporter.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/interfaces/RefreshContactsListener.kt (61%) create mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RemoveFromGroupListener.kt rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/Address.kt (59%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/Contact.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/ContactSource.kt (55%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/Email.kt (58%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/Event.kt (50%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/Group.kt (75%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/IM.kt (57%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/Organization.kt (77%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/PhoneNumber.kt (60%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/models/RecentCall.kt (65%) rename app/src/main/kotlin/com/simplemobiletools/contacts/{ => pro}/overloads/String.kt (77%) diff --git a/app/build.gradle b/app/build.gradle index 7d085373..93de4f18 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { buildToolsVersion "28.0.3" defaultConfig { - applicationId "com.simplemobiletools.contacts" + applicationId "com.simplemobiletools.contacts.pro" minSdkVersion 21 targetSdkVersion 28 versionCode 35 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 91a6c619..81d50163 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/interfaces/RemoveFromGroupListener.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/interfaces/RemoveFromGroupListener.kt deleted file mode 100644 index c435180a..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/interfaces/RemoveFromGroupListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.simplemobiletools.contacts.interfaces - -import com.simplemobiletools.contacts.models.Contact - -interface RemoveFromGroupListener { - fun removeFromGroup(contacts: ArrayList) -} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/App.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/App.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/contacts/App.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/App.kt index 482c5976..ceb01a13 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/App.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/App.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts +package com.simplemobiletools.contacts.pro import android.app.Application import com.facebook.stetho.Stetho diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt index 08fc75c1..b5973df4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.graphics.Bitmap import android.graphics.drawable.Drawable @@ -17,13 +17,13 @@ import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.getColoredBitmap import com.simplemobiletools.commons.extensions.getContrastColor import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.sendEmailIntent -import com.simplemobiletools.contacts.extensions.sendSMSIntent -import com.simplemobiletools.contacts.extensions.shareContacts -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.sendEmailIntent +import com.simplemobiletools.contacts.pro.extensions.sendSMSIntent +import com.simplemobiletools.contacts.pro.extensions.shareContacts +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.models.Contact import java.util.* abstract class ContactActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/DialpadActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt index 86188994..ac4885ef 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.content.Intent import android.graphics.Color @@ -8,16 +8,16 @@ import android.view.Menu import android.view.MenuItem import android.view.View import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.adapters.ContactsAdapter -import com.simplemobiletools.contacts.dialogs.CallConfirmationDialog -import com.simplemobiletools.contacts.extensions.callContact -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.startCallIntent -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.KEY_PHONE -import com.simplemobiletools.contacts.helpers.LOCATION_DIALPAD -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter +import com.simplemobiletools.contacts.pro.dialogs.CallConfirmationDialog +import com.simplemobiletools.contacts.pro.extensions.callContact +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.startCallIntent +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 kotlinx.android.synthetic.main.activity_dialpad.* class DialpadActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt similarity index 99% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt index c9fccc55..51fc4760 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.app.Activity import android.app.DatePickerDialog @@ -23,12 +23,12 @@ import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CONTACTS import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.dialogs.CustomLabelDialog -import com.simplemobiletools.contacts.dialogs.SelectGroupsDialog -import com.simplemobiletools.contacts.extensions.* -import com.simplemobiletools.contacts.helpers.* -import com.simplemobiletools.contacts.models.* +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.dialogs.CustomLabelDialog +import com.simplemobiletools.contacts.pro.dialogs.SelectGroupsDialog +import com.simplemobiletools.contacts.pro.extensions.* +import com.simplemobiletools.contacts.pro.helpers.* +import com.simplemobiletools.contacts.pro.models.* import kotlinx.android.synthetic.main.activity_edit_contact.* import kotlinx.android.synthetic.main.item_edit_address.view.* import kotlinx.android.synthetic.main.item_edit_email.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt index 3716007b..0e33c5c5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.os.Bundle import android.view.Menu @@ -7,17 +7,17 @@ import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.underlineText import com.simplemobiletools.commons.extensions.updateTextColors -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.adapters.ContactsAdapter -import com.simplemobiletools.contacts.dialogs.SelectContactsDialog -import com.simplemobiletools.contacts.extensions.* -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.GROUP -import com.simplemobiletools.contacts.helpers.LOCATION_GROUP_CONTACTS -import com.simplemobiletools.contacts.interfaces.RefreshContactsListener -import com.simplemobiletools.contacts.interfaces.RemoveFromGroupListener -import com.simplemobiletools.contacts.models.Contact -import com.simplemobiletools.contacts.models.Group +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter +import com.simplemobiletools.contacts.pro.dialogs.SelectContactsDialog +import com.simplemobiletools.contacts.pro.extensions.* +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.GROUP +import com.simplemobiletools.contacts.pro.helpers.LOCATION_GROUP_CONTACTS +import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener +import com.simplemobiletools.contacts.pro.interfaces.RemoveFromGroupListener +import com.simplemobiletools.contacts.pro.models.Contact +import com.simplemobiletools.contacts.pro.models.Group import kotlinx.android.synthetic.main.activity_group_contacts.* class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, RefreshContactsListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/InsertOrEditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/InsertOrEditContactActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt index 16430225..b2303819 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/InsertOrEditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.app.Activity import android.content.Intent @@ -9,15 +9,15 @@ import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.adapters.ContactsAdapter -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.getContactPublicUri -import com.simplemobiletools.contacts.helpers.ADD_NEW_CONTACT_NUMBER -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.KEY_PHONE -import com.simplemobiletools.contacts.helpers.LOCATION_INSERT_OR_EDIT -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.getContactPublicUri +import com.simplemobiletools.contacts.pro.helpers.ADD_NEW_CONTACT_NUMBER +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.KEY_PHONE +import com.simplemobiletools.contacts.pro.helpers.LOCATION_INSERT_OR_EDIT +import com.simplemobiletools.contacts.pro.models.Contact import kotlinx.android.synthetic.main.activity_insert_edit_contact.* class InsertOrEditContactActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt index f22f707a..f8eefe7d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.app.SearchManager import android.content.Context @@ -15,24 +15,23 @@ import androidx.appcompat.widget.SearchView import androidx.core.view.MenuItemCompat import androidx.viewpager.widget.ViewPager import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.dialogs.UpgradeToProDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.FAQItem import com.simplemobiletools.commons.models.Release -import com.simplemobiletools.contacts.BuildConfig -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.adapters.ViewPagerAdapter -import com.simplemobiletools.contacts.dialogs.ChangeSortingDialog -import com.simplemobiletools.contacts.dialogs.ExportContactsDialog -import com.simplemobiletools.contacts.dialogs.FilterContactSourcesDialog -import com.simplemobiletools.contacts.dialogs.ImportContactsDialog -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.getTempFile -import com.simplemobiletools.contacts.fragments.MyViewPagerFragment -import com.simplemobiletools.contacts.helpers.* -import com.simplemobiletools.contacts.interfaces.RefreshContactsListener -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.BuildConfig +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.adapters.ViewPagerAdapter +import com.simplemobiletools.contacts.pro.dialogs.ChangeSortingDialog +import com.simplemobiletools.contacts.pro.dialogs.ExportContactsDialog +import com.simplemobiletools.contacts.pro.dialogs.FilterContactSourcesDialog +import com.simplemobiletools.contacts.pro.dialogs.ImportContactsDialog +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.getTempFile +import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment +import com.simplemobiletools.contacts.pro.helpers.* +import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener +import com.simplemobiletools.contacts.pro.models.Contact import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.fragment_contacts.* import kotlinx.android.synthetic.main.fragment_favorites.* @@ -75,11 +74,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { storeStateVariables() checkWhatsNewDialog() - - if (!config.wasInitialUpgradeToProShown) { - UpgradeToProDialog(this) - config.wasInitialUpgradeToProShown = true - } } private fun checkContactPermissions() { @@ -87,7 +81,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { werePermissionsHandled = true if (it) { handlePermission(PERMISSION_WRITE_CONTACTS) { - // workaround for upgrading from version 3.x to 4.x as we added a new permission from an already granted permissions group handlePermission(PERMISSION_GET_ACCOUNTS) { storeLocalAccountData() initFragments() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SelectContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/SelectContactActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt index b71913a6..d31c6462 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SelectContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.content.Intent import android.net.Uri @@ -9,16 +9,16 @@ import android.view.MenuItem import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CONTACTS -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.adapters.SelectContactsAdapter -import com.simplemobiletools.contacts.dialogs.ChangeSortingDialog -import com.simplemobiletools.contacts.dialogs.FilterContactSourcesDialog -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.getContactPublicUri -import com.simplemobiletools.contacts.extensions.getVisibleContactSources -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.SMT_PRIVATE -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.adapters.SelectContactsAdapter +import com.simplemobiletools.contacts.pro.dialogs.ChangeSortingDialog +import com.simplemobiletools.contacts.pro.dialogs.FilterContactSourcesDialog +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.getContactPublicUri +import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE +import com.simplemobiletools.contacts.pro.models.Contact import kotlinx.android.synthetic.main.activity_select_contact.* class SelectContactActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt index 082a834b..0950612b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.os.Bundle import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.dialogs.ManageVisibleFieldsDialog -import com.simplemobiletools.contacts.dialogs.ManageVisibleTabsDialog -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.helpers.ON_CLICK_CALL_CONTACT -import com.simplemobiletools.contacts.helpers.ON_CLICK_EDIT_CONTACT -import com.simplemobiletools.contacts.helpers.ON_CLICK_VIEW_CONTACT +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.dialogs.ManageVisibleFieldsDialog +import com.simplemobiletools.contacts.pro.dialogs.ManageVisibleTabsDialog +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.helpers.ON_CLICK_CALL_CONTACT +import com.simplemobiletools.contacts.pro.helpers.ON_CLICK_EDIT_CONTACT +import com.simplemobiletools.contacts.pro.helpers.ON_CLICK_VIEW_CONTACT import kotlinx.android.synthetic.main.activity_settings.* import java.util.* @@ -23,7 +23,6 @@ class SettingsActivity : SimpleActivity() { override fun onResume() { super.onResume() - setupUpgradeToPro() setupCustomizeColors() setupManageShownContactFields() setupManageShownTabs() @@ -40,13 +39,6 @@ class SettingsActivity : SimpleActivity() { updateTextColors(settings_holder) } - private fun setupUpgradeToPro() { - settings_upgrade_to_pro_holder.beGoneIf(isAProApp()) - settings_upgrade_to_pro_holder.setOnClickListener { - launchUpgradeToProIntent() - } - } - private fun setupCustomizeColors() { settings_customize_colors_holder.setOnClickListener { startCustomizationActivity() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/SimpleActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt index 7ef01301..cff6e0a3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.contacts.R +import com.simplemobiletools.contacts.pro.R open class SimpleActivity : BaseSimpleActivity() { override fun getAppIconIDs() = arrayListOf( diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SplashActivity.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/SplashActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SplashActivity.kt index 8dd51caa..0b81ec09 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SplashActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.content.Intent import com.simplemobiletools.commons.activities.BaseSplashActivity diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt index bbb36948..386aaa2d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.activities +package com.simplemobiletools.contacts.pro.activities import android.content.Intent import android.graphics.drawable.ColorDrawable @@ -10,10 +10,10 @@ import android.view.WindowManager import android.widget.RelativeLayout import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.dialogs.CallConfirmationDialog -import com.simplemobiletools.contacts.extensions.* -import com.simplemobiletools.contacts.helpers.* +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.dialogs.CallConfirmationDialog +import com.simplemobiletools.contacts.pro.extensions.* +import com.simplemobiletools.contacts.pro.helpers.* import kotlinx.android.synthetic.main.activity_view_contact.* import kotlinx.android.synthetic.main.item_event.view.* import kotlinx.android.synthetic.main.item_view_address.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt index d9d2c4ad..5a4baf46 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.adapters +package com.simplemobiletools.contacts.pro.adapters import android.graphics.drawable.Drawable import android.view.Menu @@ -19,14 +19,14 @@ import com.simplemobiletools.commons.extensions.highlightTextPart import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.dialogs.CreateNewGroupDialog -import com.simplemobiletools.contacts.extensions.* -import com.simplemobiletools.contacts.helpers.* -import com.simplemobiletools.contacts.interfaces.RefreshContactsListener -import com.simplemobiletools.contacts.interfaces.RemoveFromGroupListener -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.dialogs.CreateNewGroupDialog +import com.simplemobiletools.contacts.pro.extensions.* +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.* diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/FilterContactSourcesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/FilterContactSourcesAdapter.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/contacts/adapters/FilterContactSourcesAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/FilterContactSourcesAdapter.kt index adcb2379..9af1c7e7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/FilterContactSourcesAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/FilterContactSourcesAdapter.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.contacts.adapters +package com.simplemobiletools.contacts.pro.adapters import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.helpers.SMT_PRIVATE -import com.simplemobiletools.contacts.models.ContactSource +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE +import com.simplemobiletools.contacts.pro.models.ContactSource import kotlinx.android.synthetic.main.item_filter_contact_source.view.* import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/GroupsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/contacts/adapters/GroupsAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt index 9b83b358..f700168c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/GroupsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.adapters +package com.simplemobiletools.contacts.pro.adapters import android.view.Menu import android.view.View @@ -9,15 +9,15 @@ import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.dialogs.RenameGroupDialog -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.dbHelper -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.GROUPS_TAB_MASK -import com.simplemobiletools.contacts.interfaces.RefreshContactsListener -import com.simplemobiletools.contacts.models.Group +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.dialogs.RenameGroupDialog +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.dbHelper +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.GROUPS_TAB_MASK +import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener +import com.simplemobiletools.contacts.pro.models.Group import kotlinx.android.synthetic.main.item_group.view.* import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/RecentCallsAdapter.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/contacts/adapters/RecentCallsAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/RecentCallsAdapter.kt index 44c2c08b..5a871563 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/RecentCallsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/RecentCallsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.adapters +package com.simplemobiletools.contacts.pro.adapters import android.view.Menu import android.view.View @@ -8,13 +8,13 @@ import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.RECENTS_TAB_MASK -import com.simplemobiletools.contacts.interfaces.RefreshContactsListener -import com.simplemobiletools.contacts.models.RecentCall +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.RECENTS_TAB_MASK +import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener +import com.simplemobiletools.contacts.pro.models.RecentCall import kotlinx.android.synthetic.main.item_recent_call.view.* import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/SelectContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/contacts/adapters/SelectContactsAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt index 4832eccc..be559a55 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/SelectContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.adapters +package com.simplemobiletools.contacts.pro.adapters import android.graphics.drawable.Drawable import android.util.SparseArray @@ -15,11 +15,11 @@ import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.helpers.Config -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.helpers.Config +import com.simplemobiletools.contacts.pro.models.Contact import kotlinx.android.synthetic.main.item_add_favorite_with_number.view.* import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ViewPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ViewPagerAdapter.kt similarity index 80% rename from app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ViewPagerAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ViewPagerAdapter.kt index 8474dcfc..bbc91af0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ViewPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ViewPagerAdapter.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.contacts.adapters +package com.simplemobiletools.contacts.pro.adapters import android.view.View import android.view.ViewGroup import androidx.viewpager.widget.PagerAdapter -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.MainActivity -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.fragments.MyViewPagerFragment -import com.simplemobiletools.contacts.helpers.* +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.MainActivity +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment +import com.simplemobiletools.contacts.pro.helpers.* class ViewPagerAdapter(val activity: MainActivity) : PagerAdapter() { private val showTabs = activity.config.showTabs diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/CallConfirmationDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CallConfirmationDialog.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/CallConfirmationDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CallConfirmationDialog.kt index 42e7951c..75e82337 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/CallConfirmationDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CallConfirmationDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs -import androidx.appcompat.app.AlertDialog import android.view.animation.AnimationUtils +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.extensions.config +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.extensions.config import kotlinx.android.synthetic.main.dialog_call_confirmation.view.* class CallConfirmationDialog(val activity: BaseSimpleActivity, val callee: String, private val callback: () -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ChangeSortingDialog.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ChangeSortingDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ChangeSortingDialog.kt index 32694617..b5ef8f2c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ChangeSortingDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ChangeSortingDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity @@ -7,8 +7,8 @@ import com.simplemobiletools.commons.helpers.SORT_BY_FIRST_NAME import com.simplemobiletools.commons.helpers.SORT_BY_MIDDLE_NAME import com.simplemobiletools.commons.helpers.SORT_BY_SURNAME import com.simplemobiletools.commons.helpers.SORT_DESCENDING -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.extensions.config +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.extensions.config import kotlinx.android.synthetic.main.dialog_change_sorting.view.* class ChangeSortingDialog(val activity: BaseSimpleActivity, private val callback: () -> Unit) { @@ -18,11 +18,11 @@ class ChangeSortingDialog(val activity: BaseSimpleActivity, private val callback init { AlertDialog.Builder(activity) - .setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() }) + .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() } .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this, R.string.sort_by) - } + activity.setupDialogStuff(view, this, R.string.sort_by) + } currSorting = config.sorting setupSortRadio() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/CreateNewGroupDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/CreateNewGroupDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt index 6f0681f6..f4eb3dbb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/CreateNewGroupDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs -import androidx.appcompat.app.AlertDialog import android.view.View +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.setupDialogStuff @@ -9,12 +9,12 @@ import com.simplemobiletools.commons.extensions.showKeyboard import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.SMT_PRIVATE -import com.simplemobiletools.contacts.models.ContactSource -import com.simplemobiletools.contacts.models.Group +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE +import com.simplemobiletools.contacts.pro.models.ContactSource +import com.simplemobiletools.contacts.pro.models.Group import kotlinx.android.synthetic.main.dialog_create_new_group.view.* class CreateNewGroupDialog(val activity: BaseSimpleActivity, val callback: (newGroup: Group) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/CustomLabelDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/CustomLabelDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt index e1a11998..9f491f26 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/CustomLabelDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity @@ -6,7 +6,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.showKeyboard import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.value -import com.simplemobiletools.contacts.R +import com.simplemobiletools.contacts.pro.R import kotlinx.android.synthetic.main.dialog_custom_label.view.* class CustomLabelDialog(val activity: BaseSimpleActivity, val callback: (label: String) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ExportContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ExportContactsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt index 3f3c1784..a23aed75 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ExportContactsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs import android.view.ViewGroup import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.adapters.FilterContactSourcesAdapter -import com.simplemobiletools.contacts.extensions.getVisibleContactSources -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.SMT_PRIVATE -import com.simplemobiletools.contacts.models.ContactSource +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.adapters.FilterContactSourcesAdapter +import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE +import com.simplemobiletools.contacts.pro.models.ContactSource import kotlinx.android.synthetic.main.dialog_export_contacts.view.* import java.io.File import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/FilterContactSourcesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/FilterContactSourcesDialog.kt similarity index 77% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/FilterContactSourcesDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/FilterContactSourcesDialog.kt index e3a91b82..6fe2413f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/FilterContactSourcesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/FilterContactSourcesDialog.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.adapters.FilterContactSourcesAdapter -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.getVisibleContactSources -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.SMT_PRIVATE -import com.simplemobiletools.contacts.models.ContactSource +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.adapters.FilterContactSourcesAdapter +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE +import com.simplemobiletools.contacts.pro.models.ContactSource import kotlinx.android.synthetic.main.dialog_filter_contact_sources.view.* import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ImportContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt similarity index 59% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ImportContactsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt index 8e85e744..6ece8edb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ImportContactsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs -import androidx.appcompat.app.AlertDialog import android.view.ViewGroup +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.getPublicContactSource -import com.simplemobiletools.contacts.extensions.showContactSourcePicker -import com.simplemobiletools.contacts.helpers.SMT_PRIVATE -import com.simplemobiletools.contacts.helpers.VcfImporter -import com.simplemobiletools.contacts.helpers.VcfImporter.ImportResult.IMPORT_FAIL +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.getPublicContactSource +import com.simplemobiletools.contacts.pro.extensions.showContactSourcePicker +import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE +import com.simplemobiletools.contacts.pro.helpers.VcfImporter +import com.simplemobiletools.contacts.pro.helpers.VcfImporter.ImportResult.IMPORT_FAIL import kotlinx.android.synthetic.main.dialog_import_contacts.view.* class ImportContactsDialog(val activity: SimpleActivity, val path: String, private val callback: (refreshView: Boolean) -> Unit) { @@ -33,17 +33,17 @@ class ImportContactsDialog(val activity: SimpleActivity, val path: String, priva .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this, R.string.import_contacts) { - getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { - activity.toast(R.string.importing) - Thread { - val result = VcfImporter(activity).importContacts(path, targetContactSource) - handleParseResult(result) - dismiss() - }.start() + activity.setupDialogStuff(view, this, R.string.import_contacts) { + getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { + activity.toast(R.string.importing) + Thread { + val result = VcfImporter(activity).importContacts(path, targetContactSource) + handleParseResult(result) + dismiss() + }.start() + } + } } - } - } } private fun handleParseResult(result: VcfImporter.ImportResult) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ManageVisibleFieldsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ManageVisibleFieldsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt index 23bdd35c..d6444e1f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ManageVisibleFieldsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.views.MyAppCompatCheckbox -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.helpers.* +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.helpers.* class ManageVisibleFieldsDialog(val activity: BaseSimpleActivity) { private var view = activity.layoutInflater.inflate(R.layout.dialog_manage_visible_fields, null) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ManageVisibleTabsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleTabsDialog.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ManageVisibleTabsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleTabsDialog.kt index 381e8dca..076c1be7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/ManageVisibleTabsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleTabsDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.views.MyAppCompatCheckbox -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.helpers.* +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.helpers.* class ManageVisibleTabsDialog(val activity: BaseSimpleActivity) { private var view = activity.layoutInflater.inflate(R.layout.dialog_manage_visible_tabs, null) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/RenameGroupDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/RenameGroupDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt index ca35f293..ea9180fb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/RenameGroupDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.extensions.dbHelper -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.models.Group +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.extensions.dbHelper +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.models.Group import kotlinx.android.synthetic.main.dialog_rename_group.view.* class RenameGroupDialog(val activity: BaseSimpleActivity, val group: Group, val callback: () -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/SelectContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/SelectContactsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt index 2c2d3b6d..b01bfacd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/SelectContactsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.extensions.baseConfig import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.adapters.SelectContactsAdapter -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.getVisibleContactSources -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.adapters.SelectContactsAdapter +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources +import com.simplemobiletools.contacts.pro.models.Contact import kotlinx.android.synthetic.main.layout_select_contact.view.* class SelectContactsDialog(val activity: SimpleActivity, initialContacts: ArrayList, val selectContacts: ArrayList? = null, diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/SelectGroupsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectGroupsDialog.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/SelectGroupsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectGroupsDialog.kt index 6682d083..78a35542 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/SelectGroupsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectGroupsDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.contacts.dialogs +package com.simplemobiletools.contacts.pro.dialogs -import androidx.appcompat.app.AlertDialog import android.view.ViewGroup +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.views.MyAppCompatCheckbox -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.models.Group +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.models.Group import kotlinx.android.synthetic.main.dialog_select_groups.view.* import kotlinx.android.synthetic.main.item_checkbox.view.* import kotlinx.android.synthetic.main.item_textview.view.* @@ -29,7 +29,7 @@ class SelectGroupsDialog(val activity: SimpleActivity, val selectedGroups: Array addCreateNewGroupButton() dialog = AlertDialog.Builder(activity) - .setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() }) + .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() } .setNegativeButton(R.string.cancel, null) .create().apply { activity.setupDialogStuff(view, this) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt index b028ffb9..8fddb344 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.extensions +package com.simplemobiletools.contacts.pro.extensions import android.app.Activity import android.content.Intent @@ -11,13 +11,13 @@ import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.helpers.PERMISSION_CALL_PHONE import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.contacts.BuildConfig -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.dialogs.CallConfirmationDialog -import com.simplemobiletools.contacts.helpers.* -import com.simplemobiletools.contacts.models.Contact -import com.simplemobiletools.contacts.models.ContactSource +import com.simplemobiletools.contacts.pro.BuildConfig +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.dialogs.CallConfirmationDialog +import com.simplemobiletools.contacts.pro.helpers.* +import com.simplemobiletools.contacts.pro.models.Contact +import com.simplemobiletools.contacts.pro.models.ContactSource import java.io.File fun SimpleActivity.startCallIntent(recipient: String) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Bitmap.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Bitmap.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Bitmap.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Bitmap.kt index 55983f24..53e775da 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Bitmap.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Bitmap.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.extensions +package com.simplemobiletools.contacts.pro.extensions import android.graphics.Bitmap import java.io.ByteArrayOutputStream diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Context.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt index 45b65c72..0726550a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.extensions +package com.simplemobiletools.contacts.pro.extensions import android.content.Context import android.content.Intent @@ -11,12 +11,12 @@ import com.simplemobiletools.commons.extensions.hasPermission 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.contacts.BuildConfig -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.EditContactActivity -import com.simplemobiletools.contacts.activities.ViewContactActivity -import com.simplemobiletools.contacts.helpers.* -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.BuildConfig +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.EditContactActivity +import com.simplemobiletools.contacts.pro.activities.ViewContactActivity +import com.simplemobiletools.contacts.pro.helpers.* +import com.simplemobiletools.contacts.pro.models.Contact import java.io.File val Context.config: Config get() = Config.newInstance(applicationContext) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/String.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/String.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/contacts/extensions/String.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/String.kt index f6d41a2b..b35d3b9a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/String.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/String.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.contacts.extensions +package com.simplemobiletools.contacts.pro.extensions import android.widget.TextView import com.simplemobiletools.commons.helpers.getDateFormats -import com.simplemobiletools.contacts.helpers.PHONE_NUMBER_PATTERN +import com.simplemobiletools.contacts.pro.helpers.PHONE_NUMBER_PATTERN import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat import java.text.DateFormat diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/ContactsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/contacts/fragments/ContactsFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt index b6afeed0..dd0009d5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/ContactsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.contacts.fragments +package com.simplemobiletools.contacts.pro.fragments import android.content.Context import android.content.Intent import android.util.AttributeSet -import com.simplemobiletools.contacts.activities.EditContactActivity +import com.simplemobiletools.contacts.pro.activities.EditContactActivity class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) { override fun fabClicked() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/FavoritesFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt similarity index 69% rename from app/src/main/kotlin/com/simplemobiletools/contacts/fragments/FavoritesFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt index a34fba56..eb18ae40 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/FavoritesFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.contacts.fragments +package com.simplemobiletools.contacts.pro.fragments import android.content.Context import android.util.AttributeSet -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.dialogs.SelectContactsDialog -import com.simplemobiletools.contacts.helpers.ContactsHelper -import com.simplemobiletools.contacts.helpers.FAVORITES_TAB_MASK +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.dialogs.SelectContactsDialog +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.FAVORITES_TAB_MASK class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) { override fun fabClicked() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/GroupsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt similarity index 66% rename from app/src/main/kotlin/com/simplemobiletools/contacts/fragments/GroupsFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt index 7b40710a..87178c5f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/GroupsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.contacts.fragments +package com.simplemobiletools.contacts.pro.fragments import android.content.Context import android.util.AttributeSet -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.dialogs.CreateNewGroupDialog -import com.simplemobiletools.contacts.helpers.GROUPS_TAB_MASK +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.dialogs.CreateNewGroupDialog +import com.simplemobiletools.contacts.pro.helpers.GROUPS_TAB_MASK class GroupsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) { override fun fabClicked() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt index 211cc78f..c35c676d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.fragments +package com.simplemobiletools.contacts.pro.fragments import android.content.Context import android.content.Intent @@ -9,19 +9,19 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.SORT_BY_FIRST_NAME import com.simplemobiletools.commons.helpers.SORT_BY_SURNAME -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.activities.GroupContactsActivity -import com.simplemobiletools.contacts.activities.MainActivity -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.adapters.ContactsAdapter -import com.simplemobiletools.contacts.adapters.GroupsAdapter -import com.simplemobiletools.contacts.adapters.RecentCallsAdapter -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.contactClicked -import com.simplemobiletools.contacts.extensions.getVisibleContactSources -import com.simplemobiletools.contacts.helpers.* -import com.simplemobiletools.contacts.models.Contact -import com.simplemobiletools.contacts.models.Group +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.activities.GroupContactsActivity +import com.simplemobiletools.contacts.pro.activities.MainActivity +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter +import com.simplemobiletools.contacts.pro.adapters.GroupsAdapter +import com.simplemobiletools.contacts.pro.adapters.RecentCallsAdapter +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.contactClicked +import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources +import com.simplemobiletools.contacts.pro.helpers.* +import com.simplemobiletools.contacts.pro.models.Contact +import com.simplemobiletools.contacts.pro.models.Group import kotlinx.android.synthetic.main.fragment_layout.view.* abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) : CoordinatorLayout(context, attributeSet) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/RecentsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/RecentsFragment.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/contacts/fragments/RecentsFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/RecentsFragment.kt index 54e09773..12678e9f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/RecentsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/RecentsFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.fragments +package com.simplemobiletools.contacts.pro.fragments import android.content.Context import android.content.Intent @@ -7,15 +7,15 @@ import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.hasPermission import com.simplemobiletools.commons.helpers.PERMISSION_READ_CALL_LOG import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CALL_LOG -import com.simplemobiletools.contacts.activities.EditContactActivity -import com.simplemobiletools.contacts.adapters.RecentCallsAdapter -import com.simplemobiletools.contacts.extensions.applyRegexFiltering -import com.simplemobiletools.contacts.extensions.contactClicked -import com.simplemobiletools.contacts.helpers.IS_FROM_SIMPLE_CONTACTS -import com.simplemobiletools.contacts.helpers.KEY_PHONE -import com.simplemobiletools.contacts.helpers.RECENTS_TAB_MASK -import com.simplemobiletools.contacts.models.Contact -import com.simplemobiletools.contacts.models.RecentCall +import com.simplemobiletools.contacts.pro.activities.EditContactActivity +import com.simplemobiletools.contacts.pro.adapters.RecentCallsAdapter +import com.simplemobiletools.contacts.pro.extensions.applyRegexFiltering +import com.simplemobiletools.contacts.pro.extensions.contactClicked +import com.simplemobiletools.contacts.pro.helpers.IS_FROM_SIMPLE_CONTACTS +import com.simplemobiletools.contacts.pro.helpers.KEY_PHONE +import com.simplemobiletools.contacts.pro.helpers.RECENTS_TAB_MASK +import com.simplemobiletools.contacts.pro.models.Contact +import com.simplemobiletools.contacts.pro.models.RecentCall import kotlinx.android.synthetic.main.fragment_layout.view.* class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt index ae605eb7..bd1fbcd3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.helpers +package com.simplemobiletools.contacts.pro.helpers import android.content.Context import com.simplemobiletools.commons.helpers.BaseConfig diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt index ba870934..9073d347 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.helpers +package com.simplemobiletools.contacts.pro.helpers import android.provider.ContactsContract.CommonDataKinds diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt similarity index 99% rename from app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt index cdffaec2..57447ffc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.helpers +package com.simplemobiletools.contacts.pro.helpers import android.accounts.Account import android.accounts.AccountManager @@ -18,10 +18,10 @@ import android.text.TextUtils import android.util.SparseArray import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.extensions.* -import com.simplemobiletools.contacts.models.* -import com.simplemobiletools.contacts.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.overloads.times import java.text.SimpleDateFormat import java.util.* import kotlin.collections.ArrayList diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/DBHelper.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/DBHelper.kt index b73283c6..645c1a61 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/DBHelper.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.helpers +package com.simplemobiletools.contacts.pro.helpers import android.app.Activity import android.content.ContentValues @@ -16,11 +16,11 @@ import com.simplemobiletools.commons.extensions.getBlobValue import com.simplemobiletools.commons.extensions.getIntValue import com.simplemobiletools.commons.extensions.getLongValue import com.simplemobiletools.commons.extensions.getStringValue -import com.simplemobiletools.contacts.extensions.applyRegexFiltering -import com.simplemobiletools.contacts.extensions.config -import com.simplemobiletools.contacts.extensions.getByteArray -import com.simplemobiletools.contacts.extensions.getPhotoThumbnailSize -import com.simplemobiletools.contacts.models.* +import com.simplemobiletools.contacts.pro.extensions.applyRegexFiltering +import com.simplemobiletools.contacts.pro.extensions.config +import com.simplemobiletools.contacts.pro.extensions.getByteArray +import com.simplemobiletools.contacts.pro.extensions.getPhotoThumbnailSize +import com.simplemobiletools.contacts.pro.models.* class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) { private val CONTACTS_TABLE_NAME = "contacts" diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/QuotedPrintable.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/QuotedPrintable.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/contacts/helpers/QuotedPrintable.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/QuotedPrintable.kt index ce974b81..e39bf43b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/QuotedPrintable.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/QuotedPrintable.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.helpers +package com.simplemobiletools.contacts.pro.helpers import java.io.ByteArrayOutputStream import java.net.URLEncoder diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt index 32c101f3..485010a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.helpers +package com.simplemobiletools.contacts.pro.helpers import android.net.Uri import android.provider.ContactsContract.CommonDataKinds @@ -8,11 +8,11 @@ import com.simplemobiletools.commons.extensions.getFileOutputStream import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.commons.extensions.toFileDirItem import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.contacts.R -import com.simplemobiletools.contacts.extensions.getByteArray -import com.simplemobiletools.contacts.extensions.getDateTimeFromDateString -import com.simplemobiletools.contacts.helpers.VcfExporter.ExportResult.EXPORT_FAIL -import com.simplemobiletools.contacts.models.Contact +import com.simplemobiletools.contacts.pro.R +import com.simplemobiletools.contacts.pro.extensions.getByteArray +import com.simplemobiletools.contacts.pro.extensions.getDateTimeFromDateString +import com.simplemobiletools.contacts.pro.helpers.VcfExporter.ExportResult.EXPORT_FAIL +import com.simplemobiletools.contacts.pro.models.Contact import ezvcard.Ezvcard import ezvcard.VCard import ezvcard.parameter.ImageType diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt index aa824798..9102abdb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfImporter.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.contacts.helpers +package com.simplemobiletools.contacts.pro.helpers import android.graphics.Bitmap import android.graphics.BitmapFactory import android.provider.ContactsContract.CommonDataKinds import android.widget.Toast import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.contacts.activities.SimpleActivity -import com.simplemobiletools.contacts.extensions.dbHelper -import com.simplemobiletools.contacts.extensions.getCachePhoto -import com.simplemobiletools.contacts.extensions.getCachePhotoUri -import com.simplemobiletools.contacts.helpers.VcfImporter.ImportResult.* -import com.simplemobiletools.contacts.models.* +import com.simplemobiletools.contacts.pro.activities.SimpleActivity +import com.simplemobiletools.contacts.pro.extensions.dbHelper +import com.simplemobiletools.contacts.pro.extensions.getCachePhoto +import com.simplemobiletools.contacts.pro.extensions.getCachePhotoUri +import com.simplemobiletools.contacts.pro.helpers.VcfImporter.ImportResult.* +import com.simplemobiletools.contacts.pro.models.* import ezvcard.Ezvcard import ezvcard.VCard import org.joda.time.DateTime diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/interfaces/RefreshContactsListener.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt similarity index 61% rename from app/src/main/kotlin/com/simplemobiletools/contacts/interfaces/RefreshContactsListener.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt index 817e6074..0d59b444 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/interfaces/RefreshContactsListener.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.interfaces +package com.simplemobiletools.contacts.pro.interfaces interface RefreshContactsListener { fun refreshContacts(refreshTabsMask: Int) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RemoveFromGroupListener.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RemoveFromGroupListener.kt new file mode 100644 index 00000000..753f0013 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RemoveFromGroupListener.kt @@ -0,0 +1,7 @@ +package com.simplemobiletools.contacts.pro.interfaces + +import com.simplemobiletools.contacts.pro.models.Contact + +interface RemoveFromGroupListener { + fun removeFromGroup(contacts: ArrayList) +} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Address.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Address.kt similarity index 59% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/Address.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Address.kt index cc07321b..3dc9ae35 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Address.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Address.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models data class Address(var value: String, var type: Int, var label: String) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt index 2ed8b08a..adad262d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models import android.graphics.Bitmap 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.extensions.applyRegexFiltering +import com.simplemobiletools.contacts.pro.extensions.applyRegexFiltering data class Contact(val id: Int, var prefix: String, var firstName: String, var middleName: String, var surname: String, var suffix: String, var nickname: String, var photoUri: String, var phoneNumbers: ArrayList, var emails: ArrayList, var addresses: ArrayList
, diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/ContactSource.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/ContactSource.kt similarity index 55% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/ContactSource.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/ContactSource.kt index b37197e8..f1a4ba0b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/ContactSource.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/ContactSource.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models data class ContactSource(var name: String, var type: String) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Email.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Email.kt similarity index 58% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/Email.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Email.kt index caeafc0d..39bdaad3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Email.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Email.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models data class Email(var value: String, var type: Int, var label: String) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Event.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Event.kt similarity index 50% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/Event.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Event.kt index c28a8eb9..fc3fd7f7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Event.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Event.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models data class Event(var value: String, var type: Int) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Group.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Group.kt similarity index 75% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/Group.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Group.kt index 1b53d894..c36635bf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Group.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Group.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models -import com.simplemobiletools.contacts.helpers.FIRST_GROUP_ID +import com.simplemobiletools.contacts.pro.helpers.FIRST_GROUP_ID import java.io.Serializable data class Group(var id: Long, var title: String, var contactsCount: Int = 0) : Serializable { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/IM.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/IM.kt similarity index 57% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/IM.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/IM.kt index f646e9f4..e3f7e0ab 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/IM.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/IM.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models data class IM(var value: String, var type: Int, var label: String) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Organization.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Organization.kt similarity index 77% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/Organization.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Organization.kt index 6c311db9..91697c25 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Organization.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Organization.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models data class Organization(var company: String, var jobPosition: String) { fun isEmpty() = company.isEmpty() && jobPosition.isEmpty() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/PhoneNumber.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/PhoneNumber.kt similarity index 60% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/PhoneNumber.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/PhoneNumber.kt index 1dd39896..b95127aa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/PhoneNumber.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/PhoneNumber.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models data class PhoneNumber(var value: String, var type: Int, var label: String) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/RecentCall.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/RecentCall.kt similarity index 65% rename from app/src/main/kotlin/com/simplemobiletools/contacts/models/RecentCall.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/RecentCall.kt index e009be76..536599e8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/RecentCall.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/RecentCall.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.contacts.models +package com.simplemobiletools.contacts.pro.models data class RecentCall(var id: Int, var number: String, var dateTime: String, var name: String?) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/overloads/String.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/overloads/String.kt similarity index 77% rename from app/src/main/kotlin/com/simplemobiletools/contacts/overloads/String.kt rename to app/src/main/kotlin/com/simplemobiletools/contacts/pro/overloads/String.kt index 5823b6df..74944090 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/overloads/String.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/overloads/String.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.contacts.overloads +package com.simplemobiletools.contacts.pro.overloads operator fun String.times(x: Int): String { val stringBuilder = StringBuilder() diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 06c0d18e..167eb122 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -12,28 +12,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - + diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml index 8ba99a90..03380853 100644 --- a/app/src/main/res/layout/fragment_favorites.xml +++ b/app/src/main/res/layout/fragment_favorites.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/fragment_groups.xml b/app/src/main/res/layout/fragment_groups.xml index 75390472..f5d42783 100644 --- a/app/src/main/res/layout/fragment_groups.xml +++ b/app/src/main/res/layout/fragment_groups.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/fragment_recents.xml b/app/src/main/res/layout/fragment_recents.xml index 4c7e37b1..2849fa32 100644 --- a/app/src/main/res/layout/fragment_recents.xml +++ b/app/src/main/res/layout/fragment_recents.xml @@ -1,5 +1,5 @@ - - + diff --git a/build.gradle b/build.gradle index eca330da..4ddb226d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.3.0' repositories { google()