Skip to content

Commit 9c8bf5a

Browse files
committed
properly handle menu item color updating
1 parent fcd032a commit 9c8bf5a

File tree

4 files changed

+28
-13
lines changed

4 files changed

+28
-13
lines changed

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
2020
updateFavorites()
2121
}
2222

23+
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
24+
menuInflater.inflate(R.menu.menu_favorites, menu)
25+
updateMenuItemColors(menu)
26+
return true
27+
}
28+
29+
override fun onOptionsItemSelected(item: MenuItem): Boolean {
30+
when (item.itemId) {
31+
R.id.add_favorite -> addFavorite()
32+
else -> return super.onOptionsItemSelected(item)
33+
}
34+
return true
35+
}
36+
2337
private fun updateFavorites() {
2438
val favorites = ArrayList<String>()
2539
config.favorites.mapTo(favorites) { it }
@@ -40,19 +54,6 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
4054
}
4155
}
4256

43-
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
44-
menuInflater.inflate(R.menu.menu_favorites, menu)
45-
return true
46-
}
47-
48-
override fun onOptionsItemSelected(item: MenuItem): Boolean {
49-
when (item.itemId) {
50-
R.id.add_favorite -> addFavorite()
51-
else -> return super.onOptionsItemSelected(item)
52-
}
53-
return true
54-
}
55-
5657
override fun refreshItems() {
5758
updateFavorites()
5859
}

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ class MainActivity : SimpleActivity() {
7171
}
7272
}
7373

74+
override fun onResume() {
75+
super.onResume()
76+
invalidateOptionsMenu()
77+
}
78+
7479
override fun onStop() {
7580
super.onStop()
7681
searchMenuItem?.collapseActionView()
@@ -84,6 +89,7 @@ class MainActivity : SimpleActivity() {
8489
override fun onCreateOptionsMenu(menu: Menu): Boolean {
8590
menuInflater.inflate(R.menu.menu, menu)
8691
setupSearch(menu)
92+
updateMenuItemColors(menu)
8793
return true
8894
}
8995

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class ReadTextActivity : SimpleActivity() {
5252
override fun onCreateOptionsMenu(menu: Menu): Boolean {
5353
menuInflater.inflate(R.menu.menu_editor, menu)
5454
setupSearch(menu)
55+
updateMenuItemColors(menu)
5556
return true
5657
}
5758

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.simplemobiletools.filemanager.pro.activities
22

33
import android.content.Intent
44
import android.os.Bundle
5+
import android.view.Menu
56
import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog
67
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
78
import com.simplemobiletools.commons.dialogs.SecurityDialog
@@ -39,6 +40,12 @@ class SettingsActivity : SimpleActivity() {
3940
setupEnableRootAccess()
4041
updateTextColors(settings_holder)
4142
setupSectionColors()
43+
invalidateOptionsMenu()
44+
}
45+
46+
override fun onCreateOptionsMenu(menu: Menu): Boolean {
47+
updateMenuItemColors(menu)
48+
return super.onCreateOptionsMenu(menu)
4249
}
4350

4451
private fun setupSectionColors() {

0 commit comments

Comments
 (0)