Update adapters to be compatible with the Smart Display SDK v6.10

Author: GuillaumeLaubier

README.md

@@ -1,24 +1,33 @@
-Smart AdServer - Google Ads Mobile SDK Adapter for iOS
+Smart AdServer - Google Mobile Ads SDK Adapter
 ==============================================
 
 Introduction
 ------------
-The _Smart AdServer iOS SDK_ can be used through _Google Ads Mobile SDK (DFP)_ using the adapter provided in this repository for both _SASBannerView_ and _SASInterstitialView_.
-We'll be following the instructions provided by DFP [here](https://support.google.com/dfp_premium/answer/6238717?hl=en).
+The _Smart Display SDK_ can be used through _Google Mobile Ads SDK_ using the adapter provided in this repository for banner and interstitial. Those adapters are compatible with the _Smart Display SDK_ v6.10.
 
 Setup
 -----
 
-To start using the _Smart AdServer iOS SDK_ through DFP, simply add all the classes included in this repository in your project (**the Xcode project needs to contain a correctly installed _Smart AdServer iOS SDK_**).
+1) Install the _Google Mobile Ads SDK_ according to the official documentation https://developers.google.com/admob/ios/download.
 
-You can declares _SDK Mediation Creatives_ in the _DFP_ interface. Refer to the article [Add a new mobile creative](https://support.google.com/dfp_premium/answer/1209767) in Google DFP documentation for detailed instructions *Note: make sure to use "SDK Mediation" as the creative type. 
+2) Install the _Smart Display SDK_ by adding the _pod_ `SmartAdServer-DisplaySDK` to your app _Podfile_ (more info in [the documentation](http://help.smartadserver.com/ios/V6.10/#IntegrationGuides/InstallationCocoapods.htm)).
 
-To setup the _Custom Event_ (under _Ad networks_), you need to fill:
+3) Checkout this repository and copy the files you need into your Xcode Project:
+
+- `SASGMACustomEventConstants.h` in any cases.
+- `SASAdView+GMA` in any cases.
+- `SASGMACustomEventBanner` for banner ads.
+- `SASGMACustomEventInterstitial` for interstitial ads.
+
+4) Edit the `SASGMACustomEventConstants.h` header and replace the default base URL with your dedicated base URL.
+
+5) You can now declare _SDK Mediation Creatives_ in the _Google Mobile Ads_ interface. To setup the _Custom Event_ (under _Ad networks_), you need to fill:
+
+- the _Parameter_ field: set your _Smart AdServer_ IDs using slash separator `[siteID]/[pageID]/[formatID]`
+- the _Class Name_ field: set `SASGADCustomEventBanner` for banners or `SASGADCustomEventInterstitial` for interstitials.
 
-* the _Parameter_ field: set your _Smart AdServer_ IDs using slash separator `[siteID]/[pageID]/[formatID]`
-* the _Class Name_ field: set `SASGADCustomEventBanner` for banners and `SASGADCustomEventInterstitial` for interstitials
 
 More infos
 ----------
-You can find more informations about the _Smart AdServer iOS SDK_ and the _Google Ads Mobile Mediation Adapters_ in the official documentation:
-http://help.smartadserver.com/en/
+You can find more informations about the _Smart Display SDK_ and the _Google Mobile Ads SDK_ in the official documentation:
+http://documentation.smartadserver.com/displaySDK

SASAdView+GAD.h SASAdView+GMA.hSASAdView+GAD.h renamed to SASAdView+GMA.h

@@ -1,5 +1,5 @@
 //
-//  SASAdView+GAD.h
+//  SASAdView+GMA.h
 //
 //  Created by Julien Gomez on 23/06/16.
 //  Copyright © 2016 Smart AdServer. All rights reserved.
@@ -10,7 +10,7 @@
 #import "SASAdView.h"
 
 
-@interface SASAdView (GAD)
+@interface SASAdView (GMA)
 
 - (void)loadFormatWithDFPServerParameter:(NSString *)serverParameter request:(GADCustomEventRequest *)request;
 

SASAdView+GAD.m SASAdView+GMA.mSASAdView+GAD.m renamed to SASAdView+GMA.m

@@ -1,21 +1,21 @@
 //
-//  SASAdView+DFPMediation.m
+//  SASAdView+GMA.m
 //  DFPBannerExample
 //
 //  Created by Julien Gomez on 23/06/16.
 //  Copyright © 2016 Google. All rights reserved.
 //
 
-#import "SASAdView+GAD.h"
-#import "SASGADCustomEventConstants.h"
+#import "SASAdView+GMA.h"
+#import "SASGMACustomEventConstants.h"
 
 
-@implementation SASAdView (GAD)
+@implementation SASAdView (GMA)
 
 - (void)loadFormatWithDFPServerParameter:(NSString *)serverParameter request:(GADCustomEventRequest *)request {
 
     // Process placement ids
-    NSArray *stringComponents = [serverParameter componentsSeparatedByString:kSASGADCustomEventServerSeparatorString];
+    NSArray *stringComponents = [serverParameter componentsSeparatedByString:kSASGMACustomEventServerSeparatorString];
     NSInteger sid = 0;
     NSString *pid = nil;
     NSInteger fid = 0;
@@ -35,7 +35,7 @@ - (void)loadFormatWithDFPServerParameter:(NSString *)serverParameter request:(GA
     NSString *tar = [request.userKeywords componentsJoinedByString:@";"];
 
     // Use location if available
-    if(request.userHasLocation) {
+    if (request.userHasLocation) {
         [SASAdView setLocation:[[CLLocation alloc] initWithLatitude:request.userLatitude longitude:request.userLongitude]];
     }
 
@@ -44,4 +44,5 @@ - (void)loadFormatWithDFPServerParameter:(NSString *)serverParameter request:(GA
     [self loadFormatId:fid pageId:pid master:YES target:tar];
 
 }
+
 @end

SASGADCustomEventConstants.h

@@ -1,5 +1,5 @@
 //
-//  SASGADCustomEventBanner.h
+//  SASGMACustomEventBanner.h
 //
 //  Created by Julien Gomez on 21/06/16.
 //  Copyright © 2016 Smart AdServer. All rights reserved.
@@ -9,6 +9,6 @@
 #import <GoogleMobileAds/GoogleMobileAds.h>
 
 
-@interface SASGADCustomEventBanner : NSObject<GADCustomEventBanner>
+@interface SASGMACustomEventBanner : NSObject<GADCustomEventBanner>
 
 @end

SASGADCustomEventBanner.h SASGMACustomEventBanner.hSASGADCustomEventBanner.h renamed to SASGMACustomEventBanner.h

@@ -1,35 +1,34 @@
 //
-//  SASGADCustomEventBanner.m
+//  SASGMACustomEventBanner.m
 //
 //  Created by Julien Gomez on 21/06/16.
 //  Copyright © 2016 Smart AdServer. All rights reserved.
 //
 
-#import "SASGADCustomEventBanner.h"
+#import "SASGMACustomEventBanner.h"
 #import "SASBannerView.h"
-#import "SASAdView+GAD.h"
+#import "SASAdView+GMA.h"
 
 
-@interface SASGADCustomEventBanner () <SASAdViewDelegate>
+@interface SASGMACustomEventBanner () <SASAdViewDelegate>
 
 @property(nonatomic, strong) SASBannerView *bannerView;
 
 @end
 
-@implementation SASGADCustomEventBanner
+@implementation SASGMACustomEventBanner
 
 @synthesize delegate;
 
-#pragma mark GADCustomEventBanner implementation
+#pragma mark GMACustomEventBanner implementation
 
 - (void)requestBannerAd:(GADAdSize)adSize
               parameter:(NSString *)serverParameter
                   label:(NSString *)serverLabel
                 request:(GADCustomEventRequest *)request {
 
     // Create the bannerView with the appropriate size.
-    self.bannerView =
-    [[SASBannerView alloc] initWithFrame:CGRectMake(0, 0, adSize.size.width, adSize.size.height)];
+    self.bannerView = [[SASBannerView alloc] initWithFrame:CGRectMake(0, 0, adSize.size.width, adSize.size.height)];
     self.bannerView.modalParentViewController = self.delegate.viewControllerForPresentingModalView;
     self.bannerView.delegate = self;
 
@@ -55,11 +54,6 @@ - (BOOL)adView:(SASAdView *)adView shouldHandleURL:(NSURL *)URL {
 }
 
 
-- (void)adView:(SASAdView *)adView willPerformActionWithExit:(BOOL)willExit {
-    [self.delegate customEventBannerWillLeaveApplication:self];
-}
-
-
 - (void)adViewWillPresentModalView:(SASAdView *)adView {
     [self.delegate customEventBannerWillPresentModal:self];
 }

SASGADCustomEventBanner.m SASGMACustomEventBanner.mSASGADCustomEventBanner.m renamed to SASGMACustomEventBanner.m

@@ -0,0 +1,9 @@
+//
+//  SASGMACustomEventConstants.h
+//
+//  Created by Julien Gomez on 27/06/16.
+//  Copyright © 2016 Smart AdServer. All rights reserved.
+//
+
+#define kSASBaseURLString                       @"https://mobile.smartadserver.com"
+#define kSASGMACustomEventServerSeparatorString @"/"

SASGMACustomEventConstants.h

@@ -1,5 +1,5 @@
 //
-//  SASGADCustomEventInterstitial.h
+//  SASGMACustomEventInterstitial.h
 //
 //  Created by Julien Gomez on 22/06/16.
 //  Copyright © 2016 Smart AdServer. All rights reserved.
@@ -9,6 +9,6 @@
 #import <GoogleMobileAds/GoogleMobileAds.h>
 
 
-@interface SASGADCustomEventInterstitial : NSObject<GADCustomEventInterstitial>
+@interface SASGMACustomEventInterstitial : NSObject<GADCustomEventInterstitial>
 
 @end

SASGADCustomEventInterstitial.h SASGMACustomEventInterstitial.hSASGADCustomEventInterstitial.h renamed to SASGMACustomEventInterstitial.h

@@ -1,26 +1,26 @@
 //
-//  SASGADCustomEventInterstitial.m
+//  SASGMACustomEventInterstitial.m
 //
 //  Created by Julien Gomez on 22/06/16.
 //  Copyright © 2016 Smart AdServer. All rights reserved.
 //
 
-#import "SASGADCustomEventInterstitial.h"
+#import "SASGMACustomEventInterstitial.h"
 #import "SASInterstitialView.h"
-#import "SASAdView+GAD.h"
+#import "SASAdView+GMA.h"
 
 
-@interface SASGADCustomEventInterstitial () <SASAdViewDelegate>
+@interface SASGMACustomEventInterstitial () <SASAdViewDelegate>
 
 @property(nonatomic, strong) SASInterstitialView *interstitialView;
 
 @end
 
-@implementation SASGADCustomEventInterstitial
+@implementation SASGMACustomEventInterstitial
 
 @synthesize delegate;
 
-#pragma mark GADCustomEventInterstitial implementation
+#pragma mark GMACustomEventInterstitial implementation
 
 - (void)requestInterstitialAdWithParameter:(NSString *)serverParameter
                                      label:(NSString *)serverLabel
@@ -31,6 +31,7 @@ - (void)requestInterstitialAdWithParameter:(NSString *)serverParameter
     self.interstitialView =
     [[SASInterstitialView alloc] initWithFrame:rootViewController.view.bounds];
     self.interstitialView.delegate = self;
+    
     [self.interstitialView loadFormatWithDFPServerParameter:serverParameter request:request];
 
 }
@@ -60,11 +61,6 @@ - (BOOL)adView:(SASAdView *)adView shouldHandleURL:(NSURL *)URL {
 }
 
 
-- (void)adView:(SASAdView *)adView willPerformActionWithExit:(BOOL)willExit {
-    [self.delegate customEventInterstitialWillLeaveApplication:self];
-}
-
-
 - (void)adViewDidDisappear:(SASAdView *)adView {
     [self.delegate customEventInterstitialDidDismiss:self];
 }