# HG changeset patch
# User nikita@nikita-laptop
# Date 1260907971 -3600
# Node ID 9c08b0277c58ace0cbe386890b177ae808822494
# Parent 1536b38818096e2ad471406e5fd4eeda858e1aac
adding a button to return to the contact list
diff -r 1536b3881809 -r 9c08b0277c58 .classpath
--- a/.classpath Tue Dec 15 16:26:29 2009 +0100
+++ b/.classpath Tue Dec 15 21:12:51 2009 +0100
@@ -1,29 +1,29 @@
-
-
-
+
+
+
-
-
+
-
+
-
+
-
+
+
diff -r 1536b3881809 -r 9c08b0277c58 default.properties
--- 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=
diff -r 1536b3881809 -r 9c08b0277c58 res/layout/changestatus.xml
--- 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" />
+
diff -r 1536b3881809 -r 9c08b0277c58 res/values-fr/strings.xml
--- 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 @@
Beem - Changer mon statut
-
Mon statutMon message personnel
+ Ouvrir la liste des contactes
+
+
Ajouter un nouveau contactBeem ProjectCréer un compte
@@ -289,7 +291,7 @@
ContactsGroupesSupprimer
- Souhaitez-vous vraiment supprimer la liste privée intitulée \'%s\'
+ Souhaitez-vous vraiment supprimer la liste privée intitulée '%s' ?OuiNon
diff -r 1536b3881809 -r 9c08b0277c58 res/values/strings.xml
--- 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 @@
No status set
+ Beem - Change my statusMy statusMy personal message
+ Open contact list
- Beem - Change my status
+
Add new contactBeem ProjectCreate account
@@ -273,7 +275,7 @@
BuddiesGroupsDelete
- Do you really want to delete the privacy list entitled \'%s\' ?
+ Do you really want to delete the privacy list entitled '%s' ?YesNo
diff -r 1536b3881809 -r 9c08b0277c58 src/com/beem/project/beem/ui/ChangeStatus.java
--- 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));
}
}
}
diff -r 1536b3881809 -r 9c08b0277c58 src/com/beem/project/beem/ui/PrivacyList.java
--- 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
- * . 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 .
+
+ 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;