signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Fix regression where CC conf toasts stopped showing in 1:1 calls

Browse Source
This commit is contained in:
Marissa Le Coz 2024-08-21 17:57:27 -04:00 committed by GitHub
parent 6ca7031c0f
commit 57cebedc91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Signal/Calls/UserInterface/IndividualCallViewController.swift
View File

@ -313,10 +313,27 @@ class IndividualCallViewController: OWSViewController, IndividualCallObserver {
bottomGradientView.autoPinWidthToSuperview()
bottomGradientView.autoPinEdge(toSuperviewEdge: .bottom)
// Confirmation toasts should sit on top of the `localVideoView`
// and most other UI elements, so this `addSubview` should remain towards
// the end of the setup.
view.addSubview(callControlsConfirmationToastContainerView)
self.callControlsConfirmationToastContainerViewBottomConstraint = callControlsConfirmationToastContainerView.autoPinEdge(
.bottom,
to: .bottom,
of: self.view,
withOffset: callControlsConfirmationToastContainerViewBottomConstraintConstant
)
callControlsConfirmationToastContainerView.autoHCenterInSuperview()
createContactViews()
createIncomingCallControls()
}
private var callControlsConfirmationToastContainerViewBottomConstraint: NSLayoutConstraint?
private var callControlsConfirmationToastContainerViewBottomConstraintConstant: CGFloat {
return -self.bottomSheet.sheetHeight - 16
}
private func presentBottomSheet(_ animated: Bool) {
guard bottomSheet.presentingViewController == nil else { return }
bottomSheet.setBottomSheetMinimizedHeight()
@ -856,6 +873,8 @@ class IndividualCallViewController: OWSViewController, IndividualCallObserver {
callDurationTimer = nil
}
callControlsConfirmationToastContainerViewBottomConstraint?.constant = callControlsConfirmationToastContainerViewBottomConstraintConstant
scheduleBottomSheetTimeoutIfNecessary()
}
@ -1354,6 +1373,7 @@ private class PermissionErrorView: UIView {
extension IndividualCallViewController: SheetPanDelegate {
func sheetPanDidBegin() {
bottomSheetState = .transitioning
self.callControlsConfirmationToastManager.forceDismissToast()
}
func sheetPanDidEnd() {