From 31ec230021e9cbc25ae292ec23183654dfc8a0a1 Mon Sep 17 00:00:00 2001 From: "v.mikhaylenko" Date: Tue, 15 Sep 2015 12:57:55 +0300 Subject: [ios] Hide next turn if got NoTurn direction. --- .../NavigationDashboard/MWMNavigationDashboardEntity.mm | 2 +- .../ic_drive_off.imageset/ic_drive_off.png | Bin 233 -> 0 bytes .../ic_drive_off.imageset/ic_drive_off@2x.png | Bin 405 -> 0 bytes .../ic_drive_off.imageset/ic_drive_off@3x.png | Bin 563 -> 0 bytes .../ic_drive_on.imageset/ic_drive_on.png | Bin 361 -> 0 bytes .../ic_drive_on.imageset/ic_drive_on@2x.png | Bin 666 -> 0 bytes .../ic_drive_on.imageset/ic_drive_on@3x.png | Bin 891 -> 0 bytes .../ic_walk_off.imageset/ic_walk_off.png | Bin 241 -> 0 bytes .../ic_walk_off.imageset/ic_walk_off@2x.png | Bin 407 -> 0 bytes .../ic_walk_off.imageset/ic_walk_off@3x.png | Bin 612 -> 0 bytes .../ic_walk_on.imageset/ic_walk_on.png | Bin 450 -> 0 bytes .../ic_walk_on.imageset/ic_walk_on@2x.png | Bin 755 -> 0 bytes .../ic_walk_on.imageset/ic_walk_on@3x.png | Bin 1186 -> 0 bytes 13 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@3x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@2x.png delete mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@3x.png (limited to 'iphone') diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm index 0dd754bfe8..f6aa180390 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm @@ -98,7 +98,7 @@ UIImage * image(routing::turns::TurnDirection t, bool isNextTurn) case TurnDirection::Count: case TurnDirection::GoStraight: case TurnDirection::NoTurn: - imageName = @"straight"; + imageName = isNextTurn ? nil : @"straight"; break; } return [UIImage imageNamed: isNextTurn ? [imageName stringByAppendingString:@"_then"] : imageName]; diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off.png deleted file mode 100644 index b6646f998c..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@2x.png deleted file mode 100644 index 4a1d250724..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@3x.png deleted file mode 100644 index eb6f3b6998..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on.png deleted file mode 100644 index 825d0bf834..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@2x.png deleted file mode 100644 index d26b68c35f..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@3x.png deleted file mode 100644 index 3b49e3fd57..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off.png deleted file mode 100644 index 017d1d5fd8..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@2x.png deleted file mode 100644 index 5a9c75b906..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@3x.png deleted file mode 100644 index 6e98b7215d..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on.png deleted file mode 100644 index 5a096db2e9..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@2x.png deleted file mode 100644 index 86eda19d40..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@3x.png deleted file mode 100644 index f5c684fe54..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@3x.png and /dev/null differ -- cgit v1.2.3