feat: add extra info for users without avatars in missing places (WPB…

…-1750) (#3403)
wireapp · Aug 30, 2024 · 1e6d17c · 1e6d17c
1 parent 74c545c
commit 1e6d17c
Show file tree

Hide file tree

Showing 38 changed files with 435 additions and 185 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/mapper/ContactMapper.kt b/app/src/main/kotlin/com/wire/android/mapper/ContactMapper.kt
@@ -19,6 +19,7 @@
 package com.wire.android.mapper
 
 import com.wire.android.model.ImageAsset
+import com.wire.android.model.NameBasedAvatar
 import com.wire.android.model.UserAvatarData
 import com.wire.android.ui.home.conversationslist.model.Membership
 import com.wire.android.ui.home.newconversation.model.Contact
@@ -47,7 +48,8 @@ class ContactMapper
                 label = UsernameMapper.fromOtherUser(otherUser),
                 avatarData = UserAvatarData(
                     asset = previewPicture?.let { ImageAsset.UserAvatarAsset(wireSessionImageLoader, it) },
-                    connectionState = connectionStatus
+                    connectionState = connectionStatus,
+                    nameBasedAvatar = NameBasedAvatar(fullName = name, accentColor = otherUser.accentId)
                 ),
                 membership = userTypeMapper.toMembership(userType),
                 connectionState = otherUser.connectionStatus
@@ -63,7 +65,8 @@ class ContactMapper
                 name = name,
                 label = String.EMPTY,
                 avatarData = UserAvatarData(
-                    asset = previewAssetId?.let { ImageAsset.UserAvatarAsset(wireSessionImageLoader, it) }
+                    asset = previewAssetId?.let { ImageAsset.UserAvatarAsset(wireSessionImageLoader, it) },
+                    membership = Membership.Service
                 ),
                 membership = Membership.Service,
                 connectionState = ConnectionState.ACCEPTED
@@ -79,7 +82,8 @@ class ContactMapper
                 name = name ?: String.EMPTY,
                 label = mapUserHandle(user),
                 avatarData = UserAvatarData(
-                    asset = previewAssetId?.let { ImageAsset.UserAvatarAsset(wireSessionImageLoader, it) }
+                    asset = previewAssetId?.let { ImageAsset.UserAvatarAsset(wireSessionImageLoader, it) },
+                    nameBasedAvatar = NameBasedAvatar(fullName = name, accentColor = -1)
                 ),
                 membership = userTypeMapper.toMembership(type),
                 connectionState = connectionStatus

diff --git a/app/src/main/kotlin/com/wire/android/mapper/MessageMapper.kt b/app/src/main/kotlin/com/wire/android/mapper/MessageMapper.kt
@@ -19,6 +19,7 @@
 package com.wire.android.mapper
 
 import com.wire.android.R
+import com.wire.android.model.NameBasedAvatar
 import com.wire.android.model.UserAvatarData
 import com.wire.android.ui.home.conversations.findUser
 import com.wire.android.ui.home.conversations.model.ExpirationStatus
@@ -201,7 +202,9 @@ class MessageMapper @Inject constructor(
     private fun getUserAvatarData(sender: User?) = UserAvatarData(
         asset = sender?.previewAsset(wireSessionImageLoader),
         availabilityStatus = sender?.availabilityStatus ?: UserAvailabilityStatus.NONE,
-        connectionState = getConnectionState(sender)
+        membership = sender?.userType?.let { userTypeMapper.toMembership(it) } ?: Membership.None,
+        connectionState = getConnectionState(sender),
+        nameBasedAvatar = NameBasedAvatar(sender?.name, sender?.accentId ?: -1)
     )
 
     private fun getConnectionState(sender: User?) =

diff --git a/app/src/main/kotlin/com/wire/android/mapper/UICallParticipantMapper.kt b/app/src/main/kotlin/com/wire/android/mapper/UICallParticipantMapper.kt
@@ -38,6 +38,7 @@ class UICallParticipantMapper @Inject constructor(
         isSharingScreen = participant.isSharingScreen,
         avatar = participant.avatarAssetId?.let { ImageAsset.UserAvatarAsset(wireSessionImageLoader, it) },
         membership = userTypeMapper.toMembership(participant.userType),
-        hasEstablishedAudio = participant.hasEstablishedAudio
+        hasEstablishedAudio = participant.hasEstablishedAudio,
+        accentId = participant.accentId
     )
 }
diff --git a/app/src/main/kotlin/com/wire/android/model/UserAvatarData.kt b/app/src/main/kotlin/com/wire/android/model/UserAvatarData.kt
@@ -20,6 +20,7 @@ package com.wire.android.model
 
 import androidx.compose.runtime.Stable
 import com.wire.android.ui.home.conversationslist.model.Membership
+import com.wire.android.util.EMPTY
 import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.UserAvailabilityStatus
 
@@ -28,5 +29,31 @@ data class UserAvatarData(
     val asset: ImageAsset.UserAvatarAsset? = null,
     val availabilityStatus: UserAvailabilityStatus = UserAvailabilityStatus.NONE,
     val connectionState: ConnectionState? = null,
-    val membership: Membership = Membership.None
-)
+    val membership: Membership = Membership.None,
+    val nameBasedAvatar: NameBasedAvatar? = null
+) {
+
+    fun shouldPreferNameBasedAvatar(): Boolean {
+        return asset == null && nameBasedAvatar != null &&
+                nameBasedAvatar.initials.isEmpty().not() && membership != Membership.Service
+    }
+}
+
+/**
+ * Holder that can be used to generate an avatar based on the user's full name initials and accent color.
+ */
+data class NameBasedAvatar(val fullName: String?, val accentColor: Int) {
+    val initials: String
+        get() {
+            if (fullName.isNullOrEmpty()) return String.EMPTY
+            val names = fullName.split(" ").map { it.uppercase() }
+            return when {
+                names.size > 1 -> {
+                    val initials = names.map { it.first() }
+                    initials.first().toString() + initials.last()
+                }
+
+                else -> names.first().take(2)
+            }
+        }
+}
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/CallState.kt b/app/src/main/kotlin/com/wire/android/ui/calling/CallState.kt
@@ -30,6 +30,7 @@ data class CallState(
     val conversationId: ConversationId,
     val conversationName: ConversationName? = null,
     val callerName: String? = null,
+    val accentId: Int = -1,
     val callStatus: CallStatus = CallStatus.CLOSED,
     val avatarAssetId: UserAvatarAsset? = null,
     val participants: List<UICallParticipant> = listOf(),

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/SharedCallingViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/calling/SharedCallingViewModel.kt
@@ -145,7 +145,8 @@ class SharedCallingViewModel @AssistedInject constructor(
                             membership = userTypeMapper.toMembership(details.otherUser.userType),
                             protocolInfo = details.conversation.protocol,
                             mlsVerificationStatus = details.conversation.mlsVerificationStatus,
-                            proteusVerificationStatus = details.conversation.proteusVerificationStatus
+                            proteusVerificationStatus = details.conversation.proteusVerificationStatus,
+                            accentId = details.otherUser.accentId
                         )
                     }
 

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/common/CallerDetails.kt b/app/src/main/kotlin/com/wire/android/ui/calling/common/CallerDetails.kt
@@ -33,9 +33,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import com.wire.android.R
 import com.wire.android.model.ImageAsset
+import com.wire.android.model.NameBasedAvatar
 import com.wire.android.model.UserAvatarData
 import com.wire.android.ui.calling.ConversationName
 import com.wire.android.ui.common.ConversationVerificationIcons
@@ -47,8 +47,10 @@ import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.spacers.VerticalSpace
 import com.wire.android.ui.home.conversationslist.model.Membership
 import com.wire.android.ui.home.conversationslist.model.hasLabel
+import com.wire.android.ui.theme.WireTheme
 import com.wire.android.ui.theme.wireTypography
 import com.wire.android.util.EMPTY
+import com.wire.android.util.ui.PreviewMultipleThemes
 import com.wire.kalium.logic.data.call.ConversationTypeForCall
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.id.ConversationId
@@ -58,6 +60,7 @@ import java.util.Locale
 fun CallerDetails(
     conversationId: ConversationId,
     conversationName: ConversationName?,
+    accentId: Int,
     isCameraOn: Boolean,
     isCbrEnabled: Boolean,
     avatarAssetId: ImageAsset.UserAvatarAsset?,
@@ -70,7 +73,9 @@ fun CallerDetails(
     onMinimiseScreen: () -> Unit
 ) {
     Column(
-        modifier = Modifier.fillMaxSize().padding(top = dimensions().spacing32x),
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(top = dimensions().spacing32x),
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -132,29 +137,35 @@ fun CallerDetails(
 
         if (!isCameraOn && conversationTypeForCall == ConversationTypeForCall.OneOnOne) {
             UserProfileAvatar(
-                avatarData = UserAvatarData(avatarAssetId),
+                avatarData = UserAvatarData(
+                    asset = avatarAssetId,
+                    nameBasedAvatar = NameBasedAvatar((conversationName as? ConversationName.Known)?.name, accentId)
+                ),
                 size = dimensions().outgoingCallUserAvatarSize,
                 modifier = Modifier.padding(top = dimensions().spacing16x)
             )
         }
     }
 }
 
-@Preview(showBackground = true)
+@PreviewMultipleThemes
 @Composable
 fun PreviewCallerDetails() {
-    CallerDetails(
-        conversationId = ConversationId("value", "domain"),
-        conversationName = ConversationName.Known("User"),
-        isCameraOn = false,
-        isCbrEnabled = false,
-        avatarAssetId = null,
-        conversationTypeForCall = ConversationTypeForCall.OneOnOne,
-        membership = Membership.Guest,
-        callingLabel = String.EMPTY,
-        protocolInfo = null,
-        mlsVerificationStatus = null,
-        proteusVerificationStatus = Conversation.VerificationStatus.VERIFIED,
-        onMinimiseScreen = { }
-    )
+    WireTheme {
+        CallerDetails(
+            conversationId = ConversationId("value", "domain"),
+            conversationName = ConversationName.Known("Jon Doe"),
+            isCameraOn = false,
+            isCbrEnabled = false,
+            avatarAssetId = null,
+            conversationTypeForCall = ConversationTypeForCall.OneOnOne,
+            membership = Membership.Guest,
+            callingLabel = String.EMPTY,
+            protocolInfo = null,
+            mlsVerificationStatus = null,
+            proteusVerificationStatus = Conversation.VerificationStatus.VERIFIED,
+            onMinimiseScreen = { },
+            accentId = -1
+        )
+    }
 }
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/incoming/IncomingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/incoming/IncomingCallScreen.kt
@@ -262,7 +262,8 @@ private fun IncomingCallContent(
                 protocolInfo = callState.protocolInfo,
                 mlsVerificationStatus = callState.mlsVerificationStatus,
                 proteusVerificationStatus = callState.proteusVerificationStatus,
-                onMinimiseScreen = onMinimiseScreen
+                onMinimiseScreen = onMinimiseScreen,
+                accentId = callState.accentId
             )
         }
     }

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/model/UICallParticipant.kt b/app/src/main/kotlin/com/wire/android/ui/calling/model/UICallParticipant.kt
@@ -32,5 +32,6 @@ data class UICallParticipant(
     val isSharingScreen: Boolean,
     val avatar: ImageAsset.UserAvatarAsset? = null,
     val membership: Membership,
-    val hasEstablishedAudio: Boolean
+    val hasEstablishedAudio: Boolean,
+    val accentId: Int
 )
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt
@@ -521,6 +521,7 @@ fun buildPreviewParticipantsList(count: Int = 10) = buildList {
                 isSharingScreen = false,
                 avatar = null,
                 membership = Membership.Admin,
+                accentId = -1
             )
         )
     }

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt
@@ -70,6 +70,7 @@ import androidx.lifecycle.LifecycleOwner
 import com.waz.avs.CameraPreviewBuilder
 import com.waz.avs.VideoRenderer
 import com.wire.android.R
