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 4a594da9..2ded0d2c 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 @@ -48,7 +48,7 @@ class WikiActivity : BaseActivity(), WikiMvp.View { loadMenu() } if (wiki.content != null) { - webView.setGithubContent(wiki.content, null) + webView.setGithubContent(wiki.content, null, true) } } diff --git a/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java b/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java index 2d16ea45..3e38bd2c 100755 --- a/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java +++ b/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java @@ -161,7 +161,11 @@ public class PrettifyWebView extends NestedWebView { } public void setGithubContent(@NonNull String source, @Nullable String baseUrl) { - addJavascriptInterface(new MarkDownInterceptorInterface(this), "Android"); + setGithubContent(source, baseUrl, false); + } + + public void setGithubContent(@NonNull String source, @Nullable String baseUrl, boolean toggleNestScrolling) { + addJavascriptInterface(new MarkDownInterceptorInterface(this, toggleNestScrolling), "Android"); String page = GithubHelper.generateContent(getContext(), source, baseUrl, AppHelper.isNightMode(getResources())); post(() -> loadDataWithBaseURL("file:///android_asset/md/", page, "text/html", "utf-8", null)); } diff --git a/app/src/main/java/com/prettifier/pretty/callback/MarkDownInterceptorInterface.java b/app/src/main/java/com/prettifier/pretty/callback/MarkDownInterceptorInterface.java index 4ad06a31..3a4f00f6 100644 --- a/app/src/main/java/com/prettifier/pretty/callback/MarkDownInterceptorInterface.java +++ b/app/src/main/java/com/prettifier/pretty/callback/MarkDownInterceptorInterface.java @@ -10,22 +10,28 @@ import com.prettifier.pretty.PrettifyWebView; public class MarkDownInterceptorInterface { private PrettifyWebView prettifyWebView; + private boolean toggleNestScrolling; public MarkDownInterceptorInterface(PrettifyWebView prettifyWebView) { + this(prettifyWebView, false); + } + + public MarkDownInterceptorInterface(PrettifyWebView prettifyWebView, boolean toggleNestScrolling) { this.prettifyWebView = prettifyWebView; + this.toggleNestScrolling = toggleNestScrolling; } @JavascriptInterface public void startIntercept() { if (prettifyWebView != null) { prettifyWebView.setInterceptTouch(true); -// prettifyWebView.setEnableNestedScrolling(false); + if (toggleNestScrolling) prettifyWebView.setEnableNestedScrolling(false); } } @JavascriptInterface public void stopIntercept() { if (prettifyWebView != null) { prettifyWebView.setInterceptTouch(false); -// prettifyWebView.setEnableNestedScrolling(true); + if (toggleNestScrolling) prettifyWebView.setEnableNestedScrolling(true); } } }