From c8e0419dec1e9128fa7cd923ecc8d5af5fb0d2a1 Mon Sep 17 00:00:00 2001
From: Nathan Mattes <hallo@bullenscheisse.de>
Date: Fri, 6 Jan 2023 13:44:11 +0100
Subject: [PATCH] Revert "Some polish here and there in regards (#690)"

This reverts commit a84910f2aba114a6600337dd9d50d3d5e5c749c6.
---
 .../Login/MastodonLoginViewController.swift   |  2 -
 .../MastodonPickServerViewController.swift    |  5 +--
 .../Welcome/WelcomeViewController.swift       | 37 ++++++++++---------
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift
index b45c102f3..9f9ce5d75 100644
--- a/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift
+++ b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift
@@ -102,8 +102,6 @@ class MastodonLoginViewController: UIViewController, NeedsDependency {
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
 
-    navigationController?.setNavigationBarHidden(true, animated: false)
-
     viewModel.updateServers()
   }
 
diff --git a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift
index defc0e31c..2ed541c5c 100644
--- a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift
+++ b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift
@@ -67,10 +67,7 @@ extension MastodonPickServerViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-
-        navigationController?.navigationBar.prefersLargeTitles = true
-        navigationController?.setNavigationBarHidden(false, animated: false)
-
+        
         setupOnboardingAppearance()
         defer { setupNavigationBarBackgroundView() }
 
diff --git a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
index d78e9a4fd..12324ec9c 100644
--- a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
+++ b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
@@ -14,7 +14,7 @@ import MastodonLocalization
 final class WelcomeViewController: UIViewController, NeedsDependency {
     
     private enum Constants {
-        static let topAnchorInset: CGFloat = 24
+        static let topAnchorInset: CGFloat = 20
     }
     
     weak var context: AppContext! { willSet { precondition(!isViewLoaded) } }
@@ -75,7 +75,7 @@ extension WelcomeViewController {
         definesPresentationContext = true
         preferredContentSize = CGSize(width: 547, height: 678)
         
-        navigationController?.navigationBar.prefersLargeTitles = false
+        navigationController?.navigationBar.prefersLargeTitles = true
         view.overrideUserInterfaceStyle = .light
         
         setupOnboardingAppearance()
@@ -135,7 +135,7 @@ extension WelcomeViewController {
         }
         
         NSLayoutConstraint.activate([
-            pageViewController.view.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: Constants.topAnchorInset),
+            pageViewController.view.topAnchor.constraint(equalTo: view.topAnchor, constant: computedTopAnchorInset),
             pageViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
             view.trailingAnchor.constraint(equalTo: pageViewController.view.trailingAnchor),
             buttonContainer.topAnchor.constraint(equalTo: pageViewController.view.bottomAnchor, constant: 16),
@@ -145,23 +145,10 @@ extension WelcomeViewController {
             .receive(on: DispatchQueue.main)
             .sink { [weak self] needsShowDismissEntry in
                 guard let self = self else { return }
-
-                if needsShowDismissEntry {
-                    self.navigationItem.leftBarButtonItem = self.dismissBarButtonItem
-                    self.navigationController?.setNavigationBarHidden(false, animated: false)
-                } else {
-                    self.navigationController?.setNavigationBarHidden(true, animated: false)
-                }
+                self.navigationItem.leftBarButtonItem = needsShowDismissEntry ? self.dismissBarButtonItem : nil
             }
             .store(in: &disposeBag)
     }
-
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-
-        navigationController?.navigationBar.prefersLargeTitles = false
-        navigationController?.setNavigationBarHidden(true, animated: false)
-    }
     
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
@@ -187,6 +174,10 @@ extension WelcomeViewController {
         setupIllustrationLayout()
         setupButtonShadowView()
     }
+    
+    private var computedTopAnchorInset: CGFloat {
+        (navigationController?.navigationBar.bounds.height ?? UINavigationBar().bounds.height) + Constants.topAnchorInset
+    }
 }
 
 extension WelcomeViewController {
@@ -248,7 +239,17 @@ extension WelcomeViewController {
 }
 
 // MARK: - OnboardingViewControllerAppearance
-extension WelcomeViewController: OnboardingViewControllerAppearance {}
+extension WelcomeViewController: OnboardingViewControllerAppearance {
+    func setupNavigationBarAppearance() {
+        // always transparent
+        let barAppearance = UINavigationBarAppearance()
+        barAppearance.configureWithTransparentBackground()
+        navigationItem.standardAppearance = barAppearance
+        navigationItem.compactAppearance = barAppearance
+        navigationItem.scrollEdgeAppearance = barAppearance
+        navigationItem.compactScrollEdgeAppearance = barAppearance
+    }
+}
 
 // MARK: - UIAdaptivePresentationControllerDelegate
 extension WelcomeViewController: UIAdaptivePresentationControllerDelegate {