updating Commons, use vectors + fix light top menu

app/build.gradle

@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.15.22'
+    implementation 'com.simplemobiletools:commons:5.16.6'
     implementation 'joda-time:joda-time:2.10.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'

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

@@ -16,7 +16,7 @@ import com.bumptech.glide.request.target.Target
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.applyColorFilter
-import com.simplemobiletools.commons.extensions.getColoredBitmap
+import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
 import com.simplemobiletools.commons.extensions.getContrastColor
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.contacts.pro.R
@@ -37,10 +37,10 @@ abstract class ContactActivity : SimpleActivity() {
         background.applyColorFilter(config.primaryColor)
         photoView.background = background
 
-        val placeholder = resources.getColoredBitmap(R.drawable.ic_person_biggest, config.primaryColor.getContrastColor())
+        val placeholder = resources.getColoredDrawableWithColor(R.drawable.ic_person_vector, config.primaryColor.getContrastColor())
         val padding = resources.getDimension(R.dimen.activity_margin).toInt()
         photoView.setPadding(padding, padding, padding, padding)
-        photoView.setImageBitmap(placeholder)
+        photoView.setImageDrawable(placeholder)
         currentContactPhotoPath = ""
         contact?.photo = null
     }

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 {

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

@@ -78,6 +78,7 @@ class DialpadActivity : SimpleActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_dialpad, menu)
+        updateMenuItemColors(menu)
         return true
     }
 

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

@@ -64,8 +64,6 @@ class EditContactActivity : ContactActivity() {
             return
         }
 
-        supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross)
-
         val action = intent.action
         isThirdPartyIntent = action == Intent.ACTION_EDIT || action == Intent.ACTION_INSERT || action == ADD_NEW_CONTACT_NUMBER
         val isFromSimpleContacts = intent.getBooleanExtra(IS_FROM_SIMPLE_CONTACTS, false)
@@ -97,6 +95,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
     }
 
@@ -384,7 +384,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()
@@ -581,7 +581,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) {
@@ -1094,7 +1094,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(

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

@@ -53,8 +53,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
     }
 

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

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.provider.ContactsContract
+import android.view.Menu
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
 import com.simplemobiletools.contacts.pro.R
@@ -37,6 +38,11 @@ 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))

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

@@ -185,8 +185,10 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
             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
     }
 
@@ -407,8 +409,8 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
 
     private fun getTabIcon(position: Int): Drawable {
         val drawableId = when (position) {
-            LOCATION_CONTACTS_TAB -> R.drawable.ic_person
+            LOCATION_CONTACTS_TAB -> R.drawable.ic_person_vector
-            LOCATION_FAVORITES_TAB -> R.drawable.ic_star_on
+            LOCATION_FAVORITES_TAB -> R.drawable.ic_star_on_vector
             else -> R.drawable.ic_group
         }
 

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

@@ -39,8 +39,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
     }
 

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

@@ -57,6 +57,7 @@ class SelectContactActivity : SimpleActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_select_activity, menu)
+        updateMenuItemColors(menu)
         return true
     }
 

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

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

@@ -64,6 +64,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
     }
@@ -465,7 +466,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 {

app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt

@@ -127,7 +127,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
     private fun getItemWithKey(key: Int): Contact? = contactItems.firstOrNull { it.id == key }
 
     fun initDrawables() {
-        contactDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_person, textColor)
+        contactDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_person_vector, textColor)
         businessContactDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_business, textColor)
     }
 

app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt

@@ -29,7 +29,7 @@ class SelectContactsAdapter(val activity: SimpleActivity, val contacts: List<Con
     private val selectedPositions = HashSet<Int>()
     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
 

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

@@ -33,7 +33,7 @@
             android:adjustViewBounds="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:padding="@dimen/tiny_margin"
-            android:src="@drawable/ic_star_off_big"/>
+            android:src="@drawable/ic_star_off_vector"/>
 
         <LinearLayout
             android:id="@+id/contact_actions_holder"
@@ -52,7 +52,7 @@
                 android:paddingStart="@dimen/activity_margin"
                 android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
-                android:src="@drawable/ic_email_big"/>
+                android:src="@drawable/ic_email_vector"/>
 
             <ImageView
                 android:id="@+id/contact_start_call"
@@ -64,7 +64,7 @@
                 android:paddingStart="@dimen/activity_margin"
                 android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
-                android:src="@drawable/ic_phone_big"/>
+                android:src="@drawable/ic_phone_vector"/>
 
             <ImageView
                 android:id="@+id/contact_send_sms"
@@ -76,7 +76,7 @@
                 android:paddingStart="@dimen/activity_margin"
                 android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
-                android:src="@drawable/ic_sms_big"/>
+                android:src="@drawable/ic_sms_vector"/>
 
         </LinearLayout>
 
@@ -88,7 +88,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_person"/>
+            android:src="@drawable/ic_person_vector"/>
 
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/contact_prefix"
@@ -194,7 +194,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_phone_big"/>
+            android:src="@drawable/ic_phone_vector"/>
 
         <LinearLayout
             android:id="@+id/contact_numbers_holder"
@@ -221,7 +221,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus"/>
+            android:src="@drawable/ic_plus_vector"/>
 
         <ImageView
             android:id="@+id/contact_emails_image"
@@ -231,7 +231,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_email"/>
+            android:src="@drawable/ic_email_vector"/>
 
         <LinearLayout
             android:id="@+id/contact_emails_holder"
@@ -257,7 +257,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus"/>
+            android:src="@drawable/ic_plus_vector"/>
 
         <ImageView
             android:id="@+id/contact_addresses_image"
@@ -267,7 +267,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_place"/>
+            android:src="@drawable/ic_place_vector"/>
 
         <LinearLayout
             android:id="@+id/contact_addresses_holder"
@@ -294,7 +294,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus"/>
+            android:src="@drawable/ic_plus_vector"/>
 
         <ImageView
             android:id="@+id/contact_ims_image"
@@ -331,7 +331,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus"/>
+            android:src="@drawable/ic_plus_vector"/>
 
         <ImageView
             android:id="@+id/contact_events_image"
@@ -368,7 +368,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus"/>
+            android:src="@drawable/ic_plus_vector"/>
 
         <ImageView
             android:id="@+id/contact_notes_image"
@@ -378,7 +378,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_label"/>
+            android:src="@drawable/ic_label_vector"/>
 
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/contact_notes"
@@ -468,7 +468,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus"/>
+            android:src="@drawable/ic_plus_vector"/>
 
         <ImageView
             android:id="@+id/contact_groups_image"
@@ -505,7 +505,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/activity_margin"
             android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus"/>
+            android:src="@drawable/ic_plus_vector"/>
 
         <ImageView
             android:id="@+id/contact_source_image"

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

@@ -51,8 +51,7 @@
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:paddingStart="@dimen/normal_margin"
+            android:paddingStart="@dimen/normal_margin">
-            android:paddingLeft="@dimen/normal_margin">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
 
@@ -65,6 +64,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_margin"
-        android:src="@drawable/ic_plus"/>
+        android:src="@drawable/ic_plus_vector"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -33,7 +33,7 @@
             android:adjustViewBounds="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:padding="@dimen/tiny_margin"
-            android:src="@drawable/ic_star_off_big"
+            android:src="@drawable/ic_star_off_vector"
             android:visibility="gone"/>
 
         <LinearLayout
@@ -53,7 +53,7 @@
                 android:paddingLeft="@dimen/activity_margin"
                 android:paddingRight="@dimen/activity_margin"
                 android:scaleType="center"
-                android:src="@drawable/ic_email_big"/>
+                android:src="@drawable/ic_email_vector"/>
 
             <ImageView
                 android:id="@+id/contact_start_call"
@@ -65,7 +65,7 @@
                 android:paddingStart="@dimen/activity_margin"
                 android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
-                android:src="@drawable/ic_phone_big"/>
+                android:src="@drawable/ic_phone_vector"/>
 
             <ImageView
                 android:id="@+id/contact_send_sms"
@@ -77,7 +77,7 @@
                 android:paddingStart="@dimen/activity_margin"
                 android:paddingEnd="@dimen/activity_margin"
                 android:scaleType="center"
-                android:src="@drawable/ic_sms_big"/>
+                android:src="@drawable/ic_sms_vector"/>
 
         </LinearLayout>
 
@@ -89,7 +89,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_person"/>
+            android:src="@drawable/ic_person_vector"/>
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/contact_prefix"
@@ -195,7 +195,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_phone_big"/>
+            android:src="@drawable/ic_phone_vector"/>
 
         <LinearLayout
             android:id="@+id/contact_numbers_holder"
@@ -214,7 +214,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_email"/>
+            android:src="@drawable/ic_email_vector"/>
 
         <LinearLayout
             android:id="@+id/contact_emails_holder"
@@ -233,7 +233,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_place"/>
+            android:src="@drawable/ic_place_vector"/>
 
         <LinearLayout
             android:id="@+id/contact_addresses_holder"
@@ -289,7 +289,7 @@
             android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/small_margin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_label"/>
+            android:src="@drawable/ic_label_vector"/>
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/contact_notes"

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

@@ -47,9 +47,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
+            android:paddingStart="@dimen/normal_margin">
-            android:paddingStart="@dimen/normal_margin"
-            android:paddingLeft="@dimen/normal_margin">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
 
@@ -62,6 +60,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_margin"
-        android:src="@drawable/ic_plus"/>
+        android:src="@drawable/ic_plus_vector"/>
 
 </merge>

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

@@ -21,7 +21,7 @@
             android:layout_height="@dimen/normal_icon_size"
             android:layout_centerVertical="true"
             android:padding="@dimen/medium_margin"
-            android:src="@drawable/ic_person"/>
+            android:src="@drawable/ic_person_vector"/>
 
         <TextView
             android:id="@+id/contact_name"
@@ -33,8 +33,8 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:paddingStart="@dimen/small_margin"
-            android:paddingEnd="@dimen/small_margin"
             android:paddingTop="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
             android:textSize="@dimen/bigger_text_size"
             tools:text="John Doe"/>
 
@@ -42,8 +42,8 @@
             android:id="@+id/contact_number"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignStart="@+id/contact_name"
             android:layout_below="@+id/contact_name"
+            android:layout_alignStart="@+id/contact_name"
             android:layout_toStartOf="@+id/contact_checkbox"
             android:layout_toEndOf="@+id/contact_tmb"
             android:maxLines="1"

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

@@ -21,7 +21,7 @@
             android:layout_height="@dimen/normal_icon_size"
             android:layout_centerVertical="true"
             android:padding="@dimen/medium_margin"
-            android:src="@drawable/ic_person"/>
+            android:src="@drawable/ic_person_vector"/>
 
         <TextView
             android:id="@+id/contact_name"

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

@@ -22,7 +22,7 @@
             android:layout_width="@dimen/normal_icon_size"
             android:layout_height="match_parent"
             android:padding="@dimen/medium_margin"
-            android:src="@drawable/ic_person"/>
+            android:src="@drawable/ic_person_vector"/>
 
         <TextView
             android:id="@+id/contact_name"

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

@@ -22,7 +22,7 @@
             android:layout_height="@dimen/normal_icon_size"
             android:layout_marginTop="@dimen/tiny_margin"
             android:padding="@dimen/medium_margin"
-            android:src="@drawable/ic_person"/>
+            android:src="@drawable/ic_person_vector"/>
 
         <TextView
             android:id="@+id/contact_name"

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

@@ -35,7 +35,7 @@
         android:layout_marginTop="@dimen/medium_margin"
         android:background="@drawable/button_background"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_minus"
+        android:src="@drawable/ic_minus_vector"
         android:visibility="gone"/>
 
 </RelativeLayout>

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

@@ -35,7 +35,7 @@
         android:layout_toStartOf="@+id/contact_event_type"
         android:background="@drawable/button_background"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_minus"
+        android:src="@drawable/ic_minus_vector"
         android:visibility="gone"/>
 
     <com.simplemobiletools.commons.views.MyTextView

app/src/main/res/menu/cab.xml

@@ -3,17 +3,17 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_edit"
-        android:icon="@drawable/ic_edit"
+        android:icon="@drawable/ic_edit_vector"
         android:title="@string/edit_contact"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_select_all"
-        android:icon="@drawable/ic_select_all"
+        android:icon="@drawable/ic_select_all_vector"
         android:title="@string/select_all"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_add_to_favorites"
-        android:icon="@drawable/ic_star_on"
+        android:icon="@drawable/ic_star_on_vector"
         android:title="@string/add_to_favorites"
         app:showAsAction="ifRoom"/>
     <item
@@ -23,27 +23,27 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_send_sms_to_contacts"
-        android:icon="@drawable/ic_sms"
+        android:icon="@drawable/ic_sms_vector"
         android:title="@string/send_sms_to_contacts"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_send_email_to_contacts"
-        android:icon="@drawable/ic_email"
+        android:icon="@drawable/ic_email_vector"
         android:title="@string/send_email_to_contacts"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_remove"
-        android:icon="@drawable/ic_minus_circle"
+        android:icon="@drawable/ic_minus_circle_vector"
         android:title="@string/remove_from_favorites"
         app:showAsAction="ifRoom"/>
 </menu>

app/src/main/res/menu/cab_groups.xml

@@ -8,12 +8,12 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_select_all"
-        android:icon="@drawable/ic_select_all"
+        android:icon="@drawable/ic_select_all_vector"
         android:title="@string/select_all"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
 </menu>

app/src/main/res/menu/menu.xml

@@ -3,18 +3,18 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/ic_search_vector"
         android:title="@string/search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="collapseActionView|ifRoom"/>
     <item
         android:id="@+id/sort"
-        android:icon="@drawable/ic_sort"
+        android:icon="@drawable/ic_sort_vector"
         android:title="@string/sort_by"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/filter"
-        android:icon="@drawable/ic_filter"
+        android:icon="@drawable/ic_filter_vector"
         android:title="@string/filter"
         app:showAsAction="ifRoom"/>
     <item

app/src/main/res/menu/menu_add_blocked_number.xml

@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/add_blocked_number"
-        android:icon="@drawable/ic_plus"
+        android:icon="@drawable/ic_plus_vector"
         android:title="@string/add_a_blocked_number"
         app:showAsAction="ifRoom"/>
 </menu>

app/src/main/res/menu/menu_dialpad.xml

@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/add_number_to_contact"
-        android:icon="@drawable/ic_plus"
+        android:icon="@drawable/ic_plus_vector"
         android:title="@string/add_number_to_contact"
         app:showAsAction="ifRoom"/>
 </menu>

app/src/main/res/menu/menu_edit_contact.xml

@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/save"
-        android:icon="@drawable/ic_check"
+        android:icon="@drawable/ic_check_vector"
         android:title="@string/save"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
@@ -17,7 +17,7 @@
         app:showAsAction="never"/>
     <item
         android:id="@+id/delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
 </menu>

app/src/main/res/menu/menu_group.xml

@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/send_sms_to_group"
-        android:icon="@drawable/ic_sms"
+        android:icon="@drawable/ic_sms_vector"
         android:title="@string/send_sms_to_group"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/send_email_to_group"
-        android:icon="@drawable/ic_email"
+        android:icon="@drawable/ic_email_vector"
         android:title="@string/send_email_to_group"
         app:showAsAction="ifRoom"/>
 </menu>

app/src/main/res/menu/menu_select_activity.xml

@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/sort"
-        android:icon="@drawable/ic_sort"
+        android:icon="@drawable/ic_sort_vector"
         android:title="@string/sort_by"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/filter"
-        android:icon="@drawable/ic_filter"
+        android:icon="@drawable/ic_filter_vector"
         android:title="@string/filter"
         app:showAsAction="ifRoom"/>
 </menu>

app/src/main/res/menu/menu_view_contact.xml

@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/edit"
-        android:icon="@drawable/ic_edit"
+        android:icon="@drawable/ic_edit_vector"
         android:title="@string/edit_contact"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
@@ -17,7 +17,7 @@
         app:showAsAction="never"/>
     <item
         android:id="@+id/delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
 </menu>