From a46002d16b68316ad6dcc1ab64882f0ab633aaab Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 25 Jul 2016 17:20:00 +0200 Subject: [PATCH] Added a button to directly go to the contact from the history details view --- res/drawable-xhdpi/contact.png | Bin 0 -> 3203 bytes res/layout/contact.xml | 6 ++---- res/layout/history_detail.xml | 16 ++++++++++++---- src/org/linphone/HistoryDetailFragment.java | 16 ++++++++++++---- 4 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 res/drawable-xhdpi/contact.png diff --git a/res/drawable-xhdpi/contact.png b/res/drawable-xhdpi/contact.png new file mode 100644 index 0000000000000000000000000000000000000000..266548e1719bfd02e4c1e5446750a9523a91fcec GIT binary patch literal 3203 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 literal 0 HcmV?d00001 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); } } }