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

Changed 'groups' to 'forums' in the Android UI.

Browse Source
This commit is contained in:
akwizgran
2013-09-27 18:25:39 +01:00
parent 7b01e42da8
commit 38c1b4eb97
9 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-android/src/net/sf/briar/android/HomeScreenActivity.java
View File

@@ -329,19 +329,19 @@ public class HomeScreenActivity extends RoboActivity {
});
buttons.add(messagesButton);
Button groupsButton = new Button(this);
groupsButton.setLayoutParams(matchMatch);
groupsButton.setBackgroundResource(0);
groupsButton.setCompoundDrawablesWithIntrinsicBounds(0,
Button forumsButton = new Button(this);
forumsButton.setLayoutParams(matchMatch);
forumsButton.setBackgroundResource(0);
forumsButton.setCompoundDrawablesWithIntrinsicBounds(0,
R.drawable.social_chat, 0, 0);
groupsButton.setText(R.string.groups_button);
groupsButton.setOnClickListener(new OnClickListener() {
forumsButton.setText(R.string.forums_button);
forumsButton.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
startActivity(new Intent(HomeScreenActivity.this,
GroupListActivity.class));
}
});
buttons.add(groupsButton);
buttons.add(forumsButton);
Button syncButton = new Button(this);
syncButton.setLayoutParams(matchMatch);

6
briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java
View File

@@ -87,7 +87,7 @@ SelectContactsDialog.Listener {
subscribeCheckBox = new CheckBox(this);
subscribeCheckBox.setId(1);
subscribeCheckBox.setText(R.string.subscribe_to_this_group);
subscribeCheckBox.setText(R.string.subscribe_to_this_forum);
subscribeCheckBox.setChecked(subscribed);
subscribeCheckBox.setOnClickListener(this);
layout.addView(subscribeCheckBox);
@@ -97,14 +97,14 @@ SelectContactsDialog.Listener {
visibleToAll = new RadioButton(this);
visibleToAll.setId(2);
visibleToAll.setText(R.string.group_visible_to_all);
visibleToAll.setText(R.string.forum_visible_to_all);
visibleToAll.setEnabled(subscribed);
visibleToAll.setOnClickListener(this);
radioGroup.addView(visibleToAll);
visibleToSome = new RadioButton(this);
visibleToSome.setId(3);
visibleToSome.setText(R.string.group_visible_to_some);
visibleToSome.setText(R.string.forum_visible_to_some);
visibleToSome.setEnabled(subscribed);
visibleToSome.setOnClickListener(this);
radioGroup.addView(visibleToSome);

6
briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
View File

@@ -85,7 +85,7 @@ SelectContactsDialog.Listener {
chooseName.setGravity(CENTER);
chooseName.setTextSize(18);
chooseName.setPadding(10, 10, 10, 0);
chooseName.setText(R.string.choose_group_name);
chooseName.setText(R.string.choose_forum_name);
layout.addView(chooseName);
nameEntry = new EditText(this) {
@@ -106,13 +106,13 @@ SelectContactsDialog.Listener {
visibleToAll = new RadioButton(this);
visibleToAll.setId(2);
visibleToAll.setText(R.string.group_visible_to_all);
visibleToAll.setText(R.string.forum_visible_to_all);
visibleToAll.setOnClickListener(this);
radioGroup.addView(visibleToAll);
visibleToSome = new RadioButton(this);
visibleToSome.setId(3);
visibleToSome.setText(R.string.group_visible_to_some);
visibleToSome.setText(R.string.forum_visible_to_some);
visibleToSome.setOnClickListener(this);
radioGroup.addView(visibleToSome);
layout.addView(radioGroup);

2
briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java
View File

@@ -68,7 +68,7 @@ class GroupListAdapter extends BaseAdapter {
manage.setGravity(CENTER);
manage.setTextSize(18);
manage.setPadding(10, 10, 10, 10);
String format = res.getQuantityString(R.plurals.groups_available,
String format = res.getQuantityString(R.plurals.forums_available,
available);
manage.setText(String.format(format, available));
return manage;

2
briar-android/src/net/sf/briar/android/groups/GroupSpinnerAdapter.java
View File

@@ -60,7 +60,7 @@ class GroupSpinnerAdapter extends BaseAdapter implements SpinnerAdapter {
int pad = res.getInteger(R.integer.spinner_padding);
name.setPadding(pad, pad, pad, pad);
GroupItem item = getItem(position);
if(item == NEW) name.setText(R.string.new_group_item);
if(item == NEW) name.setText(R.string.new_forum_item);
else name.setText(item.getGroup().getName());
return name;
}

2
briar-android/src/net/sf/briar/android/groups/ManageGroupsAdapter.java
View File

@@ -59,7 +59,7 @@ class ManageGroupsAdapter extends BaseAdapter {
none.setGravity(CENTER);
none.setTextSize(18);
none.setPadding(10, 10, 10, 10);
none.setText(R.string.no_groups_available);
none.setText(R.string.no_forums_available);
return none;
}

2
briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java
View File

@@ -18,7 +18,7 @@ public class NoGroupsDialog extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle state) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(R.string.no_groups);
builder.setMessage(R.string.no_forums);
builder.setPositiveButton(R.string.create_button,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {