process emoji charsequence instead of using EmojiTextView
This commit is contained in:
parent
03c34649b4
commit
d7c5937c20
|
@ -13,6 +13,7 @@ import android.graphics.drawable.Drawable;
|
|||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.support.annotation.ColorInt;
|
||||
import android.support.text.emoji.EmojiCompat;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.text.Spannable;
|
||||
import android.text.SpannableString;
|
||||
|
@ -69,6 +70,7 @@ import eu.siacs.conversations.ui.widget.ClickableMovementMethod;
|
|||
import eu.siacs.conversations.ui.widget.CopyTextView;
|
||||
import eu.siacs.conversations.ui.widget.ListSelectionManager;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.utils.EmojiWrapper;
|
||||
import eu.siacs.conversations.utils.Emoticons;
|
||||
import eu.siacs.conversations.utils.GeoHelper;
|
||||
import eu.siacs.conversations.utils.Patterns;
|
||||
|
@ -337,7 +339,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
|
|||
Spannable span = new SpannableString(body);
|
||||
float size = Emoticons.isEmoji(body) ? 3.0f : 2.0f;
|
||||
span.setSpan(new RelativeSizeSpan(size), 0, body.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
viewHolder.messageBody.setText(span);
|
||||
viewHolder.messageBody.setText(EmojiWrapper.transform(span));
|
||||
}
|
||||
|
||||
private int applyQuoteSpan(SpannableStringBuilder body, int start, int end, boolean darkBackground) {
|
||||
|
@ -494,7 +496,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
|
|||
Linkify.addLinks(body, GeoHelper.GEO_URI, "geo");
|
||||
FixedURLSpan.fix(body);
|
||||
viewHolder.messageBody.setAutoLinkMask(0);
|
||||
viewHolder.messageBody.setText(body);
|
||||
viewHolder.messageBody.setText(EmojiWrapper.transform(body));
|
||||
viewHolder.messageBody.setTextIsSelectable(true);
|
||||
viewHolder.messageBody.setMovementMethod(ClickableMovementMethod.getInstance());
|
||||
listSelectionManager.onUpdate(viewHolder.messageBody, message);
|
||||
|
|
|
@ -5,10 +5,10 @@ import android.content.ClipData;
|
|||
import android.content.ClipboardManager;
|
||||
import android.content.Context;
|
||||
import android.os.Build;
|
||||
import android.support.text.emoji.widget.EmojiTextView;
|
||||
import android.util.AttributeSet;
|
||||
import android.widget.TextView;
|
||||
|
||||
public class CopyTextView extends EmojiTextView {
|
||||
public class CopyTextView extends TextView {
|
||||
|
||||
public CopyTextView(Context context) {
|
||||
super(context);
|
||||
|
|
|
@ -0,0 +1,44 @@
|
|||
/*
|
||||
* Copyright (c) 2017, Daniel Gultsch All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
* are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation and/or
|
||||
* other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the copyright holder nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software without
|
||||
* specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
package eu.siacs.conversations.utils;
|
||||
|
||||
import android.support.text.emoji.EmojiCompat;
|
||||
|
||||
public class EmojiWrapper {
|
||||
|
||||
public static CharSequence transform(CharSequence input) {
|
||||
final CharSequence charSequence;
|
||||
if (EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED) {
|
||||
return EmojiCompat.get().process(input);
|
||||
} else {
|
||||
return input;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue