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()