diff --git a/iphone/Maps/Images.xcassets/Banner/Contents.json b/iphone/Maps/Images.xcassets/Banner/Contents.json new file mode 100644 index 0000000000..da4a164c91 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Banner/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/Contents.json b/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/Contents.json new file mode 100644 index 0000000000..bdc19c7f76 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_ads_fb.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_ads_fb@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_ads_fb@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/ic_ads_fb.png b/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/ic_ads_fb.png new file mode 100644 index 0000000000..e05f1efd70 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/ic_ads_fb.png differ diff --git a/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/ic_ads_fb@2x.png b/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/ic_ads_fb@2x.png new file mode 100644 index 0000000000..d9af4bf007 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/ic_ads_fb@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/ic_ads_fb@3x.png b/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/ic_ads_fb@3x.png new file mode 100644 index 0000000000..2fae0821b4 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Banner/ic_ads_fb.imageset/ic_ads_fb@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/Contents.json new file mode 100644 index 0000000000..9ac300b6b0 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "img_ad_dark.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "img_ad_dark@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "img_ad_dark@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/img_ad_dark.png b/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/img_ad_dark.png new file mode 100644 index 0000000000..6a50bdc447 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/img_ad_dark.png differ diff --git a/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/img_ad_dark@2x.png b/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/img_ad_dark@2x.png new file mode 100644 index 0000000000..597cd597fe Binary files /dev/null and b/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/img_ad_dark@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/img_ad_dark@3x.png b/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/img_ad_dark@3x.png new file mode 100644 index 0000000000..f071a54dd2 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Banner/img_ad_dark.imageset/img_ad_dark@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/Contents.json new file mode 100644 index 0000000000..dbf0520f29 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "img_ad_light.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "img_ad_light@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "img_ad_light@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/img_ad_light.png b/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/img_ad_light.png new file mode 100644 index 0000000000..b3e3a9564a Binary files /dev/null and b/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/img_ad_light.png differ diff --git a/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/img_ad_light@2x.png b/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/img_ad_light@2x.png new file mode 100644 index 0000000000..04f9af706b Binary files /dev/null and b/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/img_ad_light@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/img_ad_light@3x.png b/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/img_ad_light@3x.png new file mode 100644 index 0000000000..9ccb3ebeed Binary files /dev/null and b/iphone/Maps/Images.xcassets/Banner/img_ad_light.imageset/img_ad_light@3x.png differ diff --git a/iphone/Maps/UI/Ads/AdBanner.swift b/iphone/Maps/UI/Ads/AdBanner.swift index 6be1b35033..2369e431d3 100644 --- a/iphone/Maps/UI/Ads/AdBanner.swift +++ b/iphone/Maps/UI/Ads/AdBanner.swift @@ -37,6 +37,7 @@ final class AdBanner: UITableViewCell { @IBOutlet private weak var adIconImageView: UIImageView! @IBOutlet private weak var adTitleLabel: UILabel! @IBOutlet private weak var adBodyLabel: UILabel! + @IBOutlet private weak var adPrivacyImage: UIImageView! @IBOutlet private weak var adCallToActionButtonCompact: UIButton! @IBOutlet private weak var adCallToActionButtonDetailed: UIButton! @IBOutlet private weak var adCallToActionButtonCustom: UIButton! @@ -160,6 +161,8 @@ final class AdBanner: UITableViewCell { private func configFBBanner(ad: FBNativeAd) { adType = .native + adPrivacyImage.image = #imageLiteral(resourceName: "ic_ads_fb") + let adCallToActionButtons: [UIView] if state == .search { adCallToActionButtons = [self, adCallToActionButtonCompact] @@ -192,6 +195,7 @@ final class AdBanner: UITableViewCell { private func configRBBanner(ad: MTRGNativeAd) { guard let banner = ad.banner else { return } adType = .native + adPrivacyImage.image = UIColor.isNightMode() ? #imageLiteral(resourceName: "img_ad_dark") : #imageLiteral(resourceName: "img_ad_light") MTRGNativeAd.loadImage(banner.icon, to: adIconImageView) @@ -217,6 +221,7 @@ final class AdBanner: UITableViewCell { private func configMopubBanner(ad: MopubBanner) { mpNativeAd = ad.nativeAd adType = .native + adPrivacyImage.image = UIColor.isNightMode() ? #imageLiteral(resourceName: "img_ad_dark") : #imageLiteral(resourceName: "img_ad_light") let adCallToActionButtons: [UIButton] if state == .search { @@ -247,6 +252,8 @@ final class AdBanner: UITableViewCell { private func configGoogleFallbackBanner(ad: GoogleFallbackBanner) { adType = .fallback + adPrivacyImage.image = UIColor.isNightMode() ? #imageLiteral(resourceName: "img_ad_dark") : #imageLiteral(resourceName: "img_ad_light") + fallbackAdView.subviews.forEach { $0.removeFromSuperview() } fallbackAdView.addSubview(ad) updateFallbackBannerLayout(ad: ad) diff --git a/iphone/Maps/UI/Ads/AdBanner.xib b/iphone/Maps/UI/Ads/AdBanner.xib index 7a85ec0633..2eae411bb1 100644 --- a/iphone/Maps/UI/Ads/AdBanner.xib +++ b/iphone/Maps/UI/Ads/AdBanner.xib @@ -1,11 +1,11 @@ - + - + @@ -44,26 +44,18 @@ - + - + - + + - - + - + @@ -74,7 +66,7 @@