diff --git a/briar-android/.gitignore b/briar-android/.gitignore
index a863a56ecd998bbdb307a662a1cf6225dd40dcfb..1a6498b3f83944379d726f5bd3c4e6405ac61327 100644
--- a/briar-android/.gitignore
+++ b/briar-android/.gitignore
@@ -1,4 +1,3 @@
bin
gen
-res
local.properties
diff --git a/briar-android/res/drawable-hdpi/content_email.png b/briar-android/res/drawable-hdpi/content_email.png
new file mode 100644
index 0000000000000000000000000000000000000000..d821bc93a1707ccf462f253a9fa03f7be217964c
Binary files /dev/null and b/briar-android/res/drawable-hdpi/content_email.png differ
diff --git a/briar-android/res/drawable-hdpi/device_access_accounts.png b/briar-android/res/drawable-hdpi/device_access_accounts.png
new file mode 100644
index 0000000000000000000000000000000000000000..3daaa49670dce9d86d71b25327586a78c325f1f1
Binary files /dev/null and b/briar-android/res/drawable-hdpi/device_access_accounts.png differ
diff --git a/briar-android/res/drawable-hdpi/green_bulb.png b/briar-android/res/drawable-hdpi/green_bulb.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c9f76c4522f49d5239cb10ade1d8e5964427f0a
Binary files /dev/null and b/briar-android/res/drawable-hdpi/green_bulb.png differ
diff --git a/briar-android/res/drawable-hdpi/grey_bulb.png b/briar-android/res/drawable-hdpi/grey_bulb.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a1053fc7d3f76039fbc93c9fb1dffd1fd5e2af1
Binary files /dev/null and b/briar-android/res/drawable-hdpi/grey_bulb.png differ
diff --git a/briar-android/res/drawable-hdpi/navigation_cancel.png b/briar-android/res/drawable-hdpi/navigation_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde36e1fa7b8fb99cd7cdb3dc1e18466196750b0
Binary files /dev/null and b/briar-android/res/drawable-hdpi/navigation_cancel.png differ
diff --git a/briar-android/res/drawable-hdpi/navigation_refresh.png b/briar-android/res/drawable-hdpi/navigation_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..479aca465fb358e754f9f6a28c8e903d5f72f726
Binary files /dev/null and b/briar-android/res/drawable-hdpi/navigation_refresh.png differ
diff --git a/briar-android/res/drawable-hdpi/notification_icon.png b/briar-android/res/drawable-hdpi/notification_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1612d06b545ffe66ada892a98bf0be988af4c31
Binary files /dev/null and b/briar-android/res/drawable-hdpi/notification_icon.png differ
diff --git a/briar-android/res/drawable-hdpi/social_chat.png b/briar-android/res/drawable-hdpi/social_chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..db0c7ac720b017f6ae3522cb238093cb4f9b4d30
Binary files /dev/null and b/briar-android/res/drawable-hdpi/social_chat.png differ
diff --git a/briar-android/res/drawable-hdpi/social_person.png b/briar-android/res/drawable-hdpi/social_person.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b64886f7d79288bdbc7ba5377f73dfd5b1943e8
Binary files /dev/null and b/briar-android/res/drawable-hdpi/social_person.png differ
diff --git a/briar-android/res/drawable-hdpi/social_share.png b/briar-android/res/drawable-hdpi/social_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..47ae186749df92bbbe77f860ce657d3edce27765
Binary files /dev/null and b/briar-android/res/drawable-hdpi/social_share.png differ
diff --git a/briar-android/res/drawable-mdpi/content_email.png b/briar-android/res/drawable-mdpi/content_email.png
new file mode 100644
index 0000000000000000000000000000000000000000..8359f81d7d3b0e53ba05fb3ae7552dbf42d1b9bb
Binary files /dev/null and b/briar-android/res/drawable-mdpi/content_email.png differ
diff --git a/briar-android/res/drawable-mdpi/device_access_accounts.png b/briar-android/res/drawable-mdpi/device_access_accounts.png
new file mode 100644
index 0000000000000000000000000000000000000000..84296f8e7ccbbd0221051e465ed832fa0100acb3
Binary files /dev/null and b/briar-android/res/drawable-mdpi/device_access_accounts.png differ
diff --git a/briar-android/res/drawable-mdpi/green_bulb.png b/briar-android/res/drawable-mdpi/green_bulb.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7fb72a6d4c947ae698fee1275bd4427477986c0
Binary files /dev/null and b/briar-android/res/drawable-mdpi/green_bulb.png differ
diff --git a/briar-android/res/drawable-mdpi/grey_bulb.png b/briar-android/res/drawable-mdpi/grey_bulb.png
new file mode 100644
index 0000000000000000000000000000000000000000..790357f4e5d8e306028516269cd39a708f7bb017
Binary files /dev/null and b/briar-android/res/drawable-mdpi/grey_bulb.png differ
diff --git a/briar-android/res/drawable-mdpi/navigation_cancel.png b/briar-android/res/drawable-mdpi/navigation_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f4c3d6a2b5bffc7529ef77789f4b9a1258c967e
Binary files /dev/null and b/briar-android/res/drawable-mdpi/navigation_cancel.png differ
diff --git a/briar-android/res/drawable-mdpi/navigation_refresh.png b/briar-android/res/drawable-mdpi/navigation_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..63e70e1786450eff17a947367038076c98ccc497
Binary files /dev/null and b/briar-android/res/drawable-mdpi/navigation_refresh.png differ
diff --git a/briar-android/res/drawable-mdpi/social_chat.png b/briar-android/res/drawable-mdpi/social_chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe5d96e3c69bb043c27dfbfdc137f45ee558c1d1
Binary files /dev/null and b/briar-android/res/drawable-mdpi/social_chat.png differ
diff --git a/briar-android/res/drawable-mdpi/social_person.png b/briar-android/res/drawable-mdpi/social_person.png
new file mode 100644
index 0000000000000000000000000000000000000000..35e67efb8b279b3f936f0e65c87a10310e4dd55a
Binary files /dev/null and b/briar-android/res/drawable-mdpi/social_person.png differ
diff --git a/briar-android/res/drawable-mdpi/social_share.png b/briar-android/res/drawable-mdpi/social_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..8aa52bc7d8a74739dc5e0ad9c35a006bdcbda182
Binary files /dev/null and b/briar-android/res/drawable-mdpi/social_share.png differ
diff --git a/briar-android/res/drawable-xhdpi/content_email.png b/briar-android/res/drawable-xhdpi/content_email.png
new file mode 100644
index 0000000000000000000000000000000000000000..10b19e41534816a080b26b5554564d96d1bfe399
Binary files /dev/null and b/briar-android/res/drawable-xhdpi/content_email.png differ
diff --git a/briar-android/res/drawable-xhdpi/device_access_accounts.png b/briar-android/res/drawable-xhdpi/device_access_accounts.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bb1359520c41d9993caf83f00247ce688768101
Binary files /dev/null and b/briar-android/res/drawable-xhdpi/device_access_accounts.png differ
diff --git a/briar-android/res/drawable-xhdpi/green_bulb.png b/briar-android/res/drawable-xhdpi/green_bulb.png
new file mode 100644
index 0000000000000000000000000000000000000000..53c5273b9c9c95efbf6a66eb03b12c7918498f30
Binary files /dev/null and b/briar-android/res/drawable-xhdpi/green_bulb.png differ
diff --git a/briar-android/res/drawable-xhdpi/grey_bulb.png b/briar-android/res/drawable-xhdpi/grey_bulb.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a398fba118a854f2bc778424cf318d316c45a55
Binary files /dev/null and b/briar-android/res/drawable-xhdpi/grey_bulb.png differ
diff --git a/briar-android/res/drawable-xhdpi/navigation_cancel.png b/briar-android/res/drawable-xhdpi/navigation_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca7d159fdaa906473fa7ce7a63814ced79c89db3
Binary files /dev/null and b/briar-android/res/drawable-xhdpi/navigation_cancel.png differ
diff --git a/briar-android/res/drawable-xhdpi/navigation_refresh.png b/briar-android/res/drawable-xhdpi/navigation_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6212cf679dbd3518a837159cf54d28948a2261e
Binary files /dev/null and b/briar-android/res/drawable-xhdpi/navigation_refresh.png differ
diff --git a/briar-android/res/drawable-xhdpi/social_chat.png b/briar-android/res/drawable-xhdpi/social_chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f58695c5981c55cda078b0b96336b7a4a609b86
Binary files /dev/null and b/briar-android/res/drawable-xhdpi/social_chat.png differ
diff --git a/briar-android/res/drawable-xhdpi/social_person.png b/briar-android/res/drawable-xhdpi/social_person.png
new file mode 100644
index 0000000000000000000000000000000000000000..357229b80de402e4fc169bf28540ac472d448d6a
Binary files /dev/null and b/briar-android/res/drawable-xhdpi/social_person.png differ
diff --git a/briar-android/res/drawable-xhdpi/social_share.png b/briar-android/res/drawable-xhdpi/social_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdafd8abca1912ff47f812c38fd29994da1d7867
Binary files /dev/null and b/briar-android/res/drawable-xhdpi/social_share.png differ
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 89c4337ab2133eb6d65ac902e35a0f5ee2071488..75b51e2dbd556eb642e19017bc30c30d06723209 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -5,7 +5,9 @@
<string name="notification_text">Touch to quit.</string>
<string name="contact_list_button">Contacts</string>
<string name="messages_button">Messages</string>
- <string name="settings_button">Settings</string>
+ <string name="boards_button">Boards</string>
+ <string name="blogs_button">Blogs</string>
+ <string name="synchronize_button">Synchronize</string>
<string name="quit_button">Quit</string>
<string name="contact_list_title">Contacts</string>
<string name="contact_connected">Connected</string>
diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
index 8ecd9168bb527cb2a460d3fea169d43092186c02..65b8fd01d7be51c2b93f53f5a7fd0cbf8e29c89f 100644
--- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
+++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
@@ -58,18 +58,18 @@ public class HomeScreenActivity extends BriarActivity {
ListView.LayoutParams matchParent = new ListView.LayoutParams(
MATCH_PARENT, MATCH_PARENT);
- Button contactListButton = new Button(this);
- contactListButton.setLayoutParams(matchParent);
- contactListButton.setCompoundDrawablesWithIntrinsicBounds(0,
+ Button contactsButton = new Button(this);
+ contactsButton.setLayoutParams(matchParent);
+ contactsButton.setCompoundDrawablesWithIntrinsicBounds(0,
R.drawable.social_person, 0, 0);
- contactListButton.setText(R.string.contact_list_button);
- contactListButton.setOnClickListener(new OnClickListener() {
+ contactsButton.setText(R.string.contact_list_button);
+ contactsButton.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
startActivity(new Intent(HomeScreenActivity.this,
ContactListActivity.class));
}
});
- buttons.add(contactListButton);
+ buttons.add(contactsButton);
Button messagesButton = new Button(this);
messagesButton.setLayoutParams(matchParent);
@@ -83,22 +83,46 @@ public class HomeScreenActivity extends BriarActivity {
});
buttons.add(messagesButton);
- Button settingsButton = new Button(this);
- settingsButton.setLayoutParams(matchParent);
- settingsButton.setCompoundDrawablesWithIntrinsicBounds(0,
- R.drawable.action_settings, 0, 0);
- settingsButton.setText(R.string.settings_button);
- settingsButton.setOnClickListener(new OnClickListener() {
+ Button boardsButton = new Button(this);
+ boardsButton.setLayoutParams(matchParent);
+ boardsButton.setCompoundDrawablesWithIntrinsicBounds(0,
+ R.drawable.social_chat, 0, 0);
+ boardsButton.setText(R.string.boards_button);
+ boardsButton.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
// FIXME: Hook this button up to an activity
}
});
- buttons.add(settingsButton);
+ buttons.add(boardsButton);
+
+ Button blogsButton = new Button(this);
+ blogsButton.setLayoutParams(matchParent);
+ blogsButton.setCompoundDrawablesWithIntrinsicBounds(0,
+ R.drawable.social_share, 0, 0);
+ blogsButton.setText(R.string.blogs_button);
+ blogsButton.setOnClickListener(new OnClickListener() {
+ public void onClick(View view) {
+ // FIXME: Hook this button up to an activity
+ }
+ });
+ buttons.add(blogsButton);
+
+ Button syncButton = new Button(this);
+ syncButton.setLayoutParams(matchParent);
+ syncButton.setCompoundDrawablesWithIntrinsicBounds(0,
+ R.drawable.navigation_refresh, 0, 0);
+ syncButton.setText(R.string.synchronize_button);
+ syncButton.setOnClickListener(new OnClickListener() {
+ public void onClick(View view) {
+ // FIXME: Hook this button up to an activity
+ }
+ });
+ buttons.add(syncButton);
Button quitButton = new Button(this);
quitButton.setLayoutParams(matchParent);
quitButton.setCompoundDrawablesWithIntrinsicBounds(0,
- R.drawable.navigation_cancel, 0, 0);
+ R.drawable.device_access_accounts, 0, 0);
quitButton.setText(R.string.quit_button);
quitButton.setOnClickListener(new OnClickListener() {
public void onClick(View view) {