Fix image clicking in VFS mode and reply display

This commit is contained in:
benoit.martins 2024-01-30 13:43:50 +01:00
parent 7b93ff8998
commit 6295b0f319
3 changed files with 13 additions and 7 deletions

View file

@ -245,11 +245,13 @@ class ChatConversationTableViewSwift: UIViewController, UICollectionViewDataSour
}
}
if (!cell.imageViewBubble.isHidden || !cell.imageVideoViewBubble.isHidden) && cell.chatMessage != nil && !cell.chatMessage!.isFileTransferInProgress {
cell.imageViewBubble.onClick {
cell.imageViewBubble.onClick {
if (!cell.imageViewBubble.isHidden || !cell.imageVideoViewBubble.isHidden) && cell.chatMessage != nil && !cell.chatMessage!.isFileTransferInProgress {
self.onImageClick(chatMessage: cell.chatMessage!, index: indexPath.row)
}
cell.imageVideoViewBubble.onClick {
}
cell.imageVideoViewBubble.onClick {
if (!cell.imageViewBubble.isHidden || !cell.imageVideoViewBubble.isHidden) && cell.chatMessage != nil && !cell.chatMessage!.isFileTransferInProgress {
self.onImageClick(chatMessage: cell.chatMessage!, index: indexPath.row)
}
}

View file

@ -996,7 +996,7 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
contentMessageView.replyContentTextSpacing.isHidden = true
}else{
if(bctbx_list_size(contentList) > 1 || content == ""){
if(bctbx_list_size(contentList) >= 1 && content == nil){
contentMessageView.mediaSelectorReply.isHidden = false
contentMessageView.replyContentTextSpacing.isHidden = true
ChatMessage.getSwiftObject(cObject: message!).contents.forEach({ content in

View file

@ -961,9 +961,13 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource,
mediaSelectorReply.isHidden = true
replyContentTextSpacing.isHidden = true
}else{
if(bctbx_list_size(contentList) > 1 || content == ""){
mediaSelectorReply.isHidden = false
if(bctbx_list_size(contentList) >= 1){
if bctbx_list_size(contentList) == 1 && content != nil {
mediaSelectorReply.isHidden = true
} else {
mediaSelectorReply.isHidden = false
}
replyContentTextSpacing.isHidden = true
ChatMessage.getSwiftObject(cObject: (event.chatMessage!.replyMessage?.getCobject)!).contents.forEach({ content in
if(content.isFile){