wbrawner/Simple-File-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #177 from trubitsyn/favs-fix

Browse source 
Fix incorrect behaviour of favorites in menu
This commit is contained in:
Tibor Kaputa 2018-02-10 16:15:57 +01:00 committed by GitHub
commit c76309eb76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
View file

@ -66,8 +66,6 @@ class MainActivity : SimpleActivity() {
restartActivity()
return
}
invalidateOptionsMenu()
}
override fun onPause() {
@ -89,9 +87,12 @@ class MainActivity : SimpleActivity() {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu, menu)
return true
}
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
val favorites = config.favorites
menu.apply {
menu!!.apply {
findItem(R.id.add_favorite).isVisible = !favorites.contains(fragment.currentPath)
findItem(R.id.remove_favorite).isVisible = favorites.contains(fragment.currentPath)
findItem(R.id.go_to_favorite).isVisible = favorites.isNotEmpty()
@ -180,7 +181,6 @@ class MainActivity : SimpleActivity() {
}
(fragment_holder as ItemsFragment).openPath(newPath)
invalidateOptionsMenu()
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -213,12 +213,10 @@ class MainActivity : SimpleActivity() {
private fun addFavorite() {
config.addFavorite(fragment.currentPath)
invalidateOptionsMenu()
}
private fun removeFavorite() {
config.removeFavorite(fragment.currentPath)
invalidateOptionsMenu()
}
private fun goToFavorite() {
@ -256,7 +254,6 @@ class MainActivity : SimpleActivity() {
private fun toggleTemporarilyShowHidden(show: Boolean) {
config.temporarilyShowHidden = show
openPath(fragment.currentPath)
invalidateOptionsMenu()
}
private fun launchAbout() {