|
1 | 1 | package fr.free.nrw.commons.upload.mediaDetails; |
2 | 2 |
|
| 3 | +import static fr.free.nrw.commons.utils.ImageUtils.getErrorMessageForResult; |
| 4 | + |
3 | 5 | import android.content.Context; |
4 | 6 | import android.os.Bundle; |
5 | 7 | import android.text.TextUtils; |
|
11 | 13 | import android.widget.EditText; |
12 | 14 | import android.widget.LinearLayout; |
13 | 15 | import android.widget.TextView; |
14 | | - |
15 | 16 | import androidx.annotation.NonNull; |
16 | 17 | import androidx.annotation.Nullable; |
17 | 18 | import androidx.appcompat.widget.AppCompatButton; |
18 | 19 | import androidx.appcompat.widget.AppCompatImageButton; |
19 | 20 | import androidx.recyclerview.widget.LinearLayoutManager; |
20 | 21 | import androidx.recyclerview.widget.RecyclerView; |
21 | | - |
22 | | -import com.github.chrisbanes.photoview.PhotoView; |
23 | | -import com.jakewharton.rxbinding2.widget.RxTextView; |
24 | | - |
25 | | -import org.apache.commons.lang3.StringUtils; |
26 | | - |
27 | | -import java.util.ArrayList; |
28 | | -import java.util.List; |
29 | | -import java.util.Locale; |
30 | | - |
31 | | -import javax.inject.Inject; |
32 | | -import javax.inject.Named; |
33 | | - |
34 | 22 | import butterknife.BindView; |
35 | 23 | import butterknife.ButterKnife; |
36 | 24 | import butterknife.OnClick; |
| 25 | +import com.github.chrisbanes.photoview.PhotoView; |
| 26 | +import com.jakewharton.rxbinding2.widget.RxTextView; |
37 | 27 | import fr.free.nrw.commons.R; |
38 | 28 | import fr.free.nrw.commons.Utils; |
39 | 29 | import fr.free.nrw.commons.filepicker.UploadableFile; |
|
52 | 42 | import fr.free.nrw.commons.utils.ImageUtils; |
53 | 43 | import fr.free.nrw.commons.utils.ViewUtil; |
54 | 44 | import io.reactivex.disposables.Disposable; |
| 45 | +import java.util.ArrayList; |
| 46 | +import java.util.List; |
| 47 | +import java.util.Locale; |
| 48 | +import javax.inject.Inject; |
| 49 | +import javax.inject.Named; |
| 50 | +import org.apache.commons.lang3.StringUtils; |
55 | 51 | import timber.log.Timber; |
56 | 52 |
|
57 | | -import static fr.free.nrw.commons.utils.ImageUtils.getErrorMessageForResult; |
58 | | - |
59 | 53 | public class UploadMediaDetailFragment extends UploadBaseFragment implements |
60 | 54 | UploadMediaDetailsContract.View { |
61 | 55 |
|
@@ -179,8 +173,12 @@ private void addEtTitleTouchListener() { |
179 | 173 | etTitle.setOnTouchListener((v, event) -> { |
180 | 174 | //2 is for drawable right |
181 | 175 | float twelveDpInPixels = convertDpToPixel(12, getContext()); |
182 | | - if (event.getAction() == MotionEvent.ACTION_UP && etTitle.getCompoundDrawables()[2].getBounds().contains((int)(etTitle.getWidth()-(event.getX()+twelveDpInPixels)),(int)(event.getY()-twelveDpInPixels))){ |
183 | | - showInfoAlert(R.string.media_detail_title,R.string.title_info); |
| 176 | + if (event.getAction() == MotionEvent.ACTION_UP && etTitle.getCompoundDrawables() != null |
| 177 | + && etTitle.getCompoundDrawables().length > 2 && etTitle |
| 178 | + .getCompoundDrawables()[2].getBounds() |
| 179 | + .contains((int) (etTitle.getWidth() - (event.getX() + twelveDpInPixels)), |
| 180 | + (int) (event.getY() - twelveDpInPixels))) { |
| 181 | + showInfoAlert(R.string.media_detail_title, R.string.title_info); |
184 | 182 | return true; |
185 | 183 | } |
186 | 184 | return false; |
|
0 commit comments