From 5db169569232bea4bab7dc009850ff06c97bed5c Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 19 Apr 2020 21:29:01 +0200
Subject: [PATCH] make sure to always update the top menu colors

---
 .../smsmessenger/activities/NewConversationActivity.kt    | 6 ++++++
 .../smsmessenger/activities/SettingsActivity.kt           | 8 +++++++-
 .../smsmessenger/activities/ThreadActivity.kt             | 1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
index 49850c06..309a8026 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.smsmessenger.activities
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.view.Menu
 import android.view.WindowManager
 import com.reddit.indicatorfastscroll.FastScrollItemIndicator
 import com.simplemobiletools.commons.extensions.*
@@ -42,6 +43,11 @@ class NewConversationActivity : SimpleActivity() {
         no_contacts_placeholder_2.underlineText()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        updateMenuItemColors(menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
     private fun initContacts() {
         if (isThirdPartyIntent()) {
             return
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt
index 989aa0f9..885e3f69 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/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.activities.ManageBlockedNumbersActivity
 import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog
 import com.simplemobiletools.commons.extensions.*
@@ -15,7 +16,7 @@ import kotlinx.android.synthetic.main.activity_settings.*
 import java.util.*
 
 class SettingsActivity : SimpleActivity() {
-    var blockedNumbersAtPause = -1
+    private var blockedNumbersAtPause = -1
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -42,6 +43,11 @@ class SettingsActivity : SimpleActivity() {
         blockedNumbersAtPause = getBlockedNumbers().hashCode()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        updateMenuItemColors(menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
     private fun setupPurchaseThankYou() {
         settings_purchase_thank_you_holder.beVisibleIf(!isThankYouInstalled())
         settings_purchase_thank_you_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index f713ca91..50ef2da0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -150,6 +150,7 @@ class ThreadActivity : SimpleActivity() {
             findItem(R.id.block_number).isVisible = isNougatPlus()
         }
 
+        updateMenuItemColors(menu)
         return true
     }