TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert emoji ellipsizing temporarily

Browse Source 
it doesn't react to layout changes correct, better
to not have it for the time being.

closes #3718
closes #3812
// FREEBIE
This commit is contained in:
Jake McGinty 2015-07-28 12:05:46 -07:00 committed by Moxie Marlinspike
parent 5cf95f5b3d
commit e145b8171d
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java
View File

@ -4,17 +4,13 @@ import android.text.InputFilter;
import android.text.Spannable; import android.text.Spannable;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextUtils.TruncateAt;
import android.view.View;
import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.widget.TextView; import android.widget.TextView;
public class EmojiFilter implements InputFilter, OnGlobalLayoutListener { public class EmojiFilter implements InputFilter {
private TextView view; private TextView view;
public EmojiFilter(TextView view) { public EmojiFilter(TextView view) {
this.view = view; this.view = view;
view.getViewTreeObserver().addOnGlobalLayoutListener(this);
} }
@Override public CharSequence filter(CharSequence source, int start, int end, @Override public CharSequence filter(CharSequence source, int start, int end,
@ -26,18 +22,6 @@ public class EmojiFilter implements InputFilter, OnGlobalLayoutListener {
if (source instanceof Spanned) { if (source instanceof Spanned) {
TextUtils.copySpansFrom((Spanned) source, start, end, null, emojified, 0); TextUtils.copySpansFrom((Spanned) source, start, end, null, emojified, 0);
} }
if (view.getWidth() == 0 || view.getEllipsize() != TruncateAt.END) { return emojified;
return emojified;
} else {
return TextUtils.ellipsize(emojified,
view.getPaint(),
view.getWidth() - view.getPaddingRight() - view.getPaddingLeft(),
TruncateAt.END);
}
}
@SuppressWarnings("deprecation")
@Override public void onGlobalLayout() {
view.invalidate();
} }
} }