diff --git a/briar-android/res/values-v11/styles.xml b/briar-android/res/values-v11/styles.xml
index 3d35b1d09db047df0ce565820e8b7b81d43b463b..b412504554af73c67330ce6d4b49689ee1555a15 100644
--- a/briar-android/res/values-v11/styles.xml
+++ b/briar-android/res/values-v11/styles.xml
@@ -2,6 +2,7 @@
<resources>
<style name="LightTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/CustomActionBar</item>
+ <item name="android:windowBackground">@color/window_background</item>
</style>
<style name="CustomActionBar"
parent="android:Widget.Holo.Light.ActionBar.Solid.Inverse">
diff --git a/briar-android/res/values/color.xml b/briar-android/res/values/color.xml
index d05bd0428c1666c2ffa46137b1413d12f6e48eba..5df37c9f6bc34a59241ef77eca21380e4255f6e7 100644
--- a/briar-android/res/values/color.xml
+++ b/briar-android/res/values/color.xml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <color name="window_background">#EEEEEE</color>
<color name="action_bar_background">#2D3E50</color>
- <color name="home_screen_background">#FFFFFF</color>
- <color name="content_background">#FFFFFF</color>
- <color name="conversation_background">#DDDDDD</color>
+ <color name="button_bar_background">#FFFFFF</color>
+ <color name="private_message_background">#FFFFFF</color>
+ <color name="private_message_date">#AAAAAA</color>
<color name="unread_background">#FFFFFF</color>
- <color name="read_background">#EEEEEE</color>
- <color name="compose_background">#FFFFFF</color>
<color name="horizontal_border">#CCCCCC</color>
<color name="no_posts">#AAAAAA</color>
- <color name="private_message_date">#AAAAAA</color>
</resources>
\ No newline at end of file
diff --git a/briar-android/src/org/briarproject/android/DashboardActivity.java b/briar-android/src/org/briarproject/android/DashboardActivity.java
index b6699664e258ade799bb56ac1bb74537b2d4d827..f1f604f1e764706b2134dd18ab24501580310054 100644
--- a/briar-android/src/org/briarproject/android/DashboardActivity.java
+++ b/briar-android/src/org/briarproject/android/DashboardActivity.java
@@ -26,6 +26,7 @@ import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import android.content.Intent;
+import android.content.res.Resources;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
@@ -155,8 +156,8 @@ public class DashboardActivity extends BriarActivity {
grid.setLayoutParams(matchMatch);
grid.setGravity(CENTER);
grid.setPadding(pad, pad, pad, pad);
- grid.setBackgroundColor(getResources().getColor(
- R.color.home_screen_background));
+ Resources res = getResources();
+ grid.setBackgroundColor(res.getColor(R.color.button_bar_background));
grid.setNumColumns(2);
grid.setAdapter(new BaseAdapter() {
diff --git a/briar-android/src/org/briarproject/android/contact/ContactListActivity.java b/briar-android/src/org/briarproject/android/contact/ContactListActivity.java
index 87db736da1e0691cb1ae6659ccc241ee64276084..70519d531ea26cd6d800a2da3d9f26ab93ac16bb 100644
--- a/briar-android/src/org/briarproject/android/contact/ContactListActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ContactListActivity.java
@@ -1,5 +1,6 @@
package org.briarproject.android.contact;
+import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
@@ -7,6 +8,7 @@ import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
+import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
import java.util.Collection;
@@ -42,6 +44,7 @@ import org.briarproject.api.transport.ConnectionListener;
import org.briarproject.api.transport.ConnectionRegistry;
import android.content.Intent;
+import android.content.res.Resources;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
@@ -92,11 +95,17 @@ ConnectionListener {
layout.addView(new HorizontalBorder(this));
+ LinearLayout footer = new LinearLayout(this);
+ footer.setLayoutParams(MATCH_WRAP);
+ footer.setGravity(CENTER);
+ Resources res = getResources();
+ footer.setBackgroundColor(res.getColor(R.color.button_bar_background));
addContactButton = new ImageButton(this);
addContactButton.setBackgroundResource(0);
addContactButton.setImageResource(R.drawable.social_add_person);
addContactButton.setOnClickListener(this);
- layout.addView(addContactButton);
+ footer.addView(addContactButton);
+ layout.addView(footer);
setContentView(layout);
}
diff --git a/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java b/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
index 42b090fecc3ab741f0ba2220c686084e4824882d..501cff3f3812c22b3432bb1d73f5045574d7fa5d 100644
--- a/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
+++ b/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
@@ -35,11 +35,13 @@ class ContactListAdapter extends ArrayAdapter<ContactListItem> {
public View getView(int position, View convertView, ViewGroup parent) {
ContactListItem item = getItem(position);
Context ctx = getContext();
+ Resources res = ctx.getResources();
+
LinearLayout layout = new LinearLayout(ctx);
layout.setOrientation(HORIZONTAL);
layout.setGravity(CENTER_VERTICAL);
- Resources res = ctx.getResources();
- if(item.getUnreadCount() > 0)
+ int unread = item.getUnreadCount();
+ if(unread > 0)
layout.setBackgroundColor(res.getColor(R.color.unread_background));
ImageView bulb = new ImageView(ctx);
@@ -56,7 +58,6 @@ class ContactListAdapter extends ArrayAdapter<ContactListItem> {
name.setSingleLine();
name.setEllipsize(END);
name.setPadding(0, pad, pad, pad);
- int unread = item.getUnreadCount();
String contactName = item.getContact().getAuthor().getName();
if(unread > 0) name.setText(contactName + " (" + unread + ")");
else name.setText(contactName);
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
index 10b3fa463945c3a4d0d4caaa8f8528a9050d8731..57aed2a519318d1bc3b267e1eb4e29841142c414 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
@@ -138,7 +138,7 @@ implements EventListener, OnClickListener, OnItemClickListener {
list.setClipToPadding(false);
// Make the dividers the same colour as the background
Resources res = getResources();
- int background = res.getColor(R.color.conversation_background);
+ int background = res.getColor(R.color.window_background);
list.setBackgroundColor(background);
list.setDivider(new ColorDrawable(background));
list.setDividerHeight(pad);
@@ -158,7 +158,7 @@ implements EventListener, OnClickListener, OnItemClickListener {
footer.setOrientation(HORIZONTAL);
footer.setGravity(CENTER_VERTICAL);
footer.setPadding(pad, 0, 0, 0);
- footer.setBackgroundColor(res.getColor(R.color.compose_background));
+ footer.setBackgroundColor(res.getColor(R.color.button_bar_background));
content = new EditText(this);
content.setId(1);
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
index ce82052daffc4c63551072d5590025541bacbc9f..f50ffd72407e9d2c59f086547f93cab72fab45a9 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
@@ -44,9 +44,7 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
if(header.isLocal()) layout.setPadding(3 * pad, 0, 0, 0);
else layout.setPadding(0, 0, 3 * pad, 0);
- int background;
- if(header.isRead()) background = res.getColor(R.color.read_background);
- else background = res.getColor(R.color.unread_background);
+ int background = res.getColor(R.color.private_message_background);
View content;
if(item.getBody() == null) {
diff --git a/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java b/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
index 5f2b2ba61cb3bb4a4d9d6858d4c77b24f7203db5..1b4e5be886a354c34f33b1e77736d3e08899ac22 100644
--- a/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
@@ -110,8 +110,6 @@ implements OnClickListener {
LinearLayout message = new LinearLayout(this);
message.setOrientation(VERTICAL);
- Resources res = getResources();
- message.setBackgroundColor(res.getColor(R.color.content_background));
LinearLayout header = new LinearLayout(this);
header.setLayoutParams(MATCH_WRAP);
@@ -148,6 +146,8 @@ implements OnClickListener {
footer.setLayoutParams(MATCH_WRAP);
footer.setOrientation(HORIZONTAL);
footer.setGravity(CENTER);
+ Resources res = getResources();
+ footer.setBackgroundColor(res.getColor(R.color.button_bar_background));
readButton = new ImageButton(this);
readButton.setBackgroundResource(0);
diff --git a/briar-android/src/org/briarproject/android/groups/GroupActivity.java b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
index 0a363c8f581ea8d33edc562bea528e36190c09f3..d4d7a64de7ac41d48199990420858adf38dcbcde 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
@@ -1,5 +1,6 @@
package org.briarproject.android.groups;
+import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
@@ -8,6 +9,7 @@ import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.groups.ReadGroupPostActivity.RESULT_PREV_NEXT;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
+import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
import java.util.ArrayList;
@@ -42,6 +44,7 @@ import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.MessageId;
import android.content.Intent;
+import android.content.res.Resources;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
@@ -102,11 +105,17 @@ OnClickListener, OnItemClickListener {
layout.addView(new HorizontalBorder(this));
+ LinearLayout footer = new LinearLayout(this);
+ footer.setLayoutParams(MATCH_WRAP);
+ footer.setGravity(CENTER);
+ Resources res = getResources();
+ footer.setBackgroundColor(res.getColor(R.color.button_bar_background));
ImageButton composeButton = new ImageButton(this);
composeButton.setBackgroundResource(0);
composeButton.setImageResource(R.drawable.content_new_email);
composeButton.setOnClickListener(this);
- layout.addView(composeButton);
+ footer.addView(composeButton);
+ layout.addView(footer);
setContentView(layout);
}
diff --git a/briar-android/src/org/briarproject/android/groups/GroupAdapter.java b/briar-android/src/org/briarproject/android/groups/GroupAdapter.java
index df254e08cf309125c9185c904cd98c0684de4a4f..ad0e90abed71292f5b47b32b27a1c65308d3923d 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupAdapter.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupAdapter.java
@@ -45,10 +45,8 @@ class GroupAdapter extends ArrayAdapter<GroupItem> {
LinearLayout layout = new LinearLayout(ctx);
layout.setOrientation(VERTICAL);
layout.setGravity(CENTER_HORIZONTAL);
- int background;
- if(header.isRead()) background = res.getColor(R.color.read_background);
- else background = res.getColor(R.color.unread_background);
- layout.setBackgroundColor(background);
+ if(!header.isRead())
+ layout.setBackgroundColor(res.getColor(R.color.unread_background));
LinearLayout headerLayout = new LinearLayout(ctx);
headerLayout.setOrientation(HORIZONTAL);
diff --git a/briar-android/src/org/briarproject/android/groups/GroupListActivity.java b/briar-android/src/org/briarproject/android/groups/GroupListActivity.java
index 959793b6632fec61dd993db3ba52211dcbeb347e..09ff3fa76034c0c2a25b93f2e923719cef591624 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupListActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupListActivity.java
@@ -45,6 +45,7 @@ import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.GroupStatus;
import android.content.Intent;
+import android.content.res.Resources;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
@@ -100,6 +101,8 @@ implements EventListener, OnClickListener, OnItemClickListener {
footer.setLayoutParams(MATCH_WRAP);
footer.setOrientation(HORIZONTAL);
footer.setGravity(CENTER);
+ Resources res = getResources();
+ footer.setBackgroundColor(res.getColor(R.color.button_bar_background));
footer.addView(new ElasticHorizontalSpace(this));
newGroupButton = new ImageButton(this);
diff --git a/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java b/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java
index c1618635ec0c7b5716fa24a1ba5fc3ae81141a90..a82c13606275ca2c26402cdb420c8609ee963fcb 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java
@@ -76,7 +76,8 @@ class GroupListAdapter extends BaseAdapter {
LinearLayout layout = new LinearLayout(ctx);
layout.setOrientation(HORIZONTAL);
- if(item.getUnreadCount() > 0)
+ int unread = item.getUnreadCount();
+ if(unread > 0)
layout.setBackgroundColor(res.getColor(R.color.unread_background));
TextView name = new TextView(ctx);
@@ -86,7 +87,6 @@ class GroupListAdapter extends BaseAdapter {
name.setSingleLine();
name.setEllipsize(END);
name.setPadding(pad, pad, pad, pad);
- int unread = item.getUnreadCount();
String groupName = item.getGroup().getName();
if(unread > 0) name.setText(groupName + " (" + unread + ")");
else name.setText(groupName);
diff --git a/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java b/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
index 491be8e001f2e588a470dbfafb1bca16971db749..ba91e6e8be03b5074e90da0f245bd82b6b25a27c 100644
--- a/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
@@ -107,8 +107,6 @@ implements OnClickListener {
LinearLayout message = new LinearLayout(this);
message.setOrientation(VERTICAL);
- Resources res = getResources();
- message.setBackgroundColor(res.getColor(R.color.content_background));
LinearLayout header = new LinearLayout(this);
header.setLayoutParams(MATCH_WRAP);
@@ -145,6 +143,8 @@ implements OnClickListener {
footer.setLayoutParams(MATCH_WRAP);
footer.setOrientation(HORIZONTAL);
footer.setGravity(CENTER);
+ Resources res = getResources();
+ footer.setBackgroundColor(res.getColor(R.color.button_bar_background));
readButton = new ImageButton(this);
readButton.setBackgroundResource(0);
diff --git a/briar-android/src/org/briarproject/android/util/HorizontalBorder.java b/briar-android/src/org/briarproject/android/util/HorizontalBorder.java
index 65be8b379f48bb2d208af94347fb746d1d4159e9..6e0f4f685bbd4f31b729788cd1fc2cf6d3c72aa9 100644
--- a/briar-android/src/org/briarproject/android/util/HorizontalBorder.java
+++ b/briar-android/src/org/briarproject/android/util/HorizontalBorder.java
@@ -12,8 +12,7 @@ public class HorizontalBorder extends View {
public HorizontalBorder(Context ctx) {
super(ctx);
- int width = LayoutUtils.getSeparatorWidth(ctx);
- setLayoutParams(new LayoutParams(MATCH_PARENT, width));
+ setLayoutParams(new LayoutParams(MATCH_PARENT, 1));
setBackgroundColor(getResources().getColor(R.color.horizontal_border));
}
}
diff --git a/briar-android/src/org/briarproject/android/util/LayoutUtils.java b/briar-android/src/org/briarproject/android/util/LayoutUtils.java
index f23fd9ab8d769c7dbaa3269172e507d782178baa..0736448f6bcbc5bae2312669aadae51fe106bba9 100644
--- a/briar-android/src/org/briarproject/android/util/LayoutUtils.java
+++ b/briar-android/src/org/briarproject/android/util/LayoutUtils.java
@@ -7,12 +7,6 @@ import android.view.WindowManager;
public class LayoutUtils {
- public static int getSeparatorWidth(Context ctx) {
- DisplayMetrics metrics = getDisplayMetrics(ctx);
- int percent = Math.max(metrics.widthPixels, metrics.heightPixels) / 100;
- return Math.max(2, percent - 8);
- }
-
public static int getPadding(Context ctx) {
DisplayMetrics metrics = getDisplayMetrics(ctx);
int percent = Math.max(metrics.widthPixels, metrics.heightPixels) / 100;