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

Fixed issue with suggestion initials display + fixed animated in_progress

Browse source
This commit is contained in:
Sylvain Berfini 2023-11-19 20:36:51 +01:00
parent c650887c04
commit ce1cb3a15a
10 changed files with 67 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/assets/linphonerc_factory
View file

@ -42,6 +42,7 @@ enable_simple_group_chat_message_state=0
aggregate_imdn=1
notify_each_friend_individually_when_presence_received=0
store_friends=0
hide_empty_chat_rooms=0
[app]
activation_code_length=4

5
app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
View file

@ -35,6 +35,7 @@ import org.linphone.ui.main.chat.model.ChatMessageModel
import org.linphone.ui.main.chat.model.EventLogModel
import org.linphone.ui.main.chat.model.EventModel
import org.linphone.utils.Event
import org.linphone.utils.startAnimatedDrawable
class ConversationEventAdapter : ListAdapter<EventLogModel, RecyclerView.ViewHolder>(
EventLogDiffCallback()
@ -160,6 +161,8 @@ class ConversationEventAdapter : ListAdapter<EventLogModel, RecyclerView.ViewHol
with(binding) {
model = message
executePendingBindings()
binding.deliveryStatus.startAnimatedDrawable()
}
}
}
@ -171,6 +174,8 @@ class ConversationEventAdapter : ListAdapter<EventLogModel, RecyclerView.ViewHol
with(binding) {
model = message
executePendingBindings()
binding.deliveryStatus.startAnimatedDrawable()
}
}
}

3
app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationsListAdapter.kt
View file

@ -13,6 +13,7 @@ import org.linphone.R
import org.linphone.databinding.ChatListCellBinding
import org.linphone.ui.main.chat.model.ConversationModel
import org.linphone.utils.Event
import org.linphone.utils.startAnimatedDrawable
class ConversationsListAdapter : ListAdapter<ConversationModel, RecyclerView.ViewHolder>(
ChatRoomDiffCallback()
@ -72,6 +73,8 @@ class ConversationsListAdapter : ListAdapter<ConversationModel, RecyclerView.Vie
binding.root.isSelected = bindingAdapterPosition == selectedAdapterPosition
executePendingBindings()
binding.lastSentMessageStatus.startAnimatedDrawable()
}
}
}

6
app/src/main/java/org/linphone/ui/main/history/model/ContactOrSuggestionModel.kt
View file

@ -39,7 +39,11 @@ class ContactOrSuggestionModel @WorkerThread constructor(
val id = friend?.refKey ?: address.asStringUriOnly().hashCode()
val name = LinphoneUtils.getDisplayName(address)
val name = if (friend != null) {
friend.name ?: LinphoneUtils.getDisplayName(address)
} else {
address.username.orEmpty()
}
val initials = AppUtils.getInitials(name)

1
app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
View file

@ -224,6 +224,7 @@ abstract class AddressSelectionViewModel @UiThread constructor() : ViewModel() {
val model = ContactOrSuggestionModel(address) {
coreContext.startCall(address)
}
suggestionsList.add(model)
}
}

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

@ -22,6 +22,7 @@ package org.linphone.utils
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.PorterDuff
import android.graphics.drawable.AnimatedVectorDrawable
import android.text.Editable
import android.text.TextWatcher
import android.view.LayoutInflater
@ -48,14 +49,13 @@ import androidx.emoji2.emojipicker.EmojiPickerView
import androidx.emoji2.emojipicker.EmojiViewItem
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
import coil.dispose
import coil.load
import coil.request.videoFrameMillis
import coil.size.Dimension
import com.google.android.material.imageview.ShapeableImageView
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.linphone.BR
import org.linphone.R
import org.linphone.contacts.AbstractAvatarModel
@ -281,6 +281,17 @@ private fun loadImageForChatBubble(imageView: ImageView, file: String?, grid: Bo
}
}
@UiThread
fun ImageView.startAnimatedDrawable() {
drawable.apply {
when (this) {
is AnimatedVectorDrawableCompat -> start()
is AnimatedVectorDrawable -> start()
else -> { /* not an animated icon */ }
}
}
}
@UiThread
@BindingAdapter("coil")
fun ShapeableImageView.loadCircleFileWithCoil(file: String?) {
@ -328,13 +339,9 @@ fun ShapeableImageView.loadCallAvatarWithCoil(model: AbstractAvatarModel?) {
@UiThread
@BindingAdapter("coilInitials")
fun ShapeableImageView.loadInitialsAvatarWithCoil(initials: String?) {
(context as AppCompatActivity).lifecycleScope.launch {
withContext(Dispatchers.IO) {
val builder = AvatarGenerator(context)
builder.setInitials(initials.orEmpty())
load(builder.build())
}
}
val builder = AvatarGenerator(context)
builder.setInitials(initials.orEmpty())
load(builder.build())
}
@SuppressLint("ResourceType")

3
app/src/main/java/org/linphone/utils/LinphoneUtils.kt
View file

@ -20,6 +20,7 @@
package org.linphone.utils
import androidx.annotation.AnyThread
import androidx.annotation.DrawableRes
import androidx.annotation.IntegerRes
import androidx.annotation.WorkerThread
import java.text.DateFormat
@ -199,7 +200,7 @@ class LinphoneUtils {
}
@AnyThread
@IntegerRes
@DrawableRes
fun getChatIconResId(chatState: ChatMessage.State): Int {
return when (chatState) {
ChatMessage.State.Displayed, ChatMessage.State.FileTransferDone -> {

7
app/src/main/res/animator/rotation.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="3000"
android:propertyName="rotation"
android:valueFrom="0"
android:valueTo="360"
android:repeatCount="infinite"/>

38
app/src/main/res/drawable/animated_in_progress.xml
View file

@ -1,6 +1,34 @@
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/in_progress" >
<target
android:name="rotationGroup"
android:animation="@animator/rotation" />
<animated-vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt">
<aapt:attr name="android:drawable">
<vector
android:name="vector"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group
android:name="rotationgroup"
android:pivotX="12"
android:pivotY="12">
<path
android:name="path"
android:pathData="M 12.692 3.692 L 12.692 6.462 C 12.692 6.645 12.619 6.821 12.49 6.951 C 12.36 7.081 12.184 7.154 12 7.154 C 11.816 7.154 11.64 7.081 11.51 6.951 C 11.381 6.821 11.308 6.645 11.308 6.462 L 11.308 3.692 C 11.308 3.509 11.381 3.333 11.51 3.203 C 11.64 3.073 11.816 3 12 3 C 12.184 3 12.36 3.073 12.49 3.203 C 12.619 3.333 12.692 3.509 12.692 3.692 Z M 15.916 8.776 C 16.007 8.776 16.097 8.758 16.181 8.724 C 16.265 8.689 16.341 8.637 16.406 8.573 L 18.364 6.616 C 18.494 6.486 18.567 6.309 18.567 6.126 C 18.567 5.942 18.494 5.766 18.364 5.636 C 18.234 5.506 18.058 5.433 17.874 5.433 C 17.691 5.433 17.514 5.506 17.384 5.636 L 15.427 7.594 C 15.33 7.691 15.264 7.814 15.237 7.949 C 15.21 8.083 15.224 8.222 15.276 8.349 C 15.329 8.475 15.417 8.583 15.531 8.66 C 15.645 8.736 15.779 8.776 15.916 8.776 Z M 20.308 11.308 L 17.538 11.308 C 17.355 11.308 17.179 11.381 17.049 11.51 C 16.919 11.64 16.846 11.816 16.846 12 C 16.846 12.184 16.919 12.36 17.049 12.49 C 17.179 12.619 17.355 12.692 17.538 12.692 L 20.308 12.692 C 20.491 12.692 20.667 12.619 20.797 12.49 C 20.927 12.36 21 12.184 21 12 C 21 11.816 20.927 11.64 20.797 11.51 C 20.667 11.381 20.491 11.308 20.308 11.308 Z M 16.406 15.427 C 16.275 15.303 16.101 15.234 15.92 15.237 C 15.739 15.239 15.567 15.312 15.439 15.439 C 15.312 15.567 15.239 15.739 15.237 15.92 C 15.234 16.101 15.303 16.275 15.427 16.406 L 17.384 18.364 C 17.514 18.494 17.691 18.567 17.874 18.567 C 18.058 18.567 18.234 18.494 18.364 18.364 C 18.494 18.234 18.567 18.058 18.567 17.874 C 18.567 17.691 18.494 17.514 18.364 17.384 L 16.406 15.427 Z M 12 16.846 C 11.816 16.846 11.64 16.919 11.51 17.049 C 11.381 17.179 11.308 17.355 11.308 17.538 L 11.308 20.308 C 11.308 20.491 11.381 20.667 11.51 20.797 C 11.64 20.927 11.816 21 12 21 C 12.184 21 12.36 20.927 12.49 20.797 C 12.619 20.667 12.692 20.491 12.692 20.308 L 12.692 17.538 C 12.692 17.355 12.619 17.179 12.49 17.049 C 12.36 16.919 12.184 16.846 12 16.846 Z M 7.594 15.427 L 5.636 17.384 C 5.506 17.514 5.433 17.691 5.433 17.874 C 5.433 18.058 5.506 18.234 5.636 18.364 C 5.766 18.494 5.942 18.567 6.126 18.567 C 6.309 18.567 6.486 18.494 6.616 18.364 L 8.573 16.406 C 8.697 16.275 8.766 16.101 8.763 15.92 C 8.761 15.739 8.688 15.567 8.561 15.439 C 8.433 15.312 8.261 15.239 8.08 15.237 C 7.899 15.234 7.725 15.303 7.594 15.427 Z M 7.154 12 C 7.154 11.816 7.081 11.64 6.951 11.51 C 6.821 11.381 6.645 11.308 6.462 11.308 L 3.692 11.308 C 3.509 11.308 3.333 11.381 3.203 11.51 C 3.073 11.64 3 11.816 3 12 C 3 12.184 3.073 12.36 3.203 12.49 C 3.333 12.619 3.509 12.692 3.692 12.692 L 6.462 12.692 C 6.645 12.692 6.821 12.619 6.951 12.49 C 7.081 12.36 7.154 12.184 7.154 12 Z M 6.616 5.636 C 6.486 5.506 6.309 5.433 6.126 5.433 C 5.942 5.433 5.766 5.506 5.636 5.636 C 5.506 5.766 5.433 5.942 5.433 6.126 C 5.433 6.309 5.506 6.486 5.636 6.616 L 7.594 8.573 C 7.725 8.697 7.899 8.766 8.08 8.763 C 8.261 8.761 8.433 8.688 8.561 8.561 C 8.688 8.433 8.761 8.261 8.763 8.08 C 8.766 7.899 8.697 7.725 8.573 7.594 L 6.616 5.636 Z"
android:fillColor="#FE5E00"/>
</group>
</vector>
</aapt:attr>
<target android:name="rotationgroup">
<aapt:attr name="android:animation">
<objectAnimator
android:propertyName="rotation"
android:duration="3000"
android:valueFrom="0"
android:valueTo="360"
android:valueType="floatType"
android:repeatCount="infinite"
android:interpolator="@android:anim/linear_interpolator"/>
</aapt:attr>
</target>
</animated-vector>

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

@ -151,7 +151,7 @@
android:layout_width="@dimen/small_icon_size"
android:layout_height="@dimen/small_icon_size"
android:layout_marginEnd="10dp"
android:src="@{model.lastMessageIcon, default=@drawable/check}"
android:src="@{model.lastMessageIcon, default=@drawable/animated_in_progress}"
android:visibility="@{model.isLastMessageOutgoing ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/date_time"