TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-05 01:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix AppCompatEditText Transformation issues

Browse Source 
Closes #3168
// FREEBIE
This commit is contained in:
Jake McGinty 2015-05-14 15:54:07 -07:00 committed by Moxie Marlinspike
parent c7d2ed4f7d
commit 54db79bfdd
4 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/components/FromTextView.java
View File

@ -8,13 +8,13 @@ import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.TextView;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.Recipients; import org.thoughtcrime.securesms.recipients.Recipients;
public class FromTextView extends TextView { public class FromTextView extends EmojiTextView {
public FromTextView(Context context) { public FromTextView(Context context) {
super(context); super(context);

16
src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
View File

@ -3,6 +3,9 @@ package org.thoughtcrime.securesms.components.emoji;
import android.content.Context; import android.content.Context;
import android.support.v7.widget.AppCompatEditText; import android.support.v7.widget.AppCompatEditText;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import org.thoughtcrime.securesms.components.emoji.EmojiProvider.InvalidatingPageLoadedListener;
public class EmojiEditText extends AppCompatEditText { public class EmojiEditText extends AppCompatEditText {
public EmojiEditText(Context context) { public EmojiEditText(Context context) {
@ -23,16 +26,17 @@ public class EmojiEditText extends AppCompatEditText {
} }
private void init() { private void init() {
setTransformationMethod(new EmojiTransformationMethod());
} }
public void insertEmoji(int codePoint) { public void insertEmoji(int codePoint) {
final char[] chars = Character.toChars(codePoint); final int start = getSelectionStart();
final String text = new String(chars); final int end = getSelectionEnd();
final int start = getSelectionStart(); final char[] chars = Character.toChars(codePoint);
final int end = getSelectionEnd(); final CharSequence text = EmojiProvider.getInstance(getContext()).emojify(new String(chars),
EmojiProvider.EMOJI_SMALL,
new InvalidatingPageLoadedListener(this));
getText().replace(Math.min(start, end), Math.max(start, end), text, 0, text.length()); getText().replace(Math.min(start, end), Math.max(start, end), text);
setSelection(end + chars.length); setSelection(end + chars.length);
} }
} }

27
src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
View File

@ -2,11 +2,16 @@ package org.thoughtcrime.securesms.components.emoji;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.graphics.Rect;
import android.os.Build.VERSION_CODES; import android.os.Build.VERSION_CODES;
import android.support.v7.widget.AppCompatTextView;
import android.text.method.TransformationMethod;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.TextView; import android.view.View;
public class EmojiTextView extends TextView { import org.thoughtcrime.securesms.components.emoji.EmojiProvider.InvalidatingPageLoadedListener;
public class EmojiTextView extends AppCompatTextView {
public EmojiTextView(Context context) { public EmojiTextView(Context context) {
super(context); super(context);
init(); init();
@ -22,13 +27,19 @@ public class EmojiTextView extends TextView {
init(); init();
} }
@TargetApi(VERSION_CODES.LOLLIPOP)
public EmojiTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init();
}
private void init() { private void init() {
setTransformationMethod(new EmojiTransformationMethod()); setTransformationMethod(new EmojiTransformationMethod());
} }
private static class EmojiTransformationMethod implements TransformationMethod {
@Override public CharSequence getTransformation(CharSequence source, View view) {
return EmojiProvider.getInstance(view.getContext()).emojify(source,
EmojiProvider.EMOJI_SMALL,
new InvalidatingPageLoadedListener(view));
}
@Override public void onFocusChanged(View view, CharSequence sourceText, boolean focused,
int direction, Rect previouslyFocusedRect) { }
}
} }

17
src/org/thoughtcrime/securesms/components/emoji/EmojiTransformationMethod.java
View File

@ -1,17 +0,0 @@
package org.thoughtcrime.securesms.components.emoji;
import android.graphics.Rect;
import android.text.method.TransformationMethod;
import android.view.View;
import org.thoughtcrime.securesms.components.emoji.EmojiProvider.InvalidatingPageLoadedListener;
class EmojiTransformationMethod implements TransformationMethod {
@Override public CharSequence getTransformation(CharSequence source, View view) {
return EmojiProvider.getInstance(view.getContext()).emojify(source, EmojiProvider.EMOJI_SMALL, new InvalidatingPageLoadedListener(view));
}
@Override public void onFocusChanged(View view, CharSequence sourceText, boolean focused,
int direction, Rect previouslyFocusedRect) { }
}