Browse Source

Fix some more emoji compatibilities

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 5 years ago
parent
commit
29fa1c7deb

+ 2 - 1
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java

@@ -51,6 +51,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.graphics.drawable.RoundedBitmapDrawable;
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+import androidx.emoji.text.EmojiCompat;
 import androidx.emoji.widget.EmojiEditText;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -724,7 +725,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
     @Override
     protected String getTitle() {
-        return conversationName;
+        return String.valueOf(EmojiCompat.get().process(conversationName));
     }
 
     @Override

+ 2 - 2
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt

@@ -30,8 +30,8 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ProgressBar
-import android.widget.TextView
 import androidx.appcompat.widget.SwitchCompat
+import androidx.emoji.widget.EmojiTextView
 import androidx.recyclerview.widget.RecyclerView
 import androidx.work.Data
 import androidx.work.OneTimeWorkRequest
@@ -99,7 +99,7 @@ class ConversationInfoController(args: Bundle) : BaseController(args) {
     @BindView(R.id.avatar_image)
     lateinit var conversationAvatarImageView: SimpleDraweeView
     @BindView(R.id.display_name_text)
-    lateinit var conversationDisplayName: TextView
+    lateinit var conversationDisplayName: EmojiTextView
     @BindView(R.id.participants_list_category)
     lateinit var participantsListCategory: MaterialPreferenceCategory
     @BindView(R.id.recycler_view)

+ 1 - 1
app/src/main/res/layout/controller_conversation_info.xml

@@ -58,7 +58,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <TextView
+                    <androidx.emoji.widget.EmojiTextView
                         android:id="@+id/display_name_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"