diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt index a9ed147e7f..10f395026d 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt @@ -18,7 +18,6 @@ import com.nextcloud.talk.chat.data.network.ChatNetworkDataSource import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.models.domain.ConversationModel import com.nextcloud.talk.models.json.capabilities.SpreedCapability -import com.nextcloud.talk.models.json.generic.GenericOverall import com.nextcloud.talk.models.json.participants.TalkBan import com.nextcloud.talk.repositories.conversations.ConversationsRepository import com.nextcloud.talk.utils.ApiUtils diff --git a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt index ef43da5f89..9f60ab1b14 100644 --- a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt +++ b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt @@ -26,9 +26,9 @@ import coil.result import coil.transform.CircleCropTransformation import coil.transform.RoundedCornersTransformation import com.nextcloud.talk.R -import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.models.domain.ConversationModel +import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.models.json.conversations.Conversation import com.nextcloud.talk.models.json.conversations.ConversationEnums import com.nextcloud.talk.ui.theme.ViewThemeUtils @@ -89,7 +89,7 @@ fun ImageView.loadConversationAvatar( ContextCompat.getDrawable(context, R.drawable.ic_circular_group) ConversationEnums.ConversationType.ROOM_PUBLIC_CALL -> - ContextCompat.getDrawable(context, R.drawable.ic_circular_link) + ContextCompat.getDrawable(context, R.drawable.icon_conversation_public) else -> ContextCompat.getDrawable(context, R.drawable.account_circle_96dp) } @@ -321,7 +321,7 @@ fun ImageView.loadDefaultGroupCallAvatar(viewThemeUtils: ViewThemeUtils): io.rea } fun ImageView.loadDefaultPublicCallAvatar(viewThemeUtils: ViewThemeUtils): io.reactivex.disposables.Disposable { - val data: Any = viewThemeUtils.talk.themePlaceholderAvatar(this, R.drawable.ic_avatar_link) as Any + val data: Any = viewThemeUtils.talk.themePlaceholderAvatar(this, R.drawable.icon_conversation_public) as Any return loadUserAvatar(data) } diff --git a/app/src/main/res/drawable-night/ic_circular_link.xml b/app/src/main/res/drawable-night/ic_circular_link.xml deleted file mode 100644 index 78a52b5c42..0000000000 --- a/app/src/main/res/drawable-night/ic_circular_link.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_circular_link.xml b/app/src/main/res/drawable/ic_circular_link.xml deleted file mode 100644 index 13ea90db43..0000000000 --- a/app/src/main/res/drawable/ic_circular_link.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_conversation_public.xml b/app/src/main/res/drawable/icon_conversation_public.xml new file mode 100644 index 0000000000..6cb0aa15dd --- /dev/null +++ b/app/src/main/res/drawable/icon_conversation_public.xml @@ -0,0 +1,19 @@ + + + + + +