Skip to content

Commit def0f30

Browse files
author
Unity Ads Travis
committed
Release 2.1.0
1 parent 98a7a65 commit def0f30

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1397
-406
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
Welcome to the Unity Ads 2.0 iOS release repository.
44

5+
## Supported Integration Configurations
6+
7+
Always use the pre-built release framework when integrating Unity Ads into your project. Integration using the source-code is not supported.
8+
59
## Binaries
610

711
Binaries can be found from the [releases tab](https://github.com/Unity-Technologies/unity-ads-ios/releases).

‎UnityAds/AdUnit/UADSAdUnitError.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#import <Foundation/Foundation.h>
22

33
typedef NS_ENUM(NSInteger, UnityAdsAdUnitError) {
4-
kUnityAdsViewControllerNull,
5-
kUnityAdsViewControllerNoRotationZ,
6-
kUnityAdsViewControllerUnknownView,
7-
kUnityAdsViewControllerTargetViewNull
4+
kUnityAdsAdUnitNull,
5+
kUnityAdsAdUnitNoRotationZ,
6+
kUnityAdsAdUnitUnknownView,
87
};
98

109
NSString *NSStringFromAdUnitError(UnityAdsAdUnitError);

‎UnityAds/AdUnit/UADSAdUnitError.m‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
#import "UADSAdUnitError.h"
22

3-
static NSString *unityAdsViewControllerNull = @"VIEW_CONTROLLER_NULL";
4-
static NSString *unityAdsViewControllerNoRotationZ = @"VIEW_CONTROLLER_NO_ROTATION_Z";
5-
static NSString *unityAdsViewControllerUnknownView = @"VIEW_CONTROLLER_UNKNOWN_VIEW";
6-
static NSString *unityAdsViewControllerTargetViewNull = @"VIEW_CONTROLLER_TARGET_VIEW_NULL";
3+
static NSString *unityAdsAdUnitNull = @"ADUNIT_NULL";
4+
static NSString *unityAdsAdUnitNoRotationZ = @"NO_ROTATION_Z";
5+
static NSString *unityAdsAdUnitUnknownView = @"UNKNOWN_VIEW";
76

87
NSString *NSStringFromAdUnitError(UnityAdsAdUnitError error) {
98
switch (error) {
10-
case kUnityAdsViewControllerNull:
11-
return unityAdsViewControllerNull;
12-
case kUnityAdsViewControllerNoRotationZ:
13-
return unityAdsViewControllerNoRotationZ;
14-
case kUnityAdsViewControllerUnknownView:
15-
return unityAdsViewControllerUnknownView;
16-
case kUnityAdsViewControllerTargetViewNull:
17-
return unityAdsViewControllerTargetViewNull;
9+
case kUnityAdsAdUnitNull:
10+
return unityAdsAdUnitNull;
11+
case kUnityAdsAdUnitNoRotationZ:
12+
return unityAdsAdUnitNoRotationZ;
13+
case kUnityAdsAdUnitUnknownView:
14+
return unityAdsAdUnitUnknownView;
1815
}
1916
}

‎UnityAds/AdUnit/UADSViewController.m‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#import "UADSViewController.h"
22
#import "UADSWebViewApp.h"
3-
#import <StoreKit/SKStoreProductViewController.h>
43
#import "UADSAdUnitEvent.h"
54
#import "UADSWebViewEventCategory.h"
65
#import "UnityAds.h"
@@ -59,7 +58,7 @@ - (void)viewDidDisappear:(BOOL)animated {
5958
[self destroyVideoPlayer];
6059
[self destroyVideoView];
6160
[[[UADSWebViewApp getCurrentApp] webView] removeFromSuperview];
62-
61+
[[UADSWebViewApp getCurrentApp] placeWebViewToBackgroundView];
6362
[[UADSWebViewApp getCurrentApp] sendEvent:NSStringFromAdUnitEvent(kUnityAdsViewControllerDidDisappear) category:NSStringFromWebViewEventCategory(kUnityAdsWebViewEventCategoryAdunit) param1:nil];
6463
}
6564

@@ -167,7 +166,7 @@ - (void)handleViewPlacement:(UIView *)view {
167166
[view removeFromSuperview];
168167
}
169168

170-
169+
[view setHidden:false];
171170
[view setCenter:[self.view convertPoint:self.view.center fromView:self.view.superview]];
172171
[view setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
173172

‎UnityAds/Api/UADSApiAdUnit.m‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ + (void)WebViewExposed_close:(UADSWebViewCallback *)callback {
4848
[callback invoke:nil];
4949
}
5050
else {
51-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
51+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
5252
}
5353
}
5454

@@ -60,7 +60,7 @@ + (void)WebViewExposed_setViews:(NSArray *)views callback:(UADSWebViewCallback *
6060
[callback invoke:nil];
6161
}
6262
else {
63-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
63+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
6464
}
6565
}
6666

