forked from organicmaps/organicmaps
[MAPSME-4728] [ios] Removed old route preview.
This commit is contained in:
Ilya Grechuhin
Sergey Yershov
parent
40822ebdd4
commit
d94f05b1ea
11 changed files with 50 additions and 533 deletions
|
|
@ -1,17 +0,0 @@
|
|||
@class MWMRoutePointCell;
|
||||
|
||||
@protocol MWMRoutePointCellDelegate <NSObject>
|
||||
|
||||
@required
|
||||
- (void)didPan:(UIPanGestureRecognizer *)pan cell:(MWMRoutePointCell *)cell;
|
||||
- (void)startEditingCell:(MWMRoutePointCell *)cell;
|
||||
|
||||
@end
|
||||
|
||||
@interface MWMRoutePointCell : UICollectionViewCell
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UITextField * title;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * number;
|
||||
@property (weak, nonatomic) id<MWMRoutePointCellDelegate> delegate;
|
||||
|
||||
@end
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
#import "MWMRoutePointCell.h"
|
||||
|
||||
@interface MWMRoutePointCell () <UITextFieldDelegate>
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UIView * moveView;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMRoutePointCell
|
||||
|
||||
- (void)awakeFromNib
|
||||
{
|
||||
[super awakeFromNib];
|
||||
UIPanGestureRecognizer * pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(didPan:)];
|
||||
[self.moveView addGestureRecognizer:pan];
|
||||
}
|
||||
|
||||
- (void)didPan:(UIPanGestureRecognizer *)sender
|
||||
{
|
||||
[self.delegate didPan:sender cell:self];
|
||||
}
|
||||
|
||||
- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
|
||||
{
|
||||
[self.delegate startEditingCell:self];
|
||||
return NO;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MWMRoutePointCell" id="g71-7u-1M7" customClass="MWMRoutePointCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="272" height="36"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
|
||||
<rect key="frame" x="0.0" y="0.0" width="272" height="36"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5Eu-pp-tuf" userLabel="ContentView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="272" height="36"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QVZ-SR-ELD">
|
||||
<rect key="frame" x="10" y="8" width="20" height="20"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="upk-Hh-xve">
|
||||
<rect key="frame" x="6" y="2" width="8" height="16"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="14"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="white"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold14"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.12549019607843137" green="0.58823529411764708" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="20" id="2W2-WT-Xw1"/>
|
||||
<constraint firstAttribute="height" constant="20" id="PtI-pU-SmZ"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="10"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Current Position" placeholder="Choose destination" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="sJv-24-mPo">
|
||||
<rect key="frame" x="52" y="0.0" width="159" height="36"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="36" id="8AW-4P-EIE"/>
|
||||
</constraints>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
|
||||
<textInputTraits key="textInputTraits"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="_placeholderLabel.colorName" value="blackHintText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="g71-7u-1M7" id="AJS-bY-hPY"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6lg-JW-vOR">
|
||||
<rect key="frame" x="212" y="0.0" width="60" height="36"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_move_list" translatesAutoresizingMaskIntoConstraints="NO" id="KVK-GG-sTd">
|
||||
<rect key="frame" x="24" y="4" width="28" height="28"/>
|
||||
<gestureRecognizers/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="28" id="apW-pp-9of"/>
|
||||
<constraint firstAttribute="width" constant="28" id="kaO-Rj-sxl"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="KVK-GG-sTd" firstAttribute="top" secondItem="6lg-JW-vOR" secondAttribute="top" constant="4" id="3u9-W3-7uD"/>
|
||||
<constraint firstAttribute="trailing" secondItem="KVK-GG-sTd" secondAttribute="trailing" constant="8" id="DQO-wy-REo"/>
|
||||
<constraint firstAttribute="width" constant="60" id="PL2-79-lOf"/>
|
||||
<constraint firstAttribute="height" constant="36" id="XUC-hZ-tOc"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="6lg-JW-vOR" firstAttribute="top" secondItem="5Eu-pp-tuf" secondAttribute="top" id="ab5-hn-QdG"/>
|
||||
<constraint firstItem="sJv-24-mPo" firstAttribute="leading" secondItem="QVZ-SR-ELD" secondAttribute="trailing" priority="750" constant="22" id="baA-ey-OtA"/>
|
||||
<constraint firstItem="QVZ-SR-ELD" firstAttribute="leading" secondItem="5Eu-pp-tuf" secondAttribute="leading" constant="10" id="djG-l3-9Hy"/>
|
||||
<constraint firstItem="QVZ-SR-ELD" firstAttribute="top" secondItem="5Eu-pp-tuf" secondAttribute="top" constant="8" id="eQY-ap-RsW"/>
|
||||
<constraint firstItem="6lg-JW-vOR" firstAttribute="leading" secondItem="sJv-24-mPo" secondAttribute="trailing" constant="1" id="kE9-We-mKe"/>
|
||||
<constraint firstAttribute="trailing" secondItem="6lg-JW-vOR" secondAttribute="trailing" id="kJQ-o5-Ore"/>
|
||||
<constraint firstItem="sJv-24-mPo" firstAttribute="top" secondItem="5Eu-pp-tuf" secondAttribute="top" id="vb3-cK-3iz"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="4"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
</view>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="5Eu-pp-tuf" firstAttribute="height" secondItem="g71-7u-1M7" secondAttribute="height" id="2zr-Zb-OIe"/>
|
||||
<constraint firstItem="5Eu-pp-tuf" firstAttribute="top" secondItem="g71-7u-1M7" secondAttribute="top" id="Hen-QB-dZ2"/>
|
||||
<constraint firstItem="5Eu-pp-tuf" firstAttribute="width" secondItem="g71-7u-1M7" secondAttribute="width" id="QVW-Eo-kKX"/>
|
||||
<constraint firstItem="5Eu-pp-tuf" firstAttribute="centerX" secondItem="g71-7u-1M7" secondAttribute="centerX" id="bly-Tv-oYt"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<outlet property="moveView" destination="6lg-JW-vOR" id="UBv-0E-7Gr"/>
|
||||
<outlet property="number" destination="upk-Hh-xve" id="QzO-JM-b25"/>
|
||||
<outlet property="title" destination="sJv-24-mPo" id="CMf-Q0-CyR"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="273" y="327"/>
|
||||
</collectionViewCell>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="ic_move_list" width="28" height="28"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
@interface MWMRoutePointLayout : UICollectionViewFlowLayout
|
||||
|
||||
@property (nonatomic) BOOL isNeedToInitialLayout;
|
||||
@property (weak, nonatomic) IBOutlet UIView * parentView;
|
||||
|
||||
@end
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
#import "MWMRoutePointLayout.h"
|
||||
|
||||
static CGFloat const kHeight = 36.;
|
||||
|
||||
@implementation MWMRoutePointLayout
|
||||
|
||||
- (instancetype)initWithCoder:(NSCoder *)aDecoder
|
||||
{
|
||||
self = [super initWithCoder:aDecoder];
|
||||
if (self)
|
||||
self.isNeedToInitialLayout = YES;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (CGSize)collectionViewContentSize
|
||||
{
|
||||
return self.collectionView.bounds.size;
|
||||
}
|
||||
|
||||
- (CGFloat)minimumLineSpacing
|
||||
{
|
||||
return 8.;
|
||||
}
|
||||
|
||||
- (CGFloat)minimumInteritemSpacing
|
||||
{
|
||||
return 8.;
|
||||
}
|
||||
|
||||
- (CGSize)itemSize
|
||||
{
|
||||
if (IPAD)
|
||||
return {304., kHeight};
|
||||
return self.actualSize;
|
||||
}
|
||||
|
||||
- (UICollectionViewLayoutAttributes *)initialLayoutAttributesForAppearingItemAtIndexPath:(NSIndexPath *)itemIndexPath
|
||||
{
|
||||
if (!self.isNeedToInitialLayout)
|
||||
return nil;
|
||||
UICollectionViewLayoutAttributes * attr = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:itemIndexPath];
|
||||
attr.alpha = 0.;
|
||||
return attr;
|
||||
}
|
||||
|
||||
- (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath
|
||||
{
|
||||
UICollectionViewLayoutAttributes * attr = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath];
|
||||
attr.center = {self.collectionView.midX, self.collectionView.maxY};
|
||||
return attr;
|
||||
}
|
||||
|
||||
- (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds
|
||||
{
|
||||
self.itemSize = self.actualSize;
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (CGSize)actualSize
|
||||
{
|
||||
BOOL const isPortrait = self.parentView.superview.height > self.parentView.superview.width;
|
||||
CGFloat const width = isPortrait ? self.collectionView.width : self.collectionView.width / 2. - self.minimumInteritemSpacing / 2.;
|
||||
return {width, kHeight};
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -8,14 +8,12 @@
|
|||
|
||||
@interface MWMRoutePreview : MWMNavigationView<MWMNavigationDashboardInfoProtocol>
|
||||
|
||||
@property(weak, nonatomic, readonly) IBOutlet UIButton * extendButton;
|
||||
@property(weak, nonatomic, readonly) IBOutlet MWMTaxiCollectionView * taxiCollectionView;
|
||||
@property(weak, nonatomic) MWMNavigationDashboardManager * dashboardManager;
|
||||
|
||||
- (void)statePrepare;
|
||||
- (void)stateError;
|
||||
- (void)stateReady;
|
||||
- (void)reloadData;
|
||||
- (void)selectRouter:(MWMRouterType)routerType;
|
||||
- (void)router:(MWMRouterType)routerType setState:(MWMCircularProgressState)state;
|
||||
- (void)router:(MWMRouterType)routerType setProgress:(CGFloat)progress;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
#import "MWMCircularProgress.h"
|
||||
#import "MWMCommon.h"
|
||||
#import "MWMNavigationDashboardManager.h"
|
||||
#import "MWMRoutePointCell.h"
|
||||
#import "MWMRoutePointLayout.h"
|
||||
#import "MWMRouter.h"
|
||||
#import "MWMTaxiPreviewDataSource.h"
|
||||
#import "Statistics.h"
|
||||
|
|
@ -16,19 +14,14 @@ namespace
|
|||
CGFloat constexpr kAdditionalHeight = 20.;
|
||||
} // namespace
|
||||
|
||||
@interface MWMRoutePreview ()<MWMRoutePointCellDelegate, MWMCircularProgressProtocol>
|
||||
@interface MWMRoutePreview ()<MWMCircularProgressProtocol>
|
||||
|
||||
@property(weak, nonatomic) IBOutlet UIButton * backButton;
|
||||
@property(weak, nonatomic) IBOutlet UIView * pedestrian;
|
||||
@property(weak, nonatomic) IBOutlet UIView * vehicle;
|
||||
@property(weak, nonatomic) IBOutlet UIView * bicycle;
|
||||
@property(weak, nonatomic) IBOutlet UIView * taxi;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * planningRouteViewHeight;
|
||||
@property(weak, nonatomic) IBOutlet UIButton * extendButton;
|
||||
@property(weak, nonatomic) IBOutlet UIButton * goButton;
|
||||
@property(weak, nonatomic) IBOutlet UICollectionView * collectionView;
|
||||
@property(weak, nonatomic) IBOutlet MWMRoutePointLayout * layout;
|
||||
@property(weak, nonatomic) IBOutlet UIImageView * arrowImageView;
|
||||
@property(weak, nonatomic) IBOutlet UIView * statusBox;
|
||||
@property(weak, nonatomic) IBOutlet UIView * planningBox;
|
||||
@property(weak, nonatomic) IBOutlet UIView * resultsBox;
|
||||
|
|
@ -65,7 +58,6 @@ CGFloat constexpr kAdditionalHeight = 20.;
|
|||
self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
|
||||
self.layer.shouldRasterize = YES;
|
||||
self.layer.rasterizationScale = UIScreen.mainScreen.scale;
|
||||
[self.collectionView registerWithCellClass:[MWMRoutePointCell class]];
|
||||
[self setupProgresses];
|
||||
|
||||
[self.backButton matchInterfaceOrientation];
|
||||
|
|
@ -113,13 +105,9 @@ CGFloat constexpr kAdditionalHeight = 20.;
|
|||
for (auto const & progress : m_progresses)
|
||||
progress.second.state = MWMCircularProgressStateNormal;
|
||||
|
||||
self.arrowImageView.transform = CGAffineTransformMakeRotation(M_PI);
|
||||
self.goButton.hidden = NO;
|
||||
self.goButton.enabled = NO;
|
||||
self.extendButton.selected = YES;
|
||||
[self setupActualHeight];
|
||||
[self reloadData];
|
||||
[self.layout invalidateLayout];
|
||||
self.statusBox.hidden = YES;
|
||||
self.resultsBox.hidden = YES;
|
||||
self.heightBox.hidden = YES;
|
||||
|
|
@ -218,7 +206,6 @@ CGFloat constexpr kAdditionalHeight = 20.;
|
|||
}];
|
||||
}
|
||||
|
||||
- (void)reloadData { [self.collectionView reloadData]; }
|
||||
- (void)selectRouter:(MWMRouterType)routerType
|
||||
{
|
||||
for (auto const & progress : m_progresses)
|
||||
|
|
@ -296,62 +283,15 @@ CGFloat constexpr kAdditionalHeight = 20.;
|
|||
return {{origin, self.topBound}, {width, self.superview.height - kAdditionalHeight}};
|
||||
}
|
||||
|
||||
- (CGFloat)visibleHeight { return self.planningRouteViewHeight.constant + kAdditionalHeight; }
|
||||
- (IBAction)extendTap
|
||||
{
|
||||
BOOL const isExtended = !self.extendButton.selected;
|
||||
[Statistics logEvent:kStatEventName(kStatPointToPoint, kStatExpand)
|
||||
withParameters:@{kStatValue : (isExtended ? kStatYes : kStatNo)}];
|
||||
self.extendButton.selected = isExtended;
|
||||
[self layoutIfNeeded];
|
||||
[self setupActualHeight];
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration
|
||||
animations:^{
|
||||
self.arrowImageView.transform = isExtended
|
||||
? CGAffineTransformMakeRotation(M_PI)
|
||||
: CGAffineTransformIdentity;
|
||||
[self layoutIfNeeded];
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)setupActualHeight
|
||||
{
|
||||
if (!self.superview)
|
||||
return;
|
||||
if (IPAD)
|
||||
{
|
||||
CGFloat const selfHeight = self.superview.height - kAdditionalHeight;
|
||||
self.defaultHeight = selfHeight;
|
||||
self.height = selfHeight;
|
||||
return;
|
||||
}
|
||||
BOOL const isPortrait = self.superview.height > self.superview.width;
|
||||
CGFloat const height = isPortrait ? 140. : 96.;
|
||||
CGFloat const selfHeight = self.extendButton.selected ? height : 44.;
|
||||
self.planningRouteViewHeight.constant = selfHeight;
|
||||
CGFloat const selfHeight = IPAD ? self.superview.height - kAdditionalHeight : 44;
|
||||
self.defaultHeight = selfHeight;
|
||||
self.height = selfHeight;
|
||||
}
|
||||
|
||||
- (void)snapshotCell:(MWMRoutePointCell *)cell
|
||||
{
|
||||
UIGraphicsBeginImageContextWithOptions(cell.bounds.size, NO, 0.);
|
||||
[cell drawViewHierarchyInRect:cell.bounds afterScreenUpdates:YES];
|
||||
UIImage * image = UIGraphicsGetImageFromCurrentImageContext();
|
||||
UIGraphicsEndImageContext();
|
||||
self.movingCellImage = [[UIImageView alloc] initWithImage:image];
|
||||
self.movingCellImage.alpha = 0.8;
|
||||
[self.collectionView addSubview:self.movingCellImage];
|
||||
CALayer * l = self.movingCellImage.layer;
|
||||
l.masksToBounds = NO;
|
||||
l.shadowColor = UIColor.blackColor.CGColor;
|
||||
l.shadowRadius = 4.;
|
||||
l.shadowOpacity = 0.4;
|
||||
l.shadowOffset = {0., 0.};
|
||||
l.shouldRasterize = YES;
|
||||
l.rasterizationScale = [[UIScreen mainScreen] scale];
|
||||
}
|
||||
|
||||
#pragma mark - MWMNavigationDashboardInfoProtocol
|
||||
|
||||
- (void)updateNavigationInfo:(MWMNavigationDashboardEntity *)info
|
||||
|
|
@ -367,119 +307,6 @@ CGFloat constexpr kAdditionalHeight = 20.;
|
|||
self.arriveLabel.text = [NSString stringWithFormat:L(@"routing_arrive"), arriveStr.UTF8String];
|
||||
}
|
||||
|
||||
#pragma mark - MWMRoutePointCellDelegate
|
||||
|
||||
- (void)startEditingCell:(MWMRoutePointCell *)cell
|
||||
{
|
||||
NSUInteger const index = [self.collectionView indexPathForCell:cell].row;
|
||||
[self.dashboardManager.delegate didStartEditingRoutePoint:index == 0];
|
||||
}
|
||||
|
||||
#pragma mark - PanGestureRecognizer
|
||||
|
||||
- (void)didPan:(UIPanGestureRecognizer *)pan cell:(MWMRoutePointCell *)cell
|
||||
{
|
||||
CGPoint const locationPoint = [pan locationInView:self.collectionView];
|
||||
if (pan.state == UIGestureRecognizerStateBegan)
|
||||
{
|
||||
self.layout.isNeedToInitialLayout = NO;
|
||||
self.isNeedToMove = NO;
|
||||
self.indexPathOfMovingCell = [self.collectionView indexPathForCell:cell];
|
||||
[self snapshotCell:cell];
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration
|
||||
animations:^{
|
||||
cell.contentView.alpha = 0.;
|
||||
CGFloat const scaleY = 1.05;
|
||||
self.movingCellImage.transform = CGAffineTransformMakeScale(1., scaleY);
|
||||
}];
|
||||
}
|
||||
|
||||
if (pan.state == UIGestureRecognizerStateChanged)
|
||||
{
|
||||
self.movingCellImage.center = {locationPoint.x - cell.width / 2 + 30, locationPoint.y};
|
||||
NSIndexPath * finalIndexPath = [self.collectionView indexPathForItemAtPoint:locationPoint];
|
||||
if (finalIndexPath && ![finalIndexPath isEqual:self.indexPathOfMovingCell])
|
||||
{
|
||||
if (self.isNeedToMove)
|
||||
return;
|
||||
self.isNeedToMove = YES;
|
||||
[self.collectionView performBatchUpdates:^{
|
||||
[self.collectionView moveItemAtIndexPath:finalIndexPath
|
||||
toIndexPath:self.indexPathOfMovingCell];
|
||||
self.indexPathOfMovingCell = finalIndexPath;
|
||||
}
|
||||
completion:nil];
|
||||
}
|
||||
else
|
||||
{
|
||||
self.isNeedToMove = NO;
|
||||
}
|
||||
}
|
||||
|
||||
if (pan.state == UIGestureRecognizerStateEnded)
|
||||
{
|
||||
self.layout.isNeedToInitialLayout = YES;
|
||||
NSIndexPath * finalIndexPath = [self.collectionView indexPathForItemAtPoint:locationPoint];
|
||||
self.isNeedToMove = finalIndexPath && ![finalIndexPath isEqual:self.indexPathOfMovingCell];
|
||||
if (self.isNeedToMove)
|
||||
{
|
||||
cell.contentView.alpha = 1.;
|
||||
[self.collectionView performBatchUpdates:^{
|
||||
[self.collectionView moveItemAtIndexPath:self.indexPathOfMovingCell
|
||||
toIndexPath:finalIndexPath];
|
||||
}
|
||||
completion:^(BOOL finished) {
|
||||
[self.movingCellImage removeFromSuperview];
|
||||
self.movingCellImage.transform = CGAffineTransformIdentity;
|
||||
}];
|
||||
}
|
||||
else
|
||||
{
|
||||
cell.contentView.alpha = 1.;
|
||||
[self.movingCellImage removeFromSuperview];
|
||||
[[MWMRouter router] swapPointsAndRebuild];
|
||||
[self reloadData];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark - UICollectionView
|
||||
|
||||
@interface MWMRoutePreview (UICollectionView)<UICollectionViewDataSource, UICollectionViewDelegate>
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMRoutePreview (UICollectionView)
|
||||
|
||||
- (NSInteger)collectionView:(UICollectionView *)collectionView
|
||||
numberOfItemsInSection:(NSInteger)section
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
|
||||
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView
|
||||
cellForItemAtIndexPath:(NSIndexPath *)indexPath
|
||||
{
|
||||
Class cls = [MWMRoutePointCell class];
|
||||
auto cell = static_cast<MWMRoutePointCell *>(
|
||||
[collectionView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
|
||||
cell.number.text = @(indexPath.row + 1).stringValue;
|
||||
if (indexPath.row == 0)
|
||||
{
|
||||
cell.title.text = [MWMRouter router].startPoint.name;
|
||||
cell.title.placeholder = L(@"p2p_from");
|
||||
}
|
||||
else
|
||||
{
|
||||
cell.title.text = [MWMRouter router].finishPoint.name;
|
||||
cell.title.placeholder = L(@"p2p_to");
|
||||
}
|
||||
cell.delegate = self;
|
||||
return cell;
|
||||
}
|
||||
|
||||
#pragma mark - VisibleArea
|
||||
|
||||
- (MWMVisibleAreaAffectDirection)visibleAreaAffectDirection
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
|
|
@ -12,12 +16,14 @@
|
|||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="aNH-vh-DPz" customClass="MWMRoutePreview">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="140"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WqK-Yb-PmP" customClass="SolidTouchView">
|
||||
<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="wpf-tw-Coz" userLabel="Back">
|
||||
<rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="44" id="ELC-D6-uQM"/>
|
||||
<constraint firstAttribute="width" constant="44" id="e40-iL-uvR"/>
|
||||
|
|
@ -28,8 +34,10 @@
|
|||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oQc-l8-sZH" userLabel="Buttons Box">
|
||||
<rect key="frame" x="54" y="0.0" width="212" height="44"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cZF-Ha-2tB">
|
||||
<rect key="frame" x="6" y="3" width="38" height="38"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="38" id="m6k-uU-yOl"/>
|
||||
|
|
@ -37,6 +45,7 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FuO-c6-y9C" userLabel="Bicycle">
|
||||
<rect key="frame" x="60" y="3" width="38" height="38"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="38" id="9fe-fw-05J"/>
|
||||
|
|
@ -44,6 +53,7 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6D3-QF-6wm">
|
||||
<rect key="frame" x="114" y="3" width="38" height="38"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="38" id="815-LJ-2tk"/>
|
||||
|
|
@ -51,6 +61,7 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="15Q-ZN-NzE" userLabel="Taxi">
|
||||
<rect key="frame" x="168" y="3" width="38" height="38"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="38" id="ibp-pJ-TuK"/>
|
||||
|
|
@ -72,49 +83,14 @@
|
|||
<constraint firstItem="15Q-ZN-NzE" firstAttribute="centerY" secondItem="oQc-l8-sZH" secondAttribute="centerY" id="zvc-uG-Izm"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_up_and_down" translatesAutoresizingMaskIntoConstraints="NO" id="y8P-JL-riK">
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="13" id="LtD-Tz-US7"/>
|
||||
<constraint firstAttribute="height" constant="8" id="uez-1b-JG5"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0YR-3a-ucN">
|
||||
<connections>
|
||||
<action selector="extendTap" destination="aNH-vh-DPz" eventType="touchUpInside" id="oYh-e3-3Ln"/>
|
||||
</connections>
|
||||
</button>
|
||||
<collectionView multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="DrK-vI-WkO">
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="80" id="3R7-i6-rG1"/>
|
||||
</constraints>
|
||||
<collectionViewLayout key="collectionViewLayout" id="R9u-Qo-R0Y" customClass="MWMRoutePointLayout">
|
||||
<connections>
|
||||
<outlet property="parentView" destination="aNH-vh-DPz" id="E8J-7W-up9"/>
|
||||
</connections>
|
||||
</collectionViewLayout>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="aNH-vh-DPz" id="hJP-ak-DOp"/>
|
||||
<outlet property="delegate" destination="aNH-vh-DPz" id="IvN-9e-GGx"/>
|
||||
</connections>
|
||||
</collectionView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.12156862745098039" green="0.59999999999999998" blue="0.32156862745098036" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="140" id="2SX-TZ-tS3"/>
|
||||
<constraint firstItem="0YR-3a-ucN" firstAttribute="top" secondItem="WqK-Yb-PmP" secondAttribute="top" id="DyS-8t-eoF"/>
|
||||
<constraint firstItem="0YR-3a-ucN" firstAttribute="width" secondItem="wpf-tw-Coz" secondAttribute="width" id="IM7-F1-Enm"/>
|
||||
<constraint firstAttribute="height" constant="44" id="2SX-TZ-tS3"/>
|
||||
<constraint firstItem="oQc-l8-sZH" firstAttribute="centerY" secondItem="wpf-tw-Coz" secondAttribute="centerY" id="NwC-Dq-AAM"/>
|
||||
<constraint firstItem="0YR-3a-ucN" firstAttribute="height" secondItem="wpf-tw-Coz" secondAttribute="height" id="Of6-Cq-FHu"/>
|
||||
<constraint firstItem="wpf-tw-Coz" firstAttribute="leading" secondItem="WqK-Yb-PmP" secondAttribute="leading" id="bK5-4Q-Rv9"/>
|
||||
<constraint firstItem="wpf-tw-Coz" firstAttribute="top" secondItem="WqK-Yb-PmP" secondAttribute="top" id="cPc-fO-vAa"/>
|
||||
<constraint firstItem="y8P-JL-riK" firstAttribute="centerY" secondItem="0YR-3a-ucN" secondAttribute="centerY" id="dYT-xy-0Dq"/>
|
||||
<constraint firstAttribute="trailing" secondItem="DrK-vI-WkO" secondAttribute="trailing" priority="999" constant="8" id="jom-uc-MN0"/>
|
||||
<constraint firstItem="DrK-vI-WkO" firstAttribute="leading" secondItem="WqK-Yb-PmP" secondAttribute="leading" priority="999" constant="8" id="kYp-Bb-6dW"/>
|
||||
<constraint firstItem="DrK-vI-WkO" firstAttribute="top" secondItem="wpf-tw-Coz" secondAttribute="bottom" constant="4" id="kb4-z8-KAi"/>
|
||||
<constraint firstItem="oQc-l8-sZH" firstAttribute="centerX" secondItem="WqK-Yb-PmP" secondAttribute="centerX" id="ltA-tm-z3P"/>
|
||||
<constraint firstItem="y8P-JL-riK" firstAttribute="centerX" secondItem="0YR-3a-ucN" secondAttribute="centerX" id="ohd-Ye-gQA"/>
|
||||
<constraint firstAttribute="trailing" secondItem="0YR-3a-ucN" secondAttribute="trailing" id="qTd-74-BP9"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/>
|
||||
|
|
@ -130,15 +106,10 @@
|
|||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="arrowImageView" destination="y8P-JL-riK" id="rzP-ce-6f0"/>
|
||||
<outlet property="backButton" destination="wpf-tw-Coz" id="9nj-K5-pOR"/>
|
||||
<outlet property="bicycle" destination="FuO-c6-y9C" id="UR2-pF-Amb"/>
|
||||
<outlet property="collectionView" destination="DrK-vI-WkO" id="IRr-R5-WIS"/>
|
||||
<outlet property="contentView" destination="WqK-Yb-PmP" id="4ph-Dm-EFr"/>
|
||||
<outlet property="extendButton" destination="0YR-3a-ucN" id="fJG-ts-aGf"/>
|
||||
<outlet property="layout" destination="R9u-Qo-R0Y" id="cqs-S1-d4J"/>
|
||||
<outlet property="pedestrian" destination="6D3-QF-6wm" id="bdh-zx-9LW"/>
|
||||
<outlet property="planningRouteViewHeight" destination="2SX-TZ-tS3" id="IwX-TA-FxL"/>
|
||||
<outlet property="taxi" destination="15Q-ZN-NzE" id="RaD-7N-ZE2"/>
|
||||
<outlet property="vehicle" destination="cZF-Ha-2tB" id="QP3-tU-nfO"/>
|
||||
</connections>
|
||||
|
|
@ -146,7 +117,6 @@
|
|||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="ic_arrow_up_and_down" width="13" height="8"/>
|
||||
<image name="ic_nav_bar_back" width="14" height="22"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
|
||||
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
|
|
@ -23,8 +26,10 @@
|
|||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3s2-BV-X5i" customClass="SolidTouchView">
|
||||
<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="a4n-5I-PN3" userLabel="Back">
|
||||
<rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="44" id="huq-Vr-EM5"/>
|
||||
<constraint firstAttribute="width" constant="44" id="zCn-K4-Ax9"/>
|
||||
|
|
@ -35,26 +40,31 @@
|
|||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sXu-tl-a0m" userLabel="Buttons Box">
|
||||
<rect key="frame" x="48" y="0.0" width="224" height="44"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jDl-pu-eov">
|
||||
<rect key="frame" x="6" y="0.0" width="44" height="44"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="jDl-pu-eov" secondAttribute="height" multiplier="1:1" id="o1x-sd-13z"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yiM-fM-sSS" userLabel="Bicycle">
|
||||
<rect key="frame" x="66" y="0.0" width="44" height="44"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="yiM-fM-sSS" secondAttribute="height" multiplier="1:1" id="rnk-51-Cjg"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VhE-hA-Leo">
|
||||
<rect key="frame" x="126" y="3" width="38" height="38"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="VhE-hA-Leo" secondAttribute="height" multiplier="1:1" id="V4H-0m-WCy"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f6i-lw-K3R" userLabel="Taxi">
|
||||
<rect key="frame" x="180" y="3" width="38" height="38"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="38" id="OgG-Kd-9xU"/>
|
||||
|
|
@ -78,48 +88,28 @@
|
|||
<constraint firstItem="f6i-lw-K3R" firstAttribute="leading" secondItem="VhE-hA-Leo" secondAttribute="trailing" constant="16" id="oon-pL-3br"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<collectionView multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="TC0-58-PO9">
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="80" id="exN-o8-Rx8"/>
|
||||
</constraints>
|
||||
<collectionViewLayout key="collectionViewLayout" id="YwC-vB-4LF" customClass="MWMRoutePointLayout">
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="size" keyPath="itemSize">
|
||||
<size key="value" width="304" height="36"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="parentView" destination="u2u-Vb-2eH" id="ebV-nZ-xhX"/>
|
||||
</connections>
|
||||
</collectionViewLayout>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="u2u-Vb-2eH" id="nyl-Sz-zTu"/>
|
||||
<outlet property="delegate" destination="u2u-Vb-2eH" id="9Ib-Rd-Nf8"/>
|
||||
</connections>
|
||||
</collectionView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="sXu-tl-a0m" firstAttribute="bottom" secondItem="a4n-5I-PN3" secondAttribute="bottom" id="4NN-cC-Tsg"/>
|
||||
<constraint firstAttribute="height" constant="140" id="7e9-gc-Y07"/>
|
||||
<constraint firstAttribute="height" constant="44" id="7e9-gc-Y07"/>
|
||||
<constraint firstItem="sXu-tl-a0m" firstAttribute="top" secondItem="a4n-5I-PN3" secondAttribute="top" id="J7w-8N-vlf"/>
|
||||
<constraint firstAttribute="bottom" secondItem="TC0-58-PO9" secondAttribute="bottom" constant="12" id="O8H-Ui-wI9"/>
|
||||
<constraint firstItem="sXu-tl-a0m" firstAttribute="centerX" secondItem="3s2-BV-X5i" secondAttribute="centerX" id="OeL-MY-Mn5"/>
|
||||
<constraint firstItem="TC0-58-PO9" firstAttribute="leading" secondItem="3s2-BV-X5i" secondAttribute="leading" constant="8" id="Qnm-Iy-DdA"/>
|
||||
<constraint firstItem="a4n-5I-PN3" firstAttribute="leading" secondItem="3s2-BV-X5i" secondAttribute="leading" id="Wxp-Yl-6SC"/>
|
||||
<constraint firstItem="a4n-5I-PN3" firstAttribute="top" secondItem="3s2-BV-X5i" secondAttribute="top" id="ppW-Pq-6rh"/>
|
||||
<constraint firstAttribute="trailing" secondItem="TC0-58-PO9" secondAttribute="trailing" constant="8" id="yA7-YN-yHs"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87p-Qg-8f3" userLabel="Status Box">
|
||||
<rect key="frame" x="0.0" y="80" width="320" height="64"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tdV-a8-fmG" userLabel="Planning Box">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Planning..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="a7v-h1-j52">
|
||||
<rect key="frame" x="120" y="22" width="80" 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.26000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -137,8 +127,10 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QEP-6s-YTM" userLabel="Error Box">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Planning..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="VNi-4g-9gz" userLabel="Error">
|
||||
<rect key="frame" x="120" y="22" width="80" height="20"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -156,8 +148,10 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rqr-bu-crx" userLabel="Results Box">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="results" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zml-eW-DsI">
|
||||
<rect key="frame" x="16" y="14" width="234" 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.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -167,6 +161,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Arrive at 12:24" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oec-Ee-6ha">
|
||||
<rect key="frame" x="16" y="38" width="234" height="17"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -176,14 +171,17 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rXP-rM-9cx">
|
||||
<rect key="frame" x="254" y="18" width="50" height="12"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_elevation" translatesAutoresizingMaskIntoConstraints="NO" id="Ac5-gf-3tf">
|
||||
<rect key="frame" x="0.0" y="0.0" width="10" height="12"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="10" id="R4J-Uu-52U"/>
|
||||
<constraint firstAttribute="height" constant="12" id="v5V-2M-Fnx"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="260" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JtS-om-arD">
|
||||
<rect key="frame" x="14" y="-2.5" width="36" height="17"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -218,10 +216,14 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6iM-A6-4JK" userLabel="Height Box">
|
||||
<rect key="frame" x="0.0" y="64" width="320" height="68"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Apa-nH-KWJ">
|
||||
<rect key="frame" x="16" y="14" width="288" height="40"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zhI-92-6JG"/>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zhI-92-6JG">
|
||||
<rect key="frame" x="0.0" y="0.0" width="288" height="40"/>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
|
|
@ -242,8 +244,10 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xAP-RW-zvp" userLabel="Taxi Box">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="84"/>
|
||||
<subviews>
|
||||
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" pagingEnabled="YES" dataMode="none" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t6d-gI-JcN" customClass="MWMTaxiCollectionView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="84"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="84" id="TGC-wp-JtU"/>
|
||||
|
|
@ -301,8 +305,10 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gcR-zj-b7P">
|
||||
<rect key="frame" x="0.0" y="607" width="320" height="48"/>
|
||||
<subviews>
|
||||
<button hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4IJ-pR-Ztp" userLabel="Go" customClass="MWMStartButton">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="goButton"/>
|
||||
<inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="8" maxY="0.0"/>
|
||||
<state key="normal" title="Start"/>
|
||||
|
|
@ -373,7 +379,6 @@
|
|||
<outlet property="arriveLabel" destination="oec-Ee-6ha" id="7Ep-ck-NSQ"/>
|
||||
<outlet property="backButton" destination="a4n-5I-PN3" id="42W-5B-Z8i"/>
|
||||
<outlet property="bicycle" destination="yiM-fM-sSS" id="pMf-6J-9Gd"/>
|
||||
<outlet property="collectionView" destination="TC0-58-PO9" id="Onv-Ld-JPp"/>
|
||||
<outlet property="contentView" destination="3s2-BV-X5i" id="mp7-Qq-drU"/>
|
||||
<outlet property="elevationHeight" destination="JtS-om-arD" id="Dah-Ui-zNW"/>
|
||||
<outlet property="elevationImage" destination="Ac5-gf-3tf" id="Gka-BR-4ZM"/>
|
||||
|
|
@ -384,7 +389,6 @@
|
|||
<outlet property="heightBoxHeight" destination="Fl4-Tb-OER" id="MEr-ms-WF4"/>
|
||||
<outlet property="heightProfileElevation" destination="rXP-rM-9cx" id="9ME-YW-7qO"/>
|
||||
<outlet property="heightProfileImage" destination="zhI-92-6JG" id="BAQ-2W-WFu"/>
|
||||
<outlet property="layout" destination="YwC-vB-4LF" id="Hta-la-OdY"/>
|
||||
<outlet property="pedestrian" destination="VhE-hA-Leo" id="R3O-th-Jw0"/>
|
||||
<outlet property="planningBox" destination="tdV-a8-fmG" id="dR4-f7-H2J"/>
|
||||
<outlet property="resultLabel" destination="zml-eW-DsI" id="GaF-AU-thr"/>
|
||||
|
|
|
|||
|
|
@ -538,7 +538,6 @@ m2::PointD getMercator(MWMRoutePoint * p)
|
|||
_startPoint = startPoint;
|
||||
if (startPoint == self.finishPoint)
|
||||
self.finishPoint = zeroRoutePoint();
|
||||
[[MWMNavigationDashboardManager manager].routePreview reloadData];
|
||||
}
|
||||
|
||||
- (void)setFinishPoint:(MWMRoutePoint *)finishPoint
|
||||
|
|
@ -548,7 +547,6 @@ m2::PointD getMercator(MWMRoutePoint * p)
|
|||
_finishPoint = finishPoint;
|
||||
if (finishPoint == self.startPoint)
|
||||
self.startPoint = zeroRoutePoint();
|
||||
[[MWMNavigationDashboardManager manager].routePreview reloadData];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -598,7 +598,6 @@
|
|||
6741A9811BF340DE002C974C /* MWMRateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61579351AC2CEB60032D8E9 /* MWMRateAlert.xib */; };
|
||||
6741A9871BF340DE002C974C /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */; };
|
||||
6741A9881BF340DE002C974C /* MWMAPIBarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */; };
|
||||
6741A98A1BF340DE002C974C /* MWMRoutePointCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BB6CBF1BB17D7000DF1DF2 /* MWMRoutePointCell.xib */; };
|
||||
6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; };
|
||||
6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */; };
|
||||
6741A9911BF340DE002C974C /* MWMFacebookAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BC1E531ACBF9AB00EF0360 /* MWMFacebookAlert.xib */; };
|
||||
|
|
@ -616,12 +615,10 @@
|
|||
6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46F26CD710F623BA00ECCA39 /* EAGLView.mm */; };
|
||||
6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; };
|
||||
6741A9B91BF340DE002C974C /* MWMRateAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F61579331AC2CE9A0032D8E9 /* MWMRateAlert.mm */; };
|
||||
6741A9BA1BF340DE002C974C /* MWMRoutePointCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6BB6CC51BB18C0900DF1DF2 /* MWMRoutePointCell.m */; };
|
||||
6741A9C01BF340DE002C974C /* MWMTextView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6588E2B1B15C26700EE1E58 /* MWMTextView.mm */; };
|
||||
6741A9CF1BF340DE002C974C /* MWMLocationAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.mm */; };
|
||||
6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19821AB81A00006EAF7E /* MWMAlertViewController.mm */; };
|
||||
6741A9DB1BF340DE002C974C /* MWMRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD337E1B62403B00F2CE18 /* MWMRoutePreview.mm */; };
|
||||
6741A9DC1BF340DE002C974C /* MWMRoutePointLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BB6CC21BB1860D00DF1DF2 /* MWMRoutePointLayout.mm */; };
|
||||
6741A9E01BF340DE002C974C /* MWMDownloaderDialogHeader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B731B4A45FD0081A24A /* MWMDownloaderDialogHeader.mm */; };
|
||||
6741A9E71BF340DE002C974C /* MWMCircularProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35791B53D4C9009677EE /* MWMCircularProgressView.mm */; };
|
||||
6741A9E81BF340DE002C974C /* MWMAPIBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3465E7D71B6658C000854C4D /* MWMAPIBar.mm */; };
|
||||
|
|
@ -761,7 +758,6 @@
|
|||
849CF6611DE842290024A8A5 /* opening_hours_how_to_edit.html in Resources */ = {isa = PBXBuildFile; fileRef = F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */; };
|
||||
849CF6621DE842290024A8A5 /* MWMAPIBarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */; };
|
||||
849CF6641DE842290024A8A5 /* MWMAddPlaceNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F653CE171C71F62400A453F1 /* MWMAddPlaceNavigationBar.xib */; };
|
||||
849CF6651DE842290024A8A5 /* MWMRoutePointCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BB6CBF1BB17D7000DF1DF2 /* MWMRoutePointCell.xib */; };
|
||||
849CF6661DE842290024A8A5 /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; };
|
||||
849CF66D1DE842290024A8A5 /* MWMEditorViralAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64D9CA11C899C760063FA30 /* MWMEditorViralAlert.xib */; };
|
||||
849CF66E1DE842290024A8A5 /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */; };
|
||||
|
|
@ -784,7 +780,6 @@
|
|||
849CF6A01DE842290024A8A5 /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46F26CD710F623BA00ECCA39 /* EAGLView.mm */; };
|
||||
849CF6A21DE842290024A8A5 /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; };
|
||||
849CF6A41DE842290024A8A5 /* MWMRateAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F61579331AC2CE9A0032D8E9 /* MWMRateAlert.mm */; };
|
||||
849CF6A71DE842290024A8A5 /* MWMRoutePointCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6BB6CC51BB18C0900DF1DF2 /* MWMRoutePointCell.m */; };
|
||||
849CF6AF1DE842290024A8A5 /* MWMTextView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6588E2B1B15C26700EE1E58 /* MWMTextView.mm */; };
|
||||
849CF6B11DE842290024A8A5 /* MWMMapWidgets.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34FE4C441BCC013500066718 /* MWMMapWidgets.mm */; };
|
||||
849CF6BD1DE842290024A8A5 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342EE4101C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm */; };
|
||||
|
|
@ -799,7 +794,6 @@
|
|||
849CF6D51DE842290024A8A5 /* MWMTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */; };
|
||||
849CF6D81DE842290024A8A5 /* MWMSegue.mm in Sources */ = {isa = PBXBuildFile; fileRef = F607C18D1C047FDC00B53A87 /* MWMSegue.mm */; };
|
||||
849CF6DC1DE842290024A8A5 /* MWMRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD337E1B62403B00F2CE18 /* MWMRoutePreview.mm */; };
|
||||
849CF6DE1DE842290024A8A5 /* MWMRoutePointLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BB6CC21BB1860D00DF1DF2 /* MWMRoutePointLayout.mm */; };
|
||||
849CF6DF1DE842290024A8A5 /* MWMAuthorizationCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */; };
|
||||
849CF6E11DE842290024A8A5 /* MWMDownloaderDialogHeader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B731B4A45FD0081A24A /* MWMDownloaderDialogHeader.mm */; };
|
||||
849CF6E71DE842290024A8A5 /* MWMSearchNoResultsAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3462258D1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm */; };
|
||||
|
|
@ -979,9 +973,6 @@
|
|||
F6B97B291CD0CB170009B612 /* MWMBookmarkNameCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6B97B281CD0CB170009B612 /* MWMBookmarkNameCell.xib */; };
|
||||
F6B97B2A1CD0CB170009B612 /* MWMBookmarkNameCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6B97B281CD0CB170009B612 /* MWMBookmarkNameCell.xib */; };
|
||||
F6BB6CBE1BB15A5E00DF1DF2 /* MWMRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BB6CBD1BB15A5E00DF1DF2 /* MWMRoutePreview.xib */; };
|
||||
F6BB6CC01BB17D7000DF1DF2 /* MWMRoutePointCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BB6CBF1BB17D7000DF1DF2 /* MWMRoutePointCell.xib */; };
|
||||
F6BB6CC31BB1860D00DF1DF2 /* MWMRoutePointLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BB6CC21BB1860D00DF1DF2 /* MWMRoutePointLayout.mm */; };
|
||||
F6BB6CC61BB18C0900DF1DF2 /* MWMRoutePointCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6BB6CC51BB18C0900DF1DF2 /* MWMRoutePointCell.m */; };
|
||||
F6BBF2C61B4FFB72000CF8E2 /* MWMLocationAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.mm */; };
|
||||
F6BBF2C81B4FFB8C000CF8E2 /* MWMLocationAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */; };
|
||||
F6BC1E521ACBF98600EF0360 /* MWMFacebookAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BC1E511ACBF98600EF0360 /* MWMFacebookAlert.mm */; };
|
||||
|
|
@ -2111,11 +2102,6 @@
|
|||
F6B97B251CD0CA990009B612 /* MWMBookmarkNameCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBookmarkNameCell.mm; sourceTree = "<group>"; };
|
||||
F6B97B281CD0CB170009B612 /* MWMBookmarkNameCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBookmarkNameCell.xib; sourceTree = "<group>"; };
|
||||
F6BB6CBD1BB15A5E00DF1DF2 /* MWMRoutePreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMRoutePreview.xib; sourceTree = "<group>"; };
|
||||
F6BB6CBF1BB17D7000DF1DF2 /* MWMRoutePointCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMRoutePointCell.xib; sourceTree = "<group>"; };
|
||||
F6BB6CC11BB1860D00DF1DF2 /* MWMRoutePointLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutePointLayout.h; sourceTree = "<group>"; };
|
||||
F6BB6CC21BB1860D00DF1DF2 /* MWMRoutePointLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutePointLayout.mm; sourceTree = "<group>"; };
|
||||
F6BB6CC41BB18C0900DF1DF2 /* MWMRoutePointCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutePointCell.h; sourceTree = "<group>"; };
|
||||
F6BB6CC51BB18C0900DF1DF2 /* MWMRoutePointCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMRoutePointCell.m; sourceTree = "<group>"; };
|
||||
F6BBF2C41B4FFB72000CF8E2 /* MWMLocationAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationAlert.h; sourceTree = "<group>"; };
|
||||
F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMLocationAlert.mm; sourceTree = "<group>"; };
|
||||
F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMLocationAlert.xib; sourceTree = "<group>"; };
|
||||
|
|
@ -3315,14 +3301,11 @@
|
|||
F6172FA41BBD5A3E0081D325 /* MWMiPadRoutePreview.xib */,
|
||||
F6BD337D1B62403B00F2CE18 /* MWMRoutePreview.h */,
|
||||
F6BD337E1B62403B00F2CE18 /* MWMRoutePreview.mm */,
|
||||
F6BB6CC11BB1860D00DF1DF2 /* MWMRoutePointLayout.h */,
|
||||
F6BB6CC21BB1860D00DF1DF2 /* MWMRoutePointLayout.mm */,
|
||||
F6F778781DABC6D800B603E7 /* MWMTaxiCollectionLayout.h */,
|
||||
F6F778791DABC6D800B603E7 /* MWMTaxiCollectionLayout.mm */,
|
||||
F68FCB871DA7BD20007CC7D7 /* MWMTaxiPreviewCell.h */,
|
||||
F68FCB881DA7BD20007CC7D7 /* MWMTaxiPreviewCell.mm */,
|
||||
F68FCB891DA7BD20007CC7D7 /* MWMTaxiPreviewCell.xib */,
|
||||
F64A7B861BB2CD3D00CB03B0 /* RoutePointCell */,
|
||||
);
|
||||
path = RoutePreview;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -3459,16 +3442,6 @@
|
|||
path = RoutingDisclaimerAlert;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F64A7B861BB2CD3D00CB03B0 /* RoutePointCell */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F6BB6CC41BB18C0900DF1DF2 /* MWMRoutePointCell.h */,
|
||||
F6BB6CC51BB18C0900DF1DF2 /* MWMRoutePointCell.m */,
|
||||
F6BB6CBF1BB17D7000DF1DF2 /* MWMRoutePointCell.xib */,
|
||||
);
|
||||
name = RoutePointCell;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F64D9C9C1C899BEA0063FA30 /* EditorAlert */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -4602,7 +4575,6 @@
|
|||
F6E2FEA51E097BA00083EBEC /* MWMPPView.xib in Resources */,
|
||||
F69CE8D91E5C5088002B5881 /* PPHotelCarouselCell.xib in Resources */,
|
||||
F61579361AC2CEB60032D8E9 /* MWMRateAlert.xib in Resources */,
|
||||
F6BB6CC01BB17D7000DF1DF2 /* MWMRoutePointCell.xib in Resources */,
|
||||
F6BB6CBE1BB15A5E00DF1DF2 /* MWMRoutePreview.xib in Resources */,
|
||||
F63774E71B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib in Resources */,
|
||||
F6E2FEFF1E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */,
|
||||
|
|
@ -4772,7 +4744,6 @@
|
|||
F6E2FE941E097BA00083EBEC /* MWMPlacePageTaxiCell.xib in Resources */,
|
||||
F6E2FEA61E097BA00083EBEC /* MWMPPView.xib in Resources */,
|
||||
6741A9811BF340DE002C974C /* MWMRateAlert.xib in Resources */,
|
||||
6741A98A1BF340DE002C974C /* MWMRoutePointCell.xib in Resources */,
|
||||
6741A96E1BF340DE002C974C /* MWMRoutePreview.xib in Resources */,
|
||||
6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */,
|
||||
F6E2FF001E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */,
|
||||
|
|
@ -4943,7 +4914,6 @@
|
|||
F6E2FE951E097BA00083EBEC /* MWMPlacePageTaxiCell.xib in Resources */,
|
||||
F6E2FEA71E097BA00083EBEC /* MWMPPView.xib in Resources */,
|
||||
849CF6511DE842290024A8A5 /* MWMRateAlert.xib in Resources */,
|
||||
849CF6651DE842290024A8A5 /* MWMRoutePointCell.xib in Resources */,
|
||||
849CF6311DE842290024A8A5 /* MWMRoutePreview.xib in Resources */,
|
||||
F68224A01E5B105900BC1C18 /* PPHotelDescriptionCell.xib in Resources */,
|
||||
849CF6191DE842290024A8A5 /* MWMRoutingDisclaimerAlert.xib in Resources */,
|
||||
|
|
@ -5184,7 +5154,6 @@
|
|||
F6E2FD791E097BA00083EBEC /* MWMMapDownloaderDefaultDataSource.mm in Sources */,
|
||||
F6E2FF3E1E097BA00083EBEC /* MWMSearchTableViewController.mm in Sources */,
|
||||
F6E2FDDF1E097BA00083EBEC /* MWMEditorViewController.mm in Sources */,
|
||||
F6BB6CC61BB18C0900DF1DF2 /* MWMRoutePointCell.m in Sources */,
|
||||
F6E2FDB51E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.mm in Sources */,
|
||||
F6E2FDC71E097BA00083EBEC /* MWMEditorNotesFooter.mm in Sources */,
|
||||
340475671E081A4600C92850 /* MWMRouterSavedState.mm in Sources */,
|
||||
|
|
@ -5245,7 +5214,6 @@
|
|||
F6BD33811B62403B00F2CE18 /* MWMRoutePreview.mm in Sources */,
|
||||
34D3B0351E389D05004100F9 /* MWMEditorSelectTableViewCell.mm in Sources */,
|
||||
F6E2FD8B1E097BA00083EBEC /* MWMNoMapsView.mm in Sources */,
|
||||
F6BB6CC31BB1860D00DF1DF2 /* MWMRoutePointLayout.mm in Sources */,
|
||||
349D1AB71E2CB6E0004A2006 /* VisibleArea.swift in Sources */,
|
||||
F6E2FD701E097BA00083EBEC /* MWMMapDownloaderTableViewCell.mm in Sources */,
|
||||
F6E2FE4E1E097BA00083EBEC /* MWMActionBarButton.mm in Sources */,
|
||||
|
|
@ -5480,7 +5448,6 @@
|
|||
349D1ABC1E2D05EF004A2006 /* SearchBar.swift in Sources */,
|
||||
F6E2FD7A1E097BA00083EBEC /* MWMMapDownloaderDefaultDataSource.mm in Sources */,
|
||||
F6E2FF3F1E097BA00083EBEC /* MWMSearchTableViewController.mm in Sources */,
|
||||
6741A9BA1BF340DE002C974C /* MWMRoutePointCell.m in Sources */,
|
||||
F6E2FDE01E097BA00083EBEC /* MWMEditorViewController.mm in Sources */,
|
||||
6741A9C01BF340DE002C974C /* MWMTextView.mm in Sources */,
|
||||
F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.mm in Sources */,
|
||||
|
|
@ -5542,7 +5509,6 @@
|
|||
F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.mm in Sources */,
|
||||
34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.mm in Sources */,
|
||||
6741A9DB1BF340DE002C974C /* MWMRoutePreview.mm in Sources */,
|
||||
6741A9DC1BF340DE002C974C /* MWMRoutePointLayout.mm in Sources */,
|
||||
349D1AB81E2CB6E0004A2006 /* VisibleArea.swift in Sources */,
|
||||
F6E2FD711E097BA00083EBEC /* MWMMapDownloaderTableViewCell.mm in Sources */,
|
||||
F6E2FE4F1E097BA00083EBEC /* MWMActionBarButton.mm in Sources */,
|
||||
|
|
@ -5782,7 +5748,6 @@
|
|||
F6E2FDE11E097BA00083EBEC /* MWMEditorViewController.mm in Sources */,
|
||||
F6E2FDB71E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.mm in Sources */,
|
||||
F6E2FDC91E097BA00083EBEC /* MWMEditorNotesFooter.mm in Sources */,
|
||||
849CF6A71DE842290024A8A5 /* MWMRoutePointCell.m in Sources */,
|
||||
F6E2FD661E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */,
|
||||
3454D7D21E07F045004AF2AD /* UIImage+RGBAData.mm in Sources */,
|
||||
F6E2FF2E1E097BA00083EBEC /* MWMSearchCell.mm in Sources */,
|
||||
|
|
@ -5850,7 +5815,6 @@
|
|||
34574A681E3B85F80061E839 /* ThemeManager.swift in Sources */,
|
||||
849CF6DC1DE842290024A8A5 /* MWMRoutePreview.mm in Sources */,
|
||||
F6E2FD781E097BA00083EBEC /* MWMMapDownloaderDataSource.mm in Sources */,
|
||||
849CF6DE1DE842290024A8A5 /* MWMRoutePointLayout.mm in Sources */,
|
||||
349D1AD91E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */,
|
||||
849CF6DF1DE842290024A8A5 /* MWMAuthorizationCommon.mm in Sources */,
|
||||
F6E2FEBF1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue