diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h index d9b91ad392..b0bef993e2 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h @@ -1,5 +1,6 @@ typedef NS_ENUM(NSInteger, MWMRoutePreviewTaxiCellType) { MWMRoutePreviewTaxiCellTypeTaxi, MWMRoutePreviewTaxiCellTypeUber, - MWMRoutePreviewTaxiCellTypeYandex + MWMRoutePreviewTaxiCellTypeYandex, + MWMRoutePreviewTaxiCellTypeMaxim }; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm index c1d5e06741..65dc7fe8ae 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm @@ -129,6 +129,10 @@ using namespace taxi; self.type = MWMRoutePreviewTaxiCellTypeYandex; providerName = kStatYandex; break; + case taxi::Provider::Type::Maxim: + self.type = MWMRoutePreviewTaxiCellTypeMaxim; + providerName = kStatMaxim; + break; } [Statistics logEvent:kStatRoutingBuildTaxi withParameters:@{@"provider": providerName}]; auto cv = self.collectionView; @@ -159,6 +163,7 @@ using namespace taxi; { case taxi::Provider::Type::Uber: provider = kStatUber; break; case taxi::Provider::Type::Yandex: provider = kStatYandex; break; + case taxi::Provider::Type::Maxim: provider = kStatMaxim; break; } NSString * errorValue = nil; switch (errorCode) @@ -189,6 +194,7 @@ using namespace taxi; case MWMRoutePreviewTaxiCellTypeTaxi: return NO; case MWMRoutePreviewTaxiCellTypeUber: url = [NSURL URLWithString:@"uber://"]; break; case MWMRoutePreviewTaxiCellTypeYandex: url = [NSURL URLWithString:@"yandextaxi://"]; break; + case MWMRoutePreviewTaxiCellTypeMaxim: url = [NSURL URLWithString:@"maximzakaz://"]; break; } return [UIApplication.sharedApplication canOpenURL:url]; } @@ -210,6 +216,7 @@ using namespace taxi; case MWMRoutePreviewTaxiCellTypeTaxi: return; case MWMRoutePreviewTaxiCellTypeUber: type = Provider::Type::Uber; break; case MWMRoutePreviewTaxiCellTypeYandex: type = Provider::Type::Yandex; break; + case MWMRoutePreviewTaxiCellTypeMaxim: type = Provider::Type::Maxim; break; } auto links = engine->GetRideRequestLinks(type, productId, m_from, m_to); diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift index 29c8321b1a..27f9248fce 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift @@ -22,6 +22,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell { case .taxi: return #imageLiteral(resourceName: "icTaxiTaxi") case .uber: return #imageLiteral(resourceName: "icTaxiUber") case .yandex: return #imageLiteral(resourceName: "ic_taxi_logo_yandex") + case .maxim: return #imageLiteral(resourceName: "ic_taxi_logo_maksim") } } @@ -30,6 +31,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell { case .taxi: fallthrough case .uber: return title case .yandex: return L("yandex_taxi_title") + case .maxim: return L("maxim_taxi_title") } } @@ -37,7 +39,8 @@ final class RoutePreviewTaxiCell: UICollectionViewCell { switch type { case .taxi: fallthrough case .uber: return price - case .yandex: + case .yandex: fallthrough + case .maxim: let formatter = NumberFormatter() formatter.numberStyle = .currency formatter.currencyCode = currency diff --git a/iphone/Maps/Common/Statistics/StatisticsStrings.h b/iphone/Maps/Common/Statistics/StatisticsStrings.h index b072219ffc..c0bc07864e 100644 --- a/iphone/Maps/Common/Statistics/StatisticsStrings.h +++ b/iphone/Maps/Common/Statistics/StatisticsStrings.h @@ -173,6 +173,7 @@ static NSString * const kStatMapSearch = @"Map search"; static NSString * const kStatMapViewStyle = @"Map view style"; static NSString * const kStatMapViewStyleSettings = @"Map view style settings"; static NSString * const kStatMapsme = @"maps.me"; +static NSString * const kStatMaxim = @"Maxim"; static NSString * const kStatMenu = @"Menu"; static NSString * const kStatMigrationBig2SmallMWM = @"Big mwms to small mwms migration counter"; static NSString * const kStatMiles = @"Miles"; diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index e5d1b7900d..0e9d0ff970 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -122,6 +122,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType) case MWMRoutePreviewTaxiCellTypeTaxi: provider = kStatUnknown; break; case MWMRoutePreviewTaxiCellTypeUber: provider = kStatUber; break; case MWMRoutePreviewTaxiCellTypeYandex: provider = kStatYandex; break; + case MWMRoutePreviewTaxiCellTypeMaxim: provider = kStatMaxim; break; } [Statistics logEvent:eventName diff --git a/iphone/Maps/Images.xcassets/ic_taxi_logo_maksim.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_taxi_logo_maksim.imageset/Contents.json new file mode 100644 index 0000000000..c0bffb7729 --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_taxi_logo_maksim.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_taxi_logo_maksim.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_taxi_logo_maksim.imageset/ic_taxi_logo_maksim.pdf b/iphone/Maps/Images.xcassets/ic_taxi_logo_maksim.imageset/ic_taxi_logo_maksim.pdf new file mode 100644 index 0000000000..13ec9d513d Binary files /dev/null and b/iphone/Maps/Images.xcassets/ic_taxi_logo_maksim.imageset/ic_taxi_logo_maksim.pdf differ diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm index 489ea93e87..e635f0ad6f 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm @@ -97,6 +97,7 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS"; { case taxi::Provider::Uber: provider = kStatUber; break; case taxi::Provider::Yandex: provider = kStatYandex; break; + case taxi::Provider::Maxim: provider = kStatMaxim; break; } [Statistics logEvent:kStatPlacepageTaxiShow withParameters:@{ @"provider" : provider }]; } diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm index c2477e387f..bb4a46163e 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm @@ -347,6 +347,7 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName) case MWMPlacePageTaxiProviderTaxi: providerString = kStatUnknown; break; case MWMPlacePageTaxiProviderUber: providerString = kStatUber; break; case MWMPlacePageTaxiProviderYandex: providerString = kStatYandex; break; + case MWMPlacePageTaxiProviderMaxim: providerString = kStatMaxim; break; } [Statistics logEvent:kStatPlacePageTaxiClick withParameters:@{kStatProvider : providerString, kStatTags : data.statisticsTags}]; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/MWMPlacePageTaxiProvider.h b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/MWMPlacePageTaxiProvider.h index 701d87c484..c4566106ee 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/MWMPlacePageTaxiProvider.h +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/MWMPlacePageTaxiProvider.h @@ -1,5 +1,6 @@ typedef NS_ENUM(NSInteger, MWMPlacePageTaxiProvider) { MWMPlacePageTaxiProviderTaxi, MWMPlacePageTaxiProviderUber, - MWMPlacePageTaxiProviderYandex + MWMPlacePageTaxiProviderYandex, + MWMPlacePageTaxiProviderMaxim }; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift index fd6e6946d3..11baaed3ea 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift @@ -37,6 +37,9 @@ final class PlacePageTaxiCell: MWMTableViewCell { case .yandex: icon.image = #imageLiteral(resourceName: "ic_taxi_logo_yandex") title.text = L("yandex_taxi_title") + case .maxim: + icon.image = #imageLiteral(resourceName: "ic_taxi_logo_maksim") + title.text = L("maxim_taxi_title") } } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm index c0522797c7..5f8dc1bedb 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm @@ -376,6 +376,7 @@ map const kMetaInfoCells = { { case taxi::Provider::Uber: type = MWMPlacePageTaxiProviderUber; break; case taxi::Provider::Yandex: type = MWMPlacePageTaxiProviderYandex; break; + case taxi::Provider::Maxim: type = MWMPlacePageTaxiProviderMaxim; break; } [c configWithType:type delegate:delegate]; self.taxiCell = c; @@ -595,6 +596,7 @@ map const kMetaInfoCells = { { case taxi::Provider::Uber: provider = kStatUber; break; case taxi::Provider::Yandex: provider = kStatYandex; break; + case taxi::Provider::Maxim: provider = kStatMaxim; break; } [Statistics logEvent:kStatPlacepageTaxiShow withParameters:@{kStatProvider: provider, kStatPlacement: kStatPlacePage}];