# HG changeset patch
# User Philippe Lago <lago_p@epitech.net>
# Date 1240517981 -7200
# Node ID f14b3fcf65c8f4b2dc959fe92432b49d5b0ccd96
# Parent  e47398897afe3adf0cd3349f73faf6fdd0eaacfc# Parent  2faf7174aa03fd10a193c357830a52fd77503586
plein de retouche ui

diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/away.png
Binary file res/drawable/away.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/buddie_robot.png
Binary file res/drawable/buddie_robot.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/chat.png
Binary file res/drawable/chat.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/connecting.png
Binary file res/drawable/connecting.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/dnd.png
Binary file res/drawable/dnd.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/error.png
Binary file res/drawable/error.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/invisible.png
Binary file res/drawable/invisible.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/logo.jpg
Binary file res/drawable/logo.jpg has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/message.png
Binary file res/drawable/message.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/online.png
Binary file res/drawable/online.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/requested.png
Binary file res/drawable/requested.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/xmpp.jpg
Binary file res/drawable/xmpp.jpg has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/drawable/xmpp.png
Binary file res/drawable/xmpp.png has changed
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/layout/sendim.xml
--- a/res/layout/sendim.xml	Thu Apr 23 17:18:49 2009 +0200
+++ b/res/layout/sendim.xml	Thu Apr 23 22:19:41 2009 +0200
@@ -7,31 +7,35 @@
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="10px"
-        android:paddingRight="10px"
         android:background="@drawable/beem_sendim_header_1"
         android:gravity="center_vertical" >
 
-        <ImageView android:id="@+id/sendimavatar"
-        	android:layout_weight="5"
-        	android:layout_width="fill_parent"
+        <ImageView
+        	android:id="@+id/sendimavatar"
+        	android:src="@drawable/avatar"
+        	android:adjustViewBounds="true"
+        	android:maxWidth="70dip"
+            android:maxHeight="70dip"
+            android:padding="10dip"
+        	android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical" />
+             />
 
 		<LinearLayout
 			android:orientation="vertical"
-			android:layout_weight="1"
         	android:layout_width="fill_parent"
         	android:layout_height="wrap_content" >
         	<TextView android:id="@+id/sendimlogin"
 				android:layout_width="fill_parent"
             	android:layout_height="wrap_content"            	
-            	android:paddingLeft="20sp" />
+            	android:paddingLeft="10sp" />
 			<TextView android:id="@+id/sendimstatus"
 				android:layout_width="fill_parent"
             	android:layout_height="wrap_content"
+            	android:lines="1"
+            	android:scrollHorizontally="true"
             	android:hint="@string/SendIMNoStatusSet"
-            	android:paddingLeft="20sp" />
+            	android:paddingLeft="15sp" />
 		</LinearLayout>
 </LinearLayout>
 
@@ -76,6 +80,9 @@
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
 		android:background="@drawable/beem_sendim_textview"
+		android:scrollbarTrackVertical="@drawable/scrollbar_vertical_track"
+	    android:scrollbarThumbVertical="@drawable/scrollbar_vertical_thumb"
+	    android:scrollbarSize="12dip"
 		android:layout_weight="1">
 		
 		<TextView android:id="@+id/sendimlist"
diff -r 2faf7174aa03 -r f14b3fcf65c8 res/menu/contactlistmenu.xml
--- a/res/menu/contactlistmenu.xml	Thu Apr 23 17:18:49 2009 +0200
+++ b/res/menu/contactlistmenu.xml	Thu Apr 23 22:19:41 2009 +0200
@@ -1,6 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:title="@string/MenuConnection" android:id="@+id/account_edit" android:icon="@drawable/xmpp"/>
-	<item android:title="@string/MenuAddContact" android:id="@+id/add_contact" />
+	<item android:title="@string/MenuAddContact" android:id="@+id/add_contact" android:icon="@drawable/buddie_robot"/>
 	<item android:title="@string/MenuAccountAbout" android:id="@+id/account_about"/>
 	<item android:title="@string/MenuAccountCreate" android:id="@+id/account_create"/>
 </menu>
diff -r 2faf7174aa03 -r f14b3fcf65c8 src/com/beem/project/beem/ui/ChangeStatus.java
--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Thu Apr 23 17:18:49 2009 +0200
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Thu Apr 23 22:19:41 2009 +0200
@@ -1,30 +1,25 @@
 package com.beem.project.beem.ui;
 
 import android.app.Activity;
-
+import android.content.Context;
 import android.content.Intent;
-
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
-
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.RemoteException;
+import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.widget.AdapterView.OnItemSelectedListener;
 
 import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.BeemService;
 import com.beem.project.beem.R;
-
 import com.beem.project.beem.service.aidl.IXmppFacade;
 import com.beem.project.beem.utils.Status;
 
@@ -48,16 +43,19 @@
     private ArrayAdapter<String> mAdapter;
     private Context mContext = this;
     private Toast mToast;
+    private static Integer nb = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 	super.onCreate(savedInstanceState);
-	setContentView(R.layout.changestatus);
-
+	
+	nb++;
+	Log.i("nb de oncreate changestatus", nb.toString());
 	// Beem Application specific
 	mHandler = new Handler();
 	mBeemApplication = BeemApplication.getApplication(this);
-
+	
+	setContentView(R.layout.changestatus);
 	mStatusText = (TextView) findViewById(R.id.ChangeStatusText);
 	mOk = (Button) findViewById(R.id.ChangeStatusOk);
 	mClear = (Button) findViewById(R.id.ChangeStatusClear);