Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve notification banner transitions #5170

Merged
merged 1 commit into from
Sep 22, 2023
Merged

Improve notification banner transitions #5170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions ios/MullvadVPN/Notifications/UI/NotificationController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ final class NotificationController: UIViewController {
let bannerView: NotificationBannerView = {
let bannerView = NotificationBannerView()
bannerView.translatesAutoresizingMaskIntoConstraints = false
bannerView.isHidden = true
bannerView.isAccessibilityElement = true
return bannerView
}()
Expand Down Expand Up @@ -63,21 +62,13 @@ final class NotificationController: UIViewController {
// avoid undesired horizontal expansion animation.
view.layoutIfNeeded()

bannerView.isHidden = false
hideBannerConstraint?.isActive = false
showBannerConstraint?.isActive = true
} else {
showBannerConstraint?.isActive = false
hideBannerConstraint?.isActive = true
}

let finish = { [weak self] in
if self?.lastNotification == nil {
self?.bannerView.isHidden = true
}
completion?()
}

if animated {
let timing = UISpringTimingParameters(
dampingRatio: 0.7,
Expand All @@ -89,12 +80,12 @@ final class NotificationController: UIViewController {
self.view.layoutIfNeeded()
}
animator.addCompletion { _ in
finish()
completion?()
}
animator.startAnimation()
} else {
view.layoutIfNeeded()
finish()
completion?()
}
}

Expand Down
Loading