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

Work towards eliminating string literals from code. (#1861)

Browse source 
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.
This commit is contained in:
Dmitry Brant 2018-08-27 05:10:50 -04:00 • committed by Josephine Lim
parent b84e22c292
commit e945d45558
8 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
View file

@ -393,12 +393,12 @@ public class AchievementsActivity extends NavigationBaseActivity {
TextView shareMessage = (TextView) view.findViewById(R.id.alert_text); TextView shareMessage = (TextView) view.findViewById(R.id.alert_text);
shareMessage.setText(R.string.achievements_share_message); shareMessage.setText(R.string.achievements_share_message);
alertadd.setView(view); 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) { public void onClick(DialogInterface dialog, int which) {
shareScreen(screenshot); shareScreen(screenshot);
} }
}); });
alertadd.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { alertadd.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.cancel(); dialog.cancel();

8
app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file

@ -377,10 +377,10 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment {
.setMessage("Are you sure you want to go back? The image will not " .setMessage("Are you sure you want to go back? The image will not "
+ "have any categories saved.") + "have any categories saved.")
.setTitle("Warning") .setTitle("Warning")
.setPositiveButton("No", (dialog, id) -> { .setPositiveButton(android.R.string.no, (dialog, id) -> {
//No need to do anything, user remains on categorization screen //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() .create()
.show(); .show();
} }
@ -391,10 +391,10 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment {
+ "Are you sure you want to submit without selecting " + "Are you sure you want to submit without selecting "
+ "categories?") + "categories?")
.setTitle("No Categories Selected") .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 //Exit menuItem so user can select their categories
}) })
.setNegativeButton("Yes, submit", (dialog, id) -> { .setNegativeButton(android.R.string.yes, (dialog, id) -> {
//Proceed to submission //Proceed to submission
onCategoriesSaveHandler.onCategoriesSave(getStringList(selectedCategories)); onCategoriesSaveHandler.onCategoriesSave(getStringList(selectedCategories));
}) })

11
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file

@ -3,13 +3,11 @@ package fr.free.nrw.commons.contributions;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; 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.R;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.nearby.NearbyActivity; import fr.free.nrw.commons.nearby.NearbyActivity;
import fr.free.nrw.commons.utils.ContributionUtils;
import timber.log.Timber; import timber.log.Timber;
import static android.Manifest.permission.READ_EXTERNAL_STORAGE; import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
@ -154,11 +151,11 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
new AlertDialog.Builder(getActivity()) new AlertDialog.Builder(getActivity())
.setMessage(getString(R.string.read_storage_permission_rationale)) .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); requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 1);
dialog.dismiss(); dialog.dismiss();
}) })
.setNegativeButton("Cancel", null) .setNegativeButton(android.R.string.cancel, null)
.create() .create()
.show(); .show();
@ -196,11 +193,11 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
// sees the explanation, try again to request the permission. // sees the explanation, try again to request the permission.
new AlertDialog.Builder(getActivity()) new AlertDialog.Builder(getActivity())
.setMessage(getString(R.string.write_storage_permission_rationale)) .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); requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, 3);
dialog.dismiss(); dialog.dismiss();
}) })
.setNegativeButton("Cancel", null) .setNegativeButton(android.R.string.cancel, null)
.create() .create()
.show(); .show();
} else { } else {

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

@ -41,7 +41,7 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
recent_searches_delete_button.setOnClickListener(v -> { recent_searches_delete_button.setOnClickListener(v -> {
new AlertDialog.Builder(getContext()) new AlertDialog.Builder(getContext())
.setMessage(getString(R.string.delete_recent_searches_dialog)) .setMessage(getString(R.string.delete_recent_searches_dialog))
.setPositiveButton("YES", (dialog, which) -> { .setPositiveButton(android.R.string.yes, (dialog, which) -> {
recentSearchesDao.deleteAll(recentSearches); recentSearchesDao.deleteAll(recentSearches);
Toast.makeText(getContext(),getString(R.string.search_history_deleted),Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(),getString(R.string.search_history_deleted),Toast.LENGTH_SHORT).show();
recentSearches = recentSearchesDao.recentSearches(10); recentSearches = recentSearchesDao.recentSearches(10);
@ -50,7 +50,7 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
dialog.dismiss(); dialog.dismiss();
}) })
.setNegativeButton("NO", null) .setNegativeButton(android.R.string.no, null)
.create() .create()
.show(); .show();
}); });

8
app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java
View file

@ -31,12 +31,12 @@ class DirectUpload {
if (fragment.shouldShowRequestPermissionRationale(READ_EXTERNAL_STORAGE)) { if (fragment.shouldShowRequestPermissionRationale(READ_EXTERNAL_STORAGE)) {
new AlertDialog.Builder(fragment.getActivity()) new AlertDialog.Builder(fragment.getActivity())
.setMessage(fragment.getActivity().getString(R.string.read_storage_permission_rationale)) .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"); Timber.d("Requesting permissions for read external storage");
fragment.requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 4); fragment.requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 4);
dialog.dismiss(); dialog.dismiss();
}) })
.setNegativeButton("Cancel", null) .setNegativeButton(android.R.string.cancel, null)
.create() .create()
.show(); .show();
} else { } else {
@ -58,11 +58,11 @@ class DirectUpload {
if (fragment.shouldShowRequestPermissionRationale(WRITE_EXTERNAL_STORAGE)) { if (fragment.shouldShowRequestPermissionRationale(WRITE_EXTERNAL_STORAGE)) {
new AlertDialog.Builder(fragment.getActivity()) new AlertDialog.Builder(fragment.getActivity())
.setMessage(fragment.getActivity().getString(R.string.write_storage_permission_rationale)) .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); fragment.requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, 5);
dialog.dismiss(); dialog.dismiss();
}) })
.setNegativeButton("Cancel", null) .setNegativeButton(android.R.string.cancel, null)
.create() .create()
.show(); .show();
} else { } else {

8
app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
View file

@ -292,11 +292,11 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
// sees the explanation, try again to request the permission. // sees the explanation, try again to request the permission.
new AlertDialog.Builder(this) new AlertDialog.Builder(this)
.setMessage(getString(R.string.location_permission_rationale_nearby)) .setMessage(getString(R.string.location_permission_rationale_nearby))
.setPositiveButton("OK", (dialog, which) -> { .setPositiveButton(android.R.string.ok, (dialog, which) -> {
requestLocationPermissions(); requestLocationPermissions();
dialog.dismiss(); dialog.dismiss();
}) })
.setNegativeButton("Cancel", (dialog, id) -> { .setNegativeButton(android.R.string.cancel, (dialog, id) -> {
showLocationPermissionDeniedErrorDialog(); showLocationPermissionDeniedErrorDialog();
dialog.cancel(); dialog.cancel();
}) })
@ -467,11 +467,11 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
if (locationManager.isPermissionExplanationRequired(this)) { if (locationManager.isPermissionExplanationRequired(this)) {
new AlertDialog.Builder(this) new AlertDialog.Builder(this)
.setMessage(getString(R.string.location_permission_rationale_nearby)) .setMessage(getString(R.string.location_permission_rationale_nearby))
.setPositiveButton("OK", (dialog, which) -> { .setPositiveButton(android.R.string.ok, (dialog, which) -> {
requestLocationPermissions(); requestLocationPermissions();
dialog.dismiss(); dialog.dismiss();
}) })
.setNegativeButton("Cancel", (dialog, id) -> { .setNegativeButton(android.R.string.cancel, (dialog, id) -> {
showLocationPermissionDeniedErrorDialog(); showLocationPermissionDeniedErrorDialog();
dialog.cancel(); dialog.cancel();
}) })

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

@ -135,7 +135,7 @@ public class QuizChecker {
alert.setTitle(context.getResources().getString(R.string.quiz)); alert.setTitle(context.getResources().getString(R.string.quiz));
alert.setMessage(context.getResources().getString(R.string.quiz_alert_message, alert.setMessage(context.getResources().getString(R.string.quiz_alert_message,
REVERT_PERCENTAGE_FOR_MESSAGE)); REVERT_PERCENTAGE_FOR_MESSAGE));
alert.setPositiveButton("Proceed", new DialogInterface.OnClickListener() { alert.setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
int newRevetSharedPrefs = revertCount+ revertPref.getInt(REVERT_SHARED_PREFERENCE,0); int newRevetSharedPrefs = revertCount+ revertPref.getInt(REVERT_SHARED_PREFERENCE,0);

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

@ -183,12 +183,12 @@ public class QuizResultActivity extends AppCompatActivity {
TextView shareMessage = (TextView) view.findViewById(R.id.alert_text); TextView shareMessage = (TextView) view.findViewById(R.id.alert_text);
shareMessage.setText(R.string.quiz_result_share_message); shareMessage.setText(R.string.quiz_result_share_message);
alertadd.setView(view); 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) { public void onClick(DialogInterface dialog, int which) {
shareScreen(screenshot); shareScreen(screenshot);
} }
}); });
alertadd.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { alertadd.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.cancel(); dialog.cancel();