Patch to compile
This commit is contained in:
parent
ba0cdfb770
commit
06bd1c4b76
|
@ -592,7 +592,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
|
||||||
|
|
||||||
private fun updateProfiles() {
|
private fun updateProfiles() {
|
||||||
val profiles: MutableList<IProfile> = accountManager.getAllAccountsOrderedByActive().map { acc ->
|
val profiles: MutableList<IProfile> = accountManager.getAllAccountsOrderedByActive().map { acc ->
|
||||||
val emojifiedName = EmojiCompat.get().process(acc.displayName.emojify(acc.emojis, header))
|
val emojifiedName = EmojiCompat.get().process(acc.displayName.emojify(acc.emojis, header, true))
|
||||||
|
|
||||||
ProfileDrawerItem().apply {
|
ProfileDrawerItem().apply {
|
||||||
isSelected = acc.isActive
|
isSelected = acc.isActive
|
||||||
|
|
|
@ -81,6 +81,7 @@ import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.ListIterator;
|
import java.util.ListIterator;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="action_unmute_conversation">Gesprächstummhaltung aufheben</string>
|
<!--<string name="action_unmute_conversation">Gesprächstummhaltung aufheben</string>-->
|
||||||
<string name="action_disable_formatting_syntax">%s deaktivieren</string>
|
<string name="action_disable_formatting_syntax">%s deaktivieren</string>
|
||||||
<string name="action_emoji_react">Reagieren</string>
|
<string name="action_emoji_react">Reagieren</string>
|
||||||
<string name="action_emoji_unreact">Reaktion entfernen</string>
|
<string name="action_emoji_unreact">Reaktion entfernen</string>
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
<string name="notification_emoji_description">Benachrictigungen über neue Emojireaktionen</string>
|
<string name="notification_emoji_description">Benachrictigungen über neue Emojireaktionen</string>
|
||||||
<string name="pref_title_default_formatting">Standardformatierungssyntax (wenn von der Instanz unterstützt)</string>
|
<string name="pref_title_default_formatting">Standardformatierungssyntax (wenn von der Instanz unterstützt)</string>
|
||||||
<string name="pref_title_hide_muted_users">Ignorierte Nutzer verstecken</string>
|
<string name="pref_title_hide_muted_users">Ignorierte Nutzer verstecken</string>
|
||||||
<string name="action_mute_conversation">Gespräch stummschalten</string>
|
<!--<string name="action_mute_conversation">Gespräch stummschalten</string>-->
|
||||||
<string name="pref_title_notification_filter_emoji">Reaktionen auf meine Nachrichten</string>
|
<string name="pref_title_notification_filter_emoji">Reaktionen auf meine Nachrichten</string>
|
||||||
<string name="action_reply_to">Antwort auf</string>
|
<string name="action_reply_to">Antwort auf</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<string name="hint_website">Site internet de l\'application</string>
|
<string name="hint_website">Site internet de l\'application</string>
|
||||||
<string name="pref_title_notification_filter_emoji">mes messages peuvent recevoir des réactions</string>
|
<string name="pref_title_notification_filter_emoji">mes messages peuvent recevoir des réactions</string>
|
||||||
<string name="action_reply_to">Répondre à</string>
|
<string name="action_reply_to">Répondre à</string>
|
||||||
<string name="action_unmute_conversation">Afficher la conversation</string>
|
<!--<string name="action_unmute_conversation">Afficher la conversation</string>-->
|
||||||
<string name="action_emoji_react">Réagir</string>
|
<string name="action_emoji_react">Réagir</string>
|
||||||
<string name="action_emoji_unreact">Supprimer la réaction</string>
|
<string name="action_emoji_unreact">Supprimer la réaction</string>
|
||||||
<string name="action_emoji_reacted_by">Réaction de</string>
|
<string name="action_emoji_reacted_by">Réaction de</string>
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
<string name="error_media_upload_size">La taille du fichier dépasse la limite de l\'instance</string>
|
<string name="error_media_upload_size">La taille du fichier dépasse la limite de l\'instance</string>
|
||||||
<string name="action_enable_formatting_syntax">Activer %s</string>
|
<string name="action_enable_formatting_syntax">Activer %s</string>
|
||||||
<string name="action_disable_formatting_syntax">Désactiver %s</string>
|
<string name="action_disable_formatting_syntax">Désactiver %s</string>
|
||||||
<string name="action_mute_conversation">Masquer la conversation</string>
|
<!--<string name="action_mute_conversation">Masquer la conversation</string>-->
|
||||||
<string name="admin">Administrateur•rice</string>
|
<string name="admin">Administrateur•rice</string>
|
||||||
<string name="pref_title_default_formatting">Syntaxe de formatage par défaut (si supportée par l\'instance)</string>
|
<string name="pref_title_default_formatting">Syntaxe de formatage par défaut (si supportée par l\'instance)</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="action_reply_to">Ответ на</string>
|
<string name="action_reply_to">Ответ на</string>
|
||||||
<string name="action_mute_conversation">Заглушить разговор</string>
|
<!--<string name="action_mute_conversation">Заглушить разговор</string>
|
||||||
<string name="action_unmute_conversation">Отменить глушение разговора</string>
|
<string name="action_unmute_conversation">Отменить глушение разговора</string>-->
|
||||||
<string name="action_emoji_react">Добавить реакцию</string>
|
<string name="action_emoji_react">Добавить реакцию</string>
|
||||||
<string name="action_emoji_unreact">Удалить реакцию</string>
|
<string name="action_emoji_unreact">Удалить реакцию</string>
|
||||||
<string name="action_emoji_reacted_by">Реакции</string>
|
<string name="action_emoji_reacted_by">Реакции</string>
|
||||||
|
@ -20,4 +20,4 @@
|
||||||
<string name="pref_title_default_formatting">Синтаксис форматирования по умолчанию(если поддерживается)</string>
|
<string name="pref_title_default_formatting">Синтаксис форматирования по умолчанию(если поддерживается)</string>
|
||||||
<string name="pref_title_notification_filter_emoji">на мои посты отреагировали</string>
|
<string name="pref_title_notification_filter_emoji">на мои посты отреагировали</string>
|
||||||
<string name="pref_title_hide_muted_users">Скрывать заглушенных пользователей</string>
|
<string name="pref_title_hide_muted_users">Скрывать заглушенных пользователей</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<string name="action_reply_to">Reply to</string>
|
<string name="action_reply_to">Reply to</string>
|
||||||
<string name="action_mute_conversation">Mute conversation</string>
|
<!--<string name="action_mute_conversation">Mute conversation</string>
|
||||||
<string name="action_unmute_conversation">Unmute conversation</string>
|
<string name="action_unmute_conversation">Unmute conversation</string>-->
|
||||||
<string name="action_emoji_react">React</string>
|
<string name="action_emoji_react">React</string>
|
||||||
<string name="action_emoji_unreact">Remove reaction</string>
|
<string name="action_emoji_unreact">Remove reaction</string>
|
||||||
<string name="action_emoji_reacted_by">Who reacted</string>
|
<string name="action_emoji_reacted_by">Who reacted</string>
|
||||||
|
|
|
@ -109,6 +109,8 @@
|
||||||
<string name="action_mute">Mute</string>
|
<string name="action_mute">Mute</string>
|
||||||
<string name="action_unmute">Unmute</string>
|
<string name="action_unmute">Unmute</string>
|
||||||
<string name="action_mute_domain">Mute %s</string>
|
<string name="action_mute_domain">Mute %s</string>
|
||||||
|
<string name="action_mute_conversation">Mute conversation</string>
|
||||||
|
<string name="action_unmute_conversation">Unmute conversation</string>
|
||||||
<string name="action_mention">Mention</string>
|
<string name="action_mention">Mention</string>
|
||||||
<string name="action_hide_media">Hide media</string>
|
<string name="action_hide_media">Hide media</string>
|
||||||
<string name="action_open_drawer">Open drawer</string>
|
<string name="action_open_drawer">Open drawer</string>
|
||||||
|
|
Loading…
Reference in New Issue