Skip to content

Work towards eliminating string literals from code. #1861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2018
Merged

Work towards eliminating string literals from code. #1861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,12 +393,12 @@ public void showAlert(Bitmap screenshot){
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();
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,10 @@ public void showBackButtonDialog() {
.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();
}
Expand All @@ -391,10 +391,10 @@ private void showConfirmationDialog() {
+ "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));
})
Expand Down
11 changes: 4 additions & 7 deletions app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
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;
Expand All @@ -33,7 +31,6 @@
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;
Expand Down Expand Up @@ -154,11 +151,11 @@ public boolean onOptionsItemSelected(MenuItem item) {

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();

Expand Down Expand Up @@ -196,11 +193,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
// 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 {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
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);
Expand All @@ -50,7 +50,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
adapter.notifyDataSetChanged();
dialog.dismiss();
})
.setNegativeButton("NO", null)
.setNegativeButton(android.R.string.no, null)
.create()
.show();
});
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ void initiateGalleryUpload() {
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 {
Expand All @@ -58,11 +58,11 @@ void initiateCameraUpload() {
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 {
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,11 @@ private void checkLocationPermission() {
// 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();
})
Expand Down Expand Up @@ -467,11 +467,11 @@ private void registerLocationUpdates() {
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();
})
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void callQuiz() {
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);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,12 @@ public void showAlert(Bitmap screenshot) {
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();
Expand Down