From 8d97c3d0c3daf6904bb827ebf7877ef70b64dcad Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 12 Feb 2021 17:24:36 +0100
Subject: [PATCH] adding some coloring improvements

---
 .../dialer/activities/DialpadActivity.kt                 | 2 +-
 .../simplemobiletools/dialer/activities/MainActivity.kt  | 9 +++++----
 .../dialer/fragments/ContactsFragment.kt                 | 3 ++-
 .../dialer/fragments/RecentsFragment.kt                  | 5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
index 0cf9524e..2400cdd2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
@@ -77,7 +77,7 @@ class DialpadActivity : SimpleActivity() {
         SimpleContactsHelper(this).getAvailableContacts(false) { gotContacts(it) }
         disableKeyboardPopping()
 
-        val callIcon = resources.getColoredDrawableWithColor(R.drawable.ic_phone_vector, getFABIconColor())
+        val callIcon = resources.getColoredDrawableWithColor(R.drawable.ic_phone_vector, getAdjustedPrimaryColor().getContrastColor())
         dialpad_call_button.setImageDrawable(callIcon)
         dialpad_call_button.background.applyColorFilter(getAdjustedPrimaryColor())
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
index c2d3c57e..04f30bc2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
@@ -56,10 +56,11 @@ class MainActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
-        val dialpadIcon = resources.getColoredDrawableWithColor(R.drawable.ic_dialpad_vector, getFABIconColor())
+        val adjustedPrimaryColor = getAdjustedPrimaryColor()
+        val dialpadIcon = resources.getColoredDrawableWithColor(R.drawable.ic_dialpad_vector, adjustedPrimaryColor.getContrastColor())
         main_dialpad_button.apply {
             setImageDrawable(dialpadIcon)
-            background.applyColorFilter(getAdjustedPrimaryColor())
+            background.applyColorFilter(adjustedPrimaryColor)
         }
 
         main_tabs_holder.setBackgroundColor(config.backgroundColor)
@@ -77,8 +78,8 @@ class MainActivity : SimpleActivity() {
 
         val configPrimaryColor = config.primaryColor
         if (storedPrimaryColor != configPrimaryColor) {
-            main_tabs_holder.setSelectedTabIndicatorColor(getAdjustedPrimaryColor())
-            main_tabs_holder.getTabAt(viewpager.currentItem)?.icon?.applyColorFilter(getAdjustedPrimaryColor())
+            main_tabs_holder.setSelectedTabIndicatorColor(adjustedPrimaryColor)
+            main_tabs_holder.getTabAt(viewpager.currentItem)?.icon?.applyColorFilter(adjustedPrimaryColor)
             getAllFragments().forEach {
                 it?.primaryColorChanged(configPrimaryColor)
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt
index 485d97f3..5347cf4b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt
@@ -54,7 +54,8 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
         letter_fastscroller_thumb.setupWithFastScroller(letter_fastscroller)
         letter_fastscroller_thumb.textColor = config.primaryColor.getContrastColor()
 
-        fragment_fab.setColors(config.textColor, config.primaryColor, config.backgroundColor)
+        val adjustedPrimaryColor = context.getAdjustedPrimaryColor()
+        fragment_fab.setColors(config.textColor, adjustedPrimaryColor, adjustedPrimaryColor.getContrastColor())
         fragment_fab.setOnClickListener {
             launchCreateNewIntent()
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
index 963f15df..cf9fb723 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
@@ -26,8 +26,9 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
         }
 
         recents_placeholder.text = context.getString(placeholderResId)
+        recents_placeholder.setTextColor(context.config.textColor)
         recents_placeholder_2.apply {
-            setTextColor(context.config.primaryColor)
+            setTextColor(context.getAdjustedPrimaryColor())
             underlineText()
             setOnClickListener {
                 requestCallLogPermission()
@@ -80,7 +81,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
     private fun gotRecents(recents: ArrayList<RecentCall>) {
         if (recents.isEmpty()) {
             recents_placeholder.beVisible()
-            recents_placeholder_2.beVisibleIf(!context.hasPermission(PERMISSION_READ_CALL_LOG))
+            recents_placeholder_2.beGoneIf(context.hasPermission(PERMISSION_READ_CALL_LOG))
             recents_list.beGone()
         } else {
             recents_placeholder.beGone()