Merge pull request #18 from SimpleMobileTools/master

upd

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 ==========
 
+Version 5.1.1 *(2018-11-05)*
+----------------------------
+
+ * This version of the app is no longer maintained. Please upgrade to the Pro version. It is free till Nov 13 2018. You can find the Upgrade button at the top of the app Settings.
+
 Version 5.1.0 *(2018-10-28)*
 ----------------------------
 

app/build.gradle

@@ -7,11 +7,11 @@ android {
     buildToolsVersion "28.0.3"
 
     defaultConfig {
-        applicationId "com.simplemobiletools.contacts"
+        applicationId "com.simplemobiletools.contacts.pro"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 34
-        versionName "5.1.0"
+        versionCode 35
+        versionName "5.1.1"
         setProperty("archivesBaseName", "contacts")
     }
 
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.2.11'
+    implementation 'com.simplemobiletools:commons:5.3.11'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.simplemobiletools.contacts"
+    package="com.simplemobiletools.contacts.pro"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.CALL_PHONE"/>

app/src/main/kotlin/com/simplemobiletools/contacts/interfaces/RemoveFromGroupListener.kt

@@ -1,7 +0,0 @@
-package com.simplemobiletools.contacts.interfaces
-
-import com.simplemobiletools.contacts.models.Contact
-
-interface RemoveFromGroupListener {
-    fun removeFromGroup(contacts: ArrayList<Contact>)
-}

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

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

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

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.*

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 {

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

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
@@ -19,19 +19,19 @@ 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.*
@@ -81,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()

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

app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt

@@ -1,19 +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.beVisibleIf
-import com.simplemobiletools.commons.extensions.isThankYouInstalled
-import com.simplemobiletools.commons.extensions.launchPurchaseThankYouIntent
-import com.simplemobiletools.commons.extensions.updateTextColors
+import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.models.RadioItem
-import com.simplemobiletools.contacts.R
-import com.simplemobiletools.contacts.dialogs.ManageVisibleFieldsDialog
-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.*
 
@@ -26,12 +23,10 @@ class SettingsActivity : SimpleActivity() {
     override fun onResume() {
         super.onResume()
 
-        setupPurchaseThankYou()
         setupCustomizeColors()
         setupManageShownContactFields()
         setupManageShownTabs()
         setupUseEnglish()
-        setupAvoidWhatsNew()
         setupShowInfoBubble()
         setupShowContactThumbnails()
         setupShowPhoneNumbers()
@@ -44,13 +39,6 @@ class SettingsActivity : SimpleActivity() {
         updateTextColors(settings_holder)
     }
 
-    private fun setupPurchaseThankYou() {
-        settings_purchase_thank_you_holder.beVisibleIf(config.appRunCount > 10 && !isThankYouInstalled())
-        settings_purchase_thank_you_holder.setOnClickListener {
-            launchPurchaseThankYouIntent()
-        }
-    }
-
     private fun setupCustomizeColors() {
         settings_customize_colors_holder.setOnClickListener {
             startCustomizationActivity()
@@ -79,14 +67,6 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupAvoidWhatsNew() {
-        settings_avoid_whats_new.isChecked = config.avoidWhatsNew
-        settings_avoid_whats_new_holder.setOnClickListener {
-            settings_avoid_whats_new.toggle()
-            config.avoidWhatsNew = settings_avoid_whats_new.isChecked
-        }
-    }
-
     private fun setupShowInfoBubble() {
         settings_show_info_bubble.isChecked = config.showInfoBubble
         settings_show_info_bubble_holder.setOnClickListener {

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(

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

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.*

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.*
 

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.*
 

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.*
 

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.*
 

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.*
 

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

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

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

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

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

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.*

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.*
 

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

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)

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)

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

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<Contact>, val selectContacts: ArrayList<Contact>? = null,

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)

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

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

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)

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

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

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

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

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

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

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

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
 

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

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"

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

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

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

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)

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<Contact>)
+}

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)

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<PhoneNumber>, var emails: ArrayList<Email>, var addresses: ArrayList<Address>,

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)

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)

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)

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 {

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)

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

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)

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

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

