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

[iOS] Whats new 10.0 minor

Browse source 
https://jira.mail.ru/browse/MAPSME-13762
This commit is contained in:
Alexander Boriskov 2020-05-13 18:11:10 +03:00 • committed by Aleksey Belousov
parent 72bc22395a
commit 0629db0793
17 changed files with 89 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
View file

@ -268,6 +268,7 @@
9940621E23EAC57900493D1A /* ElevationHeightPoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElevationHeightPoint.h; sourceTree = "<group>"; };
9940621F23EAC57900493D1A /* ElevationHeightPoint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElevationHeightPoint.m; sourceTree = "<group>"; };
99447847238559F2004DAEE5 /* DeeplinkParsingResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeeplinkParsingResult.h; sourceTree = "<group>"; };
994C4E0E246C22CA0018EB1E /* MWMUTM+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMUTM+Core.h"; sourceTree = "<group>"; };
9957FACC237AB01400855F48 /* DeepLinkParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkParser.h; sourceTree = "<group>"; };
9957FACD237AB01400855F48 /* DeepLinkParser.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DeepLinkParser.mm; sourceTree = "<group>"; };
9957FAD9237ACB1100855F48 /* DeepLinkSearchData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkSearchData.h; sourceTree = "<group>"; };
@ -529,6 +530,7 @@
479F704D234FB60400011E2E /* MWMCatalogObserver.h */,
479F704E234FB60400011E2E /* MWMCatalogObserver.mm */,
479F705A234FBAC200011E2E /* MWMUTM.h */,
994C4E0E246C22CA0018EB1E /* MWMUTM+Core.h */,
);
path = Catalog;
sourceTree = "<group>";

35
iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMUTM+Core.h Normal file
View file

@ -0,0 +1,35 @@
#import "partners_api/utm.hpp"
#import <Foundation/Foundation.h>
#import "MWMUTM.h"
static inline UTM toUTM(MWMUTM utm)
{
switch (utm)
{
case MWMUTMNone: return UTM::None;
case MWMUTMBookmarksPageCatalogButton: return UTM::BookmarksPageCatalogButton;
case MWMUTMToolbarButton: return UTM::ToolbarButton;
case MWMUTMDownloadMwmBanner: return UTM::DownloadMwmBanner;
case MWMUTMLargeToponymsPlacepageGallery: return UTM::LargeToponymsPlacepageGallery;
case MWMUTMSightseeingsPlacepageGallery: return UTM::SightseeingsPlacepageGallery;
case MWMUTMDiscoveryPageGallery: return UTM::DiscoveryPageGallery;
case MWMUTMTipsAndTricks: return UTM::TipsAndTricks;
case MWMUTMBookingPromo: return UTM::BookingPromo;
case MWMUTMDiscoverCatalogOnboarding: return UTM::DiscoverCatalogOnboarding;
case MWMUTMFreeSamplesOnboading: return UTM::FreeSamplesOnboading;
case MWMUTMOutdoorPlacepageGallery: return UTM::OutdoorPlacepageGallery;
}
}
static inline UTMContent toUTMContent(MWMUTMContent content)
{
switch (content)
{
case MWMUTMContentDescription: return UTMContent::Description;
case MWMUTMContentView: return UTMContent::View;
case MWMUTMContentDetails: return UTMContent::Details;
case MWMUTMContentMore: return UTMContent::More;
}
}

2
iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMUTM.h
View file

@ -19,5 +19,5 @@ typedef NS_ENUM(NSInteger, MWMUTMContent) {
MWMUTMContentDescription = 0,
MWMUTMContentView,
MWMUTMContentDetails,
MWMUTMContentMore,
MWMUTMContentMore
};

7
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
View file

@ -5,6 +5,7 @@
#import "MWMCatalogObserver.h"
#import "MWMTag.h"
#import "MWMTagGroup+Convenience.h"
#import "MWMUTM+Core.h"
#include "Framework.h"
@ -535,7 +536,7 @@
- (NSURL *)catalogFrontendUrl:(MWMUTM)utm
{
NSString * urlString = @(self.bm.GetCatalog().GetFrontendUrl((UTM)utm).c_str());
NSString * urlString = @(self.bm.GetCatalog().GetFrontendUrl(toUTM(utm)).c_str());
return urlString ? [NSURL URLWithString:urlString] : nil;
}
@ -543,14 +544,14 @@
if (!url)
return nil;
NSString * urlString = @(InjectUTMContent(std::string(url.absoluteString.UTF8String),
(UTMContent)content).c_str());
toUTMContent(content)).c_str());
return urlString ? [NSURL URLWithString:urlString] : nil;
}
- (NSURL * _Nullable)catalogFrontendUrlPlusPath:(NSString *)path
utm:(MWMUTM)utm
{
NSString * urlString = @(self.bm.GetCatalog().GetFrontendUrl((UTM)utm).c_str());
NSString * urlString = @(self.bm.GetCatalog().GetFrontendUrl(toUTM(utm)).c_str());
return urlString ? [NSURL URLWithString:[urlString stringByAppendingPathComponent:path]] : nil;
}

23
iphone/Maps/Images.xcassets/Whats New/img_onboarding_elevprofile.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "img_onboarding_elevprofile.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "img_onboarding_elevprofile@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "img_onboarding_elevprofile@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
iphone/Maps/Images.xcassets/Whats New/img_onboarding_elevprofile.imageset/img_onboarding_elevprofile.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
iphone/Maps/Images.xcassets/Whats New/img_onboarding_elevprofile.imageset/img_onboarding_elevprofile@2x.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 72 KiB

BIN
iphone/Maps/Images.xcassets/Whats New/img_onboarding_elevprofile.imageset/img_onboarding_elevprofile@3x.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 122 KiB

6
iphone/Maps/Images.xcassets/Whats New/img_wnew_isolines.imageset/Contents.json → iphone/Maps/Images.xcassets/Whats New/img_onboarding_newcatalog.imageset/Contents.json vendored
View file

@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "img_wnew_isolines.png",
"filename" : "img_onboarding_newcatalog.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "img_wnew_isolines@2x.png",
"filename" : "img_onboarding_newcatalog@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "img_wnew_isolines@3x.png",
"filename" : "img_onboarding_newcatalog@3x.png",
"scale" : "3x"
}
],

BIN
iphone/Maps/Images.xcassets/Whats New/img_onboarding_newcatalog.imageset/img_onboarding_newcatalog.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
iphone/Maps/Images.xcassets/Whats New/img_onboarding_newcatalog.imageset/img_onboarding_newcatalog@2x.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
iphone/Maps/Images.xcassets/Whats New/img_onboarding_newcatalog.imageset/img_onboarding_newcatalog@3x.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 80 KiB

BIN
iphone/Maps/Images.xcassets/Whats New/img_wnew_isolines.imageset/img_wnew_isolines.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
iphone/Maps/Images.xcassets/Whats New/img_wnew_isolines.imageset/img_wnew_isolines@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
iphone/Maps/Images.xcassets/Whats New/img_wnew_isolines.imageset/img_wnew_isolines@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 52 KiB

21
iphone/Maps/UI/Welcome/WhatsNew/WhatsNewBuilder.swift
View file

@ -1,12 +1,21 @@
class WhatsNewBuilder {
static var catalogUrl = URL(string: "https://routes.maps.me/v3/mobilefront/?utm_source=maps.me&utm_medium=whatsnew&utm_campaign=100_minor&utm_content=download_guides_button")
static var configs:[WhatsNewPresenter.WhatsNewConfig] {
return [
WhatsNewPresenter.WhatsNewConfig(image: UIImage(named: "img_wnew_isolines"),
title: "whatsnew_isolines_title",
text: "whatsnew_isolines_message",
buttonNextTitle: "done",
isCloseButtonHidden: true)
WhatsNewPresenter.WhatsNewConfig(image: UIImage(named: "img_onboarding_elevprofile"),
title: "whatsnew_elevation_profile_title",
text: "whatsnew_elevation_profile_message",
buttonNextTitle: "new_onboarding_button"),
WhatsNewPresenter.WhatsNewConfig(image: UIImage(named: "img_onboarding_newcatalog"),
title: "whatsnew_catalog_new_title",
text: "whatsnew_catalog_new_message",
buttonNextTitle: "download_guides_button",
isCloseButtonHidden: false,
action: { MapViewController.shared()?.openCatalogAbsoluteUrl(catalogUrl, animated: true, utm: .none) }),
WhatsNewPresenter.WhatsNewConfig(image: UIImage(named: "img_onboarding_newcatalog"),
title: "whatsnew_catalog_new_title",
text: "whatsnew_catalog_new_message",
buttonNextTitle: "done")
]
}

8
iphone/Maps/UI/Welcome/WhatsNew/WhatsNewPresenter.swift
View file

@ -7,8 +7,9 @@ class WhatsNewPresenter {
var image: UIImage?
var title: String
var text: String
var buttonNextTitle: String
var isCloseButtonHidden: Bool
var buttonNextTitle: String = "new_onboarding_button"
var isCloseButtonHidden: Bool = true
var action: (()->())? = nil
}
private weak var view: IWelcomeView?
@ -34,6 +35,9 @@ extension WhatsNewPresenter: IWhatsNewPresenter {
}
func onNext() {
if let action = config.action {
action()
}
router.onNext()
Statistics.logEvent(kStatWhatsNew, withParameters: [kStatAction: kStatNext,
kStatVersion: appVersion])