From 7d743a5969331b8f2b660ee5e9d9dde2af5278d1 Mon Sep 17 00:00:00 2001 From: gavine99 Date: Tue, 1 Apr 2025 06:59:27 +1100 Subject: [PATCH] remove deprecated androidx.emoji-appcompat - see https://developer.android.com/develop/ui/views/text-and-emoji/emoji-compat --- build.gradle | 1 - presentation/build.gradle | 1 - .../main/java/com/moez/QKSMS/common/QKApplication.kt | 10 ---------- .../java/com/moez/QKSMS/common/widget/QkTextView.kt | 4 ++-- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 52b7959c..2cdad63f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ buildscript { ext.androidx_constraintlayout_version = '1.1.3' ext.androidx_core_version = '1.1.0' ext.androidx_documentfile_version = '1.0.1' - ext.androidx_emoji_version = '1.0.0' ext.androidx_exifinterface_version = '1.0.0' ext.androidx_testrunner_version = '1.1.0-alpha3' ext.androidx_viewpager_version = '1.0.0-beta05' diff --git a/presentation/build.gradle b/presentation/build.gradle index 33e7d25f..df724297 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -125,7 +125,6 @@ dependencies { implementation "androidx.appcompat:appcompat:$androidx_appcompat_version" implementation "androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_version" implementation "androidx.core:core-ktx:$androidx_core_version" - implementation "androidx.emoji:emoji-appcompat:$androidx_emoji_version" implementation "androidx.viewpager2:viewpager2:$androidx_viewpager_version" implementation "com.google.android.material:material:$material_version" implementation("androidx.work:work-runtime-ktx:$androidx_work_version") diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index f9b7f8ef..9b7b197f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -23,8 +23,6 @@ import android.app.Application import android.app.Service import android.content.BroadcastReceiver import androidx.core.provider.FontRequest -import androidx.emoji.text.EmojiCompat -import androidx.emoji.text.FontRequestEmojiCompatConfig import androidx.work.Configuration import androidx.work.WorkManager import androidx.work.WorkerFactory @@ -106,14 +104,6 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn nightModeManager.updateCurrentTheme() - val fontRequest = FontRequest( - "com.google.android.gms.fonts", - "com.google.android.gms", - "Noto Color Emoji Compat", - R.array.com_google_android_gms_fonts_certs) - - EmojiCompat.init(FontRequestEmojiCompatConfig(this, fontRequest)) - Timber.plant(Timber.DebugTree(), CrashlyticsTree(), fileLoggingTree) RxDogTag.builder() diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt index 220e94ed..ffd7f86a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt @@ -20,14 +20,14 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.util.AttributeSet -import androidx.emoji.widget.EmojiAppCompatTextView +import androidx.appcompat.widget.AppCompatTextView import dev.octoshrimpy.quik.common.util.TextViewStyler import dev.octoshrimpy.quik.injection.appComponent import javax.inject.Inject open class QkTextView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null -) : EmojiAppCompatTextView(context, attrs) { +) : AppCompatTextView(context, attrs) { @Inject lateinit var textViewStyler: TextViewStyler