diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 5eeb4e7c7d..9e1b0aa482 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -889,8 +889,7 @@ class ChatActivity : LocalUploadProgressProvider provides { refId -> uploadProgressMap[refId] }, LocalUploadedLocalPreviewProvider provides { refId -> uploadedLocalPreviewMap[refId] } ) { - val isOneToOneConversation by remember { mutableStateOf(uiState.isOneToOneConversation) } - Log.d(TAG, "isOneToOneConversation=" + isOneToOneConversation) + val isOneToOneConversation = uiState.isOneToOneConversation // list of the file ids of messages being downloaded val downloadingFileState = remember { mutableStateOf(listOf()) } diff --git a/app/src/main/java/com/nextcloud/talk/ui/chat/MentionChip.kt b/app/src/main/java/com/nextcloud/talk/ui/chat/MentionChip.kt index 67c337d793..93906c3978 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/chat/MentionChip.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/chat/MentionChip.kt @@ -160,7 +160,7 @@ fun resolveMentionFallbackIcon(mention: MentionChipModel): Int = mention.type == "user-group" -> R.drawable.ic_circular_group_mentions mention.type == "circle" -> R.drawable.icon_circular_team mention.isSelfMention -> R.drawable.mention_chip - else -> R.drawable.accent_circle + else -> R.drawable.ic_circular_user } fun estimateMentionChipWidthInEm(label: String, fontSizeSp: Float): Float { diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt index 75dd8c27d9..dcd778ff83 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt @@ -182,7 +182,7 @@ object DisplayUtils { drawable = if (chipResource == R.xml.chip_you) { R.drawable.mention_chip } else { - R.drawable.accent_circle + R.drawable.ic_circular_user } chip.setChipIconResource(drawable) } else { diff --git a/app/src/main/res/drawable/ic_circular_user.xml b/app/src/main/res/drawable/ic_circular_user.xml new file mode 100644 index 0000000000..2dacd5fe71 --- /dev/null +++ b/app/src/main/res/drawable/ic_circular_user.xml @@ -0,0 +1,27 @@ + + + + + + + + + +