Release 2.1.1

Unity-Technologies · Aug 29, 2017 · 8dbbe6a · 8dbbe6a
1 parent def0f30
commit 8dbbe6a
Show file tree

Hide file tree

Showing 43 changed files with 911 additions and 300 deletions.
diff --git a/.slather.yml b/.slather.yml
diff --git a/Modules/module.modulemap b/Modules/module.modulemap
@@ -1,6 +1,7 @@
 framework module UnityAds {
   umbrella header "UnityAds.h"
   header "UnityAdsExtended.h"
+  header "UnityAdsUnityDelegate.h"
 
   export *
   module * { export * }

diff --git a/UnityAds/AdUnit/UADSViewController.h b/UnityAds/AdUnit/UADSViewController.h
@@ -10,8 +10,9 @@
 @property (nonatomic, assign) int supportedOrientations;
 @property (nonatomic, assign) BOOL statusBarHidden;
 @property (nonatomic, assign) BOOL autorotate;
+@property (nonatomic, assign) BOOL transparent;
 
-- (instancetype)initWithViews:(NSArray *)views supportedOrientations:(NSNumber *)supportedOrientations statusBarHidden:(BOOL)statusBarHidden shouldAutorotate:(BOOL)shouldAutorotate;
+- (instancetype)initWithViews:(NSArray *)views supportedOrientations:(NSNumber *)supportedOrientations statusBarHidden:(BOOL)statusBarHidden shouldAutorotate:(BOOL)shouldAutorotate isTransparent:(BOOL)isTransparent;
 - (void)setViews:(NSArray<NSString*>*)views;
 - (void)setTransform:(float)transform;
 - (void)setViewFrame:(NSString *)view x:(int)x y:(int)y width:(int)width height:(int)height;

diff --git a/UnityAds/AdUnit/UADSViewController.m b/UnityAds/AdUnit/UADSViewController.m
@@ -11,10 +11,11 @@ @interface UADSViewController ()
 
 @implementation UADSViewController
 
-- (instancetype)initWithViews:(NSArray *)views supportedOrientations:(NSNumber *)supportedOrientations statusBarHidden:(BOOL)statusBarHidden shouldAutorotate:(BOOL)shouldAutorotate {
+- (instancetype)initWithViews:(NSArray *)views supportedOrientations:(NSNumber *)supportedOrientations statusBarHidden:(BOOL)statusBarHidden shouldAutorotate:(BOOL)shouldAutorotate isTransparent:(BOOL)isTransparent {
     self = [super init];
 
     if (self) {
+        [self setTransparent:isTransparent];
         [self setCurrentViews:views];
         [self setStatusBarHidden:statusBarHidden];
         [self setSupportedOrientations:[supportedOrientations intValue]];
@@ -27,7 +28,7 @@ - (instancetype)initWithViews:(NSArray *)views supportedOrientations:(NSNumber *
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self.view setBackgroundColor:[UIColor blackColor]];
+    [self.view setBackgroundColor:[self isTransparent] ? [UIColor clearColor] : [UIColor blackColor]];
 
     [[UADSWebViewApp getCurrentApp] sendEvent:NSStringFromAdUnitEvent(kUnityAdsViewControllerDidLoad) category:NSStringFromWebViewEventCategory(kUnityAdsWebViewEventCategoryAdunit) param1:nil];
 }
@@ -98,6 +99,10 @@ - (void)setStatusBarHidden:(BOOL)statusBarHidden {
     [self setNeedsStatusBarAppearanceUpdate];
 }
 
+- (void)setTransparent:(BOOL)isTransparent {
+    _transparent = isTransparent;
+}
+
 - (void)setTransform:(float)transform {
     self.view.transform = CGAffineTransformMakeRotation(transform);
 }
@@ -106,6 +111,10 @@ - (BOOL)prefersStatusBarHidden {
     return self.statusBarHidden;
 }
 
+- (BOOL)isTransparent {
+    return _transparent;
+}
+
 - (void)setViews:(NSArray<NSString*>*)views {
     NSMutableArray<NSString*>* actualViews = NULL;
 

diff --git a/UnityAds/Api/UADSApiAdUnit.m b/UnityAds/Api/UADSApiAdUnit.m
@@ -21,18 +21,27 @@ + (void)WebViewExposed_open:(NSArray *)views supportedOrientations:(NSNumber *)s
 }
 
 + (void)WebViewExposed_open:(NSArray *)views supportedOrientations:(NSNumber *)supportedOrientations statusBarHidden:(NSNumber *)statusBarHidden callback:(UADSWebViewCallback *)callback {
-    [UADSApiAdUnit WebViewExposed_open:views supportedOrientations:supportedOrientations statusBarHidden:[NSNumber numberWithInt:0] shouldAutorotate:[NSNumber numberWithBool:YES] callback:callback];
-
-    [callback invoke:nil];
+    [UADSApiAdUnit WebViewExposed_open:views supportedOrientations:supportedOrientations statusBarHidden:statusBarHidden shouldAutorotate:[NSNumber numberWithBool:YES] callback:callback];
 }
 
 + (void)WebViewExposed_open:(NSArray *)views supportedOrientations:(NSNumber *)supportedOrientations statusBarHidden:(NSNumber *)statusBarHidden shouldAutorotate:(NSNumber *)shouldAutorotate callback:(UADSWebViewCallback *)callback {
-
+    [UADSApiAdUnit WebViewExposed_open:views supportedOrientations:supportedOrientations statusBarHidden:statusBarHidden shouldAutorotate:shouldAutorotate isTransparent:[NSNumber numberWithBool:NO] callback:callback];
+}
+
++ (void)WebViewExposed_open:(NSArray *)views supportedOrientations:(NSNumber *)supportedOrientations statusBarHidden:(NSNumber *)statusBarHidden shouldAutorotate:(NSNumber *)shouldAutorotate isTransparent:(NSNumber *)isTransparent callback:(UADSWebViewCallback *)callback {
+    [UADSApiAdUnit WebViewExposed_open:views supportedOrientations:supportedOrientations statusBarHidden:statusBarHidden shouldAutorotate:shouldAutorotate isTransparent:isTransparent withAnimation:[NSNumber numberWithBool:YES] callback:callback];
+}
+
++ (void)WebViewExposed_open:(NSArray *)views supportedOrientations:(NSNumber *)supportedOrientations statusBarHidden:(NSNumber *)statusBarHidden shouldAutorotate:(NSNumber *)shouldAutorotate isTransparent:(NSNumber *)isTransparent withAnimation:(NSNumber *)animated callback:(UADSWebViewCallback *)callback {
     dispatch_async(dispatch_get_main_queue(), ^(void) {
         UADSLogDebug(@"PRESENTING VIEWCONTROLLER");
-        UADSViewController *adUnit = [[UADSViewController alloc] initWithViews:views supportedOrientations:supportedOrientations statusBarHidden:[statusBarHidden boolValue] shouldAutorotate:[shouldAutorotate boolValue]];
+        UADSViewController *adUnit = [[UADSViewController alloc] initWithViews:views supportedOrientations:supportedOrientations statusBarHidden:[statusBarHidden boolValue] shouldAutorotate:[shouldAutorotate boolValue] isTransparent:[isTransparent boolValue]];
         [adUnit setModalPresentationCapturesStatusBarAppearance:true];
-        [[UADSClientProperties getCurrentViewController] presentViewController:adUnit animated:YES completion:NULL];
+        if (floor(NSFoundationVersionNumber) >= NSFoundationVersionNumber_iOS_8_0 && [isTransparent boolValue]) {
+            adUnit.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+            [UADSClientProperties getCurrentViewController].modalPresentationStyle = UIModalPresentationCurrentContext;
+        }
+        [[UADSClientProperties getCurrentViewController] presentViewController:adUnit animated:[animated boolValue] completion:NULL];
         adUnitViewController = adUnit;
     });
 

diff --git a/UnityAds/Api/UADSApiDeviceInfo.h b/UnityAds/Api/UADSApiDeviceInfo.h
@@ -1,4 +1,7 @@
-
+#import "UADSVolumeChange.h"
 
 @interface UADSApiDeviceInfo : NSObject
-@end
+@end
+
+@interface UADSVolumeChangeListener : NSObject <UADSVolumeChangeDelegate>
+@end
diff --git a/UnityAds/Api/UADSApiDeviceInfo.m b/UnityAds/Api/UADSApiDeviceInfo.m
@@ -4,6 +4,21 @@
 #import "UADSConnectivityUtils.h"
 #import "UADSClientProperties.h"
 #import "UADSDeviceError.h"
+#import "UADSVolumeChange.h"
+#import "UADSWebViewApp.h"
+#import "UADSWebViewEventCategory.h"
+
+static UADSVolumeChangeListener *volumeChangeListener = NULL;
+
+@implementation UADSVolumeChangeListener
+- (void)onVolumeChanged:(float)volume {
+    if ([UADSWebViewApp getCurrentApp]) {
+        [[UADSWebViewApp getCurrentApp] sendEvent:@"VOLUME_CHANGED"
+            category:NSStringFromWebViewEventCategory(kUnityAdsWebViewEventCategoryDeviceInfo)
+            param1:[NSNumber numberWithFloat:volume], [NSNumber numberWithFloat:[UADSDevice getDeviceMaxVolume]], nil];
+    }
+}
+@end
 
 @implementation UADSApiDeviceInfo
 
@@ -159,4 +174,26 @@ + (void)WebViewExposed_getGLVersion:(UADSWebViewCallback *)callback {
     [callback invoke:[UADSDevice getGLVersion], nil];
 }
 
++ (void)WebViewExposed_getDeviceMaxVolume:(UADSWebViewCallback *)callback {
+    [callback invoke:[NSNumber numberWithFloat:[UADSDevice getDeviceMaxVolume]], nil];
+}
+
++ (void)WebViewExposed_registerVolumeChangeListener:(UADSWebViewCallback *)callback {
+    if (!volumeChangeListener) {
+        volumeChangeListener = [[UADSVolumeChangeListener alloc] init];
+        [UADSVolumeChange registerDelegate:volumeChangeListener];
+    }
+
+    [callback invoke:nil];
+}
+
++ (void)WebViewExposed_unregisterVolumeChangeListener:(UADSWebViewCallback *)callback {
+    if (volumeChangeListener) {
+        [UADSVolumeChange unregisterDelegate:volumeChangeListener];
+        volumeChangeListener = NULL;
+    }
+
+    [callback invoke:nil];
+}
+
 @end
diff --git a/UnityAds/Api/UADSApiListener.m b/UnityAds/Api/UADSApiListener.m
@@ -3,6 +3,7 @@
 #import "UADSClientProperties.h"
 #import "NSString+UnityAdsError.h"
 #import "UnityAdsExtended.h"
+#import "UnityAdsUnityDelegate.h"
 #import "UADSPlacement.h"
 
 UnityAdsFinishState UnityAdsFinishStateFromNSString (NSString* state) {
@@ -88,6 +89,18 @@ + (void)WebViewExposed_sendPlacementStateChangedEvent:(NSString *)placementId ol
     [callback invoke:nil];
 }
 
++ (void)WebViewExposed_sendInitiatePurchaseEvent:(NSString *)eventString callback:(UADSWebViewCallback *)callback {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([UADSClientProperties getDelegate] && [[UADSClientProperties getDelegate] conformsToProtocol:@protocol(UnityAdsUnityDelegate)]) {
+            if ([(id<UnityAdsUnityDelegate>)[UADSClientProperties getDelegate] respondsToSelector:@selector(unityAdsDidInitiatePurchase:)]) {
+                [(id<UnityAdsUnityDelegate>)[UADSClientProperties getDelegate] unityAdsDidInitiatePurchase:eventString];
+            }
+        }
+    });
+
+    [callback invoke:nil];
+}
+
 + (void)WebViewExposed_sendErrorEvent:(NSString *)errorString message:(NSString *)message callback:(UADSWebViewCallback *)callback {
     dispatch_async(dispatch_get_main_queue(), ^{
         if ([UADSClientProperties getDelegate]) {

diff --git a/UnityAds/Api/UADSApiSdk.m b/UnityAds/Api/UADSApiSdk.m
@@ -71,6 +71,13 @@ + (void)WebViewExposed_setShowTimeout:(NSNumber *)timeout callback:(UADSWebViewC
 }
 
 + (void)WebViewExposed_reinitialize:(UADSWebViewCallback *)callback {
+    UADSWebViewApp *currentWebViewApp = [UADSWebViewApp getCurrentApp];
+
+    if (currentWebViewApp != nil) {
+        [currentWebViewApp setWebAppLoaded:false];
+        [currentWebViewApp setWebAppInitialized:false];
+    }
+
     [UADSSdkProperties setReinitialized:true];
     [UADSInitialize initialize:[[UADSWebViewApp getCurrentApp] configuration]];
 }

diff --git a/UnityAds/Api/UADSApiStorage.m b/UnityAds/Api/UADSApiStorage.m
@@ -10,7 +10,7 @@ + (void)WebViewExposed_set:(NSString *)type key:(NSString *)key value:(id)value
     UADSStorage *storage = [UADSStorageManager getStorage:storageType];
 
     if (storage && key && value) {
-        BOOL success = [storage setValue:value forKey:key];
+        BOOL success = [storage set:key value:value];
         if (success) {
             [callback invoke:
                 key,
@@ -149,4 +149,4 @@ + (UnityAdsStorageType)getStorageTypeFromString:(NSString *)typeString {
     return (UnityAdsStorageType)typeValue;
 }
 
-@end
+@end
diff --git a/UnityAds/Categories/NSDictionary+Merge.h b/UnityAds/Categories/NSDictionary+Merge.h
@@ -0,0 +1,5 @@
+@interface NSDictionary (Merge)
+
++ (NSDictionary*)dictionaryByMerging:(NSDictionary *)primary secondary:(NSDictionary *)secondary;
+
+@end
diff --git a/UnityAds/Categories/NSDictionary+Merge.m b/UnityAds/Categories/NSDictionary+Merge.m
@@ -0,0 +1,28 @@
+#import "NSDictionary+Merge.h"
+
+@implementation NSDictionary (Merge)
+
++ (NSDictionary*)dictionaryByMerging:(NSDictionary *)primary secondary:(NSDictionary *)secondary {
+    if (!primary) {
+        return secondary;
+    }
+
+    if (!secondary) {
+        return primary;
+    }
+
+    NSMutableDictionary *newDictionary = [[NSMutableDictionary alloc] initWithDictionary:secondary];
+
+    [primary enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+        if ([newDictionary valueForKey:key] && [[newDictionary valueForKey:key] isKindOfClass:[NSDictionary class]] && [obj isKindOfClass:[NSDictionary class]]) {
+            [newDictionary setValue:[NSDictionary dictionaryByMerging:obj secondary:[newDictionary valueForKey:key]] forKey:key];
+        }
+        else {
+            [newDictionary setValue:obj forKey:key];
+        }
+    }];
+
+    return newDictionary;
+}
+
+@end
diff --git a/UnityAds/Configuration/UADSInitialize.m b/UnityAds/Configuration/UADSInitialize.m
@@ -11,6 +11,7 @@
 #import "UADSDevice.h"
 #import "UADSConnectivityUtils.h"
 #import "UADSWKWebViewApp.h"
+#import "UADSVolumeChange.h"
 
 @implementation UADSInitialize
 
@@ -112,6 +113,7 @@ - (instancetype)execute {
     });
     [UADSStorageManager init];
     [UADSNotificationObserver unregisterNotificationObserver];
+    [UADSVolumeChange clearAllDelegates];
 
     id nextState = [[UADSInitializeStateConfig alloc] initWithConfiguration:self.configuration retries:0 retryDelay:5];
     return nextState;

diff --git a/UnityAds/Connectivity/UADSConnectivityUtils.m b/UnityAds/Connectivity/UADSConnectivityUtils.m
@@ -9,7 +9,10 @@
 @implementation UADSConnectivityUtils
 
 + (void)initCarrierInfo {
-    netinfo = [CTTelephonyNetworkInfo new];
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        netinfo = [CTTelephonyNetworkInfo new];
+    });
 }
 
 + (NSInteger)getNetworkType {

diff --git a/UnityAds/Device/UADSDevice.h b/UnityAds/Device/UADSDevice.h
@@ -63,4 +63,6 @@
 
 + (NSString *)getGLVersion;
 
++ (float)getDeviceMaxVolume;
+
 @end
diff --git a/UnityAds/Device/UADSDevice.m b/UnityAds/Device/UADSDevice.m
@@ -17,8 +17,11 @@
 @implementation UADSDevice
 
 + (void)initCarrierUpdates {
-    uadsTelephonyInfo = [CTTelephonyNetworkInfo new];
-    uadsTelephonyInfo.subscriberCellularProviderDidUpdateNotifier = ^(CTCarrier *carrier) { };
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        uadsTelephonyInfo = [CTTelephonyNetworkInfo new];
+        uadsTelephonyInfo.subscriberCellularProviderDidUpdateNotifier = ^(CTCarrier *carrier) { };
+    });
 }
 
 + (NSString *)getOsVersion {
@@ -338,5 +341,9 @@ + (NSString *)getGLVersion {
     }
 }
 
++ (float)getDeviceMaxVolume {
+    return 1.0f;
+}
+
 @end
 
diff --git a/UnityAds/Device/UADSStorage.h b/UnityAds/Device/UADSStorage.h
@@ -1,21 +1,16 @@
-
+#import "UADSJsonStorage.h"
 
 typedef NS_ENUM(NSInteger, UnityAdsStorageType) {
     kUnityAdsStorageTypePublic = 1,
     kUnityAdsStorageTypePrivate = 2
 };
 
-@interface UADSStorage : NSObject
+@interface UADSStorage : UADSJsonStorage
 
 @property (nonatomic, assign) NSString *targetFileName;
 @property (nonatomic, assign) UnityAdsStorageType type;
-@property (nonatomic, strong) NSMutableDictionary *storageContents;
 
 - (instancetype)initWithLocation:(NSString *)fileLocation type:(UnityAdsStorageType)type;
-- (BOOL)setValue:(id)value forKey:(NSString *)key;
-- (id)getValueForKey:(NSString *)key;
-- (BOOL)deleteKey:(NSString *)key;
-- (NSArray *)getKeys:(NSString *)key recursive:(BOOL)recursive;
 - (void)sendEvent:(NSString *)eventType values:(NSDictionary *)values;
 
 // FILE HANDLING
@@ -24,7 +19,5 @@ typedef NS_ENUM(NSInteger, UnityAdsStorageType) {
 - (BOOL)writeStorage;
 - (BOOL)storageFileExists;
 - (BOOL)clearStorage;
-- (void)clearData;
-- (BOOL)hasData;
 
-@end
+@end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,4 +63,6 @@

		+ (NSString *)getGLVersion;

		+ (float)getDeviceMaxVolume;

		@end