diff --git a/app/build.gradle b/app/build.gradle
index 6d2f8dba..d372ae24 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
applicationId "com.simplemobiletools.contacts.pro"
minSdkVersion 21
targetSdkVersion 28
- versionCode 40
- versionName "6.2.0"
+ versionCode 45
+ versionName "6.3.4"
setProperty("archivesBaseName", "contacts")
}
@@ -51,12 +51,12 @@ android {
}
dependencies {
- implementation 'com.simplemobiletools:commons:5.6.5'
+ implementation 'com.simplemobiletools:commons:5.16.7'
implementation 'joda-time:joda-time:2.10.1'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
- kapt "androidx.room:room-compiler:2.0.0"
- implementation "androidx.room:room-runtime:2.0.0"
- annotationProcessor "androidx.room:room-compiler:2.0.0"
+ kapt "androidx.room:room-compiler:2.1.0"
+ implementation "androidx.room:room-runtime:2.1.0"
+ annotationProcessor "androidx.room:room-compiler:2.1.0"
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fd10164a..440b683b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,8 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_launcher_name"
android:roundIcon="@mipmap/ic_launcher"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ android:supportsRtl="true">
{
override fun onResourceReady(resource: Drawable?, model: Any?, target: Target?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
photoView.setPadding(0, 0, 0, 0)
+ photoView.background = ColorDrawable(0)
return false
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt
index 39ce6b69..3cd2eac6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt
@@ -8,6 +8,7 @@ import android.os.Build
import android.os.Bundle
import android.telecom.PhoneAccount
import android.telecom.TelecomManager
+import android.view.Menu
import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.contacts.pro.R
@@ -37,6 +38,11 @@ class DialerActivity : SimpleActivity() {
}
}
+ override fun onCreateOptionsMenu(menu: Menu): Boolean {
+ updateMenuItemColors(menu)
+ return super.onCreateOptionsMenu(menu)
+ }
+
@SuppressLint("MissingPermission")
private fun initOutgoingCall() {
try {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt
index 56ee61cd..4227fd30 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt
@@ -36,6 +36,10 @@ class DialpadActivity : SimpleActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_dialpad)
+ if (checkAppSideloading()) {
+ return
+ }
+
dialpad_0_holder.setOnClickListener { dialpadPressed("0", it) }
dialpad_1.setOnClickListener { dialpadPressed("1", it) }
dialpad_2.setOnClickListener { dialpadPressed("2", it) }
@@ -56,7 +60,7 @@ class DialpadActivity : SimpleActivity() {
ContactsHelper(this).getContacts { gotContacts(it) }
disableKeyboardPopping()
- val callIcon = resources.getColoredDrawableWithColor(R.drawable.ic_phone_huge, if (isBlackAndWhiteTheme()) Color.BLACK else Color.WHITE)
+ val callIcon = resources.getColoredDrawableWithColor(R.drawable.ic_phone_vector, if (isBlackAndWhiteTheme()) Color.BLACK else config.primaryColor.getContrastColor())
dialpad_call_button.setImageDrawable(callIcon)
dialpad_call_button.background.applyColorFilter(getAdjustedPrimaryColor())
@@ -74,6 +78,7 @@ class DialpadActivity : SimpleActivity() {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_dialpad, menu)
+ updateMenuItemColors(menu)
return true
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
index a25b59d1..821ffbe9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
@@ -6,7 +6,6 @@ import android.content.ClipData
import android.content.ContentValues
import android.content.Intent
import android.graphics.Bitmap
-import android.graphics.drawable.ColorDrawable
import android.net.Uri
import android.os.Bundle
import android.provider.ContactsContract.CommonDataKinds
@@ -22,6 +21,7 @@ import com.simplemobiletools.commons.dialogs.RadioGroupDialog
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.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.dialogs.CustomLabelDialog
@@ -60,7 +60,10 @@ class EditContactActivity : ContactActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_edit_contact)
- supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross)
+
+ if (checkAppSideloading()) {
+ return
+ }
val action = intent.action
isThirdPartyIntent = action == Intent.ACTION_EDIT || action == Intent.ACTION_INSERT || action == ADD_NEW_CONTACT_NUMBER
@@ -93,6 +96,8 @@ class EditContactActivity : ContactActivity() {
menu.findItem(R.id.share).isVisible = contact?.id != 0
menu.findItem(R.id.open_with).isVisible = contact?.id != 0 && contact?.isPrivate() == false
}
+
+ updateMenuItemColors(menu, true)
return true
}
@@ -144,7 +149,7 @@ class EditContactActivity : ContactActivity() {
}
if (contactId != 0) {
- Thread {
+ ensureBackgroundThread {
contact = ContactsHelper(this).getContactWithId(contactId, intent.getBooleanExtra(IS_PRIVATE, false))
if (contact == null) {
toast(R.string.unknown_error_occurred)
@@ -154,7 +159,7 @@ class EditContactActivity : ContactActivity() {
gotContact()
}
}
- }.start()
+ }
} else {
gotContact()
}
@@ -195,7 +200,9 @@ class EditContactActivity : ContactActivity() {
contact_start_call.beVisibleIf(contact!!.phoneNumbers.isNotEmpty())
contact_send_email.beVisibleIf(contact!!.emails.isNotEmpty())
- contact_photo.background = ColorDrawable(config.primaryColor)
+ val background = resources.getDrawable(R.drawable.contact_circular_background)
+ background.applyColorFilter(config.primaryColor)
+ contact_photo.background = background
if (contact!!.photoUri.isEmpty() && contact!!.photo == null) {
showPhotoPlaceholder(contact_photo)
@@ -378,7 +385,7 @@ class EditContactActivity : ContactActivity() {
private fun setupEditContact() {
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
- supportActionBar?.title = resources.getString(R.string.edit_contact)
+ updateActionBarTitle(resources.getString(R.string.edit_contact))
setupNames()
setupPhoneNumbers()
@@ -575,7 +582,7 @@ class EditContactActivity : ContactActivity() {
}
private fun setupNewContact() {
- supportActionBar?.title = resources.getString(R.string.new_contact)
+ updateActionBarTitle(resources.getString(R.string.new_contact))
originalContactSource = if (hasContactPermissions()) config.lastUsedContactSource else SMT_PRIVATE
contact = getEmptyContact()
getPublicContactSource(contact!!.source) {
@@ -869,7 +876,7 @@ class EditContactActivity : ContactActivity() {
val jobPosition = contact_organization_job_position.value
organization = Organization(company, jobPosition)
- Thread {
+ ensureBackgroundThread {
config.lastUsedContactSource = source
when {
id == 0 -> insertNewContact(false)
@@ -879,7 +886,7 @@ class EditContactActivity : ContactActivity() {
updateContact(photoUpdateStatus)
}
}
- }.start()
+ }
}
}
@@ -1088,7 +1095,7 @@ class EditContactActivity : ContactActivity() {
private fun isContactStarred() = contact_toggle_favorite.tag == 1
- private fun getStarDrawable(on: Boolean) = resources.getDrawable(if (on) R.drawable.ic_star_on_big else R.drawable.ic_star_off_big)
+ private fun getStarDrawable(on: Boolean) = resources.getDrawable(if (on) R.drawable.ic_star_on_vector else R.drawable.ic_star_off_vector)
private fun trySetPhoto() {
val items = arrayListOf(
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt
index ab35f298..91394c9b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt
@@ -7,6 +7,7 @@ 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.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter
import com.simplemobiletools.contacts.pro.dialogs.SelectContactsDialog
@@ -53,8 +54,9 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh
refreshContacts()
}
- override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+ override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_group, menu)
+ updateMenuItemColors(menu)
return true
}
@@ -69,11 +71,11 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh
private fun fabClicked() {
SelectContactsDialog(this, allContacts, groupContacts) { addedContacts, removedContacts ->
- Thread {
+ ensureBackgroundThread {
addContactsToGroup(addedContacts, group.id!!)
removeContactsFromGroup(removedContacts, group.id!!)
refreshContacts()
- }.start()
+ }
}
}
@@ -123,11 +125,11 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh
}
override fun removeFromGroup(contacts: ArrayList) {
- Thread {
+ ensureBackgroundThread {
removeContactsFromGroup(contacts, group.id!!)
if (groupContacts.size == contacts.size) {
refreshContacts()
}
- }.start()
+ }
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt
index 36934f94..84642b36 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt
@@ -4,10 +4,8 @@ import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.provider.ContactsContract
-import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
-import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
-import com.simplemobiletools.commons.extensions.toast
-import com.simplemobiletools.commons.extensions.updateTextColors
+import android.view.Menu
+import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter
@@ -24,6 +22,11 @@ class InsertOrEditContactActivity : SimpleActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_insert_edit_contact)
+
+ if (checkAppSideloading()) {
+ return
+ }
+
title = getString(R.string.select_contact)
setupViews()
@@ -35,9 +38,14 @@ class InsertOrEditContactActivity : SimpleActivity() {
}
}
+ override fun onCreateOptionsMenu(menu: Menu): Boolean {
+ updateMenuItemColors(menu)
+ return super.onCreateOptionsMenu(menu)
+ }
+
private fun setupViews() {
updateTextColors(insert_edit_contact_holder)
- new_contact_tmb.setImageDrawable(resources.getColoredDrawableWithColor(R.drawable.ic_new_contact, config.textColor))
+ new_contact_tmb.setImageDrawable(resources.getColoredDrawableWithColor(R.drawable.ic_new_contact_vector, config.textColor))
new_contact_holder.setOnClickListener {
Intent().apply {
action = Intent.ACTION_INSERT
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
index e2d67b20..4e4392d8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
@@ -1,11 +1,16 @@
package com.simplemobiletools.contacts.pro.activities
+import android.annotation.SuppressLint
import android.app.SearchManager
import android.content.Context
import android.content.Intent
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Drawable
+import android.graphics.drawable.Icon
+import android.graphics.drawable.LayerDrawable
import android.net.Uri
import android.os.Bundle
import android.os.Handler
@@ -32,12 +37,12 @@ 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.*
import kotlinx.android.synthetic.main.fragment_groups.*
import java.io.FileOutputStream
+import java.util.*
class MainActivity : SimpleActivity(), RefreshContactsListener {
private var isSearchOpen = false
@@ -148,7 +153,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
}
}
- val dialpadIcon = resources.getColoredDrawableWithColor(R.drawable.ic_dialpad, if (isBlackAndWhiteTheme()) Color.BLACK else Color.WHITE)
+ val dialpadIcon = resources.getColoredDrawableWithColor(R.drawable.ic_dialpad_vector, if (isBlackAndWhiteTheme()) Color.BLACK else config.primaryColor.getContrastColor())
main_dialpad_button.apply {
setImageDrawable(dialpadIcon)
background.applyColorFilter(getAdjustedPrimaryColor())
@@ -156,6 +161,8 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
}
isFirstResume = false
+ checkShortcuts()
+ invalidateOptionsMenu()
}
override fun onPause() {
@@ -176,11 +183,12 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
val currentFragment = getCurrentFragment()
menu.apply {
- findItem(R.id.search).isVisible = currentFragment != groups_fragment
findItem(R.id.sort).isVisible = currentFragment != groups_fragment
findItem(R.id.filter).isVisible = currentFragment != groups_fragment
+ setupSearch(this)
+ updateMenuItemColors(this)
}
- setupSearch(menu)
+
return true
}
@@ -216,7 +224,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
(searchMenuItem!!.actionView as SearchView).apply {
setSearchableInfo(searchManager.getSearchableInfo(componentName))
isSubmitButtonEnabled = false
- queryHint = getString(if (getCurrentFragment() == contacts_fragment) R.string.search_contacts else R.string.search_favorites)
+ queryHint = getString(getSearchString())
setOnQueryTextListener(object : SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(query: String) = false
@@ -244,6 +252,64 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
})
}
+ private fun getSearchString(): Int {
+ return when (getCurrentFragment()) {
+ favorites_fragment -> R.string.search_favorites
+ groups_fragment -> R.string.search_groups
+ else -> R.string.search_contacts
+ }
+ }
+
+ @SuppressLint("NewApi")
+ private fun checkShortcuts() {
+ val appIconColor = config.appIconColor
+ if (isNougatMR1Plus() && config.lastHandledShortcutColor != appIconColor) {
+ val launchDialpad = getLaunchDialpadShortcut(appIconColor)
+ val createNewContact = getCreateNewContactShortcut(appIconColor)
+
+ val manager = getSystemService(ShortcutManager::class.java)
+ try {
+ manager.dynamicShortcuts = Arrays.asList(launchDialpad, createNewContact)
+ config.lastHandledShortcutColor = appIconColor
+ } catch (ignored: Exception) {
+ }
+ }
+ }
+
+ @SuppressLint("NewApi")
+ private fun getLaunchDialpadShortcut(appIconColor: Int): ShortcutInfo {
+ val newEvent = getString(R.string.dialpad)
+ val drawable = resources.getDrawable(R.drawable.shortcut_dialpad)
+ (drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_dialpad_background).applyColorFilter(appIconColor)
+ val bmp = drawable.convertToBitmap()
+
+ val intent = Intent(this, DialpadActivity::class.java)
+ intent.action = Intent.ACTION_VIEW
+ return ShortcutInfo.Builder(this, "launch_dialpad")
+ .setShortLabel(newEvent)
+ .setLongLabel(newEvent)
+ .setIcon(Icon.createWithBitmap(bmp))
+ .setIntent(intent)
+ .build()
+ }
+
+ @SuppressLint("NewApi")
+ private fun getCreateNewContactShortcut(appIconColor: Int): ShortcutInfo {
+ val newEvent = getString(R.string.create_new_contact)
+ val drawable = resources.getDrawable(R.drawable.shortcut_plus)
+ (drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_plus_background).applyColorFilter(appIconColor)
+ val bmp = drawable.convertToBitmap()
+
+ val intent = Intent(this, EditContactActivity::class.java)
+ intent.action = Intent.ACTION_VIEW
+ return ShortcutInfo.Builder(this, "create_new_contact")
+ .setShortLabel(newEvent)
+ .setLongLabel(newEvent)
+ .setIcon(Icon.createWithBitmap(bmp))
+ .setIntent(intent)
+ .build()
+ }
+
private fun getCurrentFragment(): MyViewPagerFragment? {
val showTabs = config.showTabs
val fragments = arrayListOf()
@@ -351,9 +417,9 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
private fun getTabIcon(position: Int): Drawable {
val drawableId = when (position) {
- LOCATION_CONTACTS_TAB -> R.drawable.ic_person
- LOCATION_FAVORITES_TAB -> R.drawable.ic_star_on
- else -> R.drawable.ic_group
+ LOCATION_CONTACTS_TAB -> R.drawable.ic_person_vector
+ LOCATION_FAVORITES_TAB -> R.drawable.ic_star_on_vector
+ else -> R.drawable.ic_group_vector
}
return resources.getColoredDrawableWithColor(drawableId, config.textColor)
@@ -429,23 +495,20 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
private fun exportContacts() {
FilePickerDialog(this, pickFile = false, showFAB = true) {
- ExportContactsDialog(this, it) { file, contactSources ->
- Thread {
- ContactsHelper(this).getContacts { allContacts ->
- val contacts = allContacts.filter { contactSources.contains(it.source) }
- if (contacts.isEmpty()) {
- toast(R.string.no_entries_for_exporting)
- } else {
- VcfExporter().exportContacts(this, file, contacts as ArrayList, true) { result ->
- toast(when (result) {
- VcfExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful
- VcfExporter.ExportResult.EXPORT_PARTIAL -> R.string.exporting_some_entries_failed
- else -> R.string.exporting_failed
- })
- }
+ ExportContactsDialog(this, it) { file, ignoredContactSources ->
+ ContactsHelper(this).getContacts(ignoredContactSources) { contacts ->
+ if (contacts.isEmpty()) {
+ toast(R.string.no_entries_for_exporting)
+ } else {
+ VcfExporter().exportContacts(this, file, contacts, true) { result ->
+ toast(when (result) {
+ VcfExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful
+ VcfExporter.ExportResult.EXPORT_PARTIAL -> R.string.exporting_some_entries_failed
+ else -> R.string.exporting_failed
+ })
}
}
- }.start()
+ }
}
}
}
@@ -456,7 +519,8 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
val faqItems = arrayListOf(
FAQItem(R.string.faq_1_title, R.string.faq_1_text),
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
- FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons)
+ FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons),
+ FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons)
)
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
@@ -474,13 +538,12 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
viewpager.currentItem = config.lastUsedViewPagerPage
}
- ContactsHelper(this).getContacts {
+ ContactsHelper(this).getContacts { contacts ->
isGettingContacts = false
if (isDestroyed) {
return@getContacts
}
- val contacts = it
if (refreshTabsMask and CONTACTS_TAB_MASK != 0) {
contacts_fragment?.refreshContacts(contacts)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageBlockedNumbersActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageBlockedNumbersActivity.kt
index ae1ed642..7075fa15 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageBlockedNumbersActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageBlockedNumbersActivity.kt
@@ -8,6 +8,7 @@ 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.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.adapters.ManageBlockedNumbersAdapter
@@ -39,8 +40,9 @@ class ManageBlockedNumbersActivity : SimpleActivity(), RefreshRecyclerViewListen
}
}
- override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+ override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_add_blocked_number, menu)
+ updateMenuItemColors(menu)
return true
}
@@ -58,11 +60,11 @@ class ManageBlockedNumbersActivity : SimpleActivity(), RefreshRecyclerViewListen
private fun updatePlaceholderTexts() {
manage_blocked_numbers_placeholder.text = getString(if (isDefaultDialer()) R.string.not_blocking_anyone else R.string.must_make_default_dialer)
- manage_blocked_numbers_placeholder_2.text = getString(if (isDefaultDialer()) R.string.add_a_blocked_number else R.string.set_to_default)
+ manage_blocked_numbers_placeholder_2.text = getString(if (isDefaultDialer()) R.string.add_a_blocked_number else R.string.set_as_default)
}
private fun updateBlockedNumbers() {
- Thread {
+ ensureBackgroundThread {
val blockedNumbers = getBlockedNumbers()
runOnUiThread {
ManageBlockedNumbersAdapter(this, blockedNumbers, this, manage_blocked_numbers_list) {
@@ -74,7 +76,7 @@ class ManageBlockedNumbersActivity : SimpleActivity(), RefreshRecyclerViewListen
manage_blocked_numbers_placeholder.beVisibleIf(blockedNumbers.isEmpty())
manage_blocked_numbers_placeholder_2.beVisibleIf(blockedNumbers.isEmpty())
}
- }.start()
+ }
}
private fun addOrEditBlockedNumber(currentNumber: BlockedNumber? = null) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt
index ffeb168c..670e8486 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt
@@ -26,6 +26,11 @@ class SelectContactActivity : SimpleActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_select_contact)
+
+ if (checkAppSideloading()) {
+ return
+ }
+
setupPlaceholders()
handlePermission(PERMISSION_READ_CONTACTS) {
@@ -52,6 +57,7 @@ class SelectContactActivity : SimpleActivity() {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_select_activity, menu)
+ updateMenuItemColors(menu)
return true
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt
index de068e3d..6642034f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt
@@ -4,6 +4,7 @@ import android.annotation.TargetApi
import android.content.Intent
import android.os.Build
import android.os.Bundle
+import android.view.Menu
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.updateTextColors
@@ -44,6 +45,12 @@ class SettingsActivity : SimpleActivity() {
setupShowDialpadLetters()
setupOnContactClick()
updateTextColors(settings_holder)
+ invalidateOptionsMenu()
+ }
+
+ override fun onCreateOptionsMenu(menu: Menu): Boolean {
+ updateMenuItemColors(menu)
+ return super.onCreateOptionsMenu(menu)
}
private fun setupCustomizeColors() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
index 84fe9fea..7e820937 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
@@ -1,7 +1,6 @@
package com.simplemobiletools.contacts.pro.activities
import android.content.Intent
-import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.provider.ContactsContract
import android.view.Menu
@@ -9,8 +8,10 @@ import android.view.MenuItem
import android.view.View
import android.view.WindowManager
import android.widget.RelativeLayout
+import com.bumptech.glide.Glide
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.dialogs.CallConfirmationDialog
import com.simplemobiletools.contacts.pro.extensions.*
@@ -32,6 +33,11 @@ class ViewContactActivity : ContactActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_view_contact)
+
+ if (checkAppSideloading()) {
+ return
+ }
+
showFields = config.showContactFields
}
@@ -41,18 +47,18 @@ class ViewContactActivity : ContactActivity() {
if (isViewIntent) {
handlePermission(PERMISSION_READ_CONTACTS) {
if (it) {
- Thread {
+ ensureBackgroundThread {
initContact()
- }.start()
+ }
} else {
toast(R.string.no_contacts_permission)
finish()
}
}
} else {
- Thread {
+ ensureBackgroundThread {
initContact()
- }.start()
+ }
}
}
@@ -60,6 +66,7 @@ class ViewContactActivity : ContactActivity() {
menuInflater.inflate(R.menu.menu_view_contact, menu)
menu.apply {
findItem(R.id.open_with).isVisible = contact?.isPrivate() == false
+ updateMenuItemColors(this)
}
return true
}
@@ -133,12 +140,24 @@ class ViewContactActivity : ContactActivity() {
contact_start_call.beVisibleIf(contact!!.phoneNumbers.isNotEmpty())
contact_send_email.beVisibleIf(contact!!.emails.isNotEmpty())
- contact_photo.background = ColorDrawable(config.primaryColor)
+ val background = resources.getDrawable(R.drawable.contact_circular_background)
+ background.applyColorFilter(config.primaryColor)
+ contact_photo.background = background
if (contact!!.photoUri.isEmpty() && contact!!.photo == null) {
showPhotoPlaceholder(contact_photo)
} else {
updateContactPhoto(contact!!.photoUri, contact_photo, contact!!.photo)
+ Glide.with(this).load(contact!!.photo ?: currentContactPhotoPath).into(contact_photo_big)
+ contact_photo.setOnClickListener {
+ contact_photo_big.alpha = 0f
+ contact_photo_big.beVisible()
+ contact_photo_big.animate().alpha(1f).start()
+ }
+
+ contact_photo_big.setOnClickListener {
+ contact_photo_big.animate().alpha(0f).withEndAction { it.beGone() }.start()
+ }
}
val textColor = config.textColor
@@ -148,6 +167,7 @@ class ViewContactActivity : ContactActivity() {
contact_name_image.applyColorFilter(textColor)
contact_numbers_image.applyColorFilter(textColor)
contact_emails_image.applyColorFilter(textColor)
+ contact_addresses_image.applyColorFilter(textColor)
contact_events_image.applyColorFilter(textColor)
contact_source_image.applyColorFilter(textColor)
contact_notes_image.applyColorFilter(textColor)
@@ -458,7 +478,7 @@ class ViewContactActivity : ContactActivity() {
}
}
- private fun getStarDrawable(on: Boolean) = resources.getDrawable(if (on) R.drawable.ic_star_on_big else R.drawable.ic_star_off_big)
+ private fun getStarDrawable(on: Boolean) = resources.getDrawable(if (on) R.drawable.ic_star_on_vector else R.drawable.ic_star_off_vector)
private fun View.copyOnLongClick(value: String) {
setOnLongClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
index 4b3de60a..1c82ee22 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
@@ -20,6 +20,7 @@ import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
import com.simplemobiletools.commons.extensions.highlightTextPart
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.commons.views.FastScroller
import com.simplemobiletools.commons.views.MyRecyclerView
@@ -51,6 +52,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList, highlightText: String = "") {
@@ -163,9 +165,9 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList {
val options = RequestOptions()
@@ -304,9 +312,18 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList {
+ contact_tmb.setPadding(mediumPadding, mediumPadding, mediumPadding, mediumPadding)
+ contact_tmb.setImageDrawable(placeholderImage)
}
- else -> contact_tmb.setImageDrawable(placeholderImage)
}
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
index 1d6f76d6..c3eb0bd2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
@@ -7,6 +7,9 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.beVisibleIf
+import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
+import com.simplemobiletools.commons.extensions.highlightTextPart
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.views.FastScroller
import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.contacts.pro.R
@@ -26,7 +29,9 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList, val
private var smallPadding = activity.resources.getDimension(R.dimen.small_margin).toInt()
private var bigPadding = activity.resources.getDimension(R.dimen.normal_margin).toInt()
+ private var textToHighlight = ""
+ var adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
var showContactThumbnails = activity.config.showContactThumbnails
init {
@@ -75,10 +80,16 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList, val
private fun getItemWithKey(key: Int): Group? = groups.firstOrNull { it.id!!.toInt() == key }
- fun updateItems(newItems: ArrayList) {
- groups = newItems
- notifyDataSetChanged()
- finishActMode()
+ fun updateItems(newItems: ArrayList, highlightText: String = "") {
+ if (newItems.hashCode() != groups.hashCode()) {
+ groups = newItems
+ textToHighlight = highlightText
+ notifyDataSetChanged()
+ finishActMode()
+ } else if (textToHighlight != highlightText) {
+ textToHighlight = highlightText
+ notifyDataSetChanged()
+ }
fastScroller?.measureRecyclerView()
}
@@ -92,9 +103,9 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList, val
private fun askConfirmDelete() {
ConfirmationDialog(activity) {
- Thread {
+ ensureBackgroundThread {
deleteGroups()
- }.start()
+ }
}
}
@@ -127,9 +138,16 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList, val
private fun setupView(view: View, group: Group) {
view.apply {
group_frame?.isSelected = selectedKeys.contains(group.id!!.toInt())
+ val titleWithCnt = "${group.title} (${group.contactsCount})"
+ val groupTitle = if (textToHighlight.isEmpty()) {
+ titleWithCnt
+ } else {
+ titleWithCnt.highlightTextPart(textToHighlight, adjustedPrimaryColor)
+ }
+
group_name.apply {
setTextColor(textColor)
- text = String.format(activity.getString(R.string.groups_placeholder), group.title, group.contactsCount.toString())
+ text = groupTitle
setPadding(if (showContactThumbnails) smallPadding else bigPadding, smallPadding, smallPadding, 0)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
index be559a55..eee9bbe5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
@@ -29,7 +29,7 @@ class SelectContactsAdapter(val activity: SimpleActivity, val contacts: List()
private val config = activity.config
private val textColor = config.textColor
- private val contactDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_person, textColor)
+ private val contactDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_person_vector, textColor)
private val showContactThumbnails = config.showContactThumbnails
private val itemLayout = if (config.showPhoneNumbers) R.layout.item_add_favorite_with_number else R.layout.item_add_favorite_without_number
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt
index a76f57f3..06233246 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CreateNewGroupDialog.kt
@@ -8,10 +8,11 @@ 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.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.contacts.pro.R
+import com.simplemobiletools.contacts.pro.extensions.getPrivateContactSource
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.*
@@ -36,8 +37,7 @@ class CreateNewGroupDialog(val activity: BaseSimpleActivity, val callback: (newG
val contactSources = ArrayList()
ContactsHelper(activity).getContactSources {
it.filter { it.type.contains("google", true) }.mapTo(contactSources) { ContactSource(it.name, it.type, it.name) }
- val phoneSecret = activity.getString(R.string.phone_storage_hidden)
- contactSources.add(ContactSource(phoneSecret, SMT_PRIVATE, phoneSecret))
+ contactSources.add(activity.getPrivateContactSource())
val items = ArrayList()
contactSources.forEachIndexed { index, contactSource ->
@@ -61,7 +61,7 @@ class CreateNewGroupDialog(val activity: BaseSimpleActivity, val callback: (newG
}
private fun createGroupUnder(name: String, contactSource: ContactSource, dialog: AlertDialog) {
- Thread {
+ ensureBackgroundThread {
val newGroup = ContactsHelper(activity).createNewGroup(name, contactSource.name, contactSource.type)
activity.runOnUiThread {
if (newGroup != null) {
@@ -69,6 +69,6 @@ class CreateNewGroupDialog(val activity: BaseSimpleActivity, val callback: (newG
}
dialog.dismiss()
}
- }.start()
+ }
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt
index a23aed75..c02a4516 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt
@@ -3,18 +3,18 @@ package com.simplemobiletools.contacts.pro.dialogs
import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
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.*
-class ExportContactsDialog(val activity: SimpleActivity, val path: String, private val callback: (file: File, contactSources: HashSet) -> Unit) {
+class ExportContactsDialog(val activity: SimpleActivity, val path: String, private val callback: (file: File, ignoredContactSources: HashSet) -> Unit) {
private var contactSources = ArrayList()
init {
@@ -50,13 +50,12 @@ class ExportContactsDialog(val activity: SimpleActivity, val path: String, priva
return@setOnClickListener
}
- val selectedSources = (view.export_contacts_list.adapter as FilterContactSourcesAdapter).getSelectedContactSources()
- val selectedContactSourceNames = HashSet()
- selectedSources.forEach {
- selectedContactSourceNames.add(if (it.type == SMT_PRIVATE) SMT_PRIVATE else it.name)
+ ensureBackgroundThread {
+ val selectedSources = (view.export_contacts_list.adapter as FilterContactSourcesAdapter).getSelectedContactSources()
+ val ignoredSources = contactSources.filter { !selectedSources.contains(it) }.map { it.getFullIdentifier() }.toHashSet()
+ callback(file, ignoredSources)
+ dismiss()
}
- callback(file, selectedContactSourceNames)
- dismiss()
}
else -> activity.toast(R.string.invalid_name)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt
index 131070d3..3640391d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ImportContactsDialog.kt
@@ -4,6 +4,7 @@ import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.extensions.toast
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.extensions.config
@@ -41,11 +42,11 @@ class ImportContactsDialog(val activity: SimpleActivity, val path: String, priva
activity.setupDialogStuff(view, this, R.string.import_contacts) {
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
activity.toast(R.string.importing)
- Thread {
+ ensureBackgroundThread {
val result = VcfImporter(activity).importContacts(path, targetContactSource)
handleParseResult(result)
dismiss()
- }.start()
+ }
}
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt
index 835bc5e5..2f81ec1c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/RenameGroupDialog.kt
@@ -3,6 +3,7 @@ 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.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.extensions.groupsDB
import com.simplemobiletools.contacts.pro.helpers.ContactsHelper
@@ -35,7 +36,7 @@ class RenameGroupDialog(val activity: BaseSimpleActivity, val group: Group, val
}
group.title = newTitle
- Thread {
+ ensureBackgroundThread {
if (group.isPrivateSecretGroup()) {
activity.groupsDB.insertOrUpdate(group)
} else {
@@ -45,7 +46,7 @@ class RenameGroupDialog(val activity: BaseSimpleActivity, val group: Group, val
callback()
dismiss()
}
- }.start()
+ }
}
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt
index 16872932..5e93f5a0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt
@@ -3,6 +3,7 @@ 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.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.adapters.SelectContactsAdapter
@@ -45,13 +46,13 @@ class SelectContactsDialog(val activity: SimpleActivity, initialContacts: ArrayL
}
private fun dialogConfirmed() {
- Thread {
+ ensureBackgroundThread {
val adapter = view?.select_contact_list?.adapter as? SelectContactsAdapter
val selectedContacts = adapter?.getSelectedItemsSet()?.toList() ?: ArrayList()
val newlySelectedContacts = selectedContacts.filter { !initiallySelectedContacts.contains(it) } as ArrayList
val unselectedContacts = initiallySelectedContacts.filter { !selectedContacts.contains(it) } as ArrayList
callback(newlySelectedContacts, unselectedContacts)
- }.start()
+ }
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
index 1b307d40..e505e4ed 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
@@ -15,10 +15,7 @@ import android.provider.ContactsContract
import android.telecom.TelecomManager
import androidx.core.content.FileProvider
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.helpers.isMarshmallowPlus
-import com.simplemobiletools.commons.helpers.isNougatPlus
+import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.contacts.pro.BuildConfig
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.activities.EditContactActivity
@@ -199,7 +196,7 @@ fun Context.getPublicContactSource(source: String, callback: (String) -> Unit) {
when (source) {
SMT_PRIVATE -> callback(getString(R.string.phone_storage_hidden))
else -> {
- Thread {
+ ensureBackgroundThread {
ContactsHelper(this).getContactSources {
var newSource = source
for (contactSource in it) {
@@ -212,7 +209,7 @@ fun Context.getPublicContactSource(source: String, callback: (String) -> Unit) {
callback(newSource)
}
}
- }.start()
+ }
}
}
}
@@ -304,13 +301,16 @@ fun Context.getContactPublicUri(contact: Contact): Uri {
}
fun Context.getVisibleContactSources(): ArrayList {
- val sources = ContactsHelper(this).getDeviceContactSources()
- val phoneSecret = getString(R.string.phone_storage_hidden)
- sources.add(ContactSource(phoneSecret, SMT_PRIVATE, phoneSecret))
+ val sources = getAllContactSources()
val ignoredContactSources = config.ignoredContactSources
- val sourceNames = ArrayList(sources).filter { !ignoredContactSources.contains(it.getFullIdentifier()) }
- .map { if (it.type == SMT_PRIVATE) SMT_PRIVATE else it.name }.toMutableList() as ArrayList
- return sourceNames
+ return ArrayList(sources).filter { !ignoredContactSources.contains(it.getFullIdentifier()) }
+ .map { it.name }.toMutableList() as ArrayList
+}
+
+fun Context.getAllContactSources(): List {
+ val sources = ContactsHelper(this).getDeviceContactSources()
+ sources.add(getPrivateContactSource())
+ return sources.toMutableList()
}
@TargetApi(Build.VERSION_CODES.N)
@@ -368,3 +368,5 @@ fun Context.deleteBlockedNumber(number: String) {
@TargetApi(Build.VERSION_CODES.M)
fun Context.isDefaultDialer() = isMarshmallowPlus() && telecomManager.defaultDialerPackage == packageName
+
+fun Context.getPrivateContactSource() = ContactSource(SMT_PRIVATE, SMT_PRIVATE, getString(R.string.phone_storage_hidden))
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
index 27446be4..d5a30aef 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
@@ -29,6 +29,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
private var lastHashCode = 0
private var contactsIgnoringSearch = ArrayList()
+ private var groupsIgnoringSearch = ArrayList()
private lateinit var config: Config
var skipHashComparing = false
@@ -78,6 +79,10 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
(fragment_list.adapter as? ContactsAdapter)?.apply {
adjustedPrimaryColor = context.getAdjustedPrimaryColor()
}
+
+ (fragment_list.adapter as? GroupsAdapter)?.apply {
+ adjustedPrimaryColor = context.getAdjustedPrimaryColor()
+ }
}
fun startNameWithSurnameChanged(startNameWithSurname: Boolean) {
@@ -130,6 +135,8 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
if (this is ContactsFragment || this is FavoritesFragment) {
contactsIgnoringSearch = (fragment_list?.adapter as? ContactsAdapter)?.contactItems ?: ArrayList()
+ } else if (this is GroupsFragment) {
+ groupsIgnoringSearch = (fragment_list?.adapter as? GroupsAdapter)?.groups ?: ArrayList()
}
}
@@ -177,7 +184,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
}
private fun setupContactsFavoritesAdapter(contacts: ArrayList) {
- setupViewVisibility(contacts)
+ setupViewVisibility(contacts.isNotEmpty())
val currAdapter = fragment_list.adapter
if (currAdapter == null || forceListRedraw) {
forceListRedraw = false
@@ -227,9 +234,10 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
}
fun onSearchQueryChanged(text: String) {
- val shouldNormalize = text.normalizeString() == text
- val convertLetters = config.showDialpadLetters
- (fragment_list.adapter as? ContactsAdapter)?.apply {
+ val adapter = fragment_list.adapter
+ if (adapter is ContactsAdapter) {
+ val shouldNormalize = text.normalizeString() == text
+ val convertLetters = config.showDialpadLetters
val filtered = contactsIgnoringSearch.filter {
getProperText(it.getNameToDisplay(), shouldNormalize).contains(text, true) ||
getProperText(it.nickname, shouldNormalize).contains(text, true) ||
@@ -249,11 +257,22 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
}
if (filtered.isEmpty() && this@MyViewPagerFragment is FavoritesFragment) {
- fragment_placeholder.text = activity.getString(R.string.no_items_found)
+ fragment_placeholder.text = activity?.getString(R.string.no_items_found)
}
fragment_placeholder.beVisibleIf(filtered.isEmpty())
- updateItems(filtered, text.normalizeString())
+ (adapter as? ContactsAdapter)?.updateItems(filtered, text.normalizeString())
+ } else if (adapter is GroupsAdapter) {
+ val filtered = groupsIgnoringSearch.filter {
+ it.title.contains(text, true)
+ } as ArrayList
+
+ if (filtered.isEmpty()) {
+ fragment_placeholder.text = activity?.getString(R.string.no_items_found)
+ }
+
+ fragment_placeholder.beVisibleIf(filtered.isEmpty())
+ (adapter as? GroupsAdapter)?.updateItems(filtered, text)
}
}
@@ -261,11 +280,17 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
fun onSearchOpened() {
contactsIgnoringSearch = (fragment_list?.adapter as? ContactsAdapter)?.contactItems ?: ArrayList()
+ groupsIgnoringSearch = (fragment_list?.adapter as? GroupsAdapter)?.groups ?: ArrayList()
}
fun onSearchClosed() {
- (fragment_list.adapter as? ContactsAdapter)?.updateItems(contactsIgnoringSearch)
- setupViewVisibility(contactsIgnoringSearch)
+ if (fragment_list.adapter is ContactsAdapter) {
+ (fragment_list.adapter as? ContactsAdapter)?.updateItems(contactsIgnoringSearch)
+ setupViewVisibility(contactsIgnoringSearch.isNotEmpty())
+ } else if (fragment_list.adapter is GroupsAdapter) {
+ (fragment_list.adapter as? GroupsAdapter)?.updateItems(groupsIgnoringSearch)
+ setupViewVisibility(groupsIgnoringSearch.isNotEmpty())
+ }
if (this is FavoritesFragment) {
fragment_placeholder.text = activity?.getString(R.string.no_favorites)
@@ -279,10 +304,10 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
fragment_placeholder_2.setTextColor(context.getAdjustedPrimaryColor())
}
- private fun setupViewVisibility(contacts: ArrayList) {
- fragment_placeholder_2.beVisibleIf(contacts.isEmpty())
- fragment_placeholder.beVisibleIf(contacts.isEmpty())
- fragment_list.beVisibleIf(contacts.isNotEmpty())
+ private fun setupViewVisibility(hasItemsToShow: Boolean) {
+ fragment_placeholder_2.beVisibleIf(!hasItemsToShow)
+ fragment_placeholder.beVisibleIf(!hasItemsToShow)
+ fragment_list.beVisibleIf(hasItemsToShow)
}
abstract fun fabClicked()
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
index e07326b0..468980a0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
@@ -28,11 +28,17 @@ class ContactsHelper(val context: Context) {
private val BATCH_SIZE = 100
private var displayContactSources = ArrayList()
- fun getContacts(callback: (ArrayList) -> Unit) {
- Thread {
+ fun getContacts(ignoredContactSources: HashSet = HashSet(), callback: (ArrayList) -> Unit) {
+ ensureBackgroundThread {
val contacts = SparseArray()
displayContactSources = context.getVisibleContactSources()
- getDeviceContacts(contacts)
+ if (ignoredContactSources.isNotEmpty()) {
+ displayContactSources = context.getAllContactSources().filter {
+ it.getFullIdentifier().isNotEmpty() && !ignoredContactSources.contains(it.getFullIdentifier())
+ }.map { it.getFullIdentifier() }.toMutableList() as ArrayList
+ }
+
+ getDeviceContacts(contacts, ignoredContactSources)
if (displayContactSources.contains(SMT_PRIVATE)) {
LocalContactsHelper(context).getAllContacts().forEach {
@@ -46,7 +52,7 @@ class ContactsHelper(val context: Context) {
val resultContacts = ArrayList(contactsSize)
(0 until contactsSize).filter {
- if (showOnlyContactsWithNumbers) {
+ if (ignoredContactSources.isEmpty() && showOnlyContactsWithNumbers) {
contacts.valueAt(it).phoneNumbers.isNotEmpty()
} else {
true
@@ -55,7 +61,7 @@ class ContactsHelper(val context: Context) {
contacts.valueAt(it)
}
- if (context.config.filterDuplicates) {
+ if (ignoredContactSources.isEmpty() && context.config.filterDuplicates) {
tempContacts = tempContacts.distinctBy {
it.getHashToCompare()
} as ArrayList
@@ -87,17 +93,24 @@ class ContactsHelper(val context: Context) {
Handler(Looper.getMainLooper()).post {
callback(resultContacts)
}
- }.start()
+ }
}
private fun getContentResolverAccounts(): HashSet {
- val uri = ContactsContract.Data.CONTENT_URI
+ val sources = HashSet()
+ arrayOf(ContactsContract.Groups.CONTENT_URI, ContactsContract.Settings.CONTENT_URI, ContactsContract.RawContacts.CONTENT_URI).forEach {
+ fillSourcesFromUri(it, sources)
+ }
+
+ return sources
+ }
+
+ private fun fillSourcesFromUri(uri: Uri, sources: HashSet) {
val projection = arrayOf(
ContactsContract.RawContacts.ACCOUNT_NAME,
ContactsContract.RawContacts.ACCOUNT_TYPE
)
- val sources = HashSet()
var cursor: Cursor? = null
try {
cursor = context.contentResolver.query(uri, projection, null, null, null)
@@ -118,16 +131,14 @@ class ContactsHelper(val context: Context) {
} finally {
cursor?.close()
}
-
- return sources
}
- private fun getDeviceContacts(contacts: SparseArray) {
+ private fun getDeviceContacts(contacts: SparseArray, ignoredContactSources: HashSet?) {
if (!context.hasContactPermissions()) {
return
}
- val ignoredSources = context.config.ignoredContactSources
+ val ignoredSources = ignoredContactSources ?: context.config.ignoredContactSources
val uri = ContactsContract.Data.CONTENT_URI
val projection = getContactProjection()
@@ -656,12 +667,12 @@ class ContactsHelper(val context: Context) {
}
fun getStoredGroups(callback: (ArrayList) -> Unit) {
- Thread {
+ ensureBackgroundThread {
val groups = getStoredGroupsSync()
Handler(Looper.getMainLooper()).post {
callback(groups)
}
- }.start()
+ }
}
fun getStoredGroupsSync(): ArrayList {
@@ -827,15 +838,14 @@ class ContactsHelper(val context: Context) {
}
fun getContactSources(callback: (ArrayList) -> Unit) {
- Thread {
+ ensureBackgroundThread {
callback(getContactSourcesSync())
- }.start()
+ }
}
private fun getContactSourcesSync(): ArrayList {
val sources = getDeviceContactSources()
- val phoneSecret = context.getString(R.string.phone_storage_hidden)
- sources.add(ContactSource(phoneSecret, SMT_PRIVATE, phoneSecret))
+ sources.add(context.getPrivateContactSource())
return ArrayList(sources)
}
@@ -1239,7 +1249,8 @@ class ContactsHelper(val context: Context) {
ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI).apply {
withValue(ContactsContract.RawContacts.ACCOUNT_NAME, contact.source)
withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, getContactSourceType(contact.source))
- withValue(ContactsContract.RawContacts.DIRTY, 1)
+ withValue(ContactsContract.RawContacts.DIRTY, 0)
+ withValue(ContactsContract.RawContacts.DELETED, 0)
operations.add(build())
}
@@ -1465,21 +1476,21 @@ class ContactsHelper(val context: Context) {
}
fun addFavorites(contacts: ArrayList) {
- Thread {
+ ensureBackgroundThread {
toggleLocalFavorites(contacts, true)
if (context.hasContactPermissions()) {
toggleFavorites(contacts, true)
}
- }.start()
+ }
}
fun removeFavorites(contacts: ArrayList) {
- Thread {
+ ensureBackgroundThread {
toggleLocalFavorites(contacts, false)
if (context.hasContactPermissions()) {
toggleFavorites(contacts, false)
}
- }.start()
+ }
}
private fun toggleFavorites(contacts: ArrayList, addToFavorites: Boolean) {
@@ -1509,13 +1520,13 @@ class ContactsHelper(val context: Context) {
}
fun deleteContact(contact: Contact) {
- Thread {
+ ensureBackgroundThread {
if (contact.isPrivate()) {
context.contactsDB.deleteContactId(contact.id)
} else {
deleteContacts(arrayListOf(contact))
}
- }.start()
+ }
}
fun deleteContacts(contacts: ArrayList) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt
index 54045fa3..b67b2405 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt
@@ -117,6 +117,12 @@ class LocalContactsHelper(val context: Context) {
}
private fun convertContactToLocalContact(contact: Contact): LocalContact {
+ val photoByteArray = if (contact.photoUri.isNotEmpty()) {
+ getPhotoByteArray(contact.photoUri)
+ } else {
+ contact.photo?.getByteArray()
+ }
+
return getEmptyLocalContact().apply {
id = if (contact.id == 0) null else contact.id
prefix = contact.prefix
@@ -125,7 +131,7 @@ class LocalContactsHelper(val context: Context) {
surname = contact.surname
suffix = contact.suffix
nickname = contact.nickname
- photo = getPhotoByteArray(contact.photoUri)
+ photo = photoByteArray
phoneNumbers = contact.phoneNumbers
emails = contact.emails
events = contact.events
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt
index 0fc41e3b..eb36d4dd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt
@@ -30,7 +30,7 @@ class VcfExporter {
private var contactsFailed = 0
fun exportContacts(activity: BaseSimpleActivity, file: File, contacts: ArrayList, showExportingToast: Boolean, callback: (result: ExportResult) -> Unit) {
- activity.getFileOutputStream(file.toFileDirItem(activity), true) {
+ activity.getFileOutputStream(file.toFileDirItem(), true) {
try {
if (it == null) {
callback(EXPORT_FAIL)
diff --git a/app/src/main/res/drawable-hdpi/ic_account_box.png b/app/src/main/res/drawable-hdpi/ic_account_box.png
deleted file mode 100644
index 3f688122..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_account_box.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_block.png b/app/src/main/res/drawable-hdpi/ic_block.png
deleted file mode 100644
index 1c541fe5..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_block.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_business.png b/app/src/main/res/drawable-hdpi/ic_business.png
deleted file mode 100644
index d10ebb76..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_business.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_cake.png b/app/src/main/res/drawable-hdpi/ic_cake.png
deleted file mode 100644
index 989a999b..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_cake.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_clear_char.png b/app/src/main/res/drawable-hdpi/ic_clear_char.png
deleted file mode 100644
index 3fd9c535..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_clear_char.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_clock.png b/app/src/main/res/drawable-hdpi/ic_clock.png
deleted file mode 100644
index 43b00e0a..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_dialpad.png b/app/src/main/res/drawable-hdpi/ic_dialpad.png
deleted file mode 100644
index f600b5b7..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_dialpad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_group.png b/app/src/main/res/drawable-hdpi/ic_group.png
deleted file mode 100644
index ff698afc..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_group_add.png b/app/src/main/res/drawable-hdpi/ic_group_add.png
deleted file mode 100644
index af01bae4..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_group_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_link.png b/app/src/main/res/drawable-hdpi/ic_link.png
deleted file mode 100644
index cf0ce383..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_link.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_new_contact.png b/app/src/main/res/drawable-hdpi/ic_new_contact.png
deleted file mode 100644
index ded0ae92..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_new_contact.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_phone.png b/app/src/main/res/drawable-hdpi/ic_phone.png
deleted file mode 100644
index 3421fffe..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_phone.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_phone_huge.png b/app/src/main/res/drawable-hdpi/ic_phone_huge.png
deleted file mode 100644
index 61d59bd4..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_phone_huge.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_account_box.png b/app/src/main/res/drawable-xhdpi/ic_account_box.png
deleted file mode 100644
index cc0ec8b2..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_account_box.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_block.png b/app/src/main/res/drawable-xhdpi/ic_block.png
deleted file mode 100644
index ae3856fe..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_block.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_business.png b/app/src/main/res/drawable-xhdpi/ic_business.png
deleted file mode 100644
index e5630455..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_business.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cake.png b/app/src/main/res/drawable-xhdpi/ic_cake.png
deleted file mode 100644
index 6e8f140f..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_cake.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_clear_char.png b/app/src/main/res/drawable-xhdpi/ic_clear_char.png
deleted file mode 100644
index b51790d1..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_clear_char.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_clock.png b/app/src/main/res/drawable-xhdpi/ic_clock.png
deleted file mode 100644
index 9d64be88..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_dialpad.png b/app/src/main/res/drawable-xhdpi/ic_dialpad.png
deleted file mode 100644
index 793da560..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_dialpad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_group.png b/app/src/main/res/drawable-xhdpi/ic_group.png
deleted file mode 100644
index 323981cc..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_group_add.png b/app/src/main/res/drawable-xhdpi/ic_group_add.png
deleted file mode 100644
index a769931c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_group_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_link.png b/app/src/main/res/drawable-xhdpi/ic_link.png
deleted file mode 100644
index 302e5d78..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_link.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_new_contact.png b/app/src/main/res/drawable-xhdpi/ic_new_contact.png
deleted file mode 100644
index 5637f091..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_new_contact.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_phone.png b/app/src/main/res/drawable-xhdpi/ic_phone.png
deleted file mode 100644
index 685efe22..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_phone.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_phone_huge.png b/app/src/main/res/drawable-xhdpi/ic_phone_huge.png
deleted file mode 100644
index 3aae5d70..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_phone_huge.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_box.png b/app/src/main/res/drawable-xxhdpi/ic_account_box.png
deleted file mode 100644
index 1323e97e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_account_box.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_block.png b/app/src/main/res/drawable-xxhdpi/ic_block.png
deleted file mode 100644
index d6dc2222..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_block.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_business.png b/app/src/main/res/drawable-xxhdpi/ic_business.png
deleted file mode 100644
index 7dfc8dc5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_business.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cake.png b/app/src/main/res/drawable-xxhdpi/ic_cake.png
deleted file mode 100644
index 56ad5ad8..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_cake.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_clear_char.png b/app/src/main/res/drawable-xxhdpi/ic_clear_char.png
deleted file mode 100644
index e049a108..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_clear_char.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_clock.png b/app/src/main/res/drawable-xxhdpi/ic_clock.png
deleted file mode 100644
index a29eea53..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_dialpad.png b/app/src/main/res/drawable-xxhdpi/ic_dialpad.png
deleted file mode 100644
index 1f6bf856..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_dialpad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_group.png b/app/src/main/res/drawable-xxhdpi/ic_group.png
deleted file mode 100644
index 6c68435f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_group_add.png b/app/src/main/res/drawable-xxhdpi/ic_group_add.png
deleted file mode 100644
index f4acdf46..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_group_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_link.png b/app/src/main/res/drawable-xxhdpi/ic_link.png
deleted file mode 100644
index 6845cbba..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_link.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_new_contact.png b/app/src/main/res/drawable-xxhdpi/ic_new_contact.png
deleted file mode 100644
index d33121aa..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_new_contact.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_phone.png b/app/src/main/res/drawable-xxhdpi/ic_phone.png
deleted file mode 100644
index 61d59bd4..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_phone.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_phone_huge.png b/app/src/main/res/drawable-xxhdpi/ic_phone_huge.png
deleted file mode 100644
index aaa1b757..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_phone_huge.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_account_box.png b/app/src/main/res/drawable-xxxhdpi/ic_account_box.png
deleted file mode 100644
index a921af0e..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_account_box.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_block.png b/app/src/main/res/drawable-xxxhdpi/ic_block.png
deleted file mode 100644
index 9f1191c9..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_block.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_business.png b/app/src/main/res/drawable-xxxhdpi/ic_business.png
deleted file mode 100644
index c9aea72c..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_business.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cake.png b/app/src/main/res/drawable-xxxhdpi/ic_cake.png
deleted file mode 100644
index 0867a261..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_cake.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_clear_char.png b/app/src/main/res/drawable-xxxhdpi/ic_clear_char.png
deleted file mode 100644
index ea552fd3..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_clear_char.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_clock.png b/app/src/main/res/drawable-xxxhdpi/ic_clock.png
deleted file mode 100644
index bfd0dc3e..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_dialpad.png b/app/src/main/res/drawable-xxxhdpi/ic_dialpad.png
deleted file mode 100644
index 7754a7c9..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_dialpad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_group.png b/app/src/main/res/drawable-xxxhdpi/ic_group.png
deleted file mode 100644
index 5676f704..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_group_add.png b/app/src/main/res/drawable-xxxhdpi/ic_group_add.png
deleted file mode 100644
index fadcc0f9..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_group_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_link.png b/app/src/main/res/drawable-xxxhdpi/ic_link.png
deleted file mode 100644
index 2f793953..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_link.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_new_contact.png b/app/src/main/res/drawable-xxxhdpi/ic_new_contact.png
deleted file mode 100644
index 07435b94..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_new_contact.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_phone.png b/app/src/main/res/drawable-xxxhdpi/ic_phone.png
deleted file mode 100644
index 3aae5d70..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_phone.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_phone_huge.png b/app/src/main/res/drawable-xxxhdpi/ic_phone_huge.png
deleted file mode 100644
index 707350b0..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_phone_huge.png and /dev/null differ
diff --git a/app/src/main/res/drawable/contact_circular_background.xml b/app/src/main/res/drawable/contact_circular_background.xml
new file mode 100644
index 00000000..bd3dc800
--- /dev/null
+++ b/app/src/main/res/drawable/contact_circular_background.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_account_box_vector.xml b/app/src/main/res/drawable/ic_account_box_vector.xml
new file mode 100644
index 00000000..751db47d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_account_box_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_backspace_vector.xml b/app/src/main/res/drawable/ic_backspace_vector.xml
new file mode 100644
index 00000000..06dbed70
--- /dev/null
+++ b/app/src/main/res/drawable/ic_backspace_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_business_vector.xml b/app/src/main/res/drawable/ic_business_vector.xml
new file mode 100644
index 00000000..9da2fe87
--- /dev/null
+++ b/app/src/main/res/drawable/ic_business_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_cake_vector.xml b/app/src/main/res/drawable/ic_cake_vector.xml
new file mode 100644
index 00000000..acceada8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cake_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_dialpad_vector.xml b/app/src/main/res/drawable/ic_dialpad_vector.xml
new file mode 100644
index 00000000..e5b16ae3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dialpad_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_group_add_vector.xml b/app/src/main/res/drawable/ic_group_add_vector.xml
new file mode 100644
index 00000000..fe6e21bb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group_add_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_group_vector.xml b/app/src/main/res/drawable/ic_group_vector.xml
new file mode 100644
index 00000000..120218d2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_link_vector.xml b/app/src/main/res/drawable/ic_link_vector.xml
new file mode 100644
index 00000000..8e04bd9e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_link_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_new_contact_vector.xml b/app/src/main/res/drawable/ic_new_contact_vector.xml
new file mode 100644
index 00000000..b51c33ae
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new_contact_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/shortcut_dialpad.xml b/app/src/main/res/drawable/shortcut_dialpad.xml
new file mode 100644
index 00000000..e92c7d47
--- /dev/null
+++ b/app/src/main/res/drawable/shortcut_dialpad.xml
@@ -0,0 +1,16 @@
+
+
+ -
+
+
+
+
+
+ -
+
+