From 67d1df27fbc8e3feca36ae86edf16b1981abfa52 Mon Sep 17 00:00:00 2001 From: Suchit Kar Date: Wed, 28 Feb 2018 01:57:53 +0530 Subject: [PATCH] Extract alert dialog creation to a function --- .../commons/upload/SingleUploadFragment.java | 42 +++++++------------ 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java index c345e5d7f..50e22396a 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java @@ -233,26 +233,14 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment { if (ViewCompat.getLayoutDirection(getView()) == ViewCompat.LAYOUT_DIRECTION_LTR) { value = titleEdit.getRight() - titleEdit.getCompoundDrawables()[2].getBounds().width(); if (motionEvent.getAction() == ACTION_UP && motionEvent.getRawX() >= value) { - new AlertDialog.Builder(getContext()) - .setTitle(R.string.media_detail_title) - .setMessage(R.string.title_info) - .setCancelable(true) - .setNeutralButton(android.R.string.ok, (dialog, id) -> dialog.cancel()) - .create() - .show(); + showInfoAlert(R.string.media_detail_title, R.string.title_info); return true; } } else { value = titleEdit.getLeft() + titleEdit.getCompoundDrawables()[0].getBounds().width(); if (motionEvent.getAction() == ACTION_UP && motionEvent.getRawX() <= value) { - new AlertDialog.Builder(getContext()) - .setTitle(R.string.media_detail_title) - .setMessage(R.string.title_info) - .setCancelable(true) - .setNeutralButton(android.R.string.ok, (dialog, id) -> dialog.cancel()) - .create() - .show(); + showInfoAlert(R.string.media_detail_title, R.string.title_info); return true; } } @@ -265,26 +253,14 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment { if (ViewCompat.getLayoutDirection(getView()) == ViewCompat.LAYOUT_DIRECTION_LTR) { value = descEdit.getRight() - descEdit.getCompoundDrawables()[2].getBounds().width(); if (motionEvent.getAction() == ACTION_UP && motionEvent.getRawX() >= value) { - new AlertDialog.Builder(getContext()) - .setTitle(R.string.media_detail_description) - .setMessage(R.string.description_info) - .setCancelable(true) - .setNeutralButton(android.R.string.ok, (dialog, id) -> dialog.cancel()) - .create() - .show(); + showInfoAlert(R.string.media_detail_description,R.string.description_info); return true; } } else{ value = descEdit.getLeft() + descEdit.getCompoundDrawables()[0].getBounds().width(); if (motionEvent.getAction() == ACTION_UP && motionEvent.getRawX() <= value) { - new AlertDialog.Builder(getContext()) - .setTitle(R.string.media_detail_description) - .setMessage(R.string.description_info) - .setCancelable(true) - .setNeutralButton(android.R.string.ok, (dialog, id) -> dialog.cancel()) - .create() - .show(); + showInfoAlert(R.string.media_detail_description,R.string.description_info); return true; } } @@ -351,4 +327,14 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment { } } } + + private void showInfoAlert (int titleStringID, int messageStringID){ + new AlertDialog.Builder(getContext()) + .setTitle(titleStringID) + .setMessage(messageStringID) + .setCancelable(true) + .setNeutralButton(android.R.string.ok, (dialog, id) -> dialog.cancel()) + .create() + .show(); + } }