+import com.wire.android.model.NameBasedAvatar
 import com.wire.android.model.UserAvatarData
 import com.wire.android.ui.calling.model.UICallParticipant
 import com.wire.android.ui.common.UserProfileAvatar
@@ -119,7 +120,10 @@ fun ParticipantTile(
                         width = Dimension.fillToConstraints.atMost(maxAvatarSize)
                         height = Dimension.fillToConstraints.atMost(maxAvatarSize + activeSpeakerBorderPadding)
                     },
-                avatar = UserAvatarData(participantTitleState.avatar),
+                avatar = UserAvatarData(
+                    asset = participantTitleState.avatar,
+                    nameBasedAvatar = NameBasedAvatar(participantTitleState.name, participantTitleState.accentId)
+                ),
             )
 
             if (isSelfUser) {
@@ -144,7 +148,8 @@ fun ParticipantTile(
                 isSelfUser = isSelfUser,
                 isSelfUserMuted = isSelfUserMuted,
                 modifier = Modifier
-                    .padding( // move by the size of the active speaker border
+                    .padding(
+                        // move by the size of the active speaker border
                         start = dimensions().spacing6x,
                         end = dimensions().spacing6x,
                         bottom = dimensions().spacing6x,
@@ -452,6 +457,7 @@ private fun PreviewParticipantTile(
             avatar = null,
             membership = Membership.Admin,
             hasEstablishedAudio = hasEstablishedAudio,
+            accentId = -1
         ),
         onClearSelfUserVideoPreview = {},
         onSelfUserVideoPreviewCreated = {},

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/outgoing/OutgoingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/outgoing/OutgoingCallScreen.kt
@@ -181,7 +181,8 @@ private fun OutgoingCallContent(
                 protocolInfo = callState.protocolInfo,
                 mlsVerificationStatus = callState.mlsVerificationStatus,
                 proteusVerificationStatus = callState.proteusVerificationStatus,
-                onMinimiseScreen = onMinimiseScreen
+                onMinimiseScreen = onMinimiseScreen,
+                accentId = callState.accentId
             )
         }
     }