Merge pull request #39 from jevonmao/develop

Merge 'develop' features into 'main' for version 2.1.4 release

Author: jevonmao

Sources/PermissionsSwiftUI/Model/JMPermissionModel.swift

@@ -0,0 +1,73 @@
+//
+//  MockHealthManager.swift.swift
+//  
+//
+//  Created by Jevon Mao on 2/25/21.
+//
+
+import Foundation
+import HealthKit
+
+protocol HealthManager {
+    func authorizationStatus(for type: HKObjectType) -> HKAuthorizationStatus
+    func requestAuthorization(toShare typesToShare: Set<HKSampleType>?, read typesToRead: Set<HKObjectType>?, completion: @escaping (Bool, Error?) -> Void)
+    static func isHealthDataAvailable() -> Bool
+
+}
+extension HKHealthStore: HealthManager {}
+
+class MockHealthManager: HealthManager {
+    enum AuthorizationStatus: CaseIterable {
+        case notDetermined, authorized, denied, mixedAuthorized, mixedDenied
+    }
+    var authStatusOverride: AuthorizationStatus = .notDetermined
+    var requestSuccessOverride: Bool = true
+    static var healthDataAvailableOverride: Bool = true
+    
+    var lastStatus: HKAuthorizationStatus = .notDetermined
+    func authorizationStatus(for type: HKObjectType) -> HKAuthorizationStatus {
+        switch authStatusOverride {
+        case .authorized:
+            return .sharingAuthorized
+        case .notDetermined:
+            return .notDetermined
+        case .denied:
+            return .sharingDenied
+        case .mixedAuthorized:
+            return getCorrectPermission()
+        case .mixedDenied:
+            return getCorrectPermission()
+        }
+        
+    }
+    
+    func getCorrectPermission() -> HKAuthorizationStatus {
+        var keyStatus: HKAuthorizationStatus = .sharingAuthorized
+        if self.authStatusOverride == .mixedDenied {
+            keyStatus = .sharingDenied
+        }
+        if lastStatus == .notDetermined {
+            self.lastStatus = keyStatus
+            return keyStatus
+        }
+        else {
+            self.lastStatus = .notDetermined
+            return .notDetermined
+        }
+    }
+    func requestAuthorization(toShare typesToShare: Set<HKSampleType>?, read typesToRead: Set<HKObjectType>?, completion: @escaping (Bool, Error?) -> Void) {
+        let healthDataAvailable = MockHealthManager.healthDataAvailableOverride
+        if requestSuccessOverride {
+            completion(requestSuccessOverride, healthDataAvailable ? nil : fatalError("MockHealthManager - health data is not available"))
+        }
+        else {
+            completion(false, NSError(domain: "", code: 0, userInfo: nil))
+        }
+    }
+    
+    static func isHealthDataAvailable() -> Bool {
+        healthDataAvailableOverride
+    }
+    
+    
+}

Sources/PermissionsSwiftUI/Model/Mocks/MockHealthManager.swift

@@ -0,0 +1,106 @@
+//
+//  JMHealthPermissionManager.swift
+//  
+//
+//  Created by Jevon Mao on 2/10/21.
+//
+
+import Foundation
+import HealthKit
+
+class JMHealthPermissionManager: PermissionManager{
+    
+    typealias authorizationStatus = HKAuthorizationStatus
+    typealias permissionManagerInstance = JMHealthPermissionManager
+    typealias CountComparison = (Int, Int)
+
+    let healthStore: HealthManager
+    static let shared: PermissionManager = JMHealthPermissionManager()
+    
+    init(healthManager: HealthManager = HKHealthStore()) {
+        self.healthStore = healthManager
+    }
+    //Get the health permission from stored permissions array
+    var healthPermission: HKAccess? {
+        get {
+            //Search and get health permission from all permissions
+            let health = PermissionStore.shared.permissions.first(where: {
+                if case .health = $0{
+                    return true
+                }
+                return false
+            })
+            //Get the associated value of health permission
+            if case .health(let permissionCategories) = health {
+                return permissionCategories
+            }
+            return nil
+        }
+
+    }
+    var authorizationStatus: AuthorizationStatus{
+        get {
+            //Count to track total # of permissions allowed and denied each
+            var allowDenyCount: CountComparison = (authorized: 0, denied: 0)
+            var status: AuthorizationStatus {
+                //Set to notDetermined if all permissions are not determined
+                if allowDenyCount.0 == 0 && allowDenyCount.1 == 0 {
+                    return .notDetermined
+                }
+                //Set to authorized if majority are authorized
+                if allowDenyCount.0 > allowDenyCount.1 {
+                    return .authorized
+                }
+                //Set to denied if majority are denied, or equal # of allowed and denied
+                return .denied
+            }
+            
+            /**
+             - Note: From Apple Developer Documentation: "to help prevent possible leaks of sensitive health information, your app cannot determine whether or not a user has granted permission to read data. If you are not given permission, it simply appears as if there is no data of the requested type in the HealthKit store."
+             */
+            
+            var readPermissions = healthPermission?.readPermissions ?? []
+            var writePermissions = healthPermission?.writePermissions ?? []
+            //Map the authorization status, remove allowed and denied permissions from array.
+            //Increase allowDenyCount as needed.
+            mapPermissionAuthorizationStatus(for: &readPermissions, forCount: &allowDenyCount)
+            mapPermissionAuthorizationStatus(for: &writePermissions, forCount: &allowDenyCount)
+            return status
+        }
+
+    }
+    func mapPermissionAuthorizationStatus(for permissions: inout Set<HKSampleType>,
+                                        forCount allowDenyCount: inout CountComparison) {
+        for sampleType in permissions {
+            switch healthStore.authorizationStatus(for: sampleType){
+            case .sharingAuthorized:
+                permissions.remove(sampleType)
+                allowDenyCount.0 += 1
+            case .sharingDenied:
+                permissions.remove(sampleType)
+                allowDenyCount.1 += 1
+            default:
+                ()
+            }
+        }
+    }
+    func requestPermission(_ completion: @escaping (Bool) -> Void) {
+        guard type(of: healthStore).isHealthDataAvailable() else {
+            print("PermissionsSwiftUI - Health data is not available")
+            completion(false)
+            return
+        }
+        healthStore.requestAuthorization(toShare: Set(healthPermission?.readPermissions ?? []),
+                                         read: Set(healthPermission?.writePermissions ?? [])) { authorized, error in
+            guard error == nil else{
+                print("PermissionSwiftUI - \(error!)")
+                completion(false)
+                return
+            }
+            completion(true)
+        }
+        
+    }
+}
+
+

Sources/PermissionsSwiftUI/Model/Permissions/JMBluetoothPermissionManager.swift renamed to Sources/PermissionsSwiftUI/Model/PermissionManagers/JMBluetoothPermissionManager.swift

@@ -13,7 +13,7 @@ import SwiftUI
  The global shared storage for PermissionsSwiftUI
  */
 public struct PermissionStore {
-    //MARK: Init and Singleton Management
+    //MARK: Creating a new store
     /**
      Initalizes and returns a new instance of `PermissionStore`
 
@@ -31,40 +31,52 @@ public struct PermissionStore {
             mutableShared
         }
     }
+    //MARK: All Permissions
     ///A global array of permissions that configures the permissions to request
     public var permissions: [PermissionType] = []
     var permissionsToAsk: [PermissionType]{
         FilterPermissions.filterForShouldAskPermission(for: permissions)
     }
-    //MARK: Secondary Components
+    //MARK: Configuring View Texts
     ///The text for text label components, including header and descriptions
     public var mainTexts = MainTexts()
+    /**
+     Encapsulates the surrounding texts and title
+     */
+    public struct MainTexts{
+        ///Text to display for header text
+        public var headerText: String = "Need Permissions"
+        ///Text to display for header description text
+        public var headerDescription: String = """
+                                       In order for you use certain features of this app, you need to give permissions. See description for each permission
+                                       """
+        ///Text to display for bottom part description text
+        public var bottomDescription: String = """
+                                            Permission are necessary for all the features and functions to work properly. If not allowed, you have to enable permissions in settings
+                                            """
+    }
+    //MARK: Customizing Colors
     ///The color configuration for permission allow buttons
     public var allButtonColors = AllButtonColors()
+    
+    //MARK: Change Auto Dismiss Behaviors
     ///Whether to auto dismiss the modal after last permission is allowed
     public var autoDismissModal: Bool = true
     ///Whether to auto dismiss the alert after last permission is allowed
     public var autoDismissAlert: Bool = true
+    
+    //MARK: Configure Auto Authorization Checking
     ///Whether to auto check for authorization status before showing, and show the view only if permission is in `notDetermined`
     public var autoCheckModalAuth: Bool = true
     ///Whether to auto check for authorization status before showing, and show the view only if permission is in `notDetermined`
     public var autoCheckAlertAuth: Bool = true
+    
+    //MARK: `onAppear` and `onDisappear` Executions
     ///Override point for executing action when PermissionsSwiftUI view appears
     public var onAppear: (()->Void)?
     ///Override point for executing action when PermissionsSwiftUI view disappears
     public var onDisappear: (()->Void)?
-    public struct MainTexts{
-        ///Text to display for header text
-        public var headerText: String = "Need Permissions"
-        ///Text to display for header description text
-        public var headerDescription: String = """
-                                       In order for you use certain features of this app, you need to give permissions. See description for each permission
-                                       """
-        ///Text to display for bottom part description text
-        public var bottomDescription: String = """
-                                            Permission are necessary for all the features and functions to work properly. If not allowed, you have to enable permissions in settings
-                                            """
-    }
+    
     //MARK: Permission Components
     ///The displayed text and image icon for the camera permission
     public var cameraPermission = JMPermission(
@@ -162,6 +174,7 @@ extension PermissionStore{
         //Closure passes back PermissionStore instance, and the generic value passed in method
         property(&PermissionStore.mutableShared, value)
     }
+    
 }
 // MARK: - Button Customizations
 /**
@@ -210,7 +223,15 @@ public struct AllButtonColors{
         self.init()
         self.buttonDenied = buttonDenied
     }
-    
+    /**
+     Initializes a new `AllbuttonColors` from the primary and tertiary colors
+     
+     Both `primaryColor` and `tertiaryColor` are non-required parameters. Colors without a given initializer parameter will be displayed with the default color.
+     
+     - parameters:
+        - primaryColor: The primary color, characterized by the default blue
+        - tertiaryColor: The tertiary color, characterized by the default alert red
+     */
     public init(primaryColor: Color?=nil, tertiaryColor: Color?=nil){
         self.primaryColor = primaryColor ?? Color(.systemBlue)
         self.tertiaryColor = tertiaryColor ?? Color(.systemRed)