From 86e8b49460ab1b35b13ce61085bdd6d2df806265 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 5 Mar 2019 11:24:33 +0100 Subject: [PATCH] Improved avatar in call related code --- .../java/org/linphone/call/CallActivity.java | 34 ++++++++------ .../linphone/call/CallIncomingActivity.java | 14 +++--- .../linphone/call/CallOutgoingActivity.java | 14 +++--- .../linphone/chat/ChatMessagesOldAdapter.java | 2 - .../org/linphone/chat/ImdnOldFragment.java | 2 - .../org/linphone/views/ContactAvatar.java | 34 ++++++++++---- app/src/main/res/drawable-xhdpi/.directory | 4 ++ .../avatar_chat_mask_outgoing.png | Bin 5345 -> 0 bytes app/src/main/res/drawable/camera.xml | 4 ++ app/src/main/res/drawable/options.xml | 4 ++ app/src/main/res/layout-land/call.xml | 16 +------ app/src/main/res/layout/call.xml | 16 +------ app/src/main/res/layout/call_inactive_row.xml | 13 ++++-- app/src/main/res/layout/call_incoming.xml | 15 +----- app/src/main/res/layout/call_outgoing.xml | 15 +----- app/src/main/res/layout/contact.xml | 2 +- app/src/main/res/layout/contact_avatar.xml | 17 ++++--- ..._avatar_big.xml => contact_avatar_100.xml} | 19 ++++---- .../main/res/layout/contact_avatar_200.xml | 42 +++++++++++++++++ .../res/layout/contact_avatar_call_paused.xml | 43 ++++++++++++++++++ app/src/main/res/layout/contact_edit.xml | 2 +- app/src/main/res/layout/history_detail.xml | 2 +- app/src/main/res/layout/toast.xml | 4 +- app/src/main/res/values/attrs.xml | 2 + app/src/main/res/values/color.xml | 1 + app/src/main/res/values/styles.xml | 13 +++++- 26 files changed, 206 insertions(+), 128 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/.directory delete mode 100644 app/src/main/res/drawable-xhdpi/avatar_chat_mask_outgoing.png rename app/src/main/res/layout/{contact_avatar_big.xml => contact_avatar_100.xml} (91%) create mode 100644 app/src/main/res/layout/contact_avatar_200.xml create mode 100644 app/src/main/res/layout/contact_avatar_call_paused.xml diff --git a/app/src/main/java/org/linphone/call/CallActivity.java b/app/src/main/java/org/linphone/call/CallActivity.java index fb0fa586d..2d12197cf 100644 --- a/app/src/main/java/org/linphone/call/CallActivity.java +++ b/app/src/main/java/org/linphone/call/CallActivity.java @@ -87,9 +87,9 @@ import org.linphone.fragments.StatusFragment; import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration; import org.linphone.receivers.BluetoothManager; import org.linphone.settings.LinphonePreferences; -import org.linphone.utils.ImageUtils; import org.linphone.utils.LinphoneGenericActivity; import org.linphone.utils.LinphoneUtils; +import org.linphone.views.ContactAvatar; import org.linphone.views.Numpad; public class CallActivity extends LinphoneGenericActivity @@ -119,7 +119,6 @@ public class CallActivity extends LinphoneGenericActivity mTransfer, mConference, mConferenceStatus, - mContactPicture, mRecordCall, mRecording; private ImageView mAudioRoute, mRouteSpeaker, mRouteEarpiece, mRouteBluetooth, mMenu, mChat; @@ -425,7 +424,6 @@ public class CallActivity extends LinphoneGenericActivity mNoCurrentCall = findViewById(R.id.no_current_call); mCallPaused = findViewById(R.id.remote_pause); - mContactPicture = findViewById(R.id.contact_picture); mAvatarLayout = findViewById(R.id.avatar_layout); // Options @@ -1423,7 +1421,7 @@ public class CallActivity extends LinphoneGenericActivity private void displayCurrentCall(Call call) { Address lAddress = call.getRemoteAddress(); TextView contactName = findViewById(R.id.current_contact_name); - setContactInformation(contactName, mContactPicture, lAddress); + setContactInformation(contactName, lAddress); registerCallDurationTimer(null, call); } @@ -1449,29 +1447,35 @@ public class CallActivity extends LinphoneGenericActivity callView.setId(index + 1); TextView contactName = callView.findViewById(R.id.contact_name); - ImageView contactImage = callView.findViewById(R.id.contact_picture); Address lAddress = call.getRemoteAddress(); - setContactInformation(contactName, contactImage, lAddress); + LinphoneContact lContact = + ContactsManager.getInstance().findContactFromAddress(lAddress); + + if (lContact == null) { + String displayName = LinphoneUtils.getAddressDisplayName(lAddress); + contactName.setText(displayName); + ContactAvatar.displayAvatar(displayName, callView.findViewById(R.id.avatar_layout)); + } else { + contactName.setText(lContact.getFullName()); + ContactAvatar.displayAvatar(lContact, callView.findViewById(R.id.avatar_layout)); + } + displayCallStatusIconAndReturnCallPaused(callView, call); registerCallDurationTimer(callView, call); } mCallsList.addView(callView); } - private void setContactInformation( - TextView contactName, ImageView contactPicture, Address lAddress) { + private void setContactInformation(TextView contactName, Address lAddress) { LinphoneContact lContact = ContactsManager.getInstance().findContactFromAddress(lAddress); if (lContact == null) { - contactName.setText(LinphoneUtils.getAddressDisplayName(lAddress)); - ImageUtils.setDefaultContactImage(contactPicture); + String displayName = LinphoneUtils.getAddressDisplayName(lAddress); + contactName.setText(displayName); + ContactAvatar.displayAvatar(displayName, mAvatarLayout, R.drawable.avatar_mask_border); } else { contactName.setText(lContact.getFullName()); - ImageUtils.setImagePictureFromUri( - contactPicture.getContext(), - contactPicture, - lContact.getPhotoUri(), - lContact.getThumbnailUri()); + ContactAvatar.displayAvatar(lContact, mAvatarLayout, R.drawable.avatar_mask_border); } } diff --git a/app/src/main/java/org/linphone/call/CallIncomingActivity.java b/app/src/main/java/org/linphone/call/CallIncomingActivity.java index a34f1b4cb..04752ac8a 100644 --- a/app/src/main/java/org/linphone/call/CallIncomingActivity.java +++ b/app/src/main/java/org/linphone/call/CallIncomingActivity.java @@ -45,18 +45,18 @@ import org.linphone.core.Core; import org.linphone.core.CoreListenerStub; import org.linphone.core.tools.Log; import org.linphone.settings.LinphonePreferences; -import org.linphone.utils.ImageUtils; import org.linphone.utils.LinphoneGenericActivity; import org.linphone.utils.LinphoneUtils; import org.linphone.views.CallIncomingAnswerButton; import org.linphone.views.CallIncomingButtonListener; import org.linphone.views.CallIncomingDeclineButton; +import org.linphone.views.ContactAvatar; public class CallIncomingActivity extends LinphoneGenericActivity { private static CallIncomingActivity sInstance; private TextView mName, mNumber; - private ImageView mContactPicture, mAcceptIcon; + private ImageView mAcceptIcon; private CallIncomingAnswerButton mAccept; private CallIncomingDeclineButton mDecline; private Call mCall; @@ -85,7 +85,6 @@ public class CallIncomingActivity extends LinphoneGenericActivity { mName = findViewById(R.id.contact_name); mNumber = findViewById(R.id.contact_number); - mContactPicture = findViewById(R.id.contact_picture); // set this flag so this activity will stay in front of the keyguard int flags = @@ -187,11 +186,14 @@ public class CallIncomingActivity extends LinphoneGenericActivity { Address address = mCall.getRemoteAddress(); LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(address); if (contact != null) { - ImageUtils.setImagePictureFromUri( - this, mContactPicture, contact.getPhotoUri(), contact.getThumbnailUri()); + ContactAvatar.displayAvatar( + contact, findViewById(R.id.avatar_layout), R.drawable.avatar_mask_border); mName.setText(contact.getFullName()); } else { - mName.setText(LinphoneUtils.getAddressDisplayName(address)); + String displayName = LinphoneUtils.getAddressDisplayName(address); + ContactAvatar.displayAvatar( + displayName, findViewById(R.id.avatar_layout), R.drawable.avatar_mask_border); + mName.setText(displayName); } mNumber.setText(address.asStringUriOnly()); } diff --git a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java index 0b7914618..fb8f15009 100644 --- a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java +++ b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java @@ -48,13 +48,13 @@ import org.linphone.core.CoreListenerStub; import org.linphone.core.Reason; import org.linphone.core.tools.Log; import org.linphone.settings.LinphonePreferences; -import org.linphone.utils.ImageUtils; import org.linphone.utils.LinphoneGenericActivity; import org.linphone.utils.LinphoneUtils; +import org.linphone.views.ContactAvatar; public class CallOutgoingActivity extends LinphoneGenericActivity implements OnClickListener { private TextView mName, mNumber; - private ImageView mContactPicture, mMicro, mSpeaker, mHangUp; + private ImageView mMicro, mSpeaker, mHangUp; private Call mCall; private CoreListenerStub mListener; private boolean mIsMicMuted, mIsSpeakerEnabled; @@ -72,7 +72,6 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC mName = findViewById(R.id.contact_name); mNumber = findViewById(R.id.contact_number); - mContactPicture = findViewById(R.id.contact_picture); mIsMicMuted = false; mIsSpeakerEnabled = false; @@ -186,11 +185,14 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC Address address = mCall.getRemoteAddress(); LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(address); if (contact != null) { - ImageUtils.setImagePictureFromUri( - this, mContactPicture, contact.getPhotoUri(), contact.getThumbnailUri()); + ContactAvatar.displayAvatar( + contact, findViewById(R.id.avatar_layout), R.drawable.avatar_mask_border); mName.setText(contact.getFullName()); } else { - mName.setText(LinphoneUtils.getAddressDisplayName(address)); + String displayName = LinphoneUtils.getAddressDisplayName(address); + ContactAvatar.displayAvatar( + displayName, findViewById(R.id.avatar_layout), R.drawable.avatar_mask_border); + mName.setText(displayName); } mNumber.setText(LinphoneUtils.getDisplayableAddress(address)); } diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java index 9a53e8845..465e37cfd 100644 --- a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java +++ b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java @@ -260,7 +260,6 @@ public class ChatMessagesOldAdapter extends SelectableAdapter 0) { + holder.generatedAvatar.setText(generatedAvatar); + holder.generatedAvatar.setVisibility(View.VISIBLE); + } else { + holder.generatedAvatar.setVisibility(View.GONE); + } } holder.securityLevel.setVisibility(View.GONE); + + if (maskResource != 0) { + holder.avatarMask.setImageResource(maskResource); + } + } + + public static void displayAvatar(String displayName, View v) { + displayAvatar(displayName, v, 0); } public static void displayAvatar( @@ -124,7 +132,7 @@ public class ContactAvatar { setSecurityLevel(securityLevel, v); } - public static void displayAvatar(LinphoneContact contact, View v) { + public static void displayAvatar(LinphoneContact contact, View v, int maskResource) { if (contact == null || v == null) return; ContactAvatarHolder holder = new ContactAvatarHolder(v); @@ -162,6 +170,14 @@ public class ContactAvatar { : contact.getFullName())); holder.generatedAvatar.setVisibility(View.VISIBLE); } + + if (maskResource != 0) { + holder.avatarMask.setImageResource(maskResource); + } + } + + public static void displayAvatar(LinphoneContact contact, View v) { + displayAvatar(contact, v, 0); } public static void displayAvatar( diff --git a/app/src/main/res/drawable-xhdpi/.directory b/app/src/main/res/drawable-xhdpi/.directory new file mode 100644 index 000000000..d5c44ccc7 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/.directory @@ -0,0 +1,4 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2019,3,5,11,4,59 +Version=4 diff --git a/app/src/main/res/drawable-xhdpi/avatar_chat_mask_outgoing.png b/app/src/main/res/drawable-xhdpi/avatar_chat_mask_outgoing.png deleted file mode 100644 index 7e471c425535ec7967e3a7bf05ec381826334e42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5345 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 ntiQoVDQRtff9#9vZ6VW!eJ}qu@4~ + + + diff --git a/app/src/main/res/drawable/options.xml b/app/src/main/res/drawable/options.xml index cf70c676e..4b8c7d20e 100644 --- a/app/src/main/res/drawable/options.xml +++ b/app/src/main/res/drawable/options.xml @@ -8,6 +8,10 @@ + + + diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml index fe1ff04fc..08720c17a 100644 --- a/app/src/main/res/layout-land/call.xml +++ b/app/src/main/res/layout-land/call.xml @@ -80,21 +80,7 @@ android:layout_margin="5dp" android:gravity="center"> - - - + diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml index 18146e79e..60acdb6a7 100644 --- a/app/src/main/res/layout/call.xml +++ b/app/src/main/res/layout/call.xml @@ -81,21 +81,7 @@ android:layout_margin="5dp" android:gravity="center"> - - - + diff --git a/app/src/main/res/layout/call_inactive_row.xml b/app/src/main/res/layout/call_inactive_row.xml index 7ac04d473..df973dece 100644 --- a/app/src/main/res/layout/call_inactive_row.xml +++ b/app/src/main/res/layout/call_inactive_row.xml @@ -2,17 +2,20 @@ - + android:gravity="center"> + + + + - - - + diff --git a/app/src/main/res/layout/call_outgoing.xml b/app/src/main/res/layout/call_outgoing.xml index 306cf7085..7bf656cdb 100644 --- a/app/src/main/res/layout/call_outgoing.xml +++ b/app/src/main/res/layout/call_outgoing.xml @@ -68,20 +68,7 @@ android:layout_margin="5dp" android:gravity="center"> - - - + diff --git a/app/src/main/res/layout/contact.xml b/app/src/main/res/layout/contact.xml index bdb714a31..70f1c9354 100644 --- a/app/src/main/res/layout/contact.xml +++ b/app/src/main/res/layout/contact.xml @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:gravity="center"> - + diff --git a/app/src/main/res/layout/contact_avatar.xml b/app/src/main/res/layout/contact_avatar.xml index 79f621323..75d7c2ea3 100644 --- a/app/src/main/res/layout/contact_avatar.xml +++ b/app/src/main/res/layout/contact_avatar.xml @@ -12,15 +12,6 @@ android:adjustViewBounds="true" android:src="@drawable/avatar" /> - - + + - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/contact_avatar_call_paused.xml b/app/src/main/res/layout/contact_avatar_call_paused.xml new file mode 100644 index 000000000..132af3a9d --- /dev/null +++ b/app/src/main/res/layout/contact_avatar_call_paused.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/contact_edit.xml b/app/src/main/res/layout/contact_edit.xml index 390671cce..f558d9d47 100644 --- a/app/src/main/res/layout/contact_edit.xml +++ b/app/src/main/res/layout/contact_edit.xml @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:gravity="center"> - + diff --git a/app/src/main/res/layout/history_detail.xml b/app/src/main/res/layout/history_detail.xml index e386bc5b4..4758d9fce 100644 --- a/app/src/main/res/layout/history_detail.xml +++ b/app/src/main/res/layout/history_detail.xml @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:gravity="center"> - + diff --git a/app/src/main/res/layout/toast.xml b/app/src/main/res/layout/toast.xml index 6f5ef8c72..b0fe03c58 100644 --- a/app/src/main/res/layout/toast.xml +++ b/app/src/main/res/layout/toast.xml @@ -3,7 +3,7 @@ android:id="@+id/toastRoot" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?attr/backgroundColor" + android:background="?attr/backgroundContastColor" android:orientation="vertical"> + android:textColor="?attr/secondaryTextColor" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 30f9902ce..5f5b9c9b2 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -2,6 +2,7 @@ + @@ -10,6 +11,7 @@ + diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml index 7764b9ad3..d626c4179 100644 --- a/app/src/main/res/values/color.xml +++ b/app/src/main/res/values/color.xml @@ -3,6 +3,7 @@ #ff5e00 #e65000 + #80ff5e00 #000000 #444444 #808080 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 64f40b084..c353f1482 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,6 +11,7 @@ @color/colorH @color/colorA + @color/colorA50 @color/colorH @color/colorC @color/colorH @@ -18,6 +19,7 @@ @color/colorE @color/colorH + @color/colorC @color/colorE @color/colorC @@ -42,6 +44,8 @@ @color/colorC @color/colorC + @color/colorA + @color/colorA50 @color/colorH @color/colorH @color/colorC @@ -49,6 +53,7 @@ @color/colorF @color/colorC + @color/colorH @color/colorE @color/colorH @@ -256,12 +261,18 @@ bold - + +