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

Merge pull request #3894 from igrechuhin/MAPSME-2002

Browse source 
[ios] Added routing & booking what's new.
This commit is contained in:
Vlad Mihaylenko 2016-07-28 14:30:05 +04:00 • committed by GitHub
commit c914d7b1d4
17 changed files with 317 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.h Normal file
View file

@ -0,0 +1,5 @@
#import "MWMWelcomeController.h"
@interface MWMWhatsNewNavigationController : MWMWelcomeController
@end

76
iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.mm Normal file
View file

@ -0,0 +1,76 @@
#import "MWMWhatsNewNavigationController.h"
#import "MWMPageController.h"
@interface MWMWhatsNewNavigationController ()
@property(weak, nonatomic) IBOutlet UIView * containerView;
@property(weak, nonatomic) IBOutlet UIImageView * image;
@property(weak, nonatomic) IBOutlet UILabel * alertTitle;
@property(weak, nonatomic) IBOutlet UILabel * alertText;
@property(weak, nonatomic) IBOutlet UIButton * nextPageButton;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset;
@end
namespace
{
NSArray<TMWMWelcomeConfigBlock> * pagesConfigBlocks = @[
[^(MWMWhatsNewNavigationController * controller) {
controller.image.image = [UIImage imageNamed:@"img_whatsnew_car_navigation"];
controller.alertTitle.text = L(@"whatsnew_car_navigation_header");
controller.alertText.text = L(@"whatsnew_car_navigation_message");
[controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal];
[controller.nextPageButton addTarget:controller.pageController
action:@selector(nextPage)
forControlEvents:UIControlEventTouchUpInside];
} copy],
[^(MWMWhatsNewNavigationController * controller) {
controller.image.image = [UIImage imageNamed:@"img_whatsnew_cycle_navigation_improved"];
controller.alertTitle.text = L(@"whatsnew_cycle_navigation_2_header");
controller.alertText.text = L(@"whatsnew_cycle_navigation_2_message");
[controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal];
[controller.nextPageButton addTarget:controller.pageController
action:@selector(nextPage)
forControlEvents:UIControlEventTouchUpInside];
} copy],
[^(MWMWhatsNewNavigationController * controller) {
controller.image.image = [UIImage imageNamed:@"img_whatsnew_booking_improved"];
controller.alertTitle.text = L(@"whatsnew_booking_2_header");
controller.alertText.text = L(@"whatsnew_booking_2_message");
[controller.nextPageButton setTitle:L(@"done") forState:UIControlStateNormal];
[controller.nextPageButton addTarget:controller.pageController
action:@selector(close)
forControlEvents:UIControlEventTouchUpInside];
} copy]
];
} // namespace
@implementation MWMWhatsNewNavigationController
+ (NSString *)udWelcomeWasShownKey { return @"WhatsNewWithNavigationWasShown"; }
+ (NSArray<TMWMWelcomeConfigBlock> *)pagesConfig { return pagesConfigBlocks; }
- (IBAction)close { [self.pageController close]; }
#pragma mark - Properties
- (void)setSize:(CGSize)size
{
super.size = size;
CGSize const newSize = super.size;
CGFloat const width = newSize.width;
CGFloat const height = newSize.height;
BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant);
self.titleImageOffset.priority =
hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh;
self.image.hidden = hideImage;
self.containerWidth.constant = width;
self.containerHeight.constant = height;
}
@end

