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 menu button showing in '@' participants menu

Browse source
This commit is contained in:
Sylvain Berfini 2023-12-15 10:04:18 +01:00
parent 6338fb65d1
commit 1b827bcf76
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt
View file

@ -29,6 +29,7 @@ class ParticipantModel @WorkerThread constructor(
val address: Address,
val isMyselfAdmin: Boolean = false,
val isParticipantAdmin: Boolean = false,
val showMenu: Boolean = false,
private val onClicked: ((model: ParticipantModel) -> Unit)? = null,
private val onMenuClicked: ((view: View, model: ParticipantModel) -> Unit)? = null
) {

28
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
View file

@ -506,19 +506,31 @@ class ConversationInfoViewModel @UiThread constructor() : ViewModel() {
val friends = arrayListOf<Friend>()
val participantsList = arrayListOf<ParticipantModel>()
if (chatRoom.hasCapability(ChatRoom.Capabilities.Basic.toInt())) {
val model = ParticipantModel(chatRoom.peerAddress, selfAdmin, false) { view, model ->
// openMenu
showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))
}
val model = ParticipantModel(
chatRoom.peerAddress,
selfAdmin,
isParticipantAdmin = false,
showMenu = true,
onMenuClicked = { view, model ->
// openMenu
showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))
}
)
friends.add(model.avatarModel.friend)
participantsList.add(model)
} else {
for (participant in chatRoom.participants) {
val isParticipantAdmin = if (groupChatRoom) participant.isAdmin else false
val model = ParticipantModel(participant.address, selfAdmin, isParticipantAdmin, onMenuClicked = { view, model ->
// openMenu
showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))
})
val model = ParticipantModel(
participant.address,
selfAdmin,
isParticipantAdmin = isParticipantAdmin,
showMenu = true,
onMenuClicked = { view, model ->
// openMenu
showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))
}
)
friends.add(model.avatarModel.friend)
participantsList.add(model)
}

1
app/src/main/res/layout/chat_participant_list_cell.xml
View file

@ -87,6 +87,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:src="@drawable/dots_three_vertical"
android:visibility="@{model.showMenu ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/name"
app:layout_constraintTop_toTopOf="parent"