Remove dependency on Device library

Author: felixbuenemann

AssetsPickerViewController.podspec

@@ -41,5 +41,4 @@ Fully customizable UI.
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
   s.dependency 'SnapKit'
-  s.dependency 'Device'
 end

AssetsPickerViewController/Classes/Photo/Controller/AssetsPhotoViewController.swift

@@ -9,7 +9,6 @@
 import UIKit
 import Photos
 import PhotosUI
-import Device
 import SnapKit
 
 // MARK: - AssetsPhotoViewController

AssetsPickerViewController/Classes/Photo/View/AssetsPhotoLayout.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import Device
 
 open class AssetsPhotoLayout: UICollectionViewFlowLayout {
 
@@ -46,13 +45,13 @@ extension AssetsPhotoLayout {
         let cellSize = isPortrait ? pickerConfig.assetPortraitCellSize(forViewSize: UIScreen.main.portraitContentSize) : pickerConfig.assetLandscapeCellSize(forViewSize: UIScreen.main.landscapeContentSize)
         let lineSpace = isPortrait ? pickerConfig.assetPortraitLineSpace : pickerConfig.assetLandscapeLineSpace
         let contentHeight = CGFloat(rows) * cellSize.height + (CGFloat(max(rows - 1, 0)) * lineSpace)
-        let bottomHeight = cellSize.height * 2/3 + Device.safeAreaInsets(isPortrait: isPortrait).bottom
+        let bottomHeight = cellSize.height * 2/3 + UIScreen.safeAreaInsets(isPortrait: isPortrait).bottom
 
         return contentHeight + bottomHeight
     }
 
     private func offsetRatio(collectionView: UICollectionView, offset: CGPoint, contentSize: CGSize, isPortrait: Bool) -> CGFloat {
-        return (offset.y > 0 ? offset.y : 0) / ((contentSize.height + Device.safeAreaInsets(isPortrait: isPortrait).bottom) - collectionView.bounds.height)
+        return (offset.y > 0 ? offset.y : 0) / ((contentSize.height + UIScreen.safeAreaInsets(isPortrait: isPortrait).bottom) - collectionView.bounds.height)
     }
 
     open func translateOffset(forChangingSize size: CGSize, currentOffset: CGPoint) -> CGPoint? {
@@ -67,8 +66,8 @@ extension AssetsPhotoLayout {
         var futureOffsetY = (contentHeight - size.height) * currentRatio
 
         if currentOffset.y < 0 {
-            let insetRatio = (-currentOffset.y) / Device.safeAreaInsets(isPortrait: isPortraitCurrent).top
-            let insetDiff = Device.safeAreaInsets(isPortrait: isPortraitFuture).top * insetRatio
+            let insetRatio = (-currentOffset.y) / UIScreen.safeAreaInsets(isPortrait: isPortraitCurrent).top
+            let insetDiff = UIScreen.safeAreaInsets(isPortrait: isPortraitFuture).top * insetRatio
             futureOffsetY -= insetDiff
         }
 

AssetsPickerViewController/Classes/Utility/Device+AssetsPickerViewController.swift

@@ -7,9 +7,20 @@
 //
 
 import UIKit
-import Device
 
 extension UIScreen {
+    static func safeAreaInsets(isPortrait: Bool) -> UIEdgeInsets {
+        let w: Double = Double(UIScreen.main.bounds.width)
+        let h: Double = Double(UIScreen.main.bounds.height)
+        let screenHeight: Double = max(w, h)
+
+        switch screenHeight {
+        case 812: // 5.8" (iPhone X/XS/XR/11)
+            return isPortrait ? UIEdgeInsets(top: 88, left: 0, bottom: 34, right: 0) : UIEdgeInsets(top: 32, left: 44, bottom: 21, right: 44)
+        default:
+            return isPortrait ? UIEdgeInsets(top: 64, left: 0, bottom: 0, right: 0) : UIEdgeInsets(top: 30, left: 0, bottom: 0, right: 0)
+        }
+    }
 
     var portraitSize: CGSize {
         let size = UIScreen.main.bounds.size
@@ -24,17 +35,17 @@ extension UIScreen {
     var portraitContentSize: CGSize {
         var size = UIScreen.main.portraitSize
         if #available(iOS 11.0, *) {
-            size.width -= Device.safeAreaInsets(isPortrait: true).left + Device.safeAreaInsets(isPortrait: true).right
-            size.height -= Device.safeAreaInsets(isPortrait: true).top + Device.safeAreaInsets(isPortrait: true).bottom
+            size.width -= UIScreen.safeAreaInsets(isPortrait: true).left + UIScreen.safeAreaInsets(isPortrait: true).right
+            size.height -= UIScreen.safeAreaInsets(isPortrait: true).top + UIScreen.safeAreaInsets(isPortrait: true).bottom
         }
         return size
     }
 
     var landscapeContentSize: CGSize {
         var size = UIScreen.main.landscapeSize
         if #available(iOS 11.0, *) {
-            size.width -= Device.safeAreaInsets(isPortrait: false).left + Device.safeAreaInsets(isPortrait: false).right
-            size.height -= Device.safeAreaInsets(isPortrait: false).top + Device.safeAreaInsets(isPortrait: false).bottom
+            size.width -= UIScreen.safeAreaInsets(isPortrait: false).left + UIScreen.safeAreaInsets(isPortrait: false).right
+            size.height -= UIScreen.safeAreaInsets(isPortrait: false).top + UIScreen.safeAreaInsets(isPortrait: false).bottom
         }
         return size
     }

AssetsPickerViewController/Classes/Utility/UIScreen+AssetsPickerViewController.swift

@@ -344,13 +344,11 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-AssetsPickerViewController_Example/Pods-AssetsPickerViewController_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AssetsPickerViewController/AssetsPickerViewController.framework",
-				"${BUILT_PRODUCTS_DIR}/Device/Device.framework",
 				"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AssetsPickerViewController.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Device.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Example/AssetsPickerViewController.xcodeproj/project.pbxproj

@@ -1,26 +1,22 @@
 PODS:
-  - AssetsPickerViewController (2.9.2):
-    - Device
+  - AssetsPickerViewController (2.9.6):
     - SnapKit
-  - Device (3.1.2)
-  - SnapKit (5.0.0)
+  - SnapKit (5.0.1)
 
 DEPENDENCIES:
   - AssetsPickerViewController (from `../`)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
-    - Device
+  trunk:
     - SnapKit
 
 EXTERNAL SOURCES:
   AssetsPickerViewController:
     :path: "../"
 
 SPEC CHECKSUMS:
-  AssetsPickerViewController: 6626c9640d75ee4b60eea9b0fddf95cac0f41124
-  Device: 62242076214c30fb5760174b3601cefafa70a481
-  SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf
+  AssetsPickerViewController: afad53707ec66ddd15182fa62630448736ed3976
+  SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
 
 PODFILE CHECKSUM: ed535a80c7e9986ea173935163bbd69a1c717311