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

Author: FawziyahAlebiosu

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

@@ -445,8 +445,8 @@ private void showNearbyCardPermissionRationale() {
         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);
     }

app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java

@@ -151,7 +151,8 @@ private void callQuiz(Activity activity) {
                 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) {

app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java

@@ -167,10 +167,11 @@ public void showNoCategorySelected() {
         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

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

@@ -354,13 +354,11 @@ public void showDuplicatePicturePopup() {
                 String.format(Locale.getDefault(),
                         uploadTitleFormat,
                         uploadItem.getFileName()),
-                () -> {
-
-                },
                 () -> {
                     uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
                     onNextButtonClicked();
-                });
+                }, null);
+
     }
 
     @Override
@@ -370,11 +368,12 @@ public void showBadImagePopup(Integer errorCode) {
             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
     }

app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java

@@ -44,8 +44,8 @@ public static void showAlertDialog(Activity activity,
         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 static void showAlertDialog(Activity activity,
         showAlertDialog(activity,
                 title,
                 message,
-                activity.getString(R.string.no),
                 activity.getString(R.string.yes),
+                activity.getString(R.string.no),
                 onPositiveBtnClick,
                 onNegativeBtnClick,
                 customView,