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

Replace android.R.string.* with R.string (#6499)
Some checks are pending
Android CI / Run tests and generate APK (push) Waiting to run
Details

Browse source 
All these messages are not really necessary because
the app has its own localizations, and android.R.string
sometimes doesn't display the localized string.

Resolves #6470.
This commit is contained in:
Amir E. Aharoni 2025-10-13 08:54:32 -04:00 • committed by GitHub
parent b6014b017c
commit 0c244f369c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.kt
View file

@ -180,8 +180,8 @@ class ContributionController @Inject constructor(@param:Named("default_preferenc
showAlertDialog( showAlertDialog(
activity, activity.getString(R.string.location_permission_title), activity, activity.getString(R.string.location_permission_title),
activity.getString(R.string.in_app_camera_location_permission_rationale), activity.getString(R.string.in_app_camera_location_permission_rationale),
activity.getString(android.R.string.ok), activity.getString(R.string.ok),
activity.getString(android.R.string.cancel), activity.getString(R.string.cancel),
{ {
createDialogsAndHandleLocationPermissions( createDialogsAndHandleLocationPermissions(
activity, activity,

2
app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
View file

@ -150,7 +150,7 @@ class DescriptionEditActivity :
this, this,
getString(titleStringID), getString(titleStringID),
getString(messageStringId), getString(messageStringId),
getString(android.R.string.ok), getString(R.string.ok),
null null
) )
} }

4
app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt
View file

@ -140,8 +140,8 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi
requireActivity(), requireActivity(),
requireActivity().getString(R.string.location_permission_title), requireActivity().getString(R.string.location_permission_title),
requireActivity().getString(R.string.location_permission_rationale_explore), requireActivity().getString(R.string.location_permission_rationale_explore),
requireActivity().getString(android.R.string.ok), requireActivity().getString(R.string.ok),
requireActivity().getString(android.R.string.cancel), requireActivity().getString(R.string.cancel),
{ askForLocationPermission() }, { askForLocationPermission() },
null, null,
null null

6
app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.kt
View file

@ -67,10 +67,10 @@ class RecentSearchesFragment : CommonsDaggerSupportFragment() {
private fun showDeleteRecentAlertDialog(context: Context) { private fun showDeleteRecentAlertDialog(context: Context) {
AlertDialog.Builder(context) AlertDialog.Builder(context)
.setMessage(getString(R.string.delete_recent_searches_dialog)) .setMessage(getString(R.string.delete_recent_searches_dialog))
.setPositiveButton(android.R.string.yes) { dialog: DialogInterface, _: Int -> .setPositiveButton(R.string.yes) { dialog: DialogInterface, _: Int ->
setDeleteRecentPositiveButton(context, dialog) setDeleteRecentPositiveButton(context, dialog)
} }
.setNegativeButton(android.R.string.no, null) .setNegativeButton(R.string.no, null)
.setCancelable(false) .setCancelable(false)
.create() .create()
.show() .show()
@ -102,7 +102,7 @@ class RecentSearchesFragment : CommonsDaggerSupportFragment() {
setDeletePositiveButton(context, dialog, position) setDeletePositiveButton(context, dialog, position)
} }
) )
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.setCancelable(false) .setCancelable(false)
.create() .create()
.show() .show()

4
app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.kt
View file

@ -64,8 +64,8 @@ class LocationPermissionsHelper(
activity, activity,
activity.getString(dialogTitleResource), activity.getString(dialogTitleResource),
activity.getString(dialogTextResource), activity.getString(dialogTextResource),
activity.getString(android.R.string.ok), activity.getString(R.string.ok),
activity.getString(android.R.string.cancel), activity.getString(R.string.cancel),
{ {
ActivityCompat.requestPermissions( ActivityCompat.requestPermissions(
activity, activity,

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

@ -151,7 +151,7 @@ class QuizChecker @Inject constructor(
activity.getString(R.string.quiz), activity.getString(R.string.quiz),
activity.getString(R.string.quiz_alert_message, revertPercentageForMessage), activity.getString(R.string.quiz_alert_message, revertPercentageForMessage),
activity.getString(R.string.about_translate_proceed), activity.getString(R.string.about_translate_proceed),
activity.getString(android.R.string.cancel), activity.getString(R.string.cancel),
{ startQuizActivity(activity) }, { startQuizActivity(activity) },
null null
) )

2
app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.kt
View file

@ -193,7 +193,7 @@ class QuizResultActivity : AppCompatActivity() {
alertadd.setPositiveButton(R.string.about_translate_proceed) { dialog, _ -> alertadd.setPositiveButton(R.string.about_translate_proceed) { dialog, _ ->
shareScreen(screenshot) shareScreen(screenshot)
} }
alertadd.setNegativeButton(android.R.string.cancel) { dialog, _ -> alertadd.setNegativeButton(R.string.cancel) { dialog, _ ->
dialog.cancel() dialog.cancel()
} }
alertadd.show() alertadd.show()

4
app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt
View file

@ -238,7 +238,7 @@ class ReviewActivity : BaseActivity() {
this, this,
getString(R.string.skip_image).uppercase(Locale.ROOT), getString(R.string.skip_image).uppercase(Locale.ROOT),
getString(R.string.skip_image_explanation), getString(R.string.skip_image_explanation),
getString(android.R.string.ok), getString(R.string.ok),
null, null,
null, null,
null null
@ -250,7 +250,7 @@ class ReviewActivity : BaseActivity() {
this, this,
getString(R.string.title_activity_review), getString(R.string.title_activity_review),
getString(R.string.review_image_explanation), getString(R.string.review_image_explanation),
getString(android.R.string.ok), getString(R.string.ok),
null, null,
null, null,
null null

4
app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt
View file

@ -446,7 +446,7 @@ class UploadActivity : BaseActivity(), UploadContract.View, UploadBaseFragment.C
this, this,
getString(R.string.storage_permissions_denied), getString(R.string.storage_permissions_denied),
getString(R.string.unable_to_share_upload_item), getString(R.string.unable_to_share_upload_item),
getString(android.R.string.ok) getString(R.string.ok)
) { finish() } ) { finish() }
} else { } else {
showAlertDialog( showAlertDialog(
@ -455,7 +455,7 @@ class UploadActivity : BaseActivity(), UploadContract.View, UploadBaseFragment.C
getString( getString(
R.string.write_storage_permission_rationale_for_image_share R.string.write_storage_permission_rationale_for_image_share
), ),
getString(android.R.string.ok) getString(R.string.ok)
) { checkStoragePermissions() } ) { checkStoragePermissions() }
} }
} }

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

@ -117,7 +117,7 @@ class UploadCategoriesFragment : UploadBaseFragment(), CategoriesContract.View {
requireActivity(), requireActivity(),
getString(R.string.categories_activity_title), getString(R.string.categories_activity_title),
getString(R.string.categories_tooltip), getString(R.string.categories_tooltip),
getString(android.R.string.ok), getString(R.string.ok),
null null
) )
} }

2
app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt
View file

@ -116,7 +116,7 @@ class DepictsFragment : UploadBaseFragment(), DepictsContract.View {
requireActivity(), requireActivity(),
getString(R.string.depicts_step_title), getString(R.string.depicts_step_title),
getString(R.string.depicts_tooltip), getString(R.string.depicts_tooltip),
getString(android.R.string.ok), getString(R.string.ok),
null null
) )
} }

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

