Skip to content

Commit b53803b

Browse files
Bug fix, reduced the add description edit text clickable bound (#2973)
1 parent a7712f0 commit b53803b

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

app/src/main/java/fr/free/nrw/commons/upload/DescriptionsAdapter.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package fr.free.nrw.commons.upload;
22

3+
import android.content.Context;
34
import android.graphics.drawable.Drawable;
45
import android.text.TextUtils;
6+
import android.util.DisplayMetrics;
57
import android.view.LayoutInflater;
68
import android.view.MotionEvent;
79
import android.view.View;
@@ -105,7 +107,8 @@ public void init(int position) {
105107
null);
106108
descItemEditText.setOnTouchListener((v, event) -> {
107109
//2 is for drawable right
108-
if (event.getAction() == MotionEvent.ACTION_UP && (event.getRawX() >= (descItemEditText.getRight() - descItemEditText.getCompoundDrawables()[2].getBounds().width()))) {
110+
float twelveDpInPixels = convertDpToPixel(12, descItemEditText.getContext());
111+
if (event.getAction() == MotionEvent.ACTION_UP && descItemEditText.getCompoundDrawables()[2].getBounds().contains((int)(descItemEditText.getWidth()-(event.getX()+twelveDpInPixels)),(int)(event.getY()-twelveDpInPixels))){
109112
if (getAdapterPosition() == 0) {
110113
callback.showAlert(R.string.media_detail_description,
111114
R.string.description_info);
@@ -192,4 +195,14 @@ public interface Callback {
192195

193196
void showAlert(int mediaDetailDescription, int descriptionInfo);
194197
}
198+
199+
/**
200+
* converts dp to pixel
201+
* @param dp
202+
* @param context
203+
* @return
204+
*/
205+
private float convertDpToPixel(float dp, Context context) {
206+
return dp * ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
207+
}
195208
}

0 commit comments

Comments
 (0)