From 087a02c8da503400cae507d46dee569da8196ad6 Mon Sep 17 00:00:00 2001 From: Marcus Kida Date: Tue, 28 Mar 2023 21:44:51 +0200 Subject: [PATCH] Improve server rules in onboarding according to VQA (#996) --- .../Scene/Onboarding/Privacy/PrivacyTableViewController.swift | 2 +- .../ServerRules/MastodonServerRulesViewController.swift | 2 ++ Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Mastodon/Scene/Onboarding/Privacy/PrivacyTableViewController.swift b/Mastodon/Scene/Onboarding/Privacy/PrivacyTableViewController.swift index 4d57c38af..404db0bb4 100644 --- a/Mastodon/Scene/Onboarding/Privacy/PrivacyTableViewController.swift +++ b/Mastodon/Scene/Onboarding/Privacy/PrivacyTableViewController.swift @@ -81,7 +81,7 @@ class PrivacyTableViewController: UIViewController, NeedsDependency { override func viewDidLoad() { super.viewDidLoad() - + navigationItem.largeTitleDisplayMode = .always setupOnboardingAppearance() } diff --git a/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift b/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift index 5ad1b740c..871f115ff 100644 --- a/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift +++ b/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift @@ -51,6 +51,8 @@ extension MastodonServerRulesViewController { tableView.delegate = self viewModel.setupDiffableDataSource(tableView: tableView) + + navigationItem.largeTitleDisplayMode = .always navigationItem.rightBarButtonItem = UIBarButtonItem(title: L10n.Scene.ServerRules.Button.confirm, style: .done, target: self, action: #selector(MastodonServerRulesViewController.nextButtonPressed(_:))) title = L10n.Scene.ServerRules.title diff --git a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift index e9797921b..6518d98db 100644 --- a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift +++ b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift @@ -92,7 +92,9 @@ extension WelcomeViewController { definesPresentationContext = true preferredContentSize = CGSize(width: 547, height: 678) - navigationController?.navigationBar.prefersLargeTitles = false + navigationController?.navigationBar.prefersLargeTitles = true /// enable large title support for this and all subsequent VCs + navigationItem.largeTitleDisplayMode = .never + view.overrideUserInterfaceStyle = .light setupOnboardingAppearance()