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

Working with #3129 issue (#3146)

Browse source 
* Replace Hard-Coded strings with those from strings.xml.
This commit is contained in:
PavelAplevich 2019-09-09 08:31:30 +03:00 • committed by Josephine Lim
parent d58e3628d8
commit cc0176a0d9
6 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -199,7 +199,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
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 @@ public class AchievementsActivity extends NavigationBaseActivity {
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();

3
app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
View file

@ -7,6 +7,7 @@ import android.webkit.WebViewClient;
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 class SignupActivity extends BaseActivity {
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();

2
app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file

@ -511,7 +511,7 @@ public class NearbyMapFragment extends DaggerFragment {
}
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;
}
);

4
app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
View file

@ -92,7 +92,7 @@ public class NotificationActivity extends NavigationBaseActivity {
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 class NotificationActivity extends NavigationBaseActivity {
} 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 -> {

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

@ -163,7 +163,7 @@ public class QuizResultActivity extends AppCompatActivity {
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();
}

6
app/src/main/res/values/strings.xml
View file

@ -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>