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

Also search in contact name when filtering conversations list + updated gradle

Browse source
This commit is contained in:
Sylvain Berfini 2024-01-08 10:05:16 +01:00
parent 61c85128e8
commit cc403f2624
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt
View file

@ -154,7 +154,12 @@ class ConversationsListViewModel @UiThread constructor() : AbstractTopBarViewMod
val participants = chatRoom.participants
val found = participants.find {
it.address.asStringUriOnly().contains(filter, ignoreCase = true)
// Search in address but also in contact name if exists
val model = coreContext.contactsManager.getContactAvatarModelForAddress(it.address)
model.contactName?.contains(filter, ignoreCase = true) == true || it.address.asStringUriOnly().contains(
filter,
ignoreCase = true
)
}
if (
found != null ||

5
app/src/main/res/layout/chat_bubble_incoming.xml
View file

@ -263,10 +263,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{model.reactions, default=@string/emoji_love}"
android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/bubble"
app:layout_constraintTop_toBottomOf="@id/bubble"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintTop_toBottomOf="@id/bubble" />
</androidx.constraintlayout.widget.ConstraintLayout>

5
app/src/main/res/layout/chat_bubble_outgoing.xml
View file

@ -226,10 +226,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{model.reactions, default=@string/emoji_love}"
android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/bubble"
app:layout_constraintTop_toBottomOf="@id/bubble"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintTop_toBottomOf="@id/bubble" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/values/styles.xml
View file

@ -134,8 +134,8 @@
<item name="android:paddingBottom">5dp</item>
<item name="android:paddingTop">2dp</item>
<item name="android:orientation">horizontal</item>
<item name="android:layout_marginTop">-15dp</item>
<item name="android:layout_marginBottom">10dp</item>
<item name="android:layout_marginTop">-10dp</item>
<item name="android:layout_marginBottom">5dp</item>
<item name="android:background">@drawable/shape_chat_bubble_reactions_background</item>
</style>
<style name="call_numpad_digits_style">

4
build.gradle
View file

@ -11,8 +11,8 @@ buildscript {
}
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.2.0' apply false
id 'com.android.library' version '8.2.0' apply false
id 'com.android.application' version '8.2.1' apply false
id 'com.android.library' version '8.2.1' apply false
id 'org.jetbrains.kotlin.android' version '1.9.0-RC' apply false
id 'com.google.gms.google-services' version '4.4.0' apply false
}