# HG changeset patch
# User jibe@toto.local
# Date 1238967835 -7200
# Node ID 31b436663df5ec600485f51b83855c88f5dd48ec
# Parent  b6d4f4af9e4ca18214ed868fb13d9775030ce8c9
Modification de l'interface d'accueil avec le nouveau logo et de nouvelles couleurs. Ajout d'une icone dans le menu permettant de modifier les parametres du compte.

diff -r b6d4f4af9e4c -r 31b436663df5 AndroidManifest.xml
--- a/AndroidManifest.xml	Wed Apr 01 19:30:58 2009 +0200
+++ b/AndroidManifest.xml	Sun Apr 05 23:43:55 2009 +0200
@@ -2,7 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.beem.project.beem" android:versionCode="1"
 	android:versionName="1.0">
-	<application android:label="@string/app_name" android:name="BeemApplication">
+	<!-- <application android:label="@string/app_name" android:name="BeemApplication" -->
+		<application android:theme="@style/customtheme">
 		<activity android:name=".ui.Beem" android:label="@string/app_name">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
diff -r b6d4f4af9e4c -r 31b436663df5 res/drawable/background.png
Binary file res/drawable/background.png has changed
diff -r b6d4f4af9e4c -r 31b436663df5 res/drawable/xmpp.jpg
Binary file res/drawable/xmpp.jpg has changed
diff -r b6d4f4af9e4c -r 31b436663df5 res/layout/beem.xml
--- a/res/layout/beem.xml	Wed Apr 01 19:30:58 2009 +0200
+++ b/res/layout/beem.xml	Sun Apr 05 23:43:55 2009 +0200
@@ -4,32 +4,33 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 
-	<ImageView android:id="@+id/logo"
+	<!-- <ImageView android:id="@+id/logo"
 		android:src="@drawable/logo"
 		android:adjustViewBounds="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"/>
+		-->
 		
 	<TextView android:text="@string/BeemJabberID"
 		android:textSize="25sp"
 		android:paddingLeft="100sp"
-		android:paddingTop="50sp"
+		android:paddingTop="150sp"
 		android:paddingBottom="15sp"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
-		
+	
 	<ImageView android:id="@+id/avatar"
 		android:src="@drawable/bart"
-		android:paddingTop="10sp"
-		android:paddingBottom="10sp"		
+		android:paddingTop="30sp"
+		android:paddingBottom="30sp"		
 		android:adjustViewBounds="true"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"/>
-		
+
 	<Button android:id="@+id/connection"
 		android:textSize="20sp"
 		android:singleLine="true"
 		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"/>
-
+		android:layout_height="wrap_content"
+		 />
 </LinearLayout>
diff -r b6d4f4af9e4c -r 31b436663df5 res/menu/beemmenu.xml
--- a/res/menu/beemmenu.xml	Wed Apr 01 19:30:58 2009 +0200
+++ b/res/menu/beemmenu.xml	Sun Apr 05 23:43:55 2009 +0200
@@ -1,4 +1,4 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:title="Creer ou Editer un compte" android:id="@+id/account_edit"/>
+	<item android:title="Creer ou Editer un compte" android:id="@+id/account_edit" android:icon="@drawable/xmpp"/>
 	<item android:title="L'equipe Beem" android:id="@+id/account_about"/>
 </menu>
diff -r b6d4f4af9e4c -r 31b436663df5 res/values/style.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values/style.xml	Sun Apr 05 23:43:55 2009 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="customtheme" parent="android:Theme">
+ </style>
+ 
+  	<style name="customtheme.login"> 
+    <item name="android:windowBackground">@drawable/background</item>
+    <item name="android:windowNoTitle">true</item>
+
+ 
+  </style>        
+</resources>
\ No newline at end of file
diff -r b6d4f4af9e4c -r 31b436663df5 src/com/beem/project/beem/ui/Beem.java
--- a/src/com/beem/project/beem/ui/Beem.java	Wed Apr 01 19:30:58 2009 +0200
+++ b/src/com/beem/project/beem/ui/Beem.java	Sun Apr 05 23:43:55 2009 +0200
@@ -11,21 +11,23 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-
+import android.widget.ImageButton;
 import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.R;
 
 /**
  * La principale activite to be continuous.
  */
+
 public class Beem extends Activity {
 
     private SharedPreferences mSettings;
     private BeemDialogSettings mDialog;
     private Button mButton;
+    private ImageButton mAvatar;
     private Handler mHandler;
     private BeemApplication mBeemApplication;
-
+    
     /**
      * Default constructor.
      */
@@ -34,6 +36,7 @@
 	mHandler = new Handler();
     }
 
+   
     /**
      * Called when the activity is first created.
      * @param savedInstanceState
@@ -43,6 +46,7 @@
     public final void onCreate(Bundle savedInstanceState) {
 	super.onCreate(savedInstanceState);
 	mBeemApplication = BeemApplication.getApplication(this);
+	setTheme(R.style.customtheme_login);
 	setContentView(R.layout.beem);
 	mSettings = getSharedPreferences(
 		getString(R.string.PreferenceFileName), MODE_PRIVATE);
@@ -106,6 +110,6 @@
 	if (jid.length() == 1)
 	    jid = getString(R.string.BeemCreateAccount);
 	mButton.setText(jid);
-    }
+    }   
 
 }