Skip to content

1
1weather
Commit 993157e4 by Demid Merzlyakov
Options

IOS-73: remove BR prefix from NativeBannerView.

parent 80b5e714
Showing with 15 additions and 15 deletions
1Weather.xcodeproj/project.pbxproj
...@@ -154,9 +154,9 @@ ...@@ -154,9 +154,9 @@
CE13B80D262480B3007CBD4D /* AdConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7F1262480B3007CBD4D /* AdConfig.swift */; }; CE13B80D262480B3007CBD4D /* AdConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7F1262480B3007CBD4D /* AdConfig.swift */; };
CE13B80F262480B3007CBD4D /* BRNativeBannerContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7F4262480B3007CBD4D /* BRNativeBannerContainerView.swift */; }; CE13B80F262480B3007CBD4D /* BRNativeBannerContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7F4262480B3007CBD4D /* BRNativeBannerContainerView.swift */; };
CE13B812262480B3007CBD4D /* NativeAdItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7F7262480B3007CBD4D /* NativeAdItem.swift */; }; CE13B812262480B3007CBD4D /* NativeAdItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7F7262480B3007CBD4D /* NativeAdItem.swift */; };
CE13B814262480B3007CBD4D /* BRNativeBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7F9262480B3007CBD4D /* BRNativeBannerView.swift */; }; CE13B814262480B3007CBD4D /* NativeBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7F9262480B3007CBD4D /* NativeBannerView.swift */; };
CE13B816262480B3007CBD4D /* NativeAdLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7FB262480B3007CBD4D /* NativeAdLoader.swift */; }; CE13B816262480B3007CBD4D /* NativeAdLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7FB262480B3007CBD4D /* NativeAdLoader.swift */; };
CE13B817262480B3007CBD4D /* BRNativeBannerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE13B7FC262480B3007CBD4D /* BRNativeBannerView.xib */; }; CE13B817262480B3007CBD4D /* NativeBannerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE13B7FC262480B3007CBD4D /* NativeBannerView.xib */; };
CE13B818262480B3007CBD4D /* A9BidObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7FF262480B3007CBD4D /* A9BidObject.swift */; }; CE13B818262480B3007CBD4D /* A9BidObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B7FF262480B3007CBD4D /* A9BidObject.swift */; };
CE13B819262480B3007CBD4D /* A9Cache.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B800262480B3007CBD4D /* A9Cache.swift */; }; CE13B819262480B3007CBD4D /* A9Cache.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B800262480B3007CBD4D /* A9Cache.swift */; };
CE13B81A262480B3007CBD4D /* AdManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B801262480B3007CBD4D /* AdManager.swift */; }; CE13B81A262480B3007CBD4D /* AdManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE13B801262480B3007CBD4D /* AdManager.swift */; };
...@@ -400,9 +400,9 @@ ...@@ -400,9 +400,9 @@
CE13B7F1262480B3007CBD4D /* AdConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdConfig.swift; sourceTree = "<group>"; }; CE13B7F1262480B3007CBD4D /* AdConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdConfig.swift; sourceTree = "<group>"; };
CE13B7F4262480B3007CBD4D /* BRNativeBannerContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BRNativeBannerContainerView.swift; sourceTree = "<group>"; }; CE13B7F4262480B3007CBD4D /* BRNativeBannerContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BRNativeBannerContainerView.swift; sourceTree = "<group>"; };
CE13B7F7262480B3007CBD4D /* NativeAdItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NativeAdItem.swift; sourceTree = "<group>"; }; CE13B7F7262480B3007CBD4D /* NativeAdItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NativeAdItem.swift; sourceTree = "<group>"; };
CE13B7F9262480B3007CBD4D /* BRNativeBannerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BRNativeBannerView.swift; sourceTree = "<group>"; }; CE13B7F9262480B3007CBD4D /* NativeBannerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NativeBannerView.swift; sourceTree = "<group>"; };
CE13B7FB262480B3007CBD4D /* NativeAdLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NativeAdLoader.swift; sourceTree = "<group>"; }; CE13B7FB262480B3007CBD4D /* NativeAdLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NativeAdLoader.swift; sourceTree = "<group>"; };
CE13B7FC262480B3007CBD4D /* BRNativeBannerView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BRNativeBannerView.xib; sourceTree = "<group>"; }; CE13B7FC262480B3007CBD4D /* NativeBannerView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NativeBannerView.xib; sourceTree = "<group>"; };
CE13B7FD262480B3007CBD4D /* BRMoPubAdView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRMoPubAdView.h; sourceTree = "<group>"; }; CE13B7FD262480B3007CBD4D /* BRMoPubAdView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRMoPubAdView.h; sourceTree = "<group>"; };
CE13B7FF262480B3007CBD4D /* A9BidObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = A9BidObject.swift; sourceTree = "<group>"; }; CE13B7FF262480B3007CBD4D /* A9BidObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = A9BidObject.swift; sourceTree = "<group>"; };
CE13B800262480B3007CBD4D /* A9Cache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = A9Cache.swift; sourceTree = "<group>"; }; CE13B800262480B3007CBD4D /* A9Cache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = A9Cache.swift; sourceTree = "<group>"; };
...@@ -1070,8 +1070,8 @@ ...@@ -1070,8 +1070,8 @@
CE13B7F4262480B3007CBD4D /* BRNativeBannerContainerView.swift */, CE13B7F4262480B3007CBD4D /* BRNativeBannerContainerView.swift */,
CE13B7F7262480B3007CBD4D /* NativeAdItem.swift */, CE13B7F7262480B3007CBD4D /* NativeAdItem.swift */,
CE13B7FB262480B3007CBD4D /* NativeAdLoader.swift */, CE13B7FB262480B3007CBD4D /* NativeAdLoader.swift */,
CE13B7F9262480B3007CBD4D /* BRNativeBannerView.swift */, CE13B7F9262480B3007CBD4D /* NativeBannerView.swift */,
CE13B7FC262480B3007CBD4D /* BRNativeBannerView.xib */, CE13B7FC262480B3007CBD4D /* NativeBannerView.xib */,
); );
path = Native; path = Native;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1346,7 +1346,7 @@ ...@@ -1346,7 +1346,7 @@
CDD75F0D25DE68B10099ACDB /* Localizable.strings in Resources */, CDD75F0D25DE68B10099ACDB /* Localizable.strings in Resources */,
87C171ED25FF79CC00DA3464 /* LocalConfig.plist in Resources */, 87C171ED25FF79CC00DA3464 /* LocalConfig.plist in Resources */,
CE376C98261EE484000B1159 /* LaunchScreen.storyboard in Resources */, CE376C98261EE484000B1159 /* LaunchScreen.storyboard in Resources */,
CE13B817262480B3007CBD4D /* BRNativeBannerView.xib in Resources */, CE13B817262480B3007CBD4D /* NativeBannerView.xib in Resources */,
CE13B88F26248A77007CBD4D /* GoogleService-Info-Staging.plist in Resources */, CE13B88F26248A77007CBD4D /* GoogleService-Info-Staging.plist in Resources */,
CE13B88E26248A77007CBD4D /* GoogleService-Info-Production.plist in Resources */, CE13B88E26248A77007CBD4D /* GoogleService-Info-Production.plist in Resources */,
CD1237CC255D5C5C00C98139 /* Assets.xcassets in Resources */, CD1237CC255D5C5C00C98139 /* Assets.xcassets in Resources */,
...@@ -1548,7 +1548,7 @@ ...@@ -1548,7 +1548,7 @@
CE13B80F262480B3007CBD4D /* BRNativeBannerContainerView.swift in Sources */, CE13B80F262480B3007CBD4D /* BRNativeBannerContainerView.swift in Sources */,
CD6761842625B6A10079D273 /* RadarLayersCellFactory.swift in Sources */, CD6761842625B6A10079D273 /* RadarLayersCellFactory.swift in Sources */,
CD67617C2625A60B0079D273 /* MapLayersDismissAnimator.swift in Sources */, CD67617C2625A60B0079D273 /* MapLayersDismissAnimator.swift in Sources */,
CE13B814262480B3007CBD4D /* BRNativeBannerView.swift in Sources */, CE13B814262480B3007CBD4D /* NativeBannerView.swift in Sources */,
CD18728B2624763000AFEDAA /* MapLegendView.swift in Sources */, CD18728B2624763000AFEDAA /* MapLegendView.swift in Sources */,
CE13B80D262480B3007CBD4D /* AdConfig.swift in Sources */, CE13B80D262480B3007CBD4D /* AdConfig.swift in Sources */,
CE13B80A262480B3007CBD4D /* EnvironmentManager.swift in Sources */, CE13B80A262480B3007CBD4D /* EnvironmentManager.swift in Sources */,
......
1Weather/Ads/Native/BRNativeBannerContainerView.swift
...@@ -77,7 +77,7 @@ extension BRNativeBannerContainerView: NativeAdLoaderDelegate { ...@@ -77,7 +77,7 @@ extension BRNativeBannerContainerView: NativeAdLoaderDelegate {
func adLoader(_ adLoader: GADAdLoader, didReceive nativeAd: GADNativeAd) { func adLoader(_ adLoader: GADAdLoader, didReceive nativeAd: GADNativeAd) {
log.debug("Banner ad recieved (native_banner) by: \(String(describing: nativeAd.responseInfo.adNetworkClassName))") log.debug("Banner ad recieved (native_banner) by: \(String(describing: nativeAd.responseInfo.adNetworkClassName))")
guard let nativeBannerView = BRNativeBannerView.instantiateWithXib() else { return } guard let nativeBannerView = NativeBannerView.instantiateWithXib() else { return }
let nativeAdItem = NativeAdItem(nativeAd: nativeAd, adUnitId: adLoader.adUnitID) let nativeAdItem = NativeAdItem(nativeAd: nativeAd, adUnitId: adLoader.adUnitID)
......
1Weather/Ads/Native/BRNativeBannerView.swift → 1Weather/Ads/Native/NativeBannerView.swift
// //
// BRNativeBannerView.swift // NativeBannerView.swift
// BaconReader // BaconReader
// //
// Created by Rishab Dutta on 24/07/20. // Created by Rishab Dutta on 24/07/20.
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
import Foundation import Foundation
import GoogleMobileAds import GoogleMobileAds
class BRNativeBannerView: GADNativeAdView { class NativeBannerView: GADNativeAdView {
@IBOutlet weak var sponsoredLabel: UILabel! @IBOutlet weak var sponsoredLabel: UILabel!
@IBOutlet weak var adChoicesViewCustomOutlet: GADAdChoicesView! @IBOutlet weak var adChoicesViewCustomOutlet: GADAdChoicesView!
class func instantiateWithXib() -> BRNativeBannerView? { class func instantiateWithXib() -> NativeBannerView? {
let nib = UINib(nibName: "\(BRNativeBannerView.self)", bundle: nil) let nib = UINib(nibName: "\(NativeBannerView.self)", bundle: nil)
let bView = nib.instantiate(withOwner: self, options: nil).first as? BRNativeBannerView let bView = nib.instantiate(withOwner: self, options: nil).first as? NativeBannerView
bView?.setupPostXib() bView?.setupPostXib()
return bView return bView
} }
......
1Weather/Ads/Native/BRNativeBannerView.xib → 1Weather/Ads/Native/NativeBannerView.xib
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="BRNativeBannerView" customModule="_Weather" customModuleProvider="target"> <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="NativeBannerView" customModule="_Weather" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/> <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment