mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed contact_avatar, use user_circle instead

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-18 09:45:36 +02:00
parent ce8aee9192
commit 88c5e28577
18 changed files with 25 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/contacts/ContactsManager.kt
View file

@ -186,7 +186,8 @@ class ContactsManager @UiThread constructor(context: Context) {
}
)
personBuilder.setKey("") // TODO FIXME: use a valid key
val identity = account?.params?.identityAddress?.asStringUriOnly() ?: localAddress.asStringUriOnly()
personBuilder.setKey(identity)
personBuilder.setImportant(false)
return personBuilder.build()
}

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

@ -217,7 +217,7 @@ fun AvatarView.loadInitials(initials: String?) {
fun AvatarView.loadAccountAvatar(account: AccountModel?) {
Log.i("[Data Binding Utils] Loading account picture [${account?.avatar?.value}] with coil")
if (account == null) {
loadImage(R.drawable.contact_avatar)
loadImage(R.drawable.user_circle)
} else {
val lifecycleOwner = findViewTreeLifecycleOwner()
if (lifecycleOwner != null) {
@ -276,7 +276,7 @@ fun AvatarView.loadAccountAvatar(account: AccountModel?) {
@BindingAdapter("contactAvatar")
fun AvatarView.loadContactAvatar(contact: ContactAvatarModel?) {
if (contact == null) {
loadImage(R.drawable.contact_avatar)
loadImage(R.drawable.user_circle)
} else {
val uri = contact.avatar.value
loadImage(

2
app/src/main/res/drawable/chat_text.xml
View file

@ -5,5 +5,5 @@
android:viewportHeight="256">
<path
android:pathData="M216,48L40,48A16,16 0,0 0,24 64L24,224a15.85,15.85 0,0 0,9.24 14.5A16.13,16.13 0,0 0,40 240a15.89,15.89 0,0 0,10.25 -3.78,0.69 0.69,0 0,0 0.13,-0.11L82.5,208L216,208a16,16 0,0 0,16 -16L232,64A16,16 0,0 0,216 48ZM40,224h0ZM216,192L82.5,192a16,16 0,0 0,-10.3 3.75l-0.12,0.11L40,224L40,64L216,64ZM88,112a8,8 0,0 1,8 -8h64a8,8 0,0 1,0 16L96,120A8,8 0,0 1,88 112ZM88,144a8,8 0,0 1,8 -8h64a8,8 0,1 1,0 16L96,152A8,8 0,0 1,88 144Z"
android:fillColor="#4e6074"/>
android:fillColor="#ffffff"/>
</vector>

13
app/src/main/res/drawable/contact_avatar.xml
View file

@ -1,13 +0,0 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="vector"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<path
android:name="path"
android:pathData="M 25.978 4.333 C 14.018 4.333 4.333 14.04 4.333 26 C 4.333 37.96 14.018 47.666 25.978 47.666 C 37.96 47.666 47.667 37.96 47.667 26 C 47.667 14.04 37.96 4.333 25.978 4.333 Z M 26 43.333 C 16.423 43.333 8.667 35.576 8.667 26 C 8.667 16.423 16.423 8.666 26 8.666 C 35.577 8.666 43.333 16.423 43.333 26 C 43.333 35.576 35.577 43.333 26 43.333 Z M 33.583 23.833 C 35.382 23.833 36.833 22.381 36.833 20.583 C 36.833 18.785 35.382 17.333 33.583 17.333 C 31.785 17.333 30.333 18.785 30.333 20.583 C 30.333 22.381 31.785 23.833 33.583 23.833 Z M 18.417 23.833 C 20.215 23.833 21.667 22.381 21.667 20.583 C 21.667 18.785 20.215 17.333 18.417 17.333 C 16.618 17.333 15.167 18.785 15.167 20.583 C 15.167 22.381 16.618 23.833 18.417 23.833 Z M 26 37.916 C 31.048 37.916 35.338 34.753 37.072 30.333 L 14.928 30.333 C 16.662 34.753 20.952 37.916 26 37.916 Z"
android:fillColor="#4e6074"
android:strokeWidth="1"/>
</vector>

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

@ -34,7 +34,7 @@
android:adjustViewBounds="true"
android:background="@drawable/shape_circle_light_blue_background"
accountAvatar="@{model}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"

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

@ -90,7 +90,7 @@
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="21sp"
app:avatarViewInitialsTextStyle="bold"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewShape="circle"
app:avatarViewBorderWidth="0dp"
app:layout_constraintEnd_toEndOf="parent"

8
app/src/main/res/layout/account_profile_secure_mode_fragment.xml
View file

@ -120,8 +120,8 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="21dp"
android:background="@drawable/shape_circle_light_blue_background"
android:src="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/contact_avatar"
android:src="@drawable/user_circle"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"
@ -163,8 +163,8 @@
android:layout_height="@dimen/avatar_list_cell_size"
android:adjustViewBounds="true"
android:background="@drawable/shape_circle_light_blue_background"
android:src="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/contact_avatar"
android:src="@drawable/user_circle"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"

8
app/src/main/res/layout/assistant_secure_mode_fragment.xml
View file

@ -135,8 +135,8 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="21dp"
android:background="@drawable/shape_circle_light_blue_background"
android:src="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/contact_avatar"
android:src="@drawable/user_circle"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"
@ -178,8 +178,8 @@
android:layout_height="@dimen/avatar_list_cell_size"
android:adjustViewBounds="true"
android:background="@drawable/shape_circle_light_blue_background"
android:src="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/contact_avatar"
android:src="@drawable/user_circle"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"

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

@ -81,7 +81,7 @@
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="21sp"
app:avatarViewInitialsTextStyle="bold"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewShape="circle"
app:avatarViewBorderWidth="0dp"
app:layout_constraintEnd_toEndOf="parent"

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

@ -38,7 +38,7 @@
android:adjustViewBounds="true"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{model.avatarModel}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"

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

@ -30,7 +30,7 @@
android:adjustViewBounds="true"
android:background="@drawable/shape_circle_light_blue_background"
avatarInitials="@{model.initials, default=`JD`}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"

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

@ -32,7 +32,7 @@
android:adjustViewBounds="true"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{model}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"

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

@ -108,7 +108,7 @@
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="21sp"
app:avatarViewInitialsTextStyle="bold"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewShape="circle"
app:avatarViewBorderWidth="0dp"
app:layout_constraintEnd_toEndOf="parent"

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

@ -61,7 +61,7 @@
android:adjustViewBounds="true"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{model}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"

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

@ -42,7 +42,7 @@
android:layout_marginStart="15dp"
android:background="@drawable/shape_circle_light_blue_background"
accountAvatar="@{viewModel.account}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"

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

@ -58,7 +58,7 @@
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="36sp"
app:avatarViewInitialsTextStyle="bold"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewShape="circle"
app:avatarViewBorderWidth="0dp"
app:avatarViewBorderColor="@color/blue_trusted"

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

@ -61,7 +61,7 @@
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="36sp"
app:avatarViewInitialsTextStyle="bold"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewShape="circle"
app:avatarViewBorderWidth="0dp"
app:layout_constraintEnd_toEndOf="@id/background"

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

@ -75,7 +75,7 @@
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="36sp"
app:avatarViewInitialsTextStyle="bold"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewPlaceholder="@drawable/user_circle"
app:avatarViewShape="circle"
app:avatarViewBorderWidth="0dp"
app:layout_constraintEnd_toEndOf="@id/background"