Skip to content

Commit faf2dfd

Browse files
Niko-rNiko-r
authored
Merge pull request #78 from teads/master
Merge from 'master'
2 parents 9c29624 + 5350bc3 commit faf2dfd

29 files changed

+3387
-159
lines changed

‎TeadsSDKDemo.xcodeproj/project.pbxproj‎

Lines changed: 94 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@
5454
91E635A41DDB0AAE00525579 /* CustomCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E635A31DDB0AAE00525579 /* CustomCollectionViewCell.m */; };
5555
91E635A71DDB17B600525579 /* InReadTopCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E635A61DDB17B600525579 /* InReadTopCollectionViewController.m */; };
5656
91E792861C47A8D80080DD03 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91E792851C47A8D80080DD03 /* MediaPlayer.framework */; };
57+
B5FE9B4D1EB8730800649FD6 /* InReadWebViewEmbededInScrollViewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B4C1EB8730800649FD6 /* InReadWebViewEmbededInScrollViewViewController.m */; };
58+
B5FE9B501EB88DEC00649FD6 /* InReadWkWebViewEmbededInScrollViewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B4F1EB88DEC00649FD6 /* InReadWkWebViewEmbededInScrollViewViewController.m */; };
59+
B5FE9B581EB9C99E00649FD6 /* TeadsWebViewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B571EB9C99E00649FD6 /* TeadsWebViewTableViewCell.m */; };
60+
B5FE9B5B1EB9FFCC00649FD6 /* inReadWebViewInTableViewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B5A1EB9FFCC00649FD6 /* inReadWebViewInTableViewViewController.m */; };
61+
B5FE9B5E1EBA00AA00649FD6 /* inReadWkWebViewInTableViewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B5D1EBA00AA00649FD6 /* inReadWkWebViewInTableViewViewController.m */; };
62+
B5FE9B611EBA017700649FD6 /* TeadsWkWebViewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B601EBA017700649FD6 /* TeadsWkWebViewTableViewCell.m */; };
63+
B5FE9B641EBA21AB00649FD6 /* inReadWebViewInCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B631EBA21AB00649FD6 /* inReadWebViewInCollectionViewController.m */; };
64+
B5FE9B671EBB121D00649FD6 /* RandomCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B661EBB121D00649FD6 /* RandomCollectionViewCell.m */; };
65+
B5FE9B6A1EBB177600649FD6 /* WebViewCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B691EBB177600649FD6 /* WebViewCollectionViewCell.m */; };
66+
B5FE9B6D1EBB251F00649FD6 /* inReadWkWebViewInCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B6C1EBB251F00649FD6 /* inReadWkWebViewInCollectionViewController.m */; };
67+
B5FE9B701EBB25EF00649FD6 /* WkWebViewCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE9B6F1EBB25EF00649FD6 /* WkWebViewCollectionViewCell.m */; };
5768
/* End PBXBuildFile section */
5869

5970
/* Begin PBXContainerItemProxy section */
@@ -161,6 +172,28 @@
161172
91E792851C47A8D80080DD03 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
162173
91F581DB1A710A22007D70AC /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
163174
91F581DD1A710A29007D70AC /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
175+
B5FE9B4B1EB8730800649FD6 /* InReadWebViewEmbededInScrollViewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InReadWebViewEmbededInScrollViewViewController.h; sourceTree = "<group>"; };
176+
B5FE9B4C1EB8730800649FD6 /* InReadWebViewEmbededInScrollViewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InReadWebViewEmbededInScrollViewViewController.m; sourceTree = "<group>"; };
177+
B5FE9B4E1EB88DEC00649FD6 /* InReadWkWebViewEmbededInScrollViewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InReadWkWebViewEmbededInScrollViewViewController.h; sourceTree = "<group>"; };
178+
B5FE9B4F1EB88DEC00649FD6 /* InReadWkWebViewEmbededInScrollViewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InReadWkWebViewEmbededInScrollViewViewController.m; sourceTree = "<group>"; };
179+
B5FE9B561EB9C99E00649FD6 /* TeadsWebViewTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TeadsWebViewTableViewCell.h; sourceTree = "<group>"; };
180+
B5FE9B571EB9C99E00649FD6 /* TeadsWebViewTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TeadsWebViewTableViewCell.m; sourceTree = "<group>"; };
181+
B5FE9B591EB9FFCC00649FD6 /* inReadWebViewInTableViewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inReadWebViewInTableViewViewController.h; sourceTree = "<group>"; };
182+
B5FE9B5A1EB9FFCC00649FD6 /* inReadWebViewInTableViewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = inReadWebViewInTableViewViewController.m; sourceTree = "<group>"; };
183+
B5FE9B5C1EBA00AA00649FD6 /* inReadWkWebViewInTableViewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inReadWkWebViewInTableViewViewController.h; sourceTree = "<group>"; };
184+
B5FE9B5D1EBA00AA00649FD6 /* inReadWkWebViewInTableViewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = inReadWkWebViewInTableViewViewController.m; sourceTree = "<group>"; };
185+
B5FE9B5F1EBA017700649FD6 /* TeadsWkWebViewTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TeadsWkWebViewTableViewCell.h; sourceTree = "<group>"; };
186+
B5FE9B601EBA017700649FD6 /* TeadsWkWebViewTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TeadsWkWebViewTableViewCell.m; sourceTree = "<group>"; };
187+
B5FE9B621EBA21AB00649FD6 /* inReadWebViewInCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inReadWebViewInCollectionViewController.h; sourceTree = "<group>"; };
188+
B5FE9B631EBA21AB00649FD6 /* inReadWebViewInCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = inReadWebViewInCollectionViewController.m; sourceTree = "<group>"; };
189+
B5FE9B651EBB121D00649FD6 /* RandomCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomCollectionViewCell.h; sourceTree = "<group>"; };
190+
B5FE9B661EBB121D00649FD6 /* RandomCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RandomCollectionViewCell.m; sourceTree = "<group>"; };
191+
B5FE9B681EBB177600649FD6 /* WebViewCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewCollectionViewCell.h; sourceTree = "<group>"; };
192+
B5FE9B691EBB177600649FD6 /* WebViewCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewCollectionViewCell.m; sourceTree = "<group>"; };
193+
B5FE9B6B1EBB251F00649FD6 /* inReadWkWebViewInCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inReadWkWebViewInCollectionViewController.h; sourceTree = "<group>"; };
194+
B5FE9B6C1EBB251F00649FD6 /* inReadWkWebViewInCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = inReadWkWebViewInCollectionViewController.m; sourceTree = "<group>"; };
195+
B5FE9B6E1EBB25EF00649FD6 /* WkWebViewCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WkWebViewCollectionViewCell.h; sourceTree = "<group>"; };
196+
B5FE9B6F1EBB25EF00649FD6 /* WkWebViewCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WkWebViewCollectionViewCell.m; sourceTree = "<group>"; };
164197
/* End PBXFileReference section */
165198

166199
/* Begin PBXFrameworksBuildPhase section */
@@ -309,6 +342,7 @@
309342
children = (
310343
91566E651E784427008AF47F /* inRead_multi */,
311344
91E125BA1C64B7AA0095F327 /* inRead Top */,
345+
B5FE9B511EB8C84100649FD6 /* inRead embeded */,
312346
910CB4401A695900005E6711 /* inRead */,
313347
);
314348
path = "Demo Pages";
@@ -383,6 +417,44 @@
383417
path = "inRead Top";
384418
sourceTree = "<group>";
385419
};
420+
B5FE9B511EB8C84100649FD6 /* inRead embeded */ = {
421+
isa = PBXGroup;
422+
children = (
423+
B5FE9B551EB9C97D00649FD6 /* WebViewCell */,
424+
B5FE9B4B1EB8730800649FD6 /* InReadWebViewEmbededInScrollViewViewController.h */,
425+
B5FE9B4C1EB8730800649FD6 /* InReadWebViewEmbededInScrollViewViewController.m */,
426+
B5FE9B4E1EB88DEC00649FD6 /* InReadWkWebViewEmbededInScrollViewViewController.h */,
427+
B5FE9B4F1EB88DEC00649FD6 /* InReadWkWebViewEmbededInScrollViewViewController.m */,
428+
B5FE9B591EB9FFCC00649FD6 /* inReadWebViewInTableViewViewController.h */,
429+
B5FE9B5A1EB9FFCC00649FD6 /* inReadWebViewInTableViewViewController.m */,
430+
B5FE9B5C1EBA00AA00649FD6 /* inReadWkWebViewInTableViewViewController.h */,
431+
B5FE9B5D1EBA00AA00649FD6 /* inReadWkWebViewInTableViewViewController.m */,
432+
B5FE9B621EBA21AB00649FD6 /* inReadWebViewInCollectionViewController.h */,
433+
B5FE9B631EBA21AB00649FD6 /* inReadWebViewInCollectionViewController.m */,
434+
B5FE9B6B1EBB251F00649FD6 /* inReadWkWebViewInCollectionViewController.h */,
435+
B5FE9B6C1EBB251F00649FD6 /* inReadWkWebViewInCollectionViewController.m */,
436+
);
437+
name = "inRead embeded";
438+
path = inRead;
439+
sourceTree = "<group>";
440+
};
441+
B5FE9B551EB9C97D00649FD6 /* WebViewCell */ = {
442+
isa = PBXGroup;
443+
children = (
444+
B5FE9B561EB9C99E00649FD6 /* TeadsWebViewTableViewCell.h */,
445+
B5FE9B571EB9C99E00649FD6 /* TeadsWebViewTableViewCell.m */,
446+
B5FE9B5F1EBA017700649FD6 /* TeadsWkWebViewTableViewCell.h */,
447+
B5FE9B601EBA017700649FD6 /* TeadsWkWebViewTableViewCell.m */,
448+
B5FE9B651EBB121D00649FD6 /* RandomCollectionViewCell.h */,
449+
B5FE9B661EBB121D00649FD6 /* RandomCollectionViewCell.m */,
450+
B5FE9B681EBB177600649FD6 /* WebViewCollectionViewCell.h */,
451+
B5FE9B691EBB177600649FD6 /* WebViewCollectionViewCell.m */,
452+
B5FE9B6E1EBB25EF00649FD6 /* WkWebViewCollectionViewCell.h */,
453+
B5FE9B6F1EBB25EF00649FD6 /* WkWebViewCollectionViewCell.m */,
454+
);
455+
name = WebViewCell;
456+
sourceTree = "<group>";
457+
};
386458
/* End PBXGroup section */
387459

