mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-23 18:12:44 +02:00
Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens
This commit is contained in:
+18
-18
@@ -21,62 +21,62 @@ class HomeViewControllerWithBannerWrapperViewController: UIViewController, MXKVi
|
||||
@objc let homeViewController: HomeViewController
|
||||
private var bannerContainerView: UIView!
|
||||
private var stackView: UIStackView!
|
||||
|
||||
|
||||
init(viewController: HomeViewController) {
|
||||
self.homeViewController = viewController
|
||||
|
||||
|
||||
super.init(nibName: nil, bundle: nil)
|
||||
|
||||
|
||||
extendedLayoutIncludesOpaqueBars = true
|
||||
|
||||
|
||||
self.tabBarItem.tag = viewController.tabBarItem.tag
|
||||
self.tabBarItem.image = viewController.tabBarItem.image
|
||||
self.accessibilityLabel = viewController.accessibilityLabel
|
||||
}
|
||||
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("Not implemented")
|
||||
}
|
||||
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
|
||||
homeViewController.willMove(toParent: self)
|
||||
|
||||
|
||||
view.backgroundColor = .clear
|
||||
|
||||
|
||||
stackView = UIStackView()
|
||||
stackView.axis = .vertical
|
||||
stackView.distribution = .fill
|
||||
stackView.alignment = .fill
|
||||
|
||||
|
||||
view.vc_addSubViewMatchingParent(stackView)
|
||||
|
||||
addChild(homeViewController)
|
||||
stackView.addArrangedSubview(homeViewController.view)
|
||||
homeViewController.didMove(toParent: self)
|
||||
}
|
||||
|
||||
|
||||
// MARK: - BannerPresentationProtocol
|
||||
|
||||
|
||||
func presentBannerView(_ bannerView: UIView, animated: Bool) {
|
||||
bannerView.alpha = 0.0
|
||||
bannerView.isHidden = true
|
||||
self.stackView.insertArrangedSubview(bannerView, at: 0)
|
||||
self.stackView.layoutIfNeeded()
|
||||
|
||||
|
||||
UIView.animate(withDuration: (animated ? 0.25 : 0.0)) {
|
||||
bannerView.alpha = 1.0
|
||||
bannerView.isHidden = false
|
||||
self.stackView.layoutIfNeeded()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func dismissBannerView(animated: Bool) {
|
||||
guard stackView.arrangedSubviews.count > 1, let bannerView = self.stackView.arrangedSubviews.first else {
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
UIView.animate(withDuration: (animated ? 0.25 : 0.0)) {
|
||||
bannerView.alpha = 0.0
|
||||
bannerView.isHidden = true
|
||||
@@ -85,7 +85,7 @@ class HomeViewControllerWithBannerWrapperViewController: UIViewController, MXKVi
|
||||
bannerView.removeFromSuperview()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// MARK: - MXKViewControllerActivityHandling
|
||||
var activityIndicator: UIActivityIndicatorView! {
|
||||
get {
|
||||
@@ -95,11 +95,11 @@ class HomeViewControllerWithBannerWrapperViewController: UIViewController, MXKVi
|
||||
homeViewController.activityIndicator = newValue
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func startActivityIndicator() {
|
||||
homeViewController.startActivityIndicator()
|
||||
}
|
||||
|
||||
|
||||
func stopActivityIndicator() {
|
||||
homeViewController.stopActivityIndicator()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user