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

Fix text emoji pane font size and vertical align

Browse Source 
Fixes #3426
Closes #5196
This commit is contained in:
Brad Erickson 2016-02-08 14:23:39 -08:00 committed by Moxie Marlinspike
parent bc4dd7d002
commit 4c7d2d2c66
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.components.emoji;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.util.AttributeSet; import android.util.AttributeSet;
@ -17,7 +16,6 @@ public class EmojiView extends View implements Drawable.Callback {
private Drawable drawable; private Drawable drawable;
private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG); private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
private final Rect textBounds = new Rect();
public EmojiView(Context context) { public EmojiView(Context context) {
this(context, null); this(context, null);
@ -54,12 +52,17 @@ public class EmojiView extends View implements Drawable.Callback {
float targetFontSize = 0.75f * getHeight() - getPaddingTop() - getPaddingBottom(); float targetFontSize = 0.75f * getHeight() - getPaddingTop() - getPaddingBottom();
paint.setTextSize(targetFontSize); paint.setTextSize(targetFontSize);
paint.setColor(ResUtil.getColor(getContext(), R.attr.emoji_text_color)); paint.setColor(ResUtil.getColor(getContext(), R.attr.emoji_text_color));
paint.getTextBounds(emoji, 0, emoji.length(), textBounds); paint.setTextAlign(Paint.Align.CENTER);
float overflow = textBounds.width() / (getWidth() - getPaddingLeft() - getPaddingRight()); int xPos = (canvas.getWidth() / 2);
int yPos = (int) ((canvas.getHeight() / 2) - ((paint.descent() + paint.ascent()) / 2));
float overflow = paint.measureText(emoji) /
(getWidth() - getPaddingLeft() - getPaddingRight());
if (overflow > 1f) { if (overflow > 1f) {
paint.setTextSize(targetFontSize / overflow); paint.setTextSize(targetFontSize / overflow);
yPos = (int) ((canvas.getHeight() / 2) - ((paint.descent() + paint.ascent()) / 2));
} }
canvas.drawText(emoji, 0.5f * (getWidth() - textBounds.width()), 0.5f * (getHeight() + textBounds.height()), paint); canvas.drawText(emoji, xPos, yPos, paint);
} }
} }