Fix status bar

kudoleh · kudoleh · commit b0e2821de18e · 2020-05-26T18:30:03.000+01:00
diff --git a/ExampleMVVM.xcodeproj/project.pbxproj b/ExampleMVVM.xcodeproj/project.pbxproj
@@ -39,6 +39,7 @@
 		1F5CE1CD242C303700A9CDE3 /* CoreDataStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5CE1CC242C303700A9CDE3 /* CoreDataStorage.swift */; };
 		1F6B521323630016002FCDE9 /* RepositoryTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F6B521223630016002FCDE9 /* RepositoryTask.swift */; };
 		1F77930F222C0DF2004E034C /* StoryboardInstantiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F77930E222C0DF2004E034C /* StoryboardInstantiable.swift */; };
+		1F794921247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F794920247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift */; };
 		1F7C1D19242117910014F011 /* Movie+Stub.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F7C1D17242117790014F011 /* Movie+Stub.swift */; };
 		1F84DECE2300677B00139F73 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FEE31612218B17E00C160B9 /* Observable.swift */; };
 		1F84DED023006BDA00139F73 /* FetchRecentMovieQueriesUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F84DECF23006BDA00139F73 /* FetchRecentMovieQueriesUseCase.swift */; };
@@ -150,6 +151,7 @@
 		1F5CE1CC242C303700A9CDE3 /* CoreDataStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataStorage.swift; sourceTree = "<group>"; };
 		1F6B521223630016002FCDE9 /* RepositoryTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepositoryTask.swift; sourceTree = "<group>"; };
 		1F77930E222C0DF2004E034C /* StoryboardInstantiable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryboardInstantiable.swift; sourceTree = "<group>"; };
+		1F794920247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlackStyleNavigationBarBehavior.swift; sourceTree = "<group>"; };
 		1F7C1D17242117790014F011 /* Movie+Stub.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Movie+Stub.swift"; sourceTree = "<group>"; };
 		1F84DECF23006BDA00139F73 /* FetchRecentMovieQueriesUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchRecentMovieQueriesUseCase.swift; sourceTree = "<group>"; };
 		1F9034C32306FDFE00DEA4BD /* NetworkServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkServiceTests.swift; sourceTree = "<group>"; };
@@ -567,6 +569,7 @@
 			isa = PBXGroup;
 			children = (
 				1FB0903C243766C200DBE132 /* BackButtonEmptyTitleNavigationBarBehavior.swift */,
+				1F794920247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift */,
 			);
 			path = Behaviors;
 			sourceTree = "<group>";
@@ -1003,6 +1006,7 @@
 				1FFF1AD5243B966600937EE4 /* MoviesListItemViewModel.swift in Sources */,
 				1FC2C9632301FEC0001AE47E /* MovieQueryUDS+Mapping.swift in Sources */,
 				1FE49D90230AA7C200D1D42E /* MovieDetailsViewModel.swift in Sources */,
+				1F794921247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift in Sources */,
 				1F1FC48A22E3693100BCBA8D /* DataTransferService.swift in Sources */,
 				1FEE31622218B17E00C160B9 /* Observable.swift in Sources */,
 				1FFFC836221B0041007D99D2 /* MoviesRepository.swift in Sources */,
diff --git a/ExampleMVVM/Presentation/MoviesScene/Behaviors/BackButtonEmptyTitleNavigationBarBehavior.swift b/ExampleMVVM/Presentation/MoviesScene/Behaviors/BackButtonEmptyTitleNavigationBarBehavior.swift
@@ -9,7 +9,7 @@ import UIKit
 
 struct BackButtonEmptyTitleNavigationBarBehavior: ViewControllerLifecycleBehavior {
 
-    func afterLoading(viewController: UIViewController) {
+    func viewDidLoad(viewController: UIViewController) {
 
         viewController.navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
     }
diff --git a/ExampleMVVM/Presentation/MoviesScene/Behaviors/BlackStyleNavigationBarBehavior.swift b/ExampleMVVM/Presentation/MoviesScene/Behaviors/BlackStyleNavigationBarBehavior.swift
@@ -0,0 +1,16 @@
+//
+//  BlackStyleNavigationBarBehavior.swift
+//  ExampleMVVM
+//
+//  Created by Oleh Kudinov on 26/05/2020.
+//
+
+import UIKit
+
+struct BlackStyleNavigationBarBehavior: ViewControllerLifecycleBehavior {
+
+    func viewDidLoad(viewController: UIViewController) {
+
+        viewController.navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+    }
+}
diff --git a/ExampleMVVM/Presentation/MoviesScene/MoviesList/View/MoviesListViewController.swift b/ExampleMVVM/Presentation/MoviesScene/MoviesList/View/MoviesListViewController.swift
@@ -37,7 +37,8 @@ final class MoviesListViewController: UIViewController, StoryboardInstantiable,
         title = viewModel.screenTitle
         emptyDataLabel.text = viewModel.emptyDataTitle
         setupSearchController()
-        addBehaviors([BackButtonEmptyTitleNavigationBarBehavior()])
+        addBehaviors([BackButtonEmptyTitleNavigationBarBehavior(),
+                      BlackStyleNavigationBarBehavior()])
         
         bind(to: viewModel)
         viewModel.viewDidLoad()
@@ -107,12 +108,6 @@ final class MoviesListViewController: UIViewController, StoryboardInstantiable,
     }
 }
 
