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

Revert latest changes regarding avatar to properly fix phone number avatar across app

Browse source
This commit is contained in:
Sylvain Berfini 2022-10-28 10:28:50 +02:00
parent ce3d333a98
commit d9dce51823
16 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -203,7 +203,7 @@ dependencies {
implementation "androidx.security:security-crypto-ktx:1.1.0-alpha03"
implementation "androidx.window:window:1.0.0"
def nav_version = "2.5.2"
def nav_version = "2.5.3"
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"

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

@ -354,7 +354,7 @@ private suspend fun loadContactPictureWithCoil(
transformations(CircleCropTransformation())
}
} else {
imageView.load(R.drawable.icon_single_contact_avatar_alt)
imageView.load(R.drawable.icon_single_contact_avatar)
}
} else if (contact.showGroupChatAvatar) {
imageView.load(AppCompatResources.getDrawable(context, R.drawable.icon_multiple_contacts_avatar))
@ -366,7 +366,7 @@ private suspend fun loadContactPictureWithCoil(
transformations(CircleCropTransformation())
error(
if (displayName.isEmpty() || AppUtils.getInitials(displayName) == "+") {
AppCompatResources.getDrawable(context, R.drawable.icon_single_contact_avatar_alt)
AppCompatResources.getDrawable(context, R.drawable.icon_single_contact_avatar)
} else {
coroutineScope {
withContext(Dispatchers.IO) {

BIN
app/src/main/res/drawable-xhdpi/voip_single_contact_avatar_alt_2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

7
app/src/main/res/drawable/icon_single_contact_avatar_alt.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap android:src="@drawable/voip_single_contact_avatar_alt_2"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

2
app/src/main/res/layout/chat_message_list_cell.xml
View file

@ -70,6 +70,8 @@
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:gravity="center"
android:visibility="@{data.chatMessage.outgoing || selectionListViewModel.isEditionEnabled ? View.GONE : (data.hideAvatar ? View.INVISIBLE : View.VISIBLE)}" />

2
app/src/main/res/layout/chat_room_devices_group_cell.xml
View file

@ -34,6 +34,8 @@
android:layout_height="@dimen/contact_avatar_size"
android:layout_alignParentStart="true"
android:layout_centerHorizontal="true"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:contentDescription="@null" />
<ImageView

2
app/src/main/res/layout/chat_room_group_info_participant_cell.xml
View file

@ -32,6 +32,8 @@
android:layout_height="@dimen/contact_avatar_size"
android:layout_alignParentStart="true"
android:layout_centerHorizontal="true"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:contentDescription="@null" />
<ImageView

2
app/src/main/res/layout/chat_room_imdn_participant_cell.xml
View file

@ -20,6 +20,8 @@
android:layout_height="@dimen/contact_avatar_size"
android:layout_marginRight="10dp"
coilContact="@{data}"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:contentDescription="@null"
android:layout_centerVertical="true"/>

2
app/src/main/res/layout/conference_scheduling_participant_cell.xml
View file

@ -33,6 +33,8 @@
android:layout_height="@dimen/contact_avatar_size"
android:layout_alignParentStart="true"
android:layout_centerHorizontal="true"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:contentDescription="@null" />
<ImageView

2
app/src/main/res/layout/contact_detail_fragment.xml
View file

@ -87,6 +87,8 @@
android:layout_width="@dimen/contact_avatar_big_size"
android:layout_height="@dimen/contact_avatar_big_size"
coilContactBig="@{viewModel}"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:contentDescription="@null" />
<TextView

2
app/src/main/res/layout/contact_editor_fragment.xml
View file

@ -79,6 +79,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
coilContactBig="@{viewModel}"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:contentDescription="@null" />
<ImageView

2
app/src/main/res/layout/contact_list_cell.xml
View file

@ -39,6 +39,8 @@
coilContact="@{viewModel}"
android:layout_marginRight="10dp"
android:layout_centerVertical="true"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:contentDescription="@null" />
<LinearLayout

2
app/src/main/res/layout/contact_selection_cell.xml
View file

@ -36,6 +36,8 @@
android:layout_height="@dimen/contact_avatar_size"
android:layout_alignParentStart="true"
android:layout_centerHorizontal="true"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:contentDescription="@null" />
<ImageView

2
app/src/main/res/layout/history_detail_fragment.xml
View file

@ -89,6 +89,8 @@
android:layout_width="@dimen/contact_avatar_big_size"
android:layout_height="@dimen/contact_avatar_big_size"
coilContactBig="@{viewModel}"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"
android:contentDescription="@null" />
<TextView

4
app/src/main/res/layout/voip_calls_cell.xml
View file

@ -33,7 +33,9 @@
coilContact="@{data}"
android:layout_marginLeft="40dp"
android:layout_marginRight="10dp"
android:layout_centerVertical="true"/>
android:layout_centerVertical="true"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"/>
<ImageView
android:visibility="@{data.isInRemoteConference ? View.VISIBLE : View.GONE, default=gone}"

4
app/src/main/res/layout/voip_conference_participant_cell.xml
View file

@ -22,7 +22,9 @@
coilContact="@{data}"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_centerVertical="true"/>
android:layout_centerVertical="true"
android:background="@drawable/generated_avatar_bg"
android:src="@drawable/voip_single_contact_avatar"/>
<ImageView
android:id="@+id/delete"