Merge.
--- a/AndroidManifest.xml Sun Jul 05 20:22:33 2009 +0200
+++ b/AndroidManifest.xml Sun Jul 05 20:22:51 2009 +0200
@@ -10,8 +10,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name=".ui.ContactListSettings"
- android:label="@string/app_name" />
<activity android:name=".ui.SendIM" android:label="@string/SendIMActTitle"
android:launchMode="singleTop" />
<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle" />
--- a/res/layout/contactlist.xml Sun Jul 05 20:22:33 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +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">
-
- <ExpandableListView android:id="@+id/android:list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1" />
-
- <TextView android:id="@+id/android:empty"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" android:text="@string/ConListNotConnected" />
-
-</LinearLayout>
--- a/res/layout/sendim.xml Sun Jul 05 20:22:33 2009 +0200
+++ b/res/layout/sendim.xml Sun Jul 05 20:22:51 2009 +0200
@@ -37,6 +37,8 @@
<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:textColor="@color/white"
+ android:background="@color/black"
android:singleLine="false" />
</ScrollView>
--- a/res/values-en/strings.xml Sun Jul 05 20:22:33 2009 +0200
+++ b/res/values-en/strings.xml Sun Jul 05 20:22:51 2009 +0200
@@ -18,23 +18,6 @@
<string name="BeemServiceDestroyed">BeemService destroyed</string>
<!-- Preferences informations -->
- <string name="PreferenceFileName">Beem</string>
- <string name="PreferenceHostKey">host</string>
- <string name="PreferenceJID">Jabber ID</string>
- <string name="PreferenceLoginKey">login</string>
- <string name="PreferencePasswordKey">password</string>
- <string name="PreferenceService">service</string>
- <string name="PreferencePortKey">port</string>
- <string name="PreferenceProxyHost">proxy_host</string>
- <string name="PreferenceProxyPort">proxy_port</string>
- <string name="PreferenceUseProxy">use_proxy</string>
- <string name="PreferenceProxyType">proxy_type</string>
- <string name="PreferenceProxyUser">proxy_user</string>
- <string name="PreferenceProxyPassword">proxy_password</string>
- <string name="PreferenceProxyTypeNone">None</string>
- <string name="PreferenceProxyTypeHttp">HTTP</string>
- <string name="PreferenceProxyTypeSocks4">SOCKS4</string>
- <string name="PreferenceProxyTypeSocks5">SOCKS5</string>
<string name="PreferenceStatus">status</string>
<string name="PreferenceStatusText">status_text</string>
<string name="PreferenceIsConfigured">preference_is_configured</string>
--- a/res/values-fr/strings.xml Sun Jul 05 20:22:33 2009 +0200
+++ b/res/values-fr/strings.xml Sun Jul 05 20:22:51 2009 +0200
@@ -18,25 +18,9 @@
<string name="BeemServiceDestroyed">BeemService détruit</string>
<!-- Preferences informations -->
- <string name="PreferenceFileName">Beem</string>
- <string name="PreferenceHostKey">host</string>
- <string name="PreferenceJID">Jabber ID</string>
- <string name="PreferenceLoginKey">login</string>
- <string name="PreferencePasswordKey">password</string>
- <string name="PreferenceService">service</string>
- <string name="PreferencePortKey">port</string>
- <string name="PreferenceProxyHost">proxy_host</string>
- <string name="PreferenceProxyPort">proxy_port</string>
- <string name="PreferenceUseProxy">use_proxy</string>
- <string name="PreferenceProxyType">proxy_type</string>
- <string name="PreferenceProxyUser">proxy_user</string>
- <string name="PreferenceProxyPassword">proxy_password</string>
- <string name="PreferenceProxyTypeNone">None</string>
- <string name="PreferenceProxyTypeHttp">HTTP</string>
- <string name="PreferenceProxyTypeSocks4">SOCKS4</string>
- <string name="PreferenceProxyTypeSocks5">SOCKS5</string>
<string name="PreferenceStatus">status</string>
<string name="PreferenceStatusText">status_text</string>
+ <string name="PreferenceIsConfigured">preference_is_configured</string>
<!-- ContactListSettings class -->
<string name="CLSServerConnection">Connexion au serveur</string>
@@ -45,7 +29,7 @@
<string name="CLSService">Service:</string>
<string name="CLSHostPort">Host/Port:</string>
<string name="CLSProxyInfo">Informations Proxy</string>
- <string name="CLSLogin">Nom d'utilisateur:</string>
+ <string name="CLSLogin">Nom d\'utilisateur:</string>
<string name="CLSOkButton">Ok</string>
<!-- ContactDialog class -->
@@ -53,8 +37,8 @@
<string name="CDAlias">Alias</string>
<string name="CDResend">Réenvoyer la demande</string>
<string name="CDInfos">Informations utilisateur</string>
- <string name="CDBlock">Bloquer l'utilisateur</string>
- <string name="CDDelete">Supprimer l'utilisateur</string>
+ <string name="CDBlock">Bloquer l\'utilisateur</string>
+ <string name="CDDelete">Supprimer l\'utilisateur</string>
<string name="CDSure2Delete">Êtes-vous sûr de vouloir supprimer ce contact ?</string>
<string name="CDSure2DeleteYes">Oui</string>
<string name="CDSure2DeleteNo">Non</string>
@@ -67,7 +51,7 @@
<string name="AddCOkButton">Ok</string>
<string name="AddCContactAdded">Contact ajouté</string>
<string name="AddCContactAddedError">Erreur Contact pas ajouté</string>
- <string name="AddCContactAddedLoginError">Error Nom d'utilisateur</string>
+ <string name="AddCContactAddedLoginError">Error Nom d\'utilisateur</string>
<string name="AddCBadForm">Mauvais formulaire</string>
<!-- SendIM class -->
@@ -95,9 +79,9 @@
<!-- Subscription class -->
<string name="SubscriptAccept">Abonnement accepté</string>
- <string name="SubscriptError">Erreur d'abonnement</string>
+ <string name="SubscriptError">Erreur d\'abonnement</string>
<string name="SubscriptRefused">Abonnement refusé</string>
- <string name="SubscriptText">Vous avez une requête d'ajout de la part de %s. Souhaitez-vous l'accepter ?</string>
+ <string name="SubscriptText">Vous avez une requête d\'ajout de la part de %s. Souhaitez-vous l\'accepter ?</string>
<!-- ContactList class -->
<string name="ConListNotConnected">Non connecté</string>
--- a/src/com/beem/project/beem/ui/ContactListSettings.java Sun Jul 05 20:22:33 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-package com.beem.project.beem.ui;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.LinearLayout.LayoutParams;
-
-import com.beem.project.beem.R;
-
-public class ContactListSettings extends Activity {
-
- public static final int CHANGE = 1;
- private boolean mIsChanged = false;
- private SharedPreferences mSettings;
- private String[] mProxyTypeString;
-
- private final OnItemSelectedListener mProxyType = new OnItemSelectedListener() {
-
- @Override
- public void onItemSelected(AdapterView<?> parent, View arg1,
- int arg2, long arg3) {
- String value = parent.getSelectedItem().toString();
- LinearLayout ll = (LinearLayout) findViewById(R.id.proxy_layout);
- SharedPreferences.Editor editor = mSettings.edit();
- LayoutParams lp = (LayoutParams) ll.getLayoutParams();
- if (value
- .equals(getString(R.string.PreferenceProxyTypeNone))) {
- ll.setVisibility(View.INVISIBLE);
- lp.height = 0;
- ll.setLayoutParams(lp);
- editor.putBoolean(
- getString(R.string.PreferenceUseProxy), false);
- } else {
- ll.setVisibility(View.VISIBLE);
- lp.height = android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
- ll.setLayoutParams(lp);
- editor.putBoolean(
- getString(R.string.PreferenceUseProxy), true);
- }
- if (!value
- .equals(getPreferenceString(R.string.PreferenceProxyType))) {
- editor
- .putString(
- getString(R.string.PreferenceProxyType),
- value);
- mIsChanged = true;
- }
- editor.commit();
- }
-
- @Override
- public void onNothingSelected(AdapterView<?> arg0) {
- }
-
- };
-
- private final OnClickListener mOkListener = new OnClickListener() {
-
- public void onClick(View v) {
- SharedPreferences.Editor editor = mSettings.edit();
-
- if (isChanged(R.id.host, R.string.PreferenceHostKey)) {
- editor.putString(
- getString(R.string.PreferenceHostKey),
- getWidgetText(R.id.host));