Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +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

20
briar-android/AndroidManifest.xml
View File

@@ -46,36 +46,36 @@
android:label="@string/contact_list_title" > android:label="@string/contact_list_title" >
</activity> </activity>
<activity <activity
android:name=".android.groups.ConfigureGroupActivity" android:name="net.sf.briar.android.groups.ConfigureGroupActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity <activity
android:name=".android.groups.CreateGroupActivity" android:name="net.sf.briar.android.groups.CreateGroupActivity"
android:label="@string/create_group_title" > android:label="@string/create_forum_title" >
</activity> </activity>
<activity <activity
android:name=".android.groups.GroupActivity" android:name="net.sf.briar.android.groups.GroupActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity <activity
android:name=".android.groups.GroupListActivity" android:name="net.sf.briar.android.groups.GroupListActivity"
android:label="@string/groups_title" > android:label="@string/forums_title" >
</activity> </activity>
<activity <activity
android:name=".android.groups.ManageGroupsActivity" android:name="net.sf.briar.android.groups.ManageGroupsActivity"
android:label="@string/manage_subscriptions_title" > android:label="@string/manage_subscriptions_title" >
</activity> </activity>
<activity <activity
android:name=".android.groups.ReadGroupPostActivity" android:name="net.sf.briar.android.groups.ReadGroupPostActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity <activity
android:name=".android.groups.WriteGroupPostActivity" android:name="net.sf.briar.android.groups.WriteGroupPostActivity"
android:label="@string/new_post_title" > android:label="@string/new_post_title" >
</activity> </activity>
<activity <activity
android:name=".android.identity.CreateIdentityActivity" android:name=".android.identity.CreateIdentityActivity"
android:label="@string/create_identity_title" > android:label="@string/new_identity_title" >
</activity> </activity>
<activity <activity
android:name=".android.invitation.AddContactActivity" android:name=".android.invitation.AddContactActivity"

28
briar-android/res/values/strings.xml
View File

@@ -13,7 +13,7 @@
<string name="expiry_warning">This software has expired.\nPlease install a newer version.</string> <string name="expiry_warning">This software has expired.\nPlease install a newer version.</string>
<string name="contact_list_button">Contacts</string> <string name="contact_list_button">Contacts</string>
<string name="messages_button">Messages</string> <string name="messages_button">Messages</string>
<string name="groups_button">Groups</string> <string name="forums_button">Forums</string>
<string name="synchronize_button">Synchronize</string> <string name="synchronize_button">Synchronize</string>
<string name="quit_button">Quit</string> <string name="quit_button">Quit</string>
<string name="new_identity_item">New identity\u2026</string> <string name="new_identity_item">New identity\u2026</string>
@@ -58,29 +58,29 @@
<string name="to">To:</string> <string name="to">To:</string>
<string name="anonymous">Anonymous</string> <string name="anonymous">Anonymous</string>
<string name="new_contact_item">New contact\u2026</string> <string name="new_contact_item">New contact\u2026</string>
<string name="groups_title">Groups</string> <string name="forums_title">Forums</string>
<plurals name="groups_available"> <plurals name="forums_available">
<item quantity="one">%1$d group available from contacts</item> <item quantity="one">%1$d forum available from contacts</item>
<item quantity="other">%1$d groups available from contacts</item> <item quantity="other">%1$d forums available from contacts</item>
</plurals> </plurals>
<string name="no_posts">No posts</string> <string name="no_posts">No posts</string>
<string name="subscribe_to_this_group">Subscribe to this group</string> <string name="subscribe_to_this_forum">Subscribe to this forum</string>
<string name="create_group_title">New Group</string> <string name="create_forum_title">New Forum</string>
<string name="choose_group_name">Choose a name for your group:</string> <string name="choose_forum_name">Choose a name for your forum:</string>
<string name="group_visible_to_all">Share this group with all contacts</string> <string name="forum_visible_to_all">Share this forum with all contacts</string>
<string name="group_visible_to_some">Share this group with chosen contacts</string> <string name="forum_visible_to_some">Share this forum with chosen contacts</string>
<string name="new_post_title">New Post</string> <string name="new_post_title">New Post</string>
<string name="new_group_item">New group\u2026</string> <string name="new_forum_item">New forum\u2026</string>
<string name="manage_subscriptions_title">Manage Subscriptions</string> <string name="manage_subscriptions_title">Manage Subscriptions</string>
<string name="no_groups_available">No groups available from contacts</string> <string name="no_forums_available">No forums available from contacts</string>
<string name="subscribed_all">Subscribed, shared with all contacts</string> <string name="subscribed_all">Subscribed, shared with all contacts</string>
<string name="subscribed_some">Subscribed, shared with chosen contacts</string> <string name="subscribed_some">Subscribed, shared with chosen contacts</string>
<string name="not_subscribed">Not subscribed</string> <string name="not_subscribed">Not subscribed</string>
<string name="create_nickname_item">New nickname\u2026</string> <string name="create_nickname_item">New nickname\u2026</string>
<string name="create_identity_title">Create an Identity</string> <string name="new_identity_title">New Identity</string>
<string name="create_button">Create</string> <string name="create_button">Create</string>
<string name="no_contacts">You don\'t have any contacts. Add a contact now?</string> <string name="no_contacts">You don\'t have any contacts. Add a contact now?</string>
<string name="add_button">Add</string> <string name="add_button">Add</string>
<string name="cancel_button">Cancel</string> <string name="cancel_button">Cancel</string>
<string name="no_groups">You aren\'t subscribed to any groups. Create a group now?</string> <string name="no_forums">You aren\'t subscribed to any forums. Create a forum now?</string>
</resources> </resources>

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

