From ec11d0d2893c117cd7fc66597da793bbf4626dd1 Mon Sep 17 00:00:00 2001 From: Michal Niemiec Date: Fri, 18 Jun 2021 12:18:09 +0200 Subject: [PATCH 1/7] Fix issue related with weird app behaves on iPad --- Pod/Classes/SideMenuNavigationController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Pod/Classes/SideMenuNavigationController.swift b/Pod/Classes/SideMenuNavigationController.swift index d88bb8b6..36d4ffcc 100644 --- a/Pod/Classes/SideMenuNavigationController.swift +++ b/Pod/Classes/SideMenuNavigationController.swift @@ -539,8 +539,8 @@ private extension SideMenuNavigationController { } func setup() { - modalPresentationStyle = .overFullScreen - + modalPresentationStyle = .overCurrentContext + setupBlur() if #available(iOS 13.0, *) {} else { registerForNotifications() From e475bdefd55187ce7087298b0485757a4bf33e6d Mon Sep 17 00:00:00 2001 From: Michal Niemiec Date: Tue, 22 Jun 2021 18:53:22 +0200 Subject: [PATCH 2/7] Update modalPresentationStyle --- Pod/Classes/SideMenuNavigationController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pod/Classes/SideMenuNavigationController.swift b/Pod/Classes/SideMenuNavigationController.swift index 36d4ffcc..242003c7 100644 --- a/Pod/Classes/SideMenuNavigationController.swift +++ b/Pod/Classes/SideMenuNavigationController.swift @@ -539,7 +539,7 @@ private extension SideMenuNavigationController { } func setup() { - modalPresentationStyle = .overCurrentContext + modalPresentationStyle = .fullScreen setupBlur() if #available(iOS 13.0, *) {} else { From b0fcd226fcf4c970ced9426f890e8cd0c4bd7651 Mon Sep 17 00:00:00 2001 From: Michal Niemiec Date: Tue, 22 Jun 2021 18:54:11 +0200 Subject: [PATCH 3/7] Update modalPresentationStyle --- Pod/Classes/SideMenuNavigationController.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Pod/Classes/SideMenuNavigationController.swift b/Pod/Classes/SideMenuNavigationController.swift index 242003c7..2f579668 100644 --- a/Pod/Classes/SideMenuNavigationController.swift +++ b/Pod/Classes/SideMenuNavigationController.swift @@ -539,7 +539,11 @@ private extension SideMenuNavigationController { } func setup() { - modalPresentationStyle = .fullScreen + if #available(iOS 13.0, *) { + modalPresentationStyle = .automatic + } else { + modalPresentationStyle = .overFullScreen + } setupBlur() if #available(iOS 13.0, *) {} else { From 0743309688fb36acdff6c58292a4b3daf423fb89 Mon Sep 17 00:00:00 2001 From: Michal Niemiec Date: Tue, 22 Jun 2021 19:07:32 +0200 Subject: [PATCH 4/7] Update modalPresentationStyle --- Pod/Classes/SideMenuNavigationController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pod/Classes/SideMenuNavigationController.swift b/Pod/Classes/SideMenuNavigationController.swift index 2f579668..de59514d 100644 --- a/Pod/Classes/SideMenuNavigationController.swift +++ b/Pod/Classes/SideMenuNavigationController.swift @@ -542,7 +542,7 @@ private extension SideMenuNavigationController { if #available(iOS 13.0, *) { modalPresentationStyle = .automatic } else { - modalPresentationStyle = .overFullScreen + modalPresentationStyle = .overCurrentContext } setupBlur() From 1e7b6b7620bb6e4726d5bca129244f07f372a5aa Mon Sep 17 00:00:00 2001 From: Michal Niemiec Date: Wed, 14 Jul 2021 14:57:14 +0200 Subject: [PATCH 5/7] Update modalPresentationStyle --- Pod/Classes/SideMenuNavigationController.swift | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Pod/Classes/SideMenuNavigationController.swift b/Pod/Classes/SideMenuNavigationController.swift index de59514d..4210804a 100644 --- a/Pod/Classes/SideMenuNavigationController.swift +++ b/Pod/Classes/SideMenuNavigationController.swift @@ -537,13 +537,9 @@ private extension SideMenuNavigationController { self.foundViewController = nil }) } - + func setup() { - if #available(iOS 13.0, *) { - modalPresentationStyle = .automatic - } else { - modalPresentationStyle = .overCurrentContext - } + modalPresentationStyle = isiPad ? .overCurrentContext : .overFullScreen setupBlur() if #available(iOS 13.0, *) {} else { @@ -658,3 +654,11 @@ private extension SideMenuNavigationController { return -presentFactor } } + +extension UIResponder { + var isiPad: Bool { + get { + (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiom.pad) + } + } +} From dfd5c14e0b2185208d4ca3ed6626fea32159fef9 Mon Sep 17 00:00:00 2001 From: Michal Niemiec Date: Thu, 15 Jul 2021 12:22:37 +0200 Subject: [PATCH 6/7] Update modalPresentationStyle --- Pod/Classes/SideMenuNavigationController.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Pod/Classes/SideMenuNavigationController.swift b/Pod/Classes/SideMenuNavigationController.swift index 4210804a..74ef4b8c 100644 --- a/Pod/Classes/SideMenuNavigationController.swift +++ b/Pod/Classes/SideMenuNavigationController.swift @@ -537,9 +537,13 @@ private extension SideMenuNavigationController { self.foundViewController = nil }) } - + func setup() { - modalPresentationStyle = isiPad ? .overCurrentContext : .overFullScreen + if #available(iOS 13.0, *) { + modalPresentationStyle = isiPad ? .automatic : .overFullScreen + } else { + modalPresentationStyle = isiPad ? .overCurrentContext : .overFullScreen + } setupBlur() if #available(iOS 13.0, *) {} else { From 85eb297e61909082eb01865076ca30a50a51dae7 Mon Sep 17 00:00:00 2001 From: Petr Skornok Date: Wed, 13 Apr 2022 08:16:22 +0200 Subject: [PATCH 7/7] fix: isiPad --- Pod/Classes/SideMenuNavigationController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pod/Classes/SideMenuNavigationController.swift b/Pod/Classes/SideMenuNavigationController.swift index 74ef4b8c..9e0893ef 100644 --- a/Pod/Classes/SideMenuNavigationController.swift +++ b/Pod/Classes/SideMenuNavigationController.swift @@ -662,7 +662,7 @@ private extension SideMenuNavigationController { extension UIResponder { var isiPad: Bool { get { - (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiom.pad) + UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad } } }