# HG changeset patch
# User Philippe Lago <lago_p@epitech.net>
# Date 1264186797 -3600
# Node ID 6dd33a633ddc52e7d5ace01740e03c462d18e192
# Parent  c88a6d0911adc5fb5f361d9278ee28abc5d8de35# Parent  49e83a4b67b9f4af70a02e0b736bb955325e5555
Merge

diff -r 49e83a4b67b9 -r 6dd33a633ddc res/layout/login_anim.xml
--- a/res/layout/login_anim.xml	Thu Jan 21 02:52:06 2010 +0100
+++ b/res/layout/login_anim.xml	Fri Jan 22 19:59:57 2010 +0100
@@ -6,6 +6,9 @@
 	<ImageView android:id="@+id/loginanim_logo_anim" android:src="@drawable/beem_launcher_icon_color"
 		android:layout_height="fill_parent" android:layout_width="fill_parent"
 		android:layout_weight="1" />
+	<TextView android:id="@+id/loginanim_status_text"
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:textSize="20sp" android:gravity="center" android:textColor="@color/vert_manu"/>
 	<Button android:id="@+id/loginanim_cancel_button"
 		android:layout_height="wrap_content" android:layout_width="fill_parent"
 		android:layout_gravity="bottom" android:text="@string/CancelButton" />
diff -r 49e83a4b67b9 -r 6dd33a633ddc res/values-fr/arrays.xml
--- a/res/values-fr/arrays.xml	Thu Jan 21 02:52:06 2010 +0100
+++ b/res/values-fr/arrays.xml	Fri Jan 22 19:59:57 2010 +0100
@@ -18,4 +18,10 @@
 		<item name="@string/privacy_list_select_dialog_groups">Groupes</item>
 		<item name="@string/privacy_list_select_dialog_delete">Supprimer</item>
 	</string-array>
+	<string-array name="loganim_state">
+		<item name="@string/loganim_connecting">Connexion en cours...</item>
+		<item name="@string/loganim_authenticating">Authentification...</item>
+		<item name="@string/loganim_login_success">Connexion effectuée</item>
+		<item name="@string/loganim_login_failed">Echec de la connexion</item>
+	</string-array>
 </resources>
diff -r 49e83a4b67b9 -r 6dd33a633ddc res/values/arrays.xml
--- a/res/values/arrays.xml	Thu Jan 21 02:52:06 2010 +0100
+++ b/res/values/arrays.xml	Fri Jan 22 19:59:57 2010 +0100
@@ -18,4 +18,10 @@
 		<item name="@string/privacy_list_select_dialog_groups">Groups</item>
 		<item name="@string/privacy_list_select_dialog_delete">Delete</item>
 	</string-array>
+	<string-array name="loganim_state">
+		<item name="@string/loganim_connecting">Connecting...</item>
+		<item name="@string/loganim_authenticating">Authenticating...</item>
+		<item name="@string/loganim_login_success">Login success</item>
+		<item name="@string/loganim_login_failed">Login failed</item>
+	</string-array>
 </resources>
diff -r 49e83a4b67b9 -r 6dd33a633ddc res/values/colors.xml
--- a/res/values/colors.xml	Thu Jan 21 02:52:06 2010 +0100
+++ b/res/values/colors.xml	Fri Jan 22 19:59:57 2010 +0100
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<color name="blue_sky">#A0C8FF</color>
+	<color name="vert_manu">#CCFF00</color>
 	<color name="black">#000000</color>
 	<color name="white">#FFFFFF</color>
 	<color name="red">#FF0000</color>
diff -r 49e83a4b67b9 -r 6dd33a633ddc src/com/beem/project/beem/service/LoginAsyncTask.java
--- a/src/com/beem/project/beem/service/LoginAsyncTask.java	Thu Jan 21 02:52:06 2010 +0100
+++ b/src/com/beem/project/beem/service/LoginAsyncTask.java	Fri Jan 22 19:59:57 2010 +0100
@@ -59,19 +59,19 @@
     /**
      * State of a running connection.
      */
-    public static final int STATE_CONNECTION_RUNNING = 1;
+    public static final int STATE_CONNECTION_RUNNING = 0;
     /**
      * State of an already connected connection but authentication is running.
      */
-    public static final int STATE_LOGIN_RUNNING = 2;
+    public static final int STATE_LOGIN_RUNNING = 1;
     /**
      * State of a connected and authenticated succesfully.
      */
-    public static final int STATE_LOGIN_SUCCESS = 3;
+    public static final int STATE_LOGIN_SUCCESS = 2;
     /**
      * State of a connected but failed authentication.
      */
-    public static final int STATE_LOGIN_FAILED = 4;
+    public static final int STATE_LOGIN_FAILED = 3;
 
     private static final String TAG = "BeemLoginTask";
 
diff -r 49e83a4b67b9 -r 6dd33a633ddc src/com/beem/project/beem/ui/LoginAnim.java
--- a/src/com/beem/project/beem/ui/LoginAnim.java	Thu Jan 21 02:52:06 2010 +0100
+++ b/src/com/beem/project/beem/ui/LoginAnim.java	Fri Jan 22 19:59:57 2010 +0100
@@ -58,10 +58,11 @@
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.beem.project.beem.R;
+import com.beem.project.beem.service.LoginAsyncTask;
 import com.beem.project.beem.service.aidl.IXmppFacade;
-import com.beem.project.beem.service.LoginAsyncTask;
 
 /**
  * This class is an activity which display an animation during the connection with the server.
@@ -80,6 +81,7 @@
     private IXmppFacade mXmppFacade;
     private AsyncTask<IXmppFacade, Integer, Boolean> mTask;
     private Button mCancelBt;
+    private TextView mLoginState;
 
     /**
      * Constructor.
@@ -94,6 +96,7 @@
     protected void onCreate(Bundle savedInstanceState) {
 	super.onCreate(savedInstanceState);
 	setContentView(R.layout.login_anim);
+	mLoginState = (TextView) findViewById(R.id.loginanim_status_text);
 	mLogo = (ImageView) findViewById(R.id.loginanim_logo_anim);
 	mRotateAnim = AnimationUtils.loadAnimation(this, R.anim.rotate_and_scale);
 	mCancelBt = (Button) findViewById(R.id.loginanim_cancel_button);
@@ -207,6 +210,8 @@
 	@Override
 	protected void onProgressUpdate(Integer ... values) {
 	    Log.d(TAG, "onProgress " + values[0]);
+	    mLoginState.setText(getResources().getStringArray(R.array.loganim_state)[values[0]]);
+	    
 	}
 
 	/* (non-Javadoc)