Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit 8be2c6f

Browse files
authored
Merge pull request #2511 from RocketChat/bug/read_receipt_view.2464
[FIX] Read receipts missing on the list of messages
2 parents 0720ffe + ab0c584 commit 8be2c6f

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

Rocket.Chat/Views/Chat/New Chat/Cells/BaseMessageCell.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,21 @@ class BaseMessageCell: UICollectionViewCell, BaseMessageCellProtocol, ChatCell {
7878
func configure(readReceipt button: UIButton) {
7979
guard
8080
let viewModel = viewModel?.base as? BaseMessageChatItem,
81-
let settings = settings
81+
let settings = settings,
82+
let message = viewModel.message
8283
else {
8384
return
8485
}
8586

8687
if settings.messageReadReceiptEnabled {
8788
button.isHidden = false
89+
90+
let image = message.unread ? UIImage(named: "Unread") : UIImage(named: "Read")
91+
button.setImage(image, for: .normal)
8892
} else {
8993
button.isHidden = true
9094
button.changeWidth(to: 0)
9195
button.changeLeading(to: 0)
92-
93-
let image = (viewModel.message?.unread ?? false) ? UIImage(named: "Unread") : UIImage(named: "Read")
94-
button.setImage(image, for: .normal)
9596
}
9697
}
9798

Rocket.Chat/Views/Chat/New Chat/Cells/BasicMessageCell.xib

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@
4949
<constraint firstAttribute="height" constant="20" id="zQ8-gG-X3N"/>
5050
</constraints>
5151
</view>
52-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nz7-HR-gAg">
52+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nz7-HR-gAg">
5353
<rect key="frame" x="339" y="35" width="20" height="20"/>
5454
<constraints>
5555
<constraint firstAttribute="width" constant="20" id="0MA-1u-JG8"/>
5656
<constraint firstAttribute="height" constant="20" id="Kf1-nT-YCg"/>
5757
</constraints>
58+
<state key="normal" image="Unread"/>
5859
</button>
5960
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Exclamation" translatesAutoresizingMaskIntoConstraints="NO" id="yII-Mp-ySs">
6061
<rect key="frame" x="164.5" y="15.5" width="14" height="14"/>
@@ -106,5 +107,6 @@
106107
</objects>
107108
<resources>
108109
<image name="Exclamation" width="20" height="20"/>
110+
<image name="Unread" width="15" height="9"/>
109111
</resources>
110112
</document>

Rocket.Chat/Views/Chat/New Chat/Cells/SequentialMessageCell.xib

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@
2626
<constraint firstAttribute="height" constant="20" id="Za6-ue-cn4"/>
2727
</constraints>
2828
</view>
29-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="prl-FX-Ikw">
29+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="prl-FX-Ikw">
3030
<rect key="frame" x="339" y="0.0" width="20" height="20"/>
3131
<constraints>
3232
<constraint firstAttribute="height" constant="20" id="pBg-j1-r96"/>
3333
<constraint firstAttribute="width" constant="20" id="ziC-M7-ddE"/>
3434
</constraints>
35+
<state key="normal" image="Unread"/>
3536
</button>
3637
</subviews>
3738
</view>
@@ -58,4 +59,7 @@
5859
<point key="canvasLocation" x="509.60000000000002" y="-292.80359820089956"/>
5960
</collectionViewCell>
6061
</objects>
62+
<resources>
63+
<image name="Unread" width="15" height="9"/>
64+
</resources>
6165
</document>

0 commit comments

Comments
 (0)