Skip to content

Commit 60570db

Browse files
committed
Use smoother, interruptible animation on bottom sheets
1 parent 21ef7bd commit 60570db

File tree

6 files changed

+119
-64
lines changed

6 files changed

+119
-64
lines changed

Signal/Calls/UserInterface/CallDrawerSheet.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ class CallDrawerSheet: InteractiveSheetViewController {
6868

6969
super.init(blurEffect: nil)
7070

71+
self.animationsShouldBeInterruptible = true
7172
self.sheetPanDelegate = sheetPanDelegate
7273

7374
self.overrideUserInterfaceStyle = .dark
@@ -84,7 +85,7 @@ class CallDrawerSheet: InteractiveSheetViewController {
8485
}
8586
let halfHeight = windowHeight / 2
8687
let twoThirdsHeight = 2 * windowHeight / 3
87-
let tableHeight = tableView.contentSize.height
88+
let tableHeight = tableView.contentSize.height + tableView.safeAreaInsets.totalHeight + Constants.handleHeight
8889
if tableHeight >= twoThirdsHeight {
8990
return twoThirdsHeight
9091
} else if tableHeight > halfHeight {
@@ -650,7 +651,8 @@ private class GroupCallMemberCell: UITableViewCell, ReusableTableViewCell {
650651

651652
extension CallDrawerSheet: CallControlsHeightObserver {
652653
func callControlsHeightDidChange(newHeight: CGFloat) {
653-
Self.springAnimation {
654+
self.cancelAnimationAndUpdateConstraints()
655+
self.animate {
654656
self.setBottomSheetMinimizedHeight()
655657
self.view.layoutIfNeeded()
656658
}

Signal/ConversationView/Reactions/ReactionsDetailSheet.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class ReactionsDetailSheet: InteractiveSheetViewController {
3030
self.messageId = message.uniqueId
3131
self.reactionFinder = ReactionFinder(uniqueMessageId: message.uniqueId)
3232
super.init()
33+
self.animationsShouldBeInterruptible = true
3334
}
3435

3536
// MARK: -

Signal/Emoji/EmojiPickerSheet.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class EmojiPickerSheet: InteractiveSheetViewController {
6666
self.backdropColor = .clear
6767
}
6868

69+
self.animationsShouldBeInterruptible = true
6970
super.allowsExpansion = true
7071
}
7172

Signal/src/ViewControllers/Donations/DonationReadMoreSheetViewController.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ public class DonationReadMoreSheetViewController: InteractiveSheetViewController
1313
public override var sheetBackgroundColor: UIColor { Theme.tableView2PresentedBackgroundColor }
1414

1515
override public func viewDidLoad() {
16+
self.animationsShouldBeInterruptible = true
17+
1618
super.viewDidLoad()
1719

1820
minimizedHeight = 600

0 commit comments

Comments
 (0)