From 050f2094cf174e4cd50ce065b5c46c60d644cbb4 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 5 Mar 2013 15:31:10 +0000
Subject: [PATCH] Added a border to separate the button bar from the content
 area.

---
 briar-android/res/values-v11/styles.xml                     | 2 --
 briar-android/res/values/color.xml                          | 4 ++++
 briar-android/res/values/styles.xml                         | 1 -
 .../net/sf/briar/android/contact/ContactListActivity.java   | 6 ++++++
 .../net/sf/briar/android/messages/ConversationActivity.java | 6 ++++++
 .../sf/briar/android/messages/ConversationListActivity.java | 6 ++++++
 .../net/sf/briar/android/messages/ReadMessageActivity.java  | 6 ++++++
 7 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 briar-android/res/values/color.xml

diff --git a/briar-android/res/values-v11/styles.xml b/briar-android/res/values-v11/styles.xml
index aa2dc3fa7..f5476f167 100644
--- a/briar-android/res/values-v11/styles.xml
+++ b/briar-android/res/values-v11/styles.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="LightTheme" parent="android:Theme.Holo.Light" />
-	<style name="LightThemeNoActionBar"
-	    parent="android:Theme.Holo.Light.NoActionBar" />
 </resources>
\ No newline at end of file
diff --git a/briar-android/res/values/color.xml b/briar-android/res/values/color.xml
new file mode 100644
index 000000000..0ae07cc50
--- /dev/null
+++ b/briar-android/res/values/color.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<color name="ButtonBarBorder">#CCCCCC</color>
+</resources>
\ No newline at end of file
diff --git a/briar-android/res/values/styles.xml b/briar-android/res/values/styles.xml
index 0b9214511..7974ea745 100644
--- a/briar-android/res/values/styles.xml
+++ b/briar-android/res/values/styles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="LightTheme" parent="android:Theme.Light" />
-	<style name="LightThemeNoActionBar" parent="android:Theme.Light" />
 </resources>
\ No newline at end of file
diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
index 16638abbb..41cab314b 100644
--- a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
+++ b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
@@ -69,6 +69,12 @@ implements OnClickListener, DatabaseListener, ConnectionListener {
 		list.setOnItemClickListener(adapter);
 		layout.addView(list);
 
+		View line = new View(this);
+		line.setLayoutParams(new LayoutParams(MATCH_PARENT, 5));
+		int colour = getResources().getColor(R.color.ButtonBarBorder);
+		line.setBackgroundColor(colour);
+		layout.addView(line);
+
 		ImageButton addContactButton = new ImageButton(this);
 		addContactButton.setPadding(10, 10, 10, 10);
 		addContactButton.setBackgroundResource(0);
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
index 28bc3a3fd..380145d1b 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
@@ -81,6 +81,12 @@ implements DatabaseListener, OnClickListener, OnItemClickListener {
 		list.setOnItemClickListener(this);
 		layout.addView(list);
 
+		View line = new View(this);
+		line.setLayoutParams(new LayoutParams(MATCH_PARENT, 5));
+		int colour = getResources().getColor(R.color.ButtonBarBorder);
+		line.setBackgroundColor(colour);
+		layout.addView(line);
+
 		ImageButton composeButton = new ImageButton(this);
 		composeButton.setPadding(10, 10, 10, 10);
 		composeButton.setBackgroundResource(0);
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
index ce1a77a08..8aa3a27ff 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
@@ -75,6 +75,12 @@ implements OnClickListener, DatabaseListener {
 		list.setOnItemClickListener(adapter);
 		layout.addView(list);
 
+		View line = new View(this);
+		line.setLayoutParams(new LayoutParams(MATCH_PARENT, 5));
+		int colour = getResources().getColor(R.color.ButtonBarBorder);
+		line.setBackgroundColor(colour);
+		layout.addView(line);
+
 		ImageButton composeButton = new ImageButton(this);
 		composeButton.setPadding(10, 10, 10, 10);
 		composeButton.setBackgroundResource(0);
diff --git a/briar-android/src/net/sf/briar/android/messages/ReadMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/ReadMessageActivity.java
index 29f6848ed..10367da62 100644
--- a/briar-android/src/net/sf/briar/android/messages/ReadMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ReadMessageActivity.java
@@ -156,6 +156,12 @@ implements OnClickListener {
 		scrollView.addView(message);
 		layout.addView(scrollView);
 
+		View line = new View(this);
+		line.setLayoutParams(new LayoutParams(MATCH_PARENT, 5));
+		int colour = getResources().getColor(R.color.ButtonBarBorder);
+		line.setBackgroundColor(colour);
+		layout.addView(line);
+
 		LinearLayout footer = new LinearLayout(this);
 		footer.setLayoutParams(new LayoutParams(MATCH_PARENT, WRAP_CONTENT));
 		footer.setOrientation(HORIZONTAL);