Add a touch delegate to increase action touch targets to 48dp (#2872)
* Add a touch delegate to increase action touch targets to 48dp Fixes #2825 * Adjust layout to make action buttons larger * Remove 4dp vertical margin
This commit is contained in:
parent
965d51100c
commit
36befdebe2
4 changed files with 118 additions and 40 deletions
|
@ -55,6 +55,7 @@ import com.keylesspalace.tusky.util.LinkHelper;
|
|||
import com.keylesspalace.tusky.util.StatusDisplayOptions;
|
||||
import com.keylesspalace.tusky.util.ThemeUtils;
|
||||
import com.keylesspalace.tusky.util.TimestampUtils;
|
||||
import com.keylesspalace.tusky.util.TouchDelegateHelper;
|
||||
import com.keylesspalace.tusky.view.MediaPreviewImageView;
|
||||
import com.keylesspalace.tusky.view.MediaPreviewLayout;
|
||||
import com.keylesspalace.tusky.viewdata.PollOptionViewData;
|
||||
|
@ -63,6 +64,7 @@ import com.keylesspalace.tusky.viewdata.PollViewDataKt;
|
|||
import com.keylesspalace.tusky.viewdata.StatusViewData;
|
||||
|
||||
import java.text.NumberFormat;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
@ -170,6 +172,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
|
|||
this.avatarRadius24dp = itemView.getContext().getResources().getDimensionPixelSize(R.dimen.avatar_radius_24dp);
|
||||
|
||||
mediaPreviewUnloaded = new ColorDrawable(ThemeUtils.getColor(itemView.getContext(), R.attr.colorBackgroundAccent));
|
||||
|
||||
TouchDelegateHelper.expandTouchSizeToFillRow((ViewGroup) itemView, Arrays.asList(replyButton, reblogButton, favouriteButton, bookmarkButton, moreButton));
|
||||
}
|
||||
|
||||
protected void setDisplayName(String name, List<Emoji> customEmojis, StatusDisplayOptions statusDisplayOptions) {
|
||||
|
|
|
@ -0,0 +1,51 @@
|
|||
@file:JvmName("TouchDelegateHelper")
|
||||
|
||||
package com.keylesspalace.tusky.util
|
||||
|
||||
import android.graphics.Rect
|
||||
import android.view.MotionEvent
|
||||
import android.view.TouchDelegate
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
|
||||
/**
|
||||
* Expands the touch area of the give row of views to fill the space in-between them, using a
|
||||
* [TouchDelegate].
|
||||
*/
|
||||
fun ViewGroup.expandTouchSizeToFillRow(children: List<View>) {
|
||||
addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
|
||||
touchDelegate = CompositeTouchDelegate(
|
||||
this,
|
||||
children.mapIndexed { i, view ->
|
||||
val rect = Rect()
|
||||
view.getHitRect(rect)
|
||||
val left = children.getOrNull(i - 1)
|
||||
if (left != null) {
|
||||
// extend half-way to previous view
|
||||
rect.left -= (view.left - left.right) / 2
|
||||
}
|
||||
val right = children.getOrNull(i + 1)
|
||||
if (right != null) {
|
||||
// extend half-way to next view
|
||||
rect.right += (right.left - view.right) / 2
|
||||
}
|
||||
TouchDelegate(rect, view)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private class CompositeTouchDelegate(view: View, private val delegates: List<TouchDelegate>) :
|
||||
TouchDelegate(Rect(), view) {
|
||||
|
||||
override fun onTouchEvent(event: MotionEvent): Boolean {
|
||||
var res = false
|
||||
val x = event.x
|
||||
val y = event.y
|
||||
for (delegate in delegates) {
|
||||
event.setLocation(x, y)
|
||||
res = delegate.onTouchEvent(event) || res
|
||||
}
|
||||
return res
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue