TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add vertical spacing to emoji sprites

Browse Source 
Downsampling on low-dpi devices led to 1px bleeds between
sprite areas.

Fixes #3203
Closes #3206
// FREEBIE
This commit is contained in:
Jake McGinty 2015-05-20 16:16:27 -07:00 committed by Moxie Marlinspike
parent bc164ef549
commit 7ecc58095b
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/emoji-0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 346 KiB

After

Width:  |  Height:  |  Size: 347 KiB

BIN
assets/emoji-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 436 KiB

After

Width:  |  Height:  |  Size: 436 KiB

BIN
assets/emoji-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 511 KiB

After

Width:  |  Height:  |  Size: 515 KiB

BIN
assets/emoji-3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 272 KiB

After

Width:  |  Height:  |  Size: 273 KiB

BIN
assets/emoji-4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 312 KiB

After

Width:  |  Height:  |  Size: 315 KiB

13
src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
View File

@ -50,11 +50,13 @@ public class EmojiProvider {
public static final double EMOJI_SMALL = 0.50; public static final double EMOJI_SMALL = 0.50;
public static final int EMOJI_RAW_HEIGHT = 128; public static final int EMOJI_RAW_HEIGHT = 128;
public static final int EMOJI_RAW_WIDTH = 136; public static final int EMOJI_RAW_WIDTH = 136;
public static final int EMOJI_VERT_PAD = 8;
public static final int EMOJI_PER_ROW = 15; public static final int EMOJI_PER_ROW = 15;
private final Context context; private final Context context;
private final double drawWidth; private final double drawWidth;
private final double drawHeight; private final double drawHeight;
private final double verticalPad;
private final Handler handler = new Handler(Looper.getMainLooper()); private final Handler handler = new Handler(Looper.getMainLooper());
public static EmojiProvider getInstance(Context context) { public static EmojiProvider getInstance(Context context) {
@ -71,9 +73,10 @@ public class EmojiProvider {
private EmojiProvider(Context context) { private EmojiProvider(Context context) {
int[] pages = ResUtil.getResourceIds(context, R.array.emoji_categories); int[] pages = ResUtil.getResourceIds(context, R.array.emoji_categories);
this.context = context.getApplicationContext(); this.context = context.getApplicationContext();
this.drawHeight = context.getResources().getDimension(R.dimen.emoji_drawer_size); this.drawHeight = context.getResources().getDimension(R.dimen.emoji_drawer_size);
this.drawWidth = drawHeight * ((double)EMOJI_RAW_WIDTH) / EMOJI_RAW_HEIGHT; this.drawWidth = drawHeight * ((double)EMOJI_RAW_WIDTH) / EMOJI_RAW_HEIGHT;
this.verticalPad = EMOJI_VERT_PAD * drawHeight / EMOJI_RAW_HEIGHT;
Log.w(TAG, "draw size: " + drawWidth + "x" + drawHeight); Log.w(TAG, "draw size: " + drawWidth + "x" + drawHeight);
for (int i = 0; i < pages.length; i++) { for (int i = 0; i < pages.length; i++) {
final EmojiPageBitmap page = new EmojiPageBitmap(i); final EmojiPageBitmap page = new EmojiPageBitmap(i);
@ -156,9 +159,9 @@ public class EmojiProvider {
canvas.drawBitmap(bmp, canvas.drawBitmap(bmp,
new Rect((int)(row_index * width), new Rect((int)(row_index * width),
(int)(row * height), (int)(row * height + row * verticalPad),
(int)((row_index + 1) * width), (int)((row_index + 1) * width),
(int)((row + 1) * height)), (int)((row + 1) * height + row * verticalPad)),
b, b,
paint); paint);
} }