Set default status bar to MasterBrowserViewController

bluepeople1 · Apr 9, 2018 · 8bcff41 · 8bcff41
1 parent 012ac7e
commit 8bcff41
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Trust.xcodeproj/project.pbxproj b/Trust.xcodeproj/project.pbxproj
@@ -386,7 +386,7 @@
 		77B3BF3C201908ED00EEC15A /* ConfirmCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B3BF3B201908ED00EEC15A /* ConfirmCoordinator.swift */; };
 		77B3BF4A2019247200EEC15A /* BrowserNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B3BF492019247200EEC15A /* BrowserNavigationBar.swift */; };
 		77B806A52075C33D005FDCBE /* SharedMigrationInitializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B806A42075C33D005FDCBE /* SharedMigrationInitializer.swift */; };
-		77B806A9207766DC005FDCBE /* MasterBookmarksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B806A8207766DC005FDCBE /* MasterBookmarksViewController.swift */; };
+		77B806A9207766DC005FDCBE /* MasterBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B806A8207766DC005FDCBE /* MasterBrowserViewController.swift */; };
 		77B806AB20776781005FDCBE /* HistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B806AA20776781005FDCBE /* HistoryViewController.swift */; };
 		77B806AD20776BFD005FDCBE /* HistoriesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B806AC20776BFD005FDCBE /* HistoriesViewModel.swift */; };
 		77B806AF20776EDA005FDCBE /* HistoryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B806AE20776EDA005FDCBE /* HistoryViewModel.swift */; };
@@ -867,7 +867,7 @@
 		77B3BF3B201908ED00EEC15A /* ConfirmCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmCoordinator.swift; sourceTree = "<group>"; };
 		77B3BF492019247200EEC15A /* BrowserNavigationBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserNavigationBar.swift; sourceTree = "<group>"; };
 		77B806A42075C33D005FDCBE /* SharedMigrationInitializer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedMigrationInitializer.swift; sourceTree = "<group>"; };
-		77B806A8207766DC005FDCBE /* MasterBookmarksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterBookmarksViewController.swift; sourceTree = "<group>"; };
+		77B806A8207766DC005FDCBE /* MasterBrowserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterBrowserViewController.swift; sourceTree = "<group>"; };
 		77B806AA20776781005FDCBE /* HistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryViewController.swift; sourceTree = "<group>"; };
 		77B806AC20776BFD005FDCBE /* HistoriesViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoriesViewModel.swift; sourceTree = "<group>"; };
 		77B806AE20776EDA005FDCBE /* HistoryViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryViewModel.swift; sourceTree = "<group>"; };
@@ -1946,7 +1946,7 @@
 			children = (
 				29E6E06D1FE897EE0079265A /* BrowserViewController.swift */,
 				903682F0204A6DB800013479 /* BookmarkViewController.swift */,
-				77B806A8207766DC005FDCBE /* MasterBookmarksViewController.swift */,
+				77B806A8207766DC005FDCBE /* MasterBrowserViewController.swift */,
 				77B806AA20776781005FDCBE /* HistoryViewController.swift */,
 			);
 			path = ViewControllers;
@@ -3212,7 +3212,7 @@
 				73B1A6BE204B55FA001F546C /* NonFungibleTokenCellViewModel.swift in Sources */,
 				771D53732059337100C79485 /* TokenImageView.swift in Sources */,
 				73200B7020488C9300118A82 /* TrustNetworkProtocol.swift in Sources */,
-				77B806A9207766DC005FDCBE /* MasterBookmarksViewController.swift in Sources */,
+				77B806A9207766DC005FDCBE /* MasterBrowserViewController.swift in Sources */,
 				2955378C205F2670006049B3 /* ImageURLFormatter.swift in Sources */,
 				771D536F2058BB0D00C79485 /* BrowserCoordinator.swift in Sources */,
 				29FF12FB1F74CC8200AFD326 /* EthereumAddressRule.swift in Sources */,

diff --git a/Trust/Browser/Coordinators/BrowserCoordinator.swift b/Trust/Browser/Coordinators/BrowserCoordinator.swift
@@ -29,8 +29,8 @@ class BrowserCoordinator: Coordinator {
         return controller
     }()
 
-    lazy var rootViewController: MasterBoookmarksViewController = {
-        let controller = MasterBoookmarksViewController(
+    lazy var rootViewController: MasterBrowserViewController = {
+        let controller = MasterBrowserViewController(
             bookmarksViewController: bookmarksViewController,
             historyViewController: historyViewController,
             browserViewController: browserViewController,
@@ -315,7 +315,7 @@ extension BrowserCoordinator: HistoryViewControllerDelegate {
     }
 }
 
-extension BrowserCoordinator: MasterBoookmarksViewControllerDelegate {
+extension BrowserCoordinator: MasterBrowserViewControllerDelegate {
     func didPressAction(_ action: BrowserToolbarAction) {
         switch action {
         case .view(let viewType):

diff --git a/...llers/MasterBookmarksViewController.swift → ...rollers/MasterBrowserViewController.swift b/...llers/MasterBookmarksViewController.swift → ...rollers/MasterBrowserViewController.swift
@@ -3,7 +3,7 @@
 import Foundation
 import UIKit
 
-protocol MasterBoookmarksViewControllerDelegate: class {
+protocol MasterBrowserViewControllerDelegate: class {
     func didPressAction(_ action: BrowserToolbarAction)
 }
 
@@ -18,7 +18,7 @@ enum BookmarksViewType: Int {
     case history
 }
 
-class MasterBoookmarksViewController: UIViewController {
+class MasterBrowserViewController: UIViewController {
 
     fileprivate lazy var segmentController: UISegmentedControl = {
         let items = [
@@ -40,7 +40,7 @@ class MasterBoookmarksViewController: UIViewController {
         return button
     }()
 
-    weak var delegate: MasterBoookmarksViewControllerDelegate?
+    weak var delegate: MasterBrowserViewControllerDelegate?
 
     let bookmarksViewController: BookmarkViewController
     let historyViewController: HistoryViewController

diff --git a/Trust/Extensions/UINavigationController.swift b/Trust/Extensions/UINavigationController.swift
@@ -28,7 +28,7 @@ extension UINavigationController {
 
     open override var preferredStatusBarStyle: UIStatusBarStyle {
         var preferredStyle: UIStatusBarStyle
-        if topViewController is BrowserViewController {
+        if topViewController is MasterBrowserViewController {
             preferredStyle = .default
         } else {
             preferredStyle = .lightContent