From 041c95c6d248d34010a74a92aedcdf0d74918bbd Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 6 Nov 2024 16:39:17 +0100 Subject: [PATCH] remove jemoji, it adds +13MB --- build.gradle | 1 - .../emoji/AutoScaledEmojiTextView.java | 65 ------------------- .../res/layout/conversation_item_received.xml | 2 +- .../res/layout/conversation_item_sent.xml | 2 +- 4 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 src/main/java/org/thoughtcrime/securesms/components/emoji/AutoScaledEmojiTextView.java diff --git a/build.gradle b/build.gradle index 6d58486a8..0d1308eb5 100644 --- a/build.gradle +++ b/build.gradle @@ -166,7 +166,6 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2' implementation 'androidx.work:work-runtime:2.9.1' implementation "androidx.emoji2:emoji2-emojipicker:1.5.0" - implementation "net.fellbaum:jemoji:1.5.2" implementation 'com.google.guava:guava:31.1-android' implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1' // plays video and audio implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.1' diff --git a/src/main/java/org/thoughtcrime/securesms/components/emoji/AutoScaledEmojiTextView.java b/src/main/java/org/thoughtcrime/securesms/components/emoji/AutoScaledEmojiTextView.java deleted file mode 100644 index 33e2a3c04..000000000 --- a/src/main/java/org/thoughtcrime/securesms/components/emoji/AutoScaledEmojiTextView.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.thoughtcrime.securesms.components.emoji; - -import android.content.Context; -import android.content.res.TypedArray; -import android.util.AttributeSet; -import android.util.TypedValue; - -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatTextView; - -import net.fellbaum.jemoji.Emoji; -import net.fellbaum.jemoji.EmojiManager; - -import java.util.List; - - -public class AutoScaledEmojiTextView extends AppCompatTextView { - - private float originalFontSize; - - public AutoScaledEmojiTextView(Context context) { - this(context, null); - } - - public AutoScaledEmojiTextView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public AutoScaledEmojiTextView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - TypedArray typedArray = context.obtainStyledAttributes(attrs, new int[]{android.R.attr.textSize}); - originalFontSize = typedArray.getDimensionPixelSize(0, 0); - typedArray.recycle(); - } - - @Override - public void setText(@Nullable CharSequence text, BufferType type) { - float scale = getTextScale(text); - super.setTextSize(TypedValue.COMPLEX_UNIT_PX, originalFontSize * scale); - super.setText(text, type); - } - - private float getTextScale(CharSequence text) { - if (text.length() > 16) { - return 1; - } - List emojis = EmojiManager.extractEmojisInOrder(text.toString()); - int emojiCount = emojis.size(); - if (emojiCount <= 8) { - int charCount = text.length(); - for (Emoji emoji : emojis) { - charCount -= emoji.getEmoji().length(); - } - if (charCount == 0) { // only emojis in text - float scale = 1.25f; - if (emojiCount <= 6) scale += 0.25f; - if (emojiCount <= 4) scale += 0.25f; - if (emojiCount <= 2) scale += 0.25f; - return scale; - } - } - return 1; - } - -} diff --git a/src/main/res/layout/conversation_item_received.xml b/src/main/res/layout/conversation_item_received.xml index af1d1abb4..e56f07ead 100644 --- a/src/main/res/layout/conversation_item_received.xml +++ b/src/main/res/layout/conversation_item_received.xml @@ -163,7 +163,7 @@ android:layout_marginLeft="@dimen/message_bubble_horizontal_padding" android:layout_marginRight="@dimen/message_bubble_horizontal_padding" /> - -