From d97b99ab8305b0d3abecb32f1119b911026d80d5 Mon Sep 17 00:00:00 2001 From: Felix Mau Date: Fri, 11 Mar 2022 14:04:12 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20::=20Add=20notch=20configuration=20?= =?UTF-8?q?for=20iPhone=20XR=20(WIP)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Classes/NotchGradientLoadingBarController.swift | 6 ++++++ .../ViewModel/NotchGradientLoadingBarViewModel.swift | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/GradientLoadingBar/Classes/NotchGradientLoadingBarController.swift b/GradientLoadingBar/Classes/NotchGradientLoadingBarController.swift index 10998a3..afb7286 100644 --- a/GradientLoadingBar/Classes/NotchGradientLoadingBarController.swift +++ b/GradientLoadingBar/Classes/NotchGradientLoadingBarController.swift @@ -227,6 +227,12 @@ private extension NotchGradientLoadingBarViewModel.SafeAreaDevice { verticalOffsetForLargeCircle: -4.75, transform: CGAffineTransform(translationX: 0.33, y: 0)) + case .iPhoneXR: + return NotchConfig(notchWidth: 232, + largeCircleRadius: 21, + verticalOffsetForLargeCircle: 0, + transform: .identity) + case .iPhone12: return NotchConfig(notchWidth: 209.5, largeCircleRadius: 21, diff --git a/GradientLoadingBar/Classes/ViewModel/NotchGradientLoadingBarViewModel.swift b/GradientLoadingBar/Classes/ViewModel/NotchGradientLoadingBarViewModel.swift index 3470bbd..e35b3b9 100644 --- a/GradientLoadingBar/Classes/ViewModel/NotchGradientLoadingBarViewModel.swift +++ b/GradientLoadingBar/Classes/ViewModel/NotchGradientLoadingBarViewModel.swift @@ -14,6 +14,7 @@ final class NotchGradientLoadingBarViewModel { enum SafeAreaDevice { case unknown case iPhoneX + case iPhoneXR case iPhone11 case iPhone12 case iPhone13 @@ -39,9 +40,12 @@ private extension NotchGradientLoadingBarViewModel.SafeAreaDevice { /// Taken from init(deviceIdentifier: String) { switch deviceIdentifier { - case "iPhone10,3", "iPhone10,6", "iPhone11,2", "iPhone11,4", "iPhone11,6", "iPhone11,8": + case "iPhone10,3", "iPhone10,6", "iPhone11,2", "iPhone11,4", "iPhone11,6": self = .iPhoneX + case "iPhone11,8": + self = .iPhoneXR + case "iPhone12,1", "iPhone12,3", "iPhone12,5": self = .iPhone11