Skip to content

Commit d2332a4

Browse files
authored
Set to Light Appearance in Info.plist. The navigationBar was configured programmatically for iOS > 13. (#2612)
1 parent 47cb262 commit d2332a4

File tree

4 files changed

+35
-2
lines changed

4 files changed

+35
-2
lines changed

RxExample/RxExample.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
2864D5F31D995FCD004F8484 /* Application+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2864D5F11D995FCD004F8484 /* Application+Extensions.swift */; };
1919
8479BC721C3BDAD400FB8B54 /* ImagePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8479BC701C3BCB9800FB8B54 /* ImagePickerController.swift */; };
2020
927A78B82117A5E700A45638 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3DE1C1480E9005F1280 /* Operators.swift */; };
21+
A34040282C47AC34009E3F74 /* BaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A34040202C47AC2F009E3F74 /* BaseNavigationController.swift */; };
2122
A5CD038F1F1670E50005A376 /* CustomPickerViewAdapterExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CD038E1F1670E50005A376 /* CustomPickerViewAdapterExampleViewController.swift */; };
2223
AE51C1C91DE735D8005BAF5F /* APIWrappers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AE51C1C81DE735D8005BAF5F /* APIWrappers.storyboard */; };
2324
AE51C1CB1DE735E3005BAF5F /* Calculator.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AE51C1CA1DE735E3005BAF5F /* Calculator.storyboard */; };
@@ -304,6 +305,7 @@
304305
780D63E2226B320A00BEACB0 /* Rx.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = Rx.playground; path = ../Rx.playground; sourceTree = "<group>"; };
305306
787BBB5A226B2A6100279500 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
306307
8479BC701C3BCB9800FB8B54 /* ImagePickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImagePickerController.swift; sourceTree = "<group>"; };
308+
A34040202C47AC2F009E3F74 /* BaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNavigationController.swift; sourceTree = "<group>"; };
307309
A5CD038E1F1670E50005A376 /* CustomPickerViewAdapterExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomPickerViewAdapterExampleViewController.swift; sourceTree = "<group>"; };
308310
AE51C1C81DE735D8005BAF5F /* APIWrappers.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = APIWrappers.storyboard; sourceTree = "<group>"; };
309311
AE51C1CA1DE735E3005BAF5F /* Calculator.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Calculator.storyboard; sourceTree = "<group>"; };
@@ -937,6 +939,7 @@
937939
C8DF92E11B0B32DA009BCF9A /* Main.storyboard */,
938940
C8DF92E21B0B32DA009BCF9A /* RootViewController.swift */,
939941
C8DF92C81B0B2F84009BCF9A /* AppDelegate.swift */,
942+
A34040202C47AC2F009E3F74 /* BaseNavigationController.swift */,
940943
C8CDF0C01D688DF700C18F99 /* UITableView+Extensions.swift */,
941944
);
942945
path = iOS;
@@ -1321,6 +1324,7 @@
13211324
C8A2A2C81B4049E300F11F09 /* PseudoRandomGenerator.swift in Sources */,
13221325
C8D132151C42B54B00B59FFF /* UIImagePickerController+RxCreate.swift in Sources */,
13231326
252C9F781F14111800F5F951 /* SimplePickerViewExampleViewController.swift in Sources */,
1327+
A34040282C47AC34009E3F74 /* BaseNavigationController.swift in Sources */,
13241328
C8984CD51C36BC3E001E4272 /* PartialUpdatesViewController.swift in Sources */,
13251329
C82FF1371F93E84600BDB34D /* Deprecated.swift in Sources */,
13261330
C88CB7261D8F253D0021D83F /* RxImagePickerDelegateProxy.swift in Sources */,

RxExample/RxExample/Info-iOS.plist

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>UIUserInterfaceStyle</key>
6+
<string>Light</string>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>en</string>
79
<key>CFBundleExecutable</key>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
//
2+
// BaseNavigationController.swift
3+
// RxExample
4+
//
5+
// Created by Volodymyr Andriienko on 17.07.2024.
6+
// Copyright © 2024 Krunoslav Zaher. All rights reserved.
7+
//
8+
9+
import UIKit
10+
11+
open class BaseNavigationController: UINavigationController {
12+
13+
open override func viewDidLoad() {
14+
super.viewDidLoad()
15+
16+
if #available(iOS 13.0, *) {
17+
let appearance = UINavigationBarAppearance()
18+
appearance.configureWithOpaqueBackground()
19+
navigationBar.standardAppearance = appearance
20+
navigationBar.scrollEdgeAppearance = appearance
21+
navigationBar.compactAppearance = appearance
22+
if #available(iOS 15.0, *) {
23+
navigationBar.compactScrollEdgeAppearance = appearance
24+
}
25+
}
26+
}
27+
}

RxExample/RxExample/iOS/Main.storyboard

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
99
<scenes>
10-
<!--Navigation Controller-->
10+
<!--Base Navigation Controller-->
1111
<scene sceneID="eu0-Rq-LY9">
1212
<objects>
13-
<navigationController extendedLayoutIncludesOpaqueBars="YES" id="E5v-jn-n2n" sceneMemberID="viewController">
13+
<navigationController extendedLayoutIncludesOpaqueBars="YES" id="E5v-jn-n2n" customClass="BaseNavigationController" customModule="RxExample_iOS" customModuleProvider="target" sceneMemberID="viewController">
1414
<navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="q9W-TG-AP1">
1515
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
1616
<autoresizingMask key="autoresizingMask"/>

0 commit comments

Comments
 (0)