Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replaced old emoji library by emoji2

Browse source
This commit is contained in:
Sylvain Berfini 2023-01-12 11:35:59 +01:00
parent 84fbeae5a6
commit 8a09115623
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -196,6 +196,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.6.0' implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.core:core-splashscreen:1.0.0' implementation 'androidx.core:core-splashscreen:1.0.0'
implementation 'androidx.emoji2:emoji2:1.2.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
implementation 'androidx.media:media:1.6.0' implementation 'androidx.media:media:1.6.0'
implementation "androidx.security:security-crypto-ktx:1.1.0-alpha03" implementation "androidx.security:security-crypto-ktx:1.1.0-alpha03"
@ -215,9 +216,6 @@ dependencies {
// https://github.com/google/flexbox-layout/blob/main/LICENSE Apache v2.0 // https://github.com/google/flexbox-layout/blob/main/LICENSE Apache v2.0
implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation 'androidx.emoji:emoji:1.1.0'
implementation 'androidx.emoji:emoji-bundled:1.1.0'
// https://github.com/coil-kt/coil/blob/main/LICENSE.txt Apache v2.0 // https://github.com/coil-kt/coil/blob/main/LICENSE.txt Apache v2.0
def coil_version = "2.2.2" def coil_version = "2.2.2"
implementation("io.coil-kt:coil:$coil_version") implementation("io.coil-kt:coil:$coil_version")

3
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -32,8 +32,6 @@ import android.util.Base64
import android.util.Pair import android.util.Pair
import android.view.* import android.view.*
import android.webkit.MimeTypeMap import android.webkit.MimeTypeMap
import androidx.emoji.bundled.BundledEmojiCompatConfig
import androidx.emoji.text.EmojiCompat
import androidx.lifecycle.* import androidx.lifecycle.*
import androidx.loader.app.LoaderManager import androidx.loader.app.LoaderManager
import com.google.firebase.crashlytics.FirebaseCrashlytics import com.google.firebase.crashlytics.FirebaseCrashlytics
@ -341,7 +339,6 @@ class CoreContext(
notificationsManager.onCoreReady() notificationsManager.onCoreReady()
EmojiCompat.init(BundledEmojiCompatConfig(context))
collator.strength = Collator.NO_DECOMPOSITION collator.strength = Collator.NO_DECOMPOSITION
if (corePreferences.vfsEnabled) { if (corePreferences.vfsEnabled) {

2
app/src/main/java/org/linphone/utils/AppUtils.kt
View file

@ -28,7 +28,7 @@ import android.os.Bundle
import android.text.format.Formatter.formatShortFileSize import android.text.format.Formatter.formatShortFileSize
import android.util.TypedValue import android.util.TypedValue
import androidx.core.content.res.ResourcesCompat import androidx.core.content.res.ResourcesCompat
import androidx.emoji.text.EmojiCompat import androidx.emoji2.text.EmojiCompat
import androidx.media.AudioAttributesCompat import androidx.media.AudioAttributesCompat
import androidx.media.AudioFocusRequestCompat import androidx.media.AudioFocusRequestCompat
import androidx.media.AudioManagerCompat import androidx.media.AudioManagerCompat