removed the instances of vanniktech

Signed-off-by: Smarshal21 <[email protected]>
nextcloud · Nov 10, 2023 · ec1108c · ec1108c
1 parent d6ff39a
commit ec1108c
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 60 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -175,7 +175,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "com.vanniktech:emoji-google:0.17.0"
     implementation "androidx.emoji2:emoji2:${emojiVersion}"
     implementation "androidx.emoji2:emoji2-bundled:${emojiVersion}"
     implementation "androidx.emoji2:emoji2-views:${emojiVersion}"

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
@@ -45,7 +45,6 @@ import com.nextcloud.talk.models.json.chat.ChatMessage
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.DateUtils
-import com.nextcloud.talk.utils.TextMatchers
 import com.nextcloud.talk.utils.message.MessageUtils
 import com.nextcloud.talk.utils.preferences.AppPreferences
 import com.stfalcon.chatkit.messages.MessageHolders
@@ -103,8 +102,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
 
         val messageParameters = message.messageParameters
         if (
-            (messageParameters == null || messageParameters.size <= 0) &&
-            TextMatchers.isMessageWithSingleEmoticonOnly(message.text)
+            (messageParameters == null || messageParameters.size <= 0)
         ) {
             textSize = (textSize * TEXT_SIZE_MULTIPLIER).toFloat()
             itemView.isSelected = true

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
@@ -41,7 +41,6 @@ import com.nextcloud.talk.models.json.chat.ReadStatus
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.DateUtils
-import com.nextcloud.talk.utils.TextMatchers
 import com.nextcloud.talk.utils.message.MessageUtils
 import com.stfalcon.chatkit.messages.MessageHolders.OutcomingTextMessageViewHolder
 import javax.inject.Inject
@@ -89,8 +88,7 @@ class OutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessageViewH
 
         val messageParameters = message.messageParameters
         if (
-            (messageParameters == null || messageParameters.size <= 0) &&
-            TextMatchers.isMessageWithSingleEmoticonOnly(message.text)
+            (messageParameters == null || messageParameters.size <= 0)
         ) {
             textSize = (textSize * TEXT_SIZE_MULTIPLIER).toFloat()
             layoutParams.isWrapBefore = true

diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt
@@ -70,8 +70,6 @@ import com.nextcloud.talk.utils.database.arbitrarystorage.ArbitraryStorageModule
 import com.nextcloud.talk.utils.database.user.UserModule
 import com.nextcloud.talk.utils.preferences.AppPreferences
 import com.nextcloud.talk.webrtc.MagicWebRTCUtils
-import com.vanniktech.emoji.EmojiManager
-import com.vanniktech.emoji.google.GoogleEmojiProvider
 import de.cotech.hw.SecurityKeyManager
 import de.cotech.hw.SecurityKeyManagerConfig
 import net.sqlcipher.database.SQLiteDatabase
@@ -181,9 +179,7 @@ class NextcloudTalkApplication : MultiDexApplication(), LifecycleObserver {
 
         val config = BundledEmojiCompatConfig(this)
         config.setReplaceAll(true)
-        val emojiCompat = EmojiCompat.init(config)
-
-        EmojiManager.install(GoogleEmojiProvider())
+        EmojiCompat.init(config)
 
         NotificationUtils.registerNotificationChannels(applicationContext, appPreferences)
     }

diff --git a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
@@ -26,7 +26,6 @@
 import android.text.Editable;
 import android.text.Spanned;
 import android.widget.EditText;
-
 import third.parties.fresco.BetterImageSpan;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.data.user.model.User;
@@ -36,9 +35,6 @@
 import com.nextcloud.talk.utils.MagicCharPolicy;
 import com.nextcloud.talk.utils.text.Spans;
 import com.otaliastudios.autocomplete.AutocompleteCallback;
-import com.vanniktech.emoji.EmojiRange;
-import com.vanniktech.emoji.Emojis;
-
 import kotlin.OptIn;
 
 public class MentionAutocompleteCallback implements AutocompleteCallback<Mention> {
@@ -64,12 +60,8 @@ public boolean onPopupItemClicked(Editable editable, Mention item) {
         if (range == null) {
             return false;
         }
-        String replacement = item.getLabel();
 
         StringBuilder replacementStringBuilder = new StringBuilder(item.getLabel());
-        for (EmojiRange emojiRange : Emojis.emojis(replacement)) {
-            replacementStringBuilder.delete(emojiRange.range.getStart(), emojiRange.range.getEndInclusive());
-        }
 
         editable.replace(range.getStart(), range.getEnd(), replacementStringBuilder + " ");
         Spans.MentionChipSpan mentionChipSpan =

diff --git a/app/src/main/java/com/nextcloud/talk/utils/TextMatchers.java b/app/src/main/java/com/nextcloud/talk/utils/TextMatchers.java