Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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<String>()) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
27 changes: 27 additions & 0 deletions app/src/main/res/drawable/ic_circular_user.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!--
~ Nextcloud Talk - Android Client
~
~ SPDX-FileCopyrightText: 2018-2026 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">

<path
android:fillColor="#6B6B6B"
android:pathData="M480,0A480,480 0 1,0 480,960A480,480 0 1,0 480,0Z"/>

<group
android:scaleX="0.7"
android:scaleY="0.7"
android:pivotX="480"
android:pivotY="480">

<path
android:fillColor="@android:color/white"
android:pathData="M480,480Q414,480 367,433Q320,386 320,320Q320,254 367,207Q414,160 480,160Q546,160 593,207Q640,254 640,320Q640,386 593,433Q546,480 480,480ZM160,800L160,688Q160,654 177.5,625.5Q195,597 224,582Q286,551 350,535.5Q414,520 480,520Q546,520 610,535.5Q674,551 736,582Q765,597 782.5,625.5Q800,654 800,688L800,800L160,800ZM240,720L720,720L720,688Q720,677 714.5,668Q709,659 700,654Q646,627 591,613.5Q536,600 480,600Q424,600 369,613.5Q314,627 260,654Q251,659 245.5,668Q240,677 240,688L240,720ZM480,400Q513,400 536.5,376.5Q560,353 560,320Q560,287 536.5,263.5Q513,240 480,240Q447,240 423.5,263.5Q400,287 400,320Q400,353 423.5,376.5Q447,400 480,400Z"/>
</group>
</vector>
Loading