# HG changeset patch
# User Philippe Lago <lago_p@epitech.net>
# Date 1239633138 -7200
# Node ID ccc48305bdeb047315418b4e497cf2a281325f63
# Parent  c25c4f22a43645c1c8d1b2cceb8946de762b413f
toujours le probleme du rafraichissement lors de la reception d'un message

diff -r c25c4f22a436 -r ccc48305bdeb res/drawable/boot_robot.png
Binary file res/drawable/boot_robot.png has changed
diff -r c25c4f22a436 -r ccc48305bdeb res/layout/messagelist.xml
--- a/res/layout/messagelist.xml	Thu Apr 09 20:36:17 2009 +0200
+++ b/res/layout/messagelist.xml	Mon Apr 13 16:32:18 2009 +0200
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" id="text1"
-          android:textSize="2mm"
-          android:singleLine="false"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"/>
\ No newline at end of file
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/messageview"
+	android:textSize="2mm"
+	android:singleLine="false"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content" />
\ No newline at end of file
diff -r c25c4f22a436 -r ccc48305bdeb res/layout/sendim.xml
--- a/res/layout/sendim.xml	Thu Apr 09 20:36:17 2009 +0200
+++ b/res/layout/sendim.xml	Mon Apr 13 16:32:18 2009 +0200
@@ -3,17 +3,39 @@
     android:orientation="vertical"
     android:layout_width="fill_parent" 
     android:layout_height="fill_parent">
-
-    <ListView android:id="@android:id/list"
-        android:layout_width="fill_parent" 
-        android:layout_height="fill_parent"
+    
+    <RelativeLayout
+    	android:paddingLeft="10px"
+    	android:paddingRight="10px"
+    	android:paddingTop="10px"
+    	android:background="@color/blue_sky"
+    	android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+		
+    	<ImageView android:id="@+id/sendimavatar"
+    		android:layout_width="wrap_content"
+			android:src="@drawable/avatar" android:layout_height="20px"/>
+        
+        <TextView android:id="@+id/sendimlogin"
+        	android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignTop="@id/sendimavatar"
+			android:layout_toRightOf="@id/sendimavatar"
+        	android:hint="@string/SendIMLoginHint"/>
+    </RelativeLayout>
+	
+	<ListView android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:choiceMode="none" 
+        android:layout_height="wrap_content"
         android:layout_weight="1"
         android:transcriptMode="alwaysScroll"/>
         
     <EditText android:id="@+id/userText"
         android:layout_width="fill_parent"
         android:cursorVisible="false"
-        android:hint="@string/SendIMHint"
+        android:hint="@string/SendIMToSendHint"
         android:layout_height="wrap_content" />
         
 </LinearLayout>
\ No newline at end of file
diff -r c25c4f22a436 -r ccc48305bdeb res/values/colors.xml
--- a/res/values/colors.xml	Thu Apr 09 20:36:17 2009 +0200
+++ b/res/values/colors.xml	Mon Apr 13 16:32:18 2009 +0200
@@ -2,4 +2,5 @@
 <resources>
 	<color name="blue_sky">#A0C8FF</color>
 	<color name="black">#000000</color>
+<color name="white">#FFFFFF</color>
 </resources>
\ No newline at end of file
diff -r c25c4f22a436 -r ccc48305bdeb res/values/strings.xml
--- a/res/values/strings.xml	Thu Apr 09 20:36:17 2009 +0200
+++ b/res/values/strings.xml	Mon Apr 13 16:32:18 2009 +0200
@@ -29,9 +29,10 @@
 
 	<!--  SendIM class -->
 	<string name="SendIMSays"> says :\n</string>
-	<string name="SendIMHint">Tip text here</string>
+	<string name="SendIMToSendHint">Tip text here</string>
 	<string name="SendIMState">Is : </string>
 	<string name="SendIMFrom">and is speaking from : </string>
 	<string name="SendIMSmiley">Insert a smiley</string>
+	<string name="SendIMLoginHint">login</string>
 
 </resources>
diff -r c25c4f22a436 -r ccc48305bdeb res/values/style.xml
--- a/res/values/style.xml	Thu Apr 09 20:36:17 2009 +0200
+++ b/res/values/style.xml	Mon Apr 13 16:32:18 2009 +0200
@@ -11,4 +11,13 @@
     <item name="android:textSize">18sp</item>
 
   </style>
+  
+  	<style name="customtheme.jungle">
+  	<item name="android:windowBackground">@drawable/background</item>
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:textColor">#FFFF00</item>
+    <item name="android:typeface">sans</item>
+    <item name="android:textSize">18sp</item>
+    </style>
+  	
 </resources>
\ No newline at end of file
diff -r c25c4f22a436 -r ccc48305bdeb src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Thu Apr 09 20:36:17 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Mon Apr 13 16:32:18 2009 +0200
@@ -77,7 +77,7 @@
 	mLogin = mSettings.getString(getString(R.string.PreferenceLoginKey), "");
 	mPassword = mSettings.getString(getString(R.string.PreferencePasswordKey), "");
 	mHost = mSettings.getString(getString(R.string.PreferenceHostKey), "");
-	mHost = "10.0.2.5";
+	mHost = "10.0.2.2";
 	initConnectionConfig();
 	mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
 	mConnection = new XmppConnectionAdapter(mConnectionConfiguration, mLogin, mPassword);
diff -r c25c4f22a436 -r ccc48305bdeb src/com/beem/project/beem/ui/SendIM.java
--- a/src/com/beem/project/beem/ui/SendIM.java	Thu Apr 09 20:36:17 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Mon Apr 13 16:32:18 2009 +0200
@@ -4,7 +4,7 @@
 
 import android.app.ListActivity;
 import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.RemoteException;
@@ -18,6 +18,7 @@
 import android.view.View.OnKeyListener;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.R;
@@ -30,7 +31,7 @@
 import com.beem.project.beem.service.aidl.IXmppFacade;
 
 /**
- * @author barbu This activity class provide the view for instant messaging
+ * @author barbu This activity class provides the view for instant messaging
  *         after selecting a correspondant.
  */
 
@@ -50,6 +51,7 @@
     private IChatManagerListener mChatManagerListener;
     private IMessageListener mMessageListener;
     private IChat mChat;
+    private Drawable mAvatar;
 
     /**
      * Constructor.
@@ -64,6 +66,7 @@
     @Override
     public void onCreate(Bundle saveBundle) {
 	super.onCreate(saveBundle);
+	setTheme(R.style.customtheme_contactList);
 	mHandler = new Handler();
 	mChatManagerListener = new OnChatListener();
 	mMessageListener = new OnMessageListener();
@@ -73,7 +76,6 @@
 	mSet = getSharedPreferences("lol", MODE_PRIVATE);
 	mSmyDialog = new SendIMDialogSmiley(this, mSet);
 	mGlobalSettings = getSharedPreferences(getString(R.string.PreferenceFileName), MODE_PRIVATE);
-
 	mAdapter = new ArrayAdapter<String>(this, R.layout.messagelist,
 		mMessages);
 	setListAdapter(mAdapter);
@@ -82,6 +84,9 @@
 	mToSend.setOnKeyListener(this);
 
 	mContact = getIntent().getParcelableExtra("contact");
+	TextView login = (TextView) findViewById(R.id.sendimlogin);
+	login.setText(mContact.getJID());
+	
     }
 
     @Override