# HG changeset patch
# User Philippe Lago <lago_p@epitech.net>
# Date 1245751345 -7200
# Node ID 8bfaad9cfe93d13290760ac37d25dc75045c9f95
# Parent  48eaf4f0806210471598e4de03e8f58631c19321# Parent  08effaddeaa44e30ede2409e1f7e7710e09c0a3b
merge encore

diff -r 08effaddeaa4 -r 8bfaad9cfe93 res/layout/sendim.xml
--- a/res/layout/sendim.xml	Tue Jun 23 14:01:00 2009 +0200
+++ b/res/layout/sendim.xml	Tue Jun 23 12:02:25 2009 +0200
@@ -56,6 +56,7 @@
 		android:scrollbarSize="12dip" android:layout_weight="1">
 
 		<TextView android:id="@+id/sendimlist" android:paddingLeft="10px"
+			android:textColor="@color/black"
 			android:paddingRight="10px" android:paddingTop="10px"
 			android:layout_width="fill_parent" android:layout_height="fill_parent"
 			android:singleLine="false" />
diff -r 08effaddeaa4 -r 8bfaad9cfe93 res/values/colors.xml
--- a/res/values/colors.xml	Tue Jun 23 14:01:00 2009 +0200
+++ b/res/values/colors.xml	Tue Jun 23 12:02:25 2009 +0200
@@ -2,5 +2,5 @@
 <resources>
 	<color name="blue_sky">#A0C8FF</color>
 	<color name="black">#000000</color>
-<color name="white">#FFFFFF</color>
+	<color name="white">#FFFFFF</color>
 </resources>
\ No newline at end of file
diff -r 08effaddeaa4 -r 8bfaad9cfe93 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Tue Jun 23 14:01:00 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Tue Jun 23 12:02:25 2009 +0200
@@ -310,10 +310,12 @@
 
 	    if (curContact != null) {
 		ImageView imgV = (ImageView) view.findViewById(R.id.contactliststatus);
+		TextView v = (TextView) view.findViewById(R.id.contactlistpseudo);
 		Drawable imageDrawable = null;
 		switch (curContact.getStatus()) {
 		    case Status.CONTACT_STATUS_AVAILABLE:
 			imageDrawable = getResources().getDrawable(R.drawable.online);
+			v.setTextColor(getResources().getColor(R.color.white));
 			break;
 		    case Status.CONTACT_STATUS_AVAILABLE_FOR_CHAT:
 			imageDrawable = getResources().getDrawable(R.drawable.chat);
@@ -336,7 +338,6 @@
 		}
 		imgV.setImageDrawable(imageDrawable);
 
-		TextView v = (TextView) view.findViewById(R.id.contactlistpseudo);
 		if (v != null) {
 		    v.setText(curContact.getName());
 		}