# HG changeset patch
# User nikita@localhost
# Date 1245916951 -7200
# Node ID b952180fd935319a7f2689e9a60238e11a596c90
# Parent c7c1827fa960f9edd397ebe5ca77f689edcf1ec8# Parent c7c77413f8f2de7d1e95a807f8bc3f9a3270f7cb
merge
diff -r c7c1827fa960 -r b952180fd935 res/layout/contactdialogaliasdialog.xml
--- a/res/layout/contactdialogaliasdialog.xml Wed Jun 24 21:53:44 2009 +0200
+++ b/res/layout/contactdialogaliasdialog.xml Thu Jun 25 10:02:31 2009 +0200
@@ -4,7 +4,8 @@
android:layout_height="fill_parent">
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:singleLine="true" android:maxLines="1" />
diff -r c7c1827fa960 -r b952180fd935 res/layout/contactlistcontact.xml
--- a/res/layout/contactlistcontact.xml Wed Jun 24 21:53:44 2009 +0200
+++ b/res/layout/contactlistcontact.xml Thu Jun 25 10:02:31 2009 +0200
@@ -14,7 +14,8 @@
android:layout_height="wrap_content">
+ android:paddingLeft="20sp" android:singleLine="true"
+ android:maxLines="1" />
+
Beem - Chat
- %s says :\n
- You say :\n
+ %s says :\n%s\n
+ You say :\n%s\n
+ %s\n
Tip text here
Is :
+ Error : %s\n
and is speaking from :
Insert a smiley
login
diff -r c7c1827fa960 -r b952180fd935 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java Wed Jun 24 21:53:44 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java Thu Jun 25 10:02:31 2009 +0200
@@ -208,10 +208,6 @@
mHandler.post(new RunnableChange());
}
- /**
- * TODO: sur la suppression de contact, on passe tt le temps dans entries updated ... probleme comment
- * reconnaitre si on supprime ou ajoute un contact ....
- */
@Override
public void onEntriesUpdated(List addresses) throws RemoteException {
Log.d("CONTACTLIST", "DEBUG - ONENTRIESUPDATED()");
@@ -374,12 +370,11 @@
v.setText(curContact.getMsgState());
}
- // TODO: Rajouter l'avatar du contact getAvatar() dans la classe
- imgV = (ImageView) view.findViewById(R.id.contactlistavatar);
- if (imgV != null) {
- imageDrawable = getResources().getDrawable(R.drawable.avatar);
- imgV.setImageDrawable(imageDrawable);
- }
+ /*
+ * TODO: Rajouter l'avatar du contact getAvatar() dans la classe imgV = (ImageView)
+ * view.findViewById(R.id.contactlistavatar); if (imgV != null) { imageDrawable =
+ * getResources().getDrawable(R.drawable.avatar); imgV.setImageDrawable(imageDrawable); }
+ */
}
}
diff -r c7c1827fa960 -r b952180fd935 src/com/beem/project/beem/ui/SendIM.java
--- a/src/com/beem/project/beem/ui/SendIM.java Wed Jun 24 21:53:44 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java Thu Jun 25 10:02:31 2009 +0200
@@ -62,6 +62,7 @@
private IChat mChat;
private TextView mText;
private TextView mLogin;
+ private TextView mChatState;
private ScrollView mScrolling;
private char mSpeak;
@@ -102,6 +103,7 @@
mToSend.setOnClickListener(this);
mToSend.setOnKeyListener(this);
mLogin = (TextView) findViewById(R.id.sendimlogin);
+ mChatState = (TextView) findViewById(R.id.sendimchatstate);
try {
mContact = new Contact(getIntent().getData());
if (mRoster != null)
@@ -305,11 +307,11 @@
// INTERDICTION !
mChat.sendMessage(msg);
if (mSpeak != 1)
- mText
- .append(getString(R.string.SendIMYouSay) + text
- + '\n');
+ mText.append(String.format(
+ getString(R.string.SendIMYouSay), text));
else
- mText.append(text + "\n");
+ mText.append(String.format(
+ getString(R.string.SendIMSameSpeaker), text));
mToSend.setText(null);
mScrolling.fullScroll(ScrollView.FOCUS_DOWN);
mToSend.requestFocus();
@@ -333,17 +335,25 @@
String from = message.getFrom();
if (from == null) {
if (mSpeak != 1)
- mText.append(getString(R.string.SendIMYouSay));
+ mText.append(String
+ .format(getString(R.string.SendIMYouSay), message
+ .getBody()));
+ else
+ mText.append(String.format(
+ getString(R.string.SendIMSameSpeaker), message
+ .getBody()));
mSpeak = 1;
} else {
if (mSpeak != 2) {
String str = String.format(getString(R.string.SendIMSays),
- mContactName);
+ mContactName, message.getBody());
mText.append(str);
- }
+ } else
+ mText.append(String.format(
+ getString(R.string.SendIMSameSpeaker), message
+ .getBody()));
mSpeak = 2;
}
- mText.append(message.getBody() + '\n');
}
mScrolling.fullScroll(ScrollView.FOCUS_DOWN);
}
@@ -424,12 +434,12 @@
}
@Override
- public void onEntryDeleteFromGroup(String group, String jid) throws RemoteException {
+ public void onEntryDeleteFromGroup(String group, String jid)
+ throws RemoteException {
// TODO Auto-generated method stub
-
+
}
-
}
/**
@@ -448,19 +458,27 @@
if (chat != mChat)
return;
final Message m = msg;
+ Log.d("Message Type", "Le type du message : " + m.getType());
mHandler.post(new Runnable() {
@Override
public void run() {
if (m.getBody() != null) {
- if (mSpeak == 2)
- mText.append(m.getBody() + "\n");
+ if (m.getType() == Message.MSG_TYPE_ERROR) {
+ mText.append(String.format(
+ getString(R.string.SendIMErrorMsg), m
+ .getBody()));
+ mSpeak = 0;
+ } else if (mSpeak == 2)
+ mText.append(String.format(
+ getString(R.string.SendIMSameSpeaker), m
+ .getBody()));
else {
-
- String str = String
- .format(getString(R.string.SendIMSays), mContactName);
+
+ String str = String.format(
+ getString(R.string.SendIMSays),
+ mContactName, m.getBody());
mText.append(str);
- mText.append(m.getBody() + "\n");
}
mScrolling.fullScroll(ScrollView.FOCUS_DOWN);
mToSend.requestFocus();
@@ -475,8 +493,18 @@
*/
@Override
public void stateChanged(IChat chat) throws RemoteException {
- // TODO: a integrer dans l'ui
- // Log.d(TAG, "state changed");
+ if (chat != mChat)
+ return;
+ final String state = chat.getState();
+ Log.d("ChatState", "Action du correspondant : <--- "
+ + chat.getState() + " --->");
+ mHandler.post(new Runnable() {
+
+ @Override
+ public void run() {
+ mChatState.setText(state);
+ }
+ });
}
}