Merge pull request #42 from jevonmao/develop

Author: jevonmao

.github/workflows/swift.yml

@@ -27,8 +27,10 @@ jobs:
        uses: maxim-lobanov/setup-xcode@v1
        with:
          xcode-version: latest-stable
-     - name: Test
-       run: xcodebuild -scheme PermissionsSwiftUI -destination 'platform=iOS Simulator,name=iPhone 12 Pro Max' test
+     - name: Test large screen device
+       run: xcodebuild -scheme PermissionsSwiftUI -destination 'platform=iOS Simulator,name=iPhone 12 Pro Max'  -only-testing:PermissionsSwiftUITests test
+     - name: Test small screen device
+       run: xcodebuild -scheme PermissionsSwiftUI -destination 'platform=iOS Simulator,name=iPod touch (7th generation)' -only-testing:PermissionsSwiftUISmallScreenTests test
   Swiftformat:
     name: Check swiftformat
     runs-on: macos-latest

Package.swift

@@ -29,5 +29,9 @@ let package = Package(
             name: "PermissionsSwiftUITests",
             dependencies: ["PermissionsSwiftUI","SnapshotTesting"]
         ),
+        .testTarget(
+            name: "PermissionsSwiftUISmallScreenTests",
+            dependencies: ["PermissionsSwiftUI","SnapshotTesting"]
+        ),
     ]
 )

Sources/PermissionsSwiftUI/Components/Modal-style/MainView.swift

@@ -8,30 +8,36 @@
 import SwiftUI
 
 struct MainView: View {
-    private var showModal: Binding<Bool>
-    private var bodyView: AnyView
-    var shouldShowPermission:Binding<Bool> = Binding(get: {
-        let store = PermissionStore.shared
-        if store.autoCheckModalAuth{
-            return !PermissionStore.shared.permissionsToAsk.isEmpty
-        }
-        return true
-    }, set: {_ in})
-    init(for bodyView: AnyView, show showModal: Binding<Bool>) {
+    var showModal: Binding<Bool>
+    var bodyView: AnyView
+    var permissionsToAsk: [PermissionType]
+    var shouldShowPermission:Binding<Bool>{
+        Binding(get: {
+            let store = PermissionStore.shared
+            if store.autoCheckModalAuth{
+                return !permissionsToAsk.isEmpty
+            }
+            return true
+        }, set: {_ in})
+    }
+    init(for bodyView: AnyView,
+         show showModal: Binding<Bool>,
+         permissionsToAsk: [PermissionType]=PermissionStore.shared.permissionsToAsk) {
         self.bodyView = bodyView
         self.showModal = showModal
+        self.permissionsToAsk = permissionsToAsk
     }
-
+    
     var body: some View {
-            bodyView
-                .sheet(isPresented: showModal.combine(with: shouldShowPermission), content: {
-                    ModalView(showModal: showModal)
-                        .onAppear(perform: PermissionStore.shared.onAppear)
-                        .onDisappear(perform:PermissionStore.shared.onDisappear)
-                        .onDisappear{showModal.wrappedValue = false}
-
-                })
-     
+        bodyView
+            .sheet(isPresented: showModal.combine(with: shouldShowPermission), content: {
+                ModalView(showModal: showModal)
+                    .onAppear(perform: PermissionStore.shared.onAppear)
+                    .onDisappear(perform:PermissionStore.shared.onDisappear)
+                    .onDisappear{showModal.wrappedValue = false}
+                
+            })
+        
     }
     //if DEBUG to ensure these functions are never used in production. They are for unit testing only.
     #if DEBUG
@@ -44,7 +50,7 @@ struct MainView: View {
         onDisappear()
     }
     #endif
-
+    
 }
 //Extension Binding wrapper for Binding booleans
 extension Binding where Value == Bool{

Sources/PermissionsSwiftUI/Model/Mocks/MockHealthManager.swift

@@ -24,6 +24,7 @@ class MockHealthManager: HealthManager {
     var requestSuccessOverride: Bool = true
     static var healthDataAvailableOverride: Bool = true
 
+    var requestedPermissions: HKAccess?
     var lastStatus: HKAuthorizationStatus = .notDetermined
     func authorizationStatus(for type: HKObjectType) -> HKAuthorizationStatus {
         switch authStatusOverride {
@@ -59,6 +60,17 @@ class MockHealthManager: HealthManager {
         let healthDataAvailable = MockHealthManager.healthDataAvailableOverride
         if requestSuccessOverride {
             completion(requestSuccessOverride, healthDataAvailable ? nil : fatalError("MockHealthManager - health data is not available"))
+            guard typesToShare != nil || typesToRead != nil else {return}
+            if let typesToShare = typesToShare, let typesToRead = typesToRead {
+                requestedPermissions = .init(read: typesToRead as! Set<HKSampleType>, write: typesToShare)
+            }
+            else if let typesToShare = typesToShare {
+                requestedPermissions = .init(write: typesToShare)
+            }
+            else if let typesToRead = typesToRead {
+                requestedPermissions = .init(read: typesToRead as! Set<HKSampleType>)
+            }
+            
         }
         else {
             completion(false, NSError(domain: "", code: 0, userInfo: nil))

Sources/PermissionsSwiftUI/Model/Mocks/MockNotificationManager.swift

@@ -14,8 +14,9 @@ protocol NotificationManager {
     func getNotificationSettings(completionHandler: @escaping (UNNotificationSettings) -> Void)
 }
 extension UNUserNotificationCenter:NotificationManager{
+    static var isTestingMode = false
     static func shared() -> NotificationManager {
-        return UNUserNotificationCenter.current()
+        return isTestingMode ? MockNotificationManager.shared() : UNUserNotificationCenter.current()
     }
     func requestPermission(options: UNAuthorizationOptions=[], completionHandler: @escaping (Bool, Error?) -> Void) {
         self.requestAuthorization(options: options) { granted, error in

Sources/PermissionsSwiftUI/Model/PermissionManagers/JMHealthPermissionManager.swift

@@ -90,8 +90,8 @@ class JMHealthPermissionManager: PermissionManager{
             completion(false)
             return
         }
-        healthStore.requestAuthorization(toShare: Set(healthPermission?.readPermissions ?? []),
-                                         read: Set(healthPermission?.writePermissions ?? [])) { authorized, error in
+        healthStore.requestAuthorization(toShare: Set(healthPermission?.writePermissions ?? []),
+                                         read: Set(healthPermission?.readPermissions ?? [])) { authorized, error in
             guard error == nil else{
                 print("PermissionSwiftUI - \(error!)")
                 completion(false)

Sources/PermissionsSwiftUI/Model/PermissionManagers/JMLocationPermissionAlwaysManager.swift renamed to Sources/PermissionsSwiftUI/Model/PermissionManagers/JMLocationAlwaysPermissionManager.swift

@@ -8,12 +8,12 @@
 import Foundation
 import MapKit
 
-class JMLocationPermissionAlwaysManager: NSObject, CLLocationManagerDelegate, PermissionManager {
+class JMLocationAlwaysPermissionManager: NSObject, CLLocationManagerDelegate, PermissionManager {
 
     typealias authorizationStatus = CLAuthorizationStatus
-    typealias permissionManagerInstance = JMLocationPermissionAlwaysManager
+    typealias permissionManagerInstance = JMLocationAlwaysPermissionManager
 
-    static var shared: PermissionManager = JMLocationPermissionAlwaysManager()
+    static var shared: PermissionManager = JMLocationAlwaysPermissionManager()
     var authorizationStatus: AuthorizationStatus{
         switch CLLocationManager.authorizationStatus(){
         case .authorizedAlways:

Sources/PermissionsSwiftUI/Model/PermissionManagers/JMLocationInUsePermissionManager.swift renamed to Sources/PermissionsSwiftUI/Model/PermissionManagers/JMLocationPermissionManager.swift

@@ -9,11 +9,11 @@
 import Foundation
 import MapKit
 
-class JMLocationInUsePermissionManager: NSObject, CLLocationManagerDelegate, PermissionManager {
+class JMLocationPermissionManager: NSObject, CLLocationManagerDelegate, PermissionManager {
     typealias authorizationStatus = CLAuthorizationStatus
-    typealias permissionManagerInstance = JMLocationInUsePermissionManager
+    typealias permissionManagerInstance = JMLocationPermissionManager
 
-    static var shared: PermissionManager = JMLocationInUsePermissionManager()
+    static var shared: PermissionManager = JMLocationPermissionManager()
     var authorizationStatus: AuthorizationStatus{
         switch locationManager.authorizationStatus(){
         case .authorizedAlways:

Sources/PermissionsSwiftUI/Model/PermissionManagers/JMMicPermissionManager.swift

@@ -8,9 +8,9 @@
 import AVFoundation
 import Foundation
 
-struct JMMicPermissionManager: PermissionManager {
+struct JMMicrophonePermissionManager: PermissionManager {
 
-    static var shared: PermissionManager = JMMicPermissionManager()
+    static var shared: PermissionManager = JMMicrophonePermissionManager()
     var authorizationStatus: AuthorizationStatus{
         switch AVCaptureDevice.authorizationStatus(for: .audio){
         case .authorized:

Sources/PermissionsSwiftUI/Model/PermissionType/PermissionTypeGetSet.swift

@@ -100,13 +100,13 @@ extension PermissionType:PermissionTypeProtocol{
     func getPermissionManager() -> PermissionManager?{
         switch self {
         case .location:
-            return JMLocationPermissionAlwaysManager.shared
+            return JMLocationPermissionManager.shared
         case .locationAlways:
-            return JMLocationPermissionAlwaysManager.shared
+            return JMLocationAlwaysPermissionManager.shared
         case .photo:
             return JMPhotoPermissionManager.shared
         case .microphone:
-            return JMMicPermissionManager.shared
+            return JMMicrophonePermissionManager.shared
         case .camera:
             return JMCameraPermissionManager.shared
         case .notification:
@@ -139,9 +139,15 @@ extension PermissionType:PermissionTypeProtocol{
 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]
+                    return [.location,.locationAlways,.photo,microphone,.camera,.notification,.calendar,.bluetooth,.contacts,.motion,.reminders,.speech,.tracking, .health(categories: nil)]
                 } 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, .health(categories: nil)]
                 }
     }
+    var rawValue: String {
+            guard let label = Mirror(reflecting: self).children.first?.label else {
+                return .init(describing: self)
+            }
+            return label
+        }
 }

Sources/PermissionsSwiftUI/Model/Utility/FilterPermissions.swift

@@ -1,23 +1,24 @@
 //
 //  FilterPermissions.swift
-//  
+//
 //
 //  Created by Jevon Mao on 2/19/21.
 //
 
 import Foundation
 
-struct FilterPermissions{
-    //Based on struct boolean property, dependent on memory
-    static func filterForUnauthorized(for permissions:[PermissionType]) -> [PermissionType] {
-        let filteredPermissions = permissions.filter{$0.currentPermission.authorized==false}
+struct FilterPermissions {
+    // Based on struct boolean property, dependent on memory
+    static func filterForUnauthorized(for permissions: [PermissionType]) -> [PermissionType] {
+        let filteredPermissions = permissions.filter { $0.currentPermission.authorized == false }
         return filteredPermissions
     }
-    //Based on system API query, independent from memory
-    static func filterForShouldAskPermission(for permissions:[PermissionType]) -> [PermissionType] {
-        var filteredPermissions:[PermissionType] = []
-        for permission in permissions{
-            if permission.getPermissionManager()?.authorizationStatus == .notDetermined{
+
+    // Based on system API query, independent from memory
+    static func filterForShouldAskPermission(for permissions: [PermissionType]) -> [PermissionType] {
+        var filteredPermissions: [PermissionType] = []
+        for permission in permissions {
+            if permission.getPermissionManager()?.authorizationStatus == .notDetermined {
                 filteredPermissions.append(permission)
             }
         }