kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[MAPSME-5825] [ios] Added metro button to route builer UI.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-11-13 12:52:29 +03:00 • committed by Roman Kuznetsov
parent 7c7b84e16e
commit 3c68dd4acb
14 changed files with 143 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm
View file

@ -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;
}

82
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib
View file

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="HelveticaNeue.ttc">
<string>HelveticaNeue</string>
<string>HelveticaNeue-Medium</string>
</array>
</customFonts>
@ -55,66 +55,71 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sXu-tl-a0m" userLabel="Buttons Box">
<rect key="frame" x="75.5" y="0.0" width="224" height="44"/>
<rect key="frame" x="71" y="3" width="234" height="38"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jDl-pu-eov">
<rect key="frame" x="6" y="0.0" width="44" height="44"/>
<rect key="frame" x="6" y="0.0" width="38" height="38"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="routeAuto"/>
<constraints>
<constraint firstAttribute="width" secondItem="jDl-pu-eov" secondAttribute="height" multiplier="1:1" id="o1x-sd-13z"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yiM-fM-sSS" userLabel="Bicycle">
<rect key="frame" x="66" y="0.0" width="44" height="44"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="routeBicycle"/>
<constraints>
<constraint firstAttribute="width" secondItem="yiM-fM-sSS" secondAttribute="height" multiplier="1:1" id="rnk-51-Cjg"/>
<constraint firstAttribute="height" constant="38" id="1qk-1F-lIB"/>
<constraint firstAttribute="width" constant="38" id="LbG-GN-BNV"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VhE-hA-Leo">
<rect key="frame" x="126" y="3" width="38" height="38"/>
<rect key="frame" x="52" y="0.0" width="38" height="38"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="routePedestrian"/>
<constraints>
<constraint firstAttribute="width" secondItem="VhE-hA-Leo" secondAttribute="height" multiplier="1:1" id="V4H-0m-WCy"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Eu3-bT-Dom">
<rect key="frame" x="98" y="0.0" width="38" height="38"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="routeAuto"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yiM-fM-sSS" userLabel="Bicycle">
<rect key="frame" x="144" y="0.0" width="38" height="38"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="routeBicycle"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f6i-lw-K3R" userLabel="Taxi">
<rect key="frame" x="180" y="3" width="38" height="38"/>
<rect key="frame" x="190" y="0.0" width="38" height="38"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="routeTaxi"/>
<constraints>
<constraint firstAttribute="width" constant="38" id="OgG-Kd-9xU"/>
<constraint firstAttribute="height" constant="38" id="PHb-wf-Y8y"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="jDl-pu-eov" firstAttribute="leading" secondItem="sXu-tl-a0m" secondAttribute="leading" constant="6" id="4B3-wd-Hli"/>
<constraint firstItem="VhE-hA-Leo" firstAttribute="leading" secondItem="yiM-fM-sSS" secondAttribute="trailing" constant="16" id="5aG-G0-kVn"/>
<constraint firstItem="f6i-lw-K3R" firstAttribute="centerY" secondItem="sXu-tl-a0m" secondAttribute="centerY" id="8bO-5b-sWI"/>
<constraint firstItem="VhE-hA-Leo" firstAttribute="centerY" secondItem="jDl-pu-eov" secondAttribute="centerY" id="3io-x7-EBK"/>
<constraint firstAttribute="trailing" secondItem="yiM-fM-sSS" secondAttribute="trailing" priority="750" constant="6" id="5D1-qi-hgK"/>
<constraint firstItem="yiM-fM-sSS" firstAttribute="centerY" secondItem="Eu3-bT-Dom" secondAttribute="centerY" id="5j6-K4-Lzf"/>
<constraint firstItem="VhE-hA-Leo" firstAttribute="leading" secondItem="jDl-pu-eov" secondAttribute="trailing" constant="8" id="7Gp-G4-bFf"/>
<constraint firstItem="VhE-hA-Leo" firstAttribute="height" secondItem="jDl-pu-eov" secondAttribute="height" id="A1T-36-dfd"/>
<constraint firstItem="yiM-fM-sSS" firstAttribute="width" secondItem="Eu3-bT-Dom" secondAttribute="width" id="Azn-P1-9QF"/>
<constraint firstItem="Eu3-bT-Dom" firstAttribute="height" secondItem="VhE-hA-Leo" secondAttribute="height" id="B0l-i1-P6O"/>
<constraint firstAttribute="trailing" secondItem="f6i-lw-K3R" secondAttribute="trailing" constant="6" id="Cd3-ev-uFS"/>
<constraint firstItem="VhE-hA-Leo" firstAttribute="top" secondItem="sXu-tl-a0m" secondAttribute="top" constant="3" id="HM9-PQ-ys1"/>
<constraint firstAttribute="bottom" secondItem="jDl-pu-eov" secondAttribute="bottom" id="Icg-Vj-GvT"/>
<constraint firstItem="yiM-fM-sSS" firstAttribute="leading" secondItem="jDl-pu-eov" secondAttribute="trailing" constant="16" id="Ig8-ez-IpI"/>
<constraint firstAttribute="bottom" secondItem="VhE-hA-Leo" secondAttribute="bottom" constant="3" id="Sod-o1-NpK"/>
<constraint firstAttribute="trailing" secondItem="VhE-hA-Leo" secondAttribute="trailing" priority="750" constant="6" id="aI0-vF-pgT"/>
<constraint firstItem="yiM-fM-sSS" firstAttribute="top" secondItem="sXu-tl-a0m" secondAttribute="top" id="f3J-LS-7YL"/>
<constraint firstAttribute="bottom" secondItem="yiM-fM-sSS" secondAttribute="bottom" id="ipg-GT-aKH"/>
<constraint firstItem="jDl-pu-eov" firstAttribute="top" secondItem="sXu-tl-a0m" secondAttribute="top" id="kzv-U2-zJG"/>
<constraint firstItem="f6i-lw-K3R" firstAttribute="leading" secondItem="VhE-hA-Leo" secondAttribute="trailing" constant="16" id="oon-pL-3br"/>
<constraint firstItem="Eu3-bT-Dom" firstAttribute="width" secondItem="VhE-hA-Leo" secondAttribute="width" id="De9-p5-MSM"/>
<constraint firstAttribute="bottom" secondItem="jDl-pu-eov" secondAttribute="bottom" id="GaQ-fH-vHQ"/>
<constraint firstItem="f6i-lw-K3R" firstAttribute="centerY" secondItem="yiM-fM-sSS" secondAttribute="centerY" id="Mjd-gs-1be"/>
<constraint firstItem="Eu3-bT-Dom" firstAttribute="centerY" secondItem="VhE-hA-Leo" secondAttribute="centerY" id="Rye-xy-wJZ"/>
<constraint firstItem="VhE-hA-Leo" firstAttribute="width" secondItem="jDl-pu-eov" secondAttribute="width" id="UtW-tS-aVd"/>
<constraint firstItem="f6i-lw-K3R" firstAttribute="leading" secondItem="yiM-fM-sSS" secondAttribute="trailing" constant="8" id="Zs5-bj-AR6"/>
<constraint firstItem="Eu3-bT-Dom" firstAttribute="leading" secondItem="VhE-hA-Leo" secondAttribute="trailing" constant="8" id="a29-bx-wGD"/>
<constraint firstItem="f6i-lw-K3R" firstAttribute="width" secondItem="yiM-fM-sSS" secondAttribute="width" id="hM2-be-Fpl"/>
<constraint firstItem="jDl-pu-eov" firstAttribute="leading" secondItem="sXu-tl-a0m" secondAttribute="leading" constant="6" id="kNf-mc-JqH"/>
<constraint firstItem="f6i-lw-K3R" firstAttribute="height" secondItem="yiM-fM-sSS" secondAttribute="height" id="kqX-iw-hR7"/>
<constraint firstItem="yiM-fM-sSS" firstAttribute="height" secondItem="Eu3-bT-Dom" secondAttribute="height" id="n1O-oV-Y37"/>
<constraint firstItem="yiM-fM-sSS" firstAttribute="leading" secondItem="Eu3-bT-Dom" secondAttribute="trailing" constant="8" id="obj-Bs-U8h"/>
<constraint firstItem="jDl-pu-eov" firstAttribute="top" secondItem="sXu-tl-a0m" secondAttribute="top" id="sf1-S5-kmZ"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="sXu-tl-a0m" firstAttribute="bottom" secondItem="a4n-5I-PN3" secondAttribute="bottom" id="4NN-cC-Tsg"/>
<constraint firstItem="sXu-tl-a0m" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="a4n-5I-PN3" secondAttribute="trailing" constant="4" id="2EB-6T-LIW"/>
<constraint firstAttribute="height" constant="44" id="7e9-gc-Y07"/>
<constraint firstItem="sXu-tl-a0m" firstAttribute="top" secondItem="a4n-5I-PN3" secondAttribute="top" id="J7w-8N-vlf"/>
<constraint firstItem="sXu-tl-a0m" firstAttribute="centerX" secondItem="3s2-BV-X5i" secondAttribute="centerX" id="OeL-MY-Mn5"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="sXu-tl-a0m" secondAttribute="trailing" constant="4" id="Hj0-Nl-uaa"/>
<constraint firstItem="sXu-tl-a0m" firstAttribute="centerX" secondItem="3s2-BV-X5i" secondAttribute="centerX" priority="750" id="OeL-MY-Mn5"/>
<constraint firstItem="sXu-tl-a0m" firstAttribute="centerY" secondItem="a4n-5I-PN3" secondAttribute="centerY" id="V8T-Zb-1Ux"/>
<constraint firstItem="a4n-5I-PN3" firstAttribute="leading" secondItem="3s2-BV-X5i" secondAttribute="leading" id="Wxp-Yl-6SC"/>
<constraint firstItem="a4n-5I-PN3" firstAttribute="top" secondItem="3s2-BV-X5i" secondAttribute="top" id="ppW-Pq-6rh"/>
</constraints>
@ -426,6 +431,7 @@
<outlet property="bicycle" destination="yiM-fM-sSS" id="pMf-6J-9Gd"/>
<outlet property="contentView" destination="3s2-BV-X5i" id="mp7-Qq-drU"/>
<outlet property="pedestrian" destination="VhE-hA-Leo" id="R3O-th-Jw0"/>
<outlet property="publicTransport" destination="Eu3-bT-Dom" id="XNh-uW-Kog"/>
<outlet property="taxi" destination="f6i-lw-K3R" id="s0G-le-Kbz"/>
<outlet property="vehicle" destination="jDl-pu-eov" id="awM-KI-2xO"/>
</connections>

