diff --git a/data/copyright.html b/data/copyright.html index 102beeab77..7ceb4c27af 100644 --- a/data/copyright.html +++ b/data/copyright.html @@ -329,6 +329,9 @@
  • Freepik from www.flaticon.com
    © 2021 Freepik Freepik Free License
  • + +
  • Maki
    + © 2022 Mapbox CC0 1.0 Universal
  • diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm index a0a5b98981..1536ed3c0a 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm @@ -18,7 +18,7 @@ static CGFloat const kDrivingOptionsHeight = 48; @property(weak, nonatomic) IBOutlet UIView * contentView; @property(weak, nonatomic) IBOutlet UIView * pedestrian; @property(weak, nonatomic) IBOutlet UIView * publicTransport; -@property(weak, nonatomic) IBOutlet UIView * taxi; +@property(weak, nonatomic) IBOutlet UIView * helicopter; @property(weak, nonatomic) IBOutlet UIView * vehicle; @property(strong, nonatomic) IBOutlet NSLayoutConstraint * drivingOptionHeightConstraint; @property(strong, nonatomic) IBOutlet UIButton * drivingOptionsButton; @@ -104,9 +104,6 @@ static CGFloat const kDrivingOptionsHeight = 48; { for (auto const & progress : m_progresses) progress.second.state = MWMCircularProgressStateNormal; - - //if (!MWMLocationManager.lastLocation || !Platform::IsConnected()) - [self.taxi removeFromSuperview]; } - (void)selectRouter:(MWMRouterType)routerType diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib index ee7a5f87a3..9870f1e607 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib @@ -1,9 +1,9 @@ - + - + @@ -74,7 +74,7 @@ - + @@ -109,10 +109,10 @@ - + - + @@ -138,6 +138,17 @@ + + + + + + + + + + + @@ -353,13 +364,13 @@ - + - + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib index a6f65d9d9f..282404ff77 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib @@ -1,9 +1,9 @@ - + - + @@ -68,7 +68,7 @@ - + @@ -105,10 +105,10 @@ - + - + @@ -142,6 +142,17 @@ + + + + + + + + + + + @@ -187,6 +198,7 @@ + @@ -228,7 +240,7 @@ - + - + diff --git a/iphone/Maps/Core/Routing/MWMRouterType.h b/iphone/Maps/Core/Routing/MWMRouterType.h index 83c7b356a7..53fedea27a 100644 --- a/iphone/Maps/Core/Routing/MWMRouterType.h +++ b/iphone/Maps/Core/Routing/MWMRouterType.h @@ -2,5 +2,5 @@ typedef NS_ENUM(NSUInteger, MWMRouterType) { MWMRouterTypeVehicle, MWMRouterTypePedestrian, MWMRouterTypePublicTransport, - MWMRouterTypeBicycle + MWMRouterTypeBicycle, }; diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Contents.json index da4a164c91..73c00596a7 100644 --- a/iphone/Maps/Images.xcassets/NavigationDashboard/Contents.json +++ b/iphone/Maps/Images.xcassets/NavigationDashboard/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike.imageset/ic_bike.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike.imageset/ic_bike.pdf index 8d4df13aaa..e54ff2e0c9 100644 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike.imageset/ic_bike.pdf and b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike.imageset/ic_bike.pdf differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike_highlighted.imageset/ic_bike_highlighted.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike_highlighted.imageset/ic_bike_highlighted.pdf index 2bcfbb436b..abbe31ef6c 100644 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike_highlighted.imageset/ic_bike_highlighted.pdf and b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike_highlighted.imageset/ic_bike_highlighted.pdf differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike_selected.imageset/ic_bike_selected.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike_selected.imageset/ic_bike_selected.pdf index b4f70d213f..9b2a97df30 100644 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike_selected.imageset/ic_bike_selected.pdf and b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_bike_selected.imageset/ic_bike_selected.pdf differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter.imageset/Contents.json similarity index 75% rename from iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi.imageset/Contents.json rename to iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter.imageset/Contents.json index 6c44e9ebff..57820be728 100644 --- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "ic_taxi.pdf" + "filename" : "ic_helicopter.pdf" } ], "info" : { diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter.imageset/ic_helicopter.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter.imageset/ic_helicopter.pdf new file mode 100644 index 0000000000..5b7e449274 Binary files /dev/null and b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter.imageset/ic_helicopter.pdf differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_highlighted.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_highlighted.imageset/Contents.json similarity index 70% rename from iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_highlighted.imageset/Contents.json rename to iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_highlighted.imageset/Contents.json index 4e6aebe7c9..9bad41a519 100644 --- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_highlighted.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_highlighted.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "ic_taxi_highlighted.pdf" + "filename" : "ic_helicopter_highlighted.pdf" } ], "info" : { diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_highlighted.imageset/ic_helicopter_highlighted.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_highlighted.imageset/ic_helicopter_highlighted.pdf new file mode 100644 index 0000000000..11e5d58e9c Binary files /dev/null and b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_highlighted.imageset/ic_helicopter_highlighted.pdf differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_selected.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_selected.imageset/Contents.json similarity index 71% rename from iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_selected.imageset/Contents.json rename to iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_selected.imageset/Contents.json index ee77e83f34..5ad1f78338 100644 --- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_selected.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_selected.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "ic_taxi_selected.pdf" + "filename" : "ic_helicopter_selected.pdf" } ], "info" : { diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_selected.imageset/ic_helicopter_selected.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_selected.imageset/ic_helicopter_selected.pdf new file mode 100644 index 0000000000..fa3200c2ae Binary files /dev/null and b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_helicopter_selected.imageset/ic_helicopter_selected.pdf differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi.imageset/ic_taxi.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi.imageset/ic_taxi.pdf deleted file mode 100644 index 7a3b727c7d..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi.imageset/ic_taxi.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_highlighted.imageset/ic_taxi_highlighted.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_highlighted.imageset/ic_taxi_highlighted.pdf deleted file mode 100644 index 1dd7695c2b..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_highlighted.imageset/ic_taxi_highlighted.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_selected.imageset/ic_taxi_selected.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_selected.imageset/ic_taxi_selected.pdf deleted file mode 100644 index 8b3c328827..0000000000 Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_taxi_selected.imageset/ic_taxi_selected.pdf and /dev/null differ