From 70c47937b8313ccfc417fd3bd2ee60a3b012088b Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 3 Nov 2020 15:54:47 +0100 Subject: [PATCH] Reduce apk size by ~20 MB Signed-off-by: tobiasKaminsky --- build.gradle | 3 +-- .../java/com/nextcloud/ui/SetStatusDialogFragment.kt | 10 ++-------- src/main/res/layout/dialog_set_status.xml | 3 +-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index fedf8a991b..d52db7345f 100644 --- a/build.gradle +++ b/build.gradle @@ -322,8 +322,7 @@ dependencies { implementation 'com.caverock:androidsvg:1.4' implementation 'androidx.annotation:annotation:1.1.0' implementation 'com.google.code.gson:gson:2.8.6' - implementation group: 'androidx.emoji', name: 'emoji-bundled', version: '1.1.0' - implementation 'com.github.vanniktech:Emoji:0.7.0' + implementation 'com.vanniktech:emoji-google:0.7.0' implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido:4.1.0' implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido2:4.1.0' diff --git a/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt b/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt index 2ed43cf877..2d3a74bd0e 100644 --- a/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt +++ b/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt @@ -33,8 +33,6 @@ import android.widget.AdapterView.OnItemSelectedListener import android.widget.ArrayAdapter import androidx.annotation.VisibleForTesting import androidx.appcompat.app.AlertDialog -import androidx.emoji.bundled.BundledEmojiCompatConfig -import androidx.emoji.text.EmojiCompat import androidx.fragment.app.DialogFragment import androidx.recyclerview.widget.LinearLayoutManager import com.google.gson.Gson @@ -58,7 +56,7 @@ import com.owncloud.android.utils.DisplayUtils import com.owncloud.android.utils.ThemeUtils import com.vanniktech.emoji.EmojiManager import com.vanniktech.emoji.EmojiPopup -import com.vanniktech.emoji.googlecompat.GoogleCompatEmojiProvider +import com.vanniktech.emoji.google.GoogleEmojiProvider import kotlinx.android.synthetic.main.dialog_set_status.* import java.util.ArrayList import java.util.Calendar @@ -122,11 +120,7 @@ class SetStatusDialogFragment : } } - val config = BundledEmojiCompatConfig(requireContext()) - config.setReplaceAll(true) - val emojiCompat = EmojiCompat.init(config) - - EmojiManager.install(GoogleCompatEmojiProvider(emojiCompat)) + EmojiManager.install(GoogleEmojiProvider()) } @SuppressLint("InflateParams") diff --git a/src/main/res/layout/dialog_set_status.xml b/src/main/res/layout/dialog_set_status.xml index 3e76164a6c..21f3157603 100644 --- a/src/main/res/layout/dialog_set_status.xml +++ b/src/main/res/layout/dialog_set_status.xml @@ -359,8 +359,7 @@ android:cursorVisible="false" android:gravity="center" android:text="@string/default_emoji" - android:textSize="25sp" - app:maxEmojiCount="1" /> + android:textSize="25sp" />