@@ -329,19 +329,19 @@ public class HomeScreenActivity extends RoboActivity {
}); });
buttons.add(messagesButton); buttons.add(messagesButton);
Button groupsButton = new Button(this); Button forumsButton = new Button(this);
groupsButton.setLayoutParams(matchMatch); forumsButton.setLayoutParams(matchMatch);
groupsButton.setBackgroundResource(0); forumsButton.setBackgroundResource(0);
groupsButton.setCompoundDrawablesWithIntrinsicBounds(0, forumsButton.setCompoundDrawablesWithIntrinsicBounds(0,
R.drawable.social_chat, 0, 0); R.drawable.social_chat, 0, 0);
groupsButton.setText(R.string.groups_button); forumsButton.setText(R.string.forums_button);
groupsButton.setOnClickListener(new OnClickListener() { forumsButton.setOnClickListener(new OnClickListener() {
public void onClick(View view) { public void onClick(View view) {
startActivity(new Intent(HomeScreenActivity.this, startActivity(new Intent(HomeScreenActivity.this,
GroupListActivity.class)); GroupListActivity.class));
} }
}); });
buttons.add(groupsButton); buttons.add(forumsButton);
Button syncButton = new Button(this); Button syncButton = new Button(this);
syncButton.setLayoutParams(matchMatch); 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 = new CheckBox(this);
subscribeCheckBox.setId(1); subscribeCheckBox.setId(1);
subscribeCheckBox.setText(R.string.subscribe_to_this_group); subscribeCheckBox.setText(R.string.subscribe_to_this_forum);
subscribeCheckBox.setChecked(subscribed); subscribeCheckBox.setChecked(subscribed);
subscribeCheckBox.setOnClickListener(this); subscribeCheckBox.setOnClickListener(this);
layout.addView(subscribeCheckBox); layout.addView(subscribeCheckBox);
@@ -97,14 +97,14 @@ SelectContactsDialog.Listener {
visibleToAll = new RadioButton(this); visibleToAll = new RadioButton(this);
visibleToAll.setId(2); visibleToAll.setId(2);
visibleToAll.setText(R.string.group_visible_to_all); visibleToAll.setText(R.string.forum_visible_to_all);
visibleToAll.setEnabled(subscribed); visibleToAll.setEnabled(subscribed);
visibleToAll.setOnClickListener(this); visibleToAll.setOnClickListener(this);
radioGroup.addView(visibleToAll); radioGroup.addView(visibleToAll);
visibleToSome = new RadioButton(this); visibleToSome = new RadioButton(this);
visibleToSome.setId(3); visibleToSome.setId(3);
visibleToSome.setText(R.string.group_visible_to_some); visibleToSome.setText(R.string.forum_visible_to_some);
visibleToSome.setEnabled(subscribed); visibleToSome.setEnabled(subscribed);
visibleToSome.setOnClickListener(this); visibleToSome.setOnClickListener(this);
radioGroup.addView(visibleToSome); 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.setGravity(CENTER);
chooseName.setTextSize(18); chooseName.setTextSize(18);
chooseName.setPadding(10, 10, 10, 0); chooseName.setPadding(10, 10, 10, 0);
chooseName.setText(R.string.choose_group_name); chooseName.setText(R.string.choose_forum_name);
layout.addView(chooseName); layout.addView(chooseName);
nameEntry = new EditText(this) { nameEntry = new EditText(this) {
@@ -106,13 +106,13 @@ SelectContactsDialog.Listener {
visibleToAll = new RadioButton(this); visibleToAll = new RadioButton(this);
visibleToAll.setId(2); visibleToAll.setId(2);
visibleToAll.setText(R.string.group_visible_to_all); visibleToAll.setText(R.string.forum_visible_to_all);
visibleToAll.setOnClickListener(this); visibleToAll.setOnClickListener(this);
radioGroup.addView(visibleToAll); radioGroup.addView(visibleToAll);
visibleToSome = new RadioButton(this); visibleToSome = new RadioButton(this);
visibleToSome.setId(3); visibleToSome.setId(3);
visibleToSome.setText(R.string.group_visible_to_some); visibleToSome.setText(R.string.forum_visible_to_some);
visibleToSome.setOnClickListener(this); visibleToSome.setOnClickListener(this);
radioGroup.addView(visibleToSome); radioGroup.addView(visibleToSome);
layout.addView(radioGroup); 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.setGravity(CENTER);
manage.setTextSize(18); manage.setTextSize(18);
manage.setPadding(10, 10, 10, 10); manage.setPadding(10, 10, 10, 10);
String format = res.getQuantityString(R.plurals.groups_available, String format = res.getQuantityString(R.plurals.forums_available,
available); available);
manage.setText(String.format(format, available)); manage.setText(String.format(format, available));
return manage; 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); int pad = res.getInteger(R.integer.spinner_padding);
name.setPadding(pad, pad, pad, pad); name.setPadding(pad, pad, pad, pad);
GroupItem item = getItem(position); 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()); else name.setText(item.getGroup().getName());
return name; 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.setGravity(CENTER);
none.setTextSize(18); none.setTextSize(18);
none.setPadding(10, 10, 10, 10); none.setPadding(10, 10, 10, 10);
none.setText(R.string.no_groups_available); none.setText(R.string.no_forums_available);
return none; 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 @Override
public Dialog onCreateDialog(Bundle state) { public Dialog onCreateDialog(Bundle state) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); 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, builder.setPositiveButton(R.string.create_button,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {