Merge pull request #269 from GiftAMeal/main

Precise location support for iOS 14.0+

Author: ivanvorobei

Example Apps/iOS Example/Scenes/RootController.swift

@@ -43,7 +43,7 @@ import SPPermissionsHealth
 
 class RootController: SPTableViewController {
 
-    var availablePermissions: [SPPermissions.Permission] = [.camera, .photoLibrary, .notification, .microphone, .calendar, .contacts, .reminders, .speech, .locationWhenInUse, .locationAlways, .motion, .mediaLibrary, .bluetooth, /*.tracking,*/ .faceID, .siri, .health]
+    var availablePermissions: [SPPermissions.Permission] = [.camera, .photoLibrary, .notification, .microphone, .calendar, .contacts, .reminders, .speech, .locationWhenInUse, .locationAlways, .locationWhenInUsePrecise, .locationAlwaysPrecise .motion, .mediaLibrary, .bluetooth, /*.tracking,*/ .faceID, .siri, .health]
 
     var selectedPermissions: [SPPermissions.Permission] = []
 

Package.swift

@@ -226,7 +226,7 @@ let package = Package(
                 .define("SPPERMISSIONS_HEALTH"),
                 .define("SPPERMISSIONS_SPM")
             ]
-        )
+        ),
     ],
     swiftLanguageVersions: [.v5]
 )

SPPermissions.podspec

@@ -165,5 +165,4 @@ Pod::Spec.new do |s|
         "SWIFT_ACTIVE_COMPILATION_CONDITIONS"  => "SPPERMISSIONS_HEALTH SPPERMISSIONS_COCOAPODS"
     }
   end
-
 end

Sources/SPPermissions/Data/Images.swift

@@ -59,6 +59,10 @@ enum Images {
             return UIImage.init(named: "Siri", in: bundle, compatibleWith: nil) ?? UIImage()
         case .health:
             return UIImage.init(named: "Health", in: bundle, compatibleWith: nil) ?? UIImage()
+        case .locationWhenInUsePrecise:
+            return UIImage.init(named: "Location", in: bundle, compatibleWith: nil) ?? UIImage()
+        case .locationAlwaysPrecise:
+            return UIImage.init(named: "Location", in: bundle, compatibleWith: nil) ?? UIImage()
         }
     }
 

Sources/SPPermissions/Data/Text.swift

@@ -59,6 +59,10 @@ enum Texts {
             return NSLocalizedString("permission siri name", bundle: bundle, comment: "")
         case .health:
             return NSLocalizedString("permission health name", bundle: bundle, comment: "")
+        case .locationWhenInUsePrecise:
+            return NSLocalizedString("permission precise location when in use name", bundle: bundle, comment: "")
+        case .locationAlwaysPrecise:
+            return NSLocalizedString("permission precise location always name", bundle: bundle, comment: "")
         }
     }
 
@@ -98,6 +102,10 @@ enum Texts {
             return NSLocalizedString("permission siri description", bundle: bundle, comment: "")
         case .health:
             return NSLocalizedString("permission health description", bundle: bundle, comment: "")
+        case .locationWhenInUsePrecise:
+            return NSLocalizedString("permission precise location when in use description", bundle: bundle, comment: "")
+        case .locationAlwaysPrecise:
+            return NSLocalizedString("permission precise location always description", bundle: bundle, comment: "")
         }
     }
 

Sources/SPPermissions/Interface/Shared/SPPermissionsDrawIconView.swift

@@ -82,6 +82,10 @@ public class SPPermissionsDrawIconView: UIView {
         case .faceID, .siri, .health:
             // Not implemented old style icons.
             break
+        case .locationWhenInUsePrecise:
+            DrawService.drawLocations(frame: rect, resizing: .aspectFit, color: tintColor)
+        case .locationAlwaysPrecise:
+            DrawService.drawLocations(frame: rect, resizing: .aspectFit, color: tintColor)
         case .none:
             break
         }

Sources/SPPermissions/SPPermissions.swift

@@ -205,6 +205,8 @@ public enum SPPermissions {
         case faceID = 15
         case siri = 16
         case health = 17
+        case locationWhenInUsePrecise = 18
+        case locationAlwaysPrecise = 19
 
         public var name: String {
             switch self {
@@ -242,6 +244,10 @@ public enum SPPermissions {
                 return "Siri"
             case .health:
                 return "Health"
+            case .locationWhenInUsePrecise:
+                return "Precise Location When Use "
+            case .locationAlwaysPrecise:
+                return "Precise Location Always"
             }
         }
     }

Sources/SPPermissionsLocationAlways/SPLocationAlwaysPrecisePermission.swift

@@ -0,0 +1,61 @@
+// The MIT License (MIT)
+// Copyright © 2020 Ivan Vorobei ([email protected])
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#if SPPERMISSIONS_SPM
+import SPPermissions
+#endif
+
+#if os(iOS) && SPPERMISSIONS_LOCATION_ALWAYS
+
+import Foundation
+import MapKit
+
+public extension SPPermissions.Permission {
+
+    static var locationAlwaysPrecise: SPLocationAlwaysPrecisePermission {
+        return SPLocationAlwaysPrecisePermission()
+    }
+}
+
+public class SPLocationAlwaysPrecisePermission: SPLocationAlwaysPermission {
+    
+    public override var status: SPPermissions.PermissionStatus {
+        let alwaysAuthorizationStatus = SPLocationAlwaysPermission().status
+
+        let hasPrecision: Bool = {
+            #if os(iOS)
+            if #available(iOS 14.0, *), CLLocationManager().accuracyAuthorization != .fullAccuracy {
+                return false
+            }
+            #endif
+            return true
+        }()
+        
+        switch alwaysAuthorizationStatus {
+        #if os(iOS)
+        case .authorized: return hasPrecision ? .authorized : .denied
+        #endif
+        default: return alwaysAuthorizationStatus
+        }
+    }
+}
+
+#endif

Sources/SPPermissionsLocationWhenInUse/SPLocationWhenInUsePrecisePermission.swift

@@ -0,0 +1,61 @@
+// The MIT License (MIT)
+// Copyright © 2020 Ivan Vorobei ([email protected])
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#if SPPERMISSIONS_SPM
+import SPPermissions
+#endif
+
+#if SPPERMISSIONS_LOCATION_WHENINUSE
+
+import Foundation
+import MapKit
+
+public extension SPPermissions.Permission {
+    
+    static var locationWhenInUsePrecise: SPLocationWhenInUsePrecisePermission  {
+        return SPLocationWhenInUsePrecisePermission ()
+    }
+}
+
+public class SPLocationWhenInUsePrecisePermission: SPLocationWhenInUsePermission {
+    
+    public override var status: SPPermissions.PermissionStatus {
+        let whenInUseAuthorizationStatus = SPLocationWhenInUsePermission().status
+
+        let hasPrecision: Bool = {
+            #if os(iOS)
+            if #available(iOS 14.0, *), CLLocationManager().accuracyAuthorization != .fullAccuracy {
+                return false
+            }
+            #endif
+            return true
+        }()
+        
+        switch whenInUseAuthorizationStatus {
+        #if os(iOS)
+        case .authorized: return hasPrecision ? .authorized : .denied
+        #endif
+        default: return whenInUseAuthorizationStatus
+        }
+    }
+}
+
+#endif