From bbc4ac99c1097611e2907c7ac587e7e89fdde026 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 28 Apr 2016 11:07:20 -0300
Subject: [PATCH] This changes the window background system-wide

Closes #307
---
 briar-android/res/layout/activity_conversation.xml   |  3 +--
 briar-android/res/layout/activity_create_forum.xml   |  1 -
 .../res/layout/list_item_selectable_contact.xml      | 12 ++++--------
 briar-android/res/values/color.xml                   |  3 +--
 briar-android/res/values/dimens.xml                  |  2 ++
 briar-android/res/values/styles.xml                  |  4 +++-
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/briar-android/res/layout/activity_conversation.xml b/briar-android/res/layout/activity_conversation.xml
index d9c86d64d..19f951744 100644
--- a/briar-android/res/layout/activity_conversation.xml
+++ b/briar-android/res/layout/activity_conversation.xml
@@ -42,8 +42,7 @@
 		android:id="@+id/conversationView"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1"
-		android:background="@color/conversation_background"/>
+		android:layout_weight="1"/>
 
 	<View style="@style/Divider.Horizontal"/>
 
diff --git a/briar-android/res/layout/activity_create_forum.xml b/briar-android/res/layout/activity_create_forum.xml
index 19c61317d..b48bce90f 100644
--- a/briar-android/res/layout/activity_create_forum.xml
+++ b/briar-android/res/layout/activity_create_forum.xml
@@ -5,7 +5,6 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:gravity="center_horizontal"
-	android:background="@color/conversation_background"
 	android:padding="20dp" >
 
 	<TextView
diff --git a/briar-android/res/layout/list_item_selectable_contact.xml b/briar-android/res/layout/list_item_selectable_contact.xml
index 920129df0..f95146347 100644
--- a/briar-android/res/layout/list_item_selectable_contact.xml
+++ b/briar-android/res/layout/list_item_selectable_contact.xml
@@ -9,16 +9,13 @@
 
 	<RelativeLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:paddingTop="@dimen/listitem_horizontal_margin"
-		android:paddingBottom="@dimen/listitem_horizontal_margin"
-		android:background="?attr/selectableItemBackground"
-		>
+		android:layout_height="@dimen/listitem_height_contact_selector"
+		android:background="?attr/selectableItemBackground">
 
 		<de.hdodenhof.circleimageview.CircleImageView
 			android:id="@+id/avatarView"
-			android:layout_width="@dimen/listitem_picture_size"
-			android:layout_height="@dimen/listitem_picture_size"
+			android:layout_width="@dimen/listitem_selectable_picture_size"
+			android:layout_height="@dimen/listitem_selectable_picture_size"
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentStart="true"
 			android:layout_centerVertical="true"
@@ -40,7 +37,6 @@
 			android:layout_toLeftOf="@+id/checkBox"
 			android:layout_toRightOf="@+id/avatarView"
 			android:maxLines="2"
-			android:textColor="@android:color/primary_text_light"
 			android:textSize="@dimen/text_size_large"
 			tools:text="This is a name of a contact"/>
 
diff --git a/briar-android/res/values/color.xml b/briar-android/res/values/color.xml
index 0351b5296..763b9c936 100644
--- a/briar-android/res/values/color.xml
+++ b/briar-android/res/values/color.xml
@@ -7,8 +7,7 @@
 	<color name="briar_green_dark">#87C214</color>
 	<color name="briar_red">#C1392B</color>
 
-	<color name="window_background">#EEEEEE</color>
-	<color name="conversation_background">#efebe9</color>
+	<color name="window_background">#eceff1</color>
 	<color name="action_bar_text">#FFFFFF</color>
 	<color name="action_bar_background">@color/briar_blue</color>
 	<color name="button_bar_background">#FFFFFF</color>
diff --git a/briar-android/res/values/dimens.xml b/briar-android/res/values/dimens.xml
index c3085212c..7e3b8d807 100644
--- a/briar-android/res/values/dimens.xml
+++ b/briar-android/res/values/dimens.xml
@@ -24,7 +24,9 @@
 	<dimen name="listitem_horizontal_margin">16dp</dimen>
 	<dimen name="listitem_text_left_margin">72dp</dimen>
 	<dimen name="listitem_height_one_line_avatar">56dp</dimen>
+	<dimen name="listitem_height_contact_selector">68dp</dimen>
 	<dimen name="listitem_picture_size">48dp</dimen>
+	<dimen name="listitem_selectable_picture_size">40dp</dimen>
 	<dimen name="dropdown_picture_size">32dp</dimen>
 	<dimen name="avatar_border_width">1dp</dimen>
 
diff --git a/briar-android/res/values/styles.xml b/briar-android/res/values/styles.xml
index 12c1c3597..914f0a37a 100644
--- a/briar-android/res/values/styles.xml
+++ b/briar-android/res/values/styles.xml
@@ -6,6 +6,7 @@
 		<item name="colorPrimary">@color/briar_primary</item>
 		<item name="colorPrimaryDark">@color/briar_primary_dark</item>
 		<item name="colorAccent">@color/briar_accent</item>
+		<item name="android:windowBackground">@color/window_background</item>
 		<item name="android:textColorPrimary">@color/briar_text_primary</item>
 		<item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item>
 		<item name="android:textColorSecondary">@color/briar_text_primary</item>
@@ -17,6 +18,7 @@
 		<item name="colorPrimary">@color/briar_primary</item>
 		<item name="colorPrimaryDark">@color/briar_primary_dark</item>
 		<item name="colorAccent">@color/briar_primary</item>
+		<item name="android:windowBackground">@color/window_background</item>
 		<item name="android:textColorPrimary">@color/briar_text_primary</item>
 		<item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item>
 		<item name="android:textColorSecondary">@color/briar_text_primary</item>
@@ -101,7 +103,7 @@
 
 	<style name="Divider.ContactList" parent="Divider">
 		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">2dp</item>
+		<item name="android:layout_height">1dp</item>
 		<item name="android:layout_marginLeft">@dimen/margin_large</item>
 	</style>