Working with #3129 issue (#3146)

* Replace Hard-Coded strings with those from strings.xml.
commons-app · Oct 16, 2019 · cc0176a · cc0176a
1 parent d58e362
commit cc0176a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 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
@@ -199,7 +199,7 @@ void shareScreen(Bitmap bitmap) {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(Intent.EXTRA_STREAM, fileUri);
             intent.setType("image/png");
-            startActivity(Intent.createChooser(intent, "Share image via"));
+            startActivity(Intent.createChooser(intent, getString(R.string.share_image_via)));
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -316,8 +316,8 @@ private void setUploadProgress(int uploadCount){
 
     private void setZeroAchievements() {
         AlertDialog.Builder builder=new AlertDialog.Builder(this)
-                .setMessage("You haven't made any contributions yet")
-                .setPositiveButton("Ok", (dialog, which) -> {
+                .setMessage(getString(R.string.no_achievements_yet))
+                .setPositiveButton(getString(R.string.ok), (dialog, which) -> {
                 });
         AlertDialog dialog = builder.create();
         dialog.show();

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
@@ -7,6 +7,7 @@
 import android.widget.Toast;
 
 import fr.free.nrw.commons.BuildConfig;
+import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.theme.BaseActivity;
 import timber.log.Timber;
 
@@ -39,7 +40,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 Timber.d("Overriding URL %s", url);
 
                 Toast toast = Toast.makeText(SignupActivity.this,
-                        "Account created!", Toast.LENGTH_LONG);
+                        R.string.account_created, Toast.LENGTH_LONG);
                 toast.show();
                 // terminate on task completion.
                 finish();

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -511,7 +511,7 @@ public void onSlide(@NonNull View bottomSheet, float slideOffset) {
         }
         title.setOnLongClickListener(view -> {
                     Utils.copy("place",title.getText().toString(),getContext());
-                    Toast.makeText(getContext(),"Text copied to clipboard",Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),getString(R.string.text_copy),Toast.LENGTH_SHORT).show();
                     return true;
                 }
         );

diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
@@ -92,7 +92,7 @@ public void removeNotification(Notification notification) {
                         setAdapter(notificationList);
                         adapter.notifyDataSetChanged();
                         Snackbar snackbar = Snackbar
-                                .make(relativeLayout, "Notification marked as read", Snackbar.LENGTH_LONG);
+                                .make(relativeLayout, getString(R.string.notification_mark_read), Snackbar.LENGTH_LONG);
 
                         snackbar.show();
                         if (notificationList.size() == 0) {
@@ -103,7 +103,7 @@ public void removeNotification(Notification notification) {
                     } else {
                         adapter.notifyDataSetChanged();
                         setAdapter(notificationList);
-                        Toast.makeText(NotificationActivity.this, "There was some error!", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(NotificationActivity.this, getString(R.string.some_error), Toast.LENGTH_SHORT).show();
                     }
                 }, throwable -> {
 

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
@@ -163,7 +163,7 @@ void shareScreen(Bitmap bitmap) {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
             intent.setType("image/png");
-            startActivity(Intent.createChooser(intent, "Share image via"));
+            startActivity(Intent.createChooser(intent, getString(R.string.share_image_via)));
         } catch (Exception e) {
             e.printStackTrace();
         }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -576,5 +576,11 @@ Upload your first media by tapping on the add button.</string>
   <string name="delete_helper_ask_reason_copyright_logo">Logo</string>
   <string name="delete_helper_ask_reason_copyright_other">Other</string>
   <string name="delete_helper_ask_alert_set_positive_button_reason">Because it is</string>
+  <string name="share_image_via">Share image via</string>
+  <string name="no_achievements_yet">You haven\'t made any contributions yet</string>
+  <string name="account_created">Account created!</string>
+  <string name="text_copy">Text copied to clipboard</string>
+  <string name="notification_mark_read">Notification marked as read</string>
+  <string name="some_error">There was some error!</string>
   <string name="you_must_reset_your_passsword">Something went wrong with login, you must reset your password !!</string>
 </resources>