AvatarDrawable: cleanup

Change-Id: Ia13f38a93c9a377ae06b2e1046aeeb56512990cb

ring-android/app/src/main/java/cx/ring/views/AvatarDrawable.java

@@ -288,7 +288,7 @@ public class AvatarDrawable extends Drawable {
 
     @Override
     protected void onBoundsChange(Rect bounds) {
-        setAvatarTextValues();
+        if (showPresence)
             setupPresenceIndicator(bounds);
         int d = Math.min(bounds.width(), bounds.height());
         if (placeholder != null) {
@@ -313,6 +313,8 @@ public class AvatarDrawable extends Drawable {
             int cx = (iw - w)/2;
             int cy = (ih - h)/2;
             backgroundBounds.set(cx, cy, cx + w, h + cy);
+        } else {
+            setAvatarTextValues(bounds);
         }
         if (cropCircle) {
             if (d > 0) {
@@ -380,21 +382,13 @@ public class AvatarDrawable extends Drawable {
         return PixelFormat.TRANSLUCENT;
     }
 
-    private void setAvatarTextValues() {
+    private void setAvatarTextValues(Rect bounds) {
         if (avatarText != null) {
-            textPaint.setTextSize(getBounds().height() * DEFAULT_TEXT_SIZE_PERCENTAGE);
-            textStartXPoint = calculateTextStartXPoint();
-            textStartYPoint = calculateTextStartYPoint();
-        }
-    }
-
-    private float calculateTextStartXPoint() {
+            textPaint.setTextSize(bounds.height() * DEFAULT_TEXT_SIZE_PERCENTAGE);
             float stringWidth = textPaint.measureText(avatarText);
-        return (getBounds().width() / 2f) - (stringWidth / 2f);
+            textStartXPoint = (bounds.width() / 2f) - (stringWidth / 2f);
+            textStartYPoint = (bounds.height() / 2f) - ((textPaint.ascent() + textPaint.descent()) / 2f);
         }
-
-    private float calculateTextStartYPoint() {
-        return (getBounds().height() / 2f) - ((textPaint.ascent() + textPaint.descent()) / 2f);
     }
 
     private String convertNameToAvatarText(String name) {