mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2025-10-05 21:39:50 +02:00
Implement barebone swipe to upvote or downvote.
This commit is contained in:
@@ -10,6 +10,7 @@ import android.graphics.PorterDuff;
|
|||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
@@ -30,6 +31,7 @@ import androidx.constraintlayout.widget.ConstraintSet;
|
|||||||
import androidx.core.graphics.drawable.DrawableCompat;
|
import androidx.core.graphics.drawable.DrawableCompat;
|
||||||
import androidx.paging.PagedListAdapter;
|
import androidx.paging.PagedListAdapter;
|
||||||
import androidx.recyclerview.widget.DiffUtil;
|
import androidx.recyclerview.widget.DiffUtil;
|
||||||
|
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.bumptech.glide.Glide;
|
import com.bumptech.glide.Glide;
|
||||||
@@ -509,10 +511,12 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
|
|||||||
switch (post.getVoteType()) {
|
switch (post.getVoteType()) {
|
||||||
case 1:
|
case 1:
|
||||||
//Upvoted
|
//Upvoted
|
||||||
|
Log.i("asdasdf", "upvoted");
|
||||||
((PostBaseViewHolder) holder).upvoteButton.setColorFilter(mUpvotedColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
((PostBaseViewHolder) holder).upvoteButton.setColorFilter(mUpvotedColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
||||||
((PostBaseViewHolder) holder).scoreTextView.setTextColor(mUpvotedColor);
|
((PostBaseViewHolder) holder).scoreTextView.setTextColor(mUpvotedColor);
|
||||||
break;
|
break;
|
||||||
case -1:
|
case -1:
|
||||||
|
Log.i("asdasdf", "downvoted");
|
||||||
//Downvoted
|
//Downvoted
|
||||||
((PostBaseViewHolder) holder).downvoteButton.setColorFilter(mDownvotedColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
((PostBaseViewHolder) holder).downvoteButton.setColorFilter(mDownvotedColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
||||||
((PostBaseViewHolder) holder).scoreTextView.setTextColor(mDownvotedColor);
|
((PostBaseViewHolder) holder).scoreTextView.setTextColor(mDownvotedColor);
|
||||||
@@ -1240,6 +1244,19 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void onItemSwipe(RecyclerView.ViewHolder viewHolder, int direction) {
|
||||||
|
if (viewHolder instanceof PostBaseViewHolder) {
|
||||||
|
Post post = getItem(viewHolder.getAdapterPosition());
|
||||||
|
if (post != null) {
|
||||||
|
if (direction == ItemTouchHelper.LEFT || direction == ItemTouchHelper.START) {
|
||||||
|
((PostBaseViewHolder) viewHolder).upvoteButton.performClick();
|
||||||
|
} else {
|
||||||
|
((PostBaseViewHolder) viewHolder).downvoteButton.performClick();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public interface Callback {
|
public interface Callback {
|
||||||
void retryLoadingMore();
|
void retryLoadingMore();
|
||||||
|
|
||||||
@@ -1510,12 +1527,14 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
|
|||||||
|
|
||||||
if (previousVoteType != 1) {
|
if (previousVoteType != 1) {
|
||||||
//Not upvoted before
|
//Not upvoted before
|
||||||
|
Log.i("asdasdf", "not 1 before");
|
||||||
post.setVoteType(1);
|
post.setVoteType(1);
|
||||||
newVoteType = APIUtils.DIR_UPVOTE;
|
newVoteType = APIUtils.DIR_UPVOTE;
|
||||||
upvoteButton
|
upvoteButton
|
||||||
.setColorFilter(mUpvotedColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
.setColorFilter(mUpvotedColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
||||||
scoreTextView.setTextColor(mUpvotedColor);
|
scoreTextView.setTextColor(mUpvotedColor);
|
||||||
} else {
|
} else {
|
||||||
|
Log.i("asdasdf", "1 before");
|
||||||
//Upvoted before
|
//Upvoted before
|
||||||
post.setVoteType(0);
|
post.setVoteType(0);
|
||||||
newVoteType = APIUtils.DIR_UNVOTE;
|
newVoteType = APIUtils.DIR_UNVOTE;
|
||||||
@@ -1529,11 +1548,13 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
|
|||||||
@Override
|
@Override
|
||||||
public void onVoteThingSuccess(int position1) {
|
public void onVoteThingSuccess(int position1) {
|
||||||
if (newVoteType.equals(APIUtils.DIR_UPVOTE)) {
|
if (newVoteType.equals(APIUtils.DIR_UPVOTE)) {
|
||||||
|
Log.i("asdasdf", "1");
|
||||||
post.setVoteType(1);
|
post.setVoteType(1);
|
||||||
upvoteButton
|
upvoteButton
|
||||||
.setColorFilter(mUpvotedColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
.setColorFilter(mUpvotedColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
||||||
scoreTextView.setTextColor(mUpvotedColor);
|
scoreTextView.setTextColor(mUpvotedColor);
|
||||||
} else {
|
} else {
|
||||||
|
Log.i("asdasdf", "0");
|
||||||
post.setVoteType(0);
|
post.setVoteType(0);
|
||||||
upvoteButton.setColorFilter(mPostIconAndInfoColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
upvoteButton.setColorFilter(mPostIconAndInfoColor, android.graphics.PorterDuff.Mode.SRC_IN);
|
||||||
scoreTextView.setTextColor(mPostIconAndInfoColor);
|
scoreTextView.setTextColor(mPostIconAndInfoColor);
|
||||||
|
@@ -6,7 +6,10 @@ import android.content.Intent;
|
|||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
|
import android.graphics.Canvas;
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
|
import android.graphics.drawable.ColorDrawable;
|
||||||
|
import android.graphics.drawable.Drawable;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.CountDownTimer;
|
import android.os.CountDownTimer;
|
||||||
@@ -27,9 +30,11 @@ import androidx.annotation.DimenRes;
|
|||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.coordinatorlayout.widget.CoordinatorLayout;
|
import androidx.coordinatorlayout.widget.CoordinatorLayout;
|
||||||
|
import androidx.core.content.res.ResourcesCompat;
|
||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import androidx.lifecycle.ViewModelProvider;
|
import androidx.lifecycle.ViewModelProvider;
|
||||||
import androidx.paging.PagedList;
|
import androidx.paging.PagedList;
|
||||||
|
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
import androidx.recyclerview.widget.LinearSmoothScroller;
|
import androidx.recyclerview.widget.LinearSmoothScroller;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
@@ -172,6 +177,12 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
|
|||||||
private int maxPosition = -1;
|
private int maxPosition = -1;
|
||||||
private int postLayout;
|
private int postLayout;
|
||||||
private SortType sortType;
|
private SortType sortType;
|
||||||
|
private ColorDrawable backgroundLeft;
|
||||||
|
private ColorDrawable backgroundRight;
|
||||||
|
private Drawable drawableLeft;
|
||||||
|
private Drawable drawableRight;
|
||||||
|
private float swipeActionThreshold = 0.3f;
|
||||||
|
private ItemTouchHelper touchHelper;
|
||||||
|
|
||||||
public PostFragment() {
|
public PostFragment() {
|
||||||
// Required empty public constructor
|
// Required empty public constructor
|
||||||
@@ -610,6 +621,72 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
|
|||||||
((ActivityToolbarInterface) activity).displaySortType();
|
((ActivityToolbarInterface) activity).displaySortType();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
backgroundLeft = new ColorDrawable(customThemeWrapper.getDownvoted());
|
||||||
|
backgroundRight = new ColorDrawable(customThemeWrapper.getUpvoted());
|
||||||
|
drawableLeft = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_downward_black_24dp, null);
|
||||||
|
drawableRight = ResourcesCompat.getDrawable(activity.getResources(), R.drawable.ic_arrow_upward_black_24dp, null);
|
||||||
|
touchHelper = new ItemTouchHelper(new ItemTouchHelper.Callback() {
|
||||||
|
@Override
|
||||||
|
public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
|
||||||
|
int swipeFlags = ItemTouchHelper.START | ItemTouchHelper.END;
|
||||||
|
return makeMovementFlags(0, swipeFlags);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isItemViewSwipeEnabled() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
|
||||||
|
if (touchHelper != null) {
|
||||||
|
touchHelper.attachToRecyclerView(null);
|
||||||
|
touchHelper.attachToRecyclerView(mPostRecyclerView);
|
||||||
|
if (mAdapter != null) {
|
||||||
|
mAdapter.onItemSwipe(viewHolder, direction);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
|
||||||
|
super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
|
||||||
|
|
||||||
|
View itemView = viewHolder.itemView;
|
||||||
|
int horizontalOffset = (int) Utils.convertDpToPixel(16, activity);
|
||||||
|
if (dX > 0) {
|
||||||
|
if (dX > (itemView.getRight() - itemView.getLeft()) * 0.3) {
|
||||||
|
backgroundLeft.setBounds(0, itemView.getTop(), itemView.getRight(), itemView.getBottom());
|
||||||
|
} else {
|
||||||
|
backgroundLeft.setBounds(0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
drawableLeft.setBounds(itemView.getLeft() + ((int) dX) - horizontalOffset - drawableLeft.getIntrinsicWidth(), (itemView.getBottom() - itemView.getTop() - drawableLeft.getIntrinsicHeight()) / 2, itemView.getLeft() + ((int) dX) - horizontalOffset, (itemView.getBottom() - itemView.getTop() + drawableLeft.getIntrinsicHeight()) / 2);
|
||||||
|
backgroundLeft.draw(c);
|
||||||
|
drawableLeft.draw(c);
|
||||||
|
} else if (dX < 0) {
|
||||||
|
if (-dX > (itemView.getRight() - itemView.getLeft()) * 0.3) {
|
||||||
|
backgroundRight.setBounds(0, itemView.getTop(), itemView.getRight(), itemView.getBottom());
|
||||||
|
} else {
|
||||||
|
backgroundRight.setBounds(0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
drawableRight.setBounds(itemView.getRight() + ((int) dX) + horizontalOffset, (itemView.getBottom() - itemView.getTop() - drawableRight.getIntrinsicHeight()) / 2, itemView.getRight() + ((int) dX) + horizontalOffset + drawableRight.getIntrinsicWidth(), (itemView.getBottom() - itemView.getTop() + drawableRight.getIntrinsicHeight()) / 2);
|
||||||
|
backgroundRight.draw(c);
|
||||||
|
drawableRight.draw(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public float getSwipeThreshold(@NonNull RecyclerView.ViewHolder viewHolder) {
|
||||||
|
return swipeActionThreshold;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
touchHelper.attachToRecyclerView(mPostRecyclerView);
|
||||||
mPostRecyclerView.setAdapter(mAdapter);
|
mPostRecyclerView.setAdapter(mAdapter);
|
||||||
mPostRecyclerView.setCacheManager(mAdapter);
|
mPostRecyclerView.setCacheManager(mAdapter);
|
||||||
mPostRecyclerView.setPlayerInitializer(order -> {
|
mPostRecyclerView.setPlayerInitializer(order -> {
|
||||||
|
Reference in New Issue
Block a user