narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

improve swipe gesture

Browse source
This commit is contained in:
kosyak 2024-02-28 22:44:24 +01:00
parent 7b239d5412
commit 79c7a3748c
3 changed files with 47 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -1482,11 +1482,27 @@ public class ConversationFragment extends XmppFragment
}; };
messageListAdapter.setMessageEmptyPartLongClickListener(messageClickListener); messageListAdapter.setMessageEmptyPartLongClickListener(messageClickListener);
messageListAdapter.setSelectionStatusProvider(provider); messageListAdapter.setSelectionStatusProvider(provider);
messageListAdapter.setOnMessageBoxSwiped(message -> { messageListAdapter.setOnMessageBoxSwiped(
if (selectionActionMode == null) { new MessageAdapter.MessageBoxSwipedListener() {
quoteMessage(message); @Override
} public void onMessageBoxReleasedAfterSwipe(Message message) {
}); if (selectionActionMode == null) {
quoteMessage(message);
}
}
@Override
public void onMessageBoxSwipedEnough() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
vibrator.vibrate(VibrationEffect.createPredefined(VibrationEffect.EFFECT_TICK));
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vibrator.vibrate(VibrationEffect.createOneShot(10L, 127));
} else {
vibrator.vibrate(10L);
}
}
}
);
messageListAdapter.setReplyClickListener(this::scrollToReply); messageListAdapter.setReplyClickListener(this::scrollToReply);
binding.messagesView.setAdapter(messageListAdapter); binding.messagesView.setAdapter(messageListAdapter);
@ -1568,10 +1584,6 @@ public class ConversationFragment extends XmppFragment
showKeyboard(binding.textinput); showKeyboard(binding.textinput);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
vibrator.vibrate(VibrationEffect.createPredefined(VibrationEffect.EFFECT_TICK));
}
} }
private void scrollToReply(Message message) { private void scrollToReply(Message message) {

2
src/main/java/eu/siacs/conversations/ui/DraggableListView.kt
View file

@ -31,7 +31,7 @@ class DraggableListView : ListView {
} }
dragHelper = if (dragHelperCallback != null) { dragHelper = if (dragHelperCallback != null) {
ViewDragHelper.create(this, dragHelperCallback) ViewDragHelper.create(this, 0.8f, dragHelperCallback)
} else { } else {
null null
} }

30
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -45,7 +45,6 @@ import com.google.common.base.Strings;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.net.URI; import java.net.URI;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -117,11 +116,21 @@ public class MessageAdapter extends ArrayAdapter<Message> implements DraggableLi
private ViewDragHelper dragHelper = null; private ViewDragHelper dragHelper = null;
private final ViewDragHelper.Callback dragCallback = new ViewDragHelper.Callback() { private final ViewDragHelper.Callback dragCallback = new ViewDragHelper.Callback() {
private int horizontalOffset = 0;
private boolean swipedEnoughFirstTime = true;
@Override @Override
public boolean tryCaptureView(@NonNull View child, int pointerId) { public boolean tryCaptureView(@NonNull View child, int pointerId) {
return child.getTag(R.id.TAG_DRAGGABLE) != null; return child.getTag(R.id.TAG_DRAGGABLE) != null;
} }
@Override
public void onViewCaptured(@NonNull View capturedChild, int activePointerId) {
horizontalOffset = 0;
swipedEnoughFirstTime = true;
super.onViewCaptured(capturedChild, activePointerId);
}
@Override @Override
public void onViewReleased(@NonNull View releasedChild, float xvel, float yvel) { public void onViewReleased(@NonNull View releasedChild, float xvel, float yvel) {
if (dragHelper != null) { if (dragHelper != null) {
@ -129,19 +138,29 @@ public class MessageAdapter extends ArrayAdapter<Message> implements DraggableLi
ViewCompat.postOnAnimation(releasedChild, new SettleRunnable(releasedChild)); ViewCompat.postOnAnimation(releasedChild, new SettleRunnable(releasedChild));
ViewHolder viewHolder = (ViewHolder) releasedChild.getTag(); ViewHolder viewHolder = (ViewHolder) releasedChild.getTag();
if (viewHolder != null && viewHolder.position >= 0 && viewHolder.position < getCount()) { if (viewHolder != null && viewHolder.position >= 0 && viewHolder.position < getCount() && horizontalOffset < -releasedChild.getWidth()/6) {
Message m = getItem(viewHolder.position); Message m = getItem(viewHolder.position);
if (messageBoxSwipedListener != null) { if (messageBoxSwipedListener != null) {
messageBoxSwipedListener.onMessageBoxSwiped(m); messageBoxSwipedListener.onMessageBoxReleasedAfterSwipe(m);
} }
} }
} }
horizontalOffset = 0;
swipedEnoughFirstTime = true;
super.onViewReleased(releasedChild, xvel, yvel); super.onViewReleased(releasedChild, xvel, yvel);
} }
@Override @Override
public int clampViewPositionHorizontal(@NonNull View child, int left, int dx) { public int clampViewPositionHorizontal(@NonNull View child, int left, int dx) {
return Math.max(-child.getWidth()/4, Math.min(left, 0)); int fixedLeft = Math.min(left, 0);
horizontalOffset = fixedLeft;
if (horizontalOffset < -child.getWidth()/6 && swipedEnoughFirstTime) {
swipedEnoughFirstTime = false;
messageBoxSwipedListener.onMessageBoxSwipedEnough();
}
return Math.max(-child.getWidth()/4, fixedLeft);
} }
@ -1234,7 +1253,8 @@ public class MessageAdapter extends ArrayAdapter<Message> implements DraggableLi
} }
public interface MessageBoxSwipedListener { public interface MessageBoxSwipedListener {
void onMessageBoxSwiped(Message message); void onMessageBoxReleasedAfterSwipe(Message message);
void onMessageBoxSwipedEnough();
} }
public interface ReplyClickListener { public interface ReplyClickListener {