388460
/* Begin PBXNativeTarget section */
@@ -434,9 +506,12 @@
434506
TargetAttributes = {
435507
916CFB0F1A68288400E36306 = {
436508
CreatedOnToolsVersion = 6.1.1;
509+
DevelopmentTeam = V55UEG98F8;
510+
ProvisioningStyle = Automatic;
437511
};
438512
916CFB281A68288400E36306 = {
439513
CreatedOnToolsVersion = 6.1.1;
514+
DevelopmentTeam = V55UEG98F8;
440515
TestTargetID = 916CFB0F1A68288400E36306;
441516
};
442517
};
@@ -500,22 +575,33 @@
500575
isa = PBXSourcesBuildPhase;
501576
buildActionMask = 2147483647;
502577
files = (
578+
B5FE9B6D1EBB251F00649FD6 /* inReadWkWebViewInCollectionViewController.m in Sources */,
503579
91066C121C2B162D003E845F /* DemoUtils.m in Sources */,
580+
B5FE9B501EB88DEC00649FD6 /* InReadWkWebViewEmbededInScrollViewViewController.m in Sources */,
581+
B5FE9B641EBA21AB00649FD6 /* inReadWebViewInCollectionViewController.m in Sources */,
504582
91E125C71C64B7AA0095F327 /* InReadTopWebViewController.m in Sources */,
505583
91E125C91C64B7AA0095F327 /* InReadTopWKWebView.m in Sources */,
584+
B5FE9B701EBB25EF00649FD6 /* WkWebViewCollectionViewCell.m in Sources */,
506585
910CB4521A695933005E6711 /* InReadWebViewController.m in Sources */,
507586
91E125C31C64B7AA0095F327 /* InReadTopScrollViewController.m in Sources */,
587+
B5FE9B671EBB121D00649FD6 /* RandomCollectionViewCell.m in Sources */,
508588
913CED781B67C3590058623A /* CustomAdScrollViewController.m in Sources */,
589+
B5FE9B581EB9C99E00649FD6 /* TeadsWebViewTableViewCell.m in Sources */,
590+
B5FE9B5E1EBA00AA00649FD6 /* inReadWkWebViewInTableViewViewController.m in Sources */,
591+
B5FE9B5B1EB9FFCC00649FD6 /* inReadWebViewInTableViewViewController.m in Sources */,
509592
910CB4501A695933005E6711 /* InReadScrollViewController.m in Sources */,
510593
91E635A71DDB17B600525579 /* InReadTopCollectionViewController.m in Sources */,
594+
B5FE9B611EBA017700649FD6 /* TeadsWkWebViewTableViewCell.m in Sources */,
511595
916CFB191A68288400E36306 /* AppDelegate.m in Sources */,
596+
B5FE9B4D1EB8730800649FD6 /* InReadWebViewEmbededInScrollViewViewController.m in Sources */,
512597
91E125C51C64B7AA0095F327 /* InReadTopTableViewController.m in Sources */,
513598
91E635A41DDB0AAE00525579 /* CustomCollectionViewCell.m in Sources */,
514599
91566E681E78451B008AF47F /* MultiCustomAdCollectionViewController.m in Sources */,
515600
910CB4511A695933005E6711 /* InReadTableViewController.m in Sources */,
516601
91066C111C2B15F2003E845F /* InReadWKWebview.m in Sources */,
517602
916CFB161A68288400E36306 /* main.m in Sources */,
518603
91E635A11DDB081C00525579 /* CustomAdCollectionViewController.m in Sources */,
604+
B5FE9B6A1EBB177600649FD6 /* WebViewCollectionViewCell.m in Sources */,
519605
916CFB3F1A68303700E36306 /* MainViewController.m in Sources */,
520606
);
521607
runOnlyForDeploymentPostprocessing = 0;
@@ -643,6 +729,7 @@
643729
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
644730
CODE_SIGN_IDENTITY = "iPhone Developer";
645731
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
732+
DEVELOPMENT_TEAM = V55UEG98F8;
646733
FRAMEWORK_SEARCH_PATHS = (
647734
"$(inherited)",
648735
"$(PROJECT_DIR)/TeadsSDKDemo",
@@ -657,9 +744,10 @@
657744
);
658745
ONLY_ACTIVE_ARCH = NO;
659746
OTHER_LDFLAGS = "";
660-
PRODUCT_BUNDLE_IDENTIFIER = "tv.teads.$(PRODUCT_NAME:rfc1034identifier)";
747+
PRODUCT_BUNDLE_IDENTIFIER = tv.teads.TeadsSDKDemo;
661748
PRODUCT_NAME = "$(TARGET_NAME)";
662749
PROVISIONING_PROFILE = "";
750+
PROVISIONING_PROFILE_SPECIFIER = "";
663751
};
664752
name = Debug;
665753
};
@@ -670,6 +758,7 @@
670758
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
671759
CODE_SIGN_IDENTITY = "iPhone Developer";
672760
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
761+
DEVELOPMENT_TEAM = V55UEG98F8;
673762
FRAMEWORK_SEARCH_PATHS = (
674763
"$(inherited)",
675764
"$(PROJECT_DIR)/TeadsSDKDemo",
@@ -683,9 +772,10 @@
683772
"$(PROJECT_DIR)/TeadsSDKDemo",
684773
);
685774
OTHER_LDFLAGS = "";
686-
PRODUCT_BUNDLE_IDENTIFIER = "tv.teads.$(PRODUCT_NAME:rfc1034identifier)";
775+
PRODUCT_BUNDLE_IDENTIFIER = tv.teads.TeadsSDKDemo;
687776
PRODUCT_NAME = "$(TARGET_NAME)";
688777
PROVISIONING_PROFILE = "";
778+
PROVISIONING_PROFILE_SPECIFIER = "";
689779
};
690780
name = Release;
691781
};
@@ -694,6 +784,7 @@
694784
buildSettings = {
695785
BUNDLE_LOADER = "$(TEST_HOST)";
696786
DEBUG_INFORMATION_FORMAT = dwarf;
787+
DEVELOPMENT_TEAM = V55UEG98F8;
697788
FRAMEWORK_SEARCH_PATHS = (
698789
"$(PROJECT_DIR)",
699790
"$(inherited)",
@@ -716,6 +807,7 @@
716807
isa = XCBuildConfiguration;
717808
buildSettings = {
718809
BUNDLE_LOADER = "$(TEST_HOST)";
810+
DEVELOPMENT_TEAM = V55UEG98F8;
719811
FRAMEWORK_SEARCH_PATHS = (
720812
"$(PROJECT_DIR)",
721813
"$(inherited)",

0 commit comments

Comments
 (0)