From ec05fd4ffd164313330963d559e41093abf64303 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 20 Aug 2019 21:10:41 +0200
Subject: [PATCH] properly handle top menu color customization

---
 .../flashlight/activities/MainActivity.kt                  | 2 ++
 .../flashlight/activities/SettingsActivity.kt              | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
index f636322..b4e80bc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
@@ -72,6 +72,7 @@ class MainActivity : SimpleActivity() {
         }
 
         requestedOrientation = if (config.forcePortraitMode) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else ActivityInfo.SCREEN_ORIENTATION_SENSOR
+        invalidateOptionsMenu()
     }
 
     override fun onStart() {
@@ -95,6 +96,7 @@ class MainActivity : SimpleActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu, menu)
+        updateMenuItemColors(menu)
         return true
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
index c2fd547..015b48c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
@@ -2,6 +2,7 @@ package com.simplemobiletools.flashlight.activities
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
 import com.simplemobiletools.commons.extensions.beVisibleIf
 import com.simplemobiletools.commons.extensions.isThankYouInstalled
 import com.simplemobiletools.commons.extensions.launchPurchaseThankYouIntent
@@ -31,6 +32,12 @@ class SettingsActivity : SimpleActivity() {
         setupSOS()
         setupForcePortrait()
         updateTextColors(settings_holder)
+        invalidateOptionsMenu()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        updateMenuItemColors(menu)
+        return super.onCreateOptionsMenu(menu)
     }
 
     private fun setupCustomizeColors() {