From ec1108ccc452d60d9dc3036a558f2509f5bcf125 Mon Sep 17 00:00:00 2001 From: Smarshal21 Date: Sat, 11 Nov 2023 01:24:43 +0530 Subject: [PATCH] removed the instances of vanniktech Signed-off-by: Smarshal21 --- app/build.gradle | 1 - .../messages/IncomingTextMessageViewHolder.kt | 4 +- .../OutcomingTextMessageViewHolder.kt | 4 +- .../application/NextcloudTalkApplication.kt | 6 +-- .../MentionAutocompleteCallback.java | 8 ---- .../nextcloud/talk/utils/TextMatchers.java | 40 ------------------- 6 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 app/src/main/java/com/nextcloud/talk/utils/TextMatchers.java diff --git a/app/build.gradle b/app/build.gradle index fc0f4456c..c9b873e50 100644 --- 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 index 17333d452..061f8196a 100644 --- 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 index 680af44a6..f9dfa95bc 100644 --- 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 index 569747409..fd09ffda6 100644 --- 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 index fe8434393..f29cde274 100644 --- 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.content.Context; 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.DisplayUtils; 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 { @@ -64,12 +60,8 @@ public class MentionAutocompleteCallback implements AutocompleteCallback - * Copyright (C) 2021 Tim Krüger - * Copyright (C) 2017-2018 Mario Danic - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * Partly based on https://github.com/kevalpatel2106/EmoticonGIFKeyboard/blob/master/emoticongifkeyboard/src/main/java/com/kevalpatel2106/emoticongifkeyboard/internal/emoticon/EmoticonUtils.java - */ - -package com.nextcloud.talk.utils; - -import com.vanniktech.emoji.EmojiInformation; -import com.vanniktech.emoji.Emojis; - -import androidx.annotation.Nullable; - -public final class TextMatchers { - - public static boolean isMessageWithSingleEmoticonOnly(@Nullable final String text) { - final EmojiInformation emojiInformation = Emojis.emojiInformation(text); - return (emojiInformation.isOnlyEmojis && emojiInformation.emojis.size() == 1); - } -}