app/src/main/res/layout/activity_settings.xml

@@ -12,28 +12,6 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/settings_purchase_thank_you_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
-            android:paddingBottom="@dimen/activity_margin">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_purchase_thank_you"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
-                android:text="@string/purchase_simple_thank_you"/>
-
-        </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/settings_customize_colors_holder"
             android:layout_width="match_parent"
@@ -124,30 +102,6 @@
 
         </RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/settings_avoid_whats_new_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
-            android:paddingBottom="@dimen/activity_margin">
-
-            <com.simplemobiletools.commons.views.MySwitchCompat
-                android:id="@+id/settings_avoid_whats_new"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
-                android:text="@string/avoid_whats_new"
-                app:switchPadding="@dimen/medium_margin"/>
-
-        </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/settings_show_info_bubble_holder"
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_contacts.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.contacts.fragments.ContactsFragment
+<com.simplemobiletools.contacts.pro.fragments.ContactsFragment
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/contacts_fragment"
     android:layout_width="match_parent"
@@ -7,4 +7,4 @@
 
     <include layout="@layout/fragment_layout"/>
 
-</com.simplemobiletools.contacts.fragments.ContactsFragment>
+</com.simplemobiletools.contacts.pro.fragments.ContactsFragment>

app/src/main/res/layout/fragment_favorites.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.contacts.fragments.FavoritesFragment
+<com.simplemobiletools.contacts.pro.fragments.FavoritesFragment
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/favorites_fragment"
     android:layout_width="match_parent"
@@ -7,4 +7,4 @@
 
     <include layout="@layout/fragment_layout"/>
 
-</com.simplemobiletools.contacts.fragments.FavoritesFragment>
+</com.simplemobiletools.contacts.pro.fragments.FavoritesFragment>

app/src/main/res/layout/fragment_groups.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.contacts.fragments.GroupsFragment
+<com.simplemobiletools.contacts.pro.fragments.GroupsFragment
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/groups_fragment"
     android:layout_width="match_parent"
@@ -7,4 +7,4 @@
 
     <include layout="@layout/fragment_layout"/>
 
-</com.simplemobiletools.contacts.fragments.GroupsFragment>
+</com.simplemobiletools.contacts.pro.fragments.GroupsFragment>

app/src/main/res/layout/fragment_recents.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.contacts.fragments.RecentsFragment
+<com.simplemobiletools.contacts.pro.fragments.RecentsFragment
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/recents_fragment"
     android:layout_width="match_parent"
@@ -7,4 +7,4 @@
 
     <include layout="@layout/fragment_layout"/>
 
-</com.simplemobiletools.contacts.fragments.RecentsFragment>
+</com.simplemobiletools.contacts.pro.fragments.RecentsFragment>

app/src/main/res/values-eu/strings.xml

@@ -0,0 +1,126 @@
+<resources>
+    <string name="app_name">Kontaktu sinpleak</string>
+    <string name="app_launcher_name">Kontaktuak</string>
+    <string name="address">Helbidea</string>
+    <string name="inserting">Txertatzen...</string>
+    <string name="updating">Eguneratzen...</string>
+    <string name="phone_storage">Telefono memoria</string>
+    <string name="phone_storage_hidden">Telefono memoria (beste aplikazioentzat ikustezina)</string>
+    <string name="company">Enpresa</string>
+    <string name="job_position">Lanpostua</string>
+    <string name="website">Webgunea</string>
+    <string name="send_sms_to_contacts">Bidali SMSa kontaktuei</string>
+    <string name="send_email_to_contacts">Bidali emaila kontaktuei</string>
+    <string name="send_sms_to_group">Bidali SMSa taldera</string>
+    <string name="send_email_to_group">Bidali emaila taldeari</string>
+    <string name="call_person">%s deitu</string>
+    <string name="request_the_required_permissions">Eskatu beharrezko baimenak</string>
+
+    <string name="new_contact">Kontaktu berria</string>
+    <string name="edit_contact">Editatu taldea</string>
+    <string name="select_contact">Hautatu kontaktuak</string>
+    <string name="select_contacts">Hautatu kontaktuak</string>
+    <string name="first_name">Izena</string>
+    <string name="middle_name">Erdiko izena</string>
+    <string name="surname">Abizena</string>
+
+    <!-- Groups -->
+    <string name="no_groups">Talderik ez</string>
+    <string name="create_new_group">Sortu talde berria</string>
+    <string name="remove_from_group">Kendu taldetik</string>
+    <string name="no_group_participants">Talde hau hutsik dago</string>
+    <string name="add_contacts">Gehitu kontaktuak</string>
+    <string name="no_group_created">Ez dago kontaktuen talderik gailu honetan</string>
+    <string name="create_group">Sortu taldea</string>
+    <string name="add_to_group">Gehitu taldera</string>
+    <string name="create_group_under_account">Kontu honetarako taldea sortu</string>
+
+    <!-- Photo -->
+    <string name="take_photo">Atera argazkia</string>
+    <string name="choose_photo">Hautatu argazkia</string>
+    <string name="remove_photo">Kendu argazkia</string>
+
+    <!-- Settings -->
+    <string name="start_name_with_surname">Abizenaren arabera sailkatu</string>
+    <string name="show_phone_numbers">Erakutsi telefono zenbakiak pantaila nagusian</string>
+    <string name="on_contact_click">Kontaktu sakatzean</string>
+    <string name="call_contact">Kontaktua deitu</string>
+    <string name="view_contact">Ikusi kontaktu detaileak</string>
+    <string name="manage_shown_contact_fields">Kudeatu erakutsitako kontaktu eremuak</string>
+    <string name="filter_duplicates">Saiatu bikoiztutako kontaktuak iragazten</string>
+    <string name="manage_shown_tabs">Kudeatu erakutsitako fitxak</string>
+    <string name="contacts">Kontaktuak</string>
+    <string name="favorites">Gogokoak</string>
+    <string name="recent_calls">Azken deiak</string>
+    <string name="show_call_confirmation_dialog">Erakutsi egiaztatze mezua dei bat hasi baino lehen</string>
+
+    <!-- Emails -->
+    <string name="email">Emaila</string>
+    <string name="home">Etxea</string>
+    <string name="work">Lana</string>
+    <string name="other">Besterik</string>
+
+    <!-- Phone numbers -->
+    <string name="number">Zenbakia</string>
+    <string name="mobile">Mugikorra</string>
+    <string name="main_number">Nagusia</string>
+    <string name="work_fax">Laneko faxa</string>
+    <string name="home_fax">Etxeko faxa</string>
+    <string name="no_phone_number_found">Ez da telefono zenbakirik aurkitu</string>
+
+    <!-- Events -->
+    <string name="birthday">Urtebetetzea</string>
+    <string name="anniversary">Urteurrena</string>
+
+    <!-- Favorites -->
+    <string name="no_favorites">Ez duzu oraindik gogokorik gehitu.</string>
+    <string name="add_favorites">Gehitu gogokoak</string>
+    <string name="add_to_favorites">Gehitu gogokoen zerrendara</string>
+    <string name="remove_from_favorites">Kendu gogokoenetik</string>
+    <string name="must_be_at_edit">Kontaktu bat aldatzeko edizio pantailan egon behar zara</string>
+
+    <!-- Search -->
+    <string name="search_contacts">Bilatu kontaktuak</string>
+    <string name="search_favorites">Bilatu gogokoak</string>
+
+    <!-- Export / Import -->
+    <string name="import_contacts">Inportatu kontaktuak</string>
+    <string name="export_contacts">Esportatu kontaktuak</string>
+    <string name="import_contacts_from_vcf">Inportatu .vcf fitxategiko kontaktuak</string>
+    <string name="export_contacts_to_vcf">Esportatu kontaktua .vcf fitxategi batera</string>
+    <string name="filename_without_vcf">Fitxategi izena (.vcf gabe)</string>
+
+    <!-- Visible fields -->
+    <string name="select_fields_to_show">Hautatu erakusteko eremuak</string>
+    <string name="prefix">Aurrizkia</string>
+    <string name="suffix">Atzizkia</string>
+    <string name="phone_numbers">Telefono zenbakiak</string>
+    <string name="emails">Emailak</string>
+    <string name="addresses">Helbideak</string>
+    <string name="events">Ekitaldiak (urtebetetzeak, urteurrenak)</string>
+    <string name="notes">Oharrak</string>
+    <string name="organization">Erakundea</string>
+    <string name="websites">Webguneak</string>
+    <string name="groups">Taldeak</string>
+    <string name="contact_source">Kontaktu jatorria</string>
+
+    <!-- FAQ -->
+    <string name="faq_1_title">Aldatu ditzaket kontaktuetan ikusgarri dauden eremuak?</string>
+    <string name="faq_1_text">Bai, joan hona: Ezarpenak -> Kudeatu erakutsitako kontaktu eremuan. Hor hautatu dezakezu zein eremu nahi duzun ikusgarri izatea. Batzuk desaktibatuta daude era lehenetsian, berri batzuk aurkitu ditzakezu.</string>
+
+    <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
+    <!-- Short description has to have less than 80 chars -->
+    <string name="app_short_description">Kontaktuak kudeatzeko aplikazio iragarkigabea.</string>
+    <string name="app_long_description">
+        Aplikazio sinplea kontaktuak sortu eta kudeatzeko. Kontaktuak zure gailuan baino esin dira gorde, baina sinkronizagarriak dira Google-n edo beste kontuen bitartez. Zure kontaktu gogokoenak zerrenda banandu batean erakutsi ditzakezu.
+ 
+        Erabiltzaileen emailak eta ekitaldiak kudeatzeko erabili dezakezu ere. Aukera duzu parametro askoren arabera sailkatzeko, tartean abizena izen gisa erakustea.
+        
+        Ez ditu iragarkirik ezta beharrezkoak ez diren baimenak. Guztiz kode irekikoa da eta koloreak pertsonalizagarriak dira. Aplikazio hau sorta handiago bateko zati bat baino ez da. Gainontzekoak ikusteko, jo https://www.simplemobiletools.com webgunera
+    </string>
+
+    <!--
+        Haven't found some strings? There's more at
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
+    -->
+</resources>

