refine API for Swift

Refine some more APIs for Swift

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.h

@@ -39,15 +39,15 @@ typedef void (^OSNotificationOpenedBlock)(OSNotificationOpenedResult * _Nonnull
  Public API.
  */
 @protocol OSNotifications <NSObject>
-+ (BOOL)permission;
-+ (BOOL)canRequestPermission;
++ (BOOL)permission NS_REFINED_FOR_SWIFT;
++ (BOOL)canRequestPermission NS_REFINED_FOR_SWIFT;
 + (void)setNotificationWillShowInForegroundHandler:(OSNotificationWillShowInForegroundBlock _Nullable)block;
 + (void)setNotificationOpenedHandler:(OSNotificationOpenedBlock _Nullable)block;
 + (void)requestPermission:(OSUserResponseBlock _Nullable )block;
 + (void)requestPermission:(OSUserResponseBlock _Nullable )block fallbackToSettings:(BOOL)fallback;
-+ (void)registerForProvisionalAuthorization:(OSUserResponseBlock _Nullable )block;
-+ (void)addPermissionObserver:(NSObject<OSPermissionObserver>*_Nonnull)observer;
-+ (void)removePermissionObserver:(NSObject<OSPermissionObserver>*_Nonnull)observer;
++ (void)registerForProvisionalAuthorization:(OSUserResponseBlock _Nullable )block NS_REFINED_FOR_SWIFT;
++ (void)addPermissionObserver:(NSObject<OSPermissionObserver>*_Nonnull)observer NS_REFINED_FOR_SWIFT;
++ (void)removePermissionObserver:(NSObject<OSPermissionObserver>*_Nonnull)observer NS_REFINED_FOR_SWIFT;
 + (void)clearAll;
 @end
 

iOS_SDK/OneSignalSDK/OneSignalOutcomes/OneSignalOutcomes.h

@@ -48,7 +48,8 @@
 @protocol OSSession <NSObject>
 + (void)addOutcome:(NSString * _Nonnull)name;
 + (void)addUniqueOutcome:(NSString * _Nonnull)name;
-+ (void)addOutcomeWithValue:(NSString * _Nonnull)name value:(NSNumber * _Nonnull)value;
++ (void)addOutcomeWithValue:(NSString * _Nonnull)name value:(NSNumber * _Nonnull)value NS_REFINED_FOR_SWIFT;
+
 @end
 
 @interface OSOutcomes : NSObject <OSSession>

iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h

@@ -90,24 +90,22 @@ NS_SWIFT_NAME(login(externalId:token:));
 + (Class<OSDebug>)Debug NS_REFINED_FOR_SWIFT;
 
 #pragma mark Privacy Consent
-+ (void)setPrivacyConsent:(BOOL)granted;
-+ (BOOL)getPrivacyConsent;
++ (void)setPrivacyConsent:(BOOL)granted NS_REFINED_FOR_SWIFT;
++ (BOOL)getPrivacyConsent NS_REFINED_FOR_SWIFT;
 /**
  * Tells your application if privacy consent is still needed from the current device.
  * Consent should be provided prior to the invocation of `initialize` to ensure compliance.
  */
-+ (BOOL)requiresPrivacyConsent;
-+ (void)setRequiresPrivacyConsent:(BOOL)required;
-
-#pragma mark Permission, Subscription, and Email Observers
++ (BOOL)requiresPrivacyConsent NS_REFINED_FOR_SWIFT;
++ (void)setRequiresPrivacyConsent:(BOOL)required NS_REFINED_FOR_SWIFT;
 
 #pragma mark In-App Messaging
 + (Class<OSInAppMessages>)InAppMessages NS_REFINED_FOR_SWIFT;
 
 #pragma mark Location
 + (Class<OSLocation>)Location NS_REFINED_FOR_SWIFT;
 
-#pragma mark Outcomes
+#pragma mark Session
 + (Class<OSSession>)Session NS_REFINED_FOR_SWIFT;
 
 #pragma mark Extension

iOS_SDK/OneSignalSDK/Source/OneSignalLocation.h

@@ -45,8 +45,8 @@ typedef struct os_last_location {
 @protocol OSLocation <NSObject>
 // - Request and track user's location
 + (void)requestPermission;
-+ (void)setShared:(BOOL)enable;
-+ (BOOL)isShared;
++ (void)setShared:(BOOL)enable NS_REFINED_FOR_SWIFT;
++ (BOOL)isShared NS_REFINED_FOR_SWIFT;
 @end
 
 @interface OneSignalLocation : NSObject<OSLocation>

iOS_SDK/OneSignalSDK/Source/OneSignalSwiftInterface.swift

@@ -55,4 +55,72 @@ public extension OneSignal {
     static var Location: OSLocation.Type {
         return __location()
     }
+    
+    static var requiresPrivacyConsent: Bool {
+        get {
+            return __requiresPrivacyConsent()
+        }
+        set {
+            __setRequiresPrivacyConsent(newValue)
+        }
+    }
+    
+    static var privacyConsent: Bool {
+        get {
+            return __getPrivacyConsent()
+        }
+        set {
+            __setPrivacyConsent(newValue)
+        }
+    }
+}
+
+public extension OSInAppMessages {
+    static var Paused: Bool {
+        get {
+            return __paused()
+        }
+        set {
+            __paused(newValue)
+        }
+    }
+}
+
+public extension OSSession {
+    static func addOutcome(_ name: String, _ value: NSNumber) {
+        __addOutcome(withValue: name, value: value)
+    }
+}
+
+public extension OSNotifications {
+    static var permission: Bool {
+        return __permission()
+    }
+    
+    static var canRequestPermission: Bool {
+        return __canRequestPermission()
+    }
+
+    static func registerForProvisionalAuthorization(_ block: OSUserResponseBlock?) {
+        return __register(forProvisionalAuthorization: block)
+    }
+    
+    static func addPermissionObserver(_ observer: OSPermissionObserver) {
+        return __add(observer)
+    }
+
+    static func removePermissionObserver(_ observer: OSPermissionObserver) {
+        return __remove(observer)
+    }
+}
+
+public extension OSLocation {
+    static var isShared: Bool {
+        get {
+            return __isShared()
+        }
+        set {
+            __setShared(newValue)
+        }
+    }
 }

iOS_SDK/OneSignalSDK/UnitTests/UserModelSwiftTests.swift

@@ -28,17 +28,6 @@
 import XCTest
 import OneSignalFramework
 
-extension OSInAppMessages {
-    static var Paused: Bool {
-        get {
-            return __paused()
-        }
-        set {
-            __paused(newValue)
-        }
-    }
-}
-
 // Non-class type 'OSPushSubscriptionTestObserver' cannot conform to class protocol 'OSPushSubscriptionObserver'
 // ^ Cannot use a struct for an OSPushSubscriptionObserver