From 1dd23d474e0f397a2884ea11c054df528d189192 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 13 Jul 2022 23:29:27 +0200
Subject: [PATCH] fixing the Settings top menu

---
 .../camera/activities/SettingsActivity.kt     | 27 ++++++++-----------
 app/src/main/res/layout/activity_settings.xml |  1 +
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
index 5b7596e9..4dcd33c2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
@@ -2,8 +2,6 @@ package com.simplemobiletools.camera.activities
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
 import androidx.core.content.res.ResourcesCompat
 import com.simplemobiletools.camera.BuildConfig
 import com.simplemobiletools.camera.R
@@ -15,19 +13,21 @@ import com.simplemobiletools.commons.helpers.LICENSE_GLIDE
 import com.simplemobiletools.commons.helpers.NavigationIcon
 import com.simplemobiletools.commons.models.FAQItem
 import com.simplemobiletools.commons.models.RadioItem
-import java.util.Locale
-import kotlin.system.exitProcess
 import kotlinx.android.synthetic.main.activity_settings.*
+import java.util.*
+import kotlin.system.exitProcess
 
 class SettingsActivity : SimpleActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
+        setupOptionsMenu()
     }
 
     override fun onResume() {
         super.onResume()
         setupToolbar(settings_toolbar, NavigationIcon.Arrow)
+
         setupPurchaseThankYou()
         setupCustomizeColors()
         setupUseEnglish()
@@ -39,7 +39,6 @@ class SettingsActivity : SimpleActivity() {
         setupSavePhotosFolder()
         setupPhotoQuality()
         updateTextColors(settings_holder)
-        invalidateOptionsMenu()
 
         val properPrimaryColor = getProperPrimaryColor()
         arrayListOf(
@@ -61,18 +60,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu, menu)
-        updateMenuItemColors(menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.about -> launchAbout()
-            else -> super.onOptionsItemSelected(item)
+    private fun setupOptionsMenu() {
+        settings_toolbar.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.about -> launchAbout()
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
         }
-        return true
     }
 
     private fun setupPurchaseThankYou() {
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 418e7fb6..fa470786 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -16,6 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="@color/color_primary"
+            app:menu="@menu/menu"
             app:title="@string/settings"
             app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />