Issue #103 #101
Quelques trads et j'ai mit la bonne valeur pour le port jabber par
defaut dans les settings.
--- a/res/layout/accountcreation.xml Sun May 17 17:31:39 2009 +0200
+++ b/res/layout/accountcreation.xml Sun May 17 23:33:13 2009 +0200
@@ -1,103 +1,55 @@
<?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="Login:"
- android:minWidth="70dp"
- />
-
- <EditText android:id="@+id/login"
- 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"/>
- </LinearLayout>
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+ <LinearLayout 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="@string/ACLogin"
+ android:minWidth="70dp" />
+
+ <EditText android:id="@+id/ac_login" 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" />
+ </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="Email:"
- android:minWidth="70dp"
- />
- <EditText android:id="@+id/email"
- 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>
- <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="Repeat:"
- android:minWidth="70dp"
- />
- <EditText android:id="@+id/password2"
- 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>
+ <LinearLayout 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="@string/ACEmail"
+ android:minWidth="70dp" />
+ <EditText android:id="@+id/ac_email" 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 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="@string/ACPassword"
+ android:minWidth="70dp" />
+ <EditText android:id="@+id/ac_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>
+ <LinearLayout 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="@string/ACRepeat"
+ android:minWidth="70dp" />
+ <EditText android:id="@+id/ac_password2"
+ 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="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:text="OK">
- <requestFocus/>
- </Button>
+ <Button android:id="@+id/ac_ok" android:layout_width="fill_parent"
+ android:layout_gravity="center_horizontal" android:layout_height="wrap_content"
+ android:text="@string/ACOkButton">
+ <requestFocus />
+ </Button>
</LinearLayout>
\ No newline at end of file
--- a/res/layout/addcontact.xml Sun May 17 17:31:39 2009 +0200
+++ b/res/layout/addcontact.xml Sun May 17 23:33:13 2009 +0200
@@ -1,79 +1,45 @@
<?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="Login:"
- android:minWidth="70dp"
- />
-
- <EditText android:id="@+id/AC_login"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textSize="16sp"
- android:autoText="false"
- android:capitalize="none"
- android:minWidth="250dp"
- android:scrollHorizontally="true"/>
- </LinearLayout>
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+ <LinearLayout
+ 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="@string/AddCLogin"
+ android:minWidth="70dp" />
+
+ <EditText android:id="@+id/addc_login" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:singleLine="true"
+ android:textSize="16sp" android:autoText="false" android:capitalize="none"
+ android:minWidth="250dp" 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="Alias:"
- android:minWidth="70dp"
- />
- <EditText android:id="@+id/AC_alias"
- 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="Group:"
- android:minWidth="70dp"
- />
- <EditText android:id="@+id/AC_group"
- 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>
- <Button android:id="@+id/AC_ok"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:text="OK">
- <requestFocus/>
- </Button>
+ <LinearLayout
+ 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="@string/AddCAlias"
+ android:minWidth="70dp" />
+ <EditText android:id="@+id/addc_alias" 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
+ 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="@string/AddCGroup"
+ android:minWidth="70dp" />
+ <EditText android:id="@+id/addc_group" 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>
+ <Button android:id="@+id/addc_ok" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
+ android:text="@string/AddCOkButton">
+ <requestFocus />
+ </Button>
</LinearLayout>
\ No newline at end of file
--- a/res/layout/changestatus.xml Sun May 17 17:31:39 2009 +0200
+++ b/res/layout/changestatus.xml Sun May 17 23:33:13 2009 +0200
@@ -1,40 +1,30 @@
<?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">
-
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
<Spinner android:id="@+id/ChangeStatusSpinner"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:drawSelectorOnTop="true"/>
-
- <TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/ChangeStatusText"
- android:textColor="@color/blue_sky"/>
-
- <EditText android:id="@+id/ChangeStatusText"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:lines="6"/>
-
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
- <Button android:id="@+id/ChangeStatusOk"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"
- android:text="@string/OkButton"/>
-
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:drawSelectorOnTop="true" />
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="@string/ChangeStatusText"
+ android:textColor="@color/blue_sky" />
+
+ <EditText android:id="@+id/ChangeStatusText"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:lines="6" />
+
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="fill_parent" android:layout_height="wrap_content">
+
+ <Button android:id="@+id/ChangeStatusOk" android:layout_width="fill_parent"
+ android:layout_height="fill_parent" android:layout_weight="1"
+ android:text="@string/OkButton" />
+
<Button android:id="@+id/ChangeStatusClear"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"
- android:text="@string/ClearButton"/>
- </LinearLayout>
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_weight="1" android:text="@string/ClearButton" />
+ </LinearLayout>
</LinearLayout>
\ No newline at end of file
--- a/res/layout/contactlist.xml Sun May 17 17:31:39 2009 +0200
+++ b/res/layout/contactlist.xml Sun May 17 23:33:13 2009 +0200
@@ -11,6 +11,6 @@
<TextView android:id="@+id/android:empty"
android:layout_width="fill_parent"
- android:layout_height="fill_parent" android:text="Non connecte" />
+ android:layout_height="fill_parent" android:text="@string/ConListNotConnected" />
</LinearLayout>
--- a/res/layout/contactlistcontact.xml Sun May 17 17:31:39 2009 +0200
+++ b/res/layout/contactlistcontact.xml Sun May 17 23:33:13 2009 +0200
@@ -1,42 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="10px"
- android:paddingRight="10px"
- android:gravity="center_vertical" >
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:paddingLeft="10px"
+ android:paddingRight="10px" android:gravity="center_vertical">
- <ImageView android:id="@+id/contactliststatus"
- android:adjustViewBounds="true"
- android:maxWidth="15dip"
- android:maxHeight="15dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical" />
+ <ImageView android:id="@+id/contactliststatus"
+ android:adjustViewBounds="true" android:maxWidth="15dip"
+ android:maxHeight="15dip" 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/contactlistpseudo"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="20sp" />
- <TextView android:id="@+id/contactlistmsgperso"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="20sp" />
- </LinearLayout>
+ <LinearLayout android:orientation="vertical"
+ android:layout_weight="1" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:id="@+id/contactlistpseudo"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:paddingLeft="20sp" />
+ <TextView android:id="@+id/contactlistmsgperso"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:paddingLeft="20sp" />
+ </LinearLayout>
- <ImageView android:id="@+id/contactlistavatar"
- android:adjustViewBounds="true"
- android:maxWidth="50dip"
- android:maxHeight="50dip"
- android:padding="1dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical" />
-
+ <ImageView android:id="@+id/contactlistavatar"
+ android:adjustViewBounds="true" android:maxWidth="50dip"
+ android:maxHeight="50dip" android:padding="1dip" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:gravity="center_vertical" />
+
</LinearLayout>
\ No newline at end of file
--- a/res/layout/contactlistsettings.xml Sun May 17 17:31:39 2009 +0200
+++ b/res/layout/contactlistsettings.xml Sun May 17 23:33:13 2009 +0200
@@ -6,13 +6,13 @@
android:layout_width="fill_parent" android:layout_height="fill_parent">
<TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="Server connection"
+ android:layout_height="wrap_content" android:text="@string/CLSServerConnection"
android:textSize="18sp" />
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <LinearLayout
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:layout_height="wrap_content" android:text="@string/CLSUserid"
android:minWidth="90dp" android:textSize="14sp" />
<EditText android:id="@+id/userid" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:singleLine="true"
@@ -20,11 +20,11 @@
android:scrollHorizontally="true" />
</LinearLayout>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <LinearLayout
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:layout_height="wrap_content" android:text="@string/CLSPassword"
android:minWidth="90dp" android:textSize="14sp" />
<EditText android:id="@+id/password" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:singleLine="true"
@@ -32,11 +32,11 @@
android:capitalize="none" android:scrollHorizontally="true" />
</LinearLayout>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <LinearLayout
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="Service:"
+ android:layout_height="wrap_content" android:text="@string/CLSService"
android:minWidth="90dp" android:textSize="14sp" />
<EditText android:id="@+id/service" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:singleLine="true"
@@ -44,11 +44,11 @@
android:scrollHorizontally="true" />
</LinearLayout>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <LinearLayout
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:layout_height="wrap_content" android:text="@string/CLSHostPort"
android:minWidth="90dp" android:textSize="14sp" />
<EditText android:id="@+id/host" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:singleLine="true"
@@ -61,7 +61,7 @@
</LinearLayout>
<TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="Proxy informations"
+ android:layout_height="wrap_content" android:text=""
android:textSize="18sp" />
<Spinner android:id="@+id/proxy_type" android:layout_width="fill_parent"
@@ -72,13 +72,13 @@
android:layout_height="0sp">
<TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="Proxy informations"
+ android:layout_height="wrap_content" android:text="@string/CLSProxyInfo"
android:textSize="18sp" />
<LinearLayout 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:layout_height="wrap_content" android:text="@string/CLSHostPort"
android:minWidth="90dp" android:textSize="14sp" />
<EditText android:id="@+id/proxy_host"
android:layout_width="fill_parent" android:layout_height="wrap_content"
@@ -92,11 +92,11 @@
android:scrollHorizontally="true" />
</LinearLayout>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <LinearLayout
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="Login :"
+ android:layout_height="wrap_content" android:text="@string/CLSLogin"
android:minWidth="90dp" android:textSize="14sp" />
<EditText android:id="@+id/proxy_login"
android:layout_width="fill_parent" android:layout_height="wrap_content"
@@ -104,11 +104,11 @@
android:capitalize="none" android:scrollHorizontally="true" />
</LinearLayout>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <LinearLayout
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:layout_height="wrap_content" android:text="@string/CLSPassword"
android:minWidth="90dp" android:textSize="14sp" />
<EditText android:id="@+id/proxy_pwd" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:singleLine="true"
@@ -118,7 +118,7 @@
</LinearLayout>
<Button android:id="@+id/ok" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
- android:text="OK">
+ android:text="@string/CLSOkButton">
<requestFocus />
</Button>
</LinearLayout>
--- a/res/layout/sendim.xml Sun May 17 17:31:39 2009 +0200
+++ b/res/layout/sendim.xml Sun May 17 23:33:13 2009 +0200
@@ -1,103 +1,69 @@
<?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
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical" >
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:gravity="center_vertical">
+
+ <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" />
- <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"
- />
-
- <LinearLayout
- android:orientation="vertical"
- 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="10sp" />
+ <LinearLayout android:orientation="vertical"
+ 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="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="15sp" />
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:lines="1" android:scrollHorizontally="true"
+ android:hint="@string/SendIMNoStatusSet" android:paddingLeft="15sp" />
</LinearLayout>
-</LinearLayout>
+ </LinearLayout>
-<!-- <LinearLayout
- android:paddingLeft="5px"
- android:paddingTop="5px"
- android:background="@drawable/beem_sendim_header_1"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
+ <!--
+ <LinearLayout android:paddingLeft="5px" android:paddingTop="5px"
+ android:background="@drawable/beem_sendim_header_1"
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:layout_weight="4">
+
+ <ImageView android:id="@+id/sendimavatar"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:maxHeight="80px"
+ android:layout_weight="5" android:src="@drawable/background"/>
+
+ <LinearLayout android:layout_width="fill_parent"
+ android:layout_height="fill_parent" android:layout_weight="1"
+ android:orientation="vertical"> <TextView
+ android:id="@+id/sendimlogin" android:paddingLeft="15px"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="4">
-
- <ImageView android:id="@+id/sendimavatar"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxHeight="80px"
- android:layout_weight="5"
- android:src="@drawable/background"/>
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"
- android:orientation="vertical">
-
- <TextView android:id="@+id/sendimlogin"
- android:paddingLeft="15px"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:hint="@string/SendIMLoginHint"/>
-
- <TextView android:id="@+id/sendimstatus"
- android:paddingLeft="20px"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:hint="@string/SendIMNoStatusSet"/>
- </LinearLayout>
- </LinearLayout>-->
-
- <ScrollView
- android:id="@+id/sendimscroll"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:hint="@string/SendIMLoginHint"/> <TextView
+ android:id="@+id/sendimstatus" android:paddingLeft="20px"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:hint="@string/SendIMNoStatusSet"/> </LinearLayout>
+ </LinearLayout>
+ -->
+
+ <ScrollView android:id="@+id/sendimscroll"
+ 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"
- android:paddingLeft="10px"
- android:paddingRight="10px"
- android:paddingTop="10px"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:singleLine="false"/>
-
- </ScrollView>
-
- <EditText android:id="@+id/userText"
- android:layout_width="fill_parent"
- android:cursorVisible="false"
- android:hint="@string/SendIMToSendHint"
- android:layout_height="wrap_content" />
-
+ android:scrollbarThumbVertical="@drawable/scrollbar_vertical_thumb"
+ android:scrollbarSize="12dip" android:layout_weight="1">
+
+ <TextView android:id="@+id/sendimlist" android:paddingLeft="10px"
+ android:paddingRight="10px" android:paddingTop="10px"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:singleLine="false" />
+
+ </ScrollView>
+
+ <EditText android:id="@+id/userText" android:layout_width="fill_parent"
+ android:cursorVisible="false" android:hint="@string/SendIMToSendHint"
+ android:layout_height="wrap_content" />
+
</LinearLayout>
\ No newline at end of file
--- a/res/layout/subscription.xml Sun May 17 17:31:39 2009 +0200
+++ b/res/layout/subscription.xml Sun May 17 23:33:13 2009 +0200
@@ -1,24 +1,17 @@
<?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
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
- <Button android:id="@+id/SubscriptionAccept"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"
- android:text="@string/AcceptButton"/>
-
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="fill_parent" android:layout_height="wrap_content">
+
+ <Button android:id="@+id/SubscriptionAccept"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_weight="1" android:text="@string/AcceptButton" />
+
<Button android:id="@+id/SubscriptionRefuse"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"
- android:text="@string/RefuseButton"/>
- </LinearLayout>
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_weight="1" android:text="@string/RefuseButton" />
+ </LinearLayout>
</LinearLayout>
\ No newline at end of file
--- a/res/values/strings.xml Sun May 17 17:31:39 2009 +0200
+++ b/res/values/strings.xml Sun May 17 23:33:13 2009 +0200
@@ -42,6 +42,33 @@
<string name="PreferenceStatus">status</string>
<string name="PreferenceStatusText">status_text</string>
+ <!-- ContactListSettings class -->
+ <string name="CLSServerConnection">Server connection</string>
+ <string name="CLSUserid">Userid:</string>
+ <string name="CLSPassword">Password:</string>
+ <string name="CLSService">Service:</string>
+ <string name="CLSHostPort">Host/Port:</string>
+ <string name="CLSProxyInfo">Proxy informations</string>
+ <string name="CLSLogin">Login:</string>
+ <string name="CLSOkButton">Ok</string>
+
+ <!-- AccountCreation class -->
+ <string name="ACLogin">Login:</string>
+ <string name="ACEmail">Email:</string>
+ <string name="ACPassword">Password:</string>
+ <string name="ACRepeat">Repeat:</string>
+ <string name="ACOkButton">Ok</string>
+ <string name="ACBadForm">Bad form</string>
+ <string name="ACCreated">Account created</string>
+
+ <!-- AddContact class -->
+ <string name="AddCLogin">Login:</string>
+ <string name="AddCAlias">Alias:</string>
+ <string name="AddCGroup">Group:</string>
+ <string name="AddCOkButton">Ok</string>
+ <string name="AddCContactAdded">Contact added</string>
+ <string name="AddCBadForm">Bad form</string>
+
<!-- SendIM class -->
<string name="SendIMSays"> says :\n</string>
@@ -64,6 +91,14 @@
<string name="ChangeStatusOk">Updating status</string>
<string name="ChangeStatusNoChange">Nothing to change</string>
+
+ <!-- Subscription class -->
+ <string name="SubscriptAccept">Subscription accepted</string>
+ <string name="SubscriptError">Subscription error</string>
+ <string name="SubscriptRefused">Subscription refused</string>
+
+ <!-- ContactList class -->
+ <string name="ConListNotConnected">Not connected</string>
<!-- BeemChatManager -->
<string name="BeemChatManagerNewMessage">You have got a new message</string>
--- a/src/com/beem/project/beem/BeemApplication.java Sun May 17 17:31:39 2009 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java Sun May 17 23:33:13 2009 +0200
@@ -73,8 +73,7 @@
}
}
} catch (RemoteException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ Log.e(TAG, "service connection exception", e);
}
}
};
--- a/src/com/beem/project/beem/BeemService.java Sun May 17 17:31:39 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java Sun May 17 23:33:13 2009 +0200
@@ -192,7 +192,7 @@
@Override
public void onConnect() throws RemoteException {
- // TODO Auto-generated method stub
+
PacketFilter filter = new PacketFilter() {
@Override
--- a/src/com/beem/project/beem/ui/AccountCreation.java Sun May 17 17:31:39 2009 +0200
+++ b/src/com/beem/project/beem/ui/AccountCreation.java Sun May 17 23:33:13 2009 +0200
@@ -37,7 +37,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.accountcreation);
- Button ok = (Button) findViewById(R.id.ok);
+ Button ok = (Button) findViewById(R.id.ac_ok);
mSettings = getSharedPreferences(
getString(R.string.PreferenceFileName), MODE_PRIVATE);
ok.setOnClickListener(mOkListener);
@@ -48,30 +48,29 @@
@Override
public void onClick(View v) {
boolean valid = true;
- if (getWidgetText(R.id.login).length() == 0) {
- Log.d(TAG, "login pas ok");
+ if (getWidgetText(R.id.ac_login).length() == 0) {
valid = false;
} else {
- mAttributes.put("login", getWidgetText(R.id.login));
- mAttributes.put("name", getWidgetText(R.id.login));
+ mAttributes.put("login", getWidgetText(R.id.ac_login));
+ mAttributes.put("name", getWidgetText(R.id.ac_login));
}
- if (getWidgetText(R.id.password).length() == 0 || !getWidgetText(R.id.password).contains(getWidgetText(R.id.password2))) {
+ if (getWidgetText(R.id.ac_password).length() == 0 || !getWidgetText(R.id.ac_password).contains(getWidgetText(R.id.ac_password2))) {
valid = false;
} else {
mAttributes.put("password", getWidgetText(R.id.password));
}
- if (getWidgetText(R.id.email).length() == 0) {
+ if (getWidgetText(R.id.ac_email).length() == 0) {
valid = false;
} else {
- mAttributes.put("email", getWidgetText(R.id.email));
+ mAttributes.put("email", getWidgetText(R.id.ac_email));
}
if (valid) {
setResult(RESULT_OK);
try {
createAccount();
- Toast.makeText(AccountCreation.this, "Account created",
+ Toast.makeText(AccountCreation.this, getString(R.string.ACCreated),
Toast.LENGTH_SHORT).show();
finish();
} catch (XMPPException e) {
@@ -81,7 +80,7 @@
e.printStackTrace();
}
} else {
- Toast.makeText(AccountCreation.this, "Form error",
+ Toast.makeText(AccountCreation.this, getString(R.string.ACBadForm),
Toast.LENGTH_SHORT).show();
setResult(RESULT_CANCELED);
}
--- a/src/com/beem/project/beem/ui/AddContact.java Sun May 17 17:31:39 2009 +0200
+++ b/src/com/beem/project/beem/ui/AddContact.java Sun May 17 23:33:13 2009 +0200
@@ -13,7 +13,6 @@
import android.app.Activity;
import android.os.Bundle;
import android.os.RemoteException;
-import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
@@ -36,7 +35,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.addcontact);
- Button ok = (Button) findViewById(R.id.AC_ok);
+ Button ok = (Button) findViewById(R.id.addc_ok);
//mAccountManager = new AccountManager();
ok.setOnClickListener(mOkListener);
mService = BeemApplication.getApplication(this).getXmppFacade();
@@ -47,28 +46,25 @@
@Override
public void onClick(View v) {
boolean valid = true;
- if (getWidgetText(R.id.AC_login).length() == 0) {
- Log.d(TAG, "login pas ok");
+ if (getWidgetText(R.id.addc_login).length() == 0) {
valid = false;
} else {
- mLogin = getWidgetText(R.id.AC_login);
+ mLogin = getWidgetText(R.id.addc_login);
}
- if (getWidgetText(R.id.AC_alias).length() == 0) {
- Log.d(TAG, "alias pas ok");
+ if (getWidgetText(R.id.addc_alias).length() == 0) {
valid = false;
} else {
- mAlias = getWidgetText(R.id.AC_alias);
+ mAlias = getWidgetText(R.id.addc_alias);
}
- if (getWidgetText(R.id.AC_group).length() == 0) {
- Log.d(TAG, "group pas ok");
+ if (getWidgetText(R.id.addc_group).length() == 0) {
valid = false;
} else {
- mGroup.add(getWidgetText(R.id.AC_group));
+ mGroup.add(getWidgetText(R.id.addc_group));
}
if (valid) {
try {
mService.getRoster().addContact(mLogin, mAlias, (String[])mGroup.toArray(new String[mGroup.size()]));
- Toast.makeText(AddContact.this, "Contact added",
+ Toast.makeText(AddContact.this, getString(R.string.AddCContactAdded),
Toast.LENGTH_SHORT).show();
finish();
} catch (RemoteException e) {
@@ -78,7 +74,7 @@
}
setResult(RESULT_OK);
} else {
- Toast.makeText(AddContact.this, "Bad form",
+ Toast.makeText(AddContact.this, getString(R.string.AddCBadForm),
Toast.LENGTH_SHORT).show();
setResult(RESULT_CANCELED);
}
--- a/src/com/beem/project/beem/ui/ContactListSettings.java Sun May 17 17:31:39 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactListSettings.java Sun May 17 23:33:13 2009 +0200
@@ -144,7 +144,7 @@
EditText e = (EditText) findViewById(R.id.host);
e.setText(getPreferenceString(R.string.PreferenceHostKey));
e = (EditText) findViewById(R.id.port);
- e.setText(String.valueOf(mSettings.getInt(getString(R.string.PreferencePortKey), 1080)));
+ e.setText(String.valueOf(mSettings.getInt(getString(R.string.PreferencePortKey), 5222)));
e = (EditText) findViewById(R.id.userid);
e.setText(getPreferenceString(R.string.PreferenceLoginKey));
e = (EditText) findViewById(R.id.password);
--- a/src/com/beem/project/beem/ui/Subscription.java Sun May 17 17:31:39 2009 +0200
+++ b/src/com/beem/project/beem/ui/Subscription.java Sun May 17 23:33:13 2009 +0200
@@ -23,10 +23,10 @@
*
*/
public class Subscription extends Activity {
-
+
private IXmppFacade mService;
private String mContact;
-
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -36,7 +36,7 @@
mContact = getIntent().getStringExtra("from");
mService = BeemApplication.getApplication(this).getXmppFacade();
}
-
+
private OnClickListener mClickListener = new OnClickListener() {
@Override
@@ -48,26 +48,26 @@
PresenceAdapter preAdapt = new PresenceAdapter(presence);
try {
mService.sendPresencePacket(preAdapt);
- Toast.makeText(Subscription.this, "Subscription accept",
- Toast.LENGTH_SHORT).show();
+ Toast.makeText(Subscription.this, getString(R.string.SubscriptAccept),
+ Toast.LENGTH_SHORT).show();
finish();
} catch (RemoteException e) {
- Toast.makeText(Subscription.this, "Subscription error",
- Toast.LENGTH_SHORT).show();
+ Toast.makeText(Subscription.this, getString(R.string.SubscriptError),
+ Toast.LENGTH_SHORT).show();
e.printStackTrace();
}
break ;
case R.id.SubscriptionRefuse:
- Toast.makeText(Subscription.this, "Subscription refused",
- Toast.LENGTH_SHORT).show();
-
+ Toast.makeText(Subscription.this, getString(R.string.SubscriptRefused),
+ Toast.LENGTH_SHORT).show();
+
break ;
default:
- Toast.makeText(Subscription.this, "Subscription error",
- Toast.LENGTH_SHORT).show();
+ Toast.makeText(Subscription.this, getString(R.string.SubscriptError),
+ Toast.LENGTH_SHORT).show();
};
-
+
}
-
+
};
}