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

Improved processing of contacts in contacts list

Browse source
This commit is contained in:
Sylvain Berfini 2023-11-16 10:50:53 +01:00
parent 07926bad1e
commit 00cea06899
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
View file

@ -149,18 +149,9 @@ class ContactsListViewModel @UiThread constructor() : AbstractTopBarViewModel()
for (result in results) {
val friend = result.friend
var currentLetter = ""
val model = if (friend != null) {
currentLetter = friend.name?.get(0).toString()
ContactAvatarModel(friend)
} else {
Log.w("$TAG SearchResult [$result] has no Friend!")
val fakeFriend =
createFriendFromSearchResult(result)
currentLetter = fakeFriend.name?.get(0).toString()
ContactAvatarModel(fakeFriend)
}
val model = coreContext.contactsManager.getContactAvatarModelForAddress(result.address)
val currentLetter = model.friend.name?.get(0).toString()
val displayLetter = previousLetter.isEmpty() || currentLetter != previousLetter
if (currentLetter != previousLetter) {
previousLetter = currentLetter

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

@ -72,6 +72,8 @@ import org.linphone.ui.call.model.ConferenceParticipantDeviceModel
* This file contains all the data binding necessary for the app
*/
private const val TAG = "[Data Binding Utils]"
@BindingAdapter("inflatedLifecycleOwner")
fun setInflatedViewStubLifecycleOwner(view: View, enable: Boolean) {
val binding = DataBindingUtil.bind<ViewDataBinding>(view)
@ -104,7 +106,7 @@ fun <T> setEntries(
binding.lifecycleOwner = viewGroup.context as LifecycleOwner
} else {
Log.e(
"[Data Binding Utils] Failed to cast viewGroup's context as an Activity, lifecycle owner hasn't be set!"
"$TAG Failed to cast viewGroup's context as an Activity, lifecycle owner hasn't be set!"
)
}
@ -145,7 +147,7 @@ fun View.setKeyboardInsetListener(lambda: (visible: Boolean) -> Unit) {
lambda(isKeyboardVisible)
} catch (ise: IllegalStateException) {
Log.e(
"[Data Binding Utils] Failed to called lambda after keyboard visibility changed: $ise"
"$TAG Failed to called lambda after keyboard visibility changed: $ise"
)
}
@ -162,7 +164,7 @@ fun View.setKeyboardInsetListener(lambda: (visible: Boolean) -> Unit) {
lambda(isKeyboardVisible)
} catch (ise: IllegalStateException) {
Log.e(
"[Data Binding Utils] Failed to called lambda after keyboard visibility changed: $ise"
"$TAG Failed to called lambda after keyboard visibility changed: $ise"
)
}
}
@ -255,7 +257,7 @@ private fun loadImageForChatBubble(imageView: ImageView, file: String?, grid: Bo
listener(
onError = { _, result ->
Log.e(
"[Data Binding] [Coil] Error getting preview picture from video? [$file]: ${result.throwable}"
"$TAG Error getting preview picture from video? [$file]: ${result.throwable}"
)
imageView.visibility = View.GONE
},
@ -272,7 +274,7 @@ private fun loadImageForChatBubble(imageView: ImageView, file: String?, grid: Bo
listener(
onError = { _, result ->
Log.e(
"[Data Binding] [Coil] Error getting picture from file [$file]: ${result.throwable}"
"$TAG Error getting picture from file [$file]: ${result.throwable}"
)
imageView.visibility = View.GONE
}
@ -285,7 +287,6 @@ private fun loadImageForChatBubble(imageView: ImageView, file: String?, grid: Bo
@UiThread
@BindingAdapter("coil")
fun ShapeableImageView.loadCircleFileWithCoil(file: String?) {
Log.i("[Data Binding Utils] Loading file [$file] with coil")
if (file != null) {
load(file)
}