diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.kt index b9532a12e..29267452b 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.kt @@ -180,8 +180,8 @@ class ContributionController @Inject constructor(@param:Named("default_preferenc showAlertDialog( activity, activity.getString(R.string.location_permission_title), activity.getString(R.string.in_app_camera_location_permission_rationale), - activity.getString(R.string.ok), - activity.getString(R.string.cancel), + activity.getString(android.R.string.ok), + activity.getString(android.R.string.cancel), { createDialogsAndHandleLocationPermissions( activity, diff --git a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt index b1f1b7f9b..89d43845b 100644 --- a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt @@ -150,7 +150,7 @@ class DescriptionEditActivity : this, getString(titleStringID), getString(messageStringId), - getString(R.string.ok), + getString(android.R.string.ok), null ) } diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt index a1bae09fb..cad6bd057 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt @@ -140,8 +140,8 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi requireActivity(), requireActivity().getString(R.string.location_permission_title), requireActivity().getString(R.string.location_permission_rationale_explore), - requireActivity().getString(R.string.ok), - requireActivity().getString(R.string.cancel), + requireActivity().getString(android.R.string.ok), + requireActivity().getString(android.R.string.cancel), { askForLocationPermission() }, null, null diff --git a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.kt index e7903c9ed..c0f1bd5db 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.kt @@ -67,10 +67,10 @@ class RecentSearchesFragment : CommonsDaggerSupportFragment() { private fun showDeleteRecentAlertDialog(context: Context) { AlertDialog.Builder(context) .setMessage(getString(R.string.delete_recent_searches_dialog)) - .setPositiveButton(R.string.yes) { dialog: DialogInterface, _: Int -> + .setPositiveButton(android.R.string.yes) { dialog: DialogInterface, _: Int -> setDeleteRecentPositiveButton(context, dialog) } - .setNegativeButton(R.string.no, null) + .setNegativeButton(android.R.string.no, null) .setCancelable(false) .create() .show() @@ -102,7 +102,7 @@ class RecentSearchesFragment : CommonsDaggerSupportFragment() { setDeletePositiveButton(context, dialog, position) } ) - .setNegativeButton(R.string.cancel, null) + .setNegativeButton(android.R.string.cancel, null) .setCancelable(false) .create() .show() diff --git a/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.kt b/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.kt index 47b4165ad..fefb59adb 100644 --- a/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.kt +++ b/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.kt @@ -64,8 +64,8 @@ class LocationPermissionsHelper( activity, activity.getString(dialogTitleResource), activity.getString(dialogTextResource), - activity.getString(R.string.ok), - activity.getString(R.string.cancel), + activity.getString(android.R.string.ok), + activity.getString(android.R.string.cancel), { ActivityCompat.requestPermissions( activity, diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.kt b/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.kt index 5362f1542..0183056a6 100644 --- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.kt +++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.kt @@ -151,7 +151,7 @@ class QuizChecker @Inject constructor( activity.getString(R.string.quiz), activity.getString(R.string.quiz_alert_message, revertPercentageForMessage), activity.getString(R.string.about_translate_proceed), - activity.getString(R.string.cancel), + activity.getString(android.R.string.cancel), { startQuizActivity(activity) }, null ) diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.kt b/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.kt index 15884146d..6979edd15 100644 --- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.kt @@ -193,7 +193,7 @@ class QuizResultActivity : AppCompatActivity() { alertadd.setPositiveButton(R.string.about_translate_proceed) { dialog, _ -> shareScreen(screenshot) } - alertadd.setNegativeButton(R.string.cancel) { dialog, _ -> + alertadd.setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.cancel() } alertadd.show() diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt index dccb77af1..1d26eacae 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt @@ -238,7 +238,7 @@ class ReviewActivity : BaseActivity() { this, getString(R.string.skip_image).uppercase(Locale.ROOT), getString(R.string.skip_image_explanation), - getString(R.string.ok), + getString(android.R.string.ok), null, null, null @@ -250,7 +250,7 @@ class ReviewActivity : BaseActivity() { this, getString(R.string.title_activity_review), getString(R.string.review_image_explanation), - getString(R.string.ok), + getString(android.R.string.ok), null, null, null diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt index 66e0257f6..799d5b0f1 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt @@ -446,7 +446,7 @@ class UploadActivity : BaseActivity(), UploadContract.View, UploadBaseFragment.C this, getString(R.string.storage_permissions_denied), getString(R.string.unable_to_share_upload_item), - getString(R.string.ok) + getString(android.R.string.ok) ) { finish() } } else { showAlertDialog( @@ -455,7 +455,7 @@ class UploadActivity : BaseActivity(), UploadContract.View, UploadBaseFragment.C getString( R.string.write_storage_permission_rationale_for_image_share ), - getString(R.string.ok) + getString(android.R.string.ok) ) { checkStoragePermissions() } } } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.kt index ee6af7bb6..798ab74fe 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.kt @@ -117,7 +117,7 @@ class UploadCategoriesFragment : UploadBaseFragment(), CategoriesContract.View { requireActivity(), getString(R.string.categories_activity_title), getString(R.string.categories_tooltip), - getString(R.string.ok), + getString(android.R.string.ok), null ) } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt index 5dcc2bf86..484750410 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt @@ -116,7 +116,7 @@ class DepictsFragment : UploadBaseFragment(), DepictsContract.View { requireActivity(), getString(R.string.depicts_step_title), getString(R.string.depicts_tooltip), - getString(R.string.ok), + getString(android.R.string.ok), null ) } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.kt index b3b067948..acf55670e 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.kt @@ -303,7 +303,7 @@ class UploadMediaDetailFragment : UploadBaseFragment(), UploadMediaDetailsContra requireActivity(), getString(titleStringID), getString(messageStringId), - getString(R.string.ok), + getString(android.R.string.ok), null ) } @@ -919,4 +919,4 @@ class UploadMediaDetailFragment : UploadBaseFragment(), UploadMediaDetailsContra const val UPLOADABLE_FILE: String = "uploadable_file" const val UPLOAD_MEDIA_DETAILS: String = "upload_media_detail_adapter" } -} +} \ No newline at end of file diff --git a/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt index 5bcc9d1b2..df3b33bf6 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt +++ b/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt @@ -209,8 +209,8 @@ object PermissionUtils { activity, activity.getString(rationaleTitle), activity.getString(rationaleMessage), - activity.getString(R.string.ok), - activity.getString(R.string.cancel), + activity.getString(android.R.string.ok), + activity.getString(android.R.string.cancel), { if (activity is UploadActivity) { activity.isShowPermissionsDialog = true diff --git a/app/src/main/res/drawable/ic_arrow_16dp.xml b/app/src/main/res/drawable/ic_arrow_16dp.xml new file mode 100644 index 000000000..d99c0b5e4 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_16dp.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml b/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml index e6f9e79e7..cccf94c7b 100644 --- a/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml +++ b/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml @@ -149,6 +149,13 @@ android:textColor="#2D8BA4" android:textSize="@dimen/normal_text" android:textStyle="bold" /> + + diff --git a/app/src/main/res/values-az/error.xml b/app/src/main/res/values-az/error.xml index 53a971367..6e9503c43 100644 --- a/app/src/main/res/values-az/error.xml +++ b/app/src/main/res/values-az/error.xml @@ -5,7 +5,7 @@ * Nemoralis --> - Commons çökdü + Nasazlıq Uups. Nəsə düzgün çalışmır! Nə etdiyinizi bizə deyin, sonra e-poçt vasitəsilə bizimlə paylaşın. Bu, bizə bunu düzəltməyə kömək edəcək! Təşəkkürlər! diff --git a/app/src/main/res/values-qq/error.xml b/app/src/main/res/values-qq/error.xml index 9fffe2e0f..e48ac7c9d 100644 --- a/app/src/main/res/values-qq/error.xml +++ b/app/src/main/res/values-qq/error.xml @@ -1,11 +1,9 @@ Title of dialog to show when the app crashes - Shown when the application crashed. Prompt asking people to enter info about what they were doing when the app crashed Toast to be displayed once someone sends an error report thanking them.\n{{Identical|Thank you}} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 183c683da..0c0ae3a14 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -133,7 +133,6 @@ Settings Sign Up Featured Images - Featured images are contributions by highly skilled photographers and illustrators that the Wikimedia Commons community has chosen as some of the highest quality on the site. Custom Selector Category Peer Review @@ -530,6 +529,7 @@ Upload your first media by tapping on the add button. Error occurred while picking images Please wait… + Featured pictures are images from highly skilled photographers and illustrators that the Wikimedia Commons community has chosen as some of the highest quality on the site. Images Uploaded via Nearby places are the images which are uploaded by discovering places on the map. This feature allows editors to send a Thank you notification to users who make useful edits – by using a small thank link on the history page or diff page. Copy to the next items @@ -736,7 +736,7 @@ Upload your first media by tapping on the add button. Back Welcome to Custom Picture Selector This picker shows you which pictures you have already uploaded to Commons. - Unlike the picture on the left, the picture on the right has the Commons logo indicating it is already uploaded.\n\nTouch and hold for image preview. + Unlike the picture on the left, the picture on the right has the Commons logo indicating it is already uploaded. \n Touch and hold for image preview. Awesome This image has already been uploaded to Commons. For technical reasons, the app can\'t reliably upload more than %1$d pictures at once. The upload limit of %1$d has been exceeded by %2$d. @@ -767,7 +767,7 @@ Upload your first media by tapping on the add button. Location data helps Wiki editors find your picture, making it much more useful.\nYour recent uploads have no location.\nWe suggest you turn on location in your camera app\'s settings.\nThank you for uploading! No location found How about adding the place where this image was taken?\nLocation data helps Wiki editors find your picture, making it much more useful.\nThank you! - Add Location + Add location Please remove from this email any information that you are not comfortable sharing publicly. Also, please be aware that your email address with which you are posting, and the associated name and profile picture, will be visible publicly. Details Achievements are only available in the prod flavor. Please check the developer documentation. @@ -788,8 +788,8 @@ Upload your first media by tapping on the add button. Unmark as not for upload Marking as not for upload Unmarking as not for upload - Show already handled pictures - Hiding already handled pictures + Show already actioned pictures + Hiding already actioned pictures No more images found This image is already uploaded Can not select this image for upload diff --git a/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt index 5b5dfd7dd..be3b7e8e3 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt @@ -193,8 +193,8 @@ class DescriptionEditActivityUnitTest { method.isAccessible = true method.invoke( activity, - R.string.ok, - R.string.ok, + android.R.string.ok, + android.R.string.ok, ) val dialog: AlertDialog = ShadowAlertDialog.getLatestDialog() as AlertDialog assertEquals(dialog.isShowing, true)