Skip to content

Commit

Permalink
feat: small enhancement
Browse files Browse the repository at this point in the history
  • Loading branch information
@OlenaPostindustria
OlenaPostindustria committed Feb 18, 2025
1 parent e3c0f26 commit 9785de1
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 54 deletions.
1 change: 0 additions & 1 deletion InternalTestApp/PrebidMobileDemoRendering/Model/TestCasesManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@ struct TestCaseManager {
}

let bannerController = PrebidOriginalAPIVideoBannerController(rootController: adapterVC)
bannerController.activatePrebidSKAdNHelper = true
bannerController.adSize = CGSize(width: 300, height: 250)
bannerController.prebidConfigId = "prebid-ita-video-outstream-original-api"
bannerController.adUnitID = "/21808260008/prebid-demo-original-api-video-banner"
Expand Down
16 changes: 4 additions & 12 deletions PrebidMobile.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@
53169F1D2D4243DE007355E8 /* UserUniqueIDTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53169F1C2D4243DE007355E8 /* UserUniqueIDTests.swift */; };
531CF21927E8FC1B005E5ABE /* LogLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 531CF21827E8FC1B005E5ABE /* LogLevel.swift */; };
53269D55282E6D0F0098550D /* ServerEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53269D54282E6D0F0098550D /* ServerEvent.swift */; };
532936862CEDE8E00056FD8D /* PrebidImpressionTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 532936852CEDE8E00056FD8D /* PrebidImpressionTracker.swift */; };
5329368C2CEE14320056FD8D /* PrebidImpressionTrackerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5329368B2CEE14320056FD8D /* PrebidImpressionTrackerProtocol.swift */; };
532936792CEB887D0056FD8D /* ArbitraryORTBService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 532936782CEB887D0056FD8D /* ArbitraryORTBService.swift */; };
5329367B2CEBE92F0056FD8D /* ArbitraryORTBHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5329367A2CEBE92F0056FD8D /* ArbitraryORTBHelper.swift */; };
5329367E2CEC92340056FD8D /* ArbitraryORTBServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5329367D2CEC92340056FD8D /* ArbitraryORTBServiceTests.swift */; };
532936862CEDE8E00056FD8D /* PrebidImpressionTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 532936852CEDE8E00056FD8D /* PrebidImpressionTracker.swift */; };
5329368C2CEE14320056FD8D /* PrebidImpressionTrackerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5329368B2CEE14320056FD8D /* PrebidImpressionTrackerProtocol.swift */; };
532936932CEF1FFE0056FD8D /* ArbitraryORTBHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 532936922CEF1FFE0056FD8D /* ArbitraryORTBHelperTests.swift */; };
533135C6282A869800AA1E4D /* BidTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533135C5282A869800AA1E4D /* BidTest.swift */; };
53322AA3282D45EE0049229D /* PrebidServerEventTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53322AA2282D45EE0049229D /* PrebidServerEventTracker.swift */; };
Expand Down Expand Up @@ -122,7 +122,6 @@
535ADE102D2E987E00DB888F /* PluginEventDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535ADE0F2D2E987E00DB888F /* PluginEventDelegate.swift */; };
535ADE122D2EA2F500DB888F /* PrebidLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535ADE112D2EA2F500DB888F /* PrebidLogger.swift */; };
536469C92D341A8100F50B6D /* PrebidSKAdNetworkHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 536469C82D341A8100F50B6D /* PrebidSKAdNetworkHelper.swift */; };
53646A652D368DFB00F50B6D /* UIApplication+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53646A642D368DFB00F50B6D /* UIApplication+Extensions.swift */; };
536A427F282D11DA0069E9B2 /* PrebidServerConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 536A427E282D11DA0069E9B2 /* PrebidServerConnection.swift */; };
536A4283282D12E80069E9B2 /* PrebidServerConnectionProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 536A4282282D12E80069E9B2 /* PrebidServerConnectionProtocol.swift */; };
5379F6BA2ABB711500B0B7A9 /* PrebidAdUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5379F6B92ABB711500B0B7A9 /* PrebidAdUnitTests.swift */; };
Expand Down Expand Up @@ -989,11 +988,11 @@
53169F1C2D4243DE007355E8 /* UserUniqueIDTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserUniqueIDTests.swift; sourceTree = "<group>"; };
531CF21827E8FC1B005E5ABE /* LogLevel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogLevel.swift; sourceTree = "<group>"; };
53269D54282E6D0F0098550D /* ServerEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerEvent.swift; sourceTree = "<group>"; };
532936852CEDE8E00056FD8D /* PrebidImpressionTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidImpressionTracker.swift; sourceTree = "<group>"; };
5329368B2CEE14320056FD8D /* PrebidImpressionTrackerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidImpressionTrackerProtocol.swift; sourceTree = "<group>"; };
532936782CEB887D0056FD8D /* ArbitraryORTBService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArbitraryORTBService.swift; sourceTree = "<group>"; };
5329367A2CEBE92F0056FD8D /* ArbitraryORTBHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArbitraryORTBHelper.swift; sourceTree = "<group>"; };
5329367D2CEC92340056FD8D /* ArbitraryORTBServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArbitraryORTBServiceTests.swift; sourceTree = "<group>"; };
532936852CEDE8E00056FD8D /* PrebidImpressionTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidImpressionTracker.swift; sourceTree = "<group>"; };
5329368B2CEE14320056FD8D /* PrebidImpressionTrackerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidImpressionTrackerProtocol.swift; sourceTree = "<group>"; };
532936922CEF1FFE0056FD8D /* ArbitraryORTBHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArbitraryORTBHelperTests.swift; sourceTree = "<group>"; };
533135C5282A869800AA1E4D /* BidTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BidTest.swift; sourceTree = "<group>"; };
53322AA2282D45EE0049229D /* PrebidServerEventTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidServerEventTracker.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1034,7 +1033,6 @@
535ADE0F2D2E987E00DB888F /* PluginEventDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginEventDelegate.swift; sourceTree = "<group>"; };
535ADE112D2EA2F500DB888F /* PrebidLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidLogger.swift; sourceTree = "<group>"; };
536469C82D341A8100F50B6D /* PrebidSKAdNetworkHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidSKAdNetworkHelper.swift; sourceTree = "<group>"; };
53646A642D368DFB00F50B6D /* UIApplication+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+Extensions.swift"; sourceTree = "<group>"; };
536A427E282D11DA0069E9B2 /* PrebidServerConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidServerConnection.swift; sourceTree = "<group>"; };
536A4282282D12E80069E9B2 /* PrebidServerConnectionProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidServerConnectionProtocol.swift; sourceTree = "<group>"; };
5379F6B92ABB711500B0B7A9 /* PrebidAdUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidAdUnitTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1997,7 +1995,6 @@
53F35F6E292BAE9B001C1183 /* UserDefaults+Extensions.swift */,
53842BBB29E565030069A4B7 /* NSString+Extensions.swift */,
53D3C3872C2BEE1E0074D99B /* URL+Extensions.swift */,
53646A642D368DFB00F50B6D /* UIApplication+Extensions.swift */,
);
path = Utils;
sourceTree = "<group>";
Expand Down Expand Up @@ -2108,9 +2105,7 @@
5BC3764E271F1CFD00444D5E /* ExtensionsAndWrappers */ = {
isa = PBXGroup;
children = (
5BC37666271F1CFD00444D5E /* NSTimer */,
5BC37652271F1CFD00444D5E /* Exposure */,
5BC37666271F1CFD00444D5E /* NSTimer */,
5BC37659271F1CFD00444D5E /* NSDictionary+PBMExtensions.h */,
5BC3765F271F1CFD00444D5E /* NSDictionary+PBMExtensions.m */,
5BC37660271F1CFD00444D5E /* NSException+PBMExtensions.h */,
Expand All @@ -2124,7 +2119,6 @@
5BC37666271F1CFD00444D5E /* NSTimer */,
5BC3765B271F1CFD00444D5E /* PBMTouchDownRecognizer.h */,
5BC3766E271F1CFD00444D5E /* PBMTouchDownRecognizer.m */,
53C925012990FB30009E6F94 /* String+Extensions.swift */,
53A0E7E32CDCAF74007887F5 /* UIApplication+Extensions.swift */,
5BC37650271F1CFD00444D5E /* UIView+PBMExtensions.h */,
5BC37661271F1CFD00444D5E /* UIView+PBMExtensions.m */,
Expand Down Expand Up @@ -4245,7 +4239,6 @@
5BC37AC6271F1D0100444D5E /* PBMSKAdNetworksParameterBuilder.m in Sources */,
53CF5B3729DC690600613E84 /* VideoAdUnit.swift in Sources */,
5BC37A1C271F1D0000444D5E /* PBMErrorFamily.m in Sources */,
A9750D7A2ABB9A300066E4E6 /* PluginEventListener.swift in Sources */,
FAEE4D28262DC2B200AD9966 /* PbWebViewSearchError.swift in Sources */,
5BC37990271F1D0000444D5E /* PBMVideoCreative.m in Sources */,
FAEE4D2A262DC2B200AD9966 /* IMAUtils.swift in Sources */,
Expand All @@ -4264,7 +4257,6 @@
FAEE4D16262DC2B200AD9966 /* NativeAdEventDelegate.swift in Sources */,
5BC379B2271F1D0000444D5E /* PBMCreativeModelCollectionMakerVAST.m in Sources */,
929638C727ABD66D00D30F3D /* JsonDecodable.swift in Sources */,
53646A652D368DFB00F50B6D /* UIApplication+Extensions.swift in Sources */,
5BC37A8E271F1D0000444D5E /* RewardedAdUnit.swift in Sources */,
5BC37A9A271F1D0000444D5E /* BannerAdLoaderDelegate.swift in Sources */,
5BC37AF9271F2D3500444D5E /* NativeDataAssetType.swift in Sources */,
Expand Down
15 changes: 6 additions & 9 deletions PrebidMobile/AdUnits/Native/NativeAd.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@ public class NativeAd: NSObject, CacheExpiryDelegate {
return nil
}

let macrosHelper = PBMORTBMacrosHelper(bid: rawBid)
rawBid.adm = macrosHelper.replaceMacros(in: rawBid.adm)
rawBid.nurl = macrosHelper.replaceMacros(in: rawBid.nurl)
let bid = Bid(bid: rawBid)

let ad = NativeAd()
ad.bid = bid
Expand Down Expand Up @@ -377,13 +375,12 @@ public class NativeAd: NSObject, CacheExpiryDelegate {
}

private func fireClickTrackers() {
guard let clickTrackersURLs = nativeAdMarkup?.link?.clicktrackers else { return }

if clickTrackersURLs.count > 0 {
TrackerManager.shared.fireTrackerURLArray(arrayWithURLs: clickTrackersURLs) {
_ in
}
guard let clickTrackersURLs = nativeAdMarkup?.link?.clicktrackers,
clickTrackersURLs.count > 0 else {
return
}

TrackerManager.shared.fireTrackerURLArray(arrayWithURLs: clickTrackersURLs) { _ in }
}

private func presentSKStoreProductViewController(with productParameters: [String: Any]) {
Expand Down
13 changes: 13 additions & 0 deletions PrebidMobile/PrebidMobileRendering/ExtensionsAndWrappers/UIApplication+Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,17 @@ extension UIApplication {
return UIApplication.shared.keyWindow
}
}

static func topViewController() -> UIViewController? {
var topController = UIApplication.shared
.windows
.filter({ $0.isKeyWindow }).first?
.rootViewController

while let presentedViewController = topController?.presentedViewController {
topController = presentedViewController
}

return topController
}
}
32 changes: 0 additions & 32 deletions PrebidMobile/Utils/UIApplication+Extensions.swift
View file

This file was deleted.

0 comments on commit 9785de1

Please sign in to comment.