-extension MoviesListViewController {
-    override var preferredStatusBarStyle: UIStatusBarStyle {
-        return .lightContent
-    }
-}
-
 // MARK: - Search Controller
 
 extension MoviesListViewController {
diff --git a/ExampleMVVM/Presentation/Utils/Extensions/UIViewController+AddBehaviors.swift b/ExampleMVVM/Presentation/Utils/Extensions/UIViewController+AddBehaviors.swift
@@ -12,23 +12,23 @@
 import UIKit
 
 protocol ViewControllerLifecycleBehavior {
-    func afterLoading(viewController: UIViewController)
-    func beforeAppearing(viewController: UIViewController)
-    func afterAppearing(viewController: UIViewController)
-    func beforeDisappearing(viewController: UIViewController)
-    func afterDisappearing(viewController: UIViewController)
-    func beforeLayingOutSubviews(viewController: UIViewController)
-    func afterLayingOutSubviews(viewController: UIViewController)
+    func viewDidLoad(viewController: UIViewController)
+    func viewWillAppear(viewController: UIViewController)
+    func viewDidAppear(viewController: UIViewController)
+    func viewWillDisappear(viewController: UIViewController)
+    func viewDidDisappear(viewController: UIViewController)
+    func viewWillLayoutSubviews(viewController: UIViewController)
+    func viewDidLayoutSubviews(viewController: UIViewController)
 }
 // Default implementations
 extension ViewControllerLifecycleBehavior {
-    func afterLoading(viewController: UIViewController) {}
-    func beforeAppearing(viewController: UIViewController) {}
-    func afterAppearing(viewController: UIViewController) {}
-    func beforeDisappearing(viewController: UIViewController) {}
-    func afterDisappearing(viewController: UIViewController) {}
-    func beforeLayingOutSubviews(viewController: UIViewController) {}
-    func afterLayingOutSubviews(viewController: UIViewController) {}
+    func viewDidLoad(viewController: UIViewController) {}
+    func viewWillAppear(viewController: UIViewController) {}
+    func viewDidAppear(viewController: UIViewController) {}
+    func viewWillDisappear(viewController: UIViewController) {}
+    func viewDidDisappear(viewController: UIViewController) {}
+    func viewWillLayoutSubviews(viewController: UIViewController) {}
+    func viewDidLayoutSubviews(viewController: UIViewController) {}
 }
 
 extension UIViewController {
@@ -71,55 +71,55 @@ extension UIViewController {
             navigationController?.interactivePopGestureRecognizer?.delegate = self
 
             applyBehaviors { behavior, viewController in
-                behavior.afterLoading(viewController: viewController)
+                behavior.viewDidLoad(viewController: viewController)
             }
         }
 
         override func viewWillAppear(_ animated: Bool) {
             super.viewWillAppear(animated)
 
             applyBehaviors { behavior, viewController in
-                behavior.beforeAppearing(viewController: viewController)
+                behavior.viewWillAppear(viewController: viewController)
             }
         }
 
         override func viewDidAppear(_ animated: Bool) {
             super.viewDidAppear(animated)
 
             applyBehaviors { behavior, viewController in
-                behavior.afterAppearing(viewController: viewController)
+                behavior.viewDidAppear(viewController: viewController)
             }
         }
 
         override func viewWillDisappear(_ animated: Bool) {
             super.viewWillDisappear(animated)
 
             applyBehaviors { behavior, viewController in
-                behavior.beforeDisappearing(viewController: viewController)
+                behavior.viewWillDisappear(viewController: viewController)
             }
         }
 
         override func viewDidDisappear(_ animated: Bool) {
             super.viewDidDisappear(animated)
 
             applyBehaviors { behavior, viewController in
-                behavior.afterDisappearing(viewController: viewController)
+                behavior.viewDidDisappear(viewController: viewController)
             }
         }
 
         override func viewWillLayoutSubviews() {
             super.viewWillLayoutSubviews()
 
             applyBehaviors { behavior, viewController in
-                behavior.beforeLayingOutSubviews(viewController: viewController)
+                behavior.viewWillLayoutSubviews(viewController: viewController)
             }
         }
 
         override func viewDidLayoutSubviews() {
             super.viewDidLayoutSubviews()
 
             applyBehaviors { behavior, viewController in
-                behavior.afterLayingOutSubviews(viewController: viewController)
+                behavior.viewDidLayoutSubviews(viewController: viewController)
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import UIKit`
`9`	`9`
`10`	`10`	`struct BackButtonEmptyTitleNavigationBarBehavior: ViewControllerLifecycleBehavior {`
`11`	`11`
`12`		`- func afterLoading(viewController: UIViewController) {`
	`12`	`+ func viewDidLoad(viewController: UIViewController) {`
`13`	`13`
`14`	`14`	`viewController.navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,23 +12,23 @@`
`12`	`12`	`import UIKit`
`13`	`13`
`14`	`14`	`protocol ViewControllerLifecycleBehavior {`
`15`		`- func afterLoading(viewController: UIViewController)`
`16`		`- func beforeAppearing(viewController: UIViewController)`
`17`		`- func afterAppearing(viewController: UIViewController)`
`18`		`- func beforeDisappearing(viewController: UIViewController)`
`19`		`- func afterDisappearing(viewController: UIViewController)`
`20`		`- func beforeLayingOutSubviews(viewController: UIViewController)`
`21`		`- func afterLayingOutSubviews(viewController: UIViewController)`
	`15`	`+ func viewDidLoad(viewController: UIViewController)`
	`16`	`+ func viewWillAppear(viewController: UIViewController)`
	`17`	`+ func viewDidAppear(viewController: UIViewController)`
	`18`	`+ func viewWillDisappear(viewController: UIViewController)`
	`19`	`+ func viewDidDisappear(viewController: UIViewController)`
	`20`	`+ func viewWillLayoutSubviews(viewController: UIViewController)`
	`21`	`+ func viewDidLayoutSubviews(viewController: UIViewController)`
`22`	`22`	`}`
`23`	`23`	`// Default implementations`
`24`	`24`	`extension ViewControllerLifecycleBehavior {`
`25`		`- func afterLoading(viewController: UIViewController) {}`
`26`		`- func beforeAppearing(viewController: UIViewController) {}`
`27`		`- func afterAppearing(viewController: UIViewController) {}`
`28`		`- func beforeDisappearing(viewController: UIViewController) {}`
`29`		`- func afterDisappearing(viewController: UIViewController) {}`
`30`		`- func beforeLayingOutSubviews(viewController: UIViewController) {}`
`31`		`- func afterLayingOutSubviews(viewController: UIViewController) {}`
	`25`	`+ func viewDidLoad(viewController: UIViewController) {}`
	`26`	`+ func viewWillAppear(viewController: UIViewController) {}`
	`27`	`+ func viewDidAppear(viewController: UIViewController) {}`
	`28`	`+ func viewWillDisappear(viewController: UIViewController) {}`
	`29`	`+ func viewDidDisappear(viewController: UIViewController) {}`
	`30`	`+ func viewWillLayoutSubviews(viewController: UIViewController) {}`
	`31`	`+ func viewDidLayoutSubviews(viewController: UIViewController) {}`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`extension UIViewController {`
`@@ -71,55 +71,55 @@ extension UIViewController {`
`71`	`71`	`navigationController?.interactivePopGestureRecognizer?.delegate = self`
`72`	`72`
`73`	`73`	`applyBehaviors { behavior, viewController in`
`74`		`- behavior.afterLoading(viewController: viewController)`
	`74`	`+ behavior.viewDidLoad(viewController: viewController)`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`override func viewWillAppear(_ animated: Bool) {`
`79`	`79`	`super.viewWillAppear(animated)`
`80`	`80`
`81`	`81`	`applyBehaviors { behavior, viewController in`
`82`		`- behavior.beforeAppearing(viewController: viewController)`
	`82`	`+ behavior.viewWillAppear(viewController: viewController)`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`override func viewDidAppear(_ animated: Bool) {`
`87`	`87`	`super.viewDidAppear(animated)`
`88`	`88`
`89`	`89`	`applyBehaviors { behavior, viewController in`
`90`		`- behavior.afterAppearing(viewController: viewController)`
	`90`	`+ behavior.viewDidAppear(viewController: viewController)`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`override func viewWillDisappear(_ animated: Bool) {`
`95`	`95`	`super.viewWillDisappear(animated)`
`96`	`96`
`97`	`97`	`applyBehaviors { behavior, viewController in`
`98`		`- behavior.beforeDisappearing(viewController: viewController)`
	`98`	`+ behavior.viewWillDisappear(viewController: viewController)`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`override func viewDidDisappear(_ animated: Bool) {`
`103`	`103`	`super.viewDidDisappear(animated)`
`104`	`104`
`105`	`105`	`applyBehaviors { behavior, viewController in`
`106`		`- behavior.afterDisappearing(viewController: viewController)`
	`106`	`+ behavior.viewDidDisappear(viewController: viewController)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`override func viewWillLayoutSubviews() {`
`111`	`111`	`super.viewWillLayoutSubviews()`
`112`	`112`
`113`	`113`	`applyBehaviors { behavior, viewController in`
`114`		`- behavior.beforeLayingOutSubviews(viewController: viewController)`
	`114`	`+ behavior.viewWillLayoutSubviews(viewController: viewController)`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`override func viewDidLayoutSubviews() {`
`119`	`119`	`super.viewDidLayoutSubviews()`
`120`	`120`
`121`	`121`	`applyBehaviors { behavior, viewController in`
`122`		`- behavior.afterLayingOutSubviews(viewController: viewController)`
	`122`	`+ behavior.viewDidLayoutSubviews(viewController: viewController)`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`