Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed chat room/conference avatar when in dark mode

Browse source
This commit is contained in:
Sylvain Berfini 2022-05-02 15:36:03 +02:00
parent dcbf233774
commit b8685c2dda
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/linphone/utils/DataBindingUtils.kt
View file

@ -34,6 +34,7 @@ import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import android.widget.* import android.widget.*
import android.widget.SeekBar.OnSeekBarChangeListener import android.widget.SeekBar.OnSeekBarChangeListener
import androidx.appcompat.content.res.AppCompatResources
import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import androidx.constraintlayout.widget.Guideline import androidx.constraintlayout.widget.Guideline
import androidx.databinding.* import androidx.databinding.*
@ -43,7 +44,6 @@ import coil.request.videoFrameMillis
import coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import com.google.android.material.switchmaterial.SwitchMaterial import com.google.android.material.switchmaterial.SwitchMaterial
import org.linphone.BR import org.linphone.BR
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R import org.linphone.R
import org.linphone.activities.GenericActivity import org.linphone.activities.GenericActivity
@ -342,17 +342,22 @@ private fun loadContactPictureWithCoil(
textColor: Int = 0 textColor: Int = 0
) { ) {
if (contact != null) { if (contact != null) {
val context = imageView.context
val displayName = contact.displayName.value.orEmpty() val displayName = contact.displayName.value.orEmpty()
val source = if (useThumbnail) contact.thumbnailUri else contact.pictureUri val source = if (useThumbnail) contact.thumbnailUri else contact.pictureUri
imageView.load(source) { imageView.load(source) {
transformations(CircleCropTransformation()) transformations(CircleCropTransformation())
error( error(
if (contact.showGroupChatAvatar) { if (contact.showGroupChatAvatar) {
coreContext.contactsManager.groupAvatar.loadDrawable(imageView.context) val bg = AppCompatResources.getDrawable(context, R.drawable.generated_avatar_bg)
imageView.background = bg
AppCompatResources.getDrawable(context, R.drawable.icon_multiple_contacts_avatar)
} else if (displayName.isEmpty() || displayName == "+") { } else if (displayName.isEmpty() || displayName == "+") {
coreContext.contactsManager.contactAvatar.loadDrawable(imageView.context) val bg = AppCompatResources.getDrawable(context, R.drawable.generated_avatar_bg)
imageView.background = bg
AppCompatResources.getDrawable(context, R.drawable.icon_single_contact_avatar)
} else { } else {
val builder = ContactAvatarGenerator(imageView.context) val builder = ContactAvatarGenerator(context)
builder.setLabel(displayName) builder.setLabel(displayName)
if (size > 0) { if (size > 0) {
builder.setAvatarSize(AppUtils.getDimension(size).toInt()) builder.setAvatarSize(AppUtils.getDimension(size).toInt())