sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use emoji transform for toolbar and muc name

This commit is contained in:
Daniel Gultsch 2018-06-25 09:25:55 +02:00
parent fd3b54aaff
commit 6c0b977a0e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View File

@ -609,7 +609,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
String subject = mucOptions.getSubject(); String subject = mucOptions.getSubject();
final boolean hasTitle; final boolean hasTitle;
if (printableValue(roomName)) { if (printableValue(roomName)) {
this.binding.mucTitle.setText(roomName); this.binding.mucTitle.setText(EmojiWrapper.transform(roomName));
this.binding.mucTitle.setVisibility(View.VISIBLE); this.binding.mucTitle.setVisibility(View.VISIBLE);
hasTitle = true; hasTitle = true;
} else if (!printableValue(subject)) { } else if (!printableValue(subject)) {

3
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View File

@ -74,6 +74,7 @@ import eu.siacs.conversations.ui.util.ActivityResult;
import eu.siacs.conversations.ui.util.ConversationMenuConfigurator; import eu.siacs.conversations.ui.util.ConversationMenuConfigurator;
import eu.siacs.conversations.ui.util.MenuDoubleTabUtil; import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
import eu.siacs.conversations.ui.util.PendingItem; import eu.siacs.conversations.ui.util.PendingItem;
import eu.siacs.conversations.utils.EmojiWrapper;
import eu.siacs.conversations.utils.ExceptionHelper; import eu.siacs.conversations.utils.ExceptionHelper;
import eu.siacs.conversations.utils.XmppUri; import eu.siacs.conversations.utils.XmppUri;
import eu.siacs.conversations.xmpp.OnUpdateBlocklist; import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
@ -567,7 +568,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
if (mainFragment != null && mainFragment instanceof ConversationFragment) { if (mainFragment != null && mainFragment instanceof ConversationFragment) {
final Conversation conversation = ((ConversationFragment) mainFragment).getConversation(); final Conversation conversation = ((ConversationFragment) mainFragment).getConversation();
if (conversation != null) { if (conversation != null) {
actionBar.setTitle(conversation.getName()); actionBar.setTitle(EmojiWrapper.transform(conversation.getName()));
actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true);
return; return;
} }