aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDocile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>2024-10-28 15:46:08 +0000
committerDocile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>2024-10-28 15:46:08 +0000
commit065af144f24ca9721a9b270338f98b271dd2db4e (patch)
tree09579cdec58f1748a8feaff1f8d3545ab9ed5ec7 /app
parentbd37d81bfc85cf429c5781bfc7f003027c2c4644 (diff)
downloadinfinity-for-reddit-065af144f24ca9721a9b270338f98b271dd2db4e.tar
infinity-for-reddit-065af144f24ca9721a9b270338f98b271dd2db4e.tar.gz
infinity-for-reddit-065af144f24ca9721a9b270338f98b271dd2db4e.tar.bz2
infinity-for-reddit-065af144f24ca9721a9b270338f98b271dd2db4e.tar.lz
infinity-for-reddit-065af144f24ca9721a9b270338f98b271dd2db4e.tar.xz
infinity-for-reddit-065af144f24ca9721a9b270338f98b271dd2db4e.tar.zst
infinity-for-reddit-065af144f24ca9721a9b270338f98b271dd2db4e.zip
Refine horizontal gestures on gallery posts.
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java50
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java93
2 files changed, 59 insertions, 84 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java
index 75d7fcbf..8ef71a7e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java
@@ -2271,27 +2271,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
mCardViewColor, mCommentColor, mScale);
binding.galleryRecyclerViewItemPostDetailGallery.setAdapter(adapter);
new PagerSnapHelper().attachToRecyclerView(binding.galleryRecyclerViewItemPostDetailGallery);
- binding.galleryRecyclerViewItemPostDetailGallery.setOnTouchListener((v, motionEvent) -> {
- if (motionEvent.getActionMasked() == MotionEvent.ACTION_UP) {
- if (mActivity.mSliderPanel != null) {
- mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(false);
- }
- if (mActivity.mViewPager2 != null) {
- mActivity.mViewPager2.setUserInputEnabled(true);
- }
- mActivity.unlockSwipeRightToGoBack();
- } else {
- if (mActivity.mSliderPanel != null) {
- mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(true);
- }
- if (mActivity.mViewPager2 != null) {
- mActivity.mViewPager2.setUserInputEnabled(false);
- }
- mActivity.lockSwipeRightToGoBack();
- }
-
- return false;
- });
LinearLayoutManagerBugFixed layoutManager = new LinearLayoutManagerBugFixed(mActivity, RecyclerView.HORIZONTAL, false);
binding.galleryRecyclerViewItemPostDetailGallery.setLayoutManager(layoutManager);
binding.galleryRecyclerViewItemPostDetailGallery.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -2323,6 +2302,14 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
downX = e.getRawX();
downY = e.getRawY();
downTime = System.currentTimeMillis();
+
+ if (mActivity.mSliderPanel != null) {
+ mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(true);
+ }
+ if (mActivity.mViewPager2 != null) {
+ mActivity.mViewPager2.setUserInputEnabled(false);
+ }
+ mActivity.lockSwipeRightToGoBack();
break;
case MotionEvent.ACTION_MOVE:
if (Math.abs(e.getRawX() - downX) > minTouchSlop || Math.abs(e.getRawY() - downY) > minTouchSlop) {
@@ -2334,9 +2321,18 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
longPressed = true;
}
}
+
+ if (mActivity.mSliderPanel != null) {
+ mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(true);
+ }
+ if (mActivity.mViewPager2 != null) {
+ mActivity.mViewPager2.setUserInputEnabled(false);
+ }
+ mActivity.lockSwipeRightToGoBack();
break;
case MotionEvent.ACTION_UP:
- if (!dragged) {
+ case MotionEvent.ACTION_CANCEL:
+ if (e.getActionMasked() == MotionEvent.ACTION_UP && !dragged) {
if (System.currentTimeMillis() - downTime < longClickThreshold) {
int position = getBindingAdapterPosition();
if (position >= 0) {
@@ -2351,6 +2347,16 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
downY = 0;
dragged = false;
longPressed = false;
+
+ if (mActivity.mSliderPanel != null) {
+ mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(false);
+ }
+
+ if (mActivity.mViewPager2 != null) {
+ mActivity.mViewPager2.setUserInputEnabled(true);
+ }
+ mActivity.unlockSwipeRightToGoBack();
+ break;
}
return false;
}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
index c230751a..9afcbdd9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
@@ -10,6 +10,7 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -2029,19 +2030,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
}
});
- itemView.setOnTouchListener((v, event) -> {
- if (event.getActionMasked() == MotionEvent.ACTION_UP || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
- if (mFragment.isRecyclerViewItemSwipeable(this)) {
- mActivity.unlockSwipeRightToGoBack();
- }
- } else {
- if (mFragment.isRecyclerViewItemSwipeable(this)) {
- mActivity.lockSwipeRightToGoBack();
- }
- }
- return false;
- });
-
upvoteButton.setOnClickListener(view -> {
int position = getBindingAdapterPosition();
if (position < 0) {
@@ -3366,30 +3354,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
adapter = new PostGalleryTypeImageRecyclerViewAdapter(mGlide, mActivity.typeface,
mSaveMemoryCenterInsideDownsampleStrategy, mColorAccent, mPrimaryTextColor, mScale);
galleryRecyclerView.setAdapter(adapter);
- galleryRecyclerView.setOnTouchListener((v, motionEvent) -> {
- if (motionEvent.getActionMasked() == MotionEvent.ACTION_UP) {
- if (mActivity.mSliderPanel != null) {
- mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(false);
- }
-
- if (mActivity.mViewPager2 != null) {
- mActivity.mViewPager2.setUserInputEnabled(true);
- }
- mActivity.unlockSwipeRightToGoBack();
- swipeLocked = false;
- } else {
- if (mActivity.mSliderPanel != null) {
- mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(true);
- }
- if (mActivity.mViewPager2 != null) {
- mActivity.mViewPager2.setUserInputEnabled(false);
- }
- mActivity.lockSwipeRightToGoBack();
- swipeLocked = true;
- }
-
- return false;
- });
new PagerSnapHelper().attachToRecyclerView(galleryRecyclerView);
galleryRecyclerView.setRecycledViewPool(mGalleryRecycledViewPool);
LinearLayoutManagerBugFixed layoutManager = new LinearLayoutManagerBugFixed(mActivity, RecyclerView.HORIZONTAL, false);
@@ -3434,7 +3398,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
swipeLocked = true;
break;
case MotionEvent.ACTION_MOVE:
- if(Math.abs(e.getRawX() - downX) > minTouchSlop || Math.abs(e.getRawY() - downY) > minTouchSlop) {
+ if (Math.abs(e.getRawX() - downX) > minTouchSlop || Math.abs(e.getRawY() - downY) > minTouchSlop) {
dragged = true;
}
@@ -3455,7 +3419,8 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
swipeLocked = true;
break;
case MotionEvent.ACTION_UP:
- if (!dragged) {
+ case MotionEvent.ACTION_CANCEL:
+ if (e.getActionMasked() == MotionEvent.ACTION_UP && !dragged) {
if (System.currentTimeMillis() - downTime < longClickThreshold) {
int position = getBindingAdapterPosition();
if (position >= 0) {
@@ -4089,27 +4054,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
adapter = new PostGalleryTypeImageRecyclerViewAdapter(mGlide, mActivity.typeface,
mSaveMemoryCenterInsideDownsampleStrategy, mColorAccent, mPrimaryTextColor, mScale);
- recyclerView.setOnTouchListener((v, motionEvent) -> {
- if (motionEvent.getActionMasked() == MotionEvent.ACTION_UP) {
- if (mActivity.mSliderPanel != null) {
- mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(false);
- }
- if (mActivity.mViewPager2 != null) {
- mActivity.mViewPager2.setUserInputEnabled(true);
- }
- mActivity.unlockSwipeRightToGoBack();
- } else {
- if (mActivity.mSliderPanel != null) {
- mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(true);
- }
- if (mActivity.mViewPager2 != null) {
- mActivity.mViewPager2.setUserInputEnabled(false);
- }
- mActivity.lockSwipeRightToGoBack();
- }
-
- return false;
- });
recyclerView.setAdapter(adapter);
new PagerSnapHelper().attachToRecyclerView(recyclerView);
recyclerView.setRecycledViewPool(mGalleryRecycledViewPool);
@@ -4144,6 +4088,14 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
downX = e.getRawX();
downY = e.getRawY();
downTime = System.currentTimeMillis();
+
+ if (mActivity.mSliderPanel != null) {
+ mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(true);
+ }
+ if (mActivity.mViewPager2 != null) {
+ mActivity.mViewPager2.setUserInputEnabled(false);
+ }
+ mActivity.lockSwipeRightToGoBack();
break;
case MotionEvent.ACTION_MOVE:
if (Math.abs(e.getRawX() - downX) > minTouchSlop || Math.abs(e.getRawY() - downY) > minTouchSlop) {
@@ -4155,18 +4107,35 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
longPressed = true;
}
}
+
+ if (mActivity.mSliderPanel != null) {
+ mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(true);
+ }
+ if (mActivity.mViewPager2 != null) {
+ mActivity.mViewPager2.setUserInputEnabled(false);
+ }
+ mActivity.lockSwipeRightToGoBack();
break;
case MotionEvent.ACTION_UP:
- if (!dragged) {
+ case MotionEvent.ACTION_CANCEL:
+ if (e.getActionMasked() == MotionEvent.ACTION_UP && !dragged) {
if (System.currentTimeMillis() - downTime < longClickThreshold) {
onClick();
}
}
- case MotionEvent.ACTION_CANCEL:
downX = 0;
downY = 0;
dragged = false;
longPressed = false;
+
+ if (mActivity.mSliderPanel != null) {
+ mActivity.mSliderPanel.requestDisallowInterceptTouchEvent(false);
+ }
+
+ if (mActivity.mViewPager2 != null) {
+ mActivity.mViewPager2.setUserInputEnabled(true);
+ }
+ mActivity.unlockSwipeRightToGoBack();
}
return false;
}
generated by cgit (git). Responsive design from responsive-cgit-css. Dark theme color palette from Dracula theme