From f40be4586ccc9550717d48fb50986cb938c8aeaa Mon Sep 17 00:00:00 2001 From: damien Date: Sat, 17 Aug 2019 22:03:32 +0200 Subject: [PATCH] Use implicit internal access control --- Source/Permission.swift | 8 ++++---- Source/PermissionAlert.swift | 10 +++++----- Source/PermissionButton.swift | 2 +- Source/PermissionSet.swift | 4 ++-- Source/PermissionStatus.swift | 2 +- Source/PermissionTypes/AddressBook.swift | 2 +- Source/PermissionTypes/Bluetooth.swift | 2 +- Source/PermissionTypes/Camera.swift | 2 +- Source/PermissionTypes/Contacts.swift | 2 +- Source/PermissionTypes/Events.swift | 2 +- Source/PermissionTypes/Location.swift | 2 +- Source/PermissionTypes/LocationAlways.swift | 2 +- Source/PermissionTypes/LocationWhenInUse.swift | 2 +- Source/PermissionTypes/MediaLibrary.swift | 2 +- Source/PermissionTypes/Microphone.swift | 2 +- Source/PermissionTypes/Notifications.swift | 2 +- Source/PermissionTypes/Photos.swift | 2 +- Source/PermissionTypes/Reminders.swift | 2 +- Source/PermissionTypes/Siri.swift | 2 +- Source/PermissionTypes/SpeechRecognizer.swift | 2 +- Source/Supporting Files/Utilities.swift | 8 ++++---- 21 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Source/Permission.swift b/Source/Permission.swift index 3bf4777..b6a7341 100644 --- a/Source/Permission.swift +++ b/Source/Permission.swift @@ -221,9 +221,9 @@ open class Permission: NSObject { return DisabledAlert(permission: self) }() - internal var callback: Callback? + var callback: Callback? - internal var permissionSets: [PermissionSet] = [] + var permissionSets: [PermissionSet] = [] /** Creates and return a new permission for the specified domain. @@ -258,7 +258,7 @@ open class Permission: NSObject { } } - internal func requestAuthorization(_ callback: @escaping Callback) { + func requestAuthorization(_ callback: @escaping Callback) { switch type { #if PERMISSION_CONTACTS case .contacts: requestContacts(callback) @@ -319,7 +319,7 @@ open class Permission: NSObject { } } - internal func callbacks(_ with: PermissionStatus) { + func callbacks(_ with: PermissionStatus) { DispatchQueue.main.async { self.callback?(self.status) self.permissionSets.forEach { $0.didRequestPermission(self) } diff --git a/Source/PermissionAlert.swift b/Source/PermissionAlert.swift index 4fad8d8..4711d61 100644 --- a/Source/PermissionAlert.swift +++ b/Source/PermissionAlert.swift @@ -70,11 +70,11 @@ open class PermissionAlert { return controller } - internal init(permission: Permission) { + init(permission: Permission) { self.permission = permission } - internal func present() { + func present() { DispatchQueue.main.async { UIApplication.shared.presentViewController(self.controller) } @@ -85,7 +85,7 @@ open class PermissionAlert { } } -internal class DisabledAlert: PermissionAlert { +class DisabledAlert: PermissionAlert { override init(permission: Permission) { super.init(permission: permission) @@ -95,7 +95,7 @@ internal class DisabledAlert: PermissionAlert { } } -internal class DeniedAlert: PermissionAlert { +class DeniedAlert: PermissionAlert { override var controller: UIAlertController { let controller = super.controller @@ -132,7 +132,7 @@ internal class DeniedAlert: PermissionAlert { } } -internal class PrePermissionAlert: PermissionAlert { +class PrePermissionAlert: PermissionAlert { override var controller: UIAlertController { let controller = super.controller diff --git a/Source/PermissionButton.swift b/Source/PermissionButton.swift index 3cd33f0..f72f438 100644 --- a/Source/PermissionButton.swift +++ b/Source/PermissionButton.swift @@ -454,7 +454,7 @@ open class PermissionButton: UIButton { } } -internal extension PermissionButton { +extension PermissionButton { @objc func highlight(_ button: PermissionButton) { render(.highlighted) } diff --git a/Source/PermissionSet.swift b/Source/PermissionSet.swift index 11d0312..bf0f32c 100644 --- a/Source/PermissionSet.swift +++ b/Source/PermissionSet.swift @@ -104,11 +104,11 @@ open class PermissionSet { self.permissions.forEach { $0.permissionSets.append(self) } } - internal func willRequestPermission(_ permission: Permission) { + func willRequestPermission(_ permission: Permission) { delegate?.permissionSet(self, willRequestPermission: permission) } - internal func didRequestPermission(_ permission: Permission) { + func didRequestPermission(_ permission: Permission) { delegate?.permissionSet(self, didRequestPermission: permission) } } diff --git a/Source/PermissionStatus.swift b/Source/PermissionStatus.swift index a4c3827..e1d8f75 100644 --- a/Source/PermissionStatus.swift +++ b/Source/PermissionStatus.swift @@ -28,7 +28,7 @@ public enum PermissionStatus: String { case disabled = "Disabled" case notDetermined = "Not Determined" - internal init?(string: String?) { + init?(string: String?) { guard let string = string else { return nil } self.init(rawValue: string) } diff --git a/Source/PermissionTypes/AddressBook.swift b/Source/PermissionTypes/AddressBook.swift index dc5231e..c006625 100644 --- a/Source/PermissionTypes/AddressBook.swift +++ b/Source/PermissionTypes/AddressBook.swift @@ -25,7 +25,7 @@ #if PERMISSION_ADDRESS_BOOK import AddressBook -internal extension Permission { +extension Permission { var statusAddressBook: PermissionStatus { let status = ABAddressBookGetAuthorizationStatus() diff --git a/Source/PermissionTypes/Bluetooth.swift b/Source/PermissionTypes/Bluetooth.swift index eac3c40..7c84bf5 100644 --- a/Source/PermissionTypes/Bluetooth.swift +++ b/Source/PermissionTypes/Bluetooth.swift @@ -25,7 +25,7 @@ #if PERMISSION_BLUETOOTH import CoreBluetooth -internal let BluetoothManager = CBPeripheralManager( +let BluetoothManager = CBPeripheralManager( delegate: Permission.bluetooth, queue: nil, options: [CBPeripheralManagerOptionShowPowerAlertKey: false] diff --git a/Source/PermissionTypes/Camera.swift b/Source/PermissionTypes/Camera.swift index 8b3f111..ee90b88 100644 --- a/Source/PermissionTypes/Camera.swift +++ b/Source/PermissionTypes/Camera.swift @@ -25,7 +25,7 @@ #if PERMISSION_CAMERA import AVFoundation -internal extension Permission { +extension Permission { var statusCamera: PermissionStatus { let status = AVCaptureDevice.authorizationStatus(for: AVMediaType.video) diff --git a/Source/PermissionTypes/Contacts.swift b/Source/PermissionTypes/Contacts.swift index d2b4326..67d0f0b 100644 --- a/Source/PermissionTypes/Contacts.swift +++ b/Source/PermissionTypes/Contacts.swift @@ -25,7 +25,7 @@ #if PERMISSION_CONTACTS import Contacts -internal extension Permission { +extension Permission { var statusContacts: PermissionStatus { guard #available(iOS 9.0, *) else { fatalError() } diff --git a/Source/PermissionTypes/Events.swift b/Source/PermissionTypes/Events.swift index 334685d..31f9a4a 100644 --- a/Source/PermissionTypes/Events.swift +++ b/Source/PermissionTypes/Events.swift @@ -25,7 +25,7 @@ #if PERMISSION_EVENTS import EventKit -internal extension Permission { +extension Permission { var statusEvents: PermissionStatus { let status = EKEventStore.authorizationStatus(for: .event) diff --git a/Source/PermissionTypes/Location.swift b/Source/PermissionTypes/Location.swift index 1f3d6a4..2c1be6c 100644 --- a/Source/PermissionTypes/Location.swift +++ b/Source/PermissionTypes/Location.swift @@ -25,7 +25,7 @@ #if PERMISSION_LOCATION import CoreLocation -internal let LocationManager = CLLocationManager() +let LocationManager = CLLocationManager() private var requestedLocation = false private var triggerCallbacks = false diff --git a/Source/PermissionTypes/LocationAlways.swift b/Source/PermissionTypes/LocationAlways.swift index d4a9fe5..81445fb 100644 --- a/Source/PermissionTypes/LocationAlways.swift +++ b/Source/PermissionTypes/LocationAlways.swift @@ -25,7 +25,7 @@ #if PERMISSION_LOCATION import CoreLocation -internal extension Permission { +extension Permission { var statusLocationAlways: PermissionStatus { guard CLLocationManager.locationServicesEnabled() else { return .disabled } diff --git a/Source/PermissionTypes/LocationWhenInUse.swift b/Source/PermissionTypes/LocationWhenInUse.swift index 570101f..17e8c97 100644 --- a/Source/PermissionTypes/LocationWhenInUse.swift +++ b/Source/PermissionTypes/LocationWhenInUse.swift @@ -25,7 +25,7 @@ #if PERMISSION_LOCATION import CoreLocation -internal extension Permission { +extension Permission { var statusLocationWhenInUse: PermissionStatus { guard CLLocationManager.locationServicesEnabled() else { return .disabled } diff --git a/Source/PermissionTypes/MediaLibrary.swift b/Source/PermissionTypes/MediaLibrary.swift index 1987a18..61ec8ee 100644 --- a/Source/PermissionTypes/MediaLibrary.swift +++ b/Source/PermissionTypes/MediaLibrary.swift @@ -25,7 +25,7 @@ #if PERMISSION_MEDIA_LIBRARY import MediaPlayer -internal extension Permission { +extension Permission { var statusMediaLibrary: PermissionStatus { guard #available(iOS 9.3, *) else { fatalError() } diff --git a/Source/PermissionTypes/Microphone.swift b/Source/PermissionTypes/Microphone.swift index 2e4c956..b793c6f 100644 --- a/Source/PermissionTypes/Microphone.swift +++ b/Source/PermissionTypes/Microphone.swift @@ -25,7 +25,7 @@ #if PERMISSION_MICROPHONE import AVFoundation -internal extension Permission { +extension Permission { var statusMicrophone: PermissionStatus { let status = AVAudioSession.sharedInstance().recordPermission diff --git a/Source/PermissionTypes/Notifications.swift b/Source/PermissionTypes/Notifications.swift index 01c8bb2..1da60fb 100644 --- a/Source/PermissionTypes/Notifications.swift +++ b/Source/PermissionTypes/Notifications.swift @@ -23,7 +23,7 @@ // #if PERMISSION_NOTIFICATIONS -internal extension Permission { +extension Permission { var statusNotifications: PermissionStatus { if UIApplication.shared.currentUserNotificationSettings?.types.isEmpty == false { return .authorized diff --git a/Source/PermissionTypes/Photos.swift b/Source/PermissionTypes/Photos.swift index aab3fab..1a6ac45 100644 --- a/Source/PermissionTypes/Photos.swift +++ b/Source/PermissionTypes/Photos.swift @@ -25,7 +25,7 @@ #if PERMISSION_PHOTOS import Photos -internal extension Permission { +extension Permission { var statusPhotos: PermissionStatus { let status = PHPhotoLibrary.authorizationStatus() diff --git a/Source/PermissionTypes/Reminders.swift b/Source/PermissionTypes/Reminders.swift index b41a892..d1d62d0 100644 --- a/Source/PermissionTypes/Reminders.swift +++ b/Source/PermissionTypes/Reminders.swift @@ -25,7 +25,7 @@ #if PERMISSION_REMINDERS import EventKit -internal extension Permission { +extension Permission { var statusReminders: PermissionStatus { let status = EKEventStore.authorizationStatus(for: .reminder) diff --git a/Source/PermissionTypes/Siri.swift b/Source/PermissionTypes/Siri.swift index 83f2e6f..a576041 100644 --- a/Source/PermissionTypes/Siri.swift +++ b/Source/PermissionTypes/Siri.swift @@ -25,7 +25,7 @@ #if PERMISSION_SIRI import Intents -internal extension Permission { +extension Permission { var statusSiri: PermissionStatus { guard #available(iOS 10.0, *) else { fatalError() } let status = INPreferences.siriAuthorizationStatus() diff --git a/Source/PermissionTypes/SpeechRecognizer.swift b/Source/PermissionTypes/SpeechRecognizer.swift index b1c273e..fc4c829 100644 --- a/Source/PermissionTypes/SpeechRecognizer.swift +++ b/Source/PermissionTypes/SpeechRecognizer.swift @@ -25,7 +25,7 @@ #if PERMISSION_SPEECH_RECOGNIZER import Speech -internal extension Permission { +extension Permission { var statusSpeechRecognizer: PermissionStatus { guard #available(iOS 10.0, *) else { fatalError() } diff --git a/Source/Supporting Files/Utilities.swift b/Source/Supporting Files/Utilities.swift index 2816e64..80c1e0e 100644 --- a/Source/Supporting Files/Utilities.swift +++ b/Source/Supporting Files/Utilities.swift @@ -33,7 +33,7 @@ extension UIApplication { return vc } - internal func presentViewController(_ viewController: UIViewController, animated: Bool = true, completion: (() -> Void)? = nil) { + func presentViewController(_ viewController: UIViewController, animated: Bool = true, completion: (() -> Void)? = nil) { topViewController?.present(viewController, animated: animated, completion: completion) } } @@ -48,7 +48,7 @@ extension UIControl.State: Hashable { public var hashValue: Int { return Int(rawValue) } } -internal extension String { +extension String { static let locationWhenInUseUsageDescription = "NSLocationWhenInUseUsageDescription" static let locationAlwaysUsageDescription = "NSLocationAlwaysUsageDescription" static let microphoneUsageDescription = "NSMicrophoneUsageDescription" @@ -66,7 +66,7 @@ internal extension String { static let stateBluetoothManagerDetermined = "permission.stateBluetoothManagerDetermined" } -internal extension Selector { +extension Selector { static let tapped = #selector(PermissionButton.tapped(_:)) static let highlight = #selector(PermissionButton.highlight(_:)) static let settingsHandler = #selector(DeniedAlert.settingsHandler) @@ -111,7 +111,7 @@ extension OperationQueue { } } -internal extension NotificationCenter { +extension NotificationCenter { func addObserver(_ observer: AnyObject, selector: Selector, name: NSNotification.Name?) { addObserver(observer, selector: selector, name: name!, object: nil) }