forked from organicmaps/organicmaps
[ios] Changed new routing layout.
This commit is contained in:
v.mikhaylenko
Alex Zolotarev
parent
4e55336b0e
commit
a78f21056e
15 changed files with 517 additions and 276 deletions
|
|
@ -27,10 +27,11 @@
|
|||
|
||||
- (instancetype)init __attribute__((unavailable("init is not available")));
|
||||
- (instancetype)initWithParentController:(MapViewController *)controller;
|
||||
- (void)setTopBound:(CGFloat)bound;
|
||||
|
||||
#pragma mark - Layout
|
||||
|
||||
@property (nonatomic) CGFloat topBound;
|
||||
|
||||
- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation;
|
||||
|
||||
#pragma mark - MWMPlacePageViewManager
|
||||
|
|
|
|||
|
|
@ -51,12 +51,6 @@
|
|||
return self;
|
||||
}
|
||||
|
||||
- (void)setTopBound:(CGFloat)bound
|
||||
{
|
||||
[self.zoomButtons setTopBound:bound];
|
||||
[self.placePageManager setTopBound:bound];
|
||||
}
|
||||
|
||||
#pragma mark - Layout
|
||||
|
||||
- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation
|
||||
|
|
@ -115,6 +109,13 @@
|
|||
// GetFramework().BuildRoute(self.routeDestination, 0 /* timeoutSec */);
|
||||
}
|
||||
|
||||
- (void)navigationDashBoardDidUpdate
|
||||
{
|
||||
CGFloat const topBound = self.topBound + self.navigationManager.height;
|
||||
[self.zoomButtons setTopBound:topBound];
|
||||
[self.placePageManager setTopBound:topBound];
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
@synthesize menuState = _menuState;
|
||||
|
|
@ -160,4 +161,10 @@
|
|||
return self.placePageManager.isDirectionViewShown;
|
||||
}
|
||||
|
||||
- (void)setTopBound:(CGFloat)topBound
|
||||
{
|
||||
_topBound = topBound;
|
||||
self.navigationManager.topBound = topBound;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -23,11 +23,16 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState)
|
|||
|
||||
- (void)buildRouteWithType:(enum MWMNavigationRouteType)type;
|
||||
|
||||
- (void)navigationDashBoardDidUpdate;
|
||||
|
||||
@end
|
||||
|
||||
@interface MWMNavigationDashboardManager : NSObject
|
||||
|
||||
@property (nonatomic) MWMNavigationDashboardState state;
|
||||
@property (nonatomic) CGFloat topBound;
|
||||
@property (nonatomic, readonly) CGFloat height;
|
||||
|
||||
|
||||
- (instancetype)init __attribute__((unavailable("init is not available")));
|
||||
- (instancetype)initWithParentView:(UIView *)view delegate:(id<MWMNavigationDashboardManagerDelegate>)delegate;
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
|
||||
- (IBAction)routePreviewChange:(UIButton *)sender
|
||||
{
|
||||
self.routePreview.showGoButton = [sender isEqual:self.routePreview.pedestrian];
|
||||
[self showGoButton:[sender isEqual:self.routePreview.pedestrian]];
|
||||
// enum MWMNavigationRouteType const type = [sender isEqual:self.routePreview.pedestrian] ? MWMNavigationRouteTypePedestrian : MWMNavigationRouteTypeVehicle;
|
||||
// [self.delegate buildRouteWithType:type];
|
||||
}
|
||||
|
|
@ -113,6 +113,12 @@
|
|||
[self.navigationDashboard addToView:self.ownerView];
|
||||
}
|
||||
|
||||
- (void)showGoButton:(BOOL)show
|
||||
{
|
||||
self.routePreviewPortrait.showGoButton = self.routePreviewLandscape.showGoButton = show;
|
||||
[self.delegate navigationDashBoardDidUpdate];
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (void)setState:(MWMNavigationDashboardState)state
|
||||
|
|
@ -134,6 +140,29 @@
|
|||
break;
|
||||
}
|
||||
_state = state;
|
||||
[self.delegate navigationDashBoardDidUpdate];
|
||||
}
|
||||
|
||||
- (void)setTopBound:(CGFloat)topBound
|
||||
{
|
||||
_topBound = self.routePreviewLandscape.topBound = self.routePreviewPortrait.topBound = self.navigationDashboardLandscape.topBound = self.navigationDashboardPortrait.topBound = topBound;
|
||||
[self.delegate navigationDashBoardDidUpdate];
|
||||
}
|
||||
|
||||
- (CGFloat)height
|
||||
{
|
||||
switch (self.state)
|
||||
{
|
||||
case MWMNavigationDashboardStateHidden:
|
||||
return 0.0;
|
||||
break;
|
||||
case MWMNavigationDashboardStatePlanning:
|
||||
return self.routePreview.visibleHeight;
|
||||
break;
|
||||
case MWMNavigationDashboardStateNavigation:
|
||||
return self.navigationDashboard.height;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
|
||||
|
|
@ -7,136 +7,158 @@
|
|||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
|
||||
<connections>
|
||||
<outlet property="navigationDashboardLandscape" destination="Oeo-6A-mHo" id="IAU-RJ-VYg"/>
|
||||
<outlet property="navigationDashboardLandscape" destination="e3c-EN-9M6" id="b9k-Wx-aHt"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="Oeo-6A-mHo" customClass="MWMNavigationDashboard">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="92"/>
|
||||
<view contentMode="scaleToFill" id="e3c-EN-9M6" customClass="MWMNavigationDashboard">
|
||||
<rect key="frame" x="0.0" y="0.0" width="736" height="96"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jQ3-Hp-ClD" userLabel="Cancel">
|
||||
<rect key="frame" x="0.0" y="32" width="40" height="40"/>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qvD-ft-rlE" userLabel="Cancel">
|
||||
<rect key="frame" x="0.0" y="36" width="40" height="40"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="40" id="Bpd-ps-0hN"/>
|
||||
<constraint firstAttribute="height" constant="40" id="TZ8-Bz-6NM"/>
|
||||
<constraint firstAttribute="width" constant="40" id="Yuk-DZ-Oty"/>
|
||||
<constraint firstAttribute="height" constant="40" id="wD3-8H-mzJ"/>
|
||||
</constraints>
|
||||
<state key="normal" image="ic_cancel">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5N1-pV-7uW" userLabel="Azimut Box">
|
||||
<rect key="frame" x="56" y="29" width="190" height="52"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZzU-jx-uYa" userLabel="Azimut Box">
|
||||
<rect key="frame" x="56" y="33" width="190" height="52"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_direction" translatesAutoresizingMaskIntoConstraints="NO" id="wn3-TT-TQ9">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_direction" translatesAutoresizingMaskIntoConstraints="NO" id="1r7-WJ-4zD">
|
||||
<rect key="frame" x="0.0" y="0.0" width="52" height="52"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="52" id="JKH-zH-4E3"/>
|
||||
<constraint firstAttribute="width" constant="52" id="vnM-Ps-EOE"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TrJ-7a-QPc">
|
||||
<rect key="frame" x="60" y="5" width="21" height="42"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sMk-g9-2oJ">
|
||||
<rect key="frame" x="60" y="5" width="20.5" height="42"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="36"/>
|
||||
<color key="textColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="km" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xYv-zR-wkx">
|
||||
<rect key="frame" x="82" y="21" width="26" height="22"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="km" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vo5-Yp-xWN">
|
||||
<rect key="frame" x="81" y="21" width="26" height="22"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="26" id="6TZ-Rx-Yen"/>
|
||||
<constraint firstAttribute="height" constant="21.5" id="LJI-b9-3D4"/>
|
||||
<constraint firstAttribute="height" constant="21.5" id="Wmm-iR-zeA"/>
|
||||
<constraint firstAttribute="width" constant="25.5" id="lks-aY-5bf"/>
|
||||
<constraint firstAttribute="height" constant="21.5" id="2Xd-X9-QxK"/>
|
||||
<constraint firstAttribute="height" constant="21.5" id="BJ0-k8-PFK"/>
|
||||
<constraint firstAttribute="width" constant="25.5" id="OEQ-uY-Tnf"/>
|
||||
<constraint firstAttribute="width" constant="26" id="rCL-RY-GbF"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
|
||||
<color key="textColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="6TZ-Rx-Yen"/>
|
||||
<exclude reference="Wmm-iR-zeA"/>
|
||||
<exclude reference="2Xd-X9-QxK"/>
|
||||
<exclude reference="rCL-RY-GbF"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="TrJ-7a-QPc" secondAttribute="bottom" constant="5" id="0VR-3j-tvk"/>
|
||||
<constraint firstItem="TrJ-7a-QPc" firstAttribute="baseline" secondItem="xYv-zR-wkx" secondAttribute="baseline" id="1c6-vV-o9Z"/>
|
||||
<constraint firstItem="wn3-TT-TQ9" firstAttribute="leading" secondItem="5N1-pV-7uW" secondAttribute="leading" id="2Jn-9t-ISi"/>
|
||||
<constraint firstAttribute="width" constant="190" id="2We-Mg-bL7"/>
|
||||
<constraint firstItem="xYv-zR-wkx" firstAttribute="leading" secondItem="TrJ-7a-QPc" secondAttribute="trailing" constant="3.5" id="4aM-XV-mEd"/>
|
||||
<constraint firstItem="wn3-TT-TQ9" firstAttribute="top" secondItem="5N1-pV-7uW" secondAttribute="top" id="IVh-x5-T8F"/>
|
||||
<constraint firstAttribute="trailing" secondItem="xYv-zR-wkx" secondAttribute="trailing" id="ItV-X2-0pS"/>
|
||||
<constraint firstItem="TrJ-7a-QPc" firstAttribute="baseline" secondItem="xYv-zR-wkx" secondAttribute="baseline" id="W1L-Y4-bPS"/>
|
||||
<constraint firstItem="xYv-zR-wkx" firstAttribute="leading" secondItem="TrJ-7a-QPc" secondAttribute="trailing" constant="1" id="fDw-Rm-nO6"/>
|
||||
<constraint firstAttribute="bottom" secondItem="wn3-TT-TQ9" secondAttribute="bottom" id="fYR-ML-ZFU"/>
|
||||
<constraint firstItem="xYv-zR-wkx" firstAttribute="leading" secondItem="TrJ-7a-QPc" secondAttribute="trailing" constant="4" id="hm1-wr-aJv"/>
|
||||
<constraint firstItem="xYv-zR-wkx" firstAttribute="leading" secondItem="TrJ-7a-QPc" secondAttribute="trailing" constant="4" id="qUO-VD-GIs"/>
|
||||
<constraint firstAttribute="height" constant="52" id="r9w-fj-fuv"/>
|
||||
<constraint firstItem="TrJ-7a-QPc" firstAttribute="top" secondItem="5N1-pV-7uW" secondAttribute="top" constant="5" id="tBm-Wm-SDr"/>
|
||||
<constraint firstItem="TrJ-7a-QPc" firstAttribute="leading" secondItem="wn3-TT-TQ9" secondAttribute="trailing" constant="8" id="uiI-JA-XCl"/>
|
||||
<constraint firstItem="sMk-g9-2oJ" firstAttribute="baseline" secondItem="Vo5-Yp-xWN" secondAttribute="baseline" id="3IZ-7s-BUO"/>
|
||||
<constraint firstAttribute="bottom" secondItem="sMk-g9-2oJ" secondAttribute="bottom" constant="5" id="4c5-vj-n8i"/>
|
||||
<constraint firstItem="Vo5-Yp-xWN" firstAttribute="leading" secondItem="sMk-g9-2oJ" secondAttribute="trailing" constant="1" id="DHi-Oq-8ah"/>
|
||||
<constraint firstItem="1r7-WJ-4zD" firstAttribute="top" secondItem="ZzU-jx-uYa" secondAttribute="top" id="DLs-tP-313"/>
|
||||
<constraint firstItem="1r7-WJ-4zD" firstAttribute="leading" secondItem="ZzU-jx-uYa" secondAttribute="leading" id="HK7-8o-2bx"/>
|
||||
<constraint firstItem="sMk-g9-2oJ" firstAttribute="top" secondItem="ZzU-jx-uYa" secondAttribute="top" constant="5" id="Ixf-kz-eFi"/>
|
||||
<constraint firstItem="Vo5-Yp-xWN" firstAttribute="leading" secondItem="sMk-g9-2oJ" secondAttribute="trailing" constant="4" id="JKZ-WH-QTe"/>
|
||||
<constraint firstAttribute="bottom" secondItem="1r7-WJ-4zD" secondAttribute="bottom" id="JsW-d1-58r"/>
|
||||
<constraint firstItem="Vo5-Yp-xWN" firstAttribute="leading" secondItem="sMk-g9-2oJ" secondAttribute="trailing" constant="3.5" id="RsH-2c-74p"/>
|
||||
<constraint firstItem="sMk-g9-2oJ" firstAttribute="leading" secondItem="1r7-WJ-4zD" secondAttribute="trailing" constant="8" id="XLA-lU-avx"/>
|
||||
<constraint firstItem="Vo5-Yp-xWN" firstAttribute="leading" secondItem="sMk-g9-2oJ" secondAttribute="trailing" constant="4" id="chw-Mu-gak"/>
|
||||
<constraint firstAttribute="width" constant="190" id="pfA-s3-hU5"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Vo5-Yp-xWN" secondAttribute="trailing" id="sCi-Lc-G8B"/>
|
||||
<constraint firstItem="sMk-g9-2oJ" firstAttribute="baseline" secondItem="Vo5-Yp-xWN" secondAttribute="baseline" id="t80-eN-Ymv"/>
|
||||
<constraint firstAttribute="height" constant="52" id="y3P-ga-yXV"/>
|
||||
</constraints>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="1c6-vV-o9Z"/>
|
||||
<exclude reference="4aM-XV-mEd"/>
|
||||
<exclude reference="ItV-X2-0pS"/>
|
||||
<exclude reference="hm1-wr-aJv"/>
|
||||
<exclude reference="qUO-VD-GIs"/>
|
||||
<exclude reference="3IZ-7s-BUO"/>
|
||||
<exclude reference="JKZ-WH-QTe"/>
|
||||
<exclude reference="chw-Mu-gak"/>
|
||||
<exclude reference="sCi-Lc-G8B"/>
|
||||
<exclude reference="RsH-2c-74p"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ern-y6-muT" userLabel="Distance Box">
|
||||
<rect key="frame" x="216" y="35" width="96" height="43"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r2o-8G-3Cv" userLabel="Distance Box">
|
||||
<rect key="frame" x="548" y="39" width="180" height="42"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100000 km" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mi4-cd-rXM">
|
||||
<rect key="frame" x="0.0" y="0.0" width="96" height="23"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12 min" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yzZ-6b-Jou">
|
||||
<rect key="frame" x="0.0" y="0.0" width="180" height="21"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="23" id="ZOk-he-haN"/>
|
||||
<constraint firstAttribute="height" constant="21" id="Z2S-i8-Ntf"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10000 h" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wpm-lp-HRo">
|
||||
<rect key="frame" x="0.0" y="26" width="96" height="17"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20 km" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="heX-Mf-T11">
|
||||
<rect key="frame" x="0.0" y="27" width="112" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="112" id="APr-Ng-kVm"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="16:40 " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F95-AG-2uX">
|
||||
<rect key="frame" x="132.5" y="27" width="47.5" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="lBX-qz-7jM"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="Wpm-lp-HRo" secondAttribute="bottom" id="3ez-2Y-B7e"/>
|
||||
<constraint firstItem="Wpm-lp-HRo" firstAttribute="leading" secondItem="ern-y6-muT" secondAttribute="leading" id="Bx8-Xf-Swo"/>
|
||||
<constraint firstAttribute="width" constant="96" id="FVS-4O-Wlt"/>
|
||||
<constraint firstItem="mi4-cd-rXM" firstAttribute="leading" secondItem="ern-y6-muT" secondAttribute="leading" id="NZn-px-bwb"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Wpm-lp-HRo" secondAttribute="trailing" id="PYy-Kc-0qF"/>
|
||||
<constraint firstItem="Wpm-lp-HRo" firstAttribute="top" secondItem="mi4-cd-rXM" secondAttribute="bottom" constant="3" id="SNa-ww-TL8"/>
|
||||
<constraint firstItem="mi4-cd-rXM" firstAttribute="top" secondItem="ern-y6-muT" secondAttribute="top" id="b3c-mw-4ze"/>
|
||||
<constraint firstAttribute="trailing" secondItem="mi4-cd-rXM" secondAttribute="trailing" id="gZ9-Qc-ayG"/>
|
||||
<constraint firstAttribute="height" constant="43" id="tRm-S2-Vph"/>
|
||||
<constraint firstItem="F95-AG-2uX" firstAttribute="leading" secondItem="heX-Mf-T11" secondAttribute="trailing" constant="20" id="6ja-Bb-h9C"/>
|
||||
<constraint firstItem="yzZ-6b-Jou" firstAttribute="leading" secondItem="r2o-8G-3Cv" secondAttribute="leading" id="8Ys-z7-0ic"/>
|
||||
<constraint firstAttribute="trailing" secondItem="heX-Mf-T11" secondAttribute="trailing" constant="84" id="LwO-bA-IkU"/>
|
||||
<constraint firstAttribute="trailing" secondItem="yzZ-6b-Jou" secondAttribute="trailing" id="NnS-Nz-XvI"/>
|
||||
<constraint firstAttribute="bottom" secondItem="heX-Mf-T11" secondAttribute="bottom" constant="-1" id="SI8-Pr-fmE"/>
|
||||
<constraint firstItem="heX-Mf-T11" firstAttribute="leading" secondItem="r2o-8G-3Cv" secondAttribute="leading" id="Xii-Px-eo7"/>
|
||||
<constraint firstAttribute="height" constant="42" id="Y1G-Es-QFk"/>
|
||||
<constraint firstAttribute="width" constant="180" id="Y2M-zQ-72a"/>
|
||||
<constraint firstAttribute="trailing" secondItem="F95-AG-2uX" secondAttribute="trailing" id="ZSo-ff-YeK"/>
|
||||
<constraint firstItem="heX-Mf-T11" firstAttribute="top" secondItem="yzZ-6b-Jou" secondAttribute="bottom" constant="6" id="nke-Cf-wrp"/>
|
||||
<constraint firstItem="yzZ-6b-Jou" firstAttribute="top" secondItem="r2o-8G-3Cv" secondAttribute="top" id="nqg-k8-6Zp"/>
|
||||
<constraint firstItem="F95-AG-2uX" firstAttribute="top" secondItem="yzZ-6b-Jou" secondAttribute="bottom" constant="6" id="pYP-hY-4tg"/>
|
||||
<constraint firstAttribute="bottom" secondItem="F95-AG-2uX" secondAttribute="bottom" constant="-1" id="wrw-dm-07W"/>
|
||||
</constraints>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="LwO-bA-IkU"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="jQ3-Hp-ClD" firstAttribute="leading" secondItem="Oeo-6A-mHo" secondAttribute="leading" id="7Vk-WT-CKU"/>
|
||||
<constraint firstAttribute="bottom" secondItem="5N1-pV-7uW" secondAttribute="bottom" constant="11" id="Hgg-G6-nob"/>
|
||||
<constraint firstAttribute="bottom" secondItem="jQ3-Hp-ClD" secondAttribute="bottom" constant="20" id="LgD-CF-cA5"/>
|
||||
<constraint firstItem="5N1-pV-7uW" firstAttribute="leading" secondItem="jQ3-Hp-ClD" secondAttribute="trailing" constant="16" id="T2H-LK-kGY"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ern-y6-muT" secondAttribute="bottom" constant="14" id="cl8-AF-vx8"/>
|
||||
<constraint firstAttribute="trailing" secondItem="ern-y6-muT" secondAttribute="trailing" constant="8" id="tL0-LY-fbN"/>
|
||||
<constraint firstItem="qvD-ft-rlE" firstAttribute="leading" secondItem="e3c-EN-9M6" secondAttribute="leading" id="2nT-pL-sI6"/>
|
||||
<constraint firstAttribute="bottom" secondItem="r2o-8G-3Cv" secondAttribute="bottom" constant="15" id="3iw-Km-DHQ"/>
|
||||
<constraint firstAttribute="bottom" secondItem="qvD-ft-rlE" secondAttribute="bottom" constant="20" id="W5C-GA-XjL"/>
|
||||
<constraint firstItem="ZzU-jx-uYa" firstAttribute="leading" secondItem="qvD-ft-rlE" secondAttribute="trailing" constant="16" id="ZBX-Dk-LoL"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ZzU-jx-uYa" secondAttribute="bottom" constant="11" id="bF3-ME-vgx"/>
|
||||
<constraint firstAttribute="trailing" secondItem="r2o-8G-3Cv" secondAttribute="trailing" constant="8" id="ghP-27-V4x"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="direction" destination="wn3-TT-TQ9" id="rIY-wm-gMd"/>
|
||||
<outlet property="distanceLeft" destination="mi4-cd-rXM" id="odK-YR-gVQ"/>
|
||||
<outlet property="distanceToNextAction" destination="TrJ-7a-QPc" id="cSr-TJ-LCS"/>
|
||||
<outlet property="distanceToNextActionUnits" destination="xYv-zR-wkx" id="Aj1-l2-je6"/>
|
||||
<outlet property="eta" destination="Wpm-lp-HRo" id="1XZ-Wa-nf4"/>
|
||||
<outlet property="arrivalsTimeLabel" destination="F95-AG-2uX" id="UbS-vM-cGU"/>
|
||||
<outlet property="direction" destination="1r7-WJ-4zD" id="aHj-Mn-s8d"/>
|
||||
<outlet property="distanceLeft" destination="heX-Mf-T11" id="KPh-ym-dPt"/>
|
||||
<outlet property="distanceToNextAction" destination="sMk-g9-2oJ" id="bjw-PH-BYo"/>
|
||||
<outlet property="distanceToNextActionUnits" destination="Vo5-Yp-xWN" id="8Cy-zx-hPd"/>
|
||||
<outlet property="eta" destination="yzZ-6b-Jou" id="cnG-M1-dFR"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="369" y="261"/>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -15,5 +15,6 @@
|
|||
@property (weak, nonatomic) IBOutlet UILabel * distanceToNextActionUnits;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * distanceLeft;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * eta;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * arrivalsTimeLabel;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
|
||||
|
|
@ -7,103 +7,100 @@
|
|||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
|
||||
<connections>
|
||||
<outlet property="navigationDashboardPortrait" destination="kJl-MF-nLa" id="3Sz-qR-jPV"/>
|
||||
<outlet property="navigationDashboardPortrait" destination="wul-fx-3xk" id="Tz2-hv-QWv"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="kJl-MF-nLa" customClass="MWMNavigationDashboard">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="92"/>
|
||||
<view contentMode="scaleToFill" id="wul-fx-3xk" customClass="MWMNavigationDashboard">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="96"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lIA-YE-3gf" userLabel="Cancel">
|
||||
<rect key="frame" x="0.0" y="32" width="40" height="40"/>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CJi-qt-H0B" userLabel="Cancel">
|
||||
<rect key="frame" x="0.0" y="36" width="40" height="40"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="40" id="1FR-ua-TCV"/>
|
||||
<constraint firstAttribute="height" constant="40" id="i8m-N0-1Eu"/>
|
||||
<constraint firstAttribute="width" constant="40" id="EKP-Ms-brE"/>
|
||||
<constraint firstAttribute="height" constant="40" id="bc0-vd-6M6"/>
|
||||
</constraints>
|
||||
<state key="normal" image="ic_cancel">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<connections>
|
||||
<action selector="navigationCancelPressed:" destination="-1" eventType="touchUpInside" id="4UG-ql-HVm"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b4u-Ep-x88" userLabel="Azimut Box">
|
||||
<rect key="frame" x="56" y="29" width="190" height="52"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Zr-ul-QD4" userLabel="Azimut Box">
|
||||
<rect key="frame" x="56" y="33" width="190" height="52"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_direction" translatesAutoresizingMaskIntoConstraints="NO" id="ReY-pp-WUj">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_direction" translatesAutoresizingMaskIntoConstraints="NO" id="vcg-Bu-8CX">
|
||||
<rect key="frame" x="0.0" y="0.0" width="52" height="52"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="52" id="Xla-ak-0RV"/>
|
||||
<constraint firstAttribute="width" constant="52" id="xGv-2r-BQ7"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o81-6U-SwZ">
|
||||
<rect key="frame" x="60" y="5" width="21" height="42"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w7a-mi-GxC">
|
||||
<rect key="frame" x="60" y="5" width="20.5" height="42"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="36"/>
|
||||
<color key="textColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="km" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YdU-X4-2cS">
|
||||
<rect key="frame" x="82" y="21" width="26" height="22"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="km" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vQs-gj-DUL">
|
||||
<rect key="frame" x="81" y="21" width="26" height="22"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="21.5" id="CzS-Fm-83N"/>
|
||||
<constraint firstAttribute="width" constant="26" id="Fxw-xP-xbQ"/>
|
||||
<constraint firstAttribute="height" constant="21.5" id="gpr-ce-2RT"/>
|
||||
<constraint firstAttribute="width" constant="25.5" id="wF5-cy-6d7"/>
|
||||
<constraint firstAttribute="height" constant="21.5" id="8Id-se-VcH"/>
|
||||
<constraint firstAttribute="height" constant="21.5" id="Hag-8H-qLV"/>
|
||||
<constraint firstAttribute="width" constant="25.5" id="gWD-Y6-p24"/>
|
||||
<constraint firstAttribute="width" constant="26" id="zwS-5O-QVa"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
|
||||
<color key="textColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="CzS-Fm-83N"/>
|
||||
<exclude reference="Fxw-xP-xbQ"/>
|
||||
<exclude reference="zwS-5O-QVa"/>
|
||||
<exclude reference="8Id-se-VcH"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="o81-6U-SwZ" firstAttribute="top" secondItem="b4u-Ep-x88" secondAttribute="top" constant="5" id="3Il-GV-b9U"/>
|
||||
<constraint firstAttribute="height" constant="52" id="57A-cQ-ryV"/>
|
||||
<constraint firstItem="YdU-X4-2cS" firstAttribute="leading" secondItem="o81-6U-SwZ" secondAttribute="trailing" constant="4" id="5aZ-iy-uEl"/>
|
||||
<constraint firstAttribute="width" constant="190" id="5ph-LW-ERn"/>
|
||||
<constraint firstItem="ReY-pp-WUj" firstAttribute="top" secondItem="b4u-Ep-x88" secondAttribute="top" id="7TF-qT-VJP"/>
|
||||
<constraint firstItem="YdU-X4-2cS" firstAttribute="leading" secondItem="o81-6U-SwZ" secondAttribute="trailing" constant="4" id="C0M-9S-0HA"/>
|
||||
<constraint firstItem="ReY-pp-WUj" firstAttribute="leading" secondItem="b4u-Ep-x88" secondAttribute="leading" id="C3G-NU-J9H"/>
|
||||
<constraint firstItem="o81-6U-SwZ" firstAttribute="leading" secondItem="ReY-pp-WUj" secondAttribute="trailing" constant="8" id="a8y-4k-lKI"/>
|
||||
<constraint firstAttribute="trailing" secondItem="YdU-X4-2cS" secondAttribute="trailing" id="aP8-Xs-ejb"/>
|
||||
<constraint firstAttribute="bottom" secondItem="o81-6U-SwZ" secondAttribute="bottom" constant="5" id="haM-CW-xvd"/>
|
||||
<constraint firstItem="o81-6U-SwZ" firstAttribute="baseline" secondItem="YdU-X4-2cS" secondAttribute="baseline" id="iGE-ci-Wxa"/>
|
||||
<constraint firstItem="o81-6U-SwZ" firstAttribute="baseline" secondItem="YdU-X4-2cS" secondAttribute="baseline" id="j5N-Hz-1Lk"/>
|
||||
<constraint firstItem="YdU-X4-2cS" firstAttribute="leading" secondItem="o81-6U-SwZ" secondAttribute="trailing" constant="1" id="nEu-g2-NQY"/>
|
||||
<constraint firstItem="YdU-X4-2cS" firstAttribute="leading" secondItem="o81-6U-SwZ" secondAttribute="trailing" constant="3.5" id="q4m-Wo-CFt"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ReY-pp-WUj" secondAttribute="bottom" id="wgQ-nT-We7"/>
|
||||
<constraint firstAttribute="height" constant="52" id="0A6-z9-DaT"/>
|
||||
<constraint firstItem="vcg-Bu-8CX" firstAttribute="top" secondItem="8Zr-ul-QD4" secondAttribute="top" id="B2K-uh-ENJ"/>
|
||||
<constraint firstItem="vcg-Bu-8CX" firstAttribute="leading" secondItem="8Zr-ul-QD4" secondAttribute="leading" id="DNa-pK-w4t"/>
|
||||
<constraint firstAttribute="bottom" secondItem="w7a-mi-GxC" secondAttribute="bottom" constant="5" id="Gqm-CL-ck0"/>
|
||||
<constraint firstAttribute="trailing" secondItem="vQs-gj-DUL" secondAttribute="trailing" id="PeX-D3-WSc"/>
|
||||
<constraint firstItem="vQs-gj-DUL" firstAttribute="leading" secondItem="w7a-mi-GxC" secondAttribute="trailing" constant="1" id="S4k-of-Pfg"/>
|
||||
<constraint firstAttribute="width" constant="190" id="aes-L3-OVF"/>
|
||||
<constraint firstItem="w7a-mi-GxC" firstAttribute="baseline" secondItem="vQs-gj-DUL" secondAttribute="baseline" id="fEx-bU-M8d"/>
|
||||
<constraint firstItem="vQs-gj-DUL" firstAttribute="leading" secondItem="w7a-mi-GxC" secondAttribute="trailing" constant="3.5" id="jOo-j5-LYo"/>
|
||||
<constraint firstAttribute="bottom" secondItem="vcg-Bu-8CX" secondAttribute="bottom" id="kjG-Xr-g7l"/>
|
||||
<constraint firstItem="w7a-mi-GxC" firstAttribute="top" secondItem="8Zr-ul-QD4" secondAttribute="top" constant="5" id="lon-V9-cUc"/>
|
||||
<constraint firstItem="vQs-gj-DUL" firstAttribute="leading" secondItem="w7a-mi-GxC" secondAttribute="trailing" constant="4" id="mvA-aH-9kW"/>
|
||||
<constraint firstItem="w7a-mi-GxC" firstAttribute="baseline" secondItem="vQs-gj-DUL" secondAttribute="baseline" id="ukP-6L-edS"/>
|
||||
<constraint firstItem="vQs-gj-DUL" firstAttribute="leading" secondItem="w7a-mi-GxC" secondAttribute="trailing" constant="4" id="vx0-h4-VxL"/>
|
||||
<constraint firstItem="w7a-mi-GxC" firstAttribute="leading" secondItem="vcg-Bu-8CX" secondAttribute="trailing" constant="8" id="zgG-1s-uba"/>
|
||||
</constraints>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="iGE-ci-Wxa"/>
|
||||
<exclude reference="5aZ-iy-uEl"/>
|
||||
<exclude reference="C0M-9S-0HA"/>
|
||||
<exclude reference="aP8-Xs-ejb"/>
|
||||
<exclude reference="q4m-Wo-CFt"/>
|
||||
<exclude reference="ukP-6L-edS"/>
|
||||
<exclude reference="jOo-j5-LYo"/>
|
||||
<exclude reference="PeX-D3-WSc"/>
|
||||
<exclude reference="mvA-aH-9kW"/>
|
||||
<exclude reference="vx0-h4-VxL"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dvi-Hl-bFv" userLabel="Distance Box">
|
||||
<rect key="frame" x="216" y="35" width="96" height="43"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BLc-UX-Tny" userLabel="Distance Box">
|
||||
<rect key="frame" x="216" y="39" width="96" height="42"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100000 km" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="39t-Al-XMP">
|
||||
<rect key="frame" x="0.0" y="0.0" width="96" height="23"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10 min" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fLt-4z-zaW">
|
||||
<rect key="frame" x="0.0" y="0.0" width="96" height="21"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="23" id="d34-Al-nNv"/>
|
||||
<constraint firstAttribute="height" constant="21" id="z8a-i9-xiC"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10000 h" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FAI-YX-K7c">
|
||||
<rect key="frame" x="0.0" y="26" width="96" height="17"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10 km" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w2P-mo-JWt">
|
||||
<rect key="frame" x="0.0" y="26" width="96" height="16"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -111,35 +108,35 @@
|
|||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="FAI-YX-K7c" firstAttribute="leading" secondItem="dvi-Hl-bFv" secondAttribute="leading" id="7NC-G5-5KE"/>
|
||||
<constraint firstAttribute="trailing" secondItem="FAI-YX-K7c" secondAttribute="trailing" id="Oj0-PG-6HX"/>
|
||||
<constraint firstAttribute="height" constant="43" id="QkV-7S-E5P"/>
|
||||
<constraint firstAttribute="width" constant="96" id="RHi-9b-QXi"/>
|
||||
<constraint firstAttribute="bottom" secondItem="FAI-YX-K7c" secondAttribute="bottom" id="SQj-mH-c6x"/>
|
||||
<constraint firstAttribute="trailing" secondItem="39t-Al-XMP" secondAttribute="trailing" id="VgD-k1-k0P"/>
|
||||
<constraint firstItem="39t-Al-XMP" firstAttribute="leading" secondItem="dvi-Hl-bFv" secondAttribute="leading" id="epj-Vt-sHM"/>
|
||||
<constraint firstItem="39t-Al-XMP" firstAttribute="top" secondItem="dvi-Hl-bFv" secondAttribute="top" id="oXV-0z-Rd4"/>
|
||||
<constraint firstItem="FAI-YX-K7c" firstAttribute="top" secondItem="39t-Al-XMP" secondAttribute="bottom" constant="3" id="uuj-9Q-ugr"/>
|
||||
<constraint firstAttribute="width" constant="96" id="5wb-Gu-vSJ"/>
|
||||
<constraint firstItem="fLt-4z-zaW" firstAttribute="leading" secondItem="BLc-UX-Tny" secondAttribute="leading" id="FqW-7I-zNI"/>
|
||||
<constraint firstAttribute="trailing" secondItem="fLt-4z-zaW" secondAttribute="trailing" id="I9I-bJ-q2D"/>
|
||||
<constraint firstItem="fLt-4z-zaW" firstAttribute="top" secondItem="BLc-UX-Tny" secondAttribute="top" id="PRM-Vl-j7Y"/>
|
||||
<constraint firstAttribute="height" constant="42" id="UaJ-Vf-Spf"/>
|
||||
<constraint firstAttribute="bottom" secondItem="w2P-mo-JWt" secondAttribute="bottom" id="WGX-9a-DHA"/>
|
||||
<constraint firstItem="w2P-mo-JWt" firstAttribute="leading" secondItem="BLc-UX-Tny" secondAttribute="leading" id="hXv-eP-iwC"/>
|
||||
<constraint firstItem="w2P-mo-JWt" firstAttribute="top" secondItem="fLt-4z-zaW" secondAttribute="bottom" constant="5" id="rb4-VI-06q"/>
|
||||
<constraint firstAttribute="trailing" secondItem="w2P-mo-JWt" secondAttribute="trailing" id="xuB-k5-AJe"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="dvi-Hl-bFv" secondAttribute="bottom" constant="14" id="HbZ-8B-Gdq"/>
|
||||
<constraint firstAttribute="bottom" secondItem="b4u-Ep-x88" secondAttribute="bottom" constant="11" id="U4q-CF-sKL"/>
|
||||
<constraint firstAttribute="trailing" secondItem="dvi-Hl-bFv" secondAttribute="trailing" constant="8" id="ZZS-4m-3Kz"/>
|
||||
<constraint firstItem="b4u-Ep-x88" firstAttribute="leading" secondItem="lIA-YE-3gf" secondAttribute="trailing" constant="16" id="gvC-bD-iAi"/>
|
||||
<constraint firstItem="lIA-YE-3gf" firstAttribute="leading" secondItem="kJl-MF-nLa" secondAttribute="leading" id="l5v-dm-qqz"/>
|
||||
<constraint firstAttribute="bottom" secondItem="lIA-YE-3gf" secondAttribute="bottom" constant="20" id="wYe-FG-DNx"/>
|
||||
<constraint firstItem="8Zr-ul-QD4" firstAttribute="leading" secondItem="CJi-qt-H0B" secondAttribute="trailing" constant="16" id="3Uk-I4-PZe"/>
|
||||
<constraint firstAttribute="bottom" secondItem="8Zr-ul-QD4" secondAttribute="bottom" constant="11" id="4Nk-Im-af8"/>
|
||||
<constraint firstAttribute="bottom" secondItem="CJi-qt-H0B" secondAttribute="bottom" constant="20" id="HWG-Yb-dlT"/>
|
||||
<constraint firstAttribute="trailing" secondItem="BLc-UX-Tny" secondAttribute="trailing" constant="8" id="nsz-T8-UYO"/>
|
||||
<constraint firstItem="CJi-qt-H0B" firstAttribute="leading" secondItem="wul-fx-3xk" secondAttribute="leading" id="oNj-FL-aak"/>
|
||||
<constraint firstAttribute="bottom" secondItem="BLc-UX-Tny" secondAttribute="bottom" constant="15" id="r9D-W4-zj0"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="direction" destination="ReY-pp-WUj" id="nRf-6O-QXq"/>
|
||||
<outlet property="distanceLeft" destination="39t-Al-XMP" id="Xb6-QP-dZG"/>
|
||||
<outlet property="distanceToNextAction" destination="o81-6U-SwZ" id="Qry-d6-O44"/>
|
||||
<outlet property="distanceToNextActionUnits" destination="YdU-X4-2cS" id="waJ-ap-c0b"/>
|
||||
<outlet property="eta" destination="FAI-YX-K7c" id="2Yq-y3-5LT"/>
|
||||
<outlet property="direction" destination="vcg-Bu-8CX" id="LC4-mS-2iW"/>
|
||||
<outlet property="distanceLeft" destination="w2P-mo-JWt" id="auU-tj-zhI"/>
|
||||
<outlet property="distanceToNextAction" destination="w7a-mi-GxC" id="8SR-Qv-Udp"/>
|
||||
<outlet property="distanceToNextActionUnits" destination="vQs-gj-DUL" id="OOE-0F-Y8v"/>
|
||||
<outlet property="eta" destination="fLt-4z-zaW" id="C1L-bX-xd5"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="369" y="261"/>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@
|
|||
|
||||
@interface MWMNavigationView : SolidTouchView
|
||||
|
||||
@property (nonatomic) CGFloat topOffset;
|
||||
@property (nonatomic) CGFloat topBound;
|
||||
@property (nonatomic, readonly) CGFloat visibleHeight;
|
||||
@property (nonatomic, readonly) BOOL isVisible;
|
||||
|
||||
- (void)addToView:(UIView *)superview;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@
|
|||
@property (nonatomic) BOOL isVisible;
|
||||
@property (nonatomic) CGFloat defaultHeight;
|
||||
|
||||
@property (nonatomic) UIView * statusbarBackground;
|
||||
@property (weak, nonatomic) IBOutlet UIView * contentView;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMNavigationView
|
||||
|
|
@ -20,12 +23,15 @@
|
|||
- (void)awakeFromNib
|
||||
{
|
||||
[super awakeFromNib];
|
||||
self.statusbarBackground = [[UIView alloc] initWithFrame:CGRectZero];
|
||||
self.statusbarBackground.backgroundColor = self.contentView.backgroundColor;
|
||||
self.defaultHeight = self.height;
|
||||
self.topBound = 0.0;
|
||||
}
|
||||
|
||||
- (void)addToView:(UIView *)superview
|
||||
{
|
||||
[superview addSubview:self];
|
||||
[superview insertSubview:self atIndex:0];
|
||||
self.frame = self.defaultFrame;
|
||||
self.isVisible = YES;
|
||||
}
|
||||
|
|
@ -38,27 +44,44 @@
|
|||
- (void)layoutSubviews
|
||||
{
|
||||
[UIView animateWithDuration:0.2 animations:^
|
||||
{
|
||||
self.frame = self.defaultFrame;
|
||||
}
|
||||
completion:^(BOOL finished)
|
||||
{
|
||||
if (!self.isVisible)
|
||||
[self removeFromSuperview];
|
||||
}];
|
||||
{
|
||||
self.frame = self.defaultFrame;
|
||||
[self layoutStatusbar];
|
||||
}
|
||||
completion:^(BOOL finished)
|
||||
{
|
||||
if (!self.isVisible)
|
||||
[self removeFromSuperview];
|
||||
}];
|
||||
[super layoutSubviews];
|
||||
}
|
||||
|
||||
- (void)layoutStatusbar
|
||||
{
|
||||
CGRect const statusBarFrame = UIApplication.sharedApplication.statusBarFrame;
|
||||
if (self.topBound <= statusBarFrame.size.height)
|
||||
{
|
||||
if (![self.statusbarBackground.superview isEqual:self])
|
||||
[self addSubview:self.statusbarBackground];
|
||||
self.statusbarBackground.frame = statusBarFrame;
|
||||
self.statusbarBackground.maxY = 0.0;
|
||||
}
|
||||
else
|
||||
{
|
||||
[self.statusbarBackground removeFromSuperview];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (CGRect)defaultFrame
|
||||
{
|
||||
return CGRectMake(0.0, self.topOffset - (self.isVisible ? 0.0 : self.defaultHeight), self.superview.width, self.defaultHeight);
|
||||
return CGRectMake(0.0, self.topBound - (self.isVisible ? 0.0 : self.defaultHeight), self.superview.width, self.defaultHeight);
|
||||
}
|
||||
|
||||
- (void)setTopOffset:(CGFloat)topOffset
|
||||
- (void)setTopBound:(CGFloat)topBound
|
||||
{
|
||||
_topOffset = topOffset;
|
||||
_topBound = MAX(topBound, UIApplication.sharedApplication.statusBarFrame.size.height);
|
||||
[self layoutSubviews];
|
||||
}
|
||||
|
||||
|
|
@ -68,4 +91,12 @@
|
|||
[self layoutSubviews];
|
||||
}
|
||||
|
||||
- (CGFloat)visibleHeight
|
||||
{
|
||||
CGFloat height = self.contentView.height;
|
||||
if ([self.statusbarBackground.superview isEqual:self])
|
||||
height += self.statusbarBackground.height;
|
||||
return height;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="EvQ-CH-5qC" customClass="MWMRoutePreview">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="120"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="736" height="88"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0m5-cD-yfC">
|
||||
<rect key="frame" x="0.0" y="32" width="320" height="44"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="736" height="44"/>
|
||||
<color key="backgroundColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="44" id="O48-rs-xGy"/>
|
||||
|
|
@ -33,12 +33,15 @@
|
|||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="calibratedRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="navigationGoPressed:" destination="-1" eventType="touchUpInside" id="oB1-g0-g7y"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bfG-c5-fMl">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="76"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="736" height="44"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xcU-SM-tN8" userLabel="Spiner Button">
|
||||
<rect key="frame" x="0.0" y="28" width="40" height="40"/>
|
||||
<rect key="frame" x="0.0" y="2" width="40" height="40"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="40" id="X0o-SP-FVU"/>
|
||||
<constraint firstAttribute="width" constant="40" id="e71-1l-O5m"/>
|
||||
|
|
@ -47,33 +50,96 @@
|
|||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Landscape" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wzR-lf-hDI">
|
||||
<rect key="frame" x="56" y="37" width="172" height="21"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ECz-mP-xyb" userLabel="Planning Route Box">
|
||||
<rect key="frame" x="56" y="12" width="588" height="20"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Landscape" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wzR-lf-hDI">
|
||||
<rect key="frame" x="0.0" y="0.0" width="588" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="20" id="a91-oh-DfU"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="21" id="a91-oh-DfU"/>
|
||||
<constraint firstAttribute="height" constant="20" id="17f-3M-fBi"/>
|
||||
<constraint firstItem="wzR-lf-hDI" firstAttribute="leading" secondItem="ECz-mP-xyb" secondAttribute="leading" id="GK6-mP-16G"/>
|
||||
<constraint firstItem="wzR-lf-hDI" firstAttribute="top" secondItem="ECz-mP-xyb" secondAttribute="top" id="oFf-ns-ksJ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="wzR-lf-hDI" secondAttribute="trailing" id="ytf-Dd-Bd0"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EfU-nE-6L9" userLabel="Complete Route Box">
|
||||
<rect key="frame" x="56" y="12" width="588" height="20"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="time" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tw5-0C-086">
|
||||
<rect key="frame" x="0.0" y="0.0" width="35" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="35" id="s7o-ci-WM6"/>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="35" id="uCf-6K-3Iw"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="dist" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ziN-lg-ual">
|
||||
<rect key="frame" x="66" y="0.0" width="31" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="31" id="dXn-mA-2ax"/>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="31" id="lgu-YA-uXa"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Arrivals" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0NR-QB-wCJ">
|
||||
<rect key="frame" x="135" y="0.0" width="453" height="20"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="0NR-QB-wCJ" secondAttribute="bottom" id="0q6-9b-n76"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ziN-lg-ual" secondAttribute="bottom" id="1H4-wg-PYA"/>
|
||||
<constraint firstItem="ziN-lg-ual" firstAttribute="top" secondItem="EfU-nE-6L9" secondAttribute="top" id="876-18-bwv"/>
|
||||
<constraint firstItem="Tw5-0C-086" firstAttribute="leading" secondItem="EfU-nE-6L9" secondAttribute="leading" id="Cdb-pB-9Ob"/>
|
||||
<constraint firstAttribute="trailing" secondItem="0NR-QB-wCJ" secondAttribute="trailing" id="PEY-6C-JB9"/>
|
||||
<constraint firstItem="Tw5-0C-086" firstAttribute="top" secondItem="EfU-nE-6L9" secondAttribute="top" id="TjF-vm-SC1"/>
|
||||
<constraint firstAttribute="height" constant="20" id="YPp-YJ-xeQ"/>
|
||||
<constraint firstItem="0NR-QB-wCJ" firstAttribute="leading" secondItem="ziN-lg-ual" secondAttribute="trailing" constant="38" id="fjf-MI-w5n"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Tw5-0C-086" secondAttribute="bottom" id="hwx-Vd-9Qo"/>
|
||||
<constraint firstItem="ziN-lg-ual" firstAttribute="leading" secondItem="Tw5-0C-086" secondAttribute="trailing" constant="31" id="wUi-tY-faO"/>
|
||||
<constraint firstItem="0NR-QB-wCJ" firstAttribute="top" secondItem="EfU-nE-6L9" secondAttribute="top" id="x2A-oT-PLO"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oe3-Op-uEp" userLabel="Buttons Box">
|
||||
<rect key="frame" x="232" y="28" width="80" height="40"/>
|
||||
<rect key="frame" x="648" y="2" width="80" height="40"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0dd-I8-xaK" userLabel="Walk Button">
|
||||
<rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
|
||||
<state key="normal" image="ic_walk_on">
|
||||
<state key="normal" image="ic_walk_off">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="disabled" image="ic_walk_disable"/>
|
||||
<state key="selected" image="ic_walk_on"/>
|
||||
<connections>
|
||||
<action selector="routePreviewChange:" destination="-1" eventType="touchUpInside" id="bf4-fQ-DLf"/>
|
||||
<action selector="routeTypePressed:" destination="EvQ-CH-5qC" eventType="touchUpInside" id="qWU-C0-8CT"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yNr-DG-8Hu" userLabel="Drive Button">
|
||||
<rect key="frame" x="40" y="0.0" width="40" height="40"/>
|
||||
<state key="normal" image="ic_drive_on">
|
||||
<state key="normal" image="ic_drive_off">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="disabled" image="ic_drive_disable"/>
|
||||
<state key="selected" image="ic_drive_on"/>
|
||||
<connections>
|
||||
<action selector="routePreviewChange:" destination="-1" eventType="touchUpInside" id="XHs-7h-PYO"/>
|
||||
<action selector="routeTypePressed:" destination="EvQ-CH-5qC" eventType="touchUpInside" id="pI7-Yh-QDE"/>
|
||||
</connections>
|
||||
</button>
|
||||
|
|
@ -95,14 +161,17 @@
|
|||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="Oe3-Op-uEp" firstAttribute="leading" secondItem="wzR-lf-hDI" secondAttribute="trailing" constant="4" id="1E7-wu-yXe"/>
|
||||
<constraint firstItem="EfU-nE-6L9" firstAttribute="top" secondItem="bfG-c5-fMl" secondAttribute="top" constant="12" id="5Bd-yt-hv4"/>
|
||||
<constraint firstItem="xcU-SM-tN8" firstAttribute="leading" secondItem="bfG-c5-fMl" secondAttribute="leading" id="Jpl-JM-x5O"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Oe3-Op-uEp" secondAttribute="bottom" constant="8" id="Res-ht-qAb"/>
|
||||
<constraint firstItem="wzR-lf-hDI" firstAttribute="leading" secondItem="xcU-SM-tN8" secondAttribute="trailing" constant="16" id="gCW-J7-UDl"/>
|
||||
<constraint firstAttribute="bottom" secondItem="wzR-lf-hDI" secondAttribute="bottom" constant="18" id="psh-bv-p2o"/>
|
||||
<constraint firstAttribute="height" constant="76" id="qFf-mT-U9d"/>
|
||||
<constraint firstItem="EfU-nE-6L9" firstAttribute="leading" secondItem="xcU-SM-tN8" secondAttribute="trailing" constant="16" id="LmL-vi-JHG"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Oe3-Op-uEp" secondAttribute="bottom" constant="2" id="Res-ht-qAb"/>
|
||||
<constraint firstItem="Oe3-Op-uEp" firstAttribute="leading" secondItem="EfU-nE-6L9" secondAttribute="trailing" constant="4" id="W3N-0v-ZMF"/>
|
||||
<constraint firstItem="ECz-mP-xyb" firstAttribute="leading" secondItem="xcU-SM-tN8" secondAttribute="trailing" constant="16" id="aSe-p0-XQb"/>
|
||||
<constraint firstItem="ECz-mP-xyb" firstAttribute="top" secondItem="bfG-c5-fMl" secondAttribute="top" constant="12" id="g9u-yA-Bzr"/>
|
||||
<constraint firstAttribute="height" constant="44" id="qFf-mT-U9d"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Oe3-Op-uEp" secondAttribute="trailing" constant="8" id="rTj-VC-TKj"/>
|
||||
<constraint firstAttribute="bottom" secondItem="xcU-SM-tN8" secondAttribute="bottom" constant="8" id="rZp-0H-JZc"/>
|
||||
<constraint firstAttribute="bottom" secondItem="xcU-SM-tN8" secondAttribute="bottom" constant="2" id="rZp-0H-JZc"/>
|
||||
<constraint firstItem="Oe3-Op-uEp" firstAttribute="leading" secondItem="ECz-mP-xyb" secondAttribute="trailing" constant="4" id="vXX-Ac-Sac"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
|
|
@ -118,17 +187,28 @@
|
|||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="arrivalsLabel" destination="0NR-QB-wCJ" id="E3B-xd-DiO"/>
|
||||
<outlet property="completeBox" destination="EfU-nE-6L9" id="0eS-Nq-1OX"/>
|
||||
<outlet property="contentView" destination="bfG-c5-fMl" id="kaA-Q0-THS"/>
|
||||
<outlet property="distanceLabel" destination="ziN-lg-ual" id="tVN-kZ-kgK"/>
|
||||
<outlet property="goButtonHeight" destination="O48-rs-xGy" id="IGX-3J-58V"/>
|
||||
<outlet property="goButtonVerticalOffset" destination="C4v-nE-10G" id="YCG-GD-szj"/>
|
||||
<outlet property="pedestrian" destination="0dd-I8-xaK" id="0p2-T2-1MD"/>
|
||||
<outlet property="status" destination="wzR-lf-hDI" id="FXn-1Y-15m"/>
|
||||
<outlet property="statusBox" destination="ECz-mP-xyb" id="iuO-KL-p0U"/>
|
||||
<outlet property="timeLabel" destination="Tw5-0C-086" id="KJL-hQ-Tcp"/>
|
||||
<outlet property="vehicle" destination="yNr-DG-8Hu" id="nVZ-KV-Icf"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="369" y="452"/>
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="ic_drive_disable" width="40" height="40"/>
|
||||
<image name="ic_drive_off" width="40" height="40"/>
|
||||
<image name="ic_drive_on" width="40" height="40"/>
|
||||
<image name="ic_spinner_close_1" width="40" height="40"/>
|
||||
<image name="ic_walk_disable" width="40" height="40"/>
|
||||
<image name="ic_walk_off" width="40" height="40"/>
|
||||
<image name="ic_walk_on" width="40" height="40"/>
|
||||
</resources>
|
||||
<simulatedMetricsContainer key="defaultSimulatedMetrics">
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@
|
|||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
|
||||
<connections>
|
||||
<outlet property="routePreviewPortrait" destination="7PP-4j-9rc" id="R6c-Vi-IQ0"/>
|
||||
<outlet property="routePreviewPortrait" destination="88L-VX-bE9" id="cmc-WF-YnF"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="7PP-4j-9rc" customClass="MWMRoutePreview">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="120"/>
|
||||
<view contentMode="scaleToFill" id="88L-VX-bE9" customClass="MWMRoutePreview">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xXd-rh-qax">
|
||||
<rect key="frame" x="0.0" y="32" width="320" height="44"/>
|
||||
<button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z2d-B1-i2q">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<color key="backgroundColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="44" id="7Yl-tL-nbW"/>
|
||||
<constraint firstAttribute="height" constant="44" id="1mg-dZ-WyP"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="14"/>
|
||||
<state key="normal" title="Start">
|
||||
|
|
@ -34,107 +34,186 @@
|
|||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="navigationGoPressed:" destination="-1" eventType="touchUpInside" id="Ebg-dA-ESS"/>
|
||||
<action selector="navigationGoPressed:" destination="-1" eventType="touchUpInside" id="Ftg-bM-Sht"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VCP-zR-7y1">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="76"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q2t-0L-2K9">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pLa-SD-fX0" userLabel="Spiner Button">
|
||||
<rect key="frame" x="0.0" y="28" width="40" height="40"/>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HOJ-SC-XHE" userLabel="Spiner Button">
|
||||
<rect key="frame" x="0.0" y="2" width="40" height="40"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="40" id="UTQ-Tq-mZt"/>
|
||||
<constraint firstAttribute="height" constant="40" id="na4-nc-sSE"/>
|
||||
<constraint firstAttribute="height" constant="40" id="RdT-IS-eii"/>
|
||||
<constraint firstAttribute="width" constant="40" id="lSw-4L-0ev"/>
|
||||
</constraints>
|
||||
<state key="normal" image="ic_spinner_close_1">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Portrait" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Thj-oD-UU9">
|
||||
<rect key="frame" x="56" y="37" width="172" height="21"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="21" id="mTp-qM-1co"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hes-8E-Hej" userLabel="Buttons Box">
|
||||
<rect key="frame" x="232" y="28" width="80" height="40"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sxx-mC-hOX" userLabel="Buttons Box">
|
||||
<rect key="frame" x="232" y="2" width="80" height="40"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8Sk-cP-cgY" userLabel="Walk Button">
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p2P-UP-rWT" userLabel="Walk Button">
|
||||
<rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
|
||||
<state key="normal" image="ic_walk_on">
|
||||
<state key="normal" image="ic_walk_off">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="disabled" image="ic_walk_disable"/>
|
||||
<state key="selected" image="ic_walk_on"/>
|
||||
<connections>
|
||||
<action selector="routePreviewChange:" destination="-1" eventType="touchUpInside" id="iPP-Pp-hjn"/>
|
||||
<action selector="routeTypePressed:" destination="7PP-4j-9rc" eventType="touchUpInside" id="dAX-hb-quQ"/>
|
||||
<action selector="routePreviewChange:" destination="-1" eventType="touchUpInside" id="p1B-We-5Eo"/>
|
||||
<action selector="routeTypePressed:" destination="88L-VX-bE9" eventType="touchUpInside" id="qOv-nu-Col"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="G9x-0i-TqT" userLabel="Drive Button">
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q46-6u-Dnz" userLabel="Drive Button">
|
||||
<rect key="frame" x="40" y="0.0" width="40" height="40"/>
|
||||
<state key="normal" image="ic_drive_on">
|
||||
<state key="normal" image="ic_drive_off">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="disabled" image="ic_drive_disable"/>
|
||||
<state key="selected" image="ic_drive_on"/>
|
||||
<connections>
|
||||
<action selector="routePreviewChange:" destination="-1" eventType="touchUpInside" id="Qpx-Pe-eoP"/>
|
||||
<action selector="routeTypePressed:" destination="7PP-4j-9rc" eventType="touchUpInside" id="aiA-MM-UiF"/>
|
||||
<action selector="routePreviewChange:" destination="-1" eventType="touchUpInside" id="PmK-Z7-ySd"/>
|
||||
<action selector="routeTypePressed:" destination="88L-VX-bE9" eventType="touchUpInside" id="p0y-tA-r6k"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="8Sk-cP-cgY" secondAttribute="bottom" id="0lo-xG-iRR"/>
|
||||
<constraint firstItem="G9x-0i-TqT" firstAttribute="leading" secondItem="8Sk-cP-cgY" secondAttribute="trailing" id="4t0-d5-dJR"/>
|
||||
<constraint firstItem="G9x-0i-TqT" firstAttribute="leading" secondItem="8Sk-cP-cgY" secondAttribute="trailing" id="BPb-wo-AEk"/>
|
||||
<constraint firstItem="8Sk-cP-cgY" firstAttribute="leading" secondItem="Hes-8E-Hej" secondAttribute="leading" id="Ik0-NV-qLW"/>
|
||||
<constraint firstItem="G9x-0i-TqT" firstAttribute="top" secondItem="Hes-8E-Hej" secondAttribute="top" id="Lox-sW-PWO"/>
|
||||
<constraint firstItem="8Sk-cP-cgY" firstAttribute="top" secondItem="Hes-8E-Hej" secondAttribute="top" id="RbQ-5z-Z3a"/>
|
||||
<constraint firstAttribute="trailing" secondItem="G9x-0i-TqT" secondAttribute="trailing" id="dAO-rM-fsn"/>
|
||||
<constraint firstAttribute="height" constant="40" id="kJA-Jf-Udj"/>
|
||||
<constraint firstAttribute="bottom" secondItem="G9x-0i-TqT" secondAttribute="bottom" id="nUH-dv-UzA"/>
|
||||
<constraint firstAttribute="width" constant="80" id="ode-jY-7yp"/>
|
||||
<constraint firstAttribute="width" constant="80" id="5NG-pz-QUZ"/>
|
||||
<constraint firstItem="q46-6u-Dnz" firstAttribute="leading" secondItem="p2P-UP-rWT" secondAttribute="trailing" id="6yy-fM-M3E"/>
|
||||
<constraint firstItem="p2P-UP-rWT" firstAttribute="top" secondItem="sxx-mC-hOX" secondAttribute="top" id="LEp-xZ-T7Y"/>
|
||||
<constraint firstAttribute="trailing" secondItem="q46-6u-Dnz" secondAttribute="trailing" id="Lju-Gd-XEP"/>
|
||||
<constraint firstItem="p2P-UP-rWT" firstAttribute="leading" secondItem="sxx-mC-hOX" secondAttribute="leading" id="Sbx-A6-emP"/>
|
||||
<constraint firstAttribute="height" constant="40" id="V0B-37-g8u"/>
|
||||
<constraint firstItem="q46-6u-Dnz" firstAttribute="leading" secondItem="p2P-UP-rWT" secondAttribute="trailing" id="jZS-Ie-OAb"/>
|
||||
<constraint firstAttribute="bottom" secondItem="q46-6u-Dnz" secondAttribute="bottom" id="laZ-K8-PEC"/>
|
||||
<constraint firstItem="q46-6u-Dnz" firstAttribute="top" secondItem="sxx-mC-hOX" secondAttribute="top" id="ubn-Pk-LO5"/>
|
||||
<constraint firstAttribute="bottom" secondItem="p2P-UP-rWT" secondAttribute="bottom" id="wRs-1r-64a"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FjK-vt-keq" userLabel="Planning Route Box">
|
||||
<rect key="frame" x="56" y="12" width="172" height="20"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Portrait" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e6W-cv-xtL">
|
||||
<rect key="frame" x="0.0" y="0.0" width="172" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="20" id="JUk-KJ-2Ic"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="20" id="aUI-v0-6JP"/>
|
||||
<constraint firstAttribute="trailing" secondItem="e6W-cv-xtL" secondAttribute="trailing" id="hfA-ld-dkD"/>
|
||||
<constraint firstItem="e6W-cv-xtL" firstAttribute="top" secondItem="FjK-vt-keq" secondAttribute="top" id="mIw-vv-PWE"/>
|
||||
<constraint firstItem="e6W-cv-xtL" firstAttribute="leading" secondItem="FjK-vt-keq" secondAttribute="leading" id="s0Z-Cq-vMr"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TAN-st-OOM" userLabel="Complete Route Box">
|
||||
<rect key="frame" x="56" y="12" width="172" height="20"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="time" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yfW-D7-qCl">
|
||||
<rect key="frame" x="0.0" y="0.0" width="35" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="35" id="bjk-nU-17W"/>
|
||||
<constraint firstAttribute="height" constant="20" id="wjP-4J-wPY"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="dist" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z2M-yN-YAq">
|
||||
<rect key="frame" x="66" y="0.0" width="80" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="80" id="1wO-Od-txW"/>
|
||||
<constraint firstAttribute="width" constant="30" id="HJX-Qb-nzT"/>
|
||||
<constraint firstAttribute="height" constant="20" id="YiU-YU-rRF"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="HJX-Qb-nzT"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="Z2M-yN-YAq" firstAttribute="top" secondItem="TAN-st-OOM" secondAttribute="top" id="1jt-IM-Tmj"/>
|
||||
<constraint firstItem="Z2M-yN-YAq" firstAttribute="leading" secondItem="yfW-D7-qCl" secondAttribute="trailing" constant="31" id="RML-mi-P6Y"/>
|
||||
<constraint firstAttribute="height" constant="20" id="SzU-CF-ccV"/>
|
||||
<constraint firstItem="yfW-D7-qCl" firstAttribute="leading" secondItem="TAN-st-OOM" secondAttribute="leading" id="rN7-ae-Jhv"/>
|
||||
<constraint firstItem="yfW-D7-qCl" firstAttribute="top" secondItem="TAN-st-OOM" secondAttribute="top" id="uvr-uq-WLZ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Z2M-yN-YAq" secondAttribute="trailing" id="wla-ar-F2T"/>
|
||||
</constraints>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="wla-ar-F2T"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="Thj-oD-UU9" firstAttribute="leading" secondItem="pLa-SD-fX0" secondAttribute="trailing" constant="16" id="11W-YY-QYj"/>
|
||||
<constraint firstItem="Hes-8E-Hej" firstAttribute="leading" secondItem="Thj-oD-UU9" secondAttribute="trailing" constant="4" id="34F-wY-619"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Hes-8E-Hej" secondAttribute="trailing" constant="8" id="3yG-6V-LuZ"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Hes-8E-Hej" secondAttribute="bottom" constant="8" id="LcS-BS-uRm"/>
|
||||
<constraint firstAttribute="bottom" secondItem="pLa-SD-fX0" secondAttribute="bottom" constant="8" id="LoZ-RU-Qdh"/>
|
||||
<constraint firstItem="pLa-SD-fX0" firstAttribute="leading" secondItem="VCP-zR-7y1" secondAttribute="leading" id="c8e-GO-Mgn"/>
|
||||
<constraint firstAttribute="height" constant="76" id="dG5-C7-LZv"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Thj-oD-UU9" secondAttribute="bottom" constant="18" id="jVf-VX-JdX"/>
|
||||
<constraint firstItem="HOJ-SC-XHE" firstAttribute="leading" secondItem="q2t-0L-2K9" secondAttribute="leading" id="1Nr-Oi-DK6"/>
|
||||
<constraint firstItem="TAN-st-OOM" firstAttribute="leading" secondItem="HOJ-SC-XHE" secondAttribute="trailing" constant="16" id="DJp-pM-IED"/>
|
||||
<constraint firstAttribute="trailing" secondItem="sxx-mC-hOX" secondAttribute="trailing" constant="8" id="JOi-7b-AiY"/>
|
||||
<constraint firstItem="sxx-mC-hOX" firstAttribute="leading" secondItem="FjK-vt-keq" secondAttribute="trailing" constant="4" id="KrQ-4v-V2R"/>
|
||||
<constraint firstItem="sxx-mC-hOX" firstAttribute="leading" secondItem="TAN-st-OOM" secondAttribute="trailing" constant="4" id="L4M-1z-8S1"/>
|
||||
<constraint firstAttribute="height" constant="44" id="Si4-S0-e6Y"/>
|
||||
<constraint firstItem="FjK-vt-keq" firstAttribute="top" secondItem="q2t-0L-2K9" secondAttribute="top" constant="12" id="Ybi-xR-Cb9"/>
|
||||
<constraint firstItem="FjK-vt-keq" firstAttribute="leading" secondItem="HOJ-SC-XHE" secondAttribute="trailing" constant="16" id="YjO-tt-mNf"/>
|
||||
<constraint firstAttribute="bottom" secondItem="HOJ-SC-XHE" secondAttribute="bottom" constant="2" id="aHI-ON-PIb"/>
|
||||
<constraint firstItem="TAN-st-OOM" firstAttribute="top" secondItem="q2t-0L-2K9" secondAttribute="top" constant="12" id="gFK-VL-5cQ"/>
|
||||
<constraint firstAttribute="bottom" secondItem="sxx-mC-hOX" secondAttribute="bottom" constant="2" id="jaO-c5-e6f"/>
|
||||
<constraint firstItem="TAN-st-OOM" firstAttribute="top" secondItem="q2t-0L-2K9" secondAttribute="top" constant="32" id="vfI-Sk-fAH"/>
|
||||
</constraints>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="vfI-Sk-fAH"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="VCP-zR-7y1" secondAttribute="trailing" id="44s-L7-d3t"/>
|
||||
<constraint firstItem="xXd-rh-qax" firstAttribute="leading" secondItem="7PP-4j-9rc" secondAttribute="leading" id="Cj5-Qq-QWX"/>
|
||||
<constraint firstItem="VCP-zR-7y1" firstAttribute="top" secondItem="7PP-4j-9rc" secondAttribute="top" id="G8m-5O-PeA"/>
|
||||
<constraint firstItem="VCP-zR-7y1" firstAttribute="leading" secondItem="7PP-4j-9rc" secondAttribute="leading" id="IFc-cn-WDs"/>
|
||||
<constraint firstAttribute="trailing" secondItem="xXd-rh-qax" secondAttribute="trailing" id="Sct-Ci-Uz5"/>
|
||||
<constraint firstAttribute="bottom" secondItem="xXd-rh-qax" secondAttribute="bottom" constant="44" id="oL8-Fe-U5W"/>
|
||||
<constraint firstItem="q2t-0L-2K9" firstAttribute="top" secondItem="88L-VX-bE9" secondAttribute="top" id="07X-xX-x4t"/>
|
||||
<constraint firstAttribute="bottom" secondItem="z2d-B1-i2q" secondAttribute="bottom" constant="44" id="2ei-gn-88c"/>
|
||||
<constraint firstAttribute="trailing" secondItem="z2d-B1-i2q" secondAttribute="trailing" id="IjZ-xi-pGs"/>
|
||||
<constraint firstItem="z2d-B1-i2q" firstAttribute="leading" secondItem="88L-VX-bE9" secondAttribute="leading" id="KTW-jo-jFp"/>
|
||||
<constraint firstAttribute="trailing" secondItem="q2t-0L-2K9" secondAttribute="trailing" id="WJB-ey-lTk"/>
|
||||
<constraint firstItem="q2t-0L-2K9" firstAttribute="leading" secondItem="88L-VX-bE9" secondAttribute="leading" id="mcO-vF-Zih"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="goButtonVerticalOffset" destination="oL8-Fe-U5W" id="aPg-oO-QqN"/>
|
||||
<outlet property="pedestrian" destination="8Sk-cP-cgY" id="RUj-Uz-qeD"/>
|
||||
<outlet property="status" destination="Thj-oD-UU9" id="N8N-lB-jaJ"/>
|
||||
<outlet property="vehicle" destination="G9x-0i-TqT" id="u9a-2E-LQ5"/>
|
||||
<outlet property="completeBox" destination="TAN-st-OOM" id="KIc-tq-lnF"/>
|
||||
<outlet property="contentView" destination="q2t-0L-2K9" id="QBv-uC-WJC"/>
|
||||
<outlet property="distanceLabel" destination="Z2M-yN-YAq" id="055-qJ-WAJ"/>
|
||||
<outlet property="goButtonHeight" destination="1mg-dZ-WyP" id="Ql3-hB-aTD"/>
|
||||
<outlet property="goButtonVerticalOffset" destination="2ei-gn-88c" id="jT5-CH-aMT"/>
|
||||
<outlet property="pedestrian" destination="p2P-UP-rWT" id="okx-QZ-c9c"/>
|
||||
<outlet property="status" destination="e6W-cv-xtL" id="APO-1K-MH5"/>
|
||||
<outlet property="statusBox" destination="FjK-vt-keq" id="WgW-e1-R1d"/>
|
||||
<outlet property="timeLabel" destination="yfW-D7-qCl" id="f6d-96-ej3"/>
|
||||
<outlet property="vehicle" destination="q46-6u-Dnz" id="kbL-Fp-eVh"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="369" y="452"/>
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="ic_drive_disable" width="40" height="40"/>
|
||||
<image name="ic_drive_off" width="40" height="40"/>
|
||||
<image name="ic_drive_on" width="40" height="40"/>
|
||||
<image name="ic_spinner_close_1" width="40" height="40"/>
|
||||
<image name="ic_walk_disable" width="40" height="40"/>
|
||||
<image name="ic_walk_off" width="40" height="40"/>
|
||||
<image name="ic_walk_on" width="40" height="40"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -15,5 +15,8 @@
|
|||
@property (weak, nonatomic) IBOutlet UILabel * status;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * pedestrian;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * vehicle;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * timeLabel;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * distanceLabel;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * arrivalsLabel;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@
|
|||
|
||||
@property (nonatomic) CGFloat goButtonHiddenOffset;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * goButtonVerticalOffset;
|
||||
@property (weak, nonatomic) IBOutlet UIView * statusBox;
|
||||
@property (weak, nonatomic) IBOutlet UIView * completeBox;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * goButtonHeight;
|
||||
|
||||
@end
|
||||
|
||||
|
|
@ -22,6 +26,7 @@
|
|||
{
|
||||
[super awakeFromNib];
|
||||
self.goButtonHiddenOffset = self.goButtonVerticalOffset.constant;
|
||||
self.completeBox.hidden = YES;
|
||||
}
|
||||
|
||||
- (IBAction)routeTypePressed:(UIButton *)sender
|
||||
|
|
@ -37,7 +42,17 @@
|
|||
_showGoButton = showGoButton;
|
||||
[self layoutIfNeeded];
|
||||
self.goButtonVerticalOffset.constant = showGoButton ? 0.0 : self.goButtonHiddenOffset;
|
||||
self.statusBox.hidden = YES;
|
||||
self.completeBox.hidden = NO;
|
||||
[UIView animateWithDuration:0.2 animations:^{ [self layoutIfNeeded]; }];
|
||||
}
|
||||
|
||||
- (CGFloat)visibleHeight
|
||||
{
|
||||
CGFloat height = super.visibleHeight;
|
||||
if (self.showGoButton)
|
||||
height += self.goButtonHeight.constant;
|
||||
return height;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction)
|
|||
|
||||
typedef NS_OPTIONS(NSUInteger, MapInfoView)
|
||||
{
|
||||
MapInfoViewRoute = 1 << 0,
|
||||
MapInfoViewSearch = 1 << 1
|
||||
MapInfoViewSearch = 1 << 0
|
||||
};
|
||||
|
||||
@interface NSValueWrapper : NSObject
|
||||
|
|
@ -572,7 +571,7 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView)
|
|||
{
|
||||
[super viewDidLoad];
|
||||
self.view.clipsToBounds = YES;
|
||||
[self.view addSubview:self.routeViewWrapper];
|
||||
// [self.view addSubview:self.routeViewWrapper];
|
||||
self.controlsManager = [[MWMMapViewControlsManager alloc] initWithParentController:self];
|
||||
[self.view addSubview:self.searchView];
|
||||
__weak MapViewController * weakSelf = self;
|
||||
|
|
@ -938,10 +937,6 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView)
|
|||
|
||||
- (void)routeViewWillEnterState:(RouteViewState)state
|
||||
{
|
||||
if (state == RouteViewStateHidden)
|
||||
[self clearMapInfoViewFlag:MapInfoViewRoute];
|
||||
else
|
||||
[self setMapInfoViewFlag:MapInfoViewRoute];
|
||||
}
|
||||
|
||||
- (void)routeViewDidEnterState:(RouteViewState)state
|
||||
|
|
@ -1146,11 +1141,6 @@ NSInteger compareAddress(id l, id r, void * context)
|
|||
- (void)updateInfoViews
|
||||
{
|
||||
CGFloat topBound = 0.0;
|
||||
if ([self testMapInfoViewFlag:MapInfoViewRoute])
|
||||
{
|
||||
CGRect const routeRect = self.routeViewWrapper.frame;
|
||||
topBound = MAX(topBound, routeRect.origin.y + routeRect.size.height);
|
||||
}
|
||||
if ([self testMapInfoViewFlag:MapInfoViewSearch])
|
||||
{
|
||||
CGRect const searchRect = self.searchView.infoRect;
|
||||
|
|
|
|||
|
|
@ -203,9 +203,6 @@
|
|||
F63732961AE9431E00A03764 /* MWMBasePlacePageView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63732951AE9431E00A03764 /* MWMBasePlacePageView.mm */; };
|
||||
F63774E71B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */; };
|
||||
F63774EA1B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */; };
|
||||
F63774E41B57F55300BCF54D /* MWMNavigationDashboard.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63774E31B57F55300BCF54D /* MWMNavigationDashboard.xib */; };
|
||||
F63774ED1B5CEF9E00BCF54D /* MWMNavigationDashboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774EC1B5CEF9E00BCF54D /* MWMNavigationDashboard.mm */; };
|
||||
F63774F01B5CF25D00BCF54D /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774EF1B5CF25D00BCF54D /* MWMNavigationDashboardManager.mm */; };
|
||||
F64F19991AB81A00006EAF7E /* MWMAlertViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19821AB81A00006EAF7E /* MWMAlertViewController.mm */; };
|
||||
F64F199A1AB81A00006EAF7E /* MWMAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */; };
|
||||
F64F199B1AB81A00006EAF7E /* MWMAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19861AB81A00006EAF7E /* MWMAlert.mm */; };
|
||||
|
|
@ -628,11 +625,6 @@
|
|||
F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMRoutingDisclaimerAlert.xib; sourceTree = "<group>"; };
|
||||
F63774E81B59376F00BCF54D /* MWMRoutingDisclaimerAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutingDisclaimerAlert.h; sourceTree = "<group>"; };
|
||||
F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutingDisclaimerAlert.mm; sourceTree = "<group>"; };
|
||||
F63774E31B57F55300BCF54D /* MWMNavigationDashboard.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNavigationDashboard.xib; sourceTree = "<group>"; };
|
||||
F63774EB1B5CEF9E00BCF54D /* MWMNavigationDashboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboard.h; sourceTree = "<group>"; };
|
||||
F63774EC1B5CEF9E00BCF54D /* MWMNavigationDashboard.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboard.mm; sourceTree = "<group>"; };
|
||||
F63774EE1B5CF25D00BCF54D /* MWMNavigationDashboardManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardManager.h; sourceTree = "<group>"; };
|
||||
F63774EF1B5CF25D00BCF54D /* MWMNavigationDashboardManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboardManager.mm; sourceTree = "<group>"; };
|
||||
F64F19811AB81A00006EAF7E /* MWMAlertViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAlertViewController.h; sourceTree = "<group>"; };
|
||||
F64F19821AB81A00006EAF7E /* MWMAlertViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAlertViewController.mm; sourceTree = "<group>"; };
|
||||
F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAlertViewController.xib; sourceTree = "<group>"; };
|
||||
|
|
@ -1479,18 +1471,6 @@
|
|||
path = RoutingDisclaimerAlert;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F63774E21B57F54300BCF54D /* NavigationDashboard */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F63774E31B57F55300BCF54D /* MWMNavigationDashboard.xib */,
|
||||
F63774EB1B5CEF9E00BCF54D /* MWMNavigationDashboard.h */,
|
||||
F63774EC1B5CEF9E00BCF54D /* MWMNavigationDashboard.mm */,
|
||||
F63774EE1B5CF25D00BCF54D /* MWMNavigationDashboardManager.h */,
|
||||
F63774EF1B5CF25D00BCF54D /* MWMNavigationDashboardManager.mm */,
|
||||
);
|
||||
path = NavigationDashboard;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F64F195F1AB8125C006EAF7E /* CustomAlert */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -2305,7 +2285,7 @@
|
|||
1D3623260D0F684500981E51 /* MapsAppDelegate.mm in Sources */,
|
||||
F67BBB571AC54A7800D162C7 /* MWMFeedbackAlert.mm in Sources */,
|
||||
34D783D71B5F9D7800E0C0EE /* MWMRoutePreview.m in Sources */,
|
||||
349A35831B53E967009677EE /* MWMDownloadMapRequest.m in Sources */,
|
||||
349A35831B53E967009677EE /* MWMDownloadMapRequest.mm in Sources */,
|
||||
A32B6D4C1A14980500E54A65 /* iosOGLContext.mm in Sources */,
|
||||
B0E1FCDF1A2343BC00A8E08B /* NextTurnPhoneView.m in Sources */,
|
||||
46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue