Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/iphone
diff options
context:
space:
mode:
authorv.mikhaylenko <v.mikhaylenko@corp.mail.ru>2015-09-15 12:57:55 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 03:05:38 +0300
commit31ec230021e9cbc25ae292ec23183654dfc8a0a1 (patch)
treeb052cc17093e462fdfd5c5ea90704db5fbb23e75 /iphone
parentf01fb281ec0848d1e7d87461a225b91f94a90f9c (diff)
[ios] Hide next turn if got NoTurn direction.
Diffstat (limited to 'iphone')
-rw-r--r--iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm2
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off.pngbin233 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@2x.pngbin405 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@3x.pngbin563 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on.pngbin361 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@2x.pngbin666 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@3x.pngbin891 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off.pngbin241 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@2x.pngbin407 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@3x.pngbin612 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on.pngbin450 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@2x.pngbin755 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@3x.pngbin1186 -> 0 bytes
13 files changed, 1 insertions, 1 deletions
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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_off.imageset/ic_drive_off@3x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_drive_on.imageset/ic_drive_on@3x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_off.imageset/ic_walk_off@3x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_walk_on.imageset/ic_walk_on@3x.png
+++ /dev/null
Binary files differ