mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-11-03 23:58:55 +01:00 
			
		
		
		
	Minor edit to onOptionsItemSelected fallthrough logic
This commit is contained in:
		@@ -210,9 +210,8 @@ class CatalogueController : NucleusController<CataloguePresenter>(),
 | 
			
		||||
                        .popChangeHandler(SettingsSourcesFadeChangeHandler())
 | 
			
		||||
                        .pushChangeHandler(FadeChangeHandler()))
 | 
			
		||||
            }
 | 
			
		||||
            else -> return super.onOptionsItemSelected(item)
 | 
			
		||||
        }
 | 
			
		||||
        return true
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
@@ -289,9 +289,8 @@ open class BrowseCatalogueController(bundle: Bundle) :
 | 
			
		||||
            R.id.action_display_mode -> swapDisplayMode()
 | 
			
		||||
            R.id.action_set_filter -> navView?.let { activity?.drawer?.openDrawer(GravityCompat.END) }
 | 
			
		||||
            R.id.action_open_in_web_view -> openInWebView()
 | 
			
		||||
            else -> return super.onOptionsItemSelected(item)
 | 
			
		||||
        }
 | 
			
		||||
        return true
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun openInWebView() {
 | 
			
		||||
 
 | 
			
		||||
@@ -116,9 +116,8 @@ class DownloadController : NucleusController<DownloadPresenter>() {
 | 
			
		||||
                DownloadService.stop(context)
 | 
			
		||||
                presenter.clearQueue()
 | 
			
		||||
            }
 | 
			
		||||
            else -> return super.onOptionsItemSelected(item)
 | 
			
		||||
        }
 | 
			
		||||
        return true
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
@@ -82,9 +82,8 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
 | 
			
		||||
                        .popChangeHandler(SettingsExtensionsFadeChangeHandler())
 | 
			
		||||
                        .pushChangeHandler(FadeChangeHandler()))
 | 
			
		||||
            }
 | 
			
		||||
            else -> return super.onOptionsItemSelected(item)
 | 
			
		||||
        }
 | 
			
		||||
        return true
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
 | 
			
		||||
 
 | 
			
		||||
@@ -374,10 +374,9 @@ class LibraryController(
 | 
			
		||||
            R.id.action_source_migration -> {
 | 
			
		||||
                router.pushController(MigrationController().withFadeTransaction())
 | 
			
		||||
            }
 | 
			
		||||
            else -> return super.onOptionsItemSelected(item)
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return true
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
@@ -208,9 +208,8 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
 | 
			
		||||
                activity?.invalidateOptionsMenu()
 | 
			
		||||
            }
 | 
			
		||||
            R.id.action_sort -> presenter.revertSortOrder()
 | 
			
		||||
            else -> return super.onOptionsItemSelected(item)
 | 
			
		||||
        }
 | 
			
		||||
        return true
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun onNextChapters(chapters: List<ChapterItem>) {
 | 
			
		||||
 
 | 
			
		||||
@@ -193,9 +193,8 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
 | 
			
		||||
        when (item.itemId) {
 | 
			
		||||
            R.id.action_settings -> ReaderSettingsSheet(this).show()
 | 
			
		||||
            R.id.action_custom_filter -> ReaderColorFilterSheet(this).show()
 | 
			
		||||
            else -> return super.onOptionsItemSelected(item)
 | 
			
		||||
        }
 | 
			
		||||
        return true
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user