layout complete

deltachat-ios/Controller/WelcomeViewController.swift

@@ -4,7 +4,6 @@ class WelcomeViewController: UIViewController {
 
     private lazy var scrollView: UIScrollView = {
         let scrollView = UIScrollView()
-        scrollView.backgroundColor = .orange
         scrollView.showsVerticalScrollIndicator = false
         return scrollView
     }()
@@ -29,8 +28,10 @@ class WelcomeViewController: UIViewController {
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
         welcomeView.minContainerHeight = size.height
+        scrollView.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
     }
 
+    // MARK: - setup
     private func setupSubviews() {
         view.addSubview(scrollView)
         scrollView.translatesAutoresizingMaskIntoConstraints = false
@@ -63,6 +64,7 @@ class WelcomeContentView: UIView {
     var minContainerHeight: CGFloat = 0 {
         didSet {
             containerMinHeightConstraint.constant = minContainerHeight
+            logoHeightConstraint.constant = calculateLogoHeight()
         }
     }
 
@@ -70,6 +72,10 @@ class WelcomeContentView: UIView {
         return container.heightAnchor.constraint(greaterThanOrEqualToConstant: 0)
     }()
 
+    private lazy var logoHeightConstraint: NSLayoutConstraint = {
+        return logoView.heightAnchor.constraint(equalToConstant: 0)
+    }()
+
     private var container = UIView()
 
     private var logoView: UIImageView = {
@@ -80,11 +86,11 @@ class WelcomeContentView: UIView {
 
     private lazy var titleLabel: UILabel = {
         let label = UILabel()
-        label.text = "Welcome to Delta Chat xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+        label.text = "Welcome to Delta Chat "
         label.textColor = DcColors.grayTextColor
         label.textAlignment = .center
         label.numberOfLines = 0
-        label.font = UIFont.systemFont(ofSize: 100, weight: .bold)
+        label.font = UIFont.systemFont(ofSize: 24, weight: .bold)
         return label
     }()
 
@@ -131,17 +137,19 @@ class WelcomeContentView: UIView {
         return button
     }()
 
+    private let defaultSpacing: CGFloat = 20
+
     init() {
         super.init(frame: .zero)
         setupSubviews()
         backgroundColor = .white
-        container.makeBorder(color: .orange)
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+    // MARK: - setup
     private func setupSubviews() {
         addSubview(container)
         container.translatesAutoresizingMaskIntoConstraints = false
@@ -153,16 +161,58 @@ class WelcomeContentView: UIView {
 
         containerMinHeightConstraint.isActive = true
 
-        container.addSubview(titleLabel)
-        titleLabel.translatesAutoresizingMaskIntoConstraints = false
-        //titleLabel.centerXAnchor.constraint(equalTo: centerXAnchor).isActive = true
+        _ = [logoView, titleLabel, subtitleLabel, loginButton, qrCodeButton, importBackupButton].map {
+            addSubview($0)
+            $0.translatesAutoresizingMaskIntoConstraints = false
+        }
+
+        let bottomLayoutGuide = UILayoutGuide()
+        container.addLayoutGuide(bottomLayoutGuide)
+        bottomLayoutGuide.bottomAnchor.constraint(equalTo: container.bottomAnchor).isActive = true
+        bottomLayoutGuide.heightAnchor.constraint(equalTo: container.heightAnchor, multiplier: 0.55).isActive = true
+
+        subtitleLabel.topAnchor.constraint(equalTo: bottomLayoutGuide.topAnchor).isActive = true
+        subtitleLabel.leadingAnchor.constraint(equalTo: container.leadingAnchor).isActive = true
+        subtitleLabel.trailingAnchor.constraint(equalTo: container.trailingAnchor).isActive = true
+        subtitleLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+
         titleLabel.leadingAnchor.constraint(equalTo: container.leadingAnchor).isActive = true
         titleLabel.trailingAnchor.constraint(equalTo: container.trailingAnchor).isActive = true
-        titleLabel.topAnchor.constraint(equalTo: container.topAnchor).isActive = true
-        titleLabel.bottomAnchor.constraint(equalTo: container.bottomAnchor).isActive = true
+        titleLabel.bottomAnchor.constraint(equalTo: subtitleLabel.topAnchor, constant: -defaultSpacing).isActive = true
+        titleLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+
+        logoView.bottomAnchor.constraint(equalTo: titleLabel.topAnchor, constant: -defaultSpacing).isActive = true
+        logoView.centerXAnchor.constraint(equalTo: container.centerXAnchor).isActive = true
+        logoHeightConstraint.constant = calculateLogoHeight()
+        logoHeightConstraint.isActive = true
+        logoView.widthAnchor.constraint(equalTo: logoView.heightAnchor).isActive = true
+
+        let logoTopAnchor = logoView.topAnchor.constraint(equalTo: container.topAnchor, constant: 20)   // this will make container bigger if needed
+        logoTopAnchor.priority = .defaultLow
+        logoTopAnchor.isActive = true
+
+        loginButton.centerXAnchor.constraint(equalTo: container.centerXAnchor).isActive = true
+        loginButton.topAnchor.constraint(equalTo: subtitleLabel.bottomAnchor, constant: defaultSpacing).isActive = true
+
+        qrCodeButton.topAnchor.constraint(equalTo: loginButton.bottomAnchor, constant: defaultSpacing).isActive = true
+        qrCodeButton.centerXAnchor.constraint(equalTo: container.centerXAnchor).isActive = true
+        importBackupButton.topAnchor.constraint(equalTo: qrCodeButton.bottomAnchor, constant: 10).isActive = true
+        importBackupButton.centerXAnchor.constraint(equalTo: container.centerXAnchor).isActive = true
+        importBackupButton.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        let importBackupButtonConstraint = importBackupButton.bottomAnchor.constraint(equalTo: container.bottomAnchor, constant: -50)
+        importBackupButtonConstraint.priority = .defaultLow
+        importBackupButtonConstraint.isActive = true
 
     }
 
+    private func calculateLogoHeight() -> CGFloat {
+        let titleHeight = titleLabel.intrinsicContentSize.height
+        let subtitleHeight = subtitleLabel.intrinsicContentSize.height
+        let intrinsicHeight = subtitleHeight + titleHeight
+        let maxHeight: CGFloat = 100
+        return intrinsicHeight > maxHeight ? maxHeight : intrinsicHeight
+    }
+
     // MARK: - actions
      @objc private func loginButtonPressed(_ sender: UIButton) {
          onLogin?()
@@ -175,154 +225,4 @@ class WelcomeContentView: UIView {
      @objc private func importBackupButtonPressed(_ sender: UIButton) {
          onImportBackup?()
      }
-
-    /*
-
-
-
-
-    private let fontSize: CGFloat = 24 // probably better to make larger for ipad
-
-    private var container = UIView()
-
-    private var logoView: UIImageView = {
-        let image = #imageLiteral(resourceName: "ic_launcher").withRenderingMode(.alwaysOriginal)
-        let view = UIImageView(image: image)
-        return view
-    }()
-
-    private lazy var titleLabel: UILabel = {
-        let label = UILabel()
-        label.text = "Welcome to Delta Chat"
-        label.textColor = DcColors.grayTextColor
-        label.textAlignment = .center
-        label.font = UIFont.systemFont(ofSize: fontSize, weight: .bold)
-        return label
-    }()
-
-    private lazy var subtitleLabel: UILabel = {
-        let label = UILabel()
-        label.text = "The messenger with the broadest audience in the world. Free and independent."
-        label.font = UIFont.systemFont(ofSize: 22, weight: .regular)
-        label.textColor = DcColors.grayTextColor
-        label.numberOfLines = 0
-        label.textAlignment = .center
-        return label
-    }()
-
-    private lazy var loginButton: UIButton = {
-        let button = UIButton(type: .roundedRect)
-        let title = "log in to your server".uppercased()
-        button.setTitle(title, for: .normal)
-        button.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .regular)
-        button.setTitleColor(.white, for: .normal)
-        button.backgroundColor = DcColors.primary
-        let insets = button.contentEdgeInsets
-        button.contentEdgeInsets = UIEdgeInsets(top: 8, left: 15, bottom: 8, right: 15)
-        button.layer.cornerRadius = 5
-        button.clipsToBounds = true
-        button.addTarget(self, action: #selector(loginButtonPressed(_:)), for: .touchUpInside)
-        return button
-    }()
-
-    private lazy var qrCodeButton: UIButton = {
-        let button = UIButton()
-        let title = "Scan QR code"
-        button.setTitleColor(UIColor.systemBlue, for: .normal)
-        button.setTitle(title, for: .normal)
-        button.addTarget(self, action: #selector(qrCodeButtonPressed(_:)), for: .touchUpInside)
-        return button
-    }()
-
-    private lazy var importBackupButton: UIButton = {
-        let button = UIButton()
-        let title = "Import backup"
-        button.setTitleColor(UIColor.systemBlue, for: .normal)
-        button.setTitle(title, for: .normal)
-        button.addTarget(self, action: #selector(importBackupButtonPressed(_:)), for: .touchUpInside)
-        return button
-    }()
-
-    private var containerMinimumHeightConstraint: NSLayoutConstraint!
-
-
-    init() {
-        super.init(frame: .zero)
-        setupSubviews()
-    }
-
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    private func setupSubviews() {
-
-        addSubview(container)
-        container.translatesAutoresizingMaskIntoConstraints = false
-
-        container.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
-        container.topAnchor.constraint(equalTo: topAnchor).isActive = true
-        container.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
-        container.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
-
-        containerMinimumHeightConstraint = heightAnchor.constraint(equalToConstant: 100)
-        containerMinimumHeightConstraint.isActive = true
-
-
-
-        let verticalStackview = UIStackView(arrangedSubviews: [titleLabel, subtitleLabel])
-        verticalStackview.axis = .vertical
-        verticalStackview.spacing = 20
-        contentView.addSubview(verticalStackview)
-        verticalStackview.translatesAutoresizingMaskIntoConstraints = false
-        verticalStackview.centerYAnchor.constraint(equalTo: centerYAnchor, constant: 0).isActive = true
-        verticalStackview.centerXAnchor.constraint(equalTo: contentView.centerXAnchor).isActive = true
-        verticalStackview.widthAnchor.constraint(equalTo: contentView.widthAnchor, multiplier: 0.75).isActive = true
-
-        contentView.addSubview(logoView)
-        logoView.translatesAutoresizingMaskIntoConstraints = false
-        logoView.heightAnchor.constraint(equalTo: verticalStackview.heightAnchor, multiplier: 0.75).isActive = true
-        logoView.widthAnchor.constraint(equalTo: logoView.heightAnchor).isActive = true
-        logoView.centerXAnchor.constraint(equalTo: contentView.centerXAnchor).isActive = true
-        logoView.bottomAnchor.constraint(equalTo: verticalStackview.topAnchor, constant: -20).isActive = true
-        let logoTopAnchor = logoView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 20) // this will allow the cell to grow if needed
-        logoTopAnchor.priority = UILayoutPriority.defaultLow
-        logoTopAnchor.isActive = true
-
-
-        let buttonStackview = UIStackView(arrangedSubviews: [loginButton, qrCodeButton, importBackupButton])
-        buttonStackview.axis = .vertical
-        buttonStackview.spacing = 10
-        buttonStackview.distribution = .fillProportionally
-        contentView.addSubview(buttonStackview)
-        buttonStackview.translatesAutoresizingMaskIntoConstraints = false
-        buttonStackview.centerXAnchor.constraint(equalTo: contentView.centerXAnchor).isActive = true
-        buttonStackview.topAnchor.constraint(equalTo: verticalStackview.bottomAnchor, constant: 30).isActive = true
-
-        let buttonStackviewBottomAnchor = buttonStackview.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -20)
-        buttonStackviewBottomAnchor.priority = .
-        buttonStackviewBottomAnchor.isActive = true
-
-                contentView.addSubview(loginButton)
-        loginButton.translatesAutoresizingMaskIntoConstraints = false
-        loginButton.topAnchor.constraint(equalTo: verticalStackview.bottomAnchor, constant: 20).isActive = true
-        loginButton.centerXAnchor.constraint(equalTo: contentView.centerXAnchor).isActive = true
-
-        contentView.addSubview(qrCodeButton)
-        qrCodeButton.translatesAutoresizingMaskIntoConstraints = false
-        qrCodeButton.centerXAnchor.constraint(equalTo: contentView.centerXAnchor).isActive = true
-        qrCodeButton.topAnchor.constraint(equalTo: loginButton.bottomAnchor, constant: 10).isActive = true
-
-        contentView.addSubview(importBackupButton)
-        importBackupButton.translatesAutoresizingMaskIntoConstraints = false
-        importBackupButton.centerXAnchor.constraint(equalTo: contentView.centerXAnchor).isActive = true
-        importBackupButton.topAnchor.constraint(equalTo: qrCodeButton.bottomAnchor, constant: 10).isActive = true
-        let buttonStackviewBottomAnchor = importBackupButton.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -20)
-        buttonStackviewBottomAnchor.priority = .defaultHigh
-        buttonStackviewBottomAnchor.isActive = true
-
-    }
-    */
-
-
 }