--- a/default.properties Fri Nov 06 19:28:02 2009 +0100
+++ b/default.properties Fri Nov 06 19:38:17 2009 +0100
@@ -7,16 +7,8 @@
# "build.properties", and override values to adapt the script to your
# project structure.
+# Indicates whether an apk should be generated for each density.
+split.density=false
# Project target.
target=android-3
-# apk configurations. This property allows creation of APK files with limited
-# resources. For example, if your application contains many locales and
-# you wish to release multiple smaller apks instead of a large one, you can
-# define configuration to create apks with limited language sets.
-# Format is a comma separated list of configuration names. For each
-# configuration, a property will declare the resource configurations to
-# include. Example:
-# apk-configurations=european,northamerica
-# apk-config-european=en,fr,it,de,es
-# apk-config-northamerica=en,es
apk-configurations=
--- a/res/layout/preferences.xml Fri Nov 06 19:28:02 2009 +0100
+++ b/res/layout/preferences.xml Fri Nov 06 19:38:17 2009 +0100
@@ -1,72 +1,167 @@
<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:shouldDisableView="true" android:selectable="true">
- <EditTextPreference android:singleLine="true"
- android:summary="@string/SettingsText"
- android:title="@string/settings_account_username" android:key="settings_key_account_username"
- />
- <EditTextPreference android:name="password"
- android:singleLine="true" android:password="true"
- android:summary="@string/SettingsPassword"
- android:title="@string/settings_account_password" android:key="settings_key_account_password" />
- <CheckBoxPreference android:title="@string/SettingsCheckboxText"
- android:defaultValue="false"
- android:summary="@string/SettingsGmail"
- android:key="settings_key_gmail" />
- <PreferenceScreen android:key="proxy" android:title="@string/SettingsProxy">
- <CheckBoxPreference android:title="@string/SettingsProxyProxy"
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shouldDisableView="true"
+ android:selectable="true">
+
+ <PreferenceCategory
+ android:title="@string/general_preferences">
+
+ <PreferenceScreen
+ android:key="contact_list"
+ android:title="@string/contact_list_preferences"
+ android:summary="@string/contact_list_preferences_sum">
+
+ <CheckBoxPreference
+ android:title="@string/CLP_hidden_contact"
+ android:defaultValue="false"
+ android:summary="@string/CLP_hidden_contact_sum"
+ android:key="settings_key_hidden_contact" />
+
+ </PreferenceScreen>
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:title="@string/user_preferences">
+
+ <EditTextPreference
+ android:singleLine="true"
+ android:summary="@string/SettingsText"
+ android:title="@string/settings_account_username"
+ android:key="settings_key_account_username" />
+ <EditTextPreference
+ android:name="password"
+ android:singleLine="true"
+ android:password="true"
+ android:summary="@string/SettingsPassword"
+ android:title="@string/settings_account_password"
+ android:key="settings_key_account_password" />
+
+ <CheckBoxPreference
+ android:title="@string/SettingsCheckboxText"
android:defaultValue="false"
- android:summary="@string/SettingsProxySummary"
- android:key="settings_key_proxy_use" />
- <ListPreference android:dependency="settings_key_proxy_use"
- android:title="@string/SettingsProxyType" android:entries="@array/proxy_types"
- android:summary="@string/SettingsProxyTypeSummary"
- android:defaultValue="HTTP" android:entryValues="@array/proxy_types"
- android:key="settings_key_proxy_type" />
- <EditTextPreference android:singleLine="true" android:dependency="settings_key_proxy_use"
- android:name="serveur" android:summary="@string/SettingsProxyServer"
- android:title="@string/settings_proxy_server" android:key="settings_key_proxy_server" />
- <EditTextPreference android:singleLine="true" android:dependency="settings_key_proxy_use"
- android:name="port" android:summary="@string/SettingsProxyPort"
- android:title="@string/settings_proxy_port" android:key="settings_key_proxy_port"
- android:numeric="integer" />
- <EditTextPreference android:singleLine="true" android:dependency="settings_key_proxy_use"
- android:name="Utilisateur"
- android:summary="@string/SettingsProxyUser"
- android:title="@string/settings_proxy_username" android:key="settings_key_proxy_username" />
- <EditTextPreference android:singleLine="true" android:dependency="settings_key_proxy_use"
- android:name="pass_user" android:password="true"
- android:summary="@string/SettingsProxyPassword"
- android:title="@string/settings_proxy_password" android:key="settings_key_proxy_password" />
- </PreferenceScreen>
+ android:summary="@string/SettingsGmail"
+ android:key="settings_key_gmail" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:title="@string/network_preferences">
+
+ <PreferenceScreen
+ android:key="proxy"
+ android:title="@string/SettingsProxy"
+ android:summary="@string/settings_proxy_sum">
+
+ <CheckBoxPreference
+ android:title="@string/SettingsProxyProxy"
+ android:defaultValue="false"
+ android:summary="@string/SettingsProxySummary"
+ android:key="settings_key_proxy_use" />
+
+ <PreferenceCategory
+ android:title="@string/proxy_proxy_settings">
+
+ <ListPreference
+ android:dependency="settings_key_proxy_use"
+ android:title="@string/SettingsProxyType"
+ android:entries="@array/proxy_types"
+ android:summary="@string/SettingsProxyTypeSummary"
+ android:defaultValue="HTTP"
+ android:entryValues="@array/proxy_types"
+ android:key="settings_key_proxy_type" />
+
+ <EditTextPreference
+ android:singleLine="true"
+ android:dependency="settings_key_proxy_use"
+ android:name="serveur"
+ android:summary="@string/SettingsProxyServer"
+ android:title="@string/settings_proxy_server"
+ android:key="settings_key_proxy_server" />
+
+ <EditTextPreference
+ android:singleLine="true"
+ android:dependency="settings_key_proxy_use"
+ android:name="port"
+ android:summary="@string/SettingsProxyPort"
+ android:title="@string/settings_proxy_port"
+ android:key="settings_key_proxy_port" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:title="@string/proxy_user_settings">
+
+ <EditTextPreference
+ android:singleLine="true"
+ android:dependency="settings_key_proxy_use"
+ android:name="Utilisateur"
+ android:summary="@string/SettingsProxyUser"
+ android:title="@string/settings_proxy_username"
+ android:key="settings_key_proxy_username" />
- <PreferenceScreen android:key="advanced"
- android:title="@string/SettingsAdvanced">
- <CheckBoxPreference
- android:title="@string/settings_xmpp_use_tls"
- android:defaultValue="false"
- android:key="settings_key_xmpp_tls_use" />
-
- <EditTextPreference android:singleLine="true"
- android:title="@string/settings_reco_delay"
- android:name="Reconnect delay"
- android:summary="@string/SettingsAdvancedRecoDelay"
- android:key="settings_key_reco_delay"
- android:numeric="integer"
- android:defaultValue="10" />
-
- <CheckBoxPreference android:title="@string/SettingsAdvancedOptions"
- android:defaultValue="false"
- android:summary="@string/SettingsAdvancedSpecOpt"
- android:key="settings_key_specific_server" />
- <EditTextPreference android:singleLine="true" android:dependency="settings_key_specific_server"
- android:name="adresse" android:summary="@string/SettingsAdvancedAddOpt"
- android:title="@string/settings_xmpp_server" android:key="settings_key_xmpp_server"
- android:defaultValue="10.0.2.2" />
- <EditTextPreference android:singleLine="true" android:dependency="settings_key_specific_server"
- android:name="port" android:summary="@string/SettingsAdvancedPortOpt"
- android:title="@string/settings_xmpp_port" android:defaultValue="5222"
- android:numeric="integer"
- android:key="settings_key_xmpp_port" />
- </PreferenceScreen>
-</PreferenceScreen>
\ No newline at end of file
+ <EditTextPreference
+ android:singleLine="true"
+ android:dependency="settings_key_proxy_use"
+ android:name="pass_user"
+ android:password="true"
+ android:summary="@string/SettingsProxyPassword"
+ android:title="@string/settings_proxy_password"
+ android:key="settings_key_proxy_password" />
+
+ </PreferenceCategory>
+
+ </PreferenceScreen>
+
+ <PreferenceScreen
+ android:key="advanced"
+ android:title="@string/SettingsAdvanced"
+ android:summary="@string/settings_advanced_sum">
+
+ <PreferenceCategory
+ android:title="@string/settings_advanced_service_behaviour">
+
+ <CheckBoxPreference
+ android:title="@string/settings_xmpp_use_tls"
+ android:defaultValue="false"
+ android:key="settings_key_xmpp_tls_use" />
+
+ <EditTextPreference
+ android:singleLine="true"
+ android:title="@string/settings_reco_delay"
+ android:name="Reconnect delay"
+ android:summary="@string/SettingsAdvancedRecoDelay"
+ android:key="settings_key_reco_delay"
+ android:defaultValue="10" />
+
+ </PreferenceCategory>
+
+ <CheckBoxPreference
+ android:title="@string/SettingsAdvancedOptions"
+ android:defaultValue="false"
+ android:summary="@string/SettingsAdvancedSpecOpt"
+ android:key="settings_key_specific_server" />
+
+ <EditTextPreference
+ android:singleLine="true"
+ android:dependency="settings_key_specific_server"
+ android:name="adresse"
+ android:summary="@string/SettingsAdvancedAddOpt"
+ android:title="@string/settings_xmpp_server"
+ android:key="settings_key_xmpp_server"/>
+
+ <EditTextPreference
+ android:singleLine="true"
+ android:dependency="settings_key_specific_server"
+ android:name="port"
+ android:summary="@string/SettingsAdvancedPortOpt"
+ android:title="@string/settings_xmpp_port"
+ android:defaultValue="5222"
+ android:key="settings_key_xmpp_port" />
+
+ </PreferenceScreen>
+
+ </PreferenceCategory>
+
+</PreferenceScreen>
--- a/res/values-fr/strings.xml Fri Nov 06 19:28:02 2009 +0100
+++ b/res/values-fr/strings.xml Fri Nov 06 19:38:17 2009 +0100
@@ -78,25 +78,25 @@
<string name="ChangeStatusNoChange">Rien à changer</string>
<!-- Settings class -->
- <string name="SettingsText">Permet la modification de votre identifiant de connexion</string>
- <string name="SettingsPassword">Permet la modification de votre mot de passe</string>
+ <string name="SettingsText">Saisissez votre identifiant de connexion</string>
+ <string name="SettingsPassword">Saisissez votre mot de passe</string>
<string name="SettingsCheckboxText">Utilisation de Gmail</string>
- <string name="SettingsGmail">Cochez cette case si vous souhaitez utiliser votre compte Gmail</string>
- <string name="SettingsProxy">Beem - Paramètres - Proxy</string>
+ <string name="SettingsGmail">Cochez cette option si vous souhaitez utiliser votre compte Gmail</string>
+ <string name="SettingsProxy">Proxy</string>
<string name="SettingsProxyProxy">Utiliser un proxy</string>
- <string name="SettingsProxySummary">Cochez cette case si vous souhaitez utiliser un serveur proxy</string>
+ <string name="SettingsProxySummary">Connectez vous à travers un serveur proxy</string>
<string name="SettingsProxyType">Protocole</string>
<string name="SettingsProxyTypeSummary">Permet de choisir le type de proxy à utiliser</string>
- <string name="SettingsProxyServer">Définition de l'adresse du serveur.</string>
- <string name="SettingsProxyPort">Définition du port du serveur.</string>
- <string name="SettingsProxyUser">Optionnel, permet de s'authentifier sur le proxy</string>
- <string name="SettingsProxyPassword">Optionnel, permet de s'authentifier sur le proxy</string>
- <string name="SettingsAdvanced">Beem - Paramètres - Options avancées</string>
+ <string name="SettingsProxyServer">Saisissez l\'adresse du serveur proxy</string>
+ <string name="SettingsProxyPort">Saisissez le numéro de port du serveur proxy</string>
+ <string name="SettingsProxyUser">Optionnel, permet de s\'authentifier sur le proxy</string>
+ <string name="SettingsProxyPassword">Optionnel, permet de s\'authentifier sur le proxy</string>
+ <string name="SettingsAdvanced">Options avancées</string>
<string name="SettingsAdvancedRecoDelay">Modifier le délai de reconnexion</string>
<string name="SettingsAdvancedOptions">Options spécifiques</string>
- <string name="SettingsAdvancedSpecOpt">Cochez cette case si vous souhaitez utiliser un serveur spécifique pour votre connexion</string>
- <string name="SettingsAdvancedAddOpt">Permet d'éditer l'adresse du serveur</string>
- <string name="SettingsAdvancedPortOpt">Permet d'éditer le port du serveur</string>
+ <string name="SettingsAdvancedSpecOpt">Cochez cette option pour utiliser un serveur spécifique </string>
+ <string name="SettingsAdvancedAddOpt">Saisissez l\'adresse du serveur à joindre</string>
+ <string name="SettingsAdvancedPortOpt">Saisissez le port du serveur</string>
<!-- Subscription class -->
<string name="SubscriptAccept">Inscription acceptée</string>
@@ -170,7 +170,7 @@
<string name="settings_menu_login">Se connecter</string>
<string name="settings_saved_ok">Les paramètres ont été enregistrés avec succès.</string>
<string name="settings_filename">beem_settings</string>
- <string name="settings_reco_delay">Délai de reconnexion</string>
+
<string name="settings_key_account_username">beem_account_username</string>
<string name="settings_key_account_password">beem_account_password</string>
<string name="settings_key_xmpp_server">beem_xmpp_server</string>
@@ -182,7 +182,15 @@
<string name="settings_key_proxy_username">beem_xmpp_proxy_username</string>
<string name="settings_key_proxy_password">beem_xmpp_proxy_password</string>
<string name="settings_key_proxy_type">beem_xmpp_proxy_type</string>
+ <string name="settings_key_hidden_contact">settings_key_hidden_contact</string>
+ <!-- EditSettings Activity Categories -->
+ <string name="general_preferences">Préférences de l\'application</string>
+ <string name="user_preferences">Utilisateur</string>
+ <string name="network_preferences">Options réseau</string>
+ <string name="proxy_proxy_settings">Paramètres du proxy</string>
+ <string name="proxy_user_settings">Identifiant proxy</string>
+
<!-- EditSettings Activity tabs -->
<string name="settings_tab_tag_account">edit_settings_tab_account</string>
<string name="settings_tab_label_account">Compte</string>
@@ -191,18 +199,29 @@
<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
<string name="settings_tab_label_proxy">Proxy</string>
+ <!-- EditSettings Activity General Preferences Tabs -->
+ <string name="contact_list_preferences">Liste d\'ami(e)s</string>
+ <string name="contact_list_preferences_sum">Une série d\'options d\'affichage de votre liste d\'ami(e)s</string>
+ <string name="CLP_hidden_contact">Caché(e)s</string>
+ <string name="CLP_hidden_contact_sum">Cochez cette option pour cacher les ami(e)s déconnecté(e)s</string>
+
<!-- EditSettings Activity Account tab -->
<string name="settings_account_username">Nom d\'utilisateur</string>
<string name="settings_account_password">Mot de passe</string>
<string name="settings_account_server">Serveur</string>
<string name="settings_account_port">Port</string>
- <!-- EditSettings Activity XMPP tab -->
+ <!-- EditSettings Activity Advanced Options tab -->
+ <string name="settings_advanced_service_behaviour">Comportement du service</string>
+ <string name="settings_advanced_sum">Une série d\'options pour les utilisateurs avertis</string>
<string name="settings_xmpp_server">Serveur</string>
<string name="settings_xmpp_port">Port</string>
<string name="settings_xmpp_use_tls">Utiliser SSL/TLS</string>
+ <string name="settings_reco_delay">Délai de reconnexion</string>
+
<!-- EditSettings Activity Proxy tab -->
+ <string name="settings_proxy_sum">Paramètrez un serveur proxy</string>
<string name="settings_proxy_use">Utiliser un proxy</string>
<string name="settings_proxy_type_prompt">Choisir un type de proxy</string>
<string name="settings_proxy_server">Serveur</string>
--- a/res/values/strings.xml Fri Nov 06 19:28:02 2009 +0100
+++ b/res/values/strings.xml Fri Nov 06 19:38:17 2009 +0100
@@ -78,25 +78,25 @@
<string name="ChangeStatusNoChange">Nothing to change</string>
<!-- Settings class -->
- <string name="SettingsText">Modify my username</string>
- <string name="SettingsPassword">Modify my password</string>
+ <string name="SettingsText">Edit your username</string>
+ <string name="SettingsPassword">Edit your password</string>
<string name="SettingsCheckboxText">Using Gmail</string>
<string name="SettingsGmail">Use my Gmail account</string>
<string name="SettingsProxy">Proxy</string>
<string name="SettingsProxyProxy">Use a proxy server</string>
- <string name="SettingsProxySummary">Check this box if you\'re behind a proxy server</string>
+ <string name="SettingsProxySummary">Login through a proxy server</string>
<string name="SettingsProxyType">Protocol</string>
<string name="SettingsProxyTypeSummary">Choose the proxy server type</string>
- <string name="SettingsProxyServer">Address definition of the proxy server</string>
- <string name="SettingsProxyPort">Port definition of the proxy server</string>
+ <string name="SettingsProxyServer">Edit proxy server address</string>
+ <string name="SettingsProxyPort">Edit proxy server port</string>
<string name="SettingsProxyUser">Optional, allow to authenticate yourself on the proxy server</string>
<string name="SettingsProxyPassword">Optional, allow to authenticate yourself on the proxy server</string>
<string name="SettingsAdvanced">Advanced</string>
- <string name="SettingsAdvancedOptions">Use specific server option</string>
+ <string name="SettingsAdvancedOptions">Specific server option</string>
<string name="SettingsAdvancedRecoDelay">Modify reconnection delay</string>
<string name="SettingsAdvancedSpecOpt">Check this box if you want to use a specific server for your connection</string>
- <string name="SettingsAdvancedAddOpt">Allow to edit the server address</string>
- <string name="SettingsAdvancedPortOpt">Allow to edit the server port</string>
+ <string name="SettingsAdvancedAddOpt">Edit the server address</string>
+ <string name="SettingsAdvancedPortOpt">Edit the server port</string>
<!-- Subscription class -->
<string name="SubscriptAccept">Subscription accepted</string>
@@ -116,14 +116,8 @@
<!-- XmppConnectionAdapter class -->
<string name="AcceptContactRequest">Accept contact request</string>
<string name="AcceptContactRequestFrom">Accept contact request from </string>
-
- <!--
- Services
- -->
- <!--
- Activities
- -->
+ <!-- Activities -->
<string name="login_tag">Beem - Login Activity</string>
<string name="edit_settings_name">Beem - Settings</string>
<string name="edit_settings_tag">Beem - EditSettings Activity</string>
@@ -133,20 +127,14 @@
<string name="contact_list_tag">Beem - ContactList Activity</string>
<string name="user_info_name">Beem - User Info</string>
-
- <!--
- Buttons
- -->
+ <!-- Buttons -->
<string name="button_reset">Reset</string>
<string name="button_login">Login</string>
<string name="button_save">Save</string>
<string name="button_create_account">Create this account</string>
<string name="button_create_login_account">Create and log</string>
-
-
- <!--
- LogAs Activity
- -->
+
+ <!-- LogAs Activity -->
<string name="login_username">Username</string>
<string name="login_password">Password</string>
<string name="login_error_dialog_title">Login - Error</string>
@@ -164,15 +152,13 @@
<string name="login_login_progress">Connecting. Please wait...</string>
<string name="login_max_retry">Max retry</string>
<string name="login_error_msg">Unfortunately, an error occured.\n\nError detail:\n%s</string>
-
- <!--
- EditSettings Activity
- -->
+
+ <!-- EditSettings Activity -->
<string name="settings_menu_create_account">Create an account</string>
<string name="settings_menu_login">Login</string>
<string name="settings_saved_ok">The settings have been saved successfully.</string>
<string name="settings_filename">beem_settings</string>
- <string name="settings_reco_delay">Reconnection delay</string>
+
<string name="settings_key_account_username">beem_account_username</string>
<string name="settings_key_account_password">beem_account_password</string>
<string name="settings_key_xmpp_server">beem_xmpp_server</string>
@@ -184,27 +170,45 @@
<string name="settings_key_proxy_username">beem_xmpp_proxy_username</string>
<string name="settings_key_proxy_password">beem_xmpp_proxy_password</string>
<string name="settings_key_proxy_type">beem_xmpp_proxy_type</string>
+ <string name="settings_key_hidden_contact">settings_key_hidden_contact</string>
- <!-- EditSettings Activity tabs -->
+ <!-- EditSettings Activity Categories -->
+ <string name="general_preferences">General preferences</string>
+ <string name="user_preferences">User settings</string>
+ <string name="network_preferences">Network options</string>
+ <string name="proxy_proxy_settings">Proxy settings</string>
+ <string name="proxy_user_settings">Proxy settings</string>
+
+ <!-- EditSettings Activity Tabs -->
<string name="settings_tab_tag_account">edit_settings_tab_account</string>
<string name="settings_tab_label_account">Account</string>
<string name="settings_tab_tag_xmpp">edit_settings_tab_xmpp</string>
<string name="settings_tab_label_xmpp">XMPP</string>
<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
<string name="settings_tab_label_proxy">Proxy</string>
-
+
+ <!-- EditSettings Activity General Preferences Tabs -->
+ <string name="contact_list_preferences">Buddy list</string>
+ <string name="contact_list_preferences_sum">A set of display options for your buddy list</string>
+ <string name="CLP_hidden_contact">Hidden</string>
+ <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies</string>
+
<!-- EditSettings Activity Account tab -->
<string name="settings_account_username">Username</string>
<string name="settings_account_password">Password</string>
<string name="settings_account_server">Server</string>
<string name="settings_account_port">Port</string>
-
- <!-- EditSettings Activity XMPP tab -->
- <string name="settings_xmpp_server">Server</string>
+
+ <!-- EditSettings Activity Advanced Options tab -->
+ <string name="settings_advanced_service_behaviour">Service behaviour</string>
+ <string name="settings_advanced_sum">A set of options for advanced users</string>
+ <string name="settings_xmpp_server">Address</string>
<string name="settings_xmpp_port">Port</string>
<string name="settings_xmpp_use_tls">Require SSL/TLS</string>
-
+ <string name="settings_reco_delay">Reconnection delay</string>
+
<!-- EditSettings Activity Proxy tab -->
+ <string name="settings_proxy_sum">Settings for proxy usage</string>
<string name="settings_proxy_use">Connect using a proxy</string>
<string name="settings_proxy_type_prompt">Choose a type of proxy</string>
<string name="settings_proxy_server">Server</string>
@@ -212,9 +216,7 @@
<string name="settings_proxy_username">Username</string>
<string name="settings_proxy_password">Password</string>
- <!--
- Create an account Activity
- -->
+ <!-- Create an account Activity -->
<string name="create_account_instr_dialog_title">Create an account - Instructions</string>
<string name="create_account_err_dialog_title">Create an account - Error</string>
<string name="create_account_err_dialog_settings_button">Change my settings</string>
@@ -226,27 +228,23 @@
<string name="create_account_password">Password</string>
<string name="create_account_confirm_password">Confirm password</string>
- <!--
- ContactList Activity
- -->
+ <!-- ContactList Activity -->
<string name="contact_list_menu_add_contact">Add a contact</string>
<string name="contact_list_menu_settings">Settings</string>
<string name="contact_list_all_contact">All contacts</string>
<string name="contact_list_no_group">No group</string>
- <!--
- UserInfo Activity
- -->
+ <!-- UserInfo Activity -->
<string name="userinfo_label_alias">Alias</string>
<string name="userinfo_label_chg_group">Manage groups</string>
<string name="userinfo_label_re_suscription">Resend invit</string>
<string name="userinfo_label_block">Block</string>
<string name="userinfo_label_delete">Delete</string>
<string name="userinfo_resend">Suscription resend</string>
- <string name="userinfo_sure2delete">Are you sure you want to delete this contact?</string>
+ <string name="userinfo_sure2delete">Are you sure you want to delete this contact ?</string>
<string name="userinfo_yes">Yes</string>
<string name="userinfo_no">No</string>
- <string name="userinfo_sureresend">Are you sure you want to resend invit?</string>
+ <string name="userinfo_sureresend">Are you sure you want to resend invit ?</string>
<string name="chat_name">Beem - Chat</string>
<string name="chat_input_default_value">Type your message</string>
--- a/src/com/beem/project/beem/ui/ContactList.java Fri Nov 06 19:28:02 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java Fri Nov 06 19:38:17 2009 +0100
@@ -15,6 +15,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
+import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
@@ -23,6 +24,7 @@
import android.os.Handler;
import android.os.IBinder;
import android.os.RemoteException;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -53,6 +55,7 @@
public class ContactList extends Activity {
//private static final String TAG = "CONTACTLIST_ACT";
+ private static final boolean DEFAULT_BOOLEAN_VALUE = false;
private static final Intent SERVICE_INTENT = new Intent();
private static final int REQUEST_CODE = 1;
private BeemContactList mAdapterContactList;
@@ -64,6 +67,7 @@
private String mCurGroup;
private Handler mHandler;
private IXmppFacade mXmppFacade;
+ private SharedPreferences mSettings;
private final ServiceConnection mServConn = new BeemServiceConnection();
private BeemBroadcastReceiver mReceiver;
private Map<Integer, Bitmap> mIconsMap = new HashMap<Integer, Bitmap>();
@@ -85,6 +89,7 @@
@Override
protected void onCreate(Bundle saveBundle) {
super.onCreate(saveBundle);
+ mSettings = getSharedPreferences(getString(R.string.settings_filename), MODE_PRIVATE);
setContentView(R.layout.contactlist);
mAdapterContactList = new BeemContactList(this);
mAdapterBanner = new BeemBanner(this);
@@ -301,6 +306,11 @@
/**
* Prepare Bitmap Map.
*/
+
+ private boolean getRegisteredContactHidden() {
+ return mSettings.getBoolean(getString(R.string.settings_key_hidden_contact), DEFAULT_BOOLEAN_VALUE);
+ }
+
private void prepareIconsStatus(){
mIconsMap.put(Status.CONTACT_STATUS_AVAILABLE, BitmapFactory.decodeResource(getResources(), R.drawable.status_available));
mIconsMap.put(Status.CONTACT_STATUS_AVAILABLE_FOR_CHAT, BitmapFactory.decodeResource(getResources(), R.drawable.status_available));
@@ -642,10 +652,10 @@
for (String s : tmpGroupList) {
List<Contact> tmpList = new ArrayList<Contact>();
for (Contact c : tmpContactList) {
- if (c.getGroups().size() == 0 && !tmpNoGroup.contains(c))
- tmpNoGroup.add(c);
- else if (c.getGroups().contains(s))
- tmpList.add(c);
+ if (c.getGroups().size() == 0 && !tmpNoGroup.contains(c))
+ tmpNoGroup.add(c);
+ else if (c.getGroups().contains(s))
+ tmpList.add(c);
}
mContactOnGroup.put(s, tmpList);
}