From 7979684588ea63b3cdb039a39d14f6c60c320731 Mon Sep 17 00:00:00 2001 From: Ivan Date: Mon, 10 Oct 2016 19:28:21 +0300 Subject: [PATCH] Fix bug with empty avatars for contacts, whose names starts with "+" There were problem, that if you have several contacts, whose names starts with "+", their avatars not displayed in conversations list, or displays as white circles. Also minor tweak for "onDraw" function --- .../java/com/moez/QKSMS/ui/view/AvatarView.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java index 4f03cc8a..126f9e35 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java @@ -22,6 +22,7 @@ import android.view.View; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.ImageView; + import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.TypefaceManager; @@ -53,6 +54,7 @@ public class AvatarView extends ImageView implements View.OnClickListener { private String mInitial = "#"; private Paint mPaint; private Drawable mDefaultDrawable; + private int mYOffset; /** * When setImageDrawable is called with a drawable, we circle crop to size of this view and use @@ -89,6 +91,8 @@ public class AvatarView extends ImageView implements View.OnClickListener { } a.recycle(); + mYOffset = (int) ((mPaint.descent() + mPaint.ascent()) / 2); + setOnClickListener(this); LiveViewManager.registerView(QKPreference.THEME, this, key -> { @@ -175,7 +179,7 @@ public class AvatarView extends ImageView implements View.OnClickListener { if (mOriginalDrawable == null) super.setImageDrawable(null); } else if (isPhoneNumberFormat(name)) { mInitial = ""; - super.setImageDrawable(mDefaultDrawable); + if (mOriginalDrawable == null) super.setImageDrawable(mDefaultDrawable); } else { mInitial = "" + name.toUpperCase().charAt(0); if (mOriginalDrawable == null) super.setImageDrawable(null); @@ -185,9 +189,10 @@ public class AvatarView extends ImageView implements View.OnClickListener { } private boolean isPhoneNumberFormat(String name) { - if (TextUtils.isEmpty(name)) { - return false; - } +// We already checked it in first "if" condition in "setContactName" +// if (TextUtils.isEmpty(name)) { +// return false; +// } char c = name.charAt(0); return !name.contains("@") && (c == '+' || c == '(' || Character.isDigit(c)); @@ -276,7 +281,7 @@ public class AvatarView extends ImageView implements View.OnClickListener { if (getDrawable() == null && !isInEditMode()) { int xPos = (getWidth() / 2); - int yPos = (int) ((getHeight() / 2) - ((mPaint.descent() + mPaint.ascent()) / 2)); + int yPos = (getHeight() / 2) - mYOffset; canvas.drawText("" + mInitial, xPos, yPos, mPaint); } }