mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master' into structured-data

Browse source
This commit is contained in:
Sean Mac Gillicuddy 2020-03-20 11:25:49 +00:00
commit 02a0042d3c
5 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -448,8 +448,8 @@ public class ContributionsFragment
DialogUtil.showAlertDialog(getActivity(), DialogUtil.showAlertDialog(getActivity(),
getString(R.string.nearby_card_permission_title), getString(R.string.nearby_card_permission_title),
getString(R.string.nearby_card_permission_explanation), getString(R.string.nearby_card_permission_explanation),
this::displayYouWontSeeNearbyMessage,
this::requestLocationPermission, this::requestLocationPermission,
this::displayYouWontSeeNearbyMessage,
checkBoxView, checkBoxView,
false); false);
} }

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

@ -151,7 +151,8 @@ public class QuizChecker {
activity.getString(R.string.quiz_alert_message, REVERT_PERCENTAGE_FOR_MESSAGE), activity.getString(R.string.quiz_alert_message, REVERT_PERCENTAGE_FOR_MESSAGE),
activity.getString(R.string.about_translate_proceed), activity.getString(R.string.about_translate_proceed),
activity.getString(android.R.string.cancel), activity.getString(android.R.string.cancel),
() -> startQuizActivity(activity), null); () -> startQuizActivity(activity),
null);
} }
private void startQuizActivity(Activity activity) { private void startQuizActivity(Activity activity) {

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

@ -168,10 +168,11 @@ public class UploadCategoriesFragment extends UploadBaseFragment implements Cate
DialogUtil.showAlertDialog(getActivity(), DialogUtil.showAlertDialog(getActivity(),
getString(R.string.no_categories_selected), getString(R.string.no_categories_selected),
getString(R.string.no_categories_selected_warning_desc), getString(R.string.no_categories_selected_warning_desc),
getString(R.string.no_go_back),
getString(R.string.yes_submit), getString(R.string.yes_submit),
null, getString(R.string.no_go_back),
() -> goToNextScreen()); () -> goToNextScreen(),
null);
} }
@Override @Override

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

@ -357,13 +357,11 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
String.format(Locale.getDefault(), String.format(Locale.getDefault(),
uploadTitleFormat, uploadTitleFormat,
uploadItem.getFileName()), uploadItem.getFileName()),
() -> {
},
() -> { () -> {
uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
onNextButtonClicked(); onNextButtonClicked();
}); }, null);
} }
@Override @Override
@ -373,11 +371,12 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
DialogUtil.showAlertDialog(getActivity(), DialogUtil.showAlertDialog(getActivity(),
getString(R.string.warning), getString(R.string.warning),
errorMessageForResult, errorMessageForResult,
() -> deleteThisPicture(),
() -> { () -> {
uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
onNextButtonClicked(); onNextButtonClicked();
}); },
() -> deleteThisPicture()
);
} }
//If the error message is null, we will probably not show anything //If the error message is null, we will probably not show anything
} }

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

@ -44,8 +44,8 @@ public class DialogUtil {
showAlertDialog(activity, showAlertDialog(activity,
title, title,
message, message,
activity.getString(R.string.no),
activity.getString(R.string.yes), activity.getString(R.string.yes),
activity.getString(R.string.no),
onPositiveBtnClick, onPositiveBtnClick,
onNegativeBtnClick); onNegativeBtnClick);
} }
@ -96,8 +96,8 @@ public class DialogUtil {
showAlertDialog(activity, showAlertDialog(activity,
title, title,
message, message,
activity.getString(R.string.no),
activity.getString(R.string.yes), activity.getString(R.string.yes),
activity.getString(R.string.no),
onPositiveBtnClick, onPositiveBtnClick,
onNegativeBtnClick, onNegativeBtnClick,
customView, customView,