Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix double tap layout warning.

Browse Source
This commit is contained in:
mtang-signal
2024-04-30 14:44:00 -04:00
committed by GitHub
parent cfaf40e605
commit e4d6f9240f
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@@ -237,6 +237,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
private Stub<GiftMessageView> giftViewStub;
private Stub<PaymentMessageView> paymentViewStub;
private @Nullable EventListener eventListener;
private @Nullable GestureDetector gestureDetector;
private int defaultBubbleColor;
private int defaultBubbleColorForWallpaper;
@@ -499,6 +500,11 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
this.eventListener = eventListener;
}
@Override
public void setGestureDetector(GestureDetector gestureDetector) {
this.gestureDetector = gestureDetector;
}
public boolean disallowSwipe(float downX, float downY) {
if (!hasAudio(messageRecord)) return false;
@@ -2442,20 +2448,12 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
}
private class DoubleTapEditTouchListener implements View.OnTouchListener {
private final GestureDetector gestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onDoubleTap(MotionEvent e) {
if (eventListener != null && batchSelected.isEmpty()) {
eventListener.onItemDoubleClick(getMultiselectPartForLatestTouch());
return true;
}
return false;
}
});
@Override
public boolean onTouch(View v, MotionEvent event) {
return gestureDetector.onTouchEvent(event);
if (gestureDetector != null && batchSelected.isEmpty()) {
return gestureDetector.onTouchEvent(event);
}
return false;
}
}

17
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
View File

@@ -6,6 +6,9 @@
package org.thoughtcrime.securesms.conversation.v2
import android.text.TextUtils
import android.view.GestureDetector
import android.view.GestureDetector.SimpleOnGestureListener
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import androidx.core.text.HtmlCompat
@@ -382,8 +385,22 @@ class ConversationAdapterV2(
}
private inner class OutgoingMediaViewHolder(itemView: View) : ConversationViewHolder<OutgoingMedia>(itemView) {
val gestureDetector = GestureDetector(
context,
object : SimpleOnGestureListener() {
override fun onDoubleTap(e: MotionEvent): Boolean {
if (clickListener != null) {
clickListener.onItemDoubleClick(getMultiselectPartForLatestTouch())
return true
}
return false
}
}
)
override fun bind(model: OutgoingMedia) {
bindable.setEventListener(clickListener)
bindable.setGestureDetector(gestureDetector)
if (bindPayloadsIfAvailable()) {
return