From 3c68dd4acbf830d17e55cb72553d57239db9157b Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Mon, 13 Nov 2017 12:52:29 +0300 Subject: [PATCH] [MAPSME-5825] [ios] Added metro button to route builer UI. --- .../Views/RoutePreview/MWMRoutePreview.mm | 5 ++ .../RoutePreview/MWMiPadRoutePreview.xib | 82 +++++++++-------- .../RoutePreview/MWMiPhoneRoutePreview.xib | 85 +++++++++++------- .../Common/Statistics/StatisticsStrings.h | 1 + .../Maps/Core/Location/MWMLocationManager.mm | 1 + iphone/Maps/Core/Routing/MWMCoreRouterType.h | 3 +- iphone/Maps/Core/Routing/MWMRouter.mm | 1 + iphone/Maps/Core/Routing/MWMRouterType.h | 1 + .../ic_train.imageset/Contents.json | 12 +++ .../ic_train.imageset/ic_train.pdf | Bin 0 -> 6518 bytes .../Contents.json | 12 +++ .../ic_train_highlighted.pdf | Bin 0 -> 7079 bytes .../ic_train_selected.imageset/Contents.json | 12 +++ .../ic_train_selected.pdf | Bin 0 -> 4969 bytes 14 files changed, 143 insertions(+), 72 deletions(-) create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_train.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_train.imageset/ic_train.pdf create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_highlighted.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_highlighted.imageset/ic_train_highlighted.pdf create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_selected.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_selected.imageset/ic_train_selected.pdf diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm index e15526435d..484db61ce4 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm @@ -20,6 +20,7 @@ @property(weak, nonatomic) IBOutlet UIView * bicycle; @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 * vehicle; @@ -43,6 +44,9 @@ { [self addProgress:self.vehicle imageName:@"ic_car" routerType:MWMRouterTypeVehicle]; [self addProgress:self.pedestrian imageName:@"ic_pedestrian" routerType:MWMRouterTypePedestrian]; + [self addProgress:self.publicTransport + imageName:@"ic_train" + routerType:MWMRouterTypePublicTransport]; [self addProgress:self.bicycle imageName:@"ic_bike" routerType:MWMRouterTypeBicycle]; [self addProgress:self.taxi imageName:@"ic_taxi" routerType:MWMRouterTypeTaxi]; } @@ -121,6 +125,7 @@ { case MWMRouterTypeVehicle: routerTypeString = kStatVehicle; break; case MWMRouterTypePedestrian: routerTypeString = kStatPedestrian; break; + case MWMRouterTypePublicTransport: routerTypeString = kStatPublicTransport; break; case MWMRouterTypeBicycle: routerTypeString = kStatBicycle; break; case MWMRouterTypeTaxi: routerTypeString = kStatTaxi; break; } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib index 42787696d6..4ac2a09bb8 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib @@ -1,16 +1,16 @@ - + - - + + HelveticaNeue HelveticaNeue-Medium @@ -55,66 +55,71 @@ - + - + - - - - - - - - - + + - + - - - + + + + + + + + + + - + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - + - - + + + @@ -426,6 +431,7 @@ + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib index 676cd88e11..54ec6e0803 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib @@ -1,13 +1,18 @@ - + - + + + + HelveticaNeue + + @@ -49,10 +54,10 @@ - + - + @@ -60,47 +65,58 @@ - - - - - - - - - - + - - - - + + + + + + + + + + - + - - - - - - - + + + + + + + - - + + + + + + + - - - - + + + + + + + + + + + + + @@ -110,7 +126,9 @@ - + + + @@ -133,6 +151,7 @@ + diff --git a/iphone/Maps/Common/Statistics/StatisticsStrings.h b/iphone/Maps/Common/Statistics/StatisticsStrings.h index cbdf5e109c..139ad9b779 100644 --- a/iphone/Maps/Common/Statistics/StatisticsStrings.h +++ b/iphone/Maps/Common/Statistics/StatisticsStrings.h @@ -204,6 +204,7 @@ static NSString * const kStatProblem = @"Problem"; static NSString * const kStatProfile = @"Profile"; static NSString * const kStatProgress = @"Progress"; static NSString * const kStatProvider = @"Provider"; +static NSString * const kStatPublicTransport = @"Public Transport"; static NSString * const kStatPushReceived = @"Push received"; static NSString * const kStatRB = @"RB"; static NSString * const kStatRate = @"Rate"; diff --git a/iphone/Maps/Core/Location/MWMLocationManager.mm b/iphone/Maps/Core/Location/MWMLocationManager.mm index b364334861..24dda957cc 100644 --- a/iphone/Maps/Core/Location/MWMLocationManager.mm +++ b/iphone/Maps/Core/Location/MWMLocationManager.mm @@ -335,6 +335,7 @@ void setPermissionRequested() switch ([MWMRouter type]) { case MWMRouterTypeVehicle: manager.geoMode = GeoMode::VehicleRouting; break; + case MWMRouterTypePublicTransport: case MWMRouterTypePedestrian: manager.geoMode = GeoMode::PedestrianRouting; break; case MWMRouterTypeBicycle: manager.geoMode = GeoMode::BicycleRouting; break; case MWMRouterTypeTaxi: break; diff --git a/iphone/Maps/Core/Routing/MWMCoreRouterType.h b/iphone/Maps/Core/Routing/MWMCoreRouterType.h index 812d0170b4..084fd27841 100644 --- a/iphone/Maps/Core/Routing/MWMCoreRouterType.h +++ b/iphone/Maps/Core/Routing/MWMCoreRouterType.h @@ -8,6 +8,7 @@ static inline routing::RouterType coreRouterType(MWMRouterType type) { case MWMRouterTypeVehicle: return routing::RouterType::Vehicle; case MWMRouterTypePedestrian: return routing::RouterType::Pedestrian; + case MWMRouterTypePublicTransport: return routing::RouterType::Transit; case MWMRouterTypeBicycle: return routing::RouterType::Bicycle; case MWMRouterTypeTaxi: return routing::RouterType::Taxi; } @@ -18,7 +19,7 @@ static inline MWMRouterType routerType(routing::RouterType type) switch (type) { case routing::RouterType::Vehicle: return MWMRouterTypeVehicle; - case routing::RouterType::Transit: // TODO: AddTransitType + case routing::RouterType::Transit: return MWMRouterTypePublicTransport; case routing::RouterType::Pedestrian: return MWMRouterTypePedestrian; case routing::RouterType::Bicycle: return MWMRouterTypeBicycle; case routing::RouterType::Taxi: return MWMRouterTypeTaxi; diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index 525c5fe1f6..34e10c5761 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -88,6 +88,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType) switch ([self type]) { case MWMRouterTypeVehicle: + case MWMRouterTypePublicTransport: case MWMRouterTypeTaxi: return NO; case MWMRouterTypePedestrian: case MWMRouterTypeBicycle: return GetFramework().GetRoutingManager().HasRouteAltitude(); diff --git a/iphone/Maps/Core/Routing/MWMRouterType.h b/iphone/Maps/Core/Routing/MWMRouterType.h index 69988fcd2e..b3a3e8357d 100644 --- a/iphone/Maps/Core/Routing/MWMRouterType.h +++ b/iphone/Maps/Core/Routing/MWMRouterType.h @@ -1,6 +1,7 @@ typedef NS_ENUM(NSUInteger, MWMRouterType) { MWMRouterTypeVehicle, MWMRouterTypePedestrian, + MWMRouterTypePublicTransport, MWMRouterTypeBicycle, MWMRouterTypeTaxi }; diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train.imageset/Contents.json new file mode 100644 index 0000000000..4b6df94329 --- /dev/null +++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_train.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train.imageset/ic_train.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train.imageset/ic_train.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c5c100812296faa09398ee5a97980b9c01e97c48 GIT binary patch literal 6518 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 a$q#V~y5WdRVSfU`q@YlG5J(N7PX9ktWRds) literal 0 HcmV?d00001 diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_selected.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_selected.imageset/Contents.json new file mode 100644 index 0000000000..3f7b38a259 --- /dev/null +++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_selected.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_train_selected.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_selected.imageset/ic_train_selected.pdf b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_selected.imageset/ic_train_selected.pdf new file mode 100644 index 0000000000000000000000000000000000000000..2d7d369e170c60b484fd3d99c8ac5201cec69773 GIT binary patch literal 4969 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 TU4Cp5QVbyq1cOy|)PVm1O)87} literal 0 HcmV?d00001