diff --git a/res/drawable-xhdpi/contact.png b/res/drawable-xhdpi/contact.png new file mode 100644 index 000000000..266548e17 Binary files /dev/null and b/res/drawable-xhdpi/contact.png differ diff --git a/res/layout/contact.xml b/res/layout/contact.xml index fcc1acd76..9f3de8408 100644 --- a/res/layout/contact.xml +++ b/res/layout/contact.xml @@ -72,8 +72,7 @@ android:layout_width="100dp" android:layout_height="100dp" android:adjustViewBounds="true" - android:layout_alignParentLeft="true" - android:layout_marginLeft="5dp"/> + android:layout_alignParentLeft="true"/> + android:layout_alignParentLeft="true"/> diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml index 724ed7595..d51fbb95b 100644 --- a/res/layout/history_detail.xml +++ b/res/layout/history_detail.xml @@ -36,6 +36,17 @@ android:layout_height="match_parent" android:layout_weight="0.2" android:padding="15dp"/> + + @@ -88,7 +97,6 @@ diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/org/linphone/HistoryDetailFragment.java index f96b0e955..03169455a 100644 --- a/src/org/linphone/HistoryDetailFragment.java +++ b/src/org/linphone/HistoryDetailFragment.java @@ -36,11 +36,12 @@ import android.widget.TextView; * @author Sylvain Berfini */ public class HistoryDetailFragment extends Fragment implements OnClickListener { - private ImageView dialBack, chat, addToContacts, back; + private ImageView dialBack, chat, addToContacts, goToContact, back; private View view; private ImageView contactPicture, callDirection; private TextView contactName, contactAddress, time, date; private String sipUri, displayName, pictureUri; + private LinphoneContact contact; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -72,6 +73,9 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { addToContacts = (ImageView) view.findViewById(R.id.add_contact); addToContacts.setOnClickListener(this); + goToContact = (ImageView) view.findViewById(R.id.goto_contact); + goToContact.setOnClickListener(this); + contactPicture = (ImageView) view.findViewById(R.id.contact_picture); contactName = (TextView) view.findViewById(R.id.contact_name); @@ -107,17 +111,19 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { Log.e(e); } - if(lAddress != null) { + if (lAddress != null) { contactAddress.setText(lAddress.asStringUriOnly()); - LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(lAddress); + contact = ContactsManager.getInstance().findContactFromAddress(lAddress); if (contact != null) { contactName.setText(contact.getFullName()); LinphoneUtils.setImagePictureFromUri(view.getContext(),contactPicture,contact.getPhotoUri(),contact.getThumbnailUri()); - addToContacts.setVisibility(View.INVISIBLE); + addToContacts.setVisibility(View.GONE); + goToContact.setVisibility(View.VISIBLE); } else { contactName.setText(displayName == null ? LinphoneUtils.getAddressDisplayName(sipUri) : displayName); contactPicture.setImageResource(R.drawable.avatar); addToContacts.setVisibility(View.VISIBLE); + goToContact.setVisibility(View.GONE); } } else { contactAddress.setText(sipUri); @@ -165,6 +171,8 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { Log.e(e); } LinphoneActivity.instance().displayContactsForEdition(uri); + } else if (id == R.id.goto_contact) { + LinphoneActivity.instance().displayContact(contact, false); } } }