[ios][search] Fix search categories for routing search wheel.

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h

@@ -5,8 +5,8 @@ enum class NavigationSearchState
   MinimizedSearch,
   MinimizedGas,
   MinimizedParking,
+  MinimizedEat,
   MinimizedFood,
-  MinimizedShop,
   MinimizedATM
 };
 

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm

@@ -34,15 +34,15 @@ map<NavigationSearchState, NSString *> const kSearchStateButtonImageNames{
     {NavigationSearchState::MinimizedSearch, @"ic_routing_search_off"},
     {NavigationSearchState::MinimizedGas, @"ic_routing_fuel_off"},
     {NavigationSearchState::MinimizedParking, @"ic_routing_parking_off"},
+    {NavigationSearchState::MinimizedEat, @"ic_routing_eat_off"},
     {NavigationSearchState::MinimizedFood, @"ic_routing_food_off"},
-    {NavigationSearchState::MinimizedShop, @"ic_routing_shop_off"},
     {NavigationSearchState::MinimizedATM, @"ic_routing_atm_off"}};
 
 map<NavigationSearchState, NSString *> const kSearchButtonRequest{
     {NavigationSearchState::MinimizedGas, L(@"fuel")},
     {NavigationSearchState::MinimizedParking, L(@"parking")},
+    {NavigationSearchState::MinimizedEat, L(@"eat")},
     {NavigationSearchState::MinimizedFood, L(@"food")},
-    {NavigationSearchState::MinimizedShop, L(@"shop")},
     {NavigationSearchState::MinimizedATM, L(@"atm")}};
 
 BOOL defaultOrientation(CGSize const & size)
@@ -77,8 +77,8 @@ BOOL defaultOrientation(CGSize const & size)
 @property(weak, nonatomic) IBOutlet NSLayoutConstraint * searchButtonsSideSize;
 @property(weak, nonatomic) IBOutlet MWMButton * searchGasButton;
 @property(weak, nonatomic) IBOutlet MWMButton * searchParkingButton;
+@property(weak, nonatomic) IBOutlet MWMButton * searchEatButton;
 @property(weak, nonatomic) IBOutlet MWMButton * searchFoodButton;
-@property(weak, nonatomic) IBOutlet MWMButton * searchShopButton;
 @property(weak, nonatomic) IBOutlet MWMButton * searchATMButton;
 @property(weak, nonatomic) IBOutlet NSLayoutConstraint * turnsTopOffset;
 
@@ -196,8 +196,8 @@ BOOL defaultOrientation(CGSize const & size)
   case NavigationSearchState::MinimizedSearch:
   case NavigationSearchState::MinimizedGas:
   case NavigationSearchState::MinimizedParking:
+  case NavigationSearchState::MinimizedEat:
   case NavigationSearchState::MinimizedFood:
-  case NavigationSearchState::MinimizedShop:
   case NavigationSearchState::MinimizedATM:
     [MWMSearch clear];
     [MWMSearchManager manager].state = MWMSearchManagerStateHidden;
@@ -220,10 +220,10 @@ BOOL defaultOrientation(CGSize const & size)
     body(NavigationSearchState::MinimizedGas);
   else if (sender == self.searchParkingButton)
     body(NavigationSearchState::MinimizedParking);
+  else if (sender == self.searchEatButton)
+    body(NavigationSearchState::MinimizedEat);
   else if (sender == self.searchFoodButton)
     body(NavigationSearchState::MinimizedFood);
-  else if (sender == self.searchShopButton)
-    body(NavigationSearchState::MinimizedShop);
   else if (sender == self.searchATMButton)
     body(NavigationSearchState::MinimizedATM);
 }

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib

@@ -301,9 +301,9 @@
                                 <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="uiN-0q-kol"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GcK-FI-VXw" userLabel="Food" customClass="MWMButton">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GcK-FI-VXw" userLabel="Eat" customClass="MWMButton">
                             <rect key="frame" x="142" y="78" width="44" height="44"/>
-                            <state key="normal" image="ic_routing_food_on"/>
+                            <state key="normal" image="ic_routing_eat_on"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
                             </userDefinedRuntimeAttributes>
@@ -311,9 +311,9 @@
                                 <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="3le-Cd-rvC"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ggf-tc-U3R" userLabel="Shop" customClass="MWMButton">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ggf-tc-U3R" userLabel="Food" customClass="MWMButton">
                             <rect key="frame" x="122" y="122" width="44" height="44"/>
-                            <state key="normal" image="ic_routing_shop_on"/>
+                            <state key="normal" image="ic_routing_food_on"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
                             </userDefinedRuntimeAttributes>
