AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ads][ios] Citymobil search category banner is added

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-10-16 19:00:42 +03:00 • committed by Anatoliy V. Tomilov
parent 405ee071c2
commit a083cee218
16 changed files with 204 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h
View file

@ -11,6 +11,7 @@ typedef NS_ENUM(NSInteger, MWMBannerType) {
MWMBannerTypeSkyeng,
MWMBannerTypeBookmarkCatalog,
MWMBannerTypeMastercardSberbank,
MWMBannerTypeCitymobil,
};
NS_ASSUME_NONNULL_BEGIN

2
iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm
View file

@ -22,6 +22,8 @@ static MWMBannerType ConvertBannerType(ads::Banner::Type coreType) {
return MWMBannerTypeBookmarkCatalog;
case ads::Banner::Type::MastercardSberbank:
return MWMBannerTypeMastercardSberbank;
case ads::Banner::Type::Citymobil:
return MWMBannerTypeCitymobil;
}
}

1
iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.h
View file

@ -7,6 +7,7 @@ NS_ASSUME_NONNULL_BEGIN
- (NSArray<NSString *> *)searchCategories;
- (BOOL)hasMegafonCategoryBanner;
- (NSURL *)megafonBannerUrl;
- (NSURL *)citymobilBannerUrl;
- (BOOL)isSearchHistoryEmpty;
- (NSArray<NSString *> *)lastSearchQueries;

13
iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm
View file

@ -1,5 +1,6 @@
#import "MWMSearchFrameworkHelper.h"
#include "partners_api/ads/ads_engine.hpp"
#include "partners_api/megafon_countries.hpp"
#include "platform/preferred_languages.hpp"
@ -44,6 +45,18 @@
return [NSURL URLWithString:@(urlStr.c_str())];
}
- (NSURL *)citymobilBannerUrl
{
auto const & f = GetFramework();
auto const pos = f.GetCurrentPosition();
auto const banners = f.GetAdsEngine().GetSearchCategoryBanners(pos);
if (banners.empty() || banners.begin()->m_type != ads::Banner::Type::Citymobil)
return [NSURL URLWithString:@("")];;
return [NSURL URLWithString:@(banners.begin()->m_value.c_str())];
}
- (BOOL)isSearchHistoryEmpty
{
return GetFramework().GetSearchAPI().GetLastSearchQueries().empty();

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift
View file

@ -15,7 +15,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
case .vezet: return #imageLiteral(resourceName: "ic_taxi_logo_vezet")
case .freenow: return #imageLiteral(resourceName: "ic_logo_freenow")
case .yango: return #imageLiteral(resourceName: "ic_taxi_logo_yango")
case .citymobil: return #imageLiteral(resourceName: "ic_taxi_logo_citymobil")
case .citymobil: return #imageLiteral(resourceName: "ic_taxi_logo_citymobil_light")
}
}

1
iphone/Maps/Core/Ads/MWMBannerHelpers.h
View file

@ -21,6 +21,7 @@ static inline MWMBannerType MatchBannerType(ads::Banner::Type coreType)
case ads::Banner::Type::BookmarkCatalog: return MWMBannerTypeBookmarkCatalog;
case ads::Banner::Type::MastercardSberbank:
return MWMBannerTypeMastercardSberbank;
case ads::Banner::Type::Citymobil: return MWMBannerTypeCitymobil;
}
}

12
iphone/Maps/Images.xcassets/ic_taxi_logo_citymobil_dark.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "ic_taxi_logo_citymobil_dark.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

125
iphone/Maps/Images.xcassets/ic_taxi_logo_citymobil_dark.imageset/ic_taxi_logo_citymobil_dark.pdf vendored Normal file
View file

@ -0,0 +1,125 @@
%PDF-1.7
1 0 obj
<< >>
endobj
2 0 obj
<< /Length 3 0 R >>
stream
/DeviceRGB CS
/DeviceRGB cs
q
1.000000 0.000000 -0.000000 1.000000 1.004761 6.638306 cm
0.819608 0.454902 0.164706 scn
0.542246 5.345305 m
0.243076 5.345305 0.000000 5.588382 0.000000 5.887552 c
0.000000 6.623011 0.000000 7.913180 0.000000 8.511520 c
0.000000 8.714084 0.087258 8.910414 0.239959 9.044417 c
0.645085 9.405914 1.461570 10.138257 1.900975 10.534034 c
2.072375 10.686735 2.327916 10.686735 2.499315 10.534034 c
2.941837 10.138257 3.758322 9.405914 4.160332 9.044417 c
4.313034 8.907297 4.400290 8.714084 4.400290 8.511520 c
4.400290 7.913180 4.400290 6.623011 4.400290 5.887552 c
4.400290 5.588382 4.157215 5.345305 3.858045 5.345305 c
3.010397 5.345305 1.386778 5.345305 0.542246 5.345305 c
h
18.137177 5.345305 m
17.838005 5.345305 17.594929 5.588382 17.594929 5.887552 c
17.594929 6.623011 17.594929 7.913180 17.594929 8.511520 c
17.594929 8.714084 17.682188 8.910414 17.834888 9.044417 c
18.240015 9.405914 19.056499 10.138257 19.495905 10.534034 c
19.667305 10.686735 19.922846 10.686735 20.094246 10.534034 c
20.536768 10.138257 21.353252 9.405914 21.755260 9.044417 c
21.907963 8.907297 21.995220 8.714084 21.995220 8.511520 c
21.995220 7.913180 21.995220 6.623011 21.995220 5.887552 c
21.995220 5.588382 21.752144 5.345305 21.452974 5.345305 c
20.608442 5.345305 18.984823 5.345305 18.137177 5.345305 c
h
9.339711 5.345305 m
9.040541 5.345305 8.797464 5.588382 8.797464 5.887552 c
8.797464 6.623011 8.797464 7.913180 8.797464 8.511520 c
8.797464 8.714084 8.884723 8.910414 9.037424 9.044417 c
9.442551 9.405914 10.259034 10.138257 10.698441 10.534034 c
10.869840 10.686735 11.125381 10.686735 11.296781 10.534034 c
11.739303 10.138257 12.555787 9.405914 12.957796 9.044417 c
13.110497 8.907297 13.197756 8.714084 13.197756 8.511520 c
13.197756 7.913180 13.197756 6.623011 13.197756 5.887552 c
13.197756 5.588382 12.954679 5.345305 12.655510 5.345305 c
11.807861 5.345305 10.184243 5.345305 9.339711 5.345305 c
h
13.740000 0.038157 m
13.440830 0.038157 13.197756 0.281233 13.197756 0.580403 c
13.197756 1.315863 13.197756 2.606030 13.197756 3.204370 c
13.197756 3.406933 13.285014 3.603265 13.437716 3.737268 c
13.842841 4.098765 14.659326 4.831108 15.098731 5.226884 c
15.270131 5.379586 15.525672 5.379586 15.697072 5.226884 c
16.139593 4.831108 16.956078 4.098765 17.358088 3.737268 c
17.510788 3.600148 17.598047 3.406933 17.598047 3.204370 c
17.598047 2.606030 17.598047 1.315863 17.598047 0.580403 c
17.598047 0.281233 17.354971 0.038157 17.055801 0.038157 c
16.208153 0.038157 14.584532 0.038157 13.740000 0.038157 c
h
8.255220 0.038157 m
4.939420 0.038157 l
4.640250 0.038157 4.397174 0.281233 4.397174 0.580403 c
4.397174 1.315863 4.397174 2.606030 4.397174 3.204370 c
4.397174 3.406933 4.484432 3.603265 4.637134 3.737268 c
5.042260 4.098765 5.858744 4.831108 6.298150 5.226884 c
6.469549 5.379586 6.725091 5.379586 6.896490 5.226884 c
7.339012 4.831108 8.155496 4.098765 8.557506 3.737268 c
8.710207 3.600148 8.797464 3.406933 8.797464 3.204370 c
8.797464 2.606030 8.797464 1.315863 8.797464 0.580403 c
8.797464 0.281233 8.554390 0.038157 8.255220 0.038157 c
h
f*
n
Q
endstream
endobj
3 0 obj
3099
endobj
4 0 obj
<< /Annots []
/Type /Page
/MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
/Resources 1 0 R
/Contents 2 0 R
/Parent 5 0 R
>>
endobj
5 0 obj
<< /Kids [ 4 0 R ]
/Count 1
/Type /Pages
>>
endobj
6 0 obj
<< /Type /Catalog
/Pages 5 0 R
>>
endobj
xref
0 7
0000000000 65535 f
0000000010 00000 n
0000000034 00000 n
0000003189 00000 n
0000003212 00000 n
0000003385 00000 n
0000003459 00000 n
trailer
<< /ID [ (some) (id) ]
/Root 6 0 R
/Size 7
>>
startxref
3518
%%EOF

0
iphone/Maps/Images.xcassets/ic_taxi_logo_citymobil.imageset/Contents.json → iphone/Maps/Images.xcassets/ic_taxi_logo_citymobil_light.imageset/Contents.json vendored
View file

0
iphone/Maps/Images.xcassets/ic_taxi_logo_citymobil.imageset/ic_taxi_logo_citymobil.pdf → iphone/Maps/Images.xcassets/ic_taxi_logo_citymobil_light.imageset/ic_taxi_logo_citymobil.pdf vendored
View file

2
iphone/Maps/UI/PlacePage/Components/TaxiViewController.swift
View file

@ -34,7 +34,7 @@ class TaxiViewController: UIViewController {
taxiImageView.image = UIImage(named: "ic_taxi_logo_yango")
taxiNameLabel.text = L("yango_taxi_title")
case .citymobil:
taxiImageView.image = UIImage(named: "ic_taxi_logo_citymobil")
taxiImageView.image = UIImage(named: "ic_taxi_logo_citymobil_light")
taxiNameLabel.text = L("citymobil_taxi_title")
@unknown default:
fatalError()

2
iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.swift
View file

@ -9,7 +9,7 @@ class SearchBannerCell: MWMTableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
taxiImageView.mwm_name = "ic_megafon"
taxiImageView.mwm_name = "ic_taxi_logo_citymobil"
}
@IBAction private func onInstall(_ sender: UIButton) {

14
iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.xib
View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -15,7 +17,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" image="ic_megafon_light" translatesAutoresizingMaskIntoConstraints="NO" id="a9s-eh-L10" userLabel="Icon">
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" image="ic_taxi_logo_citymobil_light" translatesAutoresizingMaskIntoConstraints="NO" id="a9s-eh-L10" userLabel="Icon">
<rect key="frame" x="16" y="8" width="28" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="28" id="UkL-Ob-9dH"/>
@ -29,7 +31,7 @@
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="megafon"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="taxi"/>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M1X-p4-OlN">
@ -45,7 +47,7 @@
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchInstallButton"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="details"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="taxi_category_order"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="onInstall:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="0o7-8I-f79"/>
@ -110,6 +112,6 @@
</objects>
<resources>
<image name="ic_ad_close" width="8" height="8"/>
<image name="ic_megafon_light" width="28" height="28"/>
<image name="ic_taxi_logo_citymobil_light" width="24" height="24"/>
</resources>
</document>

31
iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
View file

@ -6,16 +6,16 @@ protocol SearchCategoriesViewControllerDelegate: AnyObject {
final class SearchCategoriesViewController: MWMTableViewController {
private weak var delegate: SearchCategoriesViewControllerDelegate?
private let categories: [String]
private let showMegafonBanner: Bool
private let showCitymobilBanner: Bool
private let bannerUrl: URL
private static let megafonIndex = 6
private var bannerShown = false
private static let citymobilIndex = 6
init(frameworkHelper: MWMSearchFrameworkHelper, delegate: SearchCategoriesViewControllerDelegate?) {
self.delegate = delegate
categories = frameworkHelper.searchCategories()
showMegafonBanner = frameworkHelper.hasMegafonCategoryBanner()
bannerUrl = frameworkHelper.megafonBannerUrl()
bannerUrl = frameworkHelper.citymobilBannerUrl()
showCitymobilBanner = !bannerUrl.absoluteString.isEmpty
super.init(nibName: nil, bundle: nil)
}
@ -33,13 +33,17 @@ final class SearchCategoriesViewController: MWMTableViewController {
}
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return categories.count + (showMegafonBanner ? 1 : 0)
return categories.count + (showCitymobilBanner ? 1 : 0)
}
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if showMegafonBanner && (indexPath.row == SearchCategoriesViewController.megafonIndex) {
if showCitymobilBanner && (indexPath.row == SearchCategoriesViewController.citymobilIndex) {
let cell = tableView.dequeueReusableCell(cell: SearchBannerCell.self, indexPath: indexPath)
cell.delegate = self
if (!bannerShown) {
bannerShown = true;
Statistics.logEvent(kStatSearchSponsoredShow);
}
return cell
}
@ -49,6 +53,10 @@ final class SearchCategoriesViewController: MWMTableViewController {
}
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if showCitymobilBanner && (indexPath.row == SearchCategoriesViewController.citymobilIndex) {
openBanner()
return
}
let selectedCategory = category(at: indexPath)
delegate?.categoriesViewController(self, didSelect: selectedCategory)
@ -58,17 +66,22 @@ final class SearchCategoriesViewController: MWMTableViewController {
func category(at indexPath: IndexPath) -> String {
let index = indexPath.row
if showMegafonBanner && (index > SearchCategoriesViewController.megafonIndex) {
if showCitymobilBanner && (index > SearchCategoriesViewController.citymobilIndex) {
return categories[index - 1]
} else {
return categories[index]
}
}
func openBanner() {
UIApplication.shared.open(bannerUrl)
Statistics.logEvent(kStatSearchSponsoredSelect);
}
}
extension SearchCategoriesViewController: SearchBannerCellDelegate {
func cellDidPressAction(_ cell: SearchBannerCell) {
UIApplication.shared.open(bannerUrl)
openBanner()
}
func cellDidPressClose(_ cell: SearchBannerCell) {

16
xcode/map/map.xcodeproj/project.pbxproj
View file

@ -95,10 +95,10 @@
3DA5723120C195ED007BDE27 /* everywhere_search_callback.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DA5722D20C195EC007BDE27 /* everywhere_search_callback.hpp */; };
3DA5723220C195ED007BDE27 /* everywhere_search_callback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA5722E20C195EC007BDE27 /* everywhere_search_callback.cpp */; };
3DA5723320C195ED007BDE27 /* viewport_search_callback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */; };
3DA6BCE92539F4ED00DF0DA5 /* ads_engine_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DA6BCE72539F4EC00DF0DA5 /* ads_engine_delegate.hpp */; };
3DA6BCEA2539F4ED00DF0DA5 /* ads_engine_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA6BCE82539F4EC00DF0DA5 /* ads_engine_delegate.cpp */; };
3DBD7B92240D523400ED9FE8 /* elevation_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B90240D523300ED9FE8 /* elevation_info.cpp */; };
3DBD7B93240D523400ED9FE8 /* elevation_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7B91240D523300ED9FE8 /* elevation_info.hpp */; };
3DBD7BE124237FA600ED9FE8 /* download_on_map_ads_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BDF24237FA500ED9FE8 /* download_on_map_ads_delegate.hpp */; };
3DBD7BE224237FA600ED9FE8 /* download_on_map_ads_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BE024237FA600ED9FE8 /* download_on_map_ads_delegate.cpp */; };
3DD1166621888AAC007A2ED4 /* notification_queue_serdes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1165F21888AAC007A2ED4 /* notification_queue_serdes.cpp */; };
3DD1166721888AAC007A2ED4 /* notification_queue.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1166021888AAC007A2ED4 /* notification_queue.hpp */; };
3DD1166821888AAC007A2ED4 /* notification_queue_storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1166121888AAC007A2ED4 /* notification_queue_storage.hpp */; };
@ -401,10 +401,10 @@
3DA5722D20C195EC007BDE27 /* everywhere_search_callback.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = everywhere_search_callback.hpp; sourceTree = "<group>"; };
3DA5722E20C195EC007BDE27 /* everywhere_search_callback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = everywhere_search_callback.cpp; sourceTree = "<group>"; };
3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viewport_search_callback.cpp; sourceTree = "<group>"; };
3DA6BCE72539F4EC00DF0DA5 /* ads_engine_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ads_engine_delegate.hpp; sourceTree = "<group>"; };
3DA6BCE82539F4EC00DF0DA5 /* ads_engine_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ads_engine_delegate.cpp; sourceTree = "<group>"; };
3DBD7B90240D523300ED9FE8 /* elevation_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = elevation_info.cpp; sourceTree = "<group>"; };
3DBD7B91240D523300ED9FE8 /* elevation_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = elevation_info.hpp; sourceTree = "<group>"; };
3DBD7BDF24237FA500ED9FE8 /* download_on_map_ads_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = download_on_map_ads_delegate.hpp; sourceTree = "<group>"; };
3DBD7BE024237FA600ED9FE8 /* download_on_map_ads_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = download_on_map_ads_delegate.cpp; sourceTree = "<group>"; };
3DD1165F21888AAC007A2ED4 /* notification_queue_serdes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_queue_serdes.cpp; sourceTree = "<group>"; };
3DD1166021888AAC007A2ED4 /* notification_queue.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_queue.hpp; sourceTree = "<group>"; };
3DD1166121888AAC007A2ED4 /* notification_queue_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_queue_storage.hpp; sourceTree = "<group>"; };
@ -916,6 +916,8 @@
675345BD1A4054AD00A0A8C3 /* map */ = {
isa = PBXGroup;
children = (
3DA6BCE82539F4EC00DF0DA5 /* ads_engine_delegate.cpp */,
3DA6BCE72539F4EC00DF0DA5 /* ads_engine_delegate.hpp */,
3DE28A7624BE05220009465C /* booking_utils.cpp */,
3DE28A7724BE05220009465C /* booking_utils.hpp */,
3D089870247FF5FE00837783 /* layers_statistics.cpp */,
@ -926,8 +928,6 @@
3D035CA72451960400C21B57 /* guides_on_map_delegate.hpp */,
BBBB5ED024460BF9000CBFF4 /* guides_manager.cpp */,
BBBB5ED124460BF9000CBFF4 /* guides_manager.hpp */,
3DBD7BE024237FA600ED9FE8 /* download_on_map_ads_delegate.cpp */,
3DBD7BDF24237FA500ED9FE8 /* download_on_map_ads_delegate.hpp */,
BB1C0195241BF73C0067FD5C /* track_mark.cpp */,
BB1C0194241BF73C0067FD5C /* track_mark.hpp */,
3DBD7B90240D523300ED9FE8 /* elevation_info.cpp */,
@ -1108,7 +1108,6 @@
3D4E99821FB462B60025B48C /* everywhere_search_params.hpp in Headers */,
675346751A4054E800A0A8C3 /* mwm_url.hpp in Headers */,
6753464B1A4054E800A0A8C3 /* bookmark.hpp in Headers */,
3DBD7BE124237FA600ED9FE8 /* download_on_map_ads_delegate.hpp in Headers */,
3D18DC3C22956DD100A583A6 /* framework_light_delegate.hpp in Headers */,
4564FA82209497A70043CCFB /* bookmark_catalog.hpp in Headers */,
3DA5714020B5CC80007BDE27 /* booking_filter_params.hpp in Headers */,
@ -1130,6 +1129,7 @@
3DD1166C21888AAD007A2ED4 /* notification_queue_serdes.hpp in Headers */,
BB1C0196241BF73C0067FD5C /* track_mark.hpp in Headers */,
3D0D2F7423D854AA00945C8D /* tips_api_delegate.hpp in Headers */,
3DA6BCE92539F4ED00DF0DA5 /* ads_engine_delegate.hpp in Headers */,
675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */,
3DA5714320B5CC80007BDE27 /* booking_filter_processor.hpp in Headers */,
F6B2830A1C1B03320081957A /* gps_track.hpp in Headers */,
@ -1370,9 +1370,9 @@
F6D2CE7E1EDEB7F500636DFD /* routing_manager.cpp in Sources */,
3D089872247FF5FE00837783 /* layers_statistics.cpp in Sources */,
3D74ABBE1EA76F1D0063A898 /* local_ads_supported_types.cpp in Sources */,
3DBD7BE224237FA600ED9FE8 /* download_on_map_ads_delegate.cpp in Sources */,
45A2D9D51F7556EB003310A0 /* user.cpp in Sources */,
0C2B73DE1E92AB9900530BB8 /* local_ads_manager.cpp in Sources */,
3DA6BCEA2539F4ED00DF0DA5 /* ads_engine_delegate.cpp in Sources */,
F6B283071C1B03320081957A /* gps_track_storage.cpp in Sources */,
3DE28A7824BE05220009465C /* booking_utils.cpp in Sources */,
670E39401C46C5C700E9C0A6 /* gps_tracker.cpp in Sources */,

8
xcode/partners_api/partners_api.xcodeproj/project.pbxproj
View file

@ -45,6 +45,8 @@
3DA6BCDF2535B52E00DF0DA5 /* citymobil_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DA6BCDD2535B52E00DF0DA5 /* citymobil_api.hpp */; };
3DA6BCE02535B52E00DF0DA5 /* citymobil_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA6BCDE2535B52E00DF0DA5 /* citymobil_api.cpp */; };
3DA6BCE22535B53C00DF0DA5 /* citymobil_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA6BCE12535B53C00DF0DA5 /* citymobil_tests.cpp */; };
3DA6BCE52538B3B600DF0DA5 /* citymobil_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA6BCE32538B3B500DF0DA5 /* citymobil_ads.cpp */; };
3DA6BCE62538B3B600DF0DA5 /* citymobil_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DA6BCE42538B3B500DF0DA5 /* citymobil_ads.hpp */; };
3DBD7B9824112DE100ED9FE8 /* freenow_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B9624112DE000ED9FE8 /* freenow_api.cpp */; };
3DBD7B9924112DE100ED9FE8 /* freenow_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7B9724112DE100ED9FE8 /* freenow_api.hpp */; };
3DBD7B9B24112DEA00ED9FE8 /* freenow_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B9A24112DEA00ED9FE8 /* freenow_tests.cpp */; };
@ -171,6 +173,8 @@
3DA6BCDD2535B52E00DF0DA5 /* citymobil_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = citymobil_api.hpp; sourceTree = "<group>"; };
3DA6BCDE2535B52E00DF0DA5 /* citymobil_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = citymobil_api.cpp; sourceTree = "<group>"; };
3DA6BCE12535B53C00DF0DA5 /* citymobil_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = citymobil_tests.cpp; sourceTree = "<group>"; };
3DA6BCE32538B3B500DF0DA5 /* citymobil_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = citymobil_ads.cpp; sourceTree = "<group>"; };
3DA6BCE42538B3B500DF0DA5 /* citymobil_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = citymobil_ads.hpp; sourceTree = "<group>"; };
3DBC1C501E4B14810016897F /* facebook_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = facebook_tests.cpp; sourceTree = "<group>"; };
3DBD7B9624112DE000ED9FE8 /* freenow_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = freenow_api.cpp; sourceTree = "<group>"; };
3DBD7B9724112DE100ED9FE8 /* freenow_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = freenow_api.hpp; sourceTree = "<group>"; };
@ -298,6 +302,8 @@
3DBD7BE524251BF000ED9FE8 /* ads */ = {
isa = PBXGroup;
children = (
3DA6BCE32538B3B500DF0DA5 /* citymobil_ads.cpp */,
3DA6BCE42538B3B500DF0DA5 /* citymobil_ads.hpp */,
3DCF64A724DC0A0200C49963 /* mastercard_sber_ads.cpp */,
3DCF64A624DC0A0200C49963 /* mastercard_sber_ads.hpp */,
3DBD7BE624251BF000ED9FE8 /* bookmark_catalog_ads.cpp */,
@ -488,6 +494,7 @@
3DA5713420B57358007BDE27 /* booking_params_base.hpp in Headers */,
3DBD7C0224251BF000ED9FE8 /* tinkoff_insurance_ads.hpp in Headers */,
3D18DC4122956DFA00A583A6 /* promo_api.hpp in Headers */,
3DA6BCE62538B3B600DF0DA5 /* citymobil_ads.hpp in Headers */,
3D1775A82318198700F8889C /* promo_catalog_types.hpp in Headers */,
3DBD7C1524251BF000ED9FE8 /* bookmark_catalog_ads.hpp in Headers */,
3DCD415420DAB33700143533 /* booking_block_params.hpp in Headers */,
@ -653,6 +660,7 @@
3DF01C2D20652463005DDF8C /* taxi_places.cpp in Sources */,
3DBD7C0724251BF000ED9FE8 /* mts_ads.cpp in Sources */,
F67E75251DB8F06F00D6741F /* opentable_api.cpp in Sources */,
3DA6BCE52538B3B600DF0DA5 /* citymobil_ads.cpp in Sources */,
3DBD7C1F24251C1100ED9FE8 /* mts_tests.cpp in Sources */,
3DCF64A924DC0A0300C49963 /* mastercard_sber_ads.cpp in Sources */,
3D18DC4422956E0900A583A6 /* promo_tests.cpp in Sources */,