Skip to content

Commit d26c472

Browse files
committed
Merge branch 'release/2.0.1'
2 parents 8f8d721 + aaedc53 commit d26c472

File tree

8 files changed

+35
-6
lines changed

8 files changed

+35
-6
lines changed

.swiftlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
line_length: 200
2-
file_length: 500
2+
file_length: 600

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44
`side-navigation-controller` adheres to [Semantic Versioning](http://semver.org/).
55
---
66

7+
## [2.0.1](https://github.com/Digipolitan/side-navigation/releases/tag/v2.0.1)
8+
9+
add new needsUpdate iOS11 && tvOS11
10+
11+
---
12+
713
## [2.0.0](https://github.com/Digipolitan/side-navigation/releases/tag/v2.0.0)
814

915
swift 5.0 support & renaming side-navigation-controller

Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
PODFILE CHECKSUM: e6fb4f0774793c8c0cb0d53cb6140d46f84d99f5
22

3-
COCOAPODS: 1.6.1
3+
COCOAPODS: 1.7.1

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
SideNavigationController
22
=================================
33

4+
[![Swift Version](https://img.shields.io/badge/swift-5.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
45
[![Build Status](https://travis-ci.org/Digipolitan/side-navigation-controller.svg?branch=master)](https://travis-ci.org/Digipolitan/side-navigation-controller)
56
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/SideNavigationController.svg)](https://img.shields.io/cocoapods/v/SideNavigationController.svg)
67
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)

SideNavigationController.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "SideNavigationController"
3-
s.version = "2.0.0"
3+
s.version = "2.0.1"
44
s.summary = "Side navigation controller written in swift"
55
s.homepage = "https://github.com/Digipolitan/side-navigation-controller"
66
s.authors = "Digipolitan"
@@ -9,5 +9,5 @@ s.license = { :type => "BSD", :file => "LICENSE" }
99
s.source_files = 'Sources/**/*.{swift,h}'
1010
s.ios.deployment_target = '9.0'
1111
s.tvos.deployment_target = '9.0'
12-
s.requires_arc = true
12+
s.swift_version = '5.0'
1313
end

Sources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.0</string>
18+
<string>2.0.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
<key>NSPrincipalClass</key>

Sources/SideNavigationController.swift

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,15 @@ open class SideNavigationController: UIViewController {
8181
self.visibleSideViewController?.view.isHidden = false
8282
#if os(iOS)
8383
self.setNeedsStatusBarAppearanceUpdate()
84+
if #available(iOS 11.0, *) {
85+
self.setNeedsUpdateOfHomeIndicatorAutoHidden()
86+
self.setNeedsUpdateOfScreenEdgesDeferringSystemGestures()
87+
}
8488
#elseif os(tvOS)
8589
self.setNeedsFocusUpdate()
90+
if #available(tvOS 11.0, *) {
91+
self.setNeedsUserInterfaceAppearanceUpdate()
92+
}
8693
#endif
8794
}
8895
}
@@ -163,7 +170,22 @@ open class SideNavigationController: UIViewController {
163170
open override var childForStatusBarHidden: UIViewController? {
164171
return self.visibleViewController
165172
}
173+
174+
@available(iOS 11.0, *)
175+
open override var childForHomeIndicatorAutoHidden: UIViewController? {
176+
return self.visibleViewController
177+
}
178+
179+
@available(iOS 11.0, *)
180+
open override var childForScreenEdgesDeferringSystemGestures: UIViewController? {
181+
return self.visibleViewController
182+
}
166183
#elseif os(tvOS)
184+
@available(tvOS 11.0, *)
185+
open override var childViewControllerForUserInterfaceStyle: UIViewController? {
186+
return self.visibleViewController
187+
}
188+
167189
open override var preferredFocusEnvironments: [UIFocusEnvironment] {
168190
return self.visibleViewController.preferredFocusEnvironments
169191
}

Tests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.0</string>
18+
<string>2.0.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

0 commit comments

Comments
 (0)