Merge Develop into Main to resolve conflict

Author: jevonmao

Package.swift

@@ -22,7 +22,8 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "PermissionsSwiftUI",
-            dependencies: []
+            dependencies: [],
+            exclude: ["Tests/PermissionsSwiftUITests/__Snapshots__"]
         ),
         .testTarget(
             name: "PermissionsSwiftUITests",

Sources/PermissionsSwiftUI/Components/AllowButtonSection.swift

@@ -12,7 +12,7 @@ struct AllowButtonSection: View {
     @Binding var allowButtonStatus: AllowButtonStatus
     var body: some View {
         Button(action: action, label: {
-            Text(allowButtonStatus == .allowed ? "ALLOWED" : "ALLOW")
+            Text(allowButtonStatus == .allowed ? "ALLOWED" : allowButtonStatus == .idle ? "ALLOW" : "DENIED")
                 .fontWeight(.bold)
                 .buttonStatusColor(for: allowButtonStatus)
         })

Sources/PermissionsSwiftUI/Components/PermissionSection.swift

@@ -24,10 +24,12 @@ struct PermissionSection: View {
         .clipShape(RoundedRectangle(cornerRadius: 15))
         .padding()
         .padding(.horizontal, 5)
+        .frame(maxWidth:UIScreen.main.bounds.width-30)
+
     }
 }
 
-enum AllowButtonStatus {
+enum AllowButtonStatus:CaseIterable {
     case idle
     case allowed
     case denied
@@ -63,7 +65,7 @@ struct PermissionSectionCell: View {
                     .lineLimit(3)
                     .foregroundColor(Color(.systemGray2))
             }
-            .padding(.horizontal, 5)
+            .padding(.horizontal, 3)
 
             Spacer()
             AllowButtonSection(action: {
@@ -88,6 +90,7 @@ struct PermissionSectionCell: View {
                 }
             }, allowButtonStatus: $allowButtonStatus)
         }
+        .fixedSize(horizontal: false, vertical: true)
         .padding(15)
         .frame(maxHeight:.infinity)
     }

Sources/PermissionsSwiftUI/MainView.swift

@@ -19,8 +19,22 @@ struct MainView: View {
         bodyView
             .sheet(isPresented: showModal, content: {
                 ModalView(showModal: showModal)
+                    .onAppear(perform:PermissionStore.shared.onAppear)
+                    .onDisappear(perform:PermissionStore.shared.onDisappear)
+
             })
 
 
     }
+    #if DEBUG
+    static func testCallOnAppear(){
+        guard let onAppear = PermissionStore.shared.onAppear else {return}
+        onAppear()
+    }
+    static func testCallOnDisappear(){
+        guard let onDisappear = PermissionStore.shared.onDisappear else {return}
+        onDisappear()
+    }
+    #endif
+
 }

Sources/PermissionsSwiftUI/Model/JMPermissionModel.swift

@@ -13,7 +13,9 @@ import SwiftUI
 
  `JMPermission` conforms to `Equatable` and `Hashable`. Is used for abstractly store data for each permission.
  */
-public struct JMPermission:Equatable, Hashable{
+
+public struct JMPermission:Equatable{
+
 
     /**
      Initializes a new instance of JMPermission
@@ -41,11 +43,7 @@ public struct JMPermission:Equatable, Hashable{
             return false
         }
     }
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(title)
-        hasher.combine(description)
-        hasher.combine(authorized)
-    }
+
 
     var imageIcon: AnyView
     var title: String

Sources/PermissionsSwiftUI/Model/Mocks/MockLocationManager.swift

@@ -9,20 +9,49 @@ import Foundation
 import MapKit
 
 protocol LocationManager {
-    var location:CLLocation? {get}
+    var delegate: CLLocationManagerDelegate? {get set}
+    func authorizationStatus() -> CLAuthorizationStatus
     func requestWhenInUseAuthorization()
     func requestAlwaysAuthorization()
 }
 
-class MockCLLocationManager:CLLocationManager{
-    var authStatus:CLAuthorizationStatus = .notDetermined
-    func authorizationStatus() -> CLAuthorizationStatus{
-        return authStatus
+
+extension CLLocationManager:LocationManager{
+    func authorizationStatus() -> CLAuthorizationStatus {
+        CLLocationManager.authorizationStatus()
+    }
+    
+    
+}
+struct MockCLLocationManager:LocationManager{
+    weak var delegate: CLLocationManagerDelegate?
+    
+    private static var status:CLAuthorizationStatus = .notDetermined
+    func authorizationStatus() -> CLAuthorizationStatus {
+        MockCLLocationManager.status
     }
-    override func requestAlwaysAuthorization() {
-        self.authStatus = .authorizedAlways
+    
+    func requestWhenInUseAuthorization() {
+        MockCLLocationManager.status = .authorizedWhenInUse
     }
-    override func requestWhenInUseAuthorization() {
-        self.authStatus = .authorizedWhenInUse
-    } 
+    
+    func requestAlwaysAuthorization() {
+        MockCLLocationManager.status = .authorizedAlways
+
+    }
+    
+    
 }
+//class MockCLLocationManager:CLLocationManager{
+//    var authStatus:CLAuthorizationStatus = .notDetermined
+//    func authorizationStatus() -> CLAuthorizationStatus{
+//        return authStatus
+//    }
+//    override func requestAlwaysAuthorization() {
+//        self.authStatus = .authorizedAlways
+//    }
+//    override func requestWhenInUseAuthorization() {
+//        self.authStatus = .authorizedWhenInUse
+//    }
+//}
+

Sources/PermissionsSwiftUI/Model/Mocks/MockNotificationManager.swift

@@ -0,0 +1,65 @@
+//
+//  MockNotificationManager.swift
+//  
+//
+//  Created by Jevon Mao on 2/10/21.
+//
+
+import Foundation
+import UserNotifications
+
+protocol NotificationManager {
+    static func shared() -> NotificationManager
+    func requestPermission(options: UNAuthorizationOptions, completionHandler: @escaping (Bool, Error?) -> Void)
+    func getNotificationSettings(completionHandler: @escaping (UNNotificationSettings) -> Void)
+}
+extension UNUserNotificationCenter:NotificationManager{
+    static func shared() -> NotificationManager {
+        UNUserNotificationCenter.current()
+    }
+    func requestPermission(options: UNAuthorizationOptions=[], completionHandler: @escaping (Bool, Error?) -> Void) {
+        self.requestAuthorization(options: options) { granted, error in
+            completionHandler(granted,error)
+        }
+    }
+    
+}
+class MockNotificationManager:NotificationManager{
+    var authStatus:UNAuthorizationStatus = .notDetermined
+    func getNotificationSettings(completionHandler: @escaping (UNNotificationSettings) -> Void) {
+        completionHandler(UNNotificationSettings(coder: MockNSCoder(authorizationStatus: authStatus.rawValue))!)
+        
+    }
+    
+    static func shared() -> NotificationManager {
+        MockNotificationManager()
+    }
+    
+    
+    func requestPermission(options: UNAuthorizationOptions, completionHandler: @escaping (Bool, Error?) -> Void) {
+        switch authStatus{
+        case .denied:
+            completionHandler(false,NSError(domain:"", code:0, userInfo:nil))
+        case .ephemeral:
+            completionHandler(false,nil)
+        default:
+            completionHandler(true,nil)
+            authStatus = .authorized
+        }
+    }
+    
+    
+}
+class MockNSCoder: NSCoder {
+    var authorizationStatus:Int
+    init(authorizationStatus:Int){
+        self.authorizationStatus = authorizationStatus
+    }
+    override func decodeInt64(forKey key: String) -> Int64 {
+        return Int64(authorizationStatus)
+    }
+    
+    override func decodeBool(forKey key: String) -> Bool {
+        return true
+    }
+}

Sources/PermissionsSwiftUI/Model/Mocks/MockPhotoManager.swift

@@ -0,0 +1,15 @@
+//
+//  MockPhotoManager.swift
+//  
+//
+//  Created by Jevon Mao on 2/10/21.
+//
+
+import Foundation
+import Photos
+
+class MockPhotoManager:PHPhotoLibrary{
+    static override func requestAuthorization(_ handler: @escaping (PHAuthorizationStatus) -> Void) {
+        handler(PHAuthorizationStatus.authorized)
+    }
+}

Sources/PermissionsSwiftUI/Model/PermissionStore.swift

@@ -19,6 +19,8 @@ struct PermissionStore {
     }
     var permissions: [PermissionType] = []
     var mainTexts = MainTexts()
+    var onAppear:(()->Void)?
+    var onDisappear:(()->Void)?
     struct MainTexts{
         var headerText:String = "Need Permissions"
         var headerDescription:String = """
@@ -93,6 +95,10 @@ struct PermissionStore {
         title: "Speech",
         description: "Allow to access speech recognition", authorized: false
     )
+    var healthPermission = JMPermission(imageIcon: AnyView(Image(systemName: "heart.fill")),
+                                        title: "Health",
+                                        description: "Allow to access your health information",
+                                        authorized: false)
 
 }
 // MARK: Updating methods

Sources/PermissionsSwiftUI/Model/PermissionType.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import SwiftUI
+import HealthKit
 
 /**
  The types of iOS system permission for show in the JMPermissions view
@@ -40,6 +41,21 @@ public enum PermissionType {
     case motion
     ///The `reminders` permission is needed to interact with device reminders
     case reminders
+    /**
+     Permission that allows app to access healthkit information
+     
+     - Note: Extensive Info.plist  values and configurations are required for HealthKit authorization. Please see Apple Developer [website](https://developer.apple.com/documentation/healthkit/authorizing_access_to_health_data) for details. \n
+     
+     For example, passing in a `Set` of `HKSampleType`:
+     ```
+     [.health(Set([HKObjectType.workoutType(),
+                         HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)!,
+                         HKObjectType.quantityType(forIdentifier: .distanceCycling)!,
+                         HKObjectType.quantityType(forIdentifier: .distanceWalkingRunning)!,
+                         HKObjectType.quantityType(forIdentifier: .heartRate)!]))]
+     ```
+     */
+    case health(Set<HKSampleType>)
     ///Permission that allows app to use speech recognition
     case speech
     ///In order for app to track user's data across apps and websites, the tracking permission is needed

Sources/PermissionsSwiftUI/Model/PermissionTypeGetSet.swift

@@ -8,7 +8,12 @@
 import Foundation
 import SwiftUI
 
-extension PermissionType{
+protocol PermissionTypeProtocol {
+    var permissions:[PermissionType]{get}
+    func requestPermission(isPermissionGranted: @escaping (Bool) -> Void)
+}
+extension PermissionType:PermissionTypeProtocol{
+
     var permissions:[PermissionType]{
         get{
             PermissionStore.shared.permissions 
@@ -44,6 +49,9 @@ extension PermissionType{
                 return store.remindersPermission
             case .speech:
                 return store.speechPermission
+            case .health:
+                return store.healthPermission
+
             }
         }
         set{
@@ -74,6 +82,8 @@ extension PermissionType{
                 PermissionStore.shared.updateStore(property: {$0.remindersPermission=$1}, value: newValue)
             case .speech:
                 PermissionStore.shared.updateStore(property: {$0.speechPermission=$1}, value: newValue)
+            case .health:
+                PermissionStore.shared.updateStore(property: {$0.healthPermission=$1}, value: newValue)
             }
         }
 
@@ -82,12 +92,10 @@ extension PermissionType{
         switch self {
         case .location:
             JMLocationPermissionManager.shared.requestInUsePermission { authorized in
-                print("Permission \(authorized)")
                 isPermissionGranted(authorized)
             }
         case .locationAlways:
             JMLocationPermissionManager.shared.requestAlwaysPermission { authorized in
-                print("Permission \(authorized)")
                 isPermissionGranted(authorized)
             }
         case .photo:
@@ -117,7 +125,7 @@ extension PermissionType{
 
             }
         case .tracking:
-            if #available(iOS 14, *) {
+            if #available(iOS 14.5, *) {
                 JMTrackingPermissionManager.shared.requestPermission{authorized in
                     print(authorized)
                     isPermissionGranted(authorized)
@@ -139,16 +147,21 @@ extension PermissionType{
             JMSpeechPermissionManager.shared.requestPermission{
                 isPermissionGranted($0)
             }
+        case .health:
+            JMHealthPermissionManager.shared.requestPermission{
+                isPermissionGranted($0)
+            }
         }
     }
 
 }
 extension PermissionType:CaseIterable{
     public static var allCases: [PermissionType]{
-        if #available(iOS 14.5, *) {
-            return [.location,.locationAlways,.photo,microphone,.camera,.notification,.calendar,.bluetooth,.contacts,.motion,.reminders,.speech,.tracking]
-        } else {
-            return [.location,.locationAlways,.photo,microphone,.camera,.notification,.calendar,.bluetooth,.contacts,.motion,.reminders,.speech]
-        }
+        //return [.location,.locationAlways,.photo,microphone,.camera,.notification,.calendar,.bluetooth,.contacts,.motion,.reminders,.speech]
+                if #available(iOS 14.5, *) {
+                    return [.location,.locationAlways,.photo,microphone,.camera,.notification,.calendar,.bluetooth,.contacts,.motion,.reminders,.speech,.tracking]
+                } else {
+                    return [.location,.locationAlways,.photo,microphone,.camera,.notification,.calendar,.bluetooth,.contacts,.motion,.reminders,.speech]
+                }
     }
 }

Sources/PermissionsSwiftUI/Model/Permissions/JMBluetoothPermissionManager.swift

@@ -8,6 +8,7 @@
 import CoreBluetooth
 import UIKit
 
+
 class JMBluetoothPermissionManager: NSObject {
     typealias JMBluetoothPermissionHandler = (Bool) -> Void?
     private var completion: JMBluetoothPermissionHandler?