Fix navigation bars inside of VectorHostingController.

Riot/Modules/Common/SwiftUI/VectorHostingController.swift

@@ -73,14 +73,6 @@ class VectorHostingController: UIHostingController<AnyView> {
  bottomSheetPreferences?.setup(viewController: self)
  }
 
- override func viewWillAppear(_ animated: Bool) {
- super.viewWillAppear(animated)
-
- if isNavigationBarHidden {
- self.navigationController?.isNavigationBarHidden = true
- }
- }
-
  override func viewDidAppear(_ animated: Bool) {
  super.viewDidAppear(animated)
 
@@ -93,6 +85,14 @@ class VectorHostingController: UIHostingController<AnyView> {
  }
  }
 
+ override func viewWillLayoutSubviews() {
+ super.viewWillLayoutSubviews()
+
+ if let navigationController = navigationController, navigationController.isNavigationBarHidden != isNavigationBarHidden {
+ navigationController.isNavigationBarHidden = isNavigationBarHidden
+ }
+ }
+
  override func viewDidLayoutSubviews() {
  super.viewDidLayoutSubviews()
 

RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptCoordinator.swift

@@ -27,7 +27,7 @@ final class AnalyticsPromptCoordinator: Coordinator, Presentable {
  // MARK: Private
 
  private let parameters: AnalyticsPromptCoordinatorParameters
- private let analyticsPromptHostingController: UIViewController
+ private let analyticsPromptHostingController: VectorHostingController
  private var _analyticsPromptViewModel: Any?
 
  fileprivate var analyticsPromptViewModel: AnalyticsPromptViewModel {
@@ -59,6 +59,7 @@ final class AnalyticsPromptCoordinator: Coordinator, Presentable {
  let view = AnalyticsPrompt(viewModel: viewModel.context)
  _analyticsPromptViewModel = viewModel
  analyticsPromptHostingController = VectorHostingController(rootView: view)
+ analyticsPromptHostingController.isNavigationBarHidden = true
  }
 
  // MARK: - Public

RiotSwiftUI/Modules/Onboarding/Celebration/Coordinator/OnboardingCelebrationCoordinator.swift

@@ -45,6 +45,7 @@ final class OnboardingCelebrationCoordinator: Coordinator, Presentable {
  onboardingCelebrationViewModel = viewModel
  onboardingCelebrationHostingController = VectorHostingController(rootView: view)
  onboardingCelebrationHostingController.enableNavigationBarScrollEdgeAppearance = true
+ onboardingCelebrationHostingController.isNavigationBarHidden = true
  }
 
  // MARK: - Public

RiotSwiftUI/Modules/Onboarding/Congratulations/Coordinator/OnboardingCongratulationsCoordinator.swift

@@ -58,6 +58,7 @@ final class OnboardingCongratulationsCoordinator: Coordinator, Presentable {
  onboardingCongratulationsViewModel = viewModel
  onboardingCongratulationsHostingController = VectorHostingController(rootView: view)
  onboardingCongratulationsHostingController.statusBarStyle = .lightContent
+ onboardingCongratulationsHostingController.isNavigationBarHidden = true
  }
 
  // MARK: - Public

RiotSwiftUI/Modules/Onboarding/SplashScreen/Coordinator/OnboardingSplashScreenCoordinator.swift

@@ -46,6 +46,7 @@ final class OnboardingSplashScreenCoordinator: OnboardingSplashScreenCoordinator
  onboardingSplashScreenViewModel = viewModel
  onboardingSplashScreenHostingController = VectorHostingController(rootView: view)
  onboardingSplashScreenHostingController.vc_removeBackTitle()
+ onboardingSplashScreenHostingController.isNavigationBarHidden = true
 
  indicatorPresenter = UserIndicatorTypePresenter(presentingViewController: onboardingSplashScreenHostingController)
  }