Adds DFP Rewarded Video examples. Updates Native advanced example to …

…use Unified.
googleads · Feb 2, 2018 · dbb615a · dbb615a
1 parent 208d5a4
commit dbb615a
Show file tree

Hide file tree

Showing 113 changed files with 3,017 additions and 1,502 deletions.
diff --git a/Objective-C/admob/BannerExample/Podfile.lock b/Objective-C/admob/BannerExample/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
-  - Google-Mobile-Ads-SDK (7.27.0)
+  - Google-Mobile-Ads-SDK (7.28.0)
 
 DEPENDENCIES:
   - Google-Mobile-Ads-SDK
 
 SPEC CHECKSUMS:
-  Google-Mobile-Ads-SDK: 83f7f890e638ce8f1debd440ea363338c9f6be3b
+  Google-Mobile-Ads-SDK: 7f9bc0011df363ae5616449de3682a14c4701612
 
 PODFILE CHECKSUM: d68d4e731a9b5b53785d6b3d3c2d9591736d8b17
 

diff --git a/Objective-C/admob/InterstitialExample/Podfile.lock b/Objective-C/admob/InterstitialExample/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
-  - Google-Mobile-Ads-SDK (7.27.0)
+  - Google-Mobile-Ads-SDK (7.28.0)
 
 DEPENDENCIES:
   - Google-Mobile-Ads-SDK
 
 SPEC CHECKSUMS:
-  Google-Mobile-Ads-SDK: 83f7f890e638ce8f1debd440ea363338c9f6be3b
+  Google-Mobile-Ads-SDK: 7f9bc0011df363ae5616449de3682a14c4701612
 
 PODFILE CHECKSUM: 566c40e2b89767a8c4c9182597b5d1b30b773720
 

diff --git a/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample.xcodeproj/project.pbxproj b/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample.xcodeproj/project.pbxproj
@@ -13,8 +13,7 @@
 		CF9335C61B26706400DEF1B4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CF9335C41B26706400DEF1B4 /* Main.storyboard */; };
 		CF9335C81B26706400DEF1B4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CF9335C71B26706400DEF1B4 /* Images.xcassets */; };
 		CF9335CB1B26706400DEF1B4 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF9335C91B26706400DEF1B4 /* LaunchScreen.xib */; };
-		CF9335EC1B26715A00DEF1B4 /* NativeAppInstallAdView.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF9335E61B26715A00DEF1B4 /* NativeAppInstallAdView.xib */; };
-		CF9335ED1B26715A00DEF1B4 /* NativeContentAdView.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF9335E81B26715A00DEF1B4 /* NativeContentAdView.xib */; };
+		CF9335EC1B26715A00DEF1B4 /* UnifiedNativeAdView.xib in Resources */ = {isa = PBXBuildFile; fileRef = CF9335E61B26715A00DEF1B4 /* UnifiedNativeAdView.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -28,8 +27,7 @@
 		CF9335C51B26706400DEF1B4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		CF9335C71B26706400DEF1B4 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		CF9335CA1B26706400DEF1B4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
-		CF9335E71B26715A00DEF1B4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NativeAppInstallAdView.xib; sourceTree = "<group>"; };
-		CF9335E91B26715A00DEF1B4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NativeContentAdView.xib; sourceTree = "<group>"; };
+		CF9335E71B26715A00DEF1B4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UnifiedNativeAdView.xib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -68,8 +66,7 @@
 				CF9335C21B26706400DEF1B4 /* ViewController.m */,
 				CF9335C41B26706400DEF1B4 /* Main.storyboard */,
 				CF9335C71B26706400DEF1B4 /* Images.xcassets */,
-				CF9335E61B26715A00DEF1B4 /* NativeAppInstallAdView.xib */,
-				CF9335E81B26715A00DEF1B4 /* NativeContentAdView.xib */,
+				CF9335E61B26715A00DEF1B4 /* UnifiedNativeAdView.xib */,
 				CF9335C91B26706400DEF1B4 /* LaunchScreen.xib */,
 				CF9335BA1B26706400DEF1B4 /* Supporting Files */,
 			);
@@ -144,8 +141,7 @@
 			files = (
 				CF9335C61B26706400DEF1B4 /* Main.storyboard in Resources */,
 				CF9335CB1B26706400DEF1B4 /* LaunchScreen.xib in Resources */,
-				CF9335ED1B26715A00DEF1B4 /* NativeContentAdView.xib in Resources */,
-				CF9335EC1B26715A00DEF1B4 /* NativeAppInstallAdView.xib in Resources */,
+				CF9335EC1B26715A00DEF1B4 /* UnifiedNativeAdView.xib in Resources */,
 				CF9335C81B26706400DEF1B4 /* Images.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -182,20 +178,12 @@
 			name = LaunchScreen.xib;
 			sourceTree = "<group>";
 		};
-		CF9335E61B26715A00DEF1B4 /* NativeAppInstallAdView.xib */ = {
+		CF9335E61B26715A00DEF1B4 /* UnifiedNativeAdView.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
 				CF9335E71B26715A00DEF1B4 /* Base */,
 			);
-			name = NativeAppInstallAdView.xib;
-			sourceTree = "<group>";
-		};
-		CF9335E81B26715A00DEF1B4 /* NativeContentAdView.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CF9335E91B26715A00DEF1B4 /* Base */,
-			);
-			name = NativeContentAdView.xib;
+			name = UnifiedNativeAdView.xib;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */

diff --git a/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/AppDelegate.m b/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/AppDelegate.m
@@ -26,7 +26,6 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-
   // Initialize Google Mobile Ads SDK
   [GADMobileAds configureWithApplicationID:@"ca-app-pub-3940256099942544~1458002511"];
 

diff --git a/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/Base.lproj/LaunchScreen.xib b/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/Base.lproj/LaunchScreen.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES">
     <device id="retina5_9" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment version="2048" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -24,7 +24,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" text="NativeAdvancedExample" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="16" y="250.33333333333331" width="343" height="42.999999999999943"/>
+                    <rect key="frame" x="16" y="250.33333333333337" width="343" height="43"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>