From e945d4555893a675f62334faa00b0da561b36036 Mon Sep 17 00:00:00 2001 From: Dmitry Brant Date: Mon, 27 Aug 2018 05:10:50 -0400 Subject: [PATCH] Work towards eliminating string literals from code. (#1861) String literals are being used in many places in the code, instead of proper string resources which are automatically localized. This PR replaces many of the string literals with pre-packaged resources, or will add the appropriate string if necessary. --- .../commons/achievements/AchievementsActivity.java | 4 ++-- .../nrw/commons/category/CategorizationFragment.java | 8 ++++---- .../contributions/ContributionsListFragment.java | 11 ++++------- .../recentsearches/RecentSearchesFragment.java | 4 ++-- .../java/fr/free/nrw/commons/nearby/DirectUpload.java | 8 ++++---- .../fr/free/nrw/commons/nearby/NearbyActivity.java | 8 ++++---- .../java/fr/free/nrw/commons/quiz/QuizChecker.java | 2 +- .../fr/free/nrw/commons/quiz/QuizResultActivity.java | 4 ++-- 8 files changed, 23 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java index d25c1cd8f..b894bac29 100644 --- a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java @@ -393,12 +393,12 @@ public class AchievementsActivity extends NavigationBaseActivity { TextView shareMessage = (TextView) view.findViewById(R.id.alert_text); shareMessage.setText(R.string.achievements_share_message); alertadd.setView(view); - alertadd.setPositiveButton("Proceed", new DialogInterface.OnClickListener() { + alertadd.setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { shareScreen(screenshot); } }); - alertadd.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + alertadd.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.cancel(); diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 93ddb60d5..c53c29379 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -377,10 +377,10 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment { .setMessage("Are you sure you want to go back? The image will not " + "have any categories saved.") .setTitle("Warning") - .setPositiveButton("No", (dialog, id) -> { + .setPositiveButton(android.R.string.no, (dialog, id) -> { //No need to do anything, user remains on categorization screen }) - .setNegativeButton("Yes", (dialog, id) -> getActivity().finish()) + .setNegativeButton(android.R.string.yes, (dialog, id) -> getActivity().finish()) .create() .show(); } @@ -391,10 +391,10 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment { + "Are you sure you want to submit without selecting " + "categories?") .setTitle("No Categories Selected") - .setPositiveButton("No, go back", (dialog, id) -> { + .setPositiveButton(android.R.string.no, (dialog, id) -> { //Exit menuItem so user can select their categories }) - .setNegativeButton("Yes, submit", (dialog, id) -> { + .setNegativeButton(android.R.string.yes, (dialog, id) -> { //Proceed to submission onCategoriesSaveHandler.onCategoriesSave(getStringList(selectedCategories)); }) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 6abb3ce43..e366a1468 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -3,13 +3,11 @@ package fr.free.nrw.commons.contributions; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.support.v7.app.AlertDialog; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -33,7 +31,6 @@ import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.R; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.nearby.NearbyActivity; -import fr.free.nrw.commons.utils.ContributionUtils; import timber.log.Timber; import static android.Manifest.permission.READ_EXTERNAL_STORAGE; @@ -154,11 +151,11 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { new AlertDialog.Builder(getActivity()) .setMessage(getString(R.string.read_storage_permission_rationale)) - .setPositiveButton("OK", (dialog, which) -> { + .setPositiveButton(android.R.string.ok, (dialog, which) -> { requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 1); dialog.dismiss(); }) - .setNegativeButton("Cancel", null) + .setNegativeButton(android.R.string.cancel, null) .create() .show(); @@ -196,11 +193,11 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { // sees the explanation, try again to request the permission. new AlertDialog.Builder(getActivity()) .setMessage(getString(R.string.write_storage_permission_rationale)) - .setPositiveButton("OK", (dialog, which) -> { + .setPositiveButton(android.R.string.ok, (dialog, which) -> { requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, 3); dialog.dismiss(); }) - .setNegativeButton("Cancel", null) + .setNegativeButton(android.R.string.cancel, null) .create() .show(); } else { diff --git a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java index 5c109fbb4..7c0a6fcca 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java @@ -41,7 +41,7 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment { recent_searches_delete_button.setOnClickListener(v -> { new AlertDialog.Builder(getContext()) .setMessage(getString(R.string.delete_recent_searches_dialog)) - .setPositiveButton("YES", (dialog, which) -> { + .setPositiveButton(android.R.string.yes, (dialog, which) -> { recentSearchesDao.deleteAll(recentSearches); Toast.makeText(getContext(),getString(R.string.search_history_deleted),Toast.LENGTH_SHORT).show(); recentSearches = recentSearchesDao.recentSearches(10); @@ -50,7 +50,7 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment { adapter.notifyDataSetChanged(); dialog.dismiss(); }) - .setNegativeButton("NO", null) + .setNegativeButton(android.R.string.no, null) .create() .show(); }); diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java b/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java index 9a12c6d39..ca25fccf3 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java @@ -31,12 +31,12 @@ class DirectUpload { if (fragment.shouldShowRequestPermissionRationale(READ_EXTERNAL_STORAGE)) { new AlertDialog.Builder(fragment.getActivity()) .setMessage(fragment.getActivity().getString(R.string.read_storage_permission_rationale)) - .setPositiveButton("OK", (dialog, which) -> { + .setPositiveButton(android.R.string.ok, (dialog, which) -> { Timber.d("Requesting permissions for read external storage"); fragment.requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 4); dialog.dismiss(); }) - .setNegativeButton("Cancel", null) + .setNegativeButton(android.R.string.cancel, null) .create() .show(); } else { @@ -58,11 +58,11 @@ class DirectUpload { if (fragment.shouldShowRequestPermissionRationale(WRITE_EXTERNAL_STORAGE)) { new AlertDialog.Builder(fragment.getActivity()) .setMessage(fragment.getActivity().getString(R.string.write_storage_permission_rationale)) - .setPositiveButton("OK", (dialog, which) -> { + .setPositiveButton(android.R.string.ok, (dialog, which) -> { fragment.requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, 5); dialog.dismiss(); }) - .setNegativeButton("Cancel", null) + .setNegativeButton(android.R.string.cancel, null) .create() .show(); } else { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java index 0d1db62f1..2143496f0 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java @@ -292,11 +292,11 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp // sees the explanation, try again to request the permission. new AlertDialog.Builder(this) .setMessage(getString(R.string.location_permission_rationale_nearby)) - .setPositiveButton("OK", (dialog, which) -> { + .setPositiveButton(android.R.string.ok, (dialog, which) -> { requestLocationPermissions(); dialog.dismiss(); }) - .setNegativeButton("Cancel", (dialog, id) -> { + .setNegativeButton(android.R.string.cancel, (dialog, id) -> { showLocationPermissionDeniedErrorDialog(); dialog.cancel(); }) @@ -467,11 +467,11 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp if (locationManager.isPermissionExplanationRequired(this)) { new AlertDialog.Builder(this) .setMessage(getString(R.string.location_permission_rationale_nearby)) - .setPositiveButton("OK", (dialog, which) -> { + .setPositiveButton(android.R.string.ok, (dialog, which) -> { requestLocationPermissions(); dialog.dismiss(); }) - .setNegativeButton("Cancel", (dialog, id) -> { + .setNegativeButton(android.R.string.cancel, (dialog, id) -> { showLocationPermissionDeniedErrorDialog(); dialog.cancel(); }) 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 b08563660..abc6bf48f 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 @@ -135,7 +135,7 @@ public class QuizChecker { alert.setTitle(context.getResources().getString(R.string.quiz)); alert.setMessage(context.getResources().getString(R.string.quiz_alert_message, REVERT_PERCENTAGE_FOR_MESSAGE)); - alert.setPositiveButton("Proceed", new DialogInterface.OnClickListener() { + alert.setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { int newRevetSharedPrefs = revertCount+ revertPref.getInt(REVERT_SHARED_PREFERENCE,0); diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java b/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java index e7c40f615..93a113338 100644 --- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java @@ -183,12 +183,12 @@ public class QuizResultActivity extends AppCompatActivity { TextView shareMessage = (TextView) view.findViewById(R.id.alert_text); shareMessage.setText(R.string.quiz_result_share_message); alertadd.setView(view); - alertadd.setPositiveButton("Proceed", new DialogInterface.OnClickListener() { + alertadd.setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { shareScreen(screenshot); } }); - alertadd.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + alertadd.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.cancel();