From 72759913ae68305d6c9d2b457b51a90107d03d82 Mon Sep 17 00:00:00 2001 From: mrustaa Date: Wed, 3 Nov 2021 14:02:00 +0300 Subject: [PATCH 1/3] FixRotation: (Issues During Rotation) is isPortrait remove orientation .portraitUpsideDown --- Sources/ContainerController/ContainerDevice.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Sources/ContainerController/ContainerDevice.swift b/Sources/ContainerController/ContainerDevice.swift index a394db1..897822d 100644 --- a/Sources/ContainerController/ContainerDevice.swift +++ b/Sources/ContainerController/ContainerDevice.swift @@ -10,7 +10,6 @@ import UIKit @available(iOS 13.0, *) public extension ContainerDevice { - enum Orientation { case portrait case landscapeLeft @@ -85,7 +84,7 @@ open class ContainerDevice { switch UIDevice.current.orientation { case .landscapeLeft, .landscapeRight: portrait = false - case .portrait, .portraitUpsideDown: + case .portrait: portrait = true default: break } @@ -120,6 +119,4 @@ open class ContainerDevice { return .landscapeLeft } } - - } From ca43421a8f941f4cc320db1cba2d2d95c696ea82 Mon Sep 17 00:00:00 2001 From: mrustaa Date: Thu, 4 Nov 2021 14:02:00 +0300 Subject: [PATCH 2/3] FixRotation: Create extension UIDeviceOrientation + Add property Boolean .isRotateAllowed, .face --- Sources/ContainerController/ContainerDevice.swift | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Sources/ContainerController/ContainerDevice.swift b/Sources/ContainerController/ContainerDevice.swift index 897822d..7738823 100644 --- a/Sources/ContainerController/ContainerDevice.swift +++ b/Sources/ContainerController/ContainerDevice.swift @@ -120,3 +120,17 @@ open class ContainerDevice { } } } + +public extension UIDeviceOrientation { + + var isRotateAllowed: Bool { + return !(face || self == .portraitUpsideDown) + } + + var face: Bool { + switch self { + case .faceUp, .faceDown: return true + default: return false + } + } +} From fed617321fb4b507e5b50900273e633896fa9013 Mon Sep 17 00:00:00 2001 From: mrustaa Date: Fri, 5 Nov 2021 14:02:00 +0300 Subject: [PATCH 3/3] FixRotation: (Issues During Rotation) Fix Completed Testing --- Example/ContainerControllerSwift/Maps/MapsViewController.swift | 3 +-- Sources/ContainerController/ContainerController.swift | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Example/ContainerControllerSwift/Maps/MapsViewController.swift b/Example/ContainerControllerSwift/Maps/MapsViewController.swift index 4662934..69763d0 100644 --- a/Example/ContainerControllerSwift/Maps/MapsViewController.swift +++ b/Example/ContainerControllerSwift/Maps/MapsViewController.swift @@ -105,8 +105,7 @@ class MapsViewController: StoryboardController, MapsContainerControllerDelegate, @objc func rotated() { - let orint = UIDevice.current.orientation - if orint == .faceUp || orint == .faceDown || orint == .portraitUpsideDown { return } + if !UIDevice.current.orientation.isRotateAllowed { return } updateMapViewTopPadding() } diff --git a/Sources/ContainerController/ContainerController.swift b/Sources/ContainerController/ContainerController.swift index 640568e..c857554 100644 --- a/Sources/ContainerController/ContainerController.swift +++ b/Sources/ContainerController/ContainerController.swift @@ -211,8 +211,7 @@ open class ContainerController: NSObject { @objc func rotated() { - let orint = UIDevice.current.orientation - if orint == .faceUp || orint == .faceDown || orint == .portraitUpsideDown { return } + if !UIDevice.current.orientation.isRotateAllowed { return } if ContainerDevice.orientation == oldOrientation { return } oldOrientation = ContainerDevice.orientation