Skip to content

Commit 1d13237

Browse files
a-mauricea-maurice
committed
Merge remote-tracking branch 'origin/master' into ghm
2 parents 9a874a7 + 45cad30 commit 1d13237

File tree

322 files changed

+62831
-9
lines changed

Some content is hidden

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

322 files changed

+62831
-9
lines changed

‎admob/tools/ios/testapp/README.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
Firebase AdMob iOS Test App
2+
===========================
3+
4+
The Firebase AdMob iOS test app is designed to enable implementing, modifying,
5+
and debugging API features directly in Xcode.
6+
7+
Getting Started
8+
---------------
9+
10+
- Get the code:
11+
12+
git5 init
13+
git5-track-p4-depot-paths //depot_firebase_cpp/admob/client/cpp/tools/ios/testapp/p4_depot_paths
14+
git5 sync
15+
16+
- Create the following symlinks (DO NOT check these in to google3 -- they should be added to your
17+
.gitignore):
18+
19+
NOTE: Firebase changed their includes from `include` to `src/include`.
20+
These soft links work around the issue.
21+
22+
GOOGLE3_PATH=~/path/to/git5/repo/google3 # Change to your google3 path
23+
ln -s $GOOGLE3_PATH/firebase/app/client/cpp/src/include/ $GOOGLE3_PATH/firebase/app/client/cpp/include
24+
ln -s $GOOGLE3_PATH/firebase/admob/client/cpp/src/include/ $GOOGLE3_PATH/firebase/admob/client/cpp/include
25+
26+
Setting up the App
27+
------------------
28+
29+
- In Project Navigator, add the GoogleMobileAds.framework to the Frameworks
30+
testapp project.
31+
- Update the following files:
32+
- google3/firebase/admob/client/cpp/src/common/admob_common.cc
33+
- Comment out the following code:
34+
35+
/*
36+
FIREBASE_APP_REGISTER_CALLBACKS(admob,
37+
{
38+
if (app == ::firebase::App::GetInstance()) {
39+
return firebase::admob::Initialize(*app);
40+
}
41+
return kInitResultSuccess;
42+
},
43+
{
44+
if (app == ::firebase::App::GetInstance()) {
45+
firebase::admob::Terminate();
46+
}
47+
});
48+
*/
49+
50+
- google3/firebase/admob/client/cpp/src/include/firebase/admob.h
51+
- Comment out the following code:
52+
53+
/*
54+
#if !defined(DOXYGEN) && !defined(SWIG)
55+
FIREBASE_APP_REGISTER_CALLBACKS_REFERENCE(admob)
56+
#endif // !defined(DOXYGEN) && !defined(SWIG)
57+
*/

‎admob/tools/ios/testapp/p4_depot_paths

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Run the following command to git5 track the required directories for the
2+
# Firebase-AdMob iOS test app:
3+
#
4+
# $ git5-track-p4-depot-paths //depot_firebase_cpp/admob/client/cpp/tools/ios/testapp/p4_depot_paths
5+
6+
//depot_firebase_cpp/app/...
7+
//depot_firebase_cpp/admob/...

‎admob/tools/ios/testapp/testapp.xcodeproj/project.pbxproj

Lines changed: 524 additions & 0 deletions
Large diffs are not rendered by default.

‎admob/tools/ios/testapp/testapp/AppDelegate.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright © 2016 Google. All rights reserved.
2+
3+
@import GoogleMobileAds;
4+
5+
#import <UIKit/UIKit.h>
6+
7+
@interface AppDelegate : UIResponder <UIApplicationDelegate>
8+
9+
@property(nonatomic, strong) UIWindow *window;
10+
11+
@end

‎admob/tools/ios/testapp/testapp/AppDelegate.m

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright © 2016 Google. All rights reserved.
2+
3+
#import "AppDelegate.h"
4+
5+
@interface AppDelegate ()
6+
7+
@end
8+
9+
@implementation AppDelegate
10+
11+
- (BOOL)application:(UIApplication *)application
12+
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
13+
return YES;
14+
}
15+
16+
@end

‎admob/tools/ios/testapp/testapp/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "29x29",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "29x29",
11+
"scale" : "3x"
12+
},
13+
{
14+
"idiom" : "iphone",
15+
"size" : "40x40",
16+
"scale" : "2x"
17+
},
18+
{
19+
"idiom" : "iphone",
20+
"size" : "40x40",
21+
"scale" : "3x"
22+
},
23+
{
24+
"idiom" : "iphone",
25+
"size" : "60x60",
26+
"scale" : "2x"
27+
},
28+
{
29+
"idiom" : "iphone",
30+
"size" : "60x60",
31+
"scale" : "3x"
32+
},
33+
{
34+
"idiom" : "ipad",
35+
"size" : "29x29",
36+
"scale" : "1x"
37+
},
38+
{
39+
"idiom" : "ipad",
40+
"size" : "29x29",
41+
"scale" : "2x"
42+
},
43+
{
44+
"idiom" : "ipad",
45+
"size" : "40x40",
46+
"scale" : "1x"
47+
},
48+
{
49+
"idiom" : "ipad",
50+
"size" : "40x40",
51+
"scale" : "2x"
52+
},
53+
{
54+
"idiom" : "ipad",
55+
"size" : "76x76",
56+
"scale" : "1x"
57+
},
58+
{
59+
"idiom" : "ipad",
60+
"size" : "76x76",
61+
"scale" : "2x"
62+
},
63+
{
64+
"idiom" : "ipad",
65+
"size" : "83.5x83.5",
66+
"scale" : "2x"
67+
}
68+
],
69+
"info" : {
70+
"version" : 1,
71+
"author" : "xcode"
72+
}
73+
}

‎admob/tools/ios/testapp/testapp/Assets.xcassets/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎admob/tools/ios/testapp/testapp/Assets.xcassets/LaunchImages.launchimage/Contents.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"images" : [
3+
{
4+
"orientation" : "portrait",
5+
"idiom" : "ipad",
6+
"extent" : "full-screen",
7+
"minimum-system-version" : "7.0",
8+
"scale" : "1x"
9+
},
10+
{
11+
"orientation" : "landscape",
12+
"idiom" : "ipad",
13+
"extent" : "full-screen",
14+
"minimum-system-version" : "7.0",
15+
"scale" : "1x"
16+
},
17+
{
18+
"orientation" : "portrait",
19+
"idiom" : "ipad",
20+
"extent" : "full-screen",
21+
"minimum-system-version" : "7.0",
22+
"scale" : "2x"
23+
},
24+
{
25+
"orientation" : "landscape",
26+
"idiom" : "ipad",
27+
"extent" : "full-screen",
28+
"minimum-system-version" : "7.0",
29+
"scale" : "2x"
30+
}
31+
],
32+
"info" : {
33+
"version" : 1,
34+
"author" : "xcode"
35+
}
36+
}

‎admob/tools/ios/testapp/testapp/Base.lproj/LaunchScreen.storyboard

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" initialViewController="01J-lp-oVM">
3+
<dependencies>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
6+
</dependencies>
7+
<scenes>
8+
<!--View Controller-->
9+
<scene sceneID="EHf-IW-A2E">
10+
<objects>
11+
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
12+
<layoutGuides>
13+
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
14+
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
15+
</layoutGuides>
16+
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
17+
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
18+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19+
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
20+
</view>
21+
</viewController>
22+
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
23+
</objects>
24+
<point key="canvasLocation" x="28.266666666666666" y="355"/>
25+
</scene>
26+
</scenes>
27+
</document>

‎admob/tools/ios/testapp/testapp/Base.lproj/Main.storyboard

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
3+
<dependencies>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
6+
</dependencies>
7+
<scenes>
8+
<!--View Controller-->
9+
<scene sceneID="tne-QT-ifu">
10+
<objects>
11+
<viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
12+
<layoutGuides>
13+
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
14+
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
15+
</layoutGuides>
16+
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
17+
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
18+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19+
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
20+
</view>
21+
</viewController>
22+
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
23+
</objects>
24+
<point key="canvasLocation" x="437.33333333333331" y="710.47333333333336"/>
25+
</scene>
26+
</scenes>
27+
</document>

0 commit comments

Comments
 (0)