From d3bc0721c61e0f76f932a62855934580362944b2 Mon Sep 17 00:00:00 2001 From: Fawziyah Alebiosu Date: Fri, 20 Mar 2020 03:26:34 -0400 Subject: [PATCH] Issue #3428: Swapped text in dialog buttons (#3496) * Issue #3428: Swapped text in dialog buttons because, according to Android Convention, they were opposite each other * Fixed Issue #3428 so it actually works correctly now: Swapped text in dialog buttons because, according to Android Convention, they were opposite each other * Made sure that all of the places where the two types of showAlertDialog accurately match up with the new position of positive and negative text on the dialog box Also removed occurences of empty lambda expressions and used null instead * modified deletThisPicture to be accurate lambda call * reverted mistake where ellipses replaced the three dots --- .../commons/contributions/ContributionsFragment.java | 2 +- .../java/fr/free/nrw/commons/quiz/QuizChecker.java | 3 ++- .../upload/categories/UploadCategoriesFragment.java | 7 ++++--- .../mediaDetails/UploadMediaDetailFragment.java | 11 +++++------ .../java/fr/free/nrw/commons/utils/DialogUtil.java | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java index e441ff51c..ab49e5993 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java @@ -445,8 +445,8 @@ public class ContributionsFragment DialogUtil.showAlertDialog(getActivity(), getString(R.string.nearby_card_permission_title), getString(R.string.nearby_card_permission_explanation), - this::displayYouWontSeeNearbyMessage, this::requestLocationPermission, + this::displayYouWontSeeNearbyMessage, checkBoxView, false); } diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java b/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java index e9ebda4b5..201c5bfc6 100644 --- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java +++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java @@ -151,7 +151,8 @@ public class QuizChecker { activity.getString(R.string.quiz_alert_message, REVERT_PERCENTAGE_FOR_MESSAGE), activity.getString(R.string.about_translate_proceed), activity.getString(android.R.string.cancel), - () -> startQuizActivity(activity), null); + () -> startQuizActivity(activity), + null); } private void startQuizActivity(Activity activity) { diff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java index 762b70e3b..0e4b94f9e 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java @@ -167,10 +167,11 @@ public class UploadCategoriesFragment extends UploadBaseFragment implements Cate DialogUtil.showAlertDialog(getActivity(), getString(R.string.no_categories_selected), getString(R.string.no_categories_selected_warning_desc), - getString(R.string.no_go_back), getString(R.string.yes_submit), - null, - () -> goToNextScreen()); + getString(R.string.no_go_back), + () -> goToNextScreen(), + null); + } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java index 8b0b8c39f..8a3c5837c 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java @@ -354,13 +354,11 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements String.format(Locale.getDefault(), uploadTitleFormat, uploadItem.getFileName()), - () -> { - - }, () -> { uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); onNextButtonClicked(); - }); + }, null); + } @Override @@ -370,11 +368,12 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements DialogUtil.showAlertDialog(getActivity(), getString(R.string.warning), errorMessageForResult, - () -> deleteThisPicture(), () -> { uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); onNextButtonClicked(); - }); + }, + () -> deleteThisPicture() + ); } //If the error message is null, we will probably not show anything } diff --git a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java index 0ce8ca9c9..25fae6e8e 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java @@ -44,8 +44,8 @@ public class DialogUtil { showAlertDialog(activity, title, message, - activity.getString(R.string.no), activity.getString(R.string.yes), + activity.getString(R.string.no), onPositiveBtnClick, onNegativeBtnClick); } @@ -96,8 +96,8 @@ public class DialogUtil { showAlertDialog(activity, title, message, - activity.getString(R.string.no), activity.getString(R.string.yes), + activity.getString(R.string.no), onPositiveBtnClick, onNegativeBtnClick, customView,