RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] Replace RuTaxi provider to Vezet

Browse source
This commit is contained in:
Zoia Pribytkova 2019-04-19 15:57:42 +03:00 • committed by Aleksey Belousov
parent 88c01d5555
commit c4898c8f9e
18 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h
View file

@ -3,5 +3,5 @@ typedef NS_ENUM(NSInteger, MWMRoutePreviewTaxiCellType) {
MWMRoutePreviewTaxiCellTypeUber,
MWMRoutePreviewTaxiCellTypeYandex,
MWMRoutePreviewTaxiCellTypeMaxim,
MWMRoutePreviewTaxiCellTypeRutaxi
MWMRoutePreviewTaxiCellTypeVezet
};

10
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
View file

@ -134,8 +134,8 @@ using namespace taxi;
providerName = kStatMaxim;
break;
case taxi::Provider::Type::Rutaxi:
self.type = MWMRoutePreviewTaxiCellTypeRutaxi;
providerName = kStatRutaxi;
self.type = MWMRoutePreviewTaxiCellTypeVezet;
providerName = kStatVezet;
break;
case taxi::Provider::Type::Count:
LOG(LERROR, ("Incorrect taxi provider"));
@ -171,7 +171,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;
case taxi::Provider::Type::Rutaxi: provider = kStatRutaxi; break;
case taxi::Provider::Type::Rutaxi: provider = kStatVezet; break;
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
}
NSString * errorValue = nil;
@ -204,7 +204,7 @@ using namespace taxi;
case MWMRoutePreviewTaxiCellTypeUber: url = [NSURL URLWithString:@"uber://"]; break;
case MWMRoutePreviewTaxiCellTypeYandex: url = [NSURL URLWithString:@"yandextaxi://"]; break;
case MWMRoutePreviewTaxiCellTypeMaxim: url = [NSURL URLWithString:@"maximzakaz://"]; break;
case MWMRoutePreviewTaxiCellTypeRutaxi: url = [NSURL URLWithString:@"rto://"]; break;
case MWMRoutePreviewTaxiCellTypeVezet: url = [NSURL URLWithString:@"vzt://"]; break;
}
return [UIApplication.sharedApplication canOpenURL:url];
}
@ -227,7 +227,7 @@ using namespace taxi;
case MWMRoutePreviewTaxiCellTypeUber: type = Provider::Type::Uber; break;
case MWMRoutePreviewTaxiCellTypeYandex: type = Provider::Type::Yandex; break;
case MWMRoutePreviewTaxiCellTypeMaxim: type = Provider::Type::Maxim; break;
case MWMRoutePreviewTaxiCellTypeRutaxi: type = Provider::Type::Rutaxi; break;
case MWMRoutePreviewTaxiCellTypeVezet: type = Provider::Type::Rutaxi; break;
}
auto links = engine->GetRideRequestLinks(type, productId, m_from, m_to);

8
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift
View file

@ -23,7 +23,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
case .uber: return #imageLiteral(resourceName: "icTaxiUber")
case .yandex: return #imageLiteral(resourceName: "ic_taxi_logo_yandex")
case .maxim: return #imageLiteral(resourceName: "ic_taxi_logo_maksim")
case .rutaxi: return #imageLiteral(resourceName: "ic_taxi_logo_rutaxi")
case .vezet: return #imageLiteral(resourceName: "ic_taxi_logo_vezet")
}
}
@ -33,7 +33,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
case .uber: return title
case .yandex: return L("yandex_taxi_title")
case .maxim: return L("maxim_taxi_title")
case .rutaxi: return L("rutaxi_title")
case .vezet: return L("vezet_taxi")
}
}
@ -43,7 +43,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
case .uber: return price
case .yandex: fallthrough
case .maxim: fallthrough
case .rutaxi:
case .vezet:
let formatter = NumberFormatter()
formatter.numberStyle = .currency
formatter.currencyCode = currency
@ -59,7 +59,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
let timeString = { () -> String in
var timeValue = DateComponentsFormatter.etaString(from: TimeInterval(eta)!)!
if type == .rutaxi {
if type == .vezet {
timeValue = String(coreFormat: L("place_page_starting_from"), arguments: [timeValue]);
}

2
iphone/Maps/Common/Statistics/StatisticsStrings.h
View file

@ -345,7 +345,6 @@ static NSString * const kStatRoutingTooltipClicked = @"Routing_PlanTooltip_click
static NSString * const kStatRoutingRouteStart = @"Routing_Route_start";
static NSString * const kStatRoutingRouteFinish = @"Routing_Route_finish";
static NSString * const kStatRoutingInterrupted = @"interrupted";
static NSString * const kStatRutaxi = @"Rutaxi";
static NSString * const kStatSave = @"Save";
static NSString * const kStatScenario = @"scenario";
static NSString * const kStatScreen = @"Screen";
@ -438,6 +437,7 @@ static NSString * const kStatUserInterrupted = @"user_interrupted";
static NSString * const kStatValue = @"Value";
static NSString * const kStatVehicle = @"Vehicle";
static NSString * const kStatVendor = @"vendor";
static NSString * const kStatVezet = @"Vezet";
static NSString * const kStatViewOnMap = @"view_on_map";
static NSString * const kStatVisible = @"Visible";
static NSString * const kStatWhatsNew = @"What's New";

2
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -131,7 +131,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
case MWMRoutePreviewTaxiCellTypeUber: provider = kStatUber; break;
case MWMRoutePreviewTaxiCellTypeYandex: provider = kStatYandex; break;
case MWMRoutePreviewTaxiCellTypeMaxim: provider = kStatMaxim; break;
case MWMRoutePreviewTaxiCellTypeRutaxi: provider = kStatRutaxi; break;
case MWMRoutePreviewTaxiCellTypeVezet: provider = kStatVezet; break;
}
[Statistics logEvent:eventName

BIN
iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3 KiB

BIN
iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.3 KiB

0
iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/Contents.json → iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/Contents.json vendored
View file

BIN
iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 588 B

BIN
iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi@2x.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi@3x.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

2
iphone/Maps/MAPSME.plist
View file

@ -110,7 +110,7 @@
<string>tel</string>
<string>booking</string>
<string>maximzakaz</string>
<string>rto</string>
<string>vzt</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>

2
iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
View file

@ -111,7 +111,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;
case taxi::Provider::Rutaxi: provider = kStatRutaxi; break;
case taxi::Provider::Rutaxi: provider = kStatVezet; break;
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
}
[Statistics logEvent:kStatPlacepageTaxiShow withParameters:@{ @"provider" : provider }];

2
iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
View file

@ -361,7 +361,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
case MWMPlacePageTaxiProviderUber: providerString = kStatUber; break;
case MWMPlacePageTaxiProviderYandex: providerString = kStatYandex; break;
case MWMPlacePageTaxiProviderMaxim: providerString = kStatMaxim; break;
case MWMPlacePageTaxiProviderRutaxi: providerString = kStatRutaxi; break;
case MWMPlacePageTaxiProviderVezet: providerString = kStatVezet; break;
}
[Statistics logEvent:kStatPlacePageTaxiClick
withParameters:@{kStatProvider : providerString, kStatTags : data.statisticsTags}];

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/MWMPlacePageTaxiProvider.h
View file

@ -3,5 +3,5 @@ typedef NS_ENUM(NSInteger, MWMPlacePageTaxiProvider) {
MWMPlacePageTaxiProviderUber,
MWMPlacePageTaxiProviderYandex,
MWMPlacePageTaxiProviderMaxim,
MWMPlacePageTaxiProviderRutaxi
MWMPlacePageTaxiProviderVezet
};

6
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift
View file

@ -40,9 +40,9 @@ final class PlacePageTaxiCell: MWMTableViewCell {
case .maxim:
icon.image = #imageLiteral(resourceName: "ic_taxi_logo_maksim")
title.text = L("maxim_taxi_title")
case .rutaxi:
icon.image = #imageLiteral(resourceName: "ic_taxi_logo_rutaxi")
title.text = L("rutaxi_title")
case .vezet:
icon.image = #imageLiteral(resourceName: "ic_taxi_logo_vezet")
title.text = L("vezet_taxi")
}
}

4
iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
View file

@ -393,7 +393,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
case taxi::Provider::Uber: type = MWMPlacePageTaxiProviderUber; break;
case taxi::Provider::Yandex: type = MWMPlacePageTaxiProviderYandex; break;
case taxi::Provider::Maxim: type = MWMPlacePageTaxiProviderMaxim; break;
case taxi::Provider::Rutaxi: type = MWMPlacePageTaxiProviderRutaxi; break;
case taxi::Provider::Rutaxi: type = MWMPlacePageTaxiProviderVezet; break;
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
}
[c configWithType:type delegate:delegate];
@ -631,7 +631,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
case taxi::Provider::Uber: provider = kStatUber; break;
case taxi::Provider::Yandex: provider = kStatYandex; break;
case taxi::Provider::Maxim: provider = kStatMaxim; break;
case taxi::Provider::Rutaxi: provider = kStatRutaxi; break;
case taxi::Provider::Rutaxi: provider = kStatVezet; break;
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
}
[Statistics logEvent:kStatPlacepageTaxiShow