85
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
View file

@ -1,13 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="HelveticaNeue.ttc">
<string>HelveticaNeue</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
<connections>
@ -49,10 +54,10 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oQc-l8-sZH" userLabel="Buttons Box">
<rect key="frame" x="54" y="0.0" width="212" height="44"/>
<rect key="frame" x="48" y="3" width="234" height="38"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cZF-Ha-2tB">
<rect key="frame" x="6" y="3" width="38" height="38"/>
<rect key="frame" x="6" y="0.0" width="38" height="38"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="routeAuto"/>
<constraints>
@ -60,47 +65,58 @@
<constraint firstAttribute="height" constant="38" id="mp7-b4-xot"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FuO-c6-y9C" userLabel="Bicycle">
<rect key="frame" x="60" y="3" width="38" height="38"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="routeBicycle"/>
<constraints>
<constraint firstAttribute="width" constant="38" id="9fe-fw-05J"/>
<constraint firstAttribute="height" constant="38" id="gbm-NL-zgv"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6D3-QF-6wm">
<rect key="frame" x="114" y="3" width="38" height="38"/>
<rect key="frame" x="52" y="0.0" width="38" height="38"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="routePedestrian"/>
<constraints>
<constraint firstAttribute="width" constant="38" id="815-LJ-2tk"/>
<constraint firstAttribute="height" constant="38" id="hXi-E7-GUb"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yIt-eq-pV5">
<rect key="frame" x="98" y="0.0" width="38" height="38"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="routeAuto"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FuO-c6-y9C" userLabel="Bicycle">
<rect key="frame" x="144" y="0.0" width="38" height="38"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="routeBicycle"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="15Q-ZN-NzE" userLabel="Taxi">
<rect key="frame" x="168" y="3" width="38" height="38"/>
<rect key="frame" x="190" y="0.0" width="38" height="38"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" identifier="routeTaxi"/>
<constraints>
<constraint firstAttribute="width" constant="38" id="ibp-pJ-TuK"/>
<constraint firstAttribute="height" constant="38" id="zPC-M0-Jo1"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="FuO-c6-y9C" firstAttribute="centerY" secondItem="oQc-l8-sZH" secondAttribute="centerY" id="1De-4s-V8t"/>
<constraint firstItem="6D3-QF-6wm" firstAttribute="leading" secondItem="FuO-c6-y9C" secondAttribute="trailing" constant="16" id="91z-iC-oKp"/>
<constraint firstItem="cZF-Ha-2tB" firstAttribute="centerY" secondItem="oQc-l8-sZH" secondAttribute="centerY" id="MQh-op-cpN"/>
<constraint firstItem="6D3-QF-6wm" firstAttribute="height" secondItem="cZF-Ha-2tB" secondAttribute="height" id="4Qi-EG-IAQ"/>
<constraint firstItem="6D3-QF-6wm" firstAttribute="centerY" secondItem="cZF-Ha-2tB" secondAttribute="centerY" id="59W-uU-VjX"/>
<constraint firstItem="yIt-eq-pV5" firstAttribute="centerY" secondItem="6D3-QF-6wm" secondAttribute="centerY" id="Asc-c8-I4S"/>
<constraint firstAttribute="bottom" secondItem="cZF-Ha-2tB" secondAttribute="bottom" id="CUK-cL-Kgn"/>
<constraint firstItem="cZF-Ha-2tB" firstAttribute="top" secondItem="oQc-l8-sZH" secondAttribute="top" id="Gph-Eh-TU4"/>
<constraint firstItem="yIt-eq-pV5" firstAttribute="width" secondItem="6D3-QF-6wm" secondAttribute="width" id="H4Q-ur-uYs"/>
<constraint firstItem="15Q-ZN-NzE" firstAttribute="height" secondItem="FuO-c6-y9C" secondAttribute="height" id="MJ2-gy-RuF"/>
<constraint firstItem="cZF-Ha-2tB" firstAttribute="leading" secondItem="oQc-l8-sZH" secondAttribute="leading" constant="6" id="MjU-UA-Kax"/>
<constraint firstAttribute="height" constant="44" id="Mws-KZ-ghs"/>
<constraint firstItem="15Q-ZN-NzE" firstAttribute="leading" secondItem="6D3-QF-6wm" secondAttribute="trailing" constant="16" id="Td5-UQ-kzj"/>
<constraint firstAttribute="trailing" secondItem="FuO-c6-y9C" secondAttribute="trailing" priority="750" constant="6" id="Mnf-65-B96"/>
<constraint firstItem="yIt-eq-pV5" firstAttribute="leading" secondItem="6D3-QF-6wm" secondAttribute="trailing" constant="8" id="SZ8-HG-7Hp">
<variation key="heightClass=compact" constant="16"/>
</constraint>
<constraint firstItem="FuO-c6-y9C" firstAttribute="leading" secondItem="yIt-eq-pV5" secondAttribute="trailing" constant="8" id="SZW-Df-ewG">
<variation key="heightClass=compact" constant="16"/>
</constraint>
<constraint firstAttribute="trailing" secondItem="15Q-ZN-NzE" secondAttribute="trailing" constant="6" id="WHK-N0-dCc"/>
<constraint firstItem="FuO-c6-y9C" firstAttribute="leading" secondItem="cZF-Ha-2tB" secondAttribute="trailing" constant="16" id="Z6M-UV-6x2"/>
<constraint firstItem="6D3-QF-6wm" firstAttribute="centerY" secondItem="oQc-l8-sZH" secondAttribute="centerY" id="vXO-6g-q4L"/>
<constraint firstAttribute="trailing" secondItem="6D3-QF-6wm" secondAttribute="trailing" priority="750" constant="6" id="zmG-EZ-8Wk"/>
<constraint firstItem="15Q-ZN-NzE" firstAttribute="centerY" secondItem="oQc-l8-sZH" secondAttribute="centerY" id="zvc-uG-Izm"/>
<constraint firstItem="15Q-ZN-NzE" firstAttribute="leading" secondItem="FuO-c6-y9C" secondAttribute="trailing" constant="8" id="Wve-9m-8zL">
<variation key="heightClass=compact" constant="16"/>
</constraint>
<constraint firstItem="15Q-ZN-NzE" firstAttribute="centerY" secondItem="FuO-c6-y9C" secondAttribute="centerY" id="XnT-CH-4hj"/>
<constraint firstItem="FuO-c6-y9C" firstAttribute="height" secondItem="yIt-eq-pV5" secondAttribute="height" id="bVx-od-f1R"/>
<constraint firstItem="6D3-QF-6wm" firstAttribute="leading" secondItem="cZF-Ha-2tB" secondAttribute="trailing" constant="8" id="ogb-pD-gIt">
<variation key="heightClass=compact" constant="16"/>
</constraint>
<constraint firstItem="FuO-c6-y9C" firstAttribute="centerY" secondItem="yIt-eq-pV5" secondAttribute="centerY" id="tk3-wG-hnn"/>
<constraint firstItem="6D3-QF-6wm" firstAttribute="width" secondItem="cZF-Ha-2tB" secondAttribute="width" id="ubg-3e-PYE"/>
<constraint firstItem="FuO-c6-y9C" firstAttribute="width" secondItem="yIt-eq-pV5" secondAttribute="width" id="vV6-AH-LBg"/>
<constraint firstItem="15Q-ZN-NzE" firstAttribute="width" secondItem="FuO-c6-y9C" secondAttribute="width" id="wjk-Hk-xXs"/>
<constraint firstItem="yIt-eq-pV5" firstAttribute="height" secondItem="6D3-QF-6wm" secondAttribute="height" id="wrQ-Mh-rRk"/>
</constraints>
</view>
</subviews>
@ -110,7 +126,9 @@
<constraint firstItem="oQc-l8-sZH" firstAttribute="centerY" secondItem="wpf-tw-Coz" secondAttribute="centerY" id="NwC-Dq-AAM"/>
<constraint firstItem="wpf-tw-Coz" firstAttribute="leading" secondItem="WqK-Yb-PmP" secondAttribute="leading" id="bK5-4Q-Rv9"/>
<constraint firstItem="wpf-tw-Coz" firstAttribute="top" secondItem="WqK-Yb-PmP" secondAttribute="top" id="cPc-fO-vAa"/>
<constraint firstItem="oQc-l8-sZH" firstAttribute="centerX" secondItem="WqK-Yb-PmP" secondAttribute="centerX" id="ltA-tm-z3P"/>
<constraint firstItem="oQc-l8-sZH" firstAttribute="centerX" secondItem="WqK-Yb-PmP" secondAttribute="centerX" priority="750" id="ltA-tm-z3P"/>
<constraint firstItem="oQc-l8-sZH" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="wpf-tw-Coz" secondAttribute="trailing" constant="4" id="nBk-gt-mzb"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="oQc-l8-sZH" secondAttribute="trailing" constant="4" id="yBS-u8-1oX"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/>
@ -133,6 +151,7 @@
<outlet property="bicycle" destination="FuO-c6-y9C" id="UR2-pF-Amb"/>
<outlet property="contentView" destination="WqK-Yb-PmP" id="4ph-Dm-EFr"/>
<outlet property="pedestrian" destination="6D3-QF-6wm" id="bdh-zx-9LW"/>
<outlet property="publicTransport" destination="yIt-eq-pV5" id="yIX-eM-Hrs"/>
<outlet property="taxi" destination="15Q-ZN-NzE" id="RaD-7N-ZE2"/>
<outlet property="vehicle" destination="cZF-Ha-2tB" id="QP3-tU-nfO"/>
</connections>

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

@ -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";

1
iphone/Maps/Core/Location/MWMLocationManager.mm
View file

@ -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;

3
iphone/Maps/Core/Routing/MWMCoreRouterType.h
View file

@ -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;

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

@ -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();

1
iphone/Maps/Core/Routing/MWMRouterType.h
View file

@ -1,6 +1,7 @@
typedef NS_ENUM(NSUInteger, MWMRouterType) {
MWMRouterTypeVehicle,
MWMRouterTypePedestrian,
MWMRouterTypePublicTransport,
MWMRouterTypeBicycle,
MWMRouterTypeTaxi
};

12
iphone/Maps/Images.xcassets/NavigationDashboard/ic_train.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_train.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
iphone/Maps/Images.xcassets/NavigationDashboard/ic_train.imageset/ic_train.pdf vendored Normal file
View file

Binary file not shown.

12
iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_highlighted.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_train_highlighted.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_highlighted.imageset/ic_train_highlighted.pdf vendored Normal file
View file

Binary file not shown.

12
iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_selected.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_train_selected.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
iphone/Maps/Images.xcassets/NavigationDashboard/ic_train_selected.imageset/ic_train_selected.pdf vendored Normal file
View file

Binary file not shown.