@ -303,7 +303,7 @@ class UploadMediaDetailFragment : UploadBaseFragment(), UploadMediaDetailsContra
requireActivity(), requireActivity(),
getString(titleStringID), getString(titleStringID),
getString(messageStringId), getString(messageStringId),
getString(android.R.string.ok), getString(R.string.ok),
null null
) )
} }
@ -919,4 +919,4 @@ class UploadMediaDetailFragment : UploadBaseFragment(), UploadMediaDetailsContra
const val UPLOADABLE_FILE: String = "uploadable_file" const val UPLOADABLE_FILE: String = "uploadable_file"
const val UPLOAD_MEDIA_DETAILS: String = "upload_media_detail_adapter" const val UPLOAD_MEDIA_DETAILS: String = "upload_media_detail_adapter"
} }
} }

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

@ -209,8 +209,8 @@ object PermissionUtils {
activity, activity,
activity.getString(rationaleTitle), activity.getString(rationaleTitle),
activity.getString(rationaleMessage), activity.getString(rationaleMessage),
activity.getString(android.R.string.ok), activity.getString(R.string.ok),
activity.getString(android.R.string.cancel), activity.getString(R.string.cancel),
{ {
if (activity is UploadActivity) { if (activity is UploadActivity) {
activity.isShowPermissionsDialog = true activity.isShowPermissionsDialog = true

4
app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt
View file

@ -193,8 +193,8 @@ class DescriptionEditActivityUnitTest {
method.isAccessible = true method.isAccessible = true
method.invoke( method.invoke(
activity, activity,
android.R.string.ok, R.string.ok,
android.R.string.ok, R.string.ok,
) )
val dialog: AlertDialog = ShadowAlertDialog.getLatestDialog() as AlertDialog val dialog: AlertDialog = ShadowAlertDialog.getLatestDialog() as AlertDialog
assertEquals(dialog.isShowing, true) assertEquals(dialog.isShowing, true)