158
iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment version="2048" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@ -13,6 +13,7 @@
<string>HelveticaNeue-Medium</string>
<string>HelveticaNeue-Medium</string>
<string>HelveticaNeue-Medium</string>
<string>HelveticaNeue-Medium</string>
</mutableArray>
</customFonts>
<scenes>
@ -778,6 +779,161 @@
</objects>
<point key="canvasLocation" x="3230" y="1932"/>
</scene>
<!--Whats New Navigation Controller-->
<scene sceneID="kAr-qf-Dme">
<objects>
<viewController storyboardIdentifier="MWMWhatsNewNavigationController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="J6A-Up-KBC" customClass="MWMWhatsNewNavigationController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="S2O-ZN-gaq"/>
<viewControllerLayoutGuide type="bottom" id="nJa-Wo-CTG"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="eTO-jl-C1f" customClass="SolidTouchView">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vGW-bq-fH5" userLabel="Container">
<rect key="frame" x="40" y="0.0" width="520" height="600"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ITl-q8-Byo" userLabel="BoundsView">
<rect key="frame" x="16" y="40" width="488" height="456"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tbk-TZ-Cly" userLabel="CenteredView">
<rect key="frame" x="44" y="71" width="400" height="313"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="SZx-R6-NGK">
<rect key="frame" x="90" y="0.0" width="220" height="220"/>
<constraints>
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="220" id="3pQ-h3-lDE"/>
<constraint firstAttribute="width" secondItem="SZx-R6-NGK" secondAttribute="height" multiplier="1:1" id="JHG-qN-jGY"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="800" constant="120" id="Xaq-40-NXC"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Бронируй отель из приложения" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="snm-YK-UES" userLabel="Title">
<rect key="frame" x="0.0" y="240" width="400" height="24"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="При выборе отелей на карте будут отображаться ценовая категория и рейтинг заведения." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fz1-S6-6eL" userLabel="Text">
<rect key="frame" x="0.0" y="280" width="400" height="33"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
<constraints>
<constraint firstItem="snm-YK-UES" firstAttribute="top" secondItem="tbk-TZ-Cly" secondAttribute="top" priority="740" constant="40" id="5yw-bh-sO5"/>
<constraint firstAttribute="bottom" secondItem="fz1-S6-6eL" secondAttribute="bottom" id="7uP-pr-yf3"/>
<constraint firstItem="fz1-S6-6eL" firstAttribute="width" secondItem="tbk-TZ-Cly" secondAttribute="width" id="Bm6-vT-iMZ"/>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="CVj-uQ-iWV"/>
<constraint firstItem="fz1-S6-6eL" firstAttribute="centerX" secondItem="tbk-TZ-Cly" secondAttribute="centerX" id="EAO-a9-GkN"/>
<constraint firstItem="SZx-R6-NGK" firstAttribute="centerX" secondItem="tbk-TZ-Cly" secondAttribute="centerX" id="Icp-An-OBS"/>
<constraint firstItem="SZx-R6-NGK" firstAttribute="top" secondItem="tbk-TZ-Cly" secondAttribute="top" id="L0K-TJ-0T4"/>
<constraint firstItem="snm-YK-UES" firstAttribute="width" secondItem="tbk-TZ-Cly" secondAttribute="width" id="McF-CL-WoN"/>
<constraint firstItem="fz1-S6-6eL" firstAttribute="top" secondItem="snm-YK-UES" secondAttribute="bottom" constant="16" id="SZC-Pa-OmJ"/>
<constraint firstItem="snm-YK-UES" firstAttribute="top" secondItem="SZx-R6-NGK" secondAttribute="bottom" priority="750" constant="20" id="TR6-gD-DsU"/>
<constraint firstItem="snm-YK-UES" firstAttribute="centerX" secondItem="tbk-TZ-Cly" secondAttribute="centerX" id="fwk-0i-IHb"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
<constraints>
<constraint firstItem="tbk-TZ-Cly" firstAttribute="centerX" secondItem="ITl-q8-Byo" secondAttribute="centerX" id="E6w-Lj-l2a"/>
<constraint firstAttribute="trailing" secondItem="tbk-TZ-Cly" secondAttribute="trailing" priority="999" id="Tg7-cp-hV4"/>
<constraint firstItem="tbk-TZ-Cly" firstAttribute="leading" secondItem="ITl-q8-Byo" secondAttribute="leading" priority="999" id="cuR-Do-I87"/>
<constraint firstItem="tbk-TZ-Cly" firstAttribute="centerY" secondItem="ITl-q8-Byo" secondAttribute="centerY" id="iyI-6I-oJH"/>
<constraint firstItem="tbk-TZ-Cly" firstAttribute="height" relation="lessThanOrEqual" secondItem="ITl-q8-Byo" secondAttribute="height" id="p9p-Xo-g5c"/>
</constraints>
</view>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OjW-xF-Iie" userLabel="NotNow">
<rect key="frame" x="140" y="516" width="240" height="44"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="82z-pQ-KWZ"/>
<constraint firstAttribute="width" constant="240" id="xE7-iY-0ku"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="Next">
<color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/>
</userDefinedRuntimeAttributes>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="600" id="7zL-gy-PCa"/>
<constraint firstItem="ITl-q8-Byo" firstAttribute="top" secondItem="vGW-bq-fH5" secondAttribute="top" constant="40" id="8t4-fD-AEI"/>
<constraint firstItem="OjW-xF-Iie" firstAttribute="centerX" secondItem="vGW-bq-fH5" secondAttribute="centerX" id="8yR-zq-Dml"/>
<constraint firstAttribute="trailing" secondItem="ITl-q8-Byo" secondAttribute="trailing" constant="16" id="HVg-Yg-9Q0"/>
<constraint firstAttribute="width" constant="520" id="PbP-UC-L7m"/>
<constraint firstAttribute="bottom" secondItem="OjW-xF-Iie" secondAttribute="bottom" constant="40" id="TYu-qe-JKz"/>
<constraint firstItem="OjW-xF-Iie" firstAttribute="top" secondItem="ITl-q8-Byo" secondAttribute="bottom" constant="20" id="dLe-6o-IdD"/>
<constraint firstItem="ITl-q8-Byo" firstAttribute="leading" secondItem="vGW-bq-fH5" secondAttribute="leading" constant="16" id="ri9-Q0-nbZ"/>
<constraint firstItem="SZx-R6-NGK" firstAttribute="height" secondItem="vGW-bq-fH5" secondAttribute="height" multiplier="0.3" priority="750" id="tta-EI-1eQ"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4ZS-Cx-eDt">
<rect key="frame" x="556" y="32" width="28" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="28" id="AJQ-MR-2Nc"/>
<constraint firstAttribute="height" constant="28" id="SPS-2W-vgR"/>
</constraints>
<color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
<state key="normal" image="ic_close_spinner"/>
<connections>
<action selector="close" destination="J6A-Up-KBC" eventType="touchUpInside" id="UNP-oR-xPv"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="vGW-bq-fH5" firstAttribute="centerX" secondItem="eTO-jl-C1f" secondAttribute="centerX" id="J3i-vz-lBe"/>
<constraint firstItem="vGW-bq-fH5" firstAttribute="centerY" secondItem="eTO-jl-C1f" secondAttribute="centerY" id="O18-cd-eSr"/>
<constraint firstItem="4ZS-Cx-eDt" firstAttribute="top" secondItem="S2O-ZN-gaq" secondAttribute="bottom" constant="12" id="YUt-KM-8Yw"/>
<constraint firstAttribute="trailing" secondItem="4ZS-Cx-eDt" secondAttribute="trailing" constant="16" id="ly5-uA-qk3"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<connections>
<outlet property="alertText" destination="fz1-S6-6eL" id="WUb-o6-BCy"/>
<outlet property="alertTitle" destination="snm-YK-UES" id="mfo-RB-y7d"/>
<outlet property="containerHeight" destination="7zL-gy-PCa" id="6vF-px-E6q"/>
<outlet property="containerView" destination="vGW-bq-fH5" id="h1o-AY-BIN"/>
<outlet property="containerWidth" destination="PbP-UC-L7m" id="ELZ-dl-JU0"/>
<outlet property="image" destination="SZx-R6-NGK" id="2yI-Ge-4Q2"/>
<outlet property="imageHeight" destination="tta-EI-1eQ" id="eFB-FF-bGo"/>
<outlet property="imageMinHeight" destination="Xaq-40-NXC" id="olm-sE-Ame"/>
<outlet property="nextPageButton" destination="OjW-xF-Iie" id="6uU-sk-ggB"/>
<outlet property="titleImageOffset" destination="TR6-gD-DsU" id="40b-Me-B1G"/>
<outlet property="titleTopOffset" destination="5yw-bh-sO5" id="P9V-2B-30c"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Cxu-aX-Emu" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="3916" y="1932"/>
</scene>
</scenes>
<resources>
<image name="ic_close_spinner" width="28" height="28"/>

