Skip to content

Commit 5daebb8

Browse files
committed
Revert "Update for iOS 15"
This reverts commit 3ca9af5.
1 parent 3ca9af5 commit 5daebb8

File tree

4 files changed

+31
-15
lines changed

4 files changed

+31
-15
lines changed

ExampleMVVM.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
1F5CE1CD242C303700A9CDE3 /* CoreDataStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5CE1CC242C303700A9CDE3 /* CoreDataStorage.swift */; };
4040
1F6B521323630016002FCDE9 /* RepositoryTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F6B521223630016002FCDE9 /* RepositoryTask.swift */; };
4141
1F77930F222C0DF2004E034C /* StoryboardInstantiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F77930E222C0DF2004E034C /* StoryboardInstantiable.swift */; };
42+
1F794921247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F794920247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift */; };
4243
1F7C1D19242117910014F011 /* Movie+Stub.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F7C1D17242117790014F011 /* Movie+Stub.swift */; };
4344
1F84DECE2300677B00139F73 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FEE31612218B17E00C160B9 /* Observable.swift */; };
4445
1F84DED023006BDA00139F73 /* FetchRecentMovieQueriesUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F84DECF23006BDA00139F73 /* FetchRecentMovieQueriesUseCase.swift */; };
@@ -151,6 +152,7 @@
151152
1F5CE1CC242C303700A9CDE3 /* CoreDataStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataStorage.swift; sourceTree = "<group>"; };
152153
1F6B521223630016002FCDE9 /* RepositoryTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepositoryTask.swift; sourceTree = "<group>"; };
153154
1F77930E222C0DF2004E034C /* StoryboardInstantiable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryboardInstantiable.swift; sourceTree = "<group>"; };
155+
1F794920247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlackStyleNavigationBarBehavior.swift; sourceTree = "<group>"; };
154156
1F7C1D17242117790014F011 /* Movie+Stub.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Movie+Stub.swift"; sourceTree = "<group>"; };
155157
1F84DECF23006BDA00139F73 /* FetchRecentMovieQueriesUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchRecentMovieQueriesUseCase.swift; sourceTree = "<group>"; };
156158
1F9034C32306FDFE00DEA4BD /* NetworkServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkServiceTests.swift; sourceTree = "<group>"; };
@@ -569,6 +571,7 @@
569571
isa = PBXGroup;
570572
children = (
571573
1FB0903C243766C200DBE132 /* BackButtonEmptyTitleNavigationBarBehavior.swift */,
574+
1F794920247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift */,
572575
);
573576
path = Behaviors;
574577
sourceTree = "<group>";
@@ -1007,6 +1010,7 @@
10071010
1FFF1AD5243B966600937EE4 /* MoviesListItemViewModel.swift in Sources */,
10081011
1FC2C9632301FEC0001AE47E /* MovieQueryUDS+Mapping.swift in Sources */,
10091012
1FE49D90230AA7C200D1D42E /* MovieDetailsViewModel.swift in Sources */,
1013+
1F794921247D869700552CC3 /* BlackStyleNavigationBarBehavior.swift in Sources */,
10101014
1F1FC48A22E3693100BCBA8D /* DataTransferService.swift in Sources */,
10111015
1FEE31622218B17E00C160B9 /* Observable.swift in Sources */,
10121016
1FFFC836221B0041007D99D2 /* MoviesRepository.swift in Sources */,

ExampleMVVM/Application/AppAppearance.swift

+9-12
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@ import UIKit
1111
final class AppAppearance {
1212

1313
static func setupAppearance() {
14-
if #available(iOS 15, *) {
15-
let appearance = UINavigationBarAppearance()
16-
appearance.configureWithOpaqueBackground()
17-
appearance.titleTextAttributes = [.foregroundColor: UIColor.white]
18-
appearance.backgroundColor = UIColor(red: 54.0/255.0, green: 54/255.0, blue: 49.0/255.0, alpha: 1.0)
19-
UINavigationBar.appearance().standardAppearance = appearance
20-
UINavigationBar.appearance().scrollEdgeAppearance = appearance
21-
} else {
22-
UINavigationBar.appearance().barTintColor = .black
23-
UINavigationBar.appearance().tintColor = .white
24-
UINavigationBar.appearance().titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.white]
25-
}
14+
UINavigationBar.appearance().barTintColor = .black
15+
UINavigationBar.appearance().tintColor = .white
16+
UINavigationBar.appearance().titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.white]
17+
}
18+
}
19+
20+
extension UINavigationController {
21+
@objc override open var preferredStatusBarStyle: UIStatusBarStyle {
22+
return .lightContent
2623
}
2724
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//
2+
// BlackStyleNavigationBarBehavior.swift
3+
// ExampleMVVM
4+
//
5+
// Created by Oleh Kudinov on 26/05/2020.
6+
//
7+
8+
import UIKit
9+
10+
struct BlackStyleNavigationBarBehavior: ViewControllerLifecycleBehavior {
11+
12+
func viewDidLoad(viewController: UIViewController) {
13+
14+
viewController.navigationController?.navigationBar.barStyle = .black
15+
}
16+
}

ExampleMVVM/Presentation/MoviesScene/MoviesList/View/MoviesListViewController.swift

+2-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,8 @@ final class MoviesListViewController: UIViewController, StoryboardInstantiable,
6969
}
7070

7171
private func setupBehaviours() {
72-
addBehaviors([
73-
BackButtonEmptyTitleNavigationBarBehavior()
74-
])
72+
addBehaviors([BackButtonEmptyTitleNavigationBarBehavior(),
73+
BlackStyleNavigationBarBehavior()])
7574
}
7675

7776
private func updateItems() {

0 commit comments

Comments
 (0)