narayana/snikket-ios
7
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

- #162 Fixed message grouping in chat UI

Browse source
This commit is contained in:
Muhammad Khalid 2021-12-13 21:21:58 +05:00 committed by Mehrooz Khan
parent e75611c99c
commit 01190e3be3
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Snikket/chat/ChatViewController.swift
View file

@ -201,12 +201,6 @@ class ChatViewController : BaseChatViewControllerWithDataSourceAndContextMenuAnd
return tableView.dequeueReusableCell(withIdentifier: "ChatTableViewCellIncoming", for: indexPath);
}
var continuation = false;
if (indexPath.row + 1) < dataSource.count {
if let prevItem = dataSource.getItem(at: indexPath.row + 1) {
continuation = dsItem.isMergeable(with: prevItem);
}
}
let incoming = dsItem.state.direction == .incoming;
switch dsItem {
@ -218,8 +212,7 @@ class ChatViewController : BaseChatViewControllerWithDataSourceAndContextMenuAnd
cell.set(item: item, nickname: name);
return cell;
} else {
let id = continuation ? (incoming ? "ChatTableViewMessageContinuationCell" : "ChatTableViewMessageContinuationCell2")
: (incoming ? "ChatTableViewMessageCell" : "ChatTableViewMessageCell2");
let id = (incoming ? "ChatTableViewMessageCell" : "ChatTableViewMessageCell2")
let cell: ChatTableViewCell = tableView.dequeueReusableCell(withIdentifier: id, for: indexPath) as! ChatTableViewCell;
cell.contentView.transform = dataSource.inverted ? CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: 0) : CGAffineTransform.identity;
let name = incoming ? self.titleView.name : localNickname;
@ -234,8 +227,7 @@ class ChatViewController : BaseChatViewControllerWithDataSourceAndContextMenuAnd
return cell;
}
case let item as ChatAttachment:
let id = continuation ? (incoming ? "ChatTableViewAttachmentContinuationCell" : "ChatTableViewAttachmentContinuationCell2")
: (incoming ? "ChatTableViewAttachmentCell" : "ChatTableViewAttachmentCell2");
let id = incoming ? "ChatTableViewAttachmentCell" : "ChatTableViewAttachmentCell2"
let cell: AttachmentChatTableViewCell = tableView.dequeueReusableCell(withIdentifier: id, for: indexPath) as! AttachmentChatTableViewCell;
cell.contentView.transform = dataSource.inverted ? CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: 0) : CGAffineTransform.identity;
let name = incoming ? self.titleView.name : localNickname;

14
Snikket/groupchat/MucChatViewController.swift
View file

@ -160,13 +160,6 @@ class MucChatViewController: BaseChatViewControllerWithDataSourceAndContextMenuA
return tableView.dequeueReusableCell(withIdentifier: "ChatTableViewMessageCell", for: indexPath);
}
var continuation = false;
if (indexPath.row + 1) < dataSource.count {
if let prevItem = dataSource.getItem(at: indexPath.row + 1) {
continuation = dbItem.isMergeable(with: prevItem);
}
}
let incoming = dbItem.state.direction == .incoming;
switch dbItem {
@ -178,9 +171,7 @@ class MucChatViewController: BaseChatViewControllerWithDataSourceAndContextMenuA
cell.set(item: item, nickname: name);
return cell;
} else {
let id = continuation ? (incoming ? "ChatTableViewMessageContinuationCell" : "ChatTableViewMessageContinuationCell2")
: (incoming ? "ChatTableViewMessageCell" : "ChatTableViewMessageCell2");
let id = incoming ? "ChatTableViewMessageCell" : "ChatTableViewMessageCell2"
let cell = tableView.dequeueReusableCell(withIdentifier: id, for: indexPath) as! ChatTableViewCell;
cell.contentView.transform = dataSource.inverted ? CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: 0) : CGAffineTransform.identity;
// cell.nicknameLabel?.text = item.nickname;
@ -215,8 +206,7 @@ class MucChatViewController: BaseChatViewControllerWithDataSourceAndContextMenuA
return cell;
}
case let item as ChatAttachment:
let id = continuation ? (incoming ? "ChatTableViewAttachmentContinuationCell" : "ChatTableViewAttachmentContinuationCell2")
: (incoming ? "ChatTableViewAttachmentCell" : "ChatTableViewAttachmentCell2");
let id = incoming ? "ChatTableViewAttachmentCell" : "ChatTableViewAttachmentCell2"
let cell: AttachmentChatTableViewCell = tableView.dequeueReusableCell(withIdentifier: id, for: indexPath) as! AttachmentChatTableViewCell;
cell.contentView.transform = dataSource.inverted ? CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: 0) : CGAffineTransform.identity;
if cell.avatarView != nil {