From 7fd5957fe450f2b495835514238463f46bb39308 Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Fri, 16 Aug 2019 16:05:41 +0300 Subject: [PATCH] [ios][search] Fix search categories for routing search wheel. --- .../Views/MWMNavigationInfoView.h | 2 +- .../Views/MWMNavigationInfoView.mm | 12 ++++++------ .../Views/MWMNavigationInfoView.xib | 16 ++++++++-------- .../Contents.json | 8 ++++---- .../ic_routing_eat_off.png | Bin 0 -> 298 bytes .../ic_routing_eat_off@2x.png | Bin 0 -> 538 bytes .../ic_routing_eat_off@3x.png | Bin 0 -> 778 bytes .../Contents.json | 8 ++++---- .../ic_routing_eat_off_dark.png | Bin 0 -> 2317 bytes .../ic_routing_eat_off_dark@2x.png | Bin 0 -> 5793 bytes .../ic_routing_eat_off_dark@3x.png | Bin 0 -> 9937 bytes .../Contents.json | 8 ++++---- .../ic_routing_eat_off_highlighted_dark.png | Bin 0 -> 2347 bytes ...ic_routing_eat_off_highlighted_dark@2x.png | Bin 0 -> 5726 bytes ...ic_routing_eat_off_highlighted_dark@3x.png | Bin 0 -> 9599 bytes .../Contents.json | 8 ++++---- .../ic_routing_eat_off_highlighted_light.png | Bin 0 -> 964 bytes ...c_routing_eat_off_highlighted_light@2x.png | Bin 0 -> 1886 bytes ...c_routing_eat_off_highlighted_light@3x.png | Bin 0 -> 2907 bytes .../Contents.json | 8 ++++---- .../ic_routing_eat_off_light.png | Bin 0 -> 1023 bytes .../ic_routing_eat_off_light@2x.png | Bin 0 -> 1975 bytes .../ic_routing_eat_off_light@3x.png | Bin 0 -> 3017 bytes .../Contents.json | 8 ++++---- .../ic_routing_eat_on.png | Bin 0 -> 222 bytes .../ic_routing_eat_on@2x.png | Bin 0 -> 367 bytes .../ic_routing_eat_on@3x.png | Bin 0 -> 523 bytes .../Contents.json | 2 +- .../ic_routing_food_off.png | Bin 298 -> 253 bytes .../ic_routing_food_off@2x.png | Bin 538 -> 441 bytes .../ic_routing_food_off@3x.png | Bin 778 -> 628 bytes .../Contents.json | 2 +- .../ic_routing_food_off_dark.png | Bin 2317 -> 2446 bytes .../ic_routing_food_off_dark@2x.png | Bin 5793 -> 5991 bytes .../ic_routing_food_off_dark@3x.png | Bin 9937 -> 10203 bytes .../Contents.json | 2 +- .../ic_routing_food_off_highlighted_dark.png | Bin 2347 -> 2310 bytes ...c_routing_food_off_highlighted_dark@2x.png | Bin 5726 -> 5870 bytes ...c_routing_food_off_highlighted_dark@3x.png | Bin 9599 -> 9814 bytes .../Contents.json | 2 +- .../ic_routing_food_off_highlighted_light.png | Bin 964 -> 892 bytes ..._routing_food_off_highlighted_light@2x.png | Bin 1886 -> 1778 bytes ..._routing_food_off_highlighted_light@3x.png | Bin 2907 -> 2704 bytes .../Contents.json | 2 +- .../ic_routing_food_off_light.png | Bin 1023 -> 955 bytes .../ic_routing_food_off_light@2x.png | Bin 1975 -> 1855 bytes .../ic_routing_food_off_light@3x.png | Bin 3017 -> 2834 bytes .../ic_routing_food_on.imageset/Contents.json | 2 +- .../ic_routing_food_on.png | Bin 222 -> 214 bytes .../ic_routing_food_on@2x.png | Bin 367 -> 360 bytes .../ic_routing_food_on@3x.png | Bin 523 -> 524 bytes .../ic_routing_shop_off.png | Bin 253 -> 0 bytes .../ic_routing_shop_off@2x.png | Bin 441 -> 0 bytes .../ic_routing_shop_off@3x.png | Bin 628 -> 0 bytes .../ic_routing_shop_off_dark.png | Bin 2446 -> 0 bytes .../ic_routing_shop_off_dark@2x.png | Bin 5991 -> 0 bytes .../ic_routing_shop_off_dark@3x.png | Bin 10203 -> 0 bytes .../ic_routing_shop_off_highlighted_dark.png | Bin 2310 -> 0 bytes ...c_routing_shop_off_highlighted_dark@2x.png | Bin 5870 -> 0 bytes ...c_routing_shop_off_highlighted_dark@3x.png | Bin 9814 -> 0 bytes .../ic_routing_shop_off_highlighted_light.png | Bin 892 -> 0 bytes ..._routing_shop_off_highlighted_light@2x.png | Bin 1778 -> 0 bytes ..._routing_shop_off_highlighted_light@3x.png | Bin 2704 -> 0 bytes .../ic_routing_shop_off_light.png | Bin 955 -> 0 bytes .../ic_routing_shop_off_light@2x.png | Bin 1855 -> 0 bytes .../ic_routing_shop_off_light@3x.png | Bin 2834 -> 0 bytes .../ic_routing_shop_on.png | Bin 214 -> 0 bytes .../ic_routing_shop_on@2x.png | Bin 360 -> 0 bytes .../ic_routing_shop_on@3x.png | Bin 524 -> 0 bytes 69 files changed, 45 insertions(+), 45 deletions(-) rename iphone/Maps/Images.xcassets/NavigationDashboard/Search/{ic_routing_shop_off.imageset => ic_routing_eat_off.imageset}/Contents.json (69%) create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off.imageset/ic_routing_eat_off.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off.imageset/ic_routing_eat_off@2x.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off.imageset/ic_routing_eat_off@3x.png rename iphone/Maps/Images.xcassets/NavigationDashboard/Search/{ic_routing_shop_off_dark.imageset => ic_routing_eat_off_dark.imageset}/Contents.json (62%) create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_dark.imageset/ic_routing_eat_off_dark.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_dark.imageset/ic_routing_eat_off_dark@2x.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_dark.imageset/ic_routing_eat_off_dark@3x.png rename iphone/Maps/Images.xcassets/NavigationDashboard/Search/{ic_routing_shop_off_highlighted_light.imageset => ic_routing_eat_off_highlighted_dark.imageset}/Contents.json (57%) create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_highlighted_dark.imageset/ic_routing_eat_off_highlighted_dark.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_highlighted_dark.imageset/ic_routing_eat_off_highlighted_dark@2x.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_highlighted_dark.imageset/ic_routing_eat_off_highlighted_dark@3x.png rename iphone/Maps/Images.xcassets/NavigationDashboard/Search/{ic_routing_shop_off_highlighted_dark.imageset => ic_routing_eat_off_highlighted_light.imageset}/Contents.json (58%) create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_highlighted_light.imageset/ic_routing_eat_off_highlighted_light.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_highlighted_light.imageset/ic_routing_eat_off_highlighted_light@2x.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_highlighted_light.imageset/ic_routing_eat_off_highlighted_light@3x.png rename iphone/Maps/Images.xcassets/NavigationDashboard/Search/{ic_routing_shop_off_light.imageset => ic_routing_eat_off_light.imageset}/Contents.json (62%) create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_light.imageset/ic_routing_eat_off_light.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_light.imageset/ic_routing_eat_off_light@2x.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_off_light.imageset/ic_routing_eat_off_light@3x.png rename iphone/Maps/Images.xcassets/NavigationDashboard/Search/{ic_routing_shop_on.imageset => ic_routing_eat_on.imageset}/Contents.json (70%) create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_on.imageset/ic_routing_eat_on.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_on.imageset/ic_routing_eat_on@2x.png create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_eat_on.imageset/ic_routing_eat_on@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off.imageset/ic_routing_shop_off.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off.imageset/ic_routing_shop_off@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off.imageset/ic_routing_shop_off@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_dark.imageset/ic_routing_shop_off_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_dark.imageset/ic_routing_shop_off_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_dark.imageset/ic_routing_shop_off_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_highlighted_dark.imageset/ic_routing_shop_off_highlighted_dark.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_highlighted_dark.imageset/ic_routing_shop_off_highlighted_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_highlighted_dark.imageset/ic_routing_shop_off_highlighted_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_highlighted_light.imageset/ic_routing_shop_off_highlighted_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_highlighted_light.imageset/ic_routing_shop_off_highlighted_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_highlighted_light.imageset/ic_routing_shop_off_highlighted_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_light.imageset/ic_routing_shop_off_light.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_light.imageset/ic_routing_shop_off_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_off_light.imageset/ic_routing_shop_off_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_on.imageset/ic_routing_shop_on.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_on.imageset/ic_routing_shop_on@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_shop_on.imageset/ic_routing_shop_on@3x.png diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h index 9631b55f8d..694ab2f5cc 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h @@ -5,8 +5,8 @@ enum class NavigationSearchState MinimizedSearch, MinimizedGas, MinimizedParking, + MinimizedEat, MinimizedFood, - MinimizedShop, MinimizedATM }; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm index aefcb62d02..fe73eaa8d2 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm @@ -34,15 +34,15 @@ map 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 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); } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib index f9ca80ea7b..26e5f9fff2 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib @@ -301,9 +301,9 @@ - -