5
iphone/Maps/Classes/MapViewController.mm
View file

@ -24,7 +24,7 @@
#import "MWMRouter.h"
#import "MWMStorage.h"
#import "MWMTableViewController.h"
#import "MWMWhatsNewBookingBicycleRoutingController.h"
#import "MWMWhatsNewNavigationController.h"
#import "MapsAppDelegate.h"
#import "RouteState.h"
#import "Statistics.h"
@ -298,8 +298,7 @@ BOOL gIsFirstMyPositionMode = YES;
if (isIOS7)
return;
Class<MWMWelcomeControllerProtocol> whatsNewClass =
[MWMWhatsNewBookingBicycleRoutingController class];
Class<MWMWelcomeControllerProtocol> whatsNewClass = [MWMWhatsNewNavigationController class];
BOOL const isFirstSession = [Alohalytics isFirstSession];
Class<MWMWelcomeControllerProtocol> welcomeClass =
isFirstSession ? [MWMFirstLaunchController class] : whatsNewClass;

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

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

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 45 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 65 KiB

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

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

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 50 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 79 KiB

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

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

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 64 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 104 KiB

8
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -120,6 +120,8 @@
345FDD271C3BB3AF0070C459 /* MWMEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345FDD251C3BB3AF0070C459 /* MWMEditorViewController.mm */; };
34634B1B1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34634B1A1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib */; };
3465E7D81B6658C000854C4D /* MWMAPIBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3465E7D71B6658C000854C4D /* MWMAPIBar.mm */; };
34664CFA1D4A0262003D7096 /* MWMWhatsNewNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34664CF91D4A0262003D7096 /* MWMWhatsNewNavigationController.mm */; };
34664CFB1D4A0262003D7096 /* MWMWhatsNewNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34664CF91D4A0262003D7096 /* MWMWhatsNewNavigationController.mm */; };
34679F3D1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34679F3C1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm */; };
34679F3E1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34679F3C1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm */; };
346EDADB1B9F0E35004F8DB5 /* MWMMultilineLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */; };
@ -996,6 +998,8 @@
34634B1A1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBottomMenuCollectionViewLandscapeCell.xib; sourceTree = "<group>"; };
3465E7D61B6658C000854C4D /* MWMAPIBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAPIBar.h; sourceTree = "<group>"; };
3465E7D71B6658C000854C4D /* MWMAPIBar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAPIBar.mm; sourceTree = "<group>"; };
34664CF81D4A0262003D7096 /* MWMWhatsNewNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWMWhatsNewNavigationController.h; path = Welcome/MWMWhatsNewNavigationController.h; sourceTree = "<group>"; };
34664CF91D4A0262003D7096 /* MWMWhatsNewNavigationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MWMWhatsNewNavigationController.mm; path = Welcome/MWMWhatsNewNavigationController.mm; sourceTree = "<group>"; };
34679F3B1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWMWhatsNewDownloaderEditorController.h; path = Welcome/MWMWhatsNewDownloaderEditorController.h; sourceTree = "<group>"; };
34679F3C1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MWMWhatsNewDownloaderEditorController.mm; path = Welcome/MWMWhatsNewDownloaderEditorController.mm; sourceTree = "<group>"; };
346EDAD91B9F0E35004F8DB5 /* MWMMultilineLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMultilineLabel.h; sourceTree = "<group>"; };
@ -2858,6 +2862,8 @@
34D349FA1CD0A3EE00895216 /* MWMWhatsNewEditorController.mm */,
345A2DC91D0B0EB600A7DD39 /* MWMWhatsNewBookingBicycleRoutingController.h */,
345A2DCA1D0B0EB600A7DD39 /* MWMWhatsNewBookingBicycleRoutingController.mm */,
34664CF81D4A0262003D7096 /* MWMWhatsNewNavigationController.h */,
34664CF91D4A0262003D7096 /* MWMWhatsNewNavigationController.mm */,
);
name = Welcome;
sourceTree = "<group>";
@ -3616,6 +3622,7 @@
F6791B131C43DEA7007A8A6E /* MWMStartButton.mm in Sources */,
46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */,
34F9FB8B1C438ADB00F71201 /* MWMStreetEditorViewController.mm in Sources */,
34664CFA1D4A0262003D7096 /* MWMWhatsNewNavigationController.mm in Sources */,
EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */,
34CCFDD11C21945500F28959 /* MWMPlacePageOpeningHoursDayView.mm in Sources */,
F61579341AC2CE9A0032D8E9 /* MWMRateAlert.mm in Sources */,
@ -3839,6 +3846,7 @@
6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */,
34F9FB8C1C438ADB00F71201 /* MWMStreetEditorViewController.mm in Sources */,
34CCFDD21C21945500F28959 /* MWMPlacePageOpeningHoursDayView.mm in Sources */,
34664CFB1D4A0262003D7096 /* MWMWhatsNewNavigationController.mm in Sources */,
6741A9B91BF340DE002C974C /* MWMRateAlert.mm in Sources */,
6741A9BA1BF340DE002C974C /* MWMRoutePointCell.m in Sources */,
347D7C6A1C2C0703006B2D0A /* UITextView+RuntimeAttributes.mm in Sources */,