# HG changeset patch
# User marseille@marseille-desktop
# Date 1237589329 -3600
# Node ID b6f30d35ea22d67dd5bae54e179c16345fd58802
# Parent  280112cd9602832f329dd935abfaf9191c54c36b
Reorganisation fichier xml.
Changement fenetre connection plus 'jolie' ??

diff -r 280112cd9602 -r b6f30d35ea22 res/drawable/bart.jpg
Binary file res/drawable/bart.jpg has changed
diff -r 280112cd9602 -r b6f30d35ea22 res/layout/beem.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/layout/beem.xml	Fri Mar 20 23:48:49 2009 +0100
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<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: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: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"/>
+
+</LinearLayout>
diff -r 280112cd9602 -r b6f30d35ea22 res/layout/beemdialogsettings.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/layout/beemdialogsettings.xml	Fri Mar 20 23:48:49 2009 +0100
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+        >
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:orientation="horizontal"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+            >
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Host/Port:"
+                android:minWidth="70dp"
+                />
+                
+        <EditText android:id="@+id/host"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:textSize="16sp"
+                  android:autoText="false"
+                  android:capitalize="none"
+                  android:minWidth="150dp"
+                  android:scrollHorizontally="true"/>
+        <EditText android:id="@+id/port"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:textSize="16sp"
+                  android:autoText="false"
+                  android:minWidth="80dp"
+                  android:capitalize="none"
+                  android:scrollHorizontally="true"/>
+    </LinearLayout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:orientation="horizontal"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+            >
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Userid:"
+                android:minWidth="70dp"
+                />
+        <EditText android:id="@+id/userid"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:textSize="16sp"
+                  android:autoText="false"
+                  android:minWidth="250dp"
+                  android:capitalize="none"
+                  android:scrollHorizontally="true"/>
+    </LinearLayout>
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:orientation="horizontal"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+            >
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Password:"
+                android:minWidth="70dp"
+                />
+        <EditText android:id="@+id/password"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:password="true"
+                  android:textSize="16sp"
+                  android:autoText="false"
+                  android:minWidth="250dp"
+                  android:capitalize="none"
+                  android:scrollHorizontally="true"/>
+    </LinearLayout>
+
+    <Button android:id="@+id/ok"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:text="OK">
+        <requestFocus/>
+    </Button>
+</LinearLayout>
\ No newline at end of file
diff -r 280112cd9602 -r b6f30d35ea22 res/layout/main.xml
--- a/res/layout/main.xml	Fri Mar 20 22:23:35 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-
-	<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="Jabber ID"
-		android:textSize="25sp"
-		android:paddingLeft="100sp"
-		android:paddingTop="50sp"
-		android:paddingBottom="15sp"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" />
-		
-	<EditText android:id="@+id/jid"
-		android:singleLine="true"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:scrollHorizontally="true" />
-	
-	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="10sp"/>
-
-	<Button android:id="@+id/connection"
-		android:textSize="20sp"
-		android:singleLine="true"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:text="Connection" />
-
-</LinearLayout>
-
diff -r 280112cd9602 -r b6f30d35ea22 res/layout/settings.xml
--- a/res/layout/settings.xml	Fri Mar 20 22:23:35 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-        >
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:orientation="horizontal"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-            >
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Host/Port:"
-                android:minWidth="70dp"
-                />
-                
-        <EditText android:id="@+id/host"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:textSize="16sp"
-                  android:autoText="false"
-                  android:capitalize="none"
-                  android:minWidth="150dp"
-                  android:scrollHorizontally="true"/>
-        <EditText android:id="@+id/port"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:textSize="16sp"
-                  android:autoText="false"
-                  android:minWidth="80dp"
-                  android:capitalize="none"
-                  android:scrollHorizontally="true"/>
-    </LinearLayout>
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:orientation="horizontal"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-            >
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Userid:"
-                android:minWidth="70dp"
-                />
-        <EditText android:id="@+id/userid"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:textSize="16sp"
-                  android:autoText="false"
-                  android:minWidth="250dp"
-                  android:capitalize="none"
-                  android:scrollHorizontally="true"/>
-    </LinearLayout>
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:orientation="horizontal"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-            >
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Password:"
-                android:minWidth="70dp"
-                />
-        <EditText android:id="@+id/password"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:password="true"
-                  android:textSize="16sp"
-                  android:autoText="false"
-                  android:minWidth="250dp"
-                  android:capitalize="none"
-                  android:scrollHorizontally="true"/>
-    </LinearLayout>
-
-    <Button android:id="@+id/ok"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:text="OK">
-        <requestFocus/>
-    </Button>
-</LinearLayout>
-
diff -r 280112cd9602 -r b6f30d35ea22 res/menu/account.xml
--- a/res/menu/account.xml	Fri Mar 20 22:23:35 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/account_edit"
-			android:title="Create or Edit Account" />
-	<item android:id="@+id/account_about"
-		android:title="About Beem" />
-</menu>
\ No newline at end of file
diff -r 280112cd9602 -r b6f30d35ea22 res/menu/beemmenu.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/menu/beemmenu.xml	Fri Mar 20 23:48:49 2009 +0100
@@ -0,0 +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="L'equipe Beem" android:id="@+id/account_about"/>
+</menu>
diff -r 280112cd9602 -r b6f30d35ea22 res/values/strings.xml
--- a/res/values/strings.xml	Fri Mar 20 22:23:35 2009 +0100
+++ b/res/values/strings.xml	Fri Mar 20 23:48:49 2009 +0100
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Beem</string>
-		
-<string name="BeemServiceDescription">Use the Beem Service</string>
-<string name="BeemServiceCreated">BeemService Created</string>
-<string name="BeemServiceDestroyed">BeemService destroyed</string>
+	<string name="app_name">Beem</string>
 
-<!--  Preferences information -->
-<string name="PreferenceFileName">Beem</string>
-<string name="PreferenceLoginKey">login</string>
-<string name="PreferenceHostKey">host</string>
-<string name="PreferencePasswordKey">password</string>
-<string name="PreferencePortKey">port</string>
+	<!--  Class Beem -->
+	<string name="BeemCreateAccount">Creer un compte</string>
+	<string name="BeemJabberID">Jabber ID</string>
+	
+	<!--  Class BeemService -->
+	<string name="BeemServiceDescription">Use the Beem Service</string>
+	<string name="BeemServiceCreated">BeemService Created</string>
+	<string name="BeemServiceDestroyed">BeemService destroyed</string>
+
+	<!--  Preferences information -->
+	<string name="PreferenceFileName">Beem</string>
+	<string name="PreferenceLoginKey">login</string>
+	<string name="PreferenceHostKey">host</string>
+	<string name="PreferencePasswordKey">password</string>
+	<string name="PreferencePortKey">port</string>
 </resources>
diff -r 280112cd9602 -r b6f30d35ea22 src/com/beem/project/beem/ui/Beem.java
--- a/src/com/beem/project/beem/ui/Beem.java	Fri Mar 20 22:23:35 2009 +0100
+++ b/src/com/beem/project/beem/ui/Beem.java	Fri Mar 20 23:48:49 2009 +0100
@@ -10,13 +10,14 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.EditText;
 
 import com.beem.project.beem.R;
 
 public class Beem extends Activity {
 
     private SharedPreferences mSettings;
+    private BeemDialogSettings mDialog;
+    private Button mButton;
 
     /**
      * Called when the activity is first created.
@@ -24,34 +25,37 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
+        setContentView(R.layout.beem);
         mSettings = getSharedPreferences(
                 getString(R.string.PreferenceFileName), MODE_PRIVATE);
-        showJID();
+        mDialog = new BeemDialogSettings(this, mSettings);
 
-        Button btConnection = (Button) findViewById(R.id.connection);
-        btConnection.setOnClickListener(new OnClickListener() {
+        mButton = (Button) findViewById(R.id.connection);
+        mButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(Beem.this, ContactList.class));
+                if (mButton.getText() == getString(R.string.BeemCreateAccount))
+                    mDialog.show();
+                else
+                    startActivity(new Intent(Beem.this, ContactList.class));
             }
         });
+        showJID();
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.account, menu);
+        inflater.inflate(R.menu.beemmenu, menu);
         return true;
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        BeemDialogSettings Dialog = new BeemDialogSettings(this, mSettings);
+    public boolean onOptionsItemSelected(MenuItem item) {       
         switch (item.getItemId()) {
         case R.id.account_edit:
-            Dialog.show();
+           mDialog.show();
             return true;
         case R.id.account_about:
             return true;
@@ -59,13 +63,12 @@
         return false;
     }
 
-    public void showJID() {
-        EditText ejid = (EditText) findViewById(R.id.jid);
-        String jid = mSettings.getString("login", "") + "@"
-                + mSettings.getString("host", "");
+    public void showJID() {  
+        String jid = mSettings.getString(getString(R.string.PreferenceLoginKey), "") + "@"
+                + mSettings.getString(getString(R.string.PreferenceHostKey), "");
         if (jid.length() == 1)
-            jid = "Enter Jabber ID / Create New Account";
-        ejid.setText(jid);
+            jid = getString(R.string.BeemCreateAccount);
+        mButton.setText(jid);
     }
 
 }
diff -r 280112cd9602 -r b6f30d35ea22 src/com/beem/project/beem/ui/BeemDialogSettings.java
--- a/src/com/beem/project/beem/ui/BeemDialogSettings.java	Fri Mar 20 22:23:35 2009 +0100
+++ b/src/com/beem/project/beem/ui/BeemDialogSettings.java	Fri Mar 20 23:48:49 2009 +0100
@@ -1,6 +1,5 @@
 package com.beem.project.beem.ui;
 
-
 import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -13,10 +12,13 @@
 /**
  *
  */
-public class BeemDialogSettings extends Dialog implements android.view.View.OnClickListener {
+public class BeemDialogSettings extends Dialog implements
+        android.view.View.OnClickListener {
 
     private Beem mbeem;
+
     private SharedPreferences mSettings;
+
     public BeemDialogSettings(Beem beem, SharedPreferences settings) {
         super(beem);
         this.mbeem = beem;
@@ -26,43 +28,47 @@
     @Override
     protected void onStart() {
         super.onStart();
-        setContentView(R.layout.settings);
+        setContentView(R.layout.beemdialogsettings);
         getWindow().setFlags(4, 4);
         setTitle("Jabber Account Settings");
         showSettings();
         Button ok = (Button) findViewById(R.id.ok);
         ok.setOnClickListener(this);
     }
-    
+
     @Override
     public void onClick(View v) {
         SharedPreferences.Editor editor = mSettings.edit();
         Context ctx = getContext();
-        editor.putString(ctx.getString(R.string.PreferenceHostKey), getWidgetText(R.id.host));
-        editor.putString(ctx.getString(R.string.PreferencePortKey), getWidgetText(R.id.port));
-        editor.putString(ctx.getString(R.string.PreferenceLoginKey), getWidgetText(R.id.userid));
-        editor.putString(ctx.getString(R.string.PreferencePasswordKey), getWidgetText(R.id.password));
+        editor.putString(ctx.getString(R.string.PreferenceHostKey),
+                getWidgetText(R.id.host));
+        editor.putString(ctx.getString(R.string.PreferencePortKey),
+                getWidgetText(R.id.port));
+        editor.putString(ctx.getString(R.string.PreferenceLoginKey),
+                getWidgetText(R.id.userid));
+        editor.putString(ctx.getString(R.string.PreferencePasswordKey),
+                getWidgetText(R.id.password));
         editor.commit();
         this.mbeem.showJID();
         dismiss();
     }
-    
+
     private void showSettings() {
         String tmp;
         EditText eHost = (EditText) findViewById(R.id.host);
-        if ((tmp = mSettings.getString("host","")) != "")
+        if ((tmp = mSettings.getString("host", "")) != "")
             eHost.setText(tmp);
         EditText ePort = (EditText) findViewById(R.id.port);
-        if ((tmp = mSettings.getString("port","")) != "")
+        if ((tmp = mSettings.getString("port", "")) != "")
             ePort.setText(tmp);
         EditText eLogin = (EditText) findViewById(R.id.userid);
-        if ((tmp = mSettings.getString("login","")) != "")
+        if ((tmp = mSettings.getString("login", "")) != "")
             eLogin.setText(tmp);
         EditText ePwd = (EditText) findViewById(R.id.password);
-        if ((tmp = mSettings.getString("password","")) != "")
+        if ((tmp = mSettings.getString("password", "")) != "")
             ePwd.setText(tmp);
     }
-    
+
     private String getWidgetText(int id) {
         EditText widget = (EditText) this.findViewById(id);
         return widget.getText().toString();