diff --git a/iOS/AppCoordinator.swift b/iOS/AppCoordinator.swift index be47ba0b4..f207f0b96 100644 --- a/iOS/AppCoordinator.swift +++ b/iOS/AppCoordinator.swift @@ -103,7 +103,6 @@ class AppCoordinator: NSObject, UndoableCommandRunner { } } - private(set) var showFeedNames = false private(set) var showAvatars = false @@ -456,13 +455,19 @@ class AppCoordinator: NSObject, UndoableCommandRunner { currentArticleIndexPath = indexPath } else { let targetSplit = targetSplitForDetail() + let detailViewController = UIStoryboard.main.instantiateController(ofType: DetailViewController.self) detailViewController.coordinator = self + + let detailNavController = UINavigationController(rootViewController: detailViewController) + detailNavController.isToolbarHidden = false detailViewController.navigationItem.leftBarButtonItem = targetSplit.displayModeButtonItem detailViewController.navigationItem.leftItemsSupplementBackButton = true + currentArticleIndexPath = indexPath // rootSplitViewController.toggleMasterView() - targetSplit.showDetailViewController(detailViewController, sender: self) + + targetSplit.showDetailViewController(detailNavController, sender: self) } } diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard index 53594f2ed..d1120fc2b 100644 --- a/iOS/Base.lproj/Main.storyboard +++ b/iOS/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + @@ -7,26 +7,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -137,11 +117,12 @@ - + + @@ -167,9 +148,8 @@ - - + @@ -218,20 +198,6 @@ - - - - - - - - - - - - - - diff --git a/iOS/SceneDelegate.swift b/iOS/SceneDelegate.swift index 3188b5279..084d65d94 100644 --- a/iOS/SceneDelegate.swift +++ b/iOS/SceneDelegate.swift @@ -17,9 +17,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + window = UIWindow(windowScene: scene as! UIWindowScene) window!.tintColor = AppAssets.netNewsWireBlueColor - window?.rootViewController = coordinator.start() - + window!.rootViewController = coordinator.start() + window!.makeKeyAndVisible() + // if let userActivity = connectionOptions.userActivities.first ?? session.stateRestorationActivity { // if !configure(window: window, with: userActivity) { // print("Failed to restore from \(userActivity)")