Skip to content

Issue #3428: Swapped text in dialog buttons #3496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 20, 2020
Merged

Issue #3428: Swapped text in dialog buttons #3496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c540b3
Issue #3428: Swapped text in dialog buttons because, according to And…
FawziyahAlebiosu Mar 11, 2020
8ce91d9
Fixed Issue #3428 so it actually works correctly now: Swapped text in…
FawziyahAlebiosu Mar 12, 2020
1b6d91d
Made sure that all of the places where the two types of showAlertDial…
FawziyahAlebiosu Mar 19, 2020
f4671ea
modified deletThisPicture to be accurate lambda call
FawziyahAlebiosu Mar 19, 2020
5080ebd
reverted mistake where ellipses replaced the three dots
FawziyahAlebiosu Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,13 +354,11 @@ public void showDuplicatePicturePopup() {
String.format(Locale.getDefault(),
uploadTitleFormat,
uploadItem.getFileName()),
() -> {

},
() -> {
uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
onNextButtonClicked();
});
}, null);

}

@Override
Expand All @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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,
Expand Down