Skip to content

Commit 68dd645

Browse files
github-paul-nicolasgithub-paul-nicolas
committed
Merge branch 'master' into inread-direct-page-view
2 parents a83fed0 + 5a9770b commit 68dd645

File tree

5 files changed

+88
-6
lines changed

5 files changed

+88
-6
lines changed

‎TeadsSampleApp/Assets.xcassets/teads-logo.imageset/Contents.json

+31
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,43 @@
66
"scale" : "1x"
77
},
88
{
9+
"appearances" : [
10+
{
11+
"appearance" : "luminosity",
12+
"value" : "dark"
13+
}
14+
],
15+
"filename" : "teads-logo-dark.png",
16+
"idiom" : "universal",
17+
"scale" : "1x"
18+
},
19+
{
20+
"idiom" : "universal",
21+
"scale" : "2x"
22+
},
23+
{
24+
"appearances" : [
25+
{
26+
"appearance" : "luminosity",
27+
"value" : "dark"
28+
}
29+
],
930
"idiom" : "universal",
1031
"scale" : "2x"
1132
},
1233
{
1334
"idiom" : "universal",
1435
"scale" : "3x"
36+
},
37+
{
38+
"appearances" : [
39+
{
40+
"appearance" : "luminosity",
41+
"value" : "dark"
42+
}
43+
],
44+
"idiom" : "universal",
45+
"scale" : "3x"
1546
}
1647
],
1748
"info" : {

‎TeadsSampleApp/Assets.xcassets/teads-logo.imageset/teads-logo-dark.png

17.5 KB
Loading

‎TeadsSampleApp/Base.lproj/Main.storyboard

+39-6
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<constraint firstItem="a9Q-hM-b1d" firstAttribute="leading" secondItem="Snk-38-Cgt" secondAttribute="leading" id="PF2-lL-Pij"/>
9797
<constraint firstAttribute="bottom" secondItem="a9Q-hM-b1d" secondAttribute="bottom" id="VAX-rx-iJG"/>
9898
<constraint firstItem="a9Q-hM-b1d" firstAttribute="top" secondItem="Snk-38-Cgt" secondAttribute="top" id="Zlj-LZ-s84"/>
99+
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="a9Q-hM-b1d" secondAttribute="trailing" symbolic="YES" id="dWU-Rv-mIf"/>
99100
</constraints>
100101
</view>
101102
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Creative that cuts through the noise…but respects the user." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LLA-Gg-CGL" userLabel="title">
@@ -749,6 +750,7 @@
749750
<constraints>
750751
<constraint firstItem="cbL-hy-KQD" firstAttribute="leading" secondItem="i48-6t-HSz" secondAttribute="leading" id="DsZ-dx-nOx"/>
751752
<constraint firstItem="cbL-hy-KQD" firstAttribute="top" secondItem="i48-6t-HSz" secondAttribute="top" id="do0-7U-JzX"/>
753+
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="cbL-hy-KQD" secondAttribute="trailing" symbolic="YES" id="nhV-vs-Wnb"/>
752754
<constraint firstAttribute="bottom" secondItem="cbL-hy-KQD" secondAttribute="bottom" id="qir-FA-jLs"/>
753755
<constraint firstAttribute="height" constant="24" id="x9a-h4-ptE"/>
754756
</constraints>
@@ -1131,13 +1133,13 @@
11311133
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tKl-dF-Skq">
11321134
<rect key="frame" x="8" y="46" width="359" height="58.5"/>
11331135
<subviews>
1134-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Scroll down to see your creative" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="16" preferredMaxLayoutWidth="359" translatesAutoresizingMaskIntoConstraints="NO" id="luA-K5-FUi">
1136+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Scroll down to see your creative" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="16" preferredMaxLayoutWidth="359" translatesAutoresizingMaskIntoConstraints="NO" id="luA-K5-FUi">
11351137
<rect key="frame" x="0.0" y="34.5" width="359" height="24"/>
11361138
<fontDescription key="fontDescription" type="system" weight="thin" pointSize="20"/>
11371139
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
11381140
<nil key="highlightedColor"/>
11391141
</label>
1140-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="InRead Admob TableView Integration" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="16" preferredMaxLayoutWidth="359" translatesAutoresizingMaskIntoConstraints="NO" id="kOh-ef-m1R">
1142+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="InRead Admob TableView Integration" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="16" preferredMaxLayoutWidth="359" translatesAutoresizingMaskIntoConstraints="NO" id="kOh-ef-m1R">
11411143
<rect key="frame" x="0.0" y="0.0" width="359" height="26.5"/>
11421144
<fontDescription key="fontDescription" type="system" pointSize="22"/>
11431145
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1705,6 +1707,11 @@
17051707
<subviews>
17061708
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qIe-3n-hMv">
17071709
<rect key="frame" x="0.0" y="0.0" width="375" height="162"/>
1710+
<userDefinedRuntimeAttributes>
1711+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
1712+
<integer key="value" value="5"/>
1713+
</userDefinedRuntimeAttribute>
1714+
</userDefinedRuntimeAttributes>
17081715
</imageView>
17091716
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Dq7-rc-zKx">
17101717
<rect key="frame" x="0.0" y="170" width="375" height="80"/>
@@ -2059,6 +2066,11 @@
20592066
<subviews>
20602067
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="K1s-Ef-Kao">
20612068
<rect key="frame" x="0.0" y="0.0" width="375" height="712"/>
2069+
<userDefinedRuntimeAttributes>
2070+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
2071+
<integer key="value" value="5"/>
2072+
</userDefinedRuntimeAttribute>
2073+
</userDefinedRuntimeAttributes>
20622074
</imageView>
20632075
<stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Qcu-pC-ffK">
20642076
<rect key="frame" x="0.0" y="720" width="375" height="80"/>
@@ -2256,6 +2268,7 @@
22562268
<constraints>
22572269
<constraint firstItem="sz7-LI-t3e" firstAttribute="leading" secondItem="ql2-9V-b0a" secondAttribute="leading" id="4Ai-e7-Sci"/>
22582270
<constraint firstItem="Zu3-Gq-3qs" firstAttribute="top" secondItem="sz7-LI-t3e" secondAttribute="bottom" constant="40" id="PPr-UV-OV7"/>
2271+
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Zu3-Gq-3qs" secondAttribute="trailing" symbolic="YES" id="U2g-WU-QnL"/>
22592272
<constraint firstAttribute="trailing" secondItem="sz7-LI-t3e" secondAttribute="trailing" id="X4W-fe-a7z"/>
22602273
<constraint firstItem="fqC-DB-9ra" firstAttribute="leading" secondItem="ql2-9V-b0a" secondAttribute="leading" constant="10" id="ZvK-hD-mJT"/>
22612274
<constraint firstAttribute="trailing" secondItem="fqC-DB-9ra" secondAttribute="trailing" constant="10" id="ipk-Rc-zPx"/>
@@ -2383,7 +2396,7 @@
23832396
<rect key="frame" x="0.0" y="0.0" width="375" height="250"/>
23842397
<autoresizingMask key="autoresizingMask"/>
23852398
<subviews>
2386-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1zL-7T-Of9" customClass="SmartNativeAdTableViewCell" customModule="TeadsSampleApp" customModuleProvider="target">
2399+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1zL-7T-Of9" customClass="GADNativeAdView">
23872400
<rect key="frame" x="0.0" y="0.0" width="375" height="250"/>
23882401
<subviews>
23892402
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="UNT-yN-5C9">
@@ -2477,7 +2490,7 @@
24772490
<accessibilityTraits key="traits" notEnabled="YES"/>
24782491
</accessibility>
24792492
<connections>
2480-
<outlet property="nativeAdView" destination="1zL-7T-Of9" id="ys0-fl-ZOH"/>
2493+
<outlet property="nativeAdView" destination="1zL-7T-Of9" id="taL-CU-2Ut"/>
24812494
</connections>
24822495
</tableViewCell>
24832496
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="FakeArticleNativeTableViewCell" rowHeight="250" id="pwT-to-NDe" customClass="FakeArticleNativeTableViewCell" customModule="TeadsSampleApp" customModuleProvider="target">
@@ -2492,6 +2505,11 @@
24922505
<subviews>
24932506
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="VC0-oe-4se">
24942507
<rect key="frame" x="0.0" y="0.0" width="375" height="162"/>
2508+
<userDefinedRuntimeAttributes>
2509+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
2510+
<integer key="value" value="5"/>
2511+
</userDefinedRuntimeAttribute>
2512+
</userDefinedRuntimeAttributes>
24952513
</imageView>
24962514
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="A2k-0R-pVf">
24972515
<rect key="frame" x="0.0" y="170" width="375" height="80"/>
@@ -2705,6 +2723,11 @@
27052723
<subviews>
27062724
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ngn-ab-HRg">
27072725
<rect key="frame" x="0.0" y="0.0" width="375" height="162"/>
2726+
<userDefinedRuntimeAttributes>
2727+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
2728+
<integer key="value" value="5"/>
2729+
</userDefinedRuntimeAttribute>
2730+
</userDefinedRuntimeAttributes>
27082731
</imageView>
27092732
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Vie-7f-caJ">
27102733
<rect key="frame" x="0.0" y="170" width="375" height="80"/>
@@ -3006,6 +3029,11 @@
30063029
<subviews>
30073030
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="mYC-GL-kEE">
30083031
<rect key="frame" x="0.0" y="0.0" width="375" height="162"/>
3032+
<userDefinedRuntimeAttributes>
3033+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
3034+
<integer key="value" value="5"/>
3035+
</userDefinedRuntimeAttribute>
3036+
</userDefinedRuntimeAttributes>
30093037
</imageView>
30103038
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="KQa-iY-HCC">
30113039
<rect key="frame" x="0.0" y="170" width="375" height="80"/>
@@ -3099,10 +3127,10 @@
30993127
</objects>
31003128
<point key="canvasLocation" x="3762" y="2013"/>
31013129
</scene>
3102-
<!--native-direct-tableview-->
3130+
<!--native-direct-tableview-tag-->
31033131
<scene sceneID="A6Y-Mu-UJr">
31043132
<objects>
3105-
<viewController title="native-direct-tableview-tag" id="e7F-yF-Khd" userLabel="native-direct-tableview" customClass="NativeTagDirectTableViewController" customModule="TeadsSampleApp" customModuleProvider="target" sceneMemberID="viewController">
3133+
<viewController title="native-direct-tableview-tag" id="e7F-yF-Khd" customClass="NativeTagDirectTableViewController" customModule="TeadsSampleApp" customModuleProvider="target" sceneMemberID="viewController">
31063134
<view key="view" contentMode="scaleToFill" id="6W6-24-1fW">
31073135
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
31083136
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -3190,6 +3218,11 @@
31903218
<subviews>
31913219
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="oeh-ti-8FX">
31923220
<rect key="frame" x="0.0" y="0.0" width="375" height="162"/>
3221+
<userDefinedRuntimeAttributes>
3222+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
3223+
<integer key="value" value="5"/>
3224+
</userDefinedRuntimeAttribute>
3225+
</userDefinedRuntimeAttributes>
31933226
</imageView>
31943227
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="a7d-gb-Aqg">
31953228
<rect key="frame" x="0.0" y="170" width="375" height="80"/>

‎TeadsSampleApp/Controllers/InRead/AppLovin/ScrollView/InReadAppLovinScrollViewController.swift

+9
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ class InReadAppLovinScrollViewController: AppLovinViewController {
2828
}
2929
}
3030

31+
override func viewDidAppear(_ animated: Bool) {
32+
super.viewDidAppear(animated)
33+
#if targetEnvironment(simulator)
34+
let alert = UIAlertController(title: "Warning", message: "Teads AppLovin adapter does not work on simulator ", preferredStyle: .alert)
35+
alert.addAction(.init(title: "OK", style: .default))
36+
present(alert, animated: true, completion: nil)
37+
#endif
38+
}
39+
3140
func loadAd() {
3241
let adFormat: MAAdFormat = isMREC ? .mrec : .banner
3342
bannerView = MAAdView(adUnitIdentifier: pid, adFormat: adFormat)

0 commit comments

Comments
 (0)