# HG changeset patch # User dasilvj # Date 1255621011 -7200 # Node ID 17300b201cf5190b24dbf4dd7b8a502e863fa2d2 # Parent 85b344154ede121ee240e0555a1319108ef4b92f Modification de l'UI de la contact list et de sendim. Ajout d'icons et de formes. Correction de certains petits bogues dans sendim. diff -r 85b344154ede -r 17300b201cf5 res/drawable/away.png Binary file res/drawable/away.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_add.png Binary file res/drawable/ic_menu_add.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_agenda.png Binary file res/drawable/ic_menu_agenda.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_allfriends.png Binary file res/drawable/ic_menu_allfriends.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_always_landscape_portrait.png Binary file res/drawable/ic_menu_always_landscape_portrait.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_archive.png Binary file res/drawable/ic_menu_archive.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_attachment.png Binary file res/drawable/ic_menu_attachment.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_back.png Binary file res/drawable/ic_menu_back.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_block.png Binary file res/drawable/ic_menu_block.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_blocked_user.png Binary file res/drawable/ic_menu_blocked_user.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_call.png Binary file res/drawable/ic_menu_call.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_camera.png Binary file res/drawable/ic_menu_camera.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_cc.png Binary file res/drawable/ic_menu_cc.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_chat_dashboard.png Binary file res/drawable/ic_menu_chat_dashboard.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_clear_playlist.png Binary file res/drawable/ic_menu_clear_playlist.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_close_clear_cancel.png Binary file res/drawable/ic_menu_close_clear_cancel.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_compass.png Binary file res/drawable/ic_menu_compass.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_compose.png Binary file res/drawable/ic_menu_compose.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_crop.png Binary file res/drawable/ic_menu_crop.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_day.png Binary file res/drawable/ic_menu_day.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_delete.png Binary file res/drawable/ic_menu_delete.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_directions.png Binary file res/drawable/ic_menu_directions.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_edit.png Binary file res/drawable/ic_menu_edit.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_emoticons.png Binary file res/drawable/ic_menu_emoticons.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_end_conversation.png Binary file res/drawable/ic_menu_end_conversation.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_forward.png Binary file res/drawable/ic_menu_forward.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_friendslist.png Binary file res/drawable/ic_menu_friendslist.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_gallery.png Binary file res/drawable/ic_menu_gallery.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_goto.png Binary file res/drawable/ic_menu_goto.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_help.png Binary file res/drawable/ic_menu_help.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_home.png Binary file res/drawable/ic_menu_home.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_info_details.png Binary file res/drawable/ic_menu_info_details.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_invite.png Binary file res/drawable/ic_menu_invite.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_login.png Binary file res/drawable/ic_menu_login.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_manage.png Binary file res/drawable/ic_menu_manage.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_mapmode.png Binary file res/drawable/ic_menu_mapmode.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_mark.png Binary file res/drawable/ic_menu_mark.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_month.png Binary file res/drawable/ic_menu_month.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_more.png Binary file res/drawable/ic_menu_more.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_my_calendar.png Binary file res/drawable/ic_menu_my_calendar.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_mylocation.png Binary file res/drawable/ic_menu_mylocation.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_myplaces.png Binary file res/drawable/ic_menu_myplaces.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_notifications.png Binary file res/drawable/ic_menu_notifications.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_play_clip.png Binary file res/drawable/ic_menu_play_clip.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_preferences.png Binary file res/drawable/ic_menu_preferences.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_recent_history.png Binary file res/drawable/ic_menu_recent_history.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_refresh.png Binary file res/drawable/ic_menu_refresh.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_report_image.png Binary file res/drawable/ic_menu_report_image.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_revert.png Binary file res/drawable/ic_menu_revert.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_rotate.png Binary file res/drawable/ic_menu_rotate.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_save.png Binary file res/drawable/ic_menu_save.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_search.png Binary file res/drawable/ic_menu_search.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_send.png Binary file res/drawable/ic_menu_send.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_set_as.png Binary file res/drawable/ic_menu_set_as.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_share.png Binary file res/drawable/ic_menu_share.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_slideshow.png Binary file res/drawable/ic_menu_slideshow.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_sort_alphabetically.png Binary file res/drawable/ic_menu_sort_alphabetically.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_sort_by_size.png Binary file res/drawable/ic_menu_sort_by_size.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_star.png Binary file res/drawable/ic_menu_star.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_start_conversation.png Binary file res/drawable/ic_menu_start_conversation.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_stop.png Binary file res/drawable/ic_menu_stop.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_today.png Binary file res/drawable/ic_menu_today.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_upload.png Binary file res/drawable/ic_menu_upload.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_upload_you_tube.png Binary file res/drawable/ic_menu_upload_you_tube.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_view.png Binary file res/drawable/ic_menu_view.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_week.png Binary file res/drawable/ic_menu_week.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/ic_menu_zoom.png Binary file res/drawable/ic_menu_zoom.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/invisible.png Binary file res/drawable/invisible.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/offline.png Binary file res/drawable/offline.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/shape_border_green.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/drawable/shape_border_green.xml Thu Oct 15 17:36:51 2009 +0200 @@ -0,0 +1,7 @@ + + + + + + diff -r 85b344154ede -r 17300b201cf5 res/drawable/shape_line_green.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/drawable/shape_line_green.xml Thu Oct 15 17:36:51 2009 +0200 @@ -0,0 +1,7 @@ + + + + + diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_available.png Binary file res/drawable/status_available.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_away.png Binary file res/drawable/status_away.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_blocked.png Binary file res/drawable/status_blocked.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_dnd.png Binary file res/drawable/status_dnd.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_error.png Binary file res/drawable/status_error.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_idle.png Binary file res/drawable/status_idle.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_invisible.png Binary file res/drawable/status_invisible.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_new_message.png Binary file res/drawable/status_new_message.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_offline.png Binary file res/drawable/status_offline.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_requested.png Binary file res/drawable/status_requested.png has changed diff -r 85b344154ede -r 17300b201cf5 res/drawable/status_typing.png Binary file res/drawable/status_typing.png has changed diff -r 85b344154ede -r 17300b201cf5 res/layout/contactlist.xml --- a/res/layout/contactlist.xml Fri Oct 09 16:56:20 2009 +0200 +++ b/res/layout/contactlist.xml Thu Oct 15 17:36:51 2009 +0200 @@ -4,12 +4,24 @@ android:orientation="vertical"> + android:id="@+id/contactlist_banner" + android:layout_width="fill_parent" + android:layout_height="42px" + android:spacing="42px" + android:unselectedAlpha="0.4" + android:background="#222222" /> + + - + diff -r 85b344154ede -r 17300b201cf5 res/layout/contactlistcontact.xml --- a/res/layout/contactlistcontact.xml Fri Oct 09 16:56:20 2009 +0200 +++ b/res/layout/contactlistcontact.xml Thu Oct 15 17:36:51 2009 +0200 @@ -1,12 +1,16 @@ + android:layout_height="wrap_content" + android:paddingLeft="10px" + android:paddingRight="10px" + android:paddingTop="4px" + android:paddingBottom="4px" + android:gravity="center_vertical"> - - - - \ No newline at end of file + diff -r 85b344154ede -r 17300b201cf5 res/layout/group_list.xml --- a/res/layout/group_list.xml Fri Oct 09 16:56:20 2009 +0200 +++ b/res/layout/group_list.xml Thu Oct 15 17:36:51 2009 +0200 @@ -8,6 +8,8 @@ android:stackFromBottom="true" android:transcriptMode="normal" /> \ No newline at end of file diff -r 85b344154ede -r 17300b201cf5 res/layout/login.xml --- a/res/layout/login.xml Fri Oct 09 16:56:20 2009 +0200 +++ b/res/layout/login.xml Thu Oct 15 17:36:51 2009 +0200 @@ -2,9 +2,11 @@ + + android:layout_marginBottom="25px" android:layout_marginTop="42px" /> + diff -r 85b344154ede -r 17300b201cf5 res/layout/sendim.xml --- a/res/layout/sendim.xml Fri Oct 09 16:56:20 2009 +0200 +++ b/res/layout/sendim.xml Thu Oct 15 17:36:51 2009 +0200 @@ -5,38 +5,41 @@ + android:background="#222222" + android:padding="4px"> - + - + - + android:autoLink="all" android:textSize="12sp" android:textColor="#FFFFFF" /> + + + android:layout_marginBottom="6sp" + android:padding="4px"> + android:title="@string/contact_list_menu_add_contact" + android:icon="@drawable/ic_menu_add" /> + android:title="@string/contact_list_menu_settings" + android:icon="@drawable/ic_menu_manage" /> diff -r 85b344154ede -r 17300b201cf5 res/menu/edit_settings.xml --- a/res/menu/edit_settings.xml Fri Oct 09 16:56:20 2009 +0200 +++ b/res/menu/edit_settings.xml Thu Oct 15 17:36:51 2009 +0200 @@ -1,8 +1,10 @@ + android:title="@string/settings_menu_login" + android:icon="@drawable/ic_menu_login" /> diff -r 85b344154ede -r 17300b201cf5 res/menu/login.xml --- a/res/menu/login.xml Fri Oct 09 16:56:20 2009 +0200 +++ b/res/menu/login.xml Thu Oct 15 17:36:51 2009 +0200 @@ -1,8 +1,10 @@ + android:title="@string/login_menu_settings" + android:icon="@drawable/ic_menu_manage" /> + android:title="@string/login_menu_about" + android:icon="@drawable/ic_menu_help" /> diff -r 85b344154ede -r 17300b201cf5 res/menu/sendimmenu.xml --- a/res/menu/sendimmenu.xml Fri Oct 09 16:56:20 2009 +0200 +++ b/res/menu/sendimmenu.xml Thu Oct 15 17:36:51 2009 +0200 @@ -1,4 +1,7 @@ - - + + diff -r 85b344154ede -r 17300b201cf5 res/values-fr/arrays.xml --- a/res/values-fr/arrays.xml Fri Oct 09 16:56:20 2009 +0200 +++ b/res/values-fr/arrays.xml Thu Oct 15 17:36:51 2009 +0200 @@ -6,11 +6,11 @@ SOCKS5 - Disponnible pour discuter - Disponnible + Disponible pour discuter + Disponible Occupé Absent - Indisponnible + Indisponible Déconnecté diff -r 85b344154ede -r 17300b201cf5 src/com/beem/project/beem/ui/ContactList.java --- a/src/com/beem/project/beem/ui/ContactList.java Fri Oct 09 16:56:20 2009 +0200 +++ b/src/com/beem/project/beem/ui/ContactList.java Thu Oct 15 17:36:51 2009 +0200 @@ -16,6 +16,8 @@ import android.content.IntentFilter; import android.content.ServiceConnection; import android.graphics.BitmapFactory; +import android.graphics.Color; +import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; @@ -530,62 +532,46 @@ Drawable imageDrawable = null; switch (curContact.getStatus()) { case Status.CONTACT_STATUS_AVAILABLE: - imageDrawable = getResources().getDrawable(R.drawable.online); - v.setTextColor(getResources().getColor(R.color.white)); + imageDrawable = getResources().getDrawable(R.drawable.status_available); break; case Status.CONTACT_STATUS_AVAILABLE_FOR_CHAT: - imageDrawable = getResources().getDrawable(R.drawable.chat); + imageDrawable = getResources().getDrawable(R.drawable.status_available); break; case Status.CONTACT_STATUS_AWAY: - imageDrawable = getResources().getDrawable(R.drawable.away); + imageDrawable = getResources().getDrawable(R.drawable.status_away); break; case Status.CONTACT_STATUS_BUSY: - imageDrawable = getResources().getDrawable(R.drawable.dnd); + imageDrawable = getResources().getDrawable(R.drawable.status_dnd); break; case Status.CONTACT_STATUS_DISCONNECT: - imageDrawable = getResources().getDrawable(R.drawable.offline); + imageDrawable = getResources().getDrawable(R.drawable.status_offline); break; case Status.CONTACT_STATUS_UNAVAILABLE: - imageDrawable = getResources().getDrawable(R.drawable.requested); + imageDrawable = getResources().getDrawable(R.drawable.status_requested); break; default: - imageDrawable = getResources().getDrawable(R.drawable.error); + imageDrawable = getResources().getDrawable(R.drawable.status_error); break; } imgV.setImageDrawable(imageDrawable); String mContactName = curContact.getName(); - if ("".equals(mContactName)) { + if (mContactName == null || "".equals(mContactName)) { mContactName = curContact.getJID(); mContactName = StringUtils.parseName(mContactName); if ("".equals(mContactName)) mContactName = curContact.getJID(); } v.setText(mContactName); + v.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); + v.setTextColor(Color.WHITE); + v.setTextSize(14); v = (TextView) view.findViewById(R.id.contactlistmsgperso); if (v != null) { v.setText(curContact.getMsgState()); - } - - /* - * 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); } - */ - - if (false) { - imgV = (ImageView) view.findViewById(R.id.contactlistavatar); - - byte[] rawImg; - try { - // TODO: le faire en asynchrone, car la ca bloque tout. - rawImg = mXmppFacade.getVcardAvatar(curContact.getJID()); - if (rawImg != null) - imgV.setImageBitmap(BitmapFactory.decodeByteArray(rawImg, 0, rawImg.length)); - } catch (RemoteException e) { - e.printStackTrace(); - } + v.setTextColor(Color.WHITE); + v.setTextSize(12); } } } @@ -636,6 +622,9 @@ public View getView(int position, View convertView, ViewGroup parent) { TextView i = new TextView(mContext); i.setText(mListGroup.get(position)); + i.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); + i.setTextColor(Color.WHITE); + i.setHighlightColor(Color.RED); return i; } diff -r 85b344154ede -r 17300b201cf5 src/com/beem/project/beem/ui/SendIM.java --- a/src/com/beem/project/beem/ui/SendIM.java Fri Oct 09 16:56:20 2009 +0200 +++ b/src/com/beem/project/beem/ui/SendIM.java Thu Oct 15 17:36:51 2009 +0200 @@ -42,6 +42,7 @@ import com.beem.project.beem.service.aidl.IRoster; import com.beem.project.beem.service.aidl.IXmppFacade; import com.beem.project.beem.utils.BeemBroadcastReceiver; +import com.beem.project.beem.utils.Status; /** * This activity class provides the view for instant messaging after selecting a correspondant. @@ -50,7 +51,6 @@ public class SendIM extends Activity implements OnClickListener, OnKeyListener { - private static final int STATUS_TXT_SIZE = 12; private static final String TAG = "SEND_IM"; private static final Intent SERVICE_INTENT = new Intent(); static { @@ -63,6 +63,7 @@ private SharedPreferences mSet; private Handler mHandler; private Contact mContact; + private ImageView mStatusIcon; private String mContactName; private IChatManager mChatManager; private IChatManagerListener mChatManagerListener; @@ -70,7 +71,6 @@ private IChat mChat; private TextView mText; private TextView mLogin; - private TextView mChatState; private ScrollView mScrolling; private char mSpeak; @@ -110,8 +110,8 @@ mSmyDialog = new SendIMDialogSmiley(this, mSet); mToSend.setOnClickListener(this); mToSend.setOnKeyListener(this); + mStatusIcon = (ImageView) findViewById(R.id.sendimstatus); mLogin = (TextView) findViewById(R.id.sendimlogin); - mChatState = (TextView) findViewById(R.id.sendimchatstate); try { mContact = new Contact(getIntent().getData()); if (mRoster != null) @@ -122,30 +122,11 @@ } mText = (TextView) findViewById(R.id.sendimlist); mScrolling = (ScrollView) findViewById(R.id.sendimscroll); - mStatusText = (TextView) findViewById(R.id.sendimstatus); - setViewHeader(); + mStatusText = (TextView) findViewById(R.id.sendimstatusmsg); mReceiver = new BeemBroadcastReceiver(mServConn); } /** - * Set the header information in the window. - */ - private void setViewHeader() { - Drawable avatar = getResources().getDrawable(R.drawable.avatar); - ImageView imgV = (ImageView) findViewById(R.id.sendimavatar); - imgV.setImageDrawable(avatar); - mStatusText.setTextSize(STATUS_TXT_SIZE); - mContactName = mContact.getName(); - if (mContactName == null || "".equals(mContactName)) { - mContactName = mContact.getJID(); - mContactName = StringUtils.parseName(mContactName); - if ("".equals(mContactName)) - mContactName = mContact.getJID(); - } - mLogin.setText(mContactName); - } - - /** * {@inheritDoc} */ @Override @@ -174,6 +155,38 @@ } /** + * Update the status icon of our contact. + */ + protected void updateStatusIcon() { + Drawable statusIcon = null; + switch (mContact.getStatus()) { + case Status.CONTACT_STATUS_AVAILABLE: + statusIcon = getResources().getDrawable(R.drawable.status_available); + break; + case Status.CONTACT_STATUS_AVAILABLE_FOR_CHAT: + statusIcon = getResources().getDrawable(R.drawable.status_available); + break; + case Status.CONTACT_STATUS_AWAY: + statusIcon = getResources().getDrawable(R.drawable.status_away); + break; + case Status.CONTACT_STATUS_BUSY: + statusIcon = getResources().getDrawable(R.drawable.status_dnd); + break; + case Status.CONTACT_STATUS_DISCONNECT: + statusIcon = getResources().getDrawable(R.drawable.status_offline); + break; + case Status.CONTACT_STATUS_UNAVAILABLE: + statusIcon = getResources().getDrawable(R.drawable.status_requested); + break; + default: + statusIcon = getResources().getDrawable(R.drawable.status_error); + break; + } + Log.d("SENDIM -- UPDATE STATUS ICON", "Contact current status: " + mContact.getStatus() + ""); + mStatusIcon.setImageDrawable(statusIcon); + } + + /** * {@inheritDoc} */ @Override @@ -205,7 +218,6 @@ // TODO Auto-generated catch block e.printStackTrace(); } - setViewHeader(); } /** @@ -275,7 +287,6 @@ // TODO Auto-generated catch block e.printStackTrace(); } - setViewHeader(); } /** @@ -305,7 +316,16 @@ if (mRoster.getContact(mContact.getJID()) != null) { mContact = mRoster.getContact(mContact.getJID()); mStatusText.setText(mContact.getMsgState()); + String contactName = mContact.getName(); + if (contactName == null || "".equals(contactName)) { + contactName = mContact.getJID(); + contactName = StringUtils.parseName(contactName); + if ("".equals(contactName)) + contactName = mContact.getJID(); + } + mLogin.setText(contactName); } + updateStatusIcon(); } switchChat(mContact); } catch (RemoteException e) { @@ -452,6 +472,8 @@ public void onPresenceChanged(PresenceAdapter presence) throws RemoteException { if (mContact.getJID().equals(StringUtils.parseBareAddress(presence.getFrom()))) { mContact.setStatus(mRoster.getPresence(StringUtils.parseBareAddress(presence.getFrom()))); + Log.d("SENDIM -- onPresenceChanged", "Contact current status: " + mContact.getStatus() + ""); + updateStatusIcon(); mHandler.post(new RunnableChange()); } } @@ -525,13 +547,11 @@ public void stateChanged(IChat chat) throws RemoteException { 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); } }); }