@@ -423,11 +423,11 @@
                 <outlet property="searchButtonsView" destination="TMW-aw-1RT" id="bQd-e2-Jey"/>
                 <outlet property="searchButtonsViewHeight" destination="ClV-rj-I5W" id="egz-NO-EAn"/>
                 <outlet property="searchButtonsViewWidth" destination="mOu-Vw-eLb" id="SsK-HE-lHC"/>
-                <outlet property="searchFoodButton" destination="GcK-FI-VXw" id="G0h-uf-9uS"/>
+                <outlet property="searchEatButton" destination="GcK-FI-VXw" id="G0h-uf-9uS"/>
                 <outlet property="searchGasButton" destination="2Bv-7H-IZt" id="hUg-CH-kWQ"/>
                 <outlet property="searchMainButton" destination="Xna-Q1-7zW" id="v48-fa-MQE"/>
                 <outlet property="searchParkingButton" destination="RP3-01-Pj7" id="sdL-mN-sLE"/>
-                <outlet property="searchShopButton" destination="Ggf-tc-U3R" id="RJJ-mh-rwy"/>
+                <outlet property="searchFoodButton" destination="Ggf-tc-U3R" id="RJJ-mh-rwy"/>
                 <outlet property="secondTurnImageView" destination="CKi-sy-dNO" id="A29-2z-4oh"/>
                 <outlet property="secondTurnView" destination="8Zu-Ff-6p2" id="yEK-rY-S50"/>
                 <outlet property="streetNameLabel" destination="ShI-bz-5g8" id="eZd-Es-g0l"/>
@@ -463,11 +463,11 @@
     <resources>
         <image name="ic_get_position" width="20" height="20"/>
         <image name="ic_routing_atm_on" width="24" height="24"/>
-        <image name="ic_routing_food_on" width="24" height="24"/>
+        <image name="ic_routing_eat_on" width="24" height="24"/>
         <image name="ic_routing_fuel_on" width="24" height="24"/>
         <image name="ic_routing_parking_on" width="24" height="24"/>
         <image name="ic_routing_search_light" width="56" height="56"/>
-        <image name="ic_routing_shop_on" width="24" height="24"/>
+        <image name="ic_routing_food_on" width="24" height="24"/>
         <image name="ic_search_toast" width="24" height="24"/>
     </resources>
 </document>

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off.png",
+      "filename" : "ic_routing_eat_off.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off@2x.png",
+      "filename" : "ic_routing_eat_off@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off@3x.png",
+      "filename" : "ic_routing_eat_off@3x.png",
       "scale" : "3x"
     }
   ],
@@ -23,4 +23,4 @@
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_dark.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_dark.png",
+      "filename" : "ic_routing_eat_off_dark.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_dark@2x.png",
+      "filename" : "ic_routing_eat_off_dark@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_dark@3x.png",
+      "filename" : "ic_routing_eat_off_dark@3x.png",
       "scale" : "3x"
     }
   ],
@@ -20,4 +20,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_highlighted_dark.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_highlighted_light.png",
+      "filename" : "ic_routing_eat_off_highlighted_dark.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_highlighted_light@2x.png",
+      "filename" : "ic_routing_eat_off_highlighted_dark@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_highlighted_light@3x.png",
+      "filename" : "ic_routing_eat_off_highlighted_dark@3x.png",
       "scale" : "3x"
     }
   ],
@@ -20,4 +20,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_highlighted_light.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_highlighted_dark.png",
+      "filename" : "ic_routing_eat_off_highlighted_light.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_highlighted_dark@2x.png",
+      "filename" : "ic_routing_eat_off_highlighted_light@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_highlighted_dark@3x.png",
+      "filename" : "ic_routing_eat_off_highlighted_light@3x.png",
       "scale" : "3x"
     }
   ],
@@ -20,4 +20,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_light.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_light.png",
+      "filename" : "ic_routing_eat_off_light.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_light@2x.png",
+      "filename" : "ic_routing_eat_off_light@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_off_light@3x.png",
+      "filename" : "ic_routing_eat_off_light@3x.png",
       "scale" : "3x"
     }
   ],
@@ -20,4 +20,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_on.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_on.png",
+      "filename" : "ic_routing_eat_on.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_on@2x.png",
+      "filename" : "ic_routing_eat_on@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_routing_shop_on@3x.png",
+      "filename" : "ic_routing_eat_on@3x.png",
       "scale" : "3x"
     }
   ],
@@ -23,4 +23,4 @@
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off.imageset/Contents.json

@@ -23,4 +23,4 @@
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off_dark.imageset/Contents.json

@@ -20,4 +20,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off_highlighted_dark.imageset/Contents.json

@@ -20,4 +20,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off_highlighted_light.imageset/Contents.json

@@ -20,4 +20,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off_light.imageset/Contents.json

@@ -20,4 +20,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_on.imageset/Contents.json

@@ -23,4 +23,4 @@
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}