diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java index 8173e716..ffc64f35 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java @@ -172,7 +172,7 @@ import lombok.NoArgsConstructor; if (!files.isEmpty()) { FilesListModel filesListModel = files.get(0); if (!InputHelper.isEmpty(filesListModel.getFilename()) && filesListModel.getFilename().trim().length() > 2) { - spannableBuilder.append(" ").append("/").append(" ") + spannableBuilder.append(" ") .append(filesListModel.getFilename()); } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistActivity.java b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistActivity.java index 83aac22a..cc8efeb0 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistActivity.java @@ -78,22 +78,24 @@ public class GistActivity extends BaseActivity .show(getSupportFragmentManager(), MessageDialogView.TAG); } - @OnClick({R.id.startGist, R.id.forkGist}) public void onGistActions(View view) { - view.setEnabled(false); + @OnClick({R.id.startGist, R.id.forkGist, R.id.browser}) public void onGistActions(View view) { + if (getPresenter().getGist() == null) return; + if (view.getId() != R.id.browser) { + view.setEnabled(false); + } switch (view.getId()) { case R.id.startGist: - if (getPresenter().getGist() != null) { - GithubActionService.startForGist(this, getPresenter().getGist().getGistId(), - getPresenter().isStarred() ? GithubActionService.UNSTAR_GIST : GithubActionService.STAR_GIST); - getPresenter().onStarGist(); - } + GithubActionService.startForGist(this, getPresenter().getGist().getGistId(), + getPresenter().isStarred() ? GithubActionService.UNSTAR_GIST : GithubActionService.STAR_GIST); + getPresenter().onStarGist(); break; case R.id.forkGist: - if (getPresenter().getGist() != null) { - GithubActionService.startForGist(this, getPresenter().getGist().getGistId(), - GithubActionService.FORK_GIST); - getPresenter().onForkGist(); - } + GithubActionService.startForGist(this, getPresenter().getGist().getGistId(), + GithubActionService.FORK_GIST); + getPresenter().onForkGist(); + break; + case R.id.browser: + ActivityHelper.startCustomTab(this, getPresenter().getGist().getHtmlUrl()); break; } } diff --git a/app/src/main/java/com/prettifier/pretty/NestedWebView.java b/app/src/main/java/com/prettifier/pretty/NestedWebView.java index c6c3d800..500f3023 100644 --- a/app/src/main/java/com/prettifier/pretty/NestedWebView.java +++ b/app/src/main/java/com/prettifier/pretty/NestedWebView.java @@ -42,7 +42,6 @@ public class NestedWebView extends WebView implements NestedScrollingChild { @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouchEvent(MotionEvent ev) { boolean returnValue; - MotionEvent event = MotionEvent.obtain(ev); final int action = MotionEventCompat.getActionMasked(event); if (action == MotionEvent.ACTION_DOWN) { @@ -125,5 +124,7 @@ public class NestedWebView extends WebView implements NestedScrollingChild { return mChildHelper.dispatchNestedPreFling(velocityX, velocityY); } + + } diff --git a/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java b/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java index 99c1985f..bb4dd7df 100755 --- a/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java +++ b/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java @@ -32,6 +32,7 @@ import com.prettifier.pretty.helper.PrettifyHelper; public class PrettifyWebView extends NestedWebView { private OnContentChangedListener onContentChangedListener; private boolean interceptTouch; + private boolean enableNestedScrolling; public interface OnContentChangedListener { void onContentChanged(int progress); @@ -53,7 +54,7 @@ public class PrettifyWebView extends NestedWebView { initView(attrs); } - @Override public boolean onInterceptTouchEvent(MotionEvent p_event) { + @Override public boolean onInterceptTouchEvent(MotionEvent p) { return true; } @@ -174,6 +175,14 @@ public class PrettifyWebView extends NestedWebView { this.interceptTouch = interceptTouch; } + public void setEnableNestedScrolling(boolean enableNestedScrolling) { + if (this.enableNestedScrolling != enableNestedScrolling) { + Logger.e(enableNestedScrolling); + setNestedScrollingEnabled(enableNestedScrolling); + this.enableNestedScrolling = enableNestedScrolling; + } + } + private void startActivity(@Nullable Uri url) { if (url == null) return; Logger.e(url); 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 21d403c0..a328c003 100644 --- a/app/src/main/java/com/prettifier/pretty/callback/MarkDownInterceptorInterface.java +++ b/app/src/main/java/com/prettifier/pretty/callback/MarkDownInterceptorInterface.java @@ -18,12 +18,14 @@ public class MarkDownInterceptorInterface { @JavascriptInterface public void startIntercept() { if (prettifyWebView != null) { prettifyWebView.setInterceptTouch(true); + prettifyWebView.setEnableNestedScrolling(false); } } @JavascriptInterface public void stopIntercept() { if (prettifyWebView != null) { prettifyWebView.setInterceptTouch(false); + prettifyWebView.setEnableNestedScrolling(true); } } } diff --git a/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml b/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml index 957a9ddf..4d69d563 100644 --- a/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml +++ b/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml @@ -34,6 +34,17 @@ android:layout_height="?actionBarSize" android:background="?colorPrimary"> + +