diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt index 3d86c682..409de198 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt @@ -19,7 +19,6 @@ import com.fastaccess.data.dao.wiki.WikiContentModel import com.fastaccess.helper.ActivityHelper import com.fastaccess.helper.BundleConstant import com.fastaccess.helper.Bundler -import com.fastaccess.helper.Logger import com.fastaccess.provider.scheme.LinkParserHelper import com.fastaccess.ui.base.BaseActivity import com.fastaccess.ui.modules.repos.RepoPagerActivity @@ -53,18 +52,21 @@ class WikiActivity : BaseActivity(), WikiMvp.View { loadMenu() } if (wiki.content != null) { - val baseUrl = Uri.Builder().scheme("https") + val baseUrl = Uri.Builder().scheme(LinkParserHelper.PROTOCOL_HTTPS) .authority(LinkParserHelper.HOST_DEFAULT) .appendPath(presenter.login) .appendPath(presenter.repoId) .appendPath("wiki") .build() .toString() - Logger.e(baseUrl) webView.setWikiContent(wiki.content, baseUrl) } } + override fun onSetPage(page: String) { + selectedTitle = page + } + private fun loadMenu() { navMenu.menu.clear() wiki.sidebar.onEach { diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiMvp.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiMvp.kt index 71ece421..20091594 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiMvp.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiMvp.kt @@ -11,6 +11,7 @@ import com.fastaccess.ui.base.mvp.BaseMvp interface WikiMvp { interface View : BaseMvp.FAView { fun onLoadContent(wiki: WikiContentModel) + fun onSetPage(page: String) } interface Presenter { diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiPresenter.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiPresenter.kt index d51e3199..b1fe3efc 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiPresenter.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiPresenter.kt @@ -25,6 +25,9 @@ class WikiPresenter : BasePresenter(), WikiMvp.Presenter { repoId = bundle.getString(BundleConstant.ID) login = bundle.getString(BundleConstant.EXTRA) val page = bundle.getString(BundleConstant.EXTRA_TWO) + if (!page.isNullOrEmpty()) { + sendToView { it.onSetPage(page) } + } if (!repoId.isNullOrEmpty() && !login.isNullOrEmpty()) { onSidebarClicked(WikiSideBarModel("Home", "$login/$repoId/wiki" + if (!page.isNullOrEmpty()) "/$page" else ""))