[iOS] add megafon banner to search categories list

iphone/Maps/Images.xcassets/Search/Categories/ic_megafon_dark.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_rutaxi_dark.png",
+      "filename" : "ic_megafon_dark.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_rutaxi_dark@2x.png",
+      "filename" : "ic_megafon_dark@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_rutaxi_dark@3x.png",
+      "filename" : "ic_megafon_dark@3x.png",
       "scale" : "3x"
     }
   ],

iphone/Maps/Images.xcassets/Search/Categories/ic_megafon_light.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_rutaxi_light.png",
+      "filename" : "ic_megafon_light.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_rutaxi_light@2x.png",
+      "filename" : "ic_megafon_light@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_rutaxi_light@3x.png",
+      "filename" : "ic_megafon_light@3x.png",
       "scale" : "3x"
     }
   ],

iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.swift

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

iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.xib

@@ -19,7 +19,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" image="ic_rutaxi_light" translatesAutoresizingMaskIntoConstraints="NO" id="a9s-eh-L10" userLabel="Icon">
+                    <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">
                         <rect key="frame" x="16" y="8" width="28" height="28"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="28" id="UkL-Ob-9dH"/>
@@ -34,7 +34,7 @@
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
-                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="taxi"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="megafon"/>
                         </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">
@@ -56,7 +56,7 @@
                             <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium12"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/>
-                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="install_app"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="details"/>
                         </userDefinedRuntimeAttributes>
                         <connections>
                             <action selector="onInstall:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="0o7-8I-f79"/>
@@ -121,6 +121,6 @@
     </objects>
     <resources>
         <image name="ic_ad_close" width="8" height="8"/>
-        <image name="ic_rutaxi_light" width="40" height="40"/>
+        <image name="ic_megafon_light" width="28" height="28"/>
     </resources>
 </document>

iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift

@@ -6,13 +6,16 @@ protocol SearchCategoriesViewControllerDelegate: AnyObject {
 final class SearchCategoriesViewController: MWMTableViewController {
   private weak var delegate: SearchCategoriesViewControllerDelegate?
   private let categories: [String]
-  private let rutaxi: Bool
-  private static let rutaxiIndex = 6
+  private let showMegafonBanner: Bool
+  private let bannerUrl: URL
+  private static let megafonIndex = 6
   
   init(frameworkHelper: MWMSearchFrameworkHelper, delegate: SearchCategoriesViewControllerDelegate?) {
     self.delegate = delegate
-    self.categories = frameworkHelper.searchCategories()
-    self.rutaxi = frameworkHelper.hasMegafonCategoryBanner()
+    categories = frameworkHelper.searchCategories()
+    showMegafonBanner = frameworkHelper.hasMegafonCategoryBanner()
+    bannerUrl = frameworkHelper.megafonBannerUrl()
+
     super.init(nibName: nil, bundle: nil)
   }
   
@@ -29,11 +32,11 @@ final class SearchCategoriesViewController: MWMTableViewController {
   }
   
   override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-    return categories.count + (rutaxi ? 1 : 0)
+    return categories.count + (showMegafonBanner ? 1 : 0)
   }
   
   override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-    if rutaxi && (indexPath.row == SearchCategoriesViewController.rutaxiIndex) {
+    if showMegafonBanner && (indexPath.row == SearchCategoriesViewController.megafonIndex) {
       let cell = tableView.dequeueReusableCell(cell: SearchBannerCell.self, indexPath: indexPath)
       cell.delegate = self
       return cell
@@ -54,7 +57,7 @@ final class SearchCategoriesViewController: MWMTableViewController {
   
   func category(at indexPath: IndexPath) -> String {
     let index = indexPath.row
-    if rutaxi && (index > SearchCategoriesViewController.rutaxiIndex) {
+    if showMegafonBanner && (index > SearchCategoriesViewController.megafonIndex) {
       return categories[index - 1]
     } else {
       return categories[index]
@@ -64,11 +67,7 @@ final class SearchCategoriesViewController: MWMTableViewController {
 
 extension SearchCategoriesViewController: SearchBannerCellDelegate {
   func cellDidPressAction(_ cell: SearchBannerCell) {
-    guard let url = URL(string: "https://go.onelink.me/2944814706/86db6339") else {
-      assertionFailure()
-      return
-    }
-    UIApplication.shared.open(url)
+    UIApplication.shared.open(bannerUrl)
   }
   
   func cellDidPressClose(_ cell: SearchBannerCell) {

iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.h

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

iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.mm

@@ -35,6 +35,12 @@
                                        languages::GetCurrentNorm());
 }
 
+- (NSURL *)megafonBannerUrl
+{
+  auto urlStr = ads::GetMegafonCategoryBannerUrl();
+  return [NSURL URLWithString:@(urlStr.c_str())];
+}
+
 - (BOOL)isSearchHistoryEmpty
 {
   return GetFramework().GetLastSearchQueries().empty();