diff --git a/Example Apps/Modules/Package.swift b/Example Apps/Modules/Package.swift index 201b14c..144be8d 100644 --- a/Example Apps/Modules/Package.swift +++ b/Example Apps/Modules/Package.swift @@ -13,7 +13,7 @@ let package = Package( .library(name: "Modules", targets: ["Modules"]), ], dependencies: [ - .package(name: "SparrowKit", url: "https://github.com/ivanvorobei/SparrowKit", .upToNextMajor(from: "3.5.1")), + .package(name: "SparrowKit", url: "https://github.com/ivanvorobei/SparrowKit", .upToNextMajor(from: "3.6.1")), .package(name: "PermissionsKit", path: "PermissionsKit") ], targets: [ @@ -32,7 +32,7 @@ let package = Package( .product(name: "LocationWhenInUsePermission", package: "PermissionsKit"), .product(name: "LocationAlwaysPermission", package: "PermissionsKit"), .product(name: "MotionPermission", package: "PermissionsKit"), - .product(name: "MusicPermission", package: "PermissionsKit"), + .product(name: "MediaLibraryPermission", package: "PermissionsKit"), .product(name: "BluetoothPermission", package: "PermissionsKit"), .product(name: "TrackingPermission", package: "PermissionsKit"), .product(name: "FaceIDPermission", package: "PermissionsKit"), diff --git a/Example Apps/iOS Example/Scenes/RootController.swift b/Example Apps/iOS Example/Scenes/RootController.swift index 7bfd003..6b838c6 100644 --- a/Example Apps/iOS Example/Scenes/RootController.swift +++ b/Example Apps/iOS Example/Scenes/RootController.swift @@ -22,32 +22,32 @@ import UIKit import SparrowKit -import SPPermissions -import SPPermissionsCamera -import SPPermissionsPhotoLibrary -import SPPermissionsNotification -import SPPermissionsMicrophone -import SPPermissionsCalendar -import SPPermissionsContacts -import SPPermissionsReminders -import SPPermissionsSpeechRecognizer -import SPPermissionsLocationWhenInUse -import SPPermissionsLocationAlways -import SPPermissionsMotion -import SPPermissionsMusic -import SPPermissionsBluetooth -import SPPermissionsTracking -import SPPermissionsFaceID -import SPPermissionsSiri -import SPPermissionsHealth +import PermissionsKit +import CameraPermission +import PhotoLibraryPermission +import NotificationPermission +import MicrophonePermission +import CalendarPermission +import ContactsPermission +import RemindersPermission +import SpeechRecognizerPermission +import LocationWhenInUsePermission +import LocationAlwaysPermission +import MotionPermission +import MediaLibraryPermission +import BluetoothPermission +import TrackingPermission +import FaceIDPermission +import SiriPermission +import HealthPermission import CoreLocation 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: [Permission] = [.camera, .photoLibrary, .notification, .microphone, .calendar, .contacts, .reminders, .speech, .locationWhenInUse, .locationAlways, .motion, .mediaLibrary, .bluetooth, /*.tracking,*/ .faceID, .siri, .health] - var selectedPermissions: [SPPermissions.Permission] = [] + var selectedPermissions: [Permission] = [] // MARK: Init @@ -112,7 +112,7 @@ class RootController: SPTableViewController { extension RootController: SPPermissionsDataSource { - func configure(_ cell: SPPermissionsTableViewCell, for permission: SPPermissions.Permission) { + func configure(_ cell: SPPermissionsTableViewCell, for permission: Permission) { // Here you can customise cell, like texts or colors. @@ -130,7 +130,7 @@ extension RootController: SPPermissionsDataSource { */ } - func deniedAlertTexts(for permission: SPPermissions.Permission) -> SPPermissionsDeniedAlertTexts? { + func deniedAlertTexts(for permission: Permission) -> SPPermissionsDeniedAlertTexts? { // You can create custom texts /* @@ -155,15 +155,15 @@ extension RootController: SPPermissionsDataSource { extension RootController: SPPermissionsDelegate { - func didHidePermissions(_ permissions: [SPPermissions.Permission]) { + func didHidePermissions(_ permissions: [Permission]) { print("Example App: did hide with permissions", permissions.map { $0.debugName }) } - func didAllowPermission(_ permission: SPPermissions.Permission) { + func didAllowPermission(_ permission: Permission) { print("Example App: did allow", permission.debugName) } - func didDeniedPermission(_ permission: SPPermissions.Permission) { + func didDeniedPermission(_ permission: Permission) { print("Example App: did denied", permission.debugName) } } diff --git a/Example Apps/tvOS Example/Scenes/RootController.swift b/Example Apps/tvOS Example/Scenes/RootController.swift index 7b9911b..6e0427a 100644 --- a/Example Apps/tvOS Example/Scenes/RootController.swift +++ b/Example Apps/tvOS Example/Scenes/RootController.swift @@ -34,7 +34,7 @@ import SPPermissionsSpeechRecognizer import SPPermissionsLocationWhenInUse import SPPermissionsLocationAlways import SPPermissionsMotion -import SPPermissionsMusic +import SPPermissionsMediaLibrary import SPPermissionsBluetooth import SPPermissionsTracking diff --git a/Package.swift b/Package.swift index c6c7eec..a9ce3a4 100644 --- a/Package.swift +++ b/Package.swift @@ -56,8 +56,8 @@ let package = Package( targets: ["MotionPermission"] ), .library( - name: "MusicPermission", - targets: ["MusicPermission"] + name: "MediaLibraryPermission", + targets: ["MediaLibraryPermission"] ), .library( name: "BluetoothPermission", @@ -192,10 +192,10 @@ let package = Package( ] ), .target( - name: "MusicPermission", + name: "MediaLibraryPermission", dependencies: [.target(name: "PermissionsKit")], swiftSettings: [ - .define("PERMISSIONSKIT_MUSIC"), + .define("PERMISSIONSKIT_MEDIALIBRARY"), .define("PERMISSIONSKIT_SPM") ] ), diff --git a/PermissionsKit.podspec b/PermissionsKit.podspec index 00cfda9..f9b57f2 100644 --- a/PermissionsKit.podspec +++ b/PermissionsKit.podspec @@ -124,11 +124,11 @@ Pod::Spec.new do |s| } end - s.subspec 'Music' do |subspec| + s.subspec 'MediaLibrary' do |subspec| subspec.dependency 'PermissionsKit/Core' - subspec.source_files = "Sources/MusicPermission/**/*.swift" + subspec.source_files = "Sources/MediaLibraryPermission/**/*.swift" subspec.pod_target_xcconfig = { - "SWIFT_ACTIVE_COMPILATION_CONDITIONS" => "PERMISSIONSKIT_MUSIC PERMISSIONSKIT_COCOAPODS" + "SWIFT_ACTIVE_COMPILATION_CONDITIONS" => "PERMISSIONSKIT_MEDIALIBRARY PERMISSIONSKIT_COCOAPODS" } end diff --git a/README.md b/README.md index 41e9192..3ada9a1 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,30 @@ # PermissionsKit

- - - + + +

Availalbe three ready-use interface - list, dialog & native. Supports iPad, dark mode and has ready localizations. Also you can check state of permissions, available are `.authorized`, `.denied` & `.notDetermined`.

- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +

### Community @@ -133,7 +133,7 @@ pod 'PermissionsKit/LocationAlwaysPermission', :git => 'https://github.com/sparr pod 'PermissionsKit/MotionPermission', :git => 'https://github.com/sparrowcode/PermissionsKit' ``` ```ruby -pod 'PermissionsKit/MusicPermission', :git => 'https://github.com/sparrowcode/PermissionsKit' +pod 'PermissionsKit/MediaLibraryPermission', :git => 'https://github.com/sparrowcode/PermissionsKit' ``` ```ruby pod 'PermissionsKit/BluetoothPermission', :git => 'https://github.com/sparrowcode/PermissionsKit' @@ -427,4 +427,4 @@ controller.showCloseButton = true controller.allowSwipeDismiss = true ``` -Also changed title for button. Instead of `allow` now using `continue`. The Apple Review Team asked for this. For details, check out [this issue](https://github.com/sparrowcode/PermissionsKit/issues/229). \ No newline at end of file +Also changed title for button. Instead of `allow` now using `continue`. The Apple Review Team asked for this. For details, check out [this issue](https://github.com/sparrowcode/PermissionsKit/issues/229). diff --git a/Sources/BluetoothPermission/SPBluetoothHandler.swift b/Sources/BluetoothPermission/BluetoothHandler.swift similarity index 92% rename from Sources/BluetoothPermission/SPBluetoothHandler.swift rename to Sources/BluetoothPermission/BluetoothHandler.swift index e70aa9f..34324cc 100644 --- a/Sources/BluetoothPermission/SPBluetoothHandler.swift +++ b/Sources/BluetoothPermission/BluetoothHandler.swift @@ -19,18 +19,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_BLUETOOTH - +#if PERMISSIONSKIT_BLUETOOTH import Foundation import CoreBluetooth -class SPPermissionBluetoothHandler: NSObject, CBCentralManagerDelegate { +class BluetoothHandler: NSObject, CBCentralManagerDelegate { var completion: ()->Void = {} // MARK: - Init - static let shared: SPPermissionBluetoothHandler = .init() + static let shared: BluetoothHandler = .init() override init() { super.init() @@ -66,5 +65,4 @@ class SPPermissionBluetoothHandler: NSObject, CBCentralManagerDelegate { } } } - #endif diff --git a/Sources/BluetoothPermission/SPBluetoothPermission.swift b/Sources/BluetoothPermission/BluetoothPermission.swift similarity index 82% rename from Sources/BluetoothPermission/SPBluetoothPermission.swift rename to Sources/BluetoothPermission/BluetoothPermission.swift index cf09885..a93b23e 100644 --- a/Sources/BluetoothPermission/SPBluetoothPermission.swift +++ b/Sources/BluetoothPermission/BluetoothPermission.swift @@ -19,28 +19,28 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if SPPERMISSIONS_BLUETOOTH - +#if PERMISSIONSKIT_BLUETOOTH import Foundation import CoreBluetooth +import CloudKit -public extension SPPermissions.Permission { - - static var bluetooth: SPBluetoothPermission { - return SPBluetoothPermission() +public extension Permission { + + static var bluetooth: BluetoothPermission { + return BluetoothPermission() } } -public class SPBluetoothPermission: SPPermissions.Permission { +public class BluetoothPermission: Permission { - open override var type: SPPermissions.PermissionType { .bluetooth } + open override var kind: Permission.Kind { .bluetooth } open var usageDescriptionKey: String? { "NSBluetoothAlwaysUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { if #available(iOS 13.1, tvOS 13.1, *) { switch CBCentralManager.authorization { case .allowedAlways: return .authorized @@ -69,10 +69,9 @@ public class SPBluetoothPermission: SPPermissions.Permission { } public override func request(completion: @escaping () -> Void) { - SPPermissionBluetoothHandler.shared.completion = completion - SPPermissionBluetoothHandler.shared.reqeustUpdate() + BluetoothHandler.shared.completion = completion + BluetoothHandler.shared.reqeustUpdate() } } - #endif diff --git a/Sources/CalendarPermission/SPCalendarPermission.swift b/Sources/CalendarPermission/CalendarPermission.swift similarity index 82% rename from Sources/CalendarPermission/SPCalendarPermission.swift rename to Sources/CalendarPermission/CalendarPermission.swift index fd2c1c3..9ab448b 100644 --- a/Sources/CalendarPermission/SPCalendarPermission.swift +++ b/Sources/CalendarPermission/CalendarPermission.swift @@ -19,28 +19,27 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_CALENDAR - +#if os(iOS) && PERMISSIONSKIT_CALENDAR import Foundation import EventKit -public extension SPPermissions.Permission { +public extension Permission { - static var calendar: SPCalendarPermission { - return SPCalendarPermission() + static var calendar: CalendarPermission { + return CalendarPermission() } } -public class SPCalendarPermission: SPPermissions.Permission { +public class CalendarPermission: Permission { - open override var type: SPPermissions.PermissionType { .calendar } + open override var kind: Permission.Kind { .calendar } open var usageDescriptionKey: String? { "NSCalendarsUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch EKEventStore.authorizationStatus(for: EKEntityType.event) { case .authorized: return .authorized case .denied: return .denied @@ -60,5 +59,4 @@ public class SPCalendarPermission: SPPermissions.Permission { }) } } - #endif diff --git a/Sources/CameraPermission/SPCameraPermission.swift b/Sources/CameraPermission/CameraPermission.swift similarity index 83% rename from Sources/CameraPermission/SPCameraPermission.swift rename to Sources/CameraPermission/CameraPermission.swift index 9850bce..fee767c 100644 --- a/Sources/CameraPermission/SPCameraPermission.swift +++ b/Sources/CameraPermission/CameraPermission.swift @@ -19,30 +19,29 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_CAMERA - +#if os(iOS) && PERMISSIONSKIT_CAMERA import Foundation import AVFoundation @available(iOS 11.0, macCatalyst 14.0, *) -public extension SPPermissions.Permission { +public extension Permission { - static var camera: SPCameraPermission { - return SPCameraPermission() + static var camera: CameraPermission { + return CameraPermission() } } @available(iOS 11.0, macCatalyst 14.0, *) -public class SPCameraPermission: SPPermissions.Permission { +public class CameraPermission: Permission { - open override var type: SPPermissions.PermissionType { .camera } + open override var kind: Permission.Kind { .camera } open var usageDescriptionKey: String? { "NSCameraUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch AVCaptureDevice.authorizationStatus(for: AVMediaType.video) { case .authorized: return .authorized case .denied: return .denied @@ -61,5 +60,4 @@ public class SPCameraPermission: SPPermissions.Permission { }) } } - #endif diff --git a/Sources/ContactsPermission/SPContactsPermission.swift b/Sources/ContactsPermission/ContactsPermission.swift similarity index 82% rename from Sources/ContactsPermission/SPContactsPermission.swift rename to Sources/ContactsPermission/ContactsPermission.swift index 06a36ea..da9bf05 100644 --- a/Sources/ContactsPermission/SPContactsPermission.swift +++ b/Sources/ContactsPermission/ContactsPermission.swift @@ -19,28 +19,27 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_CONTACTS - +#if os(iOS) && PERMISSIONSKIT_CONTACTS import Foundation import Contacts -public extension SPPermissions.Permission { +public extension Permission { - static var contacts: SPContactsPermission { - return SPContactsPermission() + static var contacts: ContactsPermission { + return ContactsPermission() } } -public class SPContactsPermission: SPPermissions.Permission { +public class ContactsPermission: Permission { - open override var type: SPPermissions.PermissionType { .contacts } + open override var kind: Permission.Kind { .contacts } open var usageDescriptionKey: String? { "NSContactsUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch CNContactStore.authorizationStatus(for: .contacts) { case .authorized: return .authorized case .denied: return .denied @@ -59,5 +58,4 @@ public class SPContactsPermission: SPPermissions.Permission { }) } } - #endif diff --git a/Sources/FaceIDPermission/SPFaceIDPermission.swift b/Sources/FaceIDPermission/FaceIDPermission.swift similarity index 72% rename from Sources/FaceIDPermission/SPFaceIDPermission.swift rename to Sources/FaceIDPermission/FaceIDPermission.swift index e3ce7a3..a578c58 100644 --- a/Sources/FaceIDPermission/SPFaceIDPermission.swift +++ b/Sources/FaceIDPermission/FaceIDPermission.swift @@ -19,30 +19,29 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_FACEID - +#if os(iOS) && PERMISSIONSKIT_FACEID import Foundation import LocalAuthentication -public extension SPPermissions.Permission { - - static var faceID: SPFaceIDPermission { - return SPFaceIDPermission() +public extension Permission { + + static var faceID: FaceIDPermission { + return FaceIDPermission() } } -public class SPFaceIDPermission: SPPermissions.Permission { +public class FaceIDPermission: Permission { - open override var type: SPPermissions.PermissionType { .faceID } + open override var kind: Permission.Kind { .faceID } open var usageDescriptionKey: String? { "NSFaceIDUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { let context = LAContext() - + var error: NSError? let isReady = context.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: &error) @@ -51,14 +50,14 @@ public class SPFaceIDPermission: SPPermissions.Permission { } switch error?.code { - case nil where isReady: - return .notDetermined - case LAError.biometryNotAvailable.rawValue: - return .denied - case LAError.biometryNotEnrolled.rawValue: - return .notSupported - default: - return .notSupported + case nil where isReady: + return .notDetermined + case LAError.biometryNotAvailable.rawValue: + return .denied + case LAError.biometryNotEnrolled.rawValue: + return .notSupported + default: + return .notSupported } } @@ -70,5 +69,4 @@ public class SPFaceIDPermission: SPPermissions.Permission { } } } - #endif diff --git a/Sources/HealthPermission/SPHealthPermission.swift b/Sources/HealthPermission/HealthPermission.swift similarity index 83% rename from Sources/HealthPermission/SPHealthPermission.swift rename to Sources/HealthPermission/HealthPermission.swift index 182a15a..86db143 100644 --- a/Sources/HealthPermission/SPHealthPermission.swift +++ b/Sources/HealthPermission/HealthPermission.swift @@ -19,30 +19,29 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_HEALTH - +#if os(iOS) && PERMISSIONSKIT_HEALTH import Foundation import HealthKit -public extension SPPermissions.Permission { +public extension Permission { - static var health: SPHealthPermission { - return SPHealthPermission() + static var health: HealthPermission { + return HealthPermission() } } -public class SPHealthPermission: SPPermissions.Permission { +public class HealthPermission: Permission { - open override var type: SPPermissions.PermissionType { .health } + open override var kind: Permission.Kind { .health } open var readingUsageDescriptionKey: String? { "NSHealthUpdateUsageDescription" } open var writingUsageDescriptionKey: String? { "NSHealthShareUsageDescription" } - public static func status(for type: HKObjectType) -> SPPermissions.PermissionStatus { + public static func status(for type: HKObjectType) -> Permission.Status { switch HKHealthStore().authorizationStatus(for: type) { case .sharingAuthorized: return .authorized case .sharingDenied: return .denied @@ -59,8 +58,6 @@ public class SPHealthPermission: SPPermissions.Permission { } } - - public override var canBePresentWithCustomInterface: Bool { false } // MARK: - Locked @@ -75,10 +72,9 @@ public class SPHealthPermission: SPPermissions.Permission { open override var notDetermined: Bool { fatalError() } @available(*, unavailable) - public override var status: SPPermissions.PermissionStatus { fatalError() } + public override var status: Permission.Status { fatalError() } @available(*, unavailable) open override func request(completion: @escaping ()->Void) { fatalError() } } - #endif diff --git a/Sources/LocationAlwaysPermission/SPLocationAlwaysHandler.swift b/Sources/LocationAlwaysPermission/LocationAlwaysHandler.swift similarity index 90% rename from Sources/LocationAlwaysPermission/SPLocationAlwaysHandler.swift rename to Sources/LocationAlwaysPermission/LocationAlwaysHandler.swift index 7b9b401..7a84725 100644 --- a/Sources/LocationAlwaysPermission/SPLocationAlwaysHandler.swift +++ b/Sources/LocationAlwaysPermission/LocationAlwaysHandler.swift @@ -19,17 +19,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions -import SPPermissionsLocationExtension +#if PERMISSIONSKIT_SPM +import PermissionsKit +import LocationExtension #endif -#if os(iOS) && SPPERMISSIONS_LOCATION_ALWAYS +#if os(iOS) && PERMISSIONSKIT_LOCATION_ALWAYS import Foundation import MapKit -class SPLocationAlwaysHandler: NSObject, CLLocationManagerDelegate { - +class LocationAlwaysHandler: NSObject, CLLocationManagerDelegate { + // MARK: - Location Manager lazy var locationManager = CLLocationManager() @@ -64,7 +64,7 @@ class SPLocationAlwaysHandler: NSObject, CLLocationManagerDelegate { // MARK: - Init - static var shared: SPLocationAlwaysHandler? + static var shared: LocationAlwaysHandler? override init() { super.init() @@ -74,5 +74,4 @@ class SPLocationAlwaysHandler: NSObject, CLLocationManagerDelegate { locationManager.delegate = nil } } - #endif diff --git a/Sources/LocationAlwaysPermission/SPLocationAlwaysPermission.swift b/Sources/LocationAlwaysPermission/LocationAlwaysPermission.swift similarity index 79% rename from Sources/LocationAlwaysPermission/SPLocationAlwaysPermission.swift rename to Sources/LocationAlwaysPermission/LocationAlwaysPermission.swift index 6610c94..90f3be6 100644 --- a/Sources/LocationAlwaysPermission/SPLocationAlwaysPermission.swift +++ b/Sources/LocationAlwaysPermission/LocationAlwaysPermission.swift @@ -19,29 +19,28 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions -import SPPermissionsLocationExtension +#if PERMISSIONSKIT_SPM +import PermissionsKit +import LocationExtension #endif -#if os(iOS) && SPPERMISSIONS_LOCATION_ALWAYS - +#if os(iOS) && PERMISSIONSKIT_LOCATION_ALWAYS import Foundation import MapKit -public extension SPPermissions.Permission { +public extension Permission { - static var locationAlways: SPLocationAlwaysPermission { - return SPLocationAlwaysPermission() + static var locationAlways: LocationAlwaysPermission { + return LocationAlwaysPermission() } } -public class SPLocationAlwaysPermission: SPPermissions.Permission { +public class LocationAlwaysPermission: Permission { - open override var type: SPPermissions.PermissionType { .locationAlways } + open override var kind: Permission.Kind { .locationAlways } open var usageDescriptionKey: String? { "NSLocationAlwaysAndWhenInUseUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { let authorizationStatus: CLAuthorizationStatus = { let locationManager = CLLocationManager() if #available(iOS 14.0, tvOS 14.0, *) { @@ -78,14 +77,13 @@ public class SPLocationAlwaysPermission: SPPermissions.Permission { } public override func request(completion: @escaping () -> Void) { - SPLocationAlwaysHandler.shared = SPLocationAlwaysHandler() - SPLocationAlwaysHandler.shared?.requestPermission() { + LocationAlwaysHandler.shared = LocationAlwaysHandler() + LocationAlwaysHandler.shared?.requestPermission() { DispatchQueue.main.async { completion() - SPLocationAlwaysHandler.shared = nil + LocationAlwaysHandler.shared = nil } } } } - #endif diff --git a/Sources/LocationExtension/SPLocationAccuracy.swift b/Sources/LocationExtension/LocationAccuracy.swift similarity index 96% rename from Sources/LocationExtension/SPLocationAccuracy.swift rename to Sources/LocationExtension/LocationAccuracy.swift index 51e8ee2..fc0db44 100644 --- a/Sources/LocationExtension/SPLocationAccuracy.swift +++ b/Sources/LocationExtension/LocationAccuracy.swift @@ -24,12 +24,12 @@ import MapKit extension CLLocationManager { - open func setAccuracy(_ value: SPLocationAccuracy) { + open func setAccuracy(_ value: LocationAccuracy) { desiredAccuracy = value.coreLocationAccuracy } } -public enum SPLocationAccuracy { +public enum LocationAccuracy { case best case bestForNavigation diff --git a/Sources/LocationWhenInUsePermission/SPPermissionWhenInUseLocationHandler.swift b/Sources/LocationWhenInUsePermission/LocationWhenInUseHandler.swift similarity index 90% rename from Sources/LocationWhenInUsePermission/SPPermissionWhenInUseLocationHandler.swift rename to Sources/LocationWhenInUsePermission/LocationWhenInUseHandler.swift index 197c783..095b432 100644 --- a/Sources/LocationWhenInUsePermission/SPPermissionWhenInUseLocationHandler.swift +++ b/Sources/LocationWhenInUsePermission/LocationWhenInUseHandler.swift @@ -19,17 +19,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions -import SPPermissionsLocationExtension +#if PERMISSIONSKIT_SPM +import PermissionsKit +import LocationExtension #endif -#if SPPERMISSIONS_LOCATION_WHENINUSE +#if PERMISSIONSKIT_LOCATION_WHENINUSE import Foundation import MapKit -class SPLocationWhenInUseHandler: NSObject, CLLocationManagerDelegate { - +class LocationWhenInUseHandler: NSObject, CLLocationManagerDelegate { + // MARK: - Location Manager lazy var locationManager = CLLocationManager() @@ -63,7 +63,7 @@ class SPLocationWhenInUseHandler: NSObject, CLLocationManagerDelegate { // MARK: - Init - static var shared: SPLocationWhenInUseHandler? + static var shared: LocationWhenInUseHandler? override init() { super.init() @@ -73,5 +73,4 @@ class SPLocationWhenInUseHandler: NSObject, CLLocationManagerDelegate { locationManager.delegate = nil } } - #endif diff --git a/Sources/LocationWhenInUsePermission/SPLocationWhenInUsePermission.swift b/Sources/LocationWhenInUsePermission/LocationWhenInUsePermission.swift similarity index 79% rename from Sources/LocationWhenInUsePermission/SPLocationWhenInUsePermission.swift rename to Sources/LocationWhenInUsePermission/LocationWhenInUsePermission.swift index 7ae66fd..dc981a5 100644 --- a/Sources/LocationWhenInUsePermission/SPLocationWhenInUsePermission.swift +++ b/Sources/LocationWhenInUsePermission/LocationWhenInUsePermission.swift @@ -19,28 +19,28 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions -import SPPermissionsLocationExtension +#if PERMISSIONSKIT_SPM +import PermissionsKit +import LocationExtension #endif -#if SPPERMISSIONS_LOCATION_WHENINUSE +#if PERMISSIONSKIT_LOCATION_WHENINUSE import Foundation import MapKit -public extension SPPermissions.Permission { +public extension Permission { - static var locationWhenInUse: SPLocationWhenInUsePermission { - return SPLocationWhenInUsePermission() + static var locationWhenInUse: LocationWhenInUsePermission { + return LocationWhenInUsePermission() } } -public class SPLocationWhenInUsePermission: SPPermissions.Permission { +public class LocationWhenInUsePermission: Permission { - open override var type: SPPermissions.PermissionType { .locationWhenInUse } + open override var kind: Permission.Kind { .locationWhenInUse } open var usageDescriptionKey: String? { "NSLocationAlwaysAndWhenInUseUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { let authorizationStatus: CLAuthorizationStatus = { let locationManager = CLLocationManager() if #available(iOS 14.0, tvOS 14.0, *) { @@ -77,14 +77,13 @@ public class SPLocationWhenInUsePermission: SPPermissions.Permission { } public override func request(completion: @escaping () -> Void) { - SPLocationWhenInUseHandler.shared = SPLocationWhenInUseHandler() - SPLocationWhenInUseHandler.shared?.requestPermission() { + LocationWhenInUseHandler.shared = LocationWhenInUseHandler() + LocationWhenInUseHandler.shared?.requestPermission() { DispatchQueue.main.async { completion() - SPLocationWhenInUseHandler.shared = nil + LocationWhenInUseHandler.shared = nil } } } } - #endif diff --git a/Sources/MusicPermission/SPMediaLibraryPermission.swift b/Sources/MediaLibraryPermission/MediaLibraryPermission.swift similarity index 80% rename from Sources/MusicPermission/SPMediaLibraryPermission.swift rename to Sources/MediaLibraryPermission/MediaLibraryPermission.swift index 5f4749c..8b227ea 100644 --- a/Sources/MusicPermission/SPMediaLibraryPermission.swift +++ b/Sources/MediaLibraryPermission/MediaLibraryPermission.swift @@ -19,28 +19,27 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_MUSIC - +#if os(iOS) && PERMISSIONSKIT_MEDIALIBRARY import Foundation import MediaPlayer -public extension SPPermissions.Permission { - - static var mediaLibrary: SPMediaLibraryPermission { - return SPMediaLibraryPermission() +public extension Permission { + + static var mediaLibrary: MediaLibraryPermission { + return MediaLibraryPermission() } } -public class SPMediaLibraryPermission: SPPermissions.Permission { +public class MediaLibraryPermission: Permission { - open override var type: SPPermissions.PermissionType { .mediaLibrary } + open override var kind: Permission.Kind { .mediaLibrary } open var usageDescriptionKey: String? { "NSAppleMusicUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch MPMediaLibrary.authorizationStatus() { case .authorized: return .authorized case .denied: return .denied @@ -58,5 +57,4 @@ public class SPMediaLibraryPermission: SPPermissions.Permission { } } } - #endif diff --git a/Sources/MicrophonePermission/SPMicrophonePermission.swift b/Sources/MicrophonePermission/MicrophonePermission.swift similarity index 81% rename from Sources/MicrophonePermission/SPMicrophonePermission.swift rename to Sources/MicrophonePermission/MicrophonePermission.swift index a1201d4..80a4d13 100644 --- a/Sources/MicrophonePermission/SPMicrophonePermission.swift +++ b/Sources/MicrophonePermission/MicrophonePermission.swift @@ -19,28 +19,27 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_MICROPHONE - +#if os(iOS) && PERMISSIONSKIT_MICROPHONE import Foundation import AVFoundation -public extension SPPermissions.Permission { - - static var microphone: SPMicrophonePermission { - return SPMicrophonePermission() +public extension Permission { + + static var microphone: MicrophonePermission { + return MicrophonePermission() } } -public class SPMicrophonePermission: SPPermissions.Permission { +public class MicrophonePermission: Permission { - open override var type: SPPermissions.PermissionType { .microphone } + open override var kind: Permission.Kind { .microphone } open var usageDescriptionKey: String? { "NSMicrophoneUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch AVAudioSession.sharedInstance().recordPermission { case .granted: return .authorized case .denied: return .denied @@ -58,5 +57,4 @@ public class SPMicrophonePermission: SPPermissions.Permission { } } } - #endif diff --git a/Sources/MotionPermission/SPMotionPermission.swift b/Sources/MotionPermission/MotionPermission.swift similarity index 83% rename from Sources/MotionPermission/SPMotionPermission.swift rename to Sources/MotionPermission/MotionPermission.swift index 34019dd..890ac4b 100644 --- a/Sources/MotionPermission/SPMotionPermission.swift +++ b/Sources/MotionPermission/MotionPermission.swift @@ -19,28 +19,27 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_MOTION - +#if os(iOS) && PERMISSIONSKIT_MOTION import Foundation import CoreMotion -public extension SPPermissions.Permission { - - static var motion: SPMotionPermission { - return SPMotionPermission() +public extension Permission { + + static var motion: MotionPermission { + return MotionPermission() } } -public class SPMotionPermission: SPPermissions.Permission { +public class MotionPermission: Permission { - open override var type: SPPermissions.PermissionType { .motion } + open override var kind: Permission.Kind { .motion } open var usageDescriptionKey: String? { "NSMotionUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch CMMotionActivityManager.authorizationStatus() { case .authorized: return .authorized case .denied: return .denied @@ -60,5 +59,4 @@ public class SPMotionPermission: SPPermissions.Permission { }) } } - #endif diff --git a/Sources/NotificationPermission/SPNotificationPermission.swift b/Sources/NotificationPermission/NotificationPermission.swift similarity index 85% rename from Sources/NotificationPermission/SPNotificationPermission.swift rename to Sources/NotificationPermission/NotificationPermission.swift index f048061..290af72 100644 --- a/Sources/NotificationPermission/SPNotificationPermission.swift +++ b/Sources/NotificationPermission/NotificationPermission.swift @@ -19,26 +19,25 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if SPPERMISSIONS_NOTIFICATION - +#if PERMISSIONSKIT_NOTIFICATION import UserNotifications -public extension SPPermissions.Permission { - - static var notification: SPNotificationPermission { - return SPNotificationPermission() +public extension Permission { + + static var notification: NotificationPermission { + return NotificationPermission() } } -public class SPNotificationPermission: SPPermissions.Permission { +public class NotificationPermission: Permission { - open override var type: SPPermissions.PermissionType { .notification } + open override var kind: Permission.Kind { .notification } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { guard let authorizationStatus = fetchAuthorizationStatus() else { return .notDetermined } switch authorizationStatus { case .authorized: return .authorized @@ -72,5 +71,4 @@ public class SPNotificationPermission: SPPermissions.Permission { } } } - #endif diff --git a/Sources/PermissionsKit/Data/Images.swift b/Sources/PermissionsKit/Data/Images.swift index d132748..b65f3fe 100644 --- a/Sources/PermissionsKit/Data/Images.swift +++ b/Sources/PermissionsKit/Data/Images.swift @@ -23,8 +23,8 @@ import UIKit enum Images { - static func permission_icon(for permission: SPPermissions.PermissionType) -> UIImage { - switch permission { + static func permission_icon(for kind: Permission.Kind) -> UIImage { + switch kind { case .camera: return UIImage.init(named: "Camera", in: bundle, compatibleWith: nil) ?? UIImage() case .photoLibrary: @@ -72,13 +72,13 @@ enum Images { // If installed via SPM, will be available bundle .module. - #if SPPERMISSIONS_SPM + #if PERMISSIONSKIT_SPM return .module #else // If installed via Cocoapods, should use bundle from podspec. - let path = Bundle(for: SPPermissions.Permission.self).path(forResource: "SPPermissions", ofType: "bundle") ?? "" + let path = Bundle(for: Permission.self).path(forResource: "PermissionsKit", ofType: "bundle") ?? "" let bundle = Bundle(path: path) ?? Bundle.main return bundle #endif diff --git a/Sources/PermissionsKit/Data/Text.swift b/Sources/PermissionsKit/Data/Text.swift index 198ea6c..58c7fd3 100644 --- a/Sources/PermissionsKit/Data/Text.swift +++ b/Sources/PermissionsKit/Data/Text.swift @@ -23,8 +23,8 @@ import UIKit enum Texts { - static func permission_name(_ permission: SPPermissions.PermissionType) -> String { - switch permission { + static func permission_name(for kind: Permission.Kind) -> String { + switch kind { case .camera: return NSLocalizedString("permission camera name", bundle: bundle, comment: "") case .photoLibrary: @@ -62,8 +62,8 @@ enum Texts { } } - static func permission_description(_ permission: SPPermissions.PermissionType) -> String { - switch permission { + static func permission_description(for kind: Permission.Kind) -> String { + switch kind { case .camera: return NSLocalizedString("permission camera description", bundle: bundle, comment: "") case .photoLibrary: @@ -127,13 +127,13 @@ enum Texts { // If installed via SPM, will be available bundle .module. - #if SPPERMISSIONS_SPM + #if PERMISSIONSKIT_SPM return .module #else // If installed via Cocoapods, should use bundle from podspec. - let path = Bundle(for: SPPermissions.Permission.self).path(forResource: "SPPermissions", ofType: "bundle") ?? "" + let path = Bundle(for: Permission.self).path(forResource: "PermissionsKit", ofType: "bundle") ?? "" let bundle = Bundle(path: path) ?? Bundle.main return bundle #endif diff --git a/Sources/PermissionsKit/Depricated.swift b/Sources/PermissionsKit/Depricated.swift index ac1a19a..52a879f 100644 --- a/Sources/PermissionsKit/Depricated.swift +++ b/Sources/PermissionsKit/Depricated.swift @@ -21,8 +21,14 @@ import Foundation -@available(*, deprecated, renamed: "SPPermissions.Permission") -public enum SPPermission {} +@available(*, deprecated, renamed: "Permission") +public enum SPPermission { + + @available(*, deprecated, renamed: "Permission") + enum Permission { + + } +} @available(*, deprecated, renamed: "SPPermissionsTableViewCell") public class SPPermissionTableViewCell {} diff --git a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogCloseButton.swift b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogCloseButton.swift index 8744d13..2372be1 100644 --- a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogCloseButton.swift +++ b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogCloseButton.swift @@ -60,5 +60,4 @@ class SPPermissionsDialogCloseButton: UIButton { } } } - #endif diff --git a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogController.swift b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogController.swift index 4e54083..3e78900 100644 --- a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogController.swift +++ b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogController.swift @@ -62,11 +62,11 @@ public class SPPermissionsDialogController: UIViewController, SPPermissionsContr private let dialogView = SPPermissionsDialogView() private let backgroundView = SPPermissionsDialogGradeBlurView() - private var permissions: [SPPermissions.Permission] + private var permissions: [Permission] // MARK: - Init - init(_ permissions: [SPPermissions.Permission]) { + init(_ permissions: [Permission]) { self.permissions = permissions super.init(nibName: nil, bundle: nil) } @@ -195,9 +195,9 @@ public class SPPermissionsDialogController: UIViewController, SPPermissionsContr // Update `.locationWhenInUse` if allowed `.locationAlwaysAndWhenInUse` - if permission.type == .locationAlways { - if self.permissions.contains(where: { $0.type == .locationWhenInUse }) { - if let index = self.permissions.firstIndex(where: { $0.type == .locationWhenInUse }) { + if permission.kind == .locationAlways { + if self.permissions.contains(where: { $0.kind == .locationWhenInUse }) { + if let index = self.permissions.firstIndex(where: { $0.kind == .locationWhenInUse }) { if let cell = self.dialogView.tableView.cellForRow(at: IndexPath(row: index, section: 0)) as? SPPermissionsTableViewCell { cell.updateInterface(animated: true) } @@ -350,5 +350,4 @@ extension SPPermissionsDialogController: UITableViewDataSource, UITableViewDeleg return view } } - #endif diff --git a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogGradeBlurView.swift b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogGradeBlurView.swift index 03e600c..4df3154 100644 --- a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogGradeBlurView.swift +++ b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogGradeBlurView.swift @@ -115,5 +115,4 @@ public class SPPermissionsBlurView: UIVisualEffectView { } } } - #endif diff --git a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogTableFooterView.swift b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogTableFooterView.swift index e53127c..85e73b4 100644 --- a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogTableFooterView.swift +++ b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogTableFooterView.swift @@ -49,5 +49,4 @@ class SPPermissionsDialogTableFooterView: UITableViewHeaderFooterView { fatalError("init(coder:) has not been implemented") } } - #endif diff --git a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogView.swift b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogView.swift index 9694a46..3d22a99 100644 --- a/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogView.swift +++ b/Sources/PermissionsKit/Interface/Dialog/SPPermissionsDialogView.swift @@ -114,5 +114,4 @@ class SPPermissionsDialogView: UIView { } } } - #endif diff --git a/Sources/PermissionsKit/Interface/List/SPPermissionsList.swift b/Sources/PermissionsKit/Interface/List/SPPermissionsList.swift index 570e7e6..6cfd352 100644 --- a/Sources/PermissionsKit/Interface/List/SPPermissionsList.swift +++ b/Sources/PermissionsKit/Interface/List/SPPermissionsList.swift @@ -30,9 +30,9 @@ public struct SPPermissionsList: UIViewControllerRepresentable { private weak var dataSource: SPPermissionsDataSource? private weak var delegate: SPPermissionsDelegate? - private var permissions: [SPPermissions.Permission] + private var permissions: [Permission] - public init(permissions: [SPPermissions.Permission], dataSource: SPPermissionsDataSource? = nil, delegate: SPPermissionsDelegate? = nil) { + public init(permissions: [Permission], dataSource: SPPermissionsDataSource? = nil, delegate: SPPermissionsDelegate? = nil) { self.permissions = permissions self.dataSource = dataSource self.delegate = delegate @@ -43,13 +43,12 @@ public struct SPPermissionsList: UIViewControllerRepresentable { public typealias UIViewControllerType = UINavigationController public func makeUIViewController(context: Context) -> UINavigationController { - let permissionsController = SPPermissions.list(permissions) - permissionsController.dataSource = self.dataSource - permissionsController.delegate = self.delegate - return UINavigationController(rootViewController: permissionsController) + let controller = SPPermissionsListController(permissions) + controller.dataSource = self.dataSource + controller.delegate = self.delegate + return UINavigationController(rootViewController: controller) } public func updateUIViewController(_ uiViewController: UINavigationController, context: Context) {} } - #endif diff --git a/Sources/PermissionsKit/Interface/List/SPPermissionsListController.swift b/Sources/PermissionsKit/Interface/List/SPPermissionsListController.swift index a9cdbf6..a283b11 100644 --- a/Sources/PermissionsKit/Interface/List/SPPermissionsListController.swift +++ b/Sources/PermissionsKit/Interface/List/SPPermissionsListController.swift @@ -54,11 +54,11 @@ public class SPPermissionsListController: UITableViewController, SPPermissionsCo public var footerText = Texts.comment public var prefersLargeTitles = true - private var permissions: [SPPermissions.Permission] + private var permissions: [Permission] // MARK: - Init - init(_ permissions: [SPPermissions.Permission]) { + init(_ permissions: [Permission]) { self.permissions = permissions if #available(iOS 13.0, *) { super.init(style: .insetGrouped) @@ -136,9 +136,9 @@ public class SPPermissionsListController: UITableViewController, SPPermissionsCo // Update `.locationWhenInUse` if allowed `.locationAlwaysAndWhenInUse` - if permission.type == .locationAlways { - if self.permissions.contains(where: { $0.type == .locationWhenInUse }) { - if let index = self.permissions.firstIndex(where: { $0.type == .locationWhenInUse }) { + if permission.kind == .locationAlways { + if self.permissions.contains(where: { $0.kind == .locationWhenInUse }) { + if let index = self.permissions.firstIndex(where: { $0.kind == .locationWhenInUse }) { if let cell = self.tableView.cellForRow(at: IndexPath(row: index, section: 0)) as? SPPermissionsTableViewCell { cell.updateInterface(animated: true) } @@ -247,5 +247,4 @@ extension SPPermissionsListController: UIAdaptivePresentationControllerDelegate self.processDissmissedEvent() } } - #endif diff --git a/Sources/PermissionsKit/Interface/List/SPPermissionsListFooterCommentView.swift b/Sources/PermissionsKit/Interface/List/SPPermissionsListFooterCommentView.swift index 53baa8d..8b26397 100644 --- a/Sources/PermissionsKit/Interface/List/SPPermissionsListFooterCommentView.swift +++ b/Sources/PermissionsKit/Interface/List/SPPermissionsListFooterCommentView.swift @@ -58,5 +58,4 @@ class SPPermissionsListFooterCommentView: UITableViewHeaderFooterView { fatalError("init(coder:) has not been implemented") } } - #endif diff --git a/Sources/PermissionsKit/Interface/List/SPPermissionsListHeaderView.swift b/Sources/PermissionsKit/Interface/List/SPPermissionsListHeaderView.swift index 9390a61..a5ea964 100644 --- a/Sources/PermissionsKit/Interface/List/SPPermissionsListHeaderView.swift +++ b/Sources/PermissionsKit/Interface/List/SPPermissionsListHeaderView.swift @@ -58,5 +58,4 @@ class SPPermissionsListHeaderView: UITableViewHeaderFooterView { fatalError("init(coder:) has not been implemented") } } - #endif diff --git a/Sources/PermissionsKit/Interface/Native/SPPermissionsNativeController.swift b/Sources/PermissionsKit/Interface/Native/SPPermissionsNativeController.swift index 08afe52..d06053a 100644 --- a/Sources/PermissionsKit/Interface/Native/SPPermissionsNativeController.swift +++ b/Sources/PermissionsKit/Interface/Native/SPPermissionsNativeController.swift @@ -28,13 +28,13 @@ public class SPPermissionsNativeController: NSObject, SPPermissionsControllerInt // MARK: - Data - private var permissions: [SPPermissions.Permission] - private var proceseedPermissions: [SPPermissions.Permission] = [] + private var permissions: [Permission] + private var proceseedPermissions: [Permission] = [] private var memoryLocker: SPPermissionsNativeController? = nil // MARK: - Init - init(_ permissions: [SPPermissions.Permission]) { + init(_ permissions: [Permission]) { self.permissions = permissions super.init() } diff --git a/Sources/PermissionsKit/Interface/Shared/SPPermissionsActionButton.swift b/Sources/PermissionsKit/Interface/Shared/SPPermissionsActionButton.swift index 0a22bf9..cdcbcc2 100644 --- a/Sources/PermissionsKit/Interface/Shared/SPPermissionsActionButton.swift +++ b/Sources/PermissionsKit/Interface/Shared/SPPermissionsActionButton.swift @@ -25,7 +25,7 @@ import UIKit @available(iOSApplicationExtension, unavailable) public class SPPermissionsActionButton: UIButton { - var permission: SPPermissions.Permission? + var permission: Permission? public var allowTitle: String = Texts.allow_permission_action public var allowTitleColor: UIColor = UIColor.tint @@ -87,5 +87,4 @@ public class SPPermissionsActionButton: UIButton { super.setTitle(title?.uppercased(), for: state) } } - #endif diff --git a/Sources/PermissionsKit/Interface/Shared/SPPermissionsDrawIconView.swift b/Sources/PermissionsKit/Interface/Shared/SPPermissionsDrawIconView.swift index 572cef6..1999ca8 100644 --- a/Sources/PermissionsKit/Interface/Shared/SPPermissionsDrawIconView.swift +++ b/Sources/PermissionsKit/Interface/Shared/SPPermissionsDrawIconView.swift @@ -25,7 +25,7 @@ import UIKit @available(iOSApplicationExtension, unavailable) public class SPPermissionsDrawIconView: UIView { - var permission: SPPermissions.Permission? { + var permission: Permission? { didSet { setNeedsDisplay() } @@ -50,7 +50,7 @@ public class SPPermissionsDrawIconView: UIView { override public func draw(_ rect: CGRect) { super.draw(rect) - switch permission?.type { + switch permission?.kind { case .camera: DrawService.drawCamera(frame: rect, resizing: .aspectFit, color: tintColor) case .photoLibrary: @@ -87,5 +87,4 @@ public class SPPermissionsDrawIconView: UIView { } } } - #endif diff --git a/Sources/PermissionsKit/Interface/Shared/SPPermissionsPermissionIconView.swift b/Sources/PermissionsKit/Interface/Shared/SPPermissionsPermissionIconView.swift index eb93da4..e63cad7 100644 --- a/Sources/PermissionsKit/Interface/Shared/SPPermissionsPermissionIconView.swift +++ b/Sources/PermissionsKit/Interface/Shared/SPPermissionsPermissionIconView.swift @@ -67,8 +67,8 @@ public class SPPermissionsPermissionIconView: UIView { - parameter type: Case from `SPPermissions.PermissionType`. */ - public func setPermissionType(_ type: SPPermissions.PermissionType) { - iconImageView.image = Images.permission_icon(for: type) + public func setPermission(_ kind: Permission.Kind) { + iconImageView.image = Images.permission_icon(for: kind) iconImageView.contentMode = .scaleAspectFit iconMaskView.image = Images.app_icon_mask diff --git a/Sources/PermissionsKit/Interface/Shared/SPPermissionsTableViewCell.swift b/Sources/PermissionsKit/Interface/Shared/SPPermissionsTableViewCell.swift index cb4256f..307d060 100644 --- a/Sources/PermissionsKit/Interface/Shared/SPPermissionsTableViewCell.swift +++ b/Sources/PermissionsKit/Interface/Shared/SPPermissionsTableViewCell.swift @@ -127,10 +127,10 @@ public class SPPermissionsTableViewCell: UITableViewCell { // MARK: - Helpers - func defaultConfigure(for permission: SPPermissions.Permission) { + func defaultConfigure(for permission: Permission) { - permissionTitleLabel.text = Texts.permission_name(permission.type) - permissionDescriptionLabel.text = Texts.permission_description(permission.type) + permissionTitleLabel.text = Texts.permission_name(for: permission.kind) + permissionDescriptionLabel.text = Texts.permission_description(for: permission.kind) permissionButton.permission = permission permissionButton.allowTitle = Texts.allow_permission_action @@ -140,7 +140,7 @@ public class SPPermissionsTableViewCell: UITableViewCell { permissionButton.allowedTitleColor = UIColor.white permissionButton.allowedBackgroundColor = UIColor.tint - permissionIconView.setPermissionType(permission.type) + permissionIconView.setPermission(permission.kind) layoutSubviews() } diff --git a/Sources/PermissionsKit/Permission.swift b/Sources/PermissionsKit/Permission.swift new file mode 100644 index 0000000..a131aee --- /dev/null +++ b/Sources/PermissionsKit/Permission.swift @@ -0,0 +1,199 @@ +// The MIT License (MIT) +// Copyright © 2020 Ivan Vorobei (hello@ivanvorobei.io) +// +// 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. + +import UIKit + +/** + SPPermissions: Basic permission model. + + Using like enum for list of permissions. + All permissions will be adding to this class like static. + */ +open class Permission: Equatable { + + open var authorized: Bool { + return status == .authorized + } + + open var denied: Bool { + return status == .denied + } + + open var notDetermined: Bool { + return status == .notDetermined + } + + /** + SPPermissions: Internal name for permissions. + + Don't use it in your interface. Only for console debug. + */ + open var debugName: String { + return kind.name + } + + /** + SPPermissions: Localized name of permission. + + Allowed using in interface. + */ + open var localisedName: String { + return Texts.permission_name(for: kind) + } + + /** + SPPermissions: Icon of permission. + */ + open var iconImage: UIImage { + return Images.permission_icon(for: kind) + } + + /** + SPPermissions: Open settings page. + For most permissions its app page in settings app. + You can overide it if your permission need open custom page. + */ + @available(iOSApplicationExtension, unavailable) + open func openSettingPage() { + DispatchQueue.main.async { + guard let settingsUrl = URL(string: UIApplication.openSettingsURLString) else { return } + if UIApplication.shared.canOpenURL(settingsUrl) { + UIApplication.shared.open(settingsUrl, completionHandler: nil) + } + } + } + + // MARK: Must Ovveride + + /** + SPPermissions: Permission type. + */ + open var kind: Permission.Kind { + preconditionFailure("This method must be overridden.") + } + + /** + SPPermissions: Authorization status of permission. + */ + open var status: Permission.Status { + preconditionFailure("This method must be overridden.") + } + + /** + SPPermissions: Call request of permission in system. + */ + open func request(completion: @escaping ()->Void) { + preconditionFailure("This method must be overridden.") + } + + // MARK: Internal + + public static func == (lhs: Permission, rhs: Permission) -> Bool { + return lhs.kind == rhs.kind + } + + /** + SPPermissions: If flag is `false`, permission will be filtered if try present in ready-use controllers. + */ + open var canBePresentWithCustomInterface: Bool { + return true + } + + public init() {} + + // MARK: - Models + + /** + SPPermissions: Permissions authorization status. + */ + @objc public enum Status: Int { + + case authorized + case denied + case notDetermined + case notSupported + } + + /** + SPPermissions: Permissions type. + + Type using like identifier for each permission. + */ + @objc public enum Kind: Int { + + case camera = 0 + case notification = 2 + case photoLibrary = 1 + case microphone = 3 + case calendar = 4 + case contacts = 5 + case reminders = 6 + case speech = 7 + case locationWhenInUse = 9 + case locationAlways = 10 + case motion = 11 + case mediaLibrary = 12 + case bluetooth = 13 + case tracking = 14 + case faceID = 15 + case siri = 16 + case health = 17 + + public var name: String { + switch self { + case .camera: + return "Camera" + case .photoLibrary: + return "Photo Library" + case .microphone: + return "Microphone" + case .calendar: + return "Calendar" + case .contacts: + return "Contacts" + case .reminders: + return "Reminders" + case .speech: + return "Speech" + case .locationAlways: + return "Location Always" + case .motion: + return "Motion" + case .mediaLibrary: + return "Media Library" + case .bluetooth: + return "Bluetooth" + case .notification: + return "Notification" + case .locationWhenInUse: + return "Location When Use" + case .tracking: + return "Tracking" + case .faceID: + return "FaceID" + case .siri: + return "Siri" + case .health: + return "Health" + } + } + } +} diff --git a/Sources/PermissionsKit/Protocols/SPPermissionsDataSource.swift b/Sources/PermissionsKit/Protocols/SPPermissionsDataSource.swift index a76fe60..6b67152 100644 --- a/Sources/PermissionsKit/Protocols/SPPermissionsDataSource.swift +++ b/Sources/PermissionsKit/Protocols/SPPermissionsDataSource.swift @@ -34,7 +34,7 @@ public protocol SPPermissionsDataSource: AnyObject { - parameter cell: Default cell object of class `SPPermissionsTableViewCell`. - parameter permission: For which permissions cell configuring. */ - func configure(_ cell: SPPermissionsTableViewCell, for permission: SPPermissions.Permission) + func configure(_ cell: SPPermissionsTableViewCell, for permission: Permission) #endif /** @@ -43,7 +43,7 @@ public protocol SPPermissionsDataSource: AnyObject { - parameter permission: Text for this permission. */ - func deniedAlertTexts(for permission: SPPermissions.Permission) -> SPPermissionsDeniedAlertTexts? + func deniedAlertTexts(for permission: Permission) -> SPPermissionsDeniedAlertTexts? } // Using like default for allow it like optional. @@ -51,7 +51,7 @@ public protocol SPPermissionsDataSource: AnyObject { public extension SPPermissionsDataSource { #if os(iOS) - func configure(_ cell: SPPermissionsTableViewCell, for permission: SPPermissions.Permission) -> SPPermissionsTableViewCell { return cell } + func configure(_ cell: SPPermissionsTableViewCell, for permission: Permission) -> SPPermissionsTableViewCell { return cell } #endif } diff --git a/Sources/PermissionsKit/Protocols/SPPermissionsDelegate.swift b/Sources/PermissionsKit/Protocols/SPPermissionsDelegate.swift index 930d10c..7b38ecf 100644 --- a/Sources/PermissionsKit/Protocols/SPPermissionsDelegate.swift +++ b/Sources/PermissionsKit/Protocols/SPPermissionsDelegate.swift @@ -32,30 +32,30 @@ public protocol SPPermissionsDelegate: AnyObject { - parameter permission: For which permission action invocation. */ - func didAllowPermission(_ permission: SPPermissions.Permission) + func didAllowPermission(_ permission: Permission) /** SPPermissions: Called when permission denied. - parameter permission: For which permission action invocation. */ - func didDeniedPermission(_ permission: SPPermissions.Permission) + func didDeniedPermission(_ permission: Permission) /** SPPermissions: Called when permission hided. - parameter permission: For which permission action invocation. */ - func didHidePermissions(_ permissions: [SPPermissions.Permission]) + func didHidePermissions(_ permissions: [Permission]) } // Using like default for allow it like optional. @available(iOSApplicationExtension, unavailable) public extension SPPermissionsDelegate { - func didAllowPermission(_ permission: SPPermissions.Permission) {} + func didAllowPermission(_ permission: Permission) {} - func didDeniedPermission(_ permission: SPPermissions.Permission) {} + func didDeniedPermission(_ permission: Permission) {} - func didHidePermissions(_ permissions: [SPPermissions.Permission]) {} + func didHidePermissions(_ permissions: [Permission]) {} } diff --git a/Sources/PermissionsKit/SPPermissions.swift b/Sources/PermissionsKit/SPPermissions.swift deleted file mode 100644 index 18ca6e6..0000000 --- a/Sources/PermissionsKit/SPPermissions.swift +++ /dev/null @@ -1,263 +0,0 @@ -// The MIT License (MIT) -// Copyright © 2020 Ivan Vorobei (hello@ivanvorobei.io) -// -// 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. - -import UIKit - -/** - SPPermissions: Interface for get ready-use present styles and basic services. - */ -public enum SPPermissions { - - // MARK: - Present Styles - - /** - SPPermissions: Request permissions with native style without any special controller. - - - parameter permissions: List if permissions for request, using model `SPPermissions.Permission`. - */ - @available(iOSApplicationExtension, unavailable) - public static func native(_ permissions: [SPPermissions.Permission]) -> SPPermissionsNativeController { - let controller = SPPermissionsNativeController(prepare(permissions)) - return controller - } - - #if os(iOS) - - /** - SPPermissions: Request permissions as list style. - - - parameter permissions: List if permissions for request, using model `SPPermissions.Permission`. - */ - @available(iOSApplicationExtension, unavailable) - public static func list(_ permissions: [SPPermissions.Permission]) -> SPPermissionsListController { - let controller = SPPermissionsListController(prepare(permissions)) - return controller - } - - /** - SPPermissions: Request permissions as dialog style. - - - parameter permissions: List if permissions for request, using model `SPPermissions.Permission`. - */ - @available(iOSApplicationExtension, unavailable) - public static func dialog(_ permissions: [SPPermissions.Permission]) -> SPPermissionsDialogController { - let controller = SPPermissionsDialogController(prepare(permissions)) - return controller - } - - #endif - - // MARK: - Helpers - - static func prepare(_ permissions: [SPPermissions.Permission]) -> [SPPermissions.Permission] { - - for duplicate in permissions.duplicates { - console("Got duplicate permission \(duplicate.debugName), it will be filtered") - } - - for unvailable in permissions.filter({ !$0.canBePresentWithCustomInterface }) { - console("Permission \(unvailable.debugName) can't be present with custom interface. Use `SPPermissions.Permission.NAME.request()` with requerid parametrs. Permission \(unvailable.debugName) will be filtered") - } - - return permissions.removedDuplicates().filter({ $0.canBePresentWithCustomInterface }) - } - - static func console( _ message: String) { - print("SPPermissions: \(message).") - } - - // MARK: - Models - - /** - SPPermissions: Basic permission model. - - Using like enum for list of permissions. - All permissions will be adding to this class like static. - */ - open class Permission: Equatable { - - open var authorized: Bool { - return status == .authorized - } - - open var denied: Bool { - return status == .denied - } - - open var notDetermined: Bool { - return status == .notDetermined - } - - /** - SPPermissions: Internal name for permissions. - - Don't use it in your interface. Only for console debug. - */ - open var debugName: String { - return type.name - } - - /** - SPPermissions: Localized name of permission. - - Allowed using in interface. - */ - open var localisedName: String { - return Texts.permission_name(type) - } - - /** - SPPermissions: Icon of permission. - */ - open var iconImage: UIImage { - return Images.permission_icon(for: type) - } - - /** - SPPermissions: Open settings page. - For most permissions its app page in settings app. - You can overide it if your permission need open custom page. - */ - @available(iOSApplicationExtension, unavailable) - open func openSettingPage() { - DispatchQueue.main.async { - guard let settingsUrl = URL(string: UIApplication.openSettingsURLString) else { return } - if UIApplication.shared.canOpenURL(settingsUrl) { - UIApplication.shared.open(settingsUrl, completionHandler: nil) - } - } - } - - // MARK: Must Ovveride - - /** - SPPermissions: Permission type. - */ - open var type: PermissionType { - preconditionFailure("This method must be overridden.") - } - - /** - SPPermissions: Authorization status of permission. - */ - open var status: PermissionStatus { - preconditionFailure("This method must be overridden.") - } - - /** - SPPermissions: Call request of permission in system. - */ - open func request(completion: @escaping ()->Void) { - preconditionFailure("This method must be overridden.") - } - - // MARK: Internal - - public static func == (lhs: SPPermissions.Permission, rhs: SPPermissions.Permission) -> Bool { - return lhs.type == rhs.type - } - - /** - SPPermissions: If flag is `false`, permission will be filtered if try present in ready-use controllers. - */ - open var canBePresentWithCustomInterface: Bool { - return true - } - - public init() {} - } - - /** - SPPermissions: Permissions authorization status. - */ - @objc public enum PermissionStatus: Int { - - case authorized - case denied - case notDetermined - case notSupported - } - - /** - SPPermissions: Permissions type. - - Type using like identifier for each permission. - */ - @objc public enum PermissionType: Int { - - case camera = 0 - case notification = 2 - case photoLibrary = 1 - case microphone = 3 - case calendar = 4 - case contacts = 5 - case reminders = 6 - case speech = 7 - case locationWhenInUse = 9 - case locationAlways = 10 - case motion = 11 - case mediaLibrary = 12 - case bluetooth = 13 - case tracking = 14 - case faceID = 15 - case siri = 16 - case health = 17 - - public var name: String { - switch self { - case .camera: - return "Camera" - case .photoLibrary: - return "Photo Library" - case .microphone: - return "Microphone" - case .calendar: - return "Calendar" - case .contacts: - return "Contacts" - case .reminders: - return "Reminders" - case .speech: - return "Speech" - case .locationAlways: - return "Location Always" - case .motion: - return "Motion" - case .mediaLibrary: - return "Media Library" - case .bluetooth: - return "Bluetooth" - case .notification: - return "Notification" - case .locationWhenInUse: - return "Location When Use" - case .tracking: - return "Tracking" - case .faceID: - return "FaceID" - case .siri: - return "Siri" - case .health: - return "Health" - } - } - } -} diff --git a/Sources/PermissionsKit/Services/DrawService.swift b/Sources/PermissionsKit/Services/DrawService.swift index 9b2f841..01855cc 100644 --- a/Sources/PermissionsKit/Services/DrawService.swift +++ b/Sources/PermissionsKit/Services/DrawService.swift @@ -830,5 +830,4 @@ enum DrawService { } } } - #endif diff --git a/Sources/PermissionsKit/Services/HapticService.swift b/Sources/PermissionsKit/Services/HapticService.swift index 26ec25c..30b9bfe 100644 --- a/Sources/PermissionsKit/Services/HapticService.swift +++ b/Sources/PermissionsKit/Services/HapticService.swift @@ -62,5 +62,4 @@ enum HapticService { case warning } } - #endif diff --git a/Sources/PermissionsKit/Services/PresenterService.swift b/Sources/PermissionsKit/Services/PresenterService.swift index 88d014e..07f8748 100644 --- a/Sources/PermissionsKit/Services/PresenterService.swift +++ b/Sources/PermissionsKit/Services/PresenterService.swift @@ -24,7 +24,7 @@ import UIKit enum PresenterService { @available(iOSApplicationExtension, unavailable) - static func presentAlertAboutDeniedPermission(_ permission: SPPermissions.Permission, dataSource: SPPermissionsDataSource?, on controller: UIViewController) { + static func presentAlertAboutDeniedPermission(_ permission: Permission, dataSource: SPPermissionsDataSource?, on controller: UIViewController) { let data = dataSource?.deniedAlertTexts(for: permission) diff --git a/Sources/PermissionsKit/TOCLEAN.swift b/Sources/PermissionsKit/TOCLEAN.swift new file mode 100644 index 0000000..a15cabc --- /dev/null +++ b/Sources/PermissionsKit/TOCLEAN.swift @@ -0,0 +1,87 @@ +// The MIT License (MIT) +// Copyright © 2020 Ivan Vorobei (hello@ivanvorobei.io) +// +// 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. + +import UIKit +/* +/** + SPPermissions: Interface for get ready-use present styles and basic services. + */ +public enum SPPermissionsCLEAN { + + // MARK: - Present Styles + + /** + SPPermissions: Request permissions with native style without any special controller. + + - parameter permissions: List if permissions for request, using model `SPPermissions.Permission`. + */ + @available(iOSApplicationExtension, unavailable) + public static func native(_ permissions: [Permission]) -> SPPermissionsNativeController { + let controller = SPPermissionsNativeController(prepare(permissions)) + return controller + } + + #if os(iOS) + + /** + SPPermissions: Request permissions as list style. + + - parameter permissions: List if permissions for request, using model `SPPermissions.Permission`. + */ + @available(iOSApplicationExtension, unavailable) + public static func list(_ permissions: [Permission]) -> SPPermissionsListController { + let controller = SPPermissionsListController(prepare(permissions)) + return controller + } + + /** + SPPermissions: Request permissions as dialog style. + + - parameter permissions: List if permissions for request, using model `SPPermissions.Permission`. + */ + @available(iOSApplicationExtension, unavailable) + public static func dialog(_ permissions: [Permission]) -> SPPermissionsDialogController { + let controller = SPPermissionsDialogController(prepare(permissions)) + return controller + } + + #endif + + // MARK: - Helpers + + static func prepare(_ permissions: [Permission]) -> [Permission] { + + for duplicate in permissions.duplicates { + console("Got duplicate permission \(duplicate.debugName), it will be filtered") + } + + for unvailable in permissions.filter({ !$0.canBePresentWithCustomInterface }) { + console("Permission \(unvailable.debugName) can't be present with custom interface. Use `SPPermissions.Permission.NAME.request()` with requerid parametrs. Permission \(unvailable.debugName) will be filtered") + } + + return permissions.removedDuplicates().filter({ $0.canBePresentWithCustomInterface }) + } + + static func console( _ message: String) { + print("SPPermissions: \(message).") + } +} +*/ diff --git a/Sources/PhotoLibraryPermission/SPPhotoLibraryPermission.swift b/Sources/PhotoLibraryPermission/SPPhotoLibraryPermission.swift index 504a41b..4492ae7 100644 --- a/Sources/PhotoLibraryPermission/SPPhotoLibraryPermission.swift +++ b/Sources/PhotoLibraryPermission/SPPhotoLibraryPermission.swift @@ -19,24 +19,24 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if SPPERMISSIONS_PHOTOLIBRARY +#if PERMISSIONSKIT_PHOTOLIBRARY import Photos -public extension SPPermissions.Permission { +public extension Permission { static var photoLibrary: SPPhotoLibraryPermission { return SPPhotoLibraryPermission() } } -public class SPPhotoLibraryPermission: SPPermissions.Permission { +public class SPPhotoLibraryPermission: Permission { - open override var type: SPPermissions.PermissionType { .photoLibrary } + open override var kind: Permission.Kind { .photoLibrary } open var fullAccessUsageDescriptionKey: String? { "NSPhotoLibraryUsageDescription" @@ -46,7 +46,7 @@ public class SPPhotoLibraryPermission: SPPermissions.Permission { "NSPhotoLibraryAddUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch PHPhotoLibrary.authorizationStatus() { case .authorized: return .authorized case .denied: return .denied @@ -66,6 +66,5 @@ public class SPPhotoLibraryPermission: SPPermissions.Permission { }) } } - #endif diff --git a/Sources/RemindersPermission/SPRemindersPermission.swift b/Sources/RemindersPermission/SPRemindersPermission.swift index 81f62cf..f45807b 100644 --- a/Sources/RemindersPermission/SPRemindersPermission.swift +++ b/Sources/RemindersPermission/SPRemindersPermission.swift @@ -19,28 +19,28 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_REMINDERS +#if os(iOS) && PERMISSIONSKIT_REMINDERS import Foundation import EventKit -public extension SPPermissions.Permission { +public extension Permission { static var reminders: SPRemindersPermission { return SPRemindersPermission() } } -public class SPRemindersPermission: SPPermissions.Permission { +public class SPRemindersPermission: Permission { - open override var type: SPPermissions.PermissionType { .reminders } + open override var kind: Permission.Kind { .reminders } open var usageDescriptionKey: String? { "NSRemindersUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch EKEventStore.authorizationStatus(for: EKEntityType.reminder) { case .authorized: return .authorized case .denied: return .denied @@ -60,5 +60,4 @@ public class SPRemindersPermission: SPPermissions.Permission { }) } } - #endif diff --git a/Sources/SiriPermission/SPSiriPermission.swift b/Sources/SiriPermission/SPSiriPermission.swift index 2f0deee..d4ca329 100644 --- a/Sources/SiriPermission/SPSiriPermission.swift +++ b/Sources/SiriPermission/SPSiriPermission.swift @@ -19,28 +19,28 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_SIRI +#if os(iOS) && PERMISSIONSKIT_SIRI import Foundation import Intents -public extension SPPermissions.Permission { +public extension Permission { static var siri: SPSiriPermission { return SPSiriPermission() } } -public class SPSiriPermission: SPPermissions.Permission { +public class SPSiriPermission: Permission { - open override var type: SPPermissions.PermissionType { .siri } + open override var kind: Permission.Kind { .siri } open var usageDescriptionKey: String? { "NSSiriUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch INPreferences.siriAuthorizationStatus() { case .authorized: return .authorized case .denied: return .denied @@ -58,5 +58,4 @@ public class SPSiriPermission: SPPermissions.Permission { } } } - #endif diff --git a/Sources/SpeechRecognizerPermission/SPSpeechPermission.swift b/Sources/SpeechRecognizerPermission/SPSpeechPermission.swift index 70d152c..2fc73ef 100644 --- a/Sources/SpeechRecognizerPermission/SPSpeechPermission.swift +++ b/Sources/SpeechRecognizerPermission/SPSpeechPermission.swift @@ -19,28 +19,28 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if os(iOS) && SPPERMISSIONS_SPEECH +#if os(iOS) && PERMISSIONSKIT_SPEECH import Foundation import Speech -public extension SPPermissions.Permission { +public extension Permission { static var speech: SPSpeechPermission { return SPSpeechPermission() } } -public class SPSpeechPermission: SPPermissions.Permission { +public class SPSpeechPermission: Permission { - open override var type: SPPermissions.PermissionType { .speech } + open override var kind: Permission.Kind { .speech } open var usageDescriptionKey: String? { "NSSpeechRecognitionUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch SFSpeechRecognizer.authorizationStatus() { case .authorized: return .authorized case .denied: return .denied @@ -58,5 +58,4 @@ public class SPSpeechPermission: SPPermissions.Permission { } } } - #endif diff --git a/Sources/TrackingPermission/SPTrackingPermission.swift b/Sources/TrackingPermission/SPTrackingPermission.swift index 3b4f343..f79d738 100644 --- a/Sources/TrackingPermission/SPTrackingPermission.swift +++ b/Sources/TrackingPermission/SPTrackingPermission.swift @@ -19,16 +19,16 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#if SPPERMISSIONS_SPM -import SPPermissions +#if PERMISSIONSKIT_SPM +import PermissionsKit #endif -#if SPPERMISSIONS_TRACKING +#if PERMISSIONSKIT_TRACKING import AppTrackingTransparency @available(iOS 14.5, tvOS 14.5, *) -public extension SPPermissions.Permission { +public extension Permission { static var tracking: SPTrackingPermission { return SPTrackingPermission() @@ -36,12 +36,12 @@ public extension SPPermissions.Permission { } @available(iOS 14.5, tvOS 14.5, *) -public class SPTrackingPermission: SPPermissions.Permission { +public class SPTrackingPermission: Permission { - open override var type: SPPermissions.PermissionType { .tracking } + open override var kind: Permission.Kind { .tracking } open var usageDescriptionKey: String? { "NSUserTrackingUsageDescription" } - public override var status: SPPermissions.PermissionStatus { + public override var status: Permission.Status { switch ATTrackingManager.trackingAuthorizationStatus { case .authorized: return .authorized case .denied: return .denied @@ -59,5 +59,4 @@ public class SPTrackingPermission: SPPermissions.Permission { } } } - #endif