app/src/main/res/values-ja/strings.xml

@@ -19,9 +19,9 @@
     <string name="add_to_existing_contact">既存の連絡先に追加</string>
 
     <!-- Placeholders -->
-    <string name="no_contacts_found">No contacts found</string>
-    <string name="no_contacts_with_emails">No contacts with emails have been found</string>
-    <string name="no_contacts_with_phone_numbers">No contacts with phone numbers have been found</string>
+    <string name="no_contacts_found">連絡先が見つかりません</string>
+    <string name="no_contacts_with_emails">メールアドレスが登録された連絡先が見つかりません</string>
+    <string name="no_contacts_with_phone_numbers">電話番号が登録された連絡先が見つかりません</string>
 
     <string name="new_contact">新しい連絡先</string>
     <string name="edit_contact">連絡先を編集</string>
@@ -30,7 +30,7 @@
     <string name="first_name">名</string>
     <string name="middle_name">ミドルネーム</string>
     <string name="surname">姓</string>
-    <string name="nickname">Nickname</string>
+    <string name="nickname">ニックネーム</string>
 
     <!-- Groups -->
     <string name="no_groups">グループなし</string>
@@ -62,7 +62,7 @@
     <string name="favorites">お気に入り</string>
     <string name="recent_calls">Recent calls</string>
     <string name="show_call_confirmation_dialog">発信する前に確認ダイアログを表示する</string>
-    <string name="show_only_contacts_with_numbers">Show only contacts with phone numbers</string>
+    <string name="show_only_contacts_with_numbers">電話番号が登録された連絡先のみ表示する</string>
 
     <!-- Emails -->
     <string name="email">メール</string>

app/src/main/res/values-tr/strings.xml

@@ -13,15 +13,15 @@
     <string name="send_email_to_contacts">Kişilere e-posta gönder</string>
     <string name="send_sms_to_group">Gruba SMS gönder</string>
     <string name="send_email_to_group">Gruba e-posta gönder</string>
-    <string name="call_person">Call %s</string>
-    <string name="request_the_required_permissions">Request the required permissions</string>
-    <string name="create_new_contact">Create new contact</string>
-    <string name="add_to_existing_contact">Add to an existing contact</string>
+    <string name="call_person">%s kişisini ara</string>
+    <string name="request_the_required_permissions">Gerekli izinleri iste</string>
+    <string name="create_new_contact">Yeni kişi oluştur</string>
+    <string name="add_to_existing_contact">Mevcut bir kişiye ekle</string>
 
     <!-- Placeholders -->
-    <string name="no_contacts_found">No contacts found</string>
-    <string name="no_contacts_with_emails">No contacts with emails have been found</string>
-    <string name="no_contacts_with_phone_numbers">No contacts with phone numbers have been found</string>
+    <string name="no_contacts_found">Kişi bulunamadı</string>
+    <string name="no_contacts_with_emails">E-posta ile hiç bağlantı bulunamadı</string>
+    <string name="no_contacts_with_phone_numbers">Telefon numaralarını içeren kişi bulunamadı</string>
 
     <string name="new_contact">Yeni kişi</string>
     <string name="edit_contact">Kişiyi düzenle</string>
@@ -30,7 +30,7 @@
     <string name="first_name">Adı</string>
     <string name="middle_name">Göbek adı</string>
     <string name="surname">Soyadı</string>
-    <string name="nickname">Nickname</string>
+    <string name="nickname">Takma adı</string>
 
     <!-- Groups -->
     <string name="no_groups">Grup yok</string>
@@ -57,12 +57,12 @@
     <string name="view_contact">Kişi bilgilerini göster</string>
     <string name="manage_shown_contact_fields">Görüntülenecek kişi alanlarını yönet</string>
     <string name="filter_duplicates">Çift kişileri filtrelemeyi dene</string>
-    <string name="manage_shown_tabs">Manage shown tabs</string>
-    <string name="contacts">Contacts</string>
-    <string name="favorites">Favorites</string>
-    <string name="recent_calls">Recent calls</string>
-    <string name="show_call_confirmation_dialog">Show a call confirmation dialog before initiating a call</string>
-    <string name="show_only_contacts_with_numbers">Show only contacts with phone numbers</string>
+    <string name="manage_shown_tabs">Gösterilen sekmeleri yönet</string>
+    <string name="contacts">Kişiler</string>
+    <string name="favorites">Favoriler</string>
+    <string name="recent_calls">Son aramalar</string>
+    <string name="show_call_confirmation_dialog">Arama başlatmadan önce arama onayı penceresi göster</string>
+    <string name="show_only_contacts_with_numbers">Sadece telefon numaralarını içeren kişileri göster</string>
 
     <!-- Emails -->
     <string name="email">E-posta</string>
@@ -104,8 +104,8 @@
     <string name="filename_without_vcf">Dosya adı (.vcf olmadan)</string>
 
     <!-- Dialpad -->
-    <string name="dialpad">Dialpad</string>
-    <string name="add_number_to_contact">Add number to contact</string>
+    <string name="dialpad">Tuş takımı</string>
+    <string name="add_number_to_contact">Kişiye numara ekle</string>
 
     <!-- Visible fields -->
     <string name="select_fields_to_show">Görüntülenecek alanları seç</string>
@@ -120,7 +120,7 @@
     <string name="websites">Web siteleri</string>
     <string name="groups">Gruplar</string>
     <string name="contact_source">Kişi kaynağı</string>
-    <string name="instant_messaging">Instant messaging (IM)</string>
+    <string name="instant_messaging">Anlık mesajlaşma (IM)</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Rehberde görüntülenecek alanları değiştirmek istiyorum. Bunu yapabilir miyim?</string>

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