From 25a2e961fc3f673947747644e5832e5984f8df2c Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 12 Dec 2017 11:13:23 +0300 Subject: [PATCH] [MAPSME-6154] [ios] Added transport icons. --- .../TransportTransitTrain.swift | 6 +++--- .../Contents.json | 12 ++++++++++++ .../ic_20px_route_planning_lightrail.pdf | Bin 0 -> 6151 bytes .../Contents.json | 12 ++++++++++++ .../ic_20px_route_planning_monorail.pdf | Bin 0 -> 6107 bytes 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_20px_route_planning_lightrail.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_20px_route_planning_lightrail.imageset/ic_20px_route_planning_lightrail.pdf create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_20px_route_planning_monorail.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_20px_route_planning_monorail.imageset/ic_20px_route_planning_monorail.pdf diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.swift index 1da92ec0a0..d194903607 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.swift @@ -39,9 +39,9 @@ final class TransportTransitTrain: TransportTransitCell { case .intermediatePoint: fallthrough case .pedestrian: fatalError() case .train: image.image = #imageLiteral(resourceName: "ic_20px_route_planning_train") - case .subway: fallthrough - case .lightRail: fallthrough - case .monorail: image.image = #imageLiteral(resourceName: "ic_20px_route_planning_metro") + case .subway: image.image = #imageLiteral(resourceName: "ic_20px_route_planning_metro") + case .lightRail: image.image = #imageLiteral(resourceName: "ic_20px_route_planning_lightrail") + case .monorail: image.image = #imageLiteral(resourceName: "ic_20px_route_planning_monorail") } background.backgroundColor = step.color diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_20px_route_planning_lightrail.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_20px_route_planning_lightrail.imageset/Contents.json new file mode 100644 index 0000000000..7d4ba82de6 --- /dev/null +++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_20px_route_planning_lightrail.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_20px_route_planning_lightrail.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_20px_route_planning_lightrail.imageset/ic_20px_route_planning_lightrail.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_20px_route_planning_lightrail.imageset/ic_20px_route_planning_lightrail.pdf new file mode 100644 index 0000000000000000000000000000000000000000..a5f0ca8f04db9947a999abcbdd58512f61206607 GIT binary patch literal 6151 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 Iv{V8A15(yU^8f$< literal 0 HcmV?d00001