diff --git a/briar-android/.gitignore b/briar-android/.gitignore index a863a56ec..1a6498b3f 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 000000000..d821bc93a 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 000000000..3daaa4967 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 000000000..6c9f76c45 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 000000000..4a1053fc7 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 000000000..cde36e1fa 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 000000000..479aca465 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 000000000..f1612d06b 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 000000000..db0c7ac72 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 000000000..7b64886f7 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 000000000..47ae18674 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 000000000..8359f81d7 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 000000000..84296f8e7 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 000000000..c7fb72a6d 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 000000000..790357f4e 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 000000000..9f4c3d6a2 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 000000000..63e70e178 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 000000000..fe5d96e3c 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 000000000..35e67efb8 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 000000000..8aa52bc7d 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 000000000..10b19e415 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 000000000..0bb135952 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 000000000..53c5273b9 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 000000000..9a398fba1 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 000000000..ca7d159fd 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 000000000..e6212cf67 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 000000000..3f58695c5 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 000000000..357229b80 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 000000000..cdafd8abc 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 89c4337ab..75b51e2db 100644 --- a/briar-android/res/values/strings.xml +++ b/briar-android/res/values/strings.xml @@ -5,7 +5,9 @@ Touch to quit. Contacts Messages - Settings + Boards + Blogs + Synchronize Quit Contacts Connected diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java index 8ecd9168b..65b8fd01d 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) {