From 5c540b3076b66f43af288567ad6db9905a2e7d27 Mon Sep 17 00:00:00 2001 From: FawziyahAlebiosu Date: Wed, 11 Mar 2020 14:32:38 -0400 Subject: [PATCH 1/5] Issue #3428: Swapped text in dialog buttons because, according to Android Convention, they were opposite each other --- app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0ce8ca9c9e..25fae6e8ee 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 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, From 8ce91d94ffd06e23c31bba27d0f54318580bedf6 Mon Sep 17 00:00:00 2001 From: FawziyahAlebiosu Date: Thu, 12 Mar 2020 13:16:05 -0400 Subject: [PATCH 2/5] Fixed Issue #3428 so it actually works correctly now: Swapped text in dialog buttons because, according to Android Convention, they were opposite each other --- .../upload/mediaDetails/UploadMediaDetailFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 1c6140b408..e0de12abeb 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,12 +354,12 @@ public void showDuplicatePicturePopup() { String.format(Locale.getDefault(), uploadTitleFormat, uploadItem.getFileName()), - () -> { - - }, () -> { uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); onNextButtonClicked(); + }, + () -> { + }); } From 1b6d91d07cb8786b0032705991830b3258b9b147 Mon Sep 17 00:00:00 2001 From: FawziyahAlebiosu Date: Wed, 18 Mar 2020 22:58:23 -0400 Subject: [PATCH 3/5] 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 --- .../commons/contributions/ContributionsFragment.java | 2 +- .../java/fr/free/nrw/commons/quiz/QuizChecker.java | 3 ++- .../upload/categories/UploadCategoriesFragment.java | 7 ++++--- .../mediaDetails/UploadMediaDetailFragment.java | 11 +++++------ app/src/main/res/values/strings.xml | 2 +- 5 files changed, 13 insertions(+), 12 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 32ddc4400b..cf2ae26667 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 @@ -442,8 +442,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); } 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 e9ebda4b5c..201c5bfc68 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 @@ 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) { 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 762b70e3b7..0e4b94f9e4 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 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 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 e0de12abeb..6b47e79013 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 @@ -357,10 +357,8 @@ public void showDuplicatePicturePopup() { () -> { uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); onNextButtonClicked(); - }, - () -> { + }, null); - }); } @Override @@ -370,10 +368,11 @@ public void showBadImagePopup(Integer errorCode) { DialogUtil.showAlertDialog(getActivity(), getString(R.string.warning), errorMessageForResult, - () -> deleteThisPicture(), - () -> { - uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); + () -> { 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/res/values/strings.xml b/app/src/main/res/values/strings.xml index da88ede6f0..18fdbd1bce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -552,7 +552,7 @@ Upload your first media by tapping on the add button. Software Upload photos to Wikimedia Commons directly from your phone. Download the Commons App now: %1$s - Share app via... + Share app via… Image Info No Categories found Cancelled Upload From f4671ea0be1f97ab4204549d6c535f4ac0ae3767 Mon Sep 17 00:00:00 2001 From: FawziyahAlebiosu Date: Thu, 19 Mar 2020 08:58:32 -0400 Subject: [PATCH 4/5] modified deletThisPicture to be accurate lambda call --- .../upload/mediaDetails/UploadMediaDetailFragment.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 6b47e79013..e08121302b 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 @@ -368,12 +368,12 @@ public void showBadImagePopup(Integer errorCode) { DialogUtil.showAlertDialog(getActivity(), getString(R.string.warning), errorMessageForResult, - () -> { uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); + () -> { + uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); onNextButtonClicked(); }, - () -> { - deleteThisPicture(); - }); + () -> deleteThisPicture() + ); } //If the error message is null, we will probably not show anything } From 5080ebd5c4679b548214e9a23833740d47351659 Mon Sep 17 00:00:00 2001 From: FawziyahAlebiosu Date: Thu, 19 Mar 2020 14:18:28 -0400 Subject: [PATCH 5/5] reverted mistake where ellipses replaced the three dots --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 18fdbd1bce..da88ede6f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -552,7 +552,7 @@ Upload your first media by tapping on the add button. Software Upload photos to Wikimedia Commons directly from your phone. Download the Commons App now: %1$s - Share app via… + Share app via... Image Info No Categories found Cancelled Upload