diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-07-09 21:19:48 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-07-09 21:19:48 +0200 |
| commit | f28d23606d8b26363f163885377259baadc0310d (patch) | |
| tree | 239bd6d075dbbbd6674ff24549814eee1b50ab9d /src/main | |
| parent | 71afe8ed86449aeb3795cef48fe815fd23e388d4 (diff) | |
use emoji transform for toolbar, muc name and contacts name
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationsActivity.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java index 294bb6e0c..db70c8147 100644 --- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java @@ -659,7 +659,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers String subject = mucOptions.getSubject(); final boolean hasTitle; if (printableValue(roomName)) { - this.binding.mucTitle.setText(roomName); + this.binding.mucTitle.setText(EmojiWrapper.transform(roomName)); this.binding.mucTitle.setVisibility(View.VISIBLE); hasTitle = true; } else if (!printableValue(subject)) { diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java index 3882fd732..5700e659a 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java @@ -85,6 +85,7 @@ import de.pixart.messenger.ui.interfaces.OnConversationsListItemUpdated; import de.pixart.messenger.ui.util.ActivityResult; import de.pixart.messenger.ui.util.ConversationMenuConfigurator; import de.pixart.messenger.ui.util.PendingItem; +import de.pixart.messenger.utils.EmojiWrapper; import de.pixart.messenger.utils.ExceptionHelper; import de.pixart.messenger.utils.MenuDoubleTabUtil; import de.pixart.messenger.utils.UIHelper; @@ -688,7 +689,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio actionBar.setDisplayShowCustomEnabled(true); TextView abtitle = findViewById(android.R.id.text1); TextView absubtitle = findViewById(android.R.id.text2); - abtitle.setText(conversation.getName()); + abtitle.setText(EmojiWrapper.transform(conversation.getName())); abtitle.setOnClickListener(view1 -> { if (conversation.getMode() == Conversation.MODE_SINGLE) { switchToContactDetails(conversation.getContact()); @@ -766,7 +767,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio if (userWithChatStates.size() > 0) { if (userWithChatStates.size() == 1) { MucOptions.User user = userWithChatStates.get(0); - absubtitle.setText(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user))); + absubtitle.setText(EmojiWrapper.transform(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user)))); } else { StringBuilder builder = new StringBuilder(); for (MucOptions.User user : userWithChatStates) { @@ -775,7 +776,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio } builder.append(UIHelper.getDisplayName(user)); } - absubtitle.setText(getString(R.string.contacts_are_typing, builder.toString())); + absubtitle.setText(EmojiWrapper.transform(getString(R.string.contacts_are_typing, builder.toString()))); } } } else { |