Explorar o código

welcome view layout respects navbar

nayooti %!s(int64=5) %!d(string=hai) anos
pai
achega
ead561964c
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      deltachat-ios/Controller/WelcomeViewController.swift

+ 3 - 3
deltachat-ios/Controller/WelcomeViewController.swift

@@ -66,12 +66,12 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
 
 
     override func viewDidLayoutSubviews() {
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         super.viewDidLayoutSubviews()
-        welcomeView.minContainerHeight = view.frame.height
+        welcomeView.minContainerHeight = view.frame.height - view.safeAreaInsets.top
     }
     }
 
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
         super.viewWillTransition(to: size, with: coordinator)
-        welcomeView.minContainerHeight = size.height
+        welcomeView.minContainerHeight = size.height - view.safeAreaInsets.top
         scrollView.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
         scrollView.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
     }
     }
 
 
@@ -311,7 +311,7 @@ class WelcomeContentView: UIView {
         let bottomLayoutGuide = UILayoutGuide()
         let bottomLayoutGuide = UILayoutGuide()
         container.addLayoutGuide(bottomLayoutGuide)
         container.addLayoutGuide(bottomLayoutGuide)
         bottomLayoutGuide.bottomAnchor.constraint(equalTo: container.bottomAnchor).isActive = true
         bottomLayoutGuide.bottomAnchor.constraint(equalTo: container.bottomAnchor).isActive = true
-        bottomLayoutGuide.heightAnchor.constraint(equalTo: container.heightAnchor, multiplier: 0.55).isActive = true
+        bottomLayoutGuide.heightAnchor.constraint(equalTo: container.heightAnchor, multiplier: 0.5).isActive = true
 
 
         subtitleLabel.topAnchor.constraint(equalTo: bottomLayoutGuide.topAnchor).isActive = true
         subtitleLabel.topAnchor.constraint(equalTo: bottomLayoutGuide.topAnchor).isActive = true
         subtitleLabel.leadingAnchor.constraint(equalTo: container.leadingAnchor).isActive = true
         subtitleLabel.leadingAnchor.constraint(equalTo: container.leadingAnchor).isActive = true