diff --git a/android/res/drawable-hdpi/ic_exit_highway_to_left.png b/android/res/drawable-hdpi/ic_exit_highway_to_left.png new file mode 100644 index 0000000000..4c92165cca Binary files /dev/null and b/android/res/drawable-hdpi/ic_exit_highway_to_left.png differ diff --git a/android/res/drawable-hdpi/ic_exit_highway_to_right.png b/android/res/drawable-hdpi/ic_exit_highway_to_right.png new file mode 100644 index 0000000000..5000d2bcf7 Binary files /dev/null and b/android/res/drawable-hdpi/ic_exit_highway_to_right.png differ diff --git a/android/res/drawable-hdpi/ic_then_exit_highway_to_left.png b/android/res/drawable-hdpi/ic_then_exit_highway_to_left.png new file mode 100644 index 0000000000..3a4bbef5b3 Binary files /dev/null and b/android/res/drawable-hdpi/ic_then_exit_highway_to_left.png differ diff --git a/android/res/drawable-hdpi/ic_then_exit_highway_to_right.png b/android/res/drawable-hdpi/ic_then_exit_highway_to_right.png new file mode 100644 index 0000000000..3d2566cadb Binary files /dev/null and b/android/res/drawable-hdpi/ic_then_exit_highway_to_right.png differ diff --git a/android/res/drawable-mdpi/ic_exit_highway_to_left.png b/android/res/drawable-mdpi/ic_exit_highway_to_left.png new file mode 100644 index 0000000000..c229c3f722 Binary files /dev/null and b/android/res/drawable-mdpi/ic_exit_highway_to_left.png differ diff --git a/android/res/drawable-mdpi/ic_exit_highway_to_right.png b/android/res/drawable-mdpi/ic_exit_highway_to_right.png new file mode 100644 index 0000000000..a277441643 Binary files /dev/null and b/android/res/drawable-mdpi/ic_exit_highway_to_right.png differ diff --git a/android/res/drawable-mdpi/ic_then_exit_highway_to_left.png b/android/res/drawable-mdpi/ic_then_exit_highway_to_left.png new file mode 100644 index 0000000000..ba0aeca04a Binary files /dev/null and b/android/res/drawable-mdpi/ic_then_exit_highway_to_left.png differ diff --git a/android/res/drawable-mdpi/ic_then_exit_highway_to_right.png b/android/res/drawable-mdpi/ic_then_exit_highway_to_right.png new file mode 100644 index 0000000000..1c52e2a83b Binary files /dev/null and b/android/res/drawable-mdpi/ic_then_exit_highway_to_right.png differ diff --git a/android/res/drawable-xhdpi/ic_exit_highway_to_left.png b/android/res/drawable-xhdpi/ic_exit_highway_to_left.png new file mode 100644 index 0000000000..343e550e33 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_exit_highway_to_left.png differ diff --git a/android/res/drawable-xhdpi/ic_exit_highway_to_right.png b/android/res/drawable-xhdpi/ic_exit_highway_to_right.png new file mode 100644 index 0000000000..d5fdb994e5 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_exit_highway_to_right.png differ diff --git a/android/res/drawable-xhdpi/ic_then_exit_highway_to_left.png b/android/res/drawable-xhdpi/ic_then_exit_highway_to_left.png new file mode 100644 index 0000000000..f9672d4c84 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_then_exit_highway_to_left.png differ diff --git a/android/res/drawable-xhdpi/ic_then_exit_highway_to_right.png b/android/res/drawable-xhdpi/ic_then_exit_highway_to_right.png new file mode 100644 index 0000000000..cd763a4b27 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_then_exit_highway_to_right.png differ diff --git a/android/res/drawable-xxhdpi/ic_exit_highway_to_left.png b/android/res/drawable-xxhdpi/ic_exit_highway_to_left.png new file mode 100644 index 0000000000..3058a80600 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_exit_highway_to_left.png differ diff --git a/android/res/drawable-xxhdpi/ic_exit_highway_to_right.png b/android/res/drawable-xxhdpi/ic_exit_highway_to_right.png new file mode 100644 index 0000000000..61de6bcb1a Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_exit_highway_to_right.png differ diff --git a/android/res/drawable-xxhdpi/ic_then_exit_highway_to_left.png b/android/res/drawable-xxhdpi/ic_then_exit_highway_to_left.png new file mode 100644 index 0000000000..843f6c83f5 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_then_exit_highway_to_left.png differ diff --git a/android/res/drawable-xxhdpi/ic_then_exit_highway_to_right.png b/android/res/drawable-xxhdpi/ic_then_exit_highway_to_right.png new file mode 100644 index 0000000000..690837825a Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_then_exit_highway_to_right.png differ diff --git a/android/res/drawable-xxxhdpi/ic_exit_highway_to_left.png b/android/res/drawable-xxxhdpi/ic_exit_highway_to_left.png new file mode 100644 index 0000000000..2756148f76 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_exit_highway_to_left.png differ diff --git a/android/res/drawable-xxxhdpi/ic_exit_highway_to_right.png b/android/res/drawable-xxxhdpi/ic_exit_highway_to_right.png new file mode 100644 index 0000000000..44eee441b7 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_exit_highway_to_right.png differ diff --git a/android/res/drawable-xxxhdpi/ic_then_exit_highway_to_left.png b/android/res/drawable-xxxhdpi/ic_then_exit_highway_to_left.png new file mode 100644 index 0000000000..ee7893bc47 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_then_exit_highway_to_left.png differ diff --git a/android/res/drawable-xxxhdpi/ic_then_exit_highway_to_right.png b/android/res/drawable-xxxhdpi/ic_then_exit_highway_to_right.png new file mode 100644 index 0000000000..245e7a4214 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_then_exit_highway_to_right.png differ diff --git a/android/src/com/mapswithme/maps/routing/RoutingInfo.java b/android/src/com/mapswithme/maps/routing/RoutingInfo.java index c9090211be..cd18163f30 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingInfo.java +++ b/android/src/com/mapswithme/maps/routing/RoutingInfo.java @@ -57,10 +57,8 @@ public class RoutingInfo START_AT_THE_END_OF_STREET(0, 0), REACHED_YOUR_DESTINATION(R.drawable.ic_turn_finish, R.drawable.ic_then_finish), - // @TODO(alexzatsepin) It's necessary to insert apropriate constants instead of zeros - // for EXIT_HIGHWAY_TO_LEFT() and EXIT_HIGHWAY_TO_RIGHT(). - EXIT_HIGHWAY_TO_LEFT(R.drawable.ic_turn_left_slight, R.drawable.ic_then_left_slight), - EXIT_HIGHWAY_TO_RIGHT(R.drawable.ic_turn_right_slight, R.drawable.ic_then_right_slight); + EXIT_HIGHWAY_TO_LEFT(R.drawable.ic_exit_highway_to_left, R.drawable.ic_then_exit_highway_to_left), + EXIT_HIGHWAY_TO_RIGHT(R.drawable.ic_exit_highway_to_right, R.drawable.ic_then_exit_highway_to_right); private final int mTurnRes; private final int mNextTurnRes; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm index b95980d52f..357a75858e 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm @@ -26,11 +26,11 @@ UIImage * image(routing::turns::CarDirection t, bool isNextTurn) NSString * imageName; switch (t) { - case CarDirection::ExitHighwayToRight: + case CarDirection::ExitHighwayToRight: imageName = @"ic_exit_highway_to_right"; break; case CarDirection::TurnSlightRight: imageName = @"slight_right"; break; case CarDirection::TurnRight: imageName = @"simple_right"; break; case CarDirection::TurnSharpRight: imageName = @"sharp_right"; break; - case CarDirection::ExitHighwayToLeft: + case CarDirection::ExitHighwayToLeft: imageName = @"ic_exit_highway_to_left"; break; case CarDirection::TurnSlightLeft: imageName = @"slight_left"; break; case CarDirection::TurnLeft: imageName = @"simple_left"; break; case CarDirection::TurnSharpLeft: imageName = @"sharp_left"; break; diff --git a/iphone/Maps/Images.xcassets/ic_exit_highway_to_left.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_exit_highway_to_left.imageset/Contents.json new file mode 100644 index 0000000000..2fdbdc2949 --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_exit_highway_to_left.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_exit_highway_to_left.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_exit_highway_to_left.imageset/ic_exit_highway_to_left.pdf b/iphone/Maps/Images.xcassets/ic_exit_highway_to_left.imageset/ic_exit_highway_to_left.pdf new file mode 100644 index 0000000000..a7a04b8867 Binary files /dev/null and b/iphone/Maps/Images.xcassets/ic_exit_highway_to_left.imageset/ic_exit_highway_to_left.pdf differ diff --git a/iphone/Maps/Images.xcassets/ic_exit_highway_to_left_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_exit_highway_to_left_then.imageset/Contents.json new file mode 100644 index 0000000000..903c99cc8b --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_exit_highway_to_left_then.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_exit_highway_to_left_then.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_exit_highway_to_left_then.imageset/ic_exit_highway_to_left_then.pdf b/iphone/Maps/Images.xcassets/ic_exit_highway_to_left_then.imageset/ic_exit_highway_to_left_then.pdf new file mode 100644 index 0000000000..7f1900daf5 Binary files /dev/null and b/iphone/Maps/Images.xcassets/ic_exit_highway_to_left_then.imageset/ic_exit_highway_to_left_then.pdf differ diff --git a/iphone/Maps/Images.xcassets/ic_exit_highway_to_right.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_exit_highway_to_right.imageset/Contents.json new file mode 100644 index 0000000000..7a0d8d0a17 --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_exit_highway_to_right.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_exit_highway_to_right.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_exit_highway_to_right.imageset/ic_exit_highway_to_right.pdf b/iphone/Maps/Images.xcassets/ic_exit_highway_to_right.imageset/ic_exit_highway_to_right.pdf new file mode 100644 index 0000000000..673536988a Binary files /dev/null and b/iphone/Maps/Images.xcassets/ic_exit_highway_to_right.imageset/ic_exit_highway_to_right.pdf differ diff --git a/iphone/Maps/Images.xcassets/ic_exit_highway_to_right_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_exit_highway_to_right_then.imageset/Contents.json new file mode 100644 index 0000000000..e5e73b9988 --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_exit_highway_to_right_then.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_exit_highway_to_right_then.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_exit_highway_to_right_then.imageset/ic_exit_highway_to_right_then.pdf b/iphone/Maps/Images.xcassets/ic_exit_highway_to_right_then.imageset/ic_exit_highway_to_right_then.pdf new file mode 100644 index 0000000000..7796d09c4c Binary files /dev/null and b/iphone/Maps/Images.xcassets/ic_exit_highway_to_right_then.imageset/ic_exit_highway_to_right_then.pdf differ