--- a/.classpath Tue Dec 15 16:26:29 2009 +0100
+++ b/.classpath Tue Dec 15 21:12:51 2009 +0100
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry exported="true" kind="lib" path="libs/smackx-debug.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/smackx-jingle.jar" sourcepath="/home/nikita/devel/smack">
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="lib" path="libs/smackx-debug.jar"/>
+ <classpathentry kind="lib" path="libs/smackx-jingle.jar" sourcepath="/home/nikita/devel/smack">
<attributes>
<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
</attributes>
</classpathentry>
- <classpathentry exported="true" kind="lib" path="libs/security.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/smack.jar" sourcepath="/home/marseille/smack_src_3_1_0/source">
+ <classpathentry kind="lib" path="libs/smack.jar" sourcepath="/home/marseille/smack_src_3_1_0/source">
<attributes>
<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/org/"/>
</attributes>
</classpathentry>
- <classpathentry exported="true" kind="lib" path="libs/smackx.jar" sourcepath="/home/nikita/devel/smack">
+ <classpathentry kind="lib" path="libs/smackx.jar" sourcepath="/home/nikita/devel/smack">
<attributes>
<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
</attributes>
</classpathentry>
- <classpathentry exported="true" kind="lib" path="libs/jlibrtp.jar">
+ <classpathentry kind="lib" path="libs/jlibrtp.jar">
<attributes>
<attribute name="javadoc_location" value="file:/home/nikita/android/docs/reference/"/>
</attributes>
</classpathentry>
- <classpathentry excluding="com/beem/project/beem/ui/pref.java" kind="src" path="src"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
+ <classpathentry kind="lib" path="libs/security.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
--- a/default.properties Tue Dec 15 16:26:29 2009 +0100
+++ b/default.properties Tue Dec 15 21:12:51 2009 +0100
@@ -10,5 +10,5 @@
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
-target=android-5
+target=android-3
apk-configurations=
--- a/res/layout/changestatus.xml Tue Dec 15 16:26:29 2009 +0100
+++ b/res/layout/changestatus.xml Tue Dec 15 21:12:51 2009 +0100
@@ -34,5 +34,9 @@
android:textStyle="bold" android:textColor="#333333"
android:textSize="18sp" />
</LinearLayout>
+ <Button android:id="@+id/OpenContactList" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="@string/OpenContactList"
+ android:layout_below="@+id/ChangeStatusButtons" android:textStyle="bold" android:textColor="#333333"
+ android:textSize="18sp" />
</RelativeLayout>
</ScrollView>
--- a/res/values-fr/strings.xml Tue Dec 15 16:26:29 2009 +0100
+++ b/res/values-fr/strings.xml Tue Dec 15 21:12:51 2009 +0100
@@ -68,9 +68,11 @@
<!-- ChangeStatus class -->
<string name="ChangeStatusActTitle">Beem - Changer mon statut</string>
-
<string name="ChangeStatusType">Mon statut</string>
<string name="ChangeStatusMessage">Mon message personnel</string>
+ <string name="OpenContactList">Ouvrir la liste des contactes</string>
+
+
<string name="MenuAddContact">Ajouter un nouveau contact</string>
<string name="MenuAccountAbout">Beem Project</string>
<string name="MenuAccountCreate">Créer un compte</string>
@@ -289,7 +291,7 @@
<string name="privacy_list_select_dialog_buddies">Contacts</string>
<string name="privacy_list_select_dialog_groups">Groupes</string>
<string name="privacy_list_select_dialog_delete">Supprimer</string>
- <string name="privacy_list_delete_dialog_msg">Souhaitez-vous vraiment supprimer la liste privée intitulée \'%s\'</string>
+ <string name="privacy_list_delete_dialog_msg">Souhaitez-vous vraiment supprimer la liste privée intitulée '%s' ?</string>
<string name="privacy_list_delete_dialog_yes">Oui</string>
<string name="privacy_list_delete_dialog_no">Non</string>
--- a/res/values/strings.xml Tue Dec 15 16:26:29 2009 +0100
+++ b/res/values/strings.xml Tue Dec 15 21:12:51 2009 +0100
@@ -67,10 +67,12 @@
<string name="SendIMNoStatusSet">No status set</string>
<!-- ChangeStatus class -->
+ <string name="ChangeStatusActTitle">Beem - Change my status</string>
<string name="ChangeStatusType">My status</string>
<string name="ChangeStatusMessage">My personal message</string>
+ <string name="OpenContactList">Open contact list</string>
- <string name="ChangeStatusActTitle">Beem - Change my status</string>
+
<string name="MenuAddContact">Add new contact</string>
<string name="MenuAccountAbout">Beem Project</string>
<string name="MenuAccountCreate">Create account</string>
@@ -273,7 +275,7 @@
<string name="privacy_list_select_dialog_buddies">Buddies</string>
<string name="privacy_list_select_dialog_groups">Groups</string>
<string name="privacy_list_select_dialog_delete">Delete</string>
- <string name="privacy_list_delete_dialog_msg">Do you really want to delete the privacy list entitled \'%s\' ?</string>
+ <string name="privacy_list_delete_dialog_msg">Do you really want to delete the privacy list entitled '%s' ?</string>
<string name="privacy_list_delete_dialog_yes">Yes</string>
<string name="privacy_list_delete_dialog_no">No</string>
--- a/src/com/beem/project/beem/ui/ChangeStatus.java Tue Dec 15 16:26:29 2009 +0100
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java Tue Dec 15 21:12:51 2009 +0100
@@ -70,15 +70,10 @@
import com.beem.project.beem.utils.BeemBroadcastReceiver;
import com.beem.project.beem.utils.Status;
-// TODO: Auto-generated Javadoc
/**
* This Activity is used to change the status.
* @author nikita
*/
-/**
- * @author nikita
- *
- */
public class ChangeStatus extends Activity {
private static final Intent SERVICE_INTENT = new Intent();
@@ -97,6 +92,7 @@
private Toast mToast;
private Button mOk;
private Button mClear;
+ private Button mContact;
private Spinner mSpinner;
private SharedPreferences mSettings;
@@ -126,6 +122,9 @@
mClear = (Button) findViewById(R.id.ChangeStatusClear);
mClear.setOnClickListener(mOnClickOk);
+
+ mContact = (Button) findViewById(R.id.OpenContactList);
+ mContact.setOnClickListener(mOnClickOk);
mSettings = PreferenceManager.getDefaultSharedPreferences(this);
mStatusMessageEditText = (EditText) findViewById(R.id.ChangeStatusMessage);
@@ -283,6 +282,8 @@
ChangeStatus.this.finish();
} else if (v == mClear) {
mStatusMessageEditText.setText(null);
+ } else if (v == mContact) {
+ startActivity(new Intent(ChangeStatus.this, ContactList.class));
}
}
}
--- a/src/com/beem/project/beem/ui/PrivacyList.java Tue Dec 15 16:26:29 2009 +0100
+++ b/src/com/beem/project/beem/ui/PrivacyList.java Tue Dec 15 21:12:51 2009 +0100
@@ -1,17 +1,46 @@
/*
- * BEEM is a videoconference application on the Android Platform. Copyright (C) 2009 by Frederic-Charles Barthelery,
- * Jean-Manuel Da Silva, Nikita Kozlov, Philippe Lago, Jean Baptiste Vergely, Vincent Véronis. This file is part of
- * BEEM. BEEM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later
- * version. BEEM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with BEEM. If not, see
- * <http://www.gnu.org/licenses/>. Please send bug reports with examples or suggestions to contact@beem-project.com or
- * http://dev.beem-project.com/ Epitech, hereby disclaims all copyright interest in the program “Beem” written by
- * Frederic-Charles Barthelery, Jean-Manuel Da Silva, Nikita Kozlov, Philippe Lago, Jean Baptiste Vergely, Vincent
- * Veronis. Nicolas Sadirac, November 26, 2009 President of Epitech. Flavien Astraud, November 26, 2009 Head of the EIP
- * Laboratory.
- */
+ BEEM is a videoconference application on the Android Platform.
+
+ Copyright (C) 2009 by Frederic-Charles Barthelery,
+ Jean-Manuel Da Silva,
+ Nikita Kozlov,
+ Philippe Lago,
+ Jean Baptiste Vergely,
+ Vincent Veronis.
+
+ This file is part of BEEM.
+
+ BEEM is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ BEEM is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with BEEM. If not, see <http://www.gnu.org/licenses/>.
+
+ Please send bug reports with examples or suggestions to
+ contact@beem-project.com or http://dev.beem-project.com/
+
+ Epitech, hereby disclaims all copyright interest in the program "Beem"
+ written by Frederic-Charles Barthelery,
+ Jean-Manuel Da Silva,
+ Nikita Kozlov,
+ Philippe Lago,
+ Jean Baptiste Vergely,
+ Vincent Veronis.
+
+ Nicolas Sadirac, November 26, 2009
+ President of Epitech.
+
+ Flavien Astraud, November 26, 2009
+ Head of the EIP Laboratory.
+
+*/
package com.beem.project.beem.ui;
import java.util.ArrayList;