优化刷新按钮

This commit is contained in:
kunfei
2022-02-02 22:51:34 +08:00
parent c02676654a
commit 05a0ed1ddc
2 changed files with 7 additions and 5 deletions
@@ -91,7 +91,9 @@ class ReadRssActivity : VMBaseActivity<ActivityRssReadBinding, ReadRssViewModel>
override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.menu_rss_refresh -> viewModel.refresh()
R.id.menu_rss_refresh -> viewModel.refresh {
binding.webView.reload()
}
R.id.menu_rss_star -> viewModel.favorite()
R.id.menu_share_it -> viewModel.rssArticle?.let {
share(it.link)
@@ -104,17 +104,17 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
}
}
fun refresh() {
fun refresh(finish: () -> Unit) {
rssArticle?.let { rssArticle ->
rssSource?.let {
val ruleContent = it.ruleContent
if (!ruleContent.isNullOrBlank()) {
loadContent(rssArticle, ruleContent)
} else {
loadUrl(rssArticle.link, rssArticle.origin)
finish.invoke()
}
} ?: loadUrl(rssArticle.link, rssArticle.origin)
}
} ?: finish.invoke()
} ?: finish.invoke()
}
fun favorite() {