Skip to content

Commit

Permalink
Merge pull request #93 from teads/develop
Browse files Browse the repository at this point in the history
v2.7.13
  • Loading branch information
Niko-r authored Dec 11, 2017
2 parents d7790d0 + 05a9176 commit 1ac02c2
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

v2.7.13
- UI adjustement for fullscreen on iPhone X
- Fix for (wk)webview integration

v2.7.12
- Fixed an issue with WKWebView delegates when using `reinjectTeadsInWebView`

Expand Down
2 changes: 1 addition & 1 deletion TeadsSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "TeadsSDK"
s.version = "2.7.12"
s.version = "2.7.13"
s.summary = "Teads' iOS SDK"

s.description = <<-DESC
Expand Down
20 changes: 10 additions & 10 deletions TeadsSDKDemo/Demo Pages/inRead/InReadWKWebview.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

@interface InReadWKWebview ()

@property (strong, nonatomic) WKWebView *wkWwebView;
@property (strong, nonatomic) WKWebView *wkWebView;

@property (strong, nonatomic) TeadsAd *teadsInRead;

Expand All @@ -22,14 +22,14 @@ - (void)viewDidLoad {
[super viewDidLoad];

WKWebViewConfiguration *theConfiguration = [[WKWebViewConfiguration alloc] init];
self.wkWwebView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:theConfiguration];
self.wkWwebView.navigationDelegate = self;
self.wkWebView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:theConfiguration];
self.wkWebView.navigationDelegate = self;

[self.view addSubview:self.wkWwebView];
[self.view addSubview:self.wkWebView];

[self.wkWwebView setTranslatesAutoresizingMaskIntoConstraints:NO];
[self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_wkWwebView]|" options:0 metrics:nil views:NSDictionaryOfVariableBindings(_wkWwebView)]];
[self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_wkWwebView]|" options:0 metrics:nil views:NSDictionaryOfVariableBindings(_wkWwebView)]];
[self.wkWebView setTranslatesAutoresizingMaskIntoConstraints:NO];
[self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_wkWwebView]|" options:0 metrics:nil views:NSDictionaryOfVariableBindings(_wkWebView)]];
[self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_wkWwebView]|" options:0 metrics:nil views:NSDictionaryOfVariableBindings(_wkWebView)]];

self.navigationItem.title = @"inRead WKWebView";

Expand All @@ -43,18 +43,18 @@ - (void)viewDidLoad {
//Here we specify in placeholderText an id for a HTML node to insert the inRead
self.teadsInRead = [[TeadsAd alloc] initInReadWithPlacementId:pid
placeholderText:@"#my-placement-id"
wkWebView:self.wkWwebView
wkWebView:self.wkWebView
delegate:self];
webSiteURL = [NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"index" ofType:@"html"] isDirectory:NO];
} else {
// inRead
self.teadsInRead = [[TeadsAd alloc] initInReadWithPlacementId:pid
placeholderText:[[NSUserDefaults standardUserDefaults] stringForKey:@"placeholderText"]
wkWebView:self.wkWwebView
wkWebView:self.wkWebView
delegate:self];
webSiteURL = [NSURL URLWithString:urlToLoad];
}
[self.wkWwebView loadRequest:[NSURLRequest requestWithURL:webSiteURL]];
[self.wkWebView loadRequest:[NSURLRequest requestWithURL:webSiteURL]];

}

Expand Down
Binary file modified TeadsSDKDemo/Resources/TeadsSDKResources.bundle/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified TeadsSDKDemo/TeadsSDK.framework/Versions/A/TeadsSDK
Binary file not shown.

0 comments on commit 1ac02c2

Please sign in to comment.