@@ -69,7 +69,7 @@ + (void)WebViewExposed_getViews:(UADSWebViewCallback *)callback {
6969
[callback invoke:[[UADSApiAdUnit getAdUnit] currentViews], nil];
7070
}
7171
else {
72-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
72+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
7373
}
7474
}
7575

@@ -79,7 +79,7 @@ + (void)WebViewExposed_setSupportedOrientations:(NSNumber *)supportedOrientation
7979
[callback invoke:nil];
8080
}
8181
else {
82-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
82+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
8383
}
8484
}
8585

@@ -88,7 +88,7 @@ + (void)WebViewExposed_getSupportedOrientations:(UADSWebViewCallback *)callback
8888
[callback invoke:[NSNumber numberWithInt:[[UADSApiAdUnit getAdUnit] supportedOrientations]], nil];
8989
}
9090
else {
91-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
91+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
9292
}
9393
}
9494

@@ -104,7 +104,7 @@ + (void)WebViewExposed_setStatusBarHidden:(NSNumber *)statusBarHidden callback:(
104104
[callback invoke:statusBarHidden, nil];
105105
}
106106
else {
107-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
107+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
108108
}
109109
}
110110

@@ -113,7 +113,7 @@ + (void)WebViewExposed_getStatusBarHidden:(UADSWebViewCallback *)callback {
113113
[callback invoke:[NSNumber numberWithInt:[[UADSApiAdUnit getAdUnit] statusBarHidden]], nil];
114114
}
115115
else {
116-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
116+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
117117
}
118118
}
119119

@@ -123,7 +123,7 @@ + (void)WebViewExposed_setShouldAutorotate:(NSNumber *)shouldAutorotate callback
123123
[callback invoke:shouldAutorotate, nil];
124124
}
125125
else {
126-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
126+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
127127
}
128128
}
129129

@@ -132,7 +132,7 @@ + (void)WebViewExposed_getShouldAutorotate:(UADSWebViewCallback *)callback {
132132
[callback invoke:[NSNumber numberWithInt:[[UADSApiAdUnit getAdUnit] autorotate]], nil];
133133
}
134134
else {
135-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
135+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
136136
}
137137
}
138138

@@ -144,7 +144,7 @@ + (void)WebViewExposed_setTransform:(NSNumber *)transform callback:(UADSWebViewC
144144
[callback invoke:transform, nil];
145145
}
146146
else {
147-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
147+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
148148
}
149149
}
150150

@@ -156,7 +156,7 @@ + (void)WebViewExposed_setViewFrame:(NSString *)view x:(NSNumber *)x y:(NSNumber
156156
[callback invoke:nil];
157157
}
158158
else {
159-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
159+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
160160
}
161161
}
162162

@@ -166,11 +166,11 @@ + (void)WebViewExposed_getTransform:(UADSWebViewCallback *)callback {
166166
[callback invoke:[(NSNumber *)[UADSApiAdUnit getAdUnit].view valueForKeyPath:@"layer.transform.rotation.z"], nil];
167167
}
168168
else {
169-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNoRotationZ) arg1:nil];
169+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNoRotationZ) arg1:nil];
170170
}
171171
}
172172
else {
173-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
173+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
174174
}
175175
}
176176

@@ -187,10 +187,6 @@ + (void)WebViewExposed_getViewFrame:(NSString *)view callback:(UADSWebViewCallba
187187
else if ([view isEqualToString:@"webview"]) {
188188
targetView = [[UADSWebViewApp getCurrentApp] webView];
189189
}
190-
else {
191-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerUnknownView) arg1:nil];
192-
return;
193-
}
194190

195191
if (targetView) {
196192
CGRect targetFrame = targetView.frame;
@@ -201,12 +197,12 @@ + (void)WebViewExposed_getViewFrame:(NSString *)view callback:(UADSWebViewCallba
201197
nil];
202198
}
203199
else {
204-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerTargetViewNull) arg1:nil];
200+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitUnknownView) arg1:nil];
205201
return;
206202
}
207203
}
208204
else {
209-
[callback error:NSStringFromAdUnitError(kUnityAdsViewControllerNull) arg1:nil];
205+
[callback error:NSStringFromAdUnitError(kUnityAdsAdUnitNull) arg1:nil];
210206
}
211207
}
212208

‎UnityAds/Api/UADSApiCache.h‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1+
typedef NS_ENUM(NSInteger, UnityAdsCacheError) {
2+
kUnityAdsFileIOError,
3+
kUnityAdsFileNotFound,
4+
kUnityAdsNoInternet,
5+
kUnityAdsFileAlreadyCaching,
6+
kUnityAdsNotCaching,
7+
kUnityAdsMalformedUrl,
8+
kUnityAdsNetworkError,
9+
kUnityAdsInvalidArgument,
10+
kUnityAdsUnsupportedEncoding
11+
};
112

13+
NSString *NSStringFromCacheError(UnityAdsCacheError error);
214

315
@interface UADSApiCache : NSObject
4-
@end
16+
@end

0 commit comments

Comments
 (0)