Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Group strings and remove unused resources

Browse Source 
Closes #342
This commit is contained in:
Torsten Grote
2016-08-09 15:06:11 -03:00
parent b17fbcb135
commit 72906acaee
52 changed files with 230 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/org/briarproject/android/BriarFragmentActivity.java
View File

@@ -24,9 +24,9 @@ public abstract class BriarFragmentActivity extends BriarActivity {
return;
if (fragmentTag.equals(ContactListFragment.TAG)) {
actionBar.setTitle(R.string.contacts_toolbar_header);
actionBar.setTitle(R.string.contact_list_button);
} else if (fragmentTag.equals(ForumListFragment.TAG)) {
actionBar.setTitle(R.string.forums_toolbar_header);
actionBar.setTitle(R.string.forums_button);
} else if (fragmentTag.equals(BlogsFragment.TAG)) {
actionBar.setTitle(R.string.blogs_button);
}
@@ -75,7 +75,7 @@ public abstract class BriarFragmentActivity extends BriarActivity {
R.style.BriarDialogTheme);
builder.setTitle(titleStringId);
builder.setMessage(msgStringId);
builder.setPositiveButton(R.string.dialog_button_ok, null);
builder.setPositiveButton(R.string.ok, null);
AlertDialog dialog = builder.create();
dialog.show();
}

4
briar-android/src/org/briarproject/android/PasswordActivity.java
View File

@@ -109,8 +109,8 @@ public class PasswordActivity extends BaseActivity {
R.style.BriarDialogTheme);
builder.setTitle(R.string.dialog_title_lost_password);
builder.setMessage(R.string.dialog_message_lost_password);
builder.setPositiveButton(R.string.cancel_button, null);
builder.setNegativeButton(R.string.delete_button,
builder.setPositiveButton(R.string.cancel, null);
builder.setNegativeButton(R.string.delete,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

2
briar-android/src/org/briarproject/android/blogs/BlogFragment.java
View File

@@ -283,7 +283,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
builder.setTitle(getString(R.string.blogs_remove_blog));
builder.setMessage(
getString(R.string.blogs_remove_blog_dialog_message));
builder.setPositiveButton(R.string.cancel_button, null);
builder.setPositiveButton(R.string.cancel, null);
builder.setNegativeButton(R.string.blogs_remove_blog_ok, okListener);
builder.show();
}

2
briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java
View File

@@ -160,7 +160,7 @@ public class RssFeedImportActivity extends BriarActivity {
new AlertDialog.Builder(RssFeedImportActivity.this,
R.style.BriarDialogTheme);
builder.setMessage(R.string.blogs_rss_feeds_import_error);
builder.setNegativeButton(R.string.cancel_button, null);
builder.setNegativeButton(R.string.cancel, null);
builder.setPositiveButton(R.string.try_again_button,
new DialogInterface.OnClickListener() {
@Override

2
briar-android/src/org/briarproject/android/forum/ForumListFragment.java
View File

@@ -88,7 +88,7 @@ public class ForumListFragment extends BaseEventFragment implements
snackbar = Snackbar.make(list, "", LENGTH_INDEFINITE);
snackbar.getView().setBackgroundResource(R.color.briar_primary);
snackbar.setAction(R.string.show_forums, this);
snackbar.setAction(R.string.show, this);
snackbar.setActionTextColor(ContextCompat
.getColor(getContext(), R.color.briar_button_positive));