better fallback to "guest" if participant name not known

Signed-off-by: Marcel Hibbe <[email protected]>

Author: mahibi

app/src/main/java/com/nextcloud/talk/call/components/AvatarWithFallback.kt

@@ -19,23 +19,24 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
-import com.nextcloud.talk.R
 import com.nextcloud.talk.activities.ParticipantUiState
 import com.nextcloud.talk.models.json.participants.Participant
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.DisplayUtils.isDarkModeOn
 
 @Composable
-fun AvatarWithFallback(participant: ParticipantUiState, modifier: Modifier = Modifier) {
+fun AvatarWithFallback(participant: ParticipantUiState, displayName: String, modifier: Modifier = Modifier) {
     Box(
         modifier = modifier
             .clip(CircleShape),
         contentAlignment = Alignment.Center
     ) {
-        val avatarUrl = getUrlForAvatar(participant = participant)
+        val avatarUrl = getUrlForAvatar(
+            participant = participant,
+            displayName = displayName
+        )
         if (avatarUrl.isNotEmpty()) {
             AsyncImage(
                 model = avatarUrl,
@@ -73,7 +74,7 @@ private fun FallbackAvatar(participant: ParticipantUiState) {
 }
 
 @Composable
-fun getUrlForAvatar(participant: ParticipantUiState): String {
+fun getUrlForAvatar(participant: ParticipantUiState, displayName: String): String {
     var url = ApiUtils.getUrlForAvatar(
         participant.baseUrl,
         participant.actorId,
@@ -84,7 +85,7 @@ fun getUrlForAvatar(participant: ParticipantUiState): String {
     ) {
         url = ApiUtils.getUrlForGuestAvatar(
             participant.baseUrl,
-            participant.nick ?: stringResource(R.string.nc_nick_guest),
+            displayName,
             true
         )
     }

app/src/main/java/com/nextcloud/talk/call/components/ParticipantTile.kt

@@ -57,7 +57,13 @@ fun ParticipantTile(
     isVoiceOnlyCall: Boolean,
     onScreenShareIconClick: ((String?) -> Unit?)?
 ) {
-    val color = Color(ColorGenerator.usernameToColor(participantUiState.nick ?: ""))
+    val displayName = if (participantUiState.nick.isNullOrEmpty()) {
+        stringResource(R.string.nc_nick_guest)
+    } else {
+        participantUiState.nick
+    }
+
+    val color = Color(ColorGenerator.usernameToColor(displayName))
 
     BoxWithConstraints(
         modifier = modifier
@@ -71,6 +77,7 @@ fun ParticipantTile(
         } else {
             AvatarWithFallback(
                 participant = participantUiState,
+                displayName = displayName,
                 modifier = Modifier
                     .size(avatarSize)
                     .align(Alignment.Center)
@@ -115,7 +122,7 @@ fun ParticipantTile(
             }
 
             Text(
-                text = participantUiState.nick ?: stringResource(R.string.nc_nick_guest),
+                text = displayName,
                 color = Color.White,
                 modifier = Modifier
                     .align(Alignment.BottomStart),