From 4f16dc5c42bdffbed9c0645b4a361d0d12eaa9ea Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Aug 2018 15:39:03 +0200 Subject: [PATCH] make sure the top tab icons are colored properly --- .../contacts/activities/MainActivity.kt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index 1b78e8e1..dc7d06a4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -4,6 +4,7 @@ import android.app.SearchManager import android.content.Context import android.content.Intent import android.graphics.drawable.ColorDrawable +import android.graphics.drawable.Drawable import android.net.Uri import android.os.Bundle import android.os.Handler @@ -369,12 +370,16 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { invalidateOptionsMenu() } - private fun getTabIcon(position: Int) = resources.getDrawable(when (position) { - LOCATION_CONTACTS_TAB -> R.drawable.ic_person - LOCATION_FAVORITES_TAB -> R.drawable.ic_star_on - LOCATION_RECENTS_TAB -> R.drawable.ic_clock - else -> R.drawable.ic_group - }) + 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 + LOCATION_RECENTS_TAB -> R.drawable.ic_clock + else -> R.drawable.ic_group + } + + return resources.getColoredDrawableWithColor(drawableId, config.textColor) + } private fun showSortingDialog() { ChangeSortingDialog(this) {