sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into development

This commit is contained in:
iNPUTmice 2014-11-09 17:02:49 +01:00
parent ad6fef063b 61f046a675
commit e9af0d4ca7
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/eu/siacs/conversations/services/AvatarService.java
View File

@ -22,6 +22,7 @@ public class AvatarService {
private static final int FG_COLOR = 0xFFFAFAFA; private static final int FG_COLOR = 0xFFFAFAFA;
private static final int TRANSPARENT = 0x00000000; private static final int TRANSPARENT = 0x00000000;
private static final int PLACEHOLDER_COLOR = 0xFF202020;
private static final String PREFIX_CONTACT = "contact"; private static final String PREFIX_CONTACT = "contact";
private static final String PREFIX_CONVERSATION = "conversation"; private static final String PREFIX_CONVERSATION = "conversation";
@ -140,7 +141,7 @@ public class AvatarService {
drawTile(canvas, users.get(0), 0, 0, size / 2 - 1, size / 2 - 1); drawTile(canvas, users.get(0), 0, 0, size / 2 - 1, size / 2 - 1);
drawTile(canvas, users.get(1), 0, size / 2 + 1, size / 2 - 1, size); drawTile(canvas, users.get(1), 0, size / 2 + 1, size / 2 - 1, size);
drawTile(canvas, users.get(2), size / 2 + 1, 0, size, size / 2 - 1); drawTile(canvas, users.get(2), size / 2 + 1, 0, size, size / 2 - 1);
drawTile(canvas, "\u2026", 0xFF202020, size / 2 + 1, size / 2 + 1, drawTile(canvas, "\u2026", PLACEHOLDER_COLOR, size / 2 + 1, size / 2 + 1,
size, size); size, size);
} }
this.mXmppConnectionService.getBitmapCache().put(KEY, bitmap); this.mXmppConnectionService.getBitmapCache().put(KEY, bitmap);
@ -204,8 +205,15 @@ public class AvatarService {
} }
bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888); bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap); Canvas canvas = new Canvas(bitmap);
String letter = name.substring(0, 1); String letter;
int color = this.getColorForName(name); int color;
if (name.length() > 0) {
letter = name.substring(0, 1);
color = this.getColorForName(name);
} else {
letter = "X";
color = PLACEHOLDER_COLOR;
}
drawTile(canvas, letter, color, 0, 0, size, size); drawTile(canvas, letter, color, 0, 0, size, size);
mXmppConnectionService.getBitmapCache().put(KEY, bitmap); mXmppConnectionService.getBitmapCache().put(KEY, bitmap);
return bitmap; return bitmap;
@ -255,21 +263,21 @@ public class AvatarService {
.cropCenter(uri, bottom - top, right - left); .cropCenter(uri, bottom - top, right - left);
if (bitmap != null) { if (bitmap != null) {
drawTile(canvas, bitmap, left, top, right, bottom); drawTile(canvas, bitmap, left, top, right, bottom);
} else { return;
String letter = user.getName().substring(0, 1);
int color = this.getColorForName(user.getName());
drawTile(canvas, letter, color, left, top, right, bottom);
} }
} else {
String letter = user.getName().substring(0, 1);
int color = this.getColorForName(user.getName());
drawTile(canvas, letter, color, left, top, right, bottom);
} }
} else {
String letter = user.getName().substring(0, 1);
int color = this.getColorForName(user.getName());
drawTile(canvas, letter, color, left, top, right, bottom);
} }
String name = user.getName();
String letter;
int color;
if (name.length() > 0) {
letter = name.substring(0, 1);
color = this.getColorForName(name);
} else {
letter = "X";
color = PLACEHOLDER_COLOR;
}
drawTile(canvas, letter, color, left, top, right, bottom);
} }
private void drawTile(Canvas canvas, Bitmap bm, int dstleft, int dsttop, private void drawTile(Canvas canvas, Bitmap bm, int dstleft, int dsttop,