Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix read receipts on call tiles

Browse source
This commit is contained in:
ismailgulek 2021-04-12 01:27:38 +03:00
parent 07f30f5404
commit 55faf7bdf3
No known key found for this signature in database
GPG key ID: E96336D42D9470A9
3 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Riot/Modules/Room/Views/BubbleCells/Call/CallBubbleCellBaseContentView.swift
View file

@ -41,6 +41,9 @@ class CallBubbleCellBaseContentView: UIView {
@IBOutlet weak var bubbleOverlayContainer: UIView!
@IBOutlet weak var bubbleInfoContainerTopConstraint: NSLayoutConstraint!
@IBOutlet weak var readReceiptsContainerView: UIView!
@IBOutlet weak var readReceiptsContentView: UIView!
@IBOutlet weak var bottomContainerView: UIView!
var statusText: String? {
@ -52,6 +55,14 @@ class CallBubbleCellBaseContentView: UIView {
private(set) var theme: Theme = ThemeService.shared().theme
private var showReadReceipts: Bool {
get {
return !self.readReceiptsContainerView.isHidden
} set {
self.readReceiptsContainerView.isHidden = !newValue
}
}
func relayoutCallSummary() {
if bottomContainerView.subviews.isEmpty {
callSummaryHeightConstraint.constant = Constants.callSummaryStandaloneViewHeight
@ -102,3 +113,19 @@ extension CallBubbleCellBaseContentView: Themable {
}
}
// MARK: - BubbleCellReadReceiptsDisplayable
extension CallBubbleCellBaseContentView: BubbleCellReadReceiptsDisplayable {
func addReadReceiptsView(_ readReceiptsView: UIView) {
self.readReceiptsContentView.vc_removeAllSubviews()
self.readReceiptsContentView.vc_addSubViewMatchingParent(readReceiptsView)
self.showReadReceipts = true
}
func removeReadReceiptsView() {
self.showReadReceipts = false
self.readReceiptsContentView.vc_removeAllSubviews()
}
}

24
Riot/Modules/Room/Views/BubbleCells/Call/CallBubbleCellBaseContentView.xib
View file

@ -146,7 +146,29 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NR7-X3-ty9">
<rect key="frame" x="0.0" y="214" width="344" height="12"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8R3-S9-yAK">
<rect key="frame" x="194" y="0.0" width="150" height="12"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="150" id="zJh-xY-kM0"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="8R3-S9-yAK" secondAttribute="bottom" id="5Ep-68-kOk"/>
<constraint firstAttribute="height" constant="12" id="DIz-l1-rQS"/>
<constraint firstItem="8R3-S9-yAK" firstAttribute="top" secondItem="NR7-X3-ty9" secondAttribute="top" id="jei-Aj-tlK"/>
<constraint firstAttribute="trailing" secondItem="8R3-S9-yAK" secondAttribute="trailing" id="pUG-Ee-meE"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="NR7-X3-ty9" firstAttribute="width" secondItem="pdr-Jo-LHQ" secondAttribute="width" id="Owx-yH-6kR"/>
</constraints>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Fb-Sw-AW5">
<rect key="frame" x="0.0" y="0.0" width="414" height="220"/>
@ -181,6 +203,8 @@
<outlet property="paginationLabel" destination="GQH-kh-LXA" id="Mww-Ps-yv1"/>
<outlet property="paginationSeparatorView" destination="YdR-PH-eGM" id="aK7-LF-awm"/>
<outlet property="paginationTitleView" destination="H6S-AE-DTm" id="yep-a0-QYq"/>
<outlet property="readReceiptsContainerView" destination="NR7-X3-ty9" id="ryw-i0-0Ff"/>
<outlet property="readReceiptsContentView" destination="8R3-S9-yAK" id="bO0-cF-i4x"/>
</connections>
<point key="canvasLocation" x="44.927536231884062" y="-132.25446428571428"/>
</view>

14
Riot/Modules/Room/Views/BubbleCells/Call/RoomBaseCallBubbleCell.swift
View file

@ -135,6 +135,18 @@ class RoomBaseCallBubbleCell: MXKRoomBubbleTableViewCell {
}
extension RoomBaseCallBubbleCell: BubbleCellReadReceiptsDisplayable {
func addReadReceiptsView(_ readReceiptsView: UIView) {
innerContentView.addReadReceiptsView(readReceiptsView)
}
func removeReadReceiptsView() {
innerContentView.removeReadReceiptsView()
}
}
extension RoomBaseCallBubbleCell: Themable {
func update(theme: Theme) {
@ -143,6 +155,6 @@ extension RoomBaseCallBubbleCell: Themable {
}
extension RoomBaseCallBubbleCell: NibLoadable, Reusable {
extension RoomBaseCallBubbleCell: NibReusable {
}