this commit removes wiki right bottom bar links, as well as fixing selection.

This commit is contained in:
Kosh 2017-06-13 22:26:39 +08:00
parent 2eade6365a
commit 6afca0235f
2 changed files with 11 additions and 7 deletions

View File

@ -53,6 +53,7 @@ class WikiActivity : BaseActivity<WikiMvp.View, WikiPresenter>(), WikiMvp.View {
}
private fun loadMenu() {
navMenu.menu.clear()
wiki.sidebar.onEach {
navMenu.menu.add(R.id.languageGroup, it.title?.hashCode()!!, Menu.NONE, it.title)
.setCheckable(true)
@ -80,14 +81,10 @@ class WikiActivity : BaseActivity<WikiMvp.View, WikiPresenter>(), WikiMvp.View {
}
private fun onSidebarClicked(item: MenuItem) {
this.selectedTitle = item.title.toString()
closeDrawerLayout()
wiki.sidebar.first { it.title?.toLowerCase() == item.title.toString().toLowerCase() }
.let {
if (it.title != null) {
this.selectedTitle = it.title
presenter.onSidebarClicked(it)
}
}
.let { presenter.onSidebarClicked(it) }
}
private fun closeDrawerLayout() {

View File

@ -43,7 +43,14 @@ class WikiPresenter : BasePresenter<WikiMvp.View>(), WikiMvp.Presenter {
val document: Document = Jsoup.parse(body, "")
val wikiWrapper = document.select("#wiki-wrapper")
if (wikiWrapper.isNotEmpty()) {
// val header = wikiWrapper.select(".gh-header-title").html()
val cloneUrl = wikiWrapper.select(".clone-url")
val bottomRightBar = wikiWrapper.select(".wiki-custom-sidebar")
if (cloneUrl.isNotEmpty()) {
cloneUrl.remove()
}
if (bottomRightBar.isNotEmpty()) {
bottomRightBar.remove()
}
val wikiContent = wikiWrapper.select(".wiki-content")
val content = wikiContent.select(".markdown-body").html()
val rightBarList = wikiContent.select(".wiki-pages").select("li")