gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 20:19:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some more emoji compatibilities

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-03 16:00:51 +02:00
parent 49fe0a691b
commit 29fa1c7deb
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

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

4
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

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

2
app/src/main/res/layout/controller_conversation_info.xml
View File

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