forked from organicmaps/organicmaps
[ios] Removed side menu.
This commit is contained in:
Ilya Grechuhin
Ilya Grechuhin
parent
41b431de52
commit
eee5a566a0
22 changed files with 13 additions and 1346 deletions
|
|
@ -1,10 +0,0 @@
|
|||
#import <Foundation/Foundation.h>
|
||||
|
||||
@interface MWMLocationButton : NSObject
|
||||
|
||||
@property (nonatomic) BOOL hidden;
|
||||
|
||||
- (instancetype)init __attribute__((unavailable("init is not available")));
|
||||
- (instancetype)initWithParentView:(UIView *)view;
|
||||
|
||||
@end
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
#import "MWMLocationButton.h"
|
||||
#import "MWMLocationButtonView.h"
|
||||
|
||||
#include "Framework.h"
|
||||
|
||||
static NSString * const kMWMLocationButtonViewNibName = @"MWMLocationButton";
|
||||
|
||||
@interface MWMLocationButton()
|
||||
|
||||
@property (nonatomic) IBOutlet MWMLocationButtonView * button;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMLocationButton
|
||||
|
||||
- (instancetype)initWithParentView:(UIView *)view
|
||||
{
|
||||
self = [super init];
|
||||
if (self)
|
||||
{
|
||||
[[NSBundle mainBundle] loadNibNamed:kMWMLocationButtonViewNibName owner:self options:nil];
|
||||
[view addSubview:self.button];
|
||||
[self configLocationListener];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)configLocationListener
|
||||
{
|
||||
typedef void (*LocationStateModeFnT)(id, SEL, location::State::Mode);
|
||||
SEL locationStateModeSelector = @selector(onLocationStateModeChanged:);
|
||||
LocationStateModeFnT locationStateModeFn = (LocationStateModeFnT)[self methodForSelector:locationStateModeSelector];
|
||||
|
||||
GetFramework().GetLocationState()->AddStateModeListener(bind(locationStateModeFn, self, locationStateModeSelector, _1));
|
||||
}
|
||||
|
||||
- (void)onLocationStateModeChanged:(location::State::Mode)state
|
||||
{
|
||||
self.button.locationState = state;
|
||||
}
|
||||
|
||||
- (IBAction)buttonPressed:(id)sender
|
||||
{
|
||||
GetFramework().GetLocationState()->SwitchToNextMode();
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (BOOL)hidden
|
||||
{
|
||||
return self.button.hidden;
|
||||
}
|
||||
|
||||
- (void)setHidden:(BOOL)hidden
|
||||
{
|
||||
self.button.hidden = hidden;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMLocationButton">
|
||||
<connections>
|
||||
<outlet property="button" destination="5qS-Qi-k1g" id="YgC-Eq-sz4"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="5qS-Qi-k1g" customClass="MWMLocationButtonView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="56" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<state key="normal" image="btn_white_target_off_1">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="highlighted" image="btn_white_target_off_1_pressed"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="download_maps"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="buttonPressed:" destination="-1" eventType="touchUpInside" id="qeG-JS-5c9"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="267.5" y="254"/>
|
||||
</button>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="btn_white_target_off_1" width="56" height="56"/>
|
||||
<image name="btn_white_target_off_1_pressed" width="56" height="56"/>
|
||||
</resources>
|
||||
<simulatedMetricsContainer key="defaultSimulatedMetrics">
|
||||
<simulatedStatusBarMetrics key="statusBar"/>
|
||||
<simulatedOrientationMetrics key="orientation"/>
|
||||
<simulatedScreenMetrics key="destination" type="retina4"/>
|
||||
</simulatedMetricsContainer>
|
||||
</document>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
#import <UIKit/UIKit.h>
|
||||
|
||||
#include "map/location_state.hpp"
|
||||
|
||||
@interface MWMLocationButtonView : UIButton
|
||||
|
||||
@property (nonatomic) location::State::Mode locationState;
|
||||
|
||||
- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available")));
|
||||
- (instancetype)init __attribute__((unavailable("init is not available")));
|
||||
|
||||
@end
|
||||
|
|
@ -1,137 +0,0 @@
|
|||
#import "MWMLocationButtonView.h"
|
||||
#import "MWMMapViewControlsCommon.h"
|
||||
|
||||
@interface MWMLocationButtonView()
|
||||
|
||||
@property (nonatomic) CGRect defaultBounds;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMLocationButtonView
|
||||
|
||||
- (instancetype)initWithCoder:(NSCoder *)aDecoder
|
||||
{
|
||||
self = [super initWithCoder:aDecoder];
|
||||
if (self)
|
||||
{
|
||||
self.defaultBounds = self.bounds;
|
||||
self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
|
||||
self.locationState = location::State::UnknownPosition;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)layoutSubviews
|
||||
{
|
||||
[super layoutSubviews];
|
||||
self.bounds = self.defaultBounds;
|
||||
[self layoutXPosition:self.hidden];
|
||||
self.maxY = self.superview.height - 2.0 * kViewControlsOffsetToBounds;
|
||||
}
|
||||
|
||||
- (void)layoutXPosition:(BOOL)hidden
|
||||
{
|
||||
if (hidden)
|
||||
self.maxX = 0.0;
|
||||
else
|
||||
self.minX = 2.0 * kViewControlsOffsetToBounds;
|
||||
}
|
||||
|
||||
- (void)setImageNamed:(location::State::Mode)state
|
||||
{
|
||||
if (state == location::State::PendingPosition)
|
||||
[self setPendingPositionAnimation];
|
||||
else
|
||||
{
|
||||
static NSDictionary * stateMap = @{@(location::State::UnknownPosition).stringValue : @"btn_white_unknow_position",
|
||||
@(location::State::NotFollow).stringValue : @"btn_white_target_off_1",
|
||||
@(location::State::Follow).stringValue : @"btn_white_target_on",
|
||||
@(location::State::RotateAndFollow).stringValue : @"btn_white_direction"};
|
||||
[self.imageView stopAnimating];
|
||||
NSString * const imageName = stateMap[@(state).stringValue];
|
||||
self.highlighted = NO;
|
||||
[self setImage:[UIImage imageNamed:imageName] forState:UIControlStateNormal];
|
||||
[self setImage:[UIImage imageNamed:[imageName stringByAppendingString:@"_pressed"]]
|
||||
forState:UIControlStateHighlighted];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setAnimation:(NSArray *)animationImages once:(BOOL)once
|
||||
{
|
||||
UIImageView * animationIV = self.imageView;
|
||||
animationIV.animationImages = animationImages;
|
||||
animationIV.animationDuration = framesDuration(animationImages.count);
|
||||
animationIV.animationRepeatCount = once ? 1 : 0;
|
||||
[animationIV startAnimating];
|
||||
}
|
||||
|
||||
- (void)setPendingPositionAnimation
|
||||
{
|
||||
NSString * imageName = @"btn_white_loading_";
|
||||
[self setImage:[UIImage imageNamed:[imageName stringByAppendingString:@"1"]] forState:UIControlStateNormal];
|
||||
NSUInteger const animationImagesCount = 18;
|
||||
NSMutableArray * animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
|
||||
for (NSUInteger i = 0; i < animationImagesCount; ++i)
|
||||
animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@", imageName, @(i+1)]];
|
||||
[self setAnimation:animationImages once:NO];
|
||||
}
|
||||
|
||||
- (void)changeButtonFromState:(location::State::Mode)beginState toState:(location::State::Mode)endState
|
||||
{
|
||||
[self setImageNamed:endState];
|
||||
static NSDictionary * stateMap = @{@(location::State::UnknownPosition).stringValue : @"noposition",
|
||||
@(location::State::PendingPosition).stringValue : @"pending",
|
||||
@(location::State::NotFollow).stringValue : @"notfollow",
|
||||
@(location::State::Follow).stringValue : @"follow",
|
||||
@(location::State::RotateAndFollow).stringValue : @"followandrotate"};
|
||||
NSString * changeAnimation = [NSString stringWithFormat:@"%@_to_%@_",
|
||||
stateMap[@(beginState).stringValue], stateMap[@(endState).stringValue]];
|
||||
NSUInteger const animationImagesCount = 6;
|
||||
NSMutableArray * animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
|
||||
for (NSUInteger i = 0; i < animationImagesCount; ++i)
|
||||
animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@", changeAnimation, @(i+1)]];
|
||||
[self setAnimation:animationImages once:YES];
|
||||
[self changeStateFinish];
|
||||
}
|
||||
|
||||
- (void)changeStateFinish
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^
|
||||
{
|
||||
if (self.imageView.isAnimating)
|
||||
[self changeStateFinish];
|
||||
else
|
||||
[self setImageNamed:self.locationState];
|
||||
});
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (void)setLocationState:(location::State::Mode)locationState
|
||||
{
|
||||
if (_locationState == locationState)
|
||||
[self setImageNamed:locationState];
|
||||
else
|
||||
{
|
||||
[self changeButtonFromState:_locationState toState:locationState];
|
||||
_locationState = locationState;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setHidden:(BOOL)hidden
|
||||
{
|
||||
if (!hidden)
|
||||
super.hidden = NO;
|
||||
[self layoutXPosition:!hidden];
|
||||
[UIView animateWithDuration:framesDuration(kMenuViewHideFramesCount) animations:^
|
||||
{
|
||||
[self layoutXPosition:hidden];
|
||||
}
|
||||
completion:^(BOOL finished)
|
||||
{
|
||||
if (hidden)
|
||||
super.hidden = YES;
|
||||
}];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
static NSTimeInterval const kMenuViewHideFramesCount = 7.0;
|
||||
static NSTimeInterval const kMenuViewMoveFramesCount = 7.0;
|
||||
|
||||
static inline NSTimeInterval framesDuration(NSTimeInterval const framesCount)
|
||||
{
|
||||
static NSTimeInterval const kFPS = 30.0;
|
||||
static NSTimeInterval const kFrameDuration = 1.0 / kFPS;
|
||||
return kFrameDuration * framesCount;
|
||||
}
|
||||
|
||||
static CGFloat const kViewControlsOffsetToBounds = 4.0;
|
||||
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
@property (nonatomic) BOOL hidden;
|
||||
@property (nonatomic) BOOL zoomHidden;
|
||||
//@property (nonatomic) BOOL locationHidden;
|
||||
@property (nonatomic) MWMBottomMenuState menuState;
|
||||
@property (nonatomic, readonly) MWMNavigationDashboardState navigationState;
|
||||
@property (nonatomic) BOOL searchHidden;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ extern NSString * const kAlohalyticsTapEventKey;
|
|||
MWMSearchManagerProtocol, MWMSearchViewProtocol, MWMBottomMenuControllerProtocol>
|
||||
|
||||
@property (nonatomic) MWMZoomButtons * zoomButtons;
|
||||
//@property (nonatomic) MWMLocationButton * locationButton;
|
||||
@property (nonatomic) MWMBottomMenuViewController * menuController;
|
||||
@property (nonatomic) MWMPlacePageViewManager * placePageManager;
|
||||
@property (nonatomic) MWMNavigationDashboardManager * navigationManager;
|
||||
|
|
@ -131,14 +130,6 @@ extern NSString * const kAlohalyticsTapEventKey;
|
|||
self.topBound = searchView.height;
|
||||
}
|
||||
|
||||
#pragma mark - MWMSideMenuManagerProtocol
|
||||
|
||||
- (void)sideMenuDidUpdateLayout
|
||||
{
|
||||
// [self.zoomButtons setBottomBound:self.menuManager.menuButtonFrameWithSpacing.origin.y];
|
||||
[self.zoomButtons setBottomBound:0.0];
|
||||
}
|
||||
|
||||
#pragma mark - MWMSearchManagerProtocol & MWMBottomMenuControllerProtocol
|
||||
|
||||
- (void)actionDownloadMaps
|
||||
|
|
@ -309,7 +300,6 @@ extern NSString * const kAlohalyticsTapEventKey;
|
|||
_hidden = hidden;
|
||||
self.zoomHidden = _zoomHidden;
|
||||
self.menuState = _menuState;
|
||||
// self.locationHidden = _locationHidden;
|
||||
GetFramework().SetFullScreenMode(hidden);
|
||||
}
|
||||
|
||||
|
|
@ -337,12 +327,6 @@ extern NSString * const kAlohalyticsTapEventKey;
|
|||
return self.navigationManager.state;
|
||||
}
|
||||
|
||||
//- (void)setLocationHidden:(BOOL)locationHidden
|
||||
//{
|
||||
// _locationHidden = locationHidden;
|
||||
// self.locationButton.hidden = self.hidden || locationHidden;
|
||||
//}
|
||||
|
||||
- (BOOL)isDirectionViewShown
|
||||
{
|
||||
return self.placePageManager.isDirectionViewShown;
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
#import "MWMSideMenuButtonDelegate.h"
|
||||
#import "MWMSideMenuDelegate.h"
|
||||
#import "MWMSideMenuDownloadBadge.h"
|
||||
|
||||
@interface MWMSideMenuButton : UIView <MWMSideMenuDownloadBadgeOwner>
|
||||
|
||||
@property (nonatomic, readonly) CGRect frameWithSpacing;
|
||||
@property (weak, nonatomic) id<MWMSideMenuInformationDisplayProtocol, MWMSideMenuButtonTapProtocol, MWMSideMenuButtonLayoutProtocol> delegate;
|
||||
@property (weak, nonatomic) MWMSideMenuDownloadBadge * downloadBadge;
|
||||
|
||||
- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available")));
|
||||
- (instancetype)init __attribute__((unavailable("init is not available")));
|
||||
|
||||
- (void)setup;
|
||||
- (void)setHidden:(BOOL)hidden animated:(BOOL)animated;
|
||||
|
||||
@end
|
||||
|
|
@ -1,142 +0,0 @@
|
|||
#import "MWMMapViewControlsCommon.h"
|
||||
#import "MWMSideMenuButton.h"
|
||||
|
||||
@interface MWMSideMenuButton()
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UIImageView * buttonImage;
|
||||
@property (nonatomic) CGRect defaultBounds;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMSideMenuButton
|
||||
|
||||
- (instancetype)initWithCoder:(NSCoder *)aDecoder
|
||||
{
|
||||
self = [super initWithCoder:aDecoder];
|
||||
if (self)
|
||||
{
|
||||
self.defaultBounds = self.bounds;
|
||||
self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)setup
|
||||
{
|
||||
self.contentScaleFactor = self.superview.contentScaleFactor;
|
||||
self.alpha = 0.0;
|
||||
[UIView animateWithDuration:framesDuration(3) animations:^
|
||||
{
|
||||
self.alpha = 1.0;
|
||||
}];
|
||||
UIImageView const * const animationIV = self.buttonImage;
|
||||
NSString const * const imageName = @"btn_green_menu_";
|
||||
self.buttonImage.image = [UIImage imageNamed:[imageName stringByAppendingString:@"1"]];
|
||||
static NSUInteger const animationImagesCount = 4;
|
||||
NSMutableArray * const animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
|
||||
for (NSUInteger i = 0; i < animationImagesCount; ++i)
|
||||
animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@", imageName, @(animationImagesCount - i)]];
|
||||
animationIV.animationImages = animationImages;
|
||||
animationIV.animationDuration = framesDuration(animationIV.animationImages.count);
|
||||
animationIV.animationRepeatCount = 1;
|
||||
[animationIV startAnimating];
|
||||
[self setNeedsLayout];
|
||||
}
|
||||
|
||||
- (void)layoutSubviews
|
||||
{
|
||||
[super layoutSubviews];
|
||||
self.buttonImage.frame = self.bounds = self.defaultBounds;
|
||||
self.maxY = self.superview.height - 2.0 * kViewControlsOffsetToBounds;
|
||||
[self layoutXPosition:self.hidden];
|
||||
[self.delegate menuButtonDidUpdateLayout];
|
||||
}
|
||||
|
||||
- (void)layoutXPosition:(BOOL)hidden
|
||||
{
|
||||
if (hidden)
|
||||
{
|
||||
self.minX = self.superview.width;
|
||||
}
|
||||
else
|
||||
{
|
||||
self.maxX = self.superview.width - 2.0 * kViewControlsOffsetToBounds;
|
||||
|
||||
m2::PointD const pivot(self.minX * self.contentScaleFactor - 2.0 * kViewControlsOffsetToBounds, self.maxY * self.contentScaleFactor - kViewControlsOffsetToBounds);
|
||||
[self.delegate setRulerPivot:pivot];
|
||||
[self.delegate setCopyrightLabelPivot:pivot];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)handleSingleTap
|
||||
{
|
||||
[self.delegate handleSingleTap];
|
||||
}
|
||||
|
||||
- (void)handleDoubleTap
|
||||
{
|
||||
[self.delegate handleDoubleTap];
|
||||
}
|
||||
|
||||
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
{
|
||||
self.buttonImage.highlighted = YES;
|
||||
UITouch * touch = [touches anyObject];
|
||||
if (touch.tapCount > 1)
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget:self];
|
||||
}
|
||||
|
||||
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
{
|
||||
self.buttonImage.highlighted = NO;
|
||||
UITouch * touch = [touches anyObject];
|
||||
if (touch.tapCount == 1)
|
||||
[self performSelector:@selector(handleSingleTap) withObject:nil afterDelay:0.1];
|
||||
else if (touch.tapCount > 1)
|
||||
[self handleDoubleTap];
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (void)setHidden:(BOOL)hidden animated:(BOOL)animated
|
||||
{
|
||||
if (self.hidden == hidden)
|
||||
return;
|
||||
if (animated)
|
||||
{
|
||||
if (!hidden)
|
||||
self.hidden = NO;
|
||||
[self layoutXPosition:!hidden];
|
||||
[UIView animateWithDuration:framesDuration(kMenuViewHideFramesCount) animations:^
|
||||
{
|
||||
[self layoutXPosition:hidden];
|
||||
}
|
||||
completion:^(BOOL finished)
|
||||
{
|
||||
if (hidden)
|
||||
self.hidden = YES;
|
||||
}];
|
||||
}
|
||||
else
|
||||
{
|
||||
self.hidden = hidden;
|
||||
[self layoutXPosition:hidden];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (void)setDownloadBadge:(MWMSideMenuDownloadBadge *)downloadBadge
|
||||
{
|
||||
_downloadBadge = downloadBadge;
|
||||
if (![downloadBadge.superview isEqual:self])
|
||||
[self addSubview:downloadBadge];
|
||||
}
|
||||
|
||||
- (CGRect)frameWithSpacing
|
||||
{
|
||||
CGFloat const outset = 2.0 * kViewControlsOffsetToBounds;
|
||||
return CGRectInset(self.frame, -outset, -outset);
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
@protocol MWMSideMenuButtonTapProtocol <NSObject>
|
||||
|
||||
- (void)handleSingleTap;
|
||||
- (void)handleDoubleTap;
|
||||
|
||||
@end
|
||||
|
||||
@protocol MWMSideMenuButtonLayoutProtocol <NSObject>
|
||||
|
||||
- (void)menuButtonDidUpdateLayout;
|
||||
|
||||
@end
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#include "geometry/point2d.hpp"
|
||||
|
||||
@protocol MWMSideMenuInformationDisplayProtocol <NSObject>
|
||||
|
||||
- (void)setRulerPivot:(m2::PointD)pivot;
|
||||
- (void)setCopyrightLabelPivot:(m2::PointD)pivot;
|
||||
|
||||
@end
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#import <UIKit/UIKit.h>
|
||||
|
||||
@class MWMSideMenuDownloadBadge;
|
||||
@protocol MWMSideMenuDownloadBadgeOwner <NSObject>
|
||||
|
||||
@property (weak, nonatomic) MWMSideMenuDownloadBadge * downloadBadge;
|
||||
|
||||
@end
|
||||
|
||||
@interface MWMSideMenuDownloadBadge : UIView
|
||||
|
||||
@property (nonatomic) NSUInteger outOfDateCount;
|
||||
|
||||
- (void)showAnimatedAfterDelay:(NSTimeInterval)delay;
|
||||
- (void)hide;
|
||||
|
||||
@end
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
#import "MWMMapViewControlsCommon.h"
|
||||
#import "MWMSideMenuDownloadBadge.h"
|
||||
|
||||
@interface MWMSideMenuDownloadBadge ()
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UIImageView * badgeBackground;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * downloadCount;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMSideMenuDownloadBadge
|
||||
|
||||
- (void)layoutSubviews
|
||||
{
|
||||
self.maxX = self.superview.width;
|
||||
self.badgeBackground.frame = self.bounds;
|
||||
self.downloadCount.frame = self.bounds;
|
||||
[super layoutSubviews];
|
||||
}
|
||||
|
||||
- (void)showAnimatedAfterDelay:(NSTimeInterval)delay
|
||||
{
|
||||
self.hidden = YES;
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^
|
||||
{
|
||||
[self expand];
|
||||
});
|
||||
}
|
||||
|
||||
- (void)hide
|
||||
{
|
||||
[self removeFromSuperview];
|
||||
}
|
||||
|
||||
- (void)expand
|
||||
{
|
||||
if (self.outOfDateCount == 0)
|
||||
return;
|
||||
self.hidden = NO;
|
||||
CATransform3D const zeroScale = CATransform3DScale(CATransform3DIdentity, 0.0, 0.0, 1.0);
|
||||
self.badgeBackground.layer.transform = self.downloadCount.layer.transform = zeroScale;
|
||||
self.badgeBackground.alpha = self.downloadCount.alpha = 0.0;
|
||||
self.badgeBackground.hidden = NO;
|
||||
self.downloadCount.hidden = NO;
|
||||
self.downloadCount.text = @(self.outOfDateCount).stringValue;
|
||||
[UIView animateWithDuration:framesDuration(4) animations:^
|
||||
{
|
||||
self.badgeBackground.layer.transform = self.downloadCount.layer.transform = CATransform3DIdentity;
|
||||
self.badgeBackground.alpha = self.downloadCount.alpha = 1.0;
|
||||
}];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#import <UIKit/UIKit.h>
|
||||
|
||||
@class MapViewController;
|
||||
@protocol MWMSideMenuManagerProtocol;
|
||||
|
||||
typedef NS_ENUM(NSUInteger, MWMSideMenuState)
|
||||
{
|
||||
MWMSideMenuStateHidden,
|
||||
MWMSideMenuStateInactive,
|
||||
MWMSideMenuStateActive
|
||||
};
|
||||
|
||||
@interface MWMSideMenuManager : NSObject
|
||||
|
||||
@property (nonatomic) MWMSideMenuState state;
|
||||
@property (nonatomic, readonly) CGRect menuButtonFrameWithSpacing;
|
||||
|
||||
- (instancetype)init __attribute__((unavailable("init is not available")));
|
||||
- (instancetype)initWithParentController:(MapViewController *)controller delegate:(id<MWMSideMenuManagerProtocol>)delegate;
|
||||
|
||||
@end
|
||||
|
|
@ -1,240 +0,0 @@
|
|||
#import "BookmarksRootVC.h"
|
||||
#import "LocationManager.h"
|
||||
#import "MapsAppDelegate.h"
|
||||
#import "MapViewController.h"
|
||||
#import "MWMActivityViewController.h"
|
||||
#import "MWMMapViewControlsCommon.h"
|
||||
#import "MWMMapViewControlsManager.h"
|
||||
#import "MWMSideMenuButton.h"
|
||||
#import "MWMSideMenuButtonDelegate.h"
|
||||
#import "MWMSideMenuDelegate.h"
|
||||
#import "MWMSideMenuDownloadBadge.h"
|
||||
#import "MWMSideMenuManager.h"
|
||||
#import "MWMSideMenuManagerDelegate.h"
|
||||
#import "MWMSideMenuView.h"
|
||||
#import "SettingsAndMoreVC.h"
|
||||
|
||||
#import "3party/Alohalytics/src/alohalytics_objc.h"
|
||||
|
||||
#include "Framework.h"
|
||||
#include "map/information_display.hpp"
|
||||
|
||||
static NSString * const kMWMSideMenuViewsNibName = @"MWMSideMenuViews";
|
||||
|
||||
extern NSString * const kAlohalyticsTapEventKey;
|
||||
|
||||
@interface MWMSideMenuManager() <MWMSideMenuInformationDisplayProtocol, MWMSideMenuButtonTapProtocol,
|
||||
MWMSideMenuButtonLayoutProtocol>
|
||||
|
||||
@property (weak, nonatomic) id<MWMSideMenuManagerProtocol> delegate;
|
||||
@property (weak, nonatomic) MapViewController * controller;
|
||||
|
||||
@property (nonatomic) IBOutlet MWMSideMenuButton * menuButton;
|
||||
@property (nonatomic) IBOutlet MWMSideMenuDownloadBadge * downloadBadge;
|
||||
@property (nonatomic) IBOutlet MWMSideMenuView * sideMenu;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UIButton * shareLocationButton;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMSideMenuManager
|
||||
|
||||
- (instancetype)initWithParentController:(MapViewController *)controller
|
||||
delegate:(id<MWMSideMenuManagerProtocol>)delegate
|
||||
{
|
||||
self = [super init];
|
||||
if (self)
|
||||
{
|
||||
self.controller = controller;
|
||||
self.delegate = delegate;
|
||||
[[NSBundle mainBundle] loadNibNamed:kMWMSideMenuViewsNibName owner:self options:nil];
|
||||
[self.controller.view addSubview:self.menuButton];
|
||||
[self.menuButton setup];
|
||||
self.menuButton.delegate = self;
|
||||
self.sideMenu.delegate = self;
|
||||
[self addCloseMenuWithTap];
|
||||
self.state = MWMSideMenuStateInactive;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)addCloseMenuWithTap
|
||||
{
|
||||
UITapGestureRecognizer * const tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(toggleMenu)];
|
||||
[self.sideMenu.dimBackground addGestureRecognizer:tap];
|
||||
}
|
||||
|
||||
#pragma mark - Actions
|
||||
|
||||
- (IBAction)menuActionOpenBookmarks
|
||||
{
|
||||
[Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"bookmarks"];
|
||||
BookmarksRootVC * const vc = [[BookmarksRootVC alloc] init];
|
||||
[self.controller.navigationController pushViewController:vc animated:YES];
|
||||
}
|
||||
|
||||
- (IBAction)menuActionDownloadMaps
|
||||
{
|
||||
[self.delegate actionDownloadMaps];
|
||||
}
|
||||
|
||||
- (IBAction)menuActionOpenSettings
|
||||
{
|
||||
[Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"settingsAndMore"];
|
||||
SettingsAndMoreVC * const vc = [[SettingsAndMoreVC alloc] initWithStyle:UITableViewStyleGrouped];
|
||||
[self.controller.navigationController pushViewController:vc animated:YES];
|
||||
}
|
||||
|
||||
- (IBAction)menuActionShareLocation
|
||||
{
|
||||
[Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"share@"];
|
||||
CLLocation const * const location = [MapsAppDelegate theApp].m_locationManager.lastLocation;
|
||||
if (!location)
|
||||
{
|
||||
[[[UIAlertView alloc] initWithTitle:L(@"unknown_current_position") message:nil delegate:nil
|
||||
cancelButtonTitle:L(@"ok") otherButtonTitles:nil] show];
|
||||
return;
|
||||
}
|
||||
CLLocationCoordinate2D const coord = location.coordinate;
|
||||
MWMActivityViewController * shareVC = [MWMActivityViewController shareControllerForLocationTitle:nil location:coord
|
||||
myPosition:YES];
|
||||
[shareVC presentInParentViewController:self.controller anchorView:self.shareLocationButton];
|
||||
}
|
||||
|
||||
- (IBAction)menuActionOpenSearch
|
||||
{
|
||||
self.state = MWMSideMenuStateInactive;
|
||||
[Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"search"];
|
||||
self.controller.controlsManager.searchHidden = NO;
|
||||
}
|
||||
|
||||
- (void)toggleMenu
|
||||
{
|
||||
if (self.state == MWMSideMenuStateActive)
|
||||
self.state = MWMSideMenuStateInactive;
|
||||
else if (self.state == MWMSideMenuStateInactive)
|
||||
self.state = MWMSideMenuStateActive;
|
||||
}
|
||||
|
||||
#pragma mark - MWMSideMenuButtonTapProtocol
|
||||
|
||||
- (void)handleSingleTap
|
||||
{
|
||||
[self toggleMenu];
|
||||
}
|
||||
|
||||
- (void)handleDoubleTap
|
||||
{
|
||||
[self menuActionOpenSearch];
|
||||
}
|
||||
|
||||
#pragma mark - MWMSideMenuButtonLayoutProtocol
|
||||
|
||||
- (void)menuButtonDidUpdateLayout
|
||||
{
|
||||
[self.delegate sideMenuDidUpdateLayout];
|
||||
}
|
||||
|
||||
#pragma mark - MWMSideMenuInformationDisplayProtocol
|
||||
|
||||
- (void)setRulerPivot:(m2::PointD)pivot
|
||||
{
|
||||
// Workaround for old ios when layoutSubviews are called in undefined order.
|
||||
dispatch_async(dispatch_get_main_queue(), ^
|
||||
{
|
||||
GetFramework().GetInformationDisplay().SetWidgetPivot(InformationDisplay::WidgetType::Ruler, pivot);
|
||||
});
|
||||
}
|
||||
|
||||
- (void)setCopyrightLabelPivot:(m2::PointD)pivot
|
||||
{
|
||||
// Workaround for old ios when layoutSubviews are called in undefined order.
|
||||
dispatch_async(dispatch_get_main_queue(), ^
|
||||
{
|
||||
GetFramework().GetInformationDisplay().SetWidgetPivot(InformationDisplay::WidgetType::CopyrightLabel, pivot);
|
||||
});
|
||||
}
|
||||
|
||||
- (void)showMenu
|
||||
{
|
||||
self.menuButton.alpha = 1.0;
|
||||
self.sideMenu.alpha = 0.0;
|
||||
[self.controller.view addSubview:self.sideMenu];
|
||||
[UIView animateWithDuration:framesDuration(3) animations:^
|
||||
{
|
||||
self.menuButton.alpha = 0.0;
|
||||
self.sideMenu.alpha = 1.0;
|
||||
}
|
||||
completion:^(BOOL finished)
|
||||
{
|
||||
if (self.state == MWMSideMenuStateActive)
|
||||
[self.menuButton setHidden:YES animated:NO];
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)hideMenu
|
||||
{
|
||||
[UIView animateWithDuration:framesDuration(3) animations:^
|
||||
{
|
||||
self.menuButton.alpha = 1.0;
|
||||
self.sideMenu.alpha = 0.0;
|
||||
}
|
||||
completion:^(BOOL finished)
|
||||
{
|
||||
[self.sideMenu removeFromSuperview];
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)addDownloadBadgeToView:(UIView<MWMSideMenuDownloadBadgeOwner> *)view
|
||||
{
|
||||
int const count = GetFramework().GetCountryTree().GetActiveMapLayout().GetOutOfDateCount();
|
||||
if (count > 0)
|
||||
{
|
||||
self.downloadBadge.outOfDateCount = count;
|
||||
view.downloadBadge = self.downloadBadge;
|
||||
[self.downloadBadge showAnimatedAfterDelay:framesDuration(10)];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (void)setState:(MWMSideMenuState)state
|
||||
{
|
||||
if (_state == state)
|
||||
return;
|
||||
[self.downloadBadge hide];
|
||||
switch (state)
|
||||
{
|
||||
case MWMSideMenuStateActive:
|
||||
[Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"menu"];
|
||||
[self addDownloadBadgeToView:self.sideMenu];
|
||||
[self showMenu];
|
||||
[self.sideMenu setup];
|
||||
break;
|
||||
case MWMSideMenuStateInactive:
|
||||
[self addDownloadBadgeToView:self.menuButton];
|
||||
if (_state == MWMSideMenuStateActive)
|
||||
{
|
||||
[self.menuButton setHidden:NO animated:NO];
|
||||
[self hideMenu];
|
||||
}
|
||||
else
|
||||
{
|
||||
[self.menuButton setHidden:NO animated:YES];
|
||||
}
|
||||
break;
|
||||
case MWMSideMenuStateHidden:
|
||||
[self.menuButton setHidden:YES animated:YES];
|
||||
[self hideMenu];
|
||||
break;
|
||||
}
|
||||
_state = state;
|
||||
[self.controller updateStatusBarStyle];
|
||||
}
|
||||
|
||||
- (CGRect)menuButtonFrameWithSpacing
|
||||
{
|
||||
return self.menuButton.frameWithSpacing;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#import <Foundation/Foundation.h>
|
||||
|
||||
@protocol MWMSideMenuManagerProtocol <NSObject>
|
||||
|
||||
- (void)sideMenuDidUpdateLayout;
|
||||
- (void)actionDownloadMaps;
|
||||
|
||||
@end
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#import "MWMSideMenuDelegate.h"
|
||||
#import "MWMSideMenuDownloadBadge.h"
|
||||
|
||||
@interface MWMSideMenuView : SolidTouchView <MWMSideMenuDownloadBadgeOwner>
|
||||
|
||||
@property (weak, nonatomic, readonly) IBOutlet UIView * dimBackground;
|
||||
@property (weak, nonatomic) id<MWMSideMenuInformationDisplayProtocol> delegate;
|
||||
@property (weak, nonatomic) MWMSideMenuDownloadBadge * downloadBadge;
|
||||
|
||||
- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available")));
|
||||
- (instancetype)init __attribute__((unavailable("init is not available")));
|
||||
|
||||
- (void)setup;
|
||||
|
||||
@end
|
||||
|
|
@ -1,210 +0,0 @@
|
|||
#import "MWMMapViewControlsCommon.h"
|
||||
#import "MWMSideMenuDownloadBadge.h"
|
||||
#import "MWMSideMenuView.h"
|
||||
|
||||
@interface MWMSideMenuView()
|
||||
|
||||
@property (weak, nonatomic, readwrite) IBOutlet UIView * dimBackground;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UIButton * bookmarksButton;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * downloadMapsButton;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * settingsButton;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * shareLocationButton;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * searchButton;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UIButton * bookmarksLabel;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * downloadMapsLabel;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * settingsLabel;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * shareLocationLabel;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * searchLabel;
|
||||
|
||||
@property (nonatomic) NSArray * buttons;
|
||||
@property (nonatomic) NSArray * labels;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMSideMenuView
|
||||
|
||||
- (instancetype)initWithCoder:(NSCoder *)aDecoder
|
||||
{
|
||||
self = [super initWithCoder:aDecoder];
|
||||
if (!self)
|
||||
return nil;
|
||||
self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)awakeFromNib
|
||||
{
|
||||
[super awakeFromNib];
|
||||
self.buttons = @[self.shareLocationButton, self.settingsButton, self.downloadMapsButton, self.bookmarksButton, self.searchButton];
|
||||
self.labels = @[self.shareLocationLabel, self.settingsLabel, self.downloadMapsLabel, self.bookmarksLabel, self.searchLabel];
|
||||
}
|
||||
|
||||
- (void)setup
|
||||
{
|
||||
self.contentScaleFactor = self.superview.contentScaleFactor;
|
||||
self.frame = self.superview.bounds;
|
||||
self.alpha = 1.0;
|
||||
UIImageView const * const animationIV = self.searchButton.imageView;
|
||||
NSString const * const imageName = @"btn_green_menu_";
|
||||
static NSUInteger const animationImagesCount = 4;
|
||||
NSMutableArray * const animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
|
||||
for (NSUInteger i = 0; i < animationImagesCount; ++i)
|
||||
animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@", imageName, @(i+1)]];
|
||||
animationIV.animationImages = animationImages;
|
||||
animationIV.animationDuration = framesDuration(animationIV.animationImages.count);
|
||||
animationIV.animationRepeatCount = 1;
|
||||
[animationIV startAnimating];
|
||||
[self updateMenuBackground];
|
||||
[self showAnimation];
|
||||
[self setNeedsLayout];
|
||||
}
|
||||
|
||||
- (CGFloat)offsetBetweenButtons
|
||||
{
|
||||
CGFloat offset = 66.0;
|
||||
CGFloat const menuWidth = self.size.width;
|
||||
CGFloat const menuHeight = self.size.height;
|
||||
if (menuWidth > menuHeight)
|
||||
{
|
||||
CGFloat const topOffset = 10.;
|
||||
NSUInteger const buttonsCount = self.buttons.count;
|
||||
CGFloat const buttonHeight = self.searchButton.height;
|
||||
CGFloat const buttonCenterOffsetToBounds = 0.5 * buttonHeight + 2.0 * kViewControlsOffsetToBounds;
|
||||
offset = MIN(offset, (menuHeight - topOffset - 2.0 * (buttonCenterOffsetToBounds - 0.5 * buttonHeight) - buttonsCount*buttonHeight) / (buttonsCount - 1) + buttonHeight);
|
||||
}
|
||||
return offset;
|
||||
}
|
||||
|
||||
- (void)layoutSubviews
|
||||
{
|
||||
[super layoutSubviews];
|
||||
self.frame = self.superview.frame;
|
||||
self.dimBackground.frame = self.frame;
|
||||
|
||||
CGSize const boundsSize = self.size;
|
||||
CGFloat const offsetBetweenButtons = [self offsetBetweenButtons];
|
||||
CGFloat const offsetLabelToButton = 10.0;
|
||||
CGFloat const buttonCenterOffsetToBounds = 0.5 * self.searchButton.height + 2.0 * kViewControlsOffsetToBounds;
|
||||
CGPoint buttonCenter = CGPointMake(boundsSize.width - buttonCenterOffsetToBounds, boundsSize.height - buttonCenterOffsetToBounds);
|
||||
|
||||
self.searchButton.center = buttonCenter;
|
||||
buttonCenter.y -= offsetBetweenButtons;
|
||||
self.bookmarksButton.center = buttonCenter;
|
||||
buttonCenter.y -= offsetBetweenButtons;
|
||||
self.downloadMapsButton.center = buttonCenter;
|
||||
buttonCenter.y -= offsetBetweenButtons;
|
||||
self.settingsButton.center = buttonCenter;
|
||||
buttonCenter.y -= offsetBetweenButtons;
|
||||
self.shareLocationButton.center = buttonCenter;
|
||||
|
||||
self.searchLabel.height = self.searchButton.height;
|
||||
self.bookmarksLabel.height = self.bookmarksButton.height;
|
||||
self.downloadMapsLabel.height = self.downloadMapsButton.height;
|
||||
self.settingsLabel.height = self.settingsButton.height;
|
||||
self.shareLocationLabel.height = self.shareLocationButton.height;
|
||||
|
||||
[self.shareLocationLabel sizeToFit];
|
||||
[self.settingsLabel sizeToFit];
|
||||
[self.downloadMapsLabel sizeToFit];
|
||||
[self.bookmarksLabel sizeToFit];
|
||||
[self.searchLabel sizeToFit];
|
||||
|
||||
CGFloat const labelWidth = 0.5 * boundsSize.width;
|
||||
self.shareLocationLabel.width = MIN(labelWidth, self.shareLocationLabel.width);
|
||||
self.settingsLabel.width = MIN(labelWidth, self.settingsLabel.width);
|
||||
self.downloadMapsLabel.width = MIN(labelWidth, self.downloadMapsLabel.width);
|
||||
self.bookmarksLabel.width = MIN(labelWidth, self.bookmarksLabel.width);
|
||||
|
||||
self.searchLabel.midY = self.searchButton.midY;
|
||||
self.bookmarksLabel.midY = self.bookmarksButton.midY;
|
||||
self.downloadMapsLabel.midY = self.downloadMapsButton.midY;
|
||||
self.settingsLabel.midY = self.settingsButton.midY;
|
||||
self.shareLocationLabel.midY = self.shareLocationButton.midY;
|
||||
|
||||
CGFloat const rightBound = self.shareLocationButton.minX - offsetLabelToButton;
|
||||
self.shareLocationLabel.maxX = rightBound;
|
||||
self.settingsLabel.maxX = rightBound;
|
||||
self.downloadMapsLabel.maxX = rightBound;
|
||||
self.bookmarksLabel.maxX = rightBound;
|
||||
self.searchLabel.maxX = rightBound;
|
||||
|
||||
m2::PointD const pivot(self.searchButton.minX * self.contentScaleFactor - 2.0 * kViewControlsOffsetToBounds, self.searchButton.maxY * self.contentScaleFactor - kViewControlsOffsetToBounds);
|
||||
[self.delegate setRulerPivot:pivot];
|
||||
[self.delegate setCopyrightLabelPivot:pivot];
|
||||
}
|
||||
|
||||
#pragma mark - Animations
|
||||
|
||||
- (void)updateMenuBackground
|
||||
{
|
||||
self.dimBackground.hidden = NO;
|
||||
self.dimBackground.alpha = 0.0;
|
||||
[UIView animateWithDuration:framesDuration(2) animations:^
|
||||
{
|
||||
self.dimBackground.alpha = 0.8;
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)showAnimation
|
||||
{
|
||||
[self.labels enumerateObjectsUsingBlock:^(UIButton * label, NSUInteger idx, BOOL * stop)
|
||||
{
|
||||
label.alpha = 0.0;
|
||||
}];
|
||||
|
||||
[self.buttons enumerateObjectsUsingBlock:^(UIButton * button, NSUInteger idx, BOOL * stop)
|
||||
{
|
||||
button.alpha = 0.0;
|
||||
}];
|
||||
[self showAnimationStepWithLabels:[self.labels mutableCopy] buttons:[self.buttons mutableCopy]];
|
||||
}
|
||||
|
||||
- (void)showAnimationStepWithLabels:(NSMutableArray *)labels buttons:(NSMutableArray *)buttons
|
||||
{
|
||||
if (buttons.count == 0 || labels.count == 0)
|
||||
return;
|
||||
|
||||
UIButton const * const label = [labels lastObject];
|
||||
[labels removeLastObject];
|
||||
label.alpha = 1.0;
|
||||
|
||||
UIButton const * const button = [buttons lastObject];
|
||||
[buttons removeLastObject];
|
||||
button.alpha = 1.0;
|
||||
|
||||
[CATransaction begin];
|
||||
[CATransaction setAnimationDuration:framesDuration(1.0)];
|
||||
[CATransaction setCompletionBlock:^
|
||||
{
|
||||
[self showAnimationStepWithLabels:labels buttons:buttons];
|
||||
}];
|
||||
CFTimeInterval const beginTime = CACurrentMediaTime();
|
||||
CABasicAnimation * alphaAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
|
||||
alphaAnimation.beginTime = beginTime;
|
||||
alphaAnimation.fromValue = @0.0;
|
||||
alphaAnimation.toValue = @1.0;
|
||||
[label.layer addAnimation:alphaAnimation forKey:@"alphaAnimation"];
|
||||
|
||||
if (![button isEqual:self.searchButton])
|
||||
{
|
||||
CABasicAnimation * translationAnimation = [CABasicAnimation animationWithKeyPath:@"transform.translation.y"];
|
||||
translationAnimation.beginTime = beginTime;
|
||||
translationAnimation.fromValue = @([self offsetBetweenButtons]);
|
||||
translationAnimation.toValue = @0.0;
|
||||
[button.layer addAnimation:translationAnimation forKey:@"translationAnimation"];
|
||||
}
|
||||
[CATransaction commit];
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (void)setDownloadBadge:(MWMSideMenuDownloadBadge *)downloadBadge
|
||||
{
|
||||
_downloadBadge = downloadBadge;
|
||||
if (![downloadBadge.superview isEqual:self.downloadMapsButton])
|
||||
[self.downloadMapsButton addSubview:downloadBadge];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,261 +0,0 @@
|
|||
<?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">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMSideMenuManager">
|
||||
<connections>
|
||||
<outlet property="downloadBadge" destination="ap1-Ml-Dfy" id="bpF-Z1-YAt"/>
|
||||
<outlet property="menuButton" destination="Mu5-FL-O9o" id="rNf-Pw-Kqq"/>
|
||||
<outlet property="shareLocationButton" destination="U6a-I5-v5p" id="TpK-KH-1cA"/>
|
||||
<outlet property="sideMenu" destination="i5M-Pr-FkT" id="p49-Bn-Hkx"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT" customClass="MWMSideMenuView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<view alpha="0.80000000000000004" contentMode="scaleToFill" id="4iS-Dh-FAa" userLabel="DimBackground">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="wordWrap" id="vKQ-Xm-fC0" userLabel="Share Label">
|
||||
<rect key="frame" x="8" y="248" width="240" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" title="Share Location">
|
||||
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="share_my_location"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="titleLabel.numberOfLines">
|
||||
<integer key="value" value="0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="menuActionShareLocation" destination="-1" eventType="touchUpInside" id="EPD-lw-MI7"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="U6a-I5-v5p" userLabel="Share">
|
||||
<rect key="frame" x="256" y="248" width="56" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" image="btn_green_share">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="highlighted" image="btn_green_share_pressed"/>
|
||||
<connections>
|
||||
<action selector="menuActionShareLocation" destination="-1" eventType="touchUpInside" id="87x-er-hhP"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="wordWrap" id="pUg-T0-gDk" userLabel="Settings Label">
|
||||
<rect key="frame" x="8" y="312" width="240" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" title="Settings">
|
||||
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="settings"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="titleLabel.numberOfLines">
|
||||
<integer key="value" value="0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="menuActionOpenSettings" destination="-1" eventType="touchUpInside" id="Ufq-ga-qXm"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="78h-K2-K78" userLabel="Settings">
|
||||
<rect key="frame" x="256" y="312" width="56" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" image="btn_green_settings">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="highlighted" image="btn_green_settings_pressed"/>
|
||||
<connections>
|
||||
<action selector="menuActionOpenSettings" destination="-1" eventType="touchUpInside" id="kgP-17-hux"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="wordWrap" id="joI-Q5-Iyo" userLabel="Download Label">
|
||||
<rect key="frame" x="8" y="376" width="240" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" title="Download Maps">
|
||||
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="download_maps"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="titleLabel.numberOfLines">
|
||||
<integer key="value" value="0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="menuActionDownloadMaps" destination="-1" eventType="touchUpInside" id="TLT-ce-6yF"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="pLL-6e-i3i" userLabel="Download">
|
||||
<rect key="frame" x="256" y="376" width="56" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" image="btn_green_download">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="highlighted" image="btn_green_download_pressed"/>
|
||||
<connections>
|
||||
<action selector="menuActionDownloadMaps" destination="-1" eventType="touchUpInside" id="mRz-aq-RBf"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="wordWrap" id="mWD-fB-THv" userLabel="Bookmarks Label">
|
||||
<rect key="frame" x="8" y="440" width="240" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" title="Bookmarks">
|
||||
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="bookmarks"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="titleLabel.numberOfLines">
|
||||
<integer key="value" value="0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="menuActionOpenBookmarks" destination="-1" eventType="touchUpInside" id="Qch-Bf-Cpx"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="ZEc-sk-zsN" userLabel="Bookmarks">
|
||||
<rect key="frame" x="256" y="440" width="56" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" image="btn_green_bookmarks">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="highlighted" image="btn_green_bookmarks_pressed"/>
|
||||
<connections>
|
||||
<action selector="menuActionOpenBookmarks" destination="-1" eventType="touchUpInside" id="R4f-dp-nOX"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="wordWrap" id="06v-Es-Du1" userLabel="Search Label">
|
||||
<rect key="frame" x="8" y="504" width="240" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" title="Search">
|
||||
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="menu_search"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="titleLabel.numberOfLines">
|
||||
<integer key="value" value="0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="menuActionOpenSearch" destination="-1" eventType="touchUpInside" id="hJu-NG-VJR"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="rpT-xg-5E2" userLabel="Search">
|
||||
<rect key="frame" x="256" y="504" width="56" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" image="btn_green_search">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<state key="highlighted" image="btn_green_search_pressed"/>
|
||||
<connections>
|
||||
<action selector="menuActionOpenSearch" destination="-1" eventType="touchUpInside" id="AQD-SE-Ikf"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<nil key="simulatedTopBarMetrics"/>
|
||||
<nil key="simulatedBottomBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="bookmarksButton" destination="ZEc-sk-zsN" id="KjM-Yb-Jus"/>
|
||||
<outlet property="bookmarksLabel" destination="mWD-fB-THv" id="gIu-lT-I05"/>
|
||||
<outlet property="dimBackground" destination="4iS-Dh-FAa" id="ww7-Md-QuY"/>
|
||||
<outlet property="downloadMapsButton" destination="pLL-6e-i3i" id="Wd7-aB-nMt"/>
|
||||
<outlet property="downloadMapsLabel" destination="joI-Q5-Iyo" id="hzF-K0-klD"/>
|
||||
<outlet property="searchButton" destination="rpT-xg-5E2" id="uAa-2k-Vdf"/>
|
||||
<outlet property="searchLabel" destination="06v-Es-Du1" id="KEx-ZM-6Er"/>
|
||||
<outlet property="settingsButton" destination="78h-K2-K78" id="zBJ-iH-06h"/>
|
||||
<outlet property="settingsLabel" destination="pUg-T0-gDk" id="cHU-te-fCy"/>
|
||||
<outlet property="shareLocationButton" destination="U6a-I5-v5p" id="Rak-JL-2M7"/>
|
||||
<outlet property="shareLocationLabel" destination="vKQ-Xm-fC0" id="Rrl-IA-sCp"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="301" y="305"/>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" id="ap1-Ml-Dfy" userLabel="Download Badge" customClass="MWMSideMenuDownloadBadge">
|
||||
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_counter" id="AIs-PS-5d2" userLabel="Background">
|
||||
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="99" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yPG-HI-11x" userLabel="Download Count">
|
||||
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="badgeBackground" destination="AIs-PS-5d2" id="n7J-su-7r7"/>
|
||||
<outlet property="downloadCount" destination="yPG-HI-11x" id="fr5-Z4-OWh"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="81" y="467"/>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" id="Mu5-FL-O9o" customClass="MWMSideMenuButton">
|
||||
<rect key="frame" x="0.0" y="0.0" width="56" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="btn_green_menu_1" highlightedImage="btn_green_menu_pressed" id="FPt-Vy-4Lm" userLabel="buttonImage">
|
||||
<rect key="frame" x="0.0" y="0.0" width="56" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="buttonImage" destination="FPt-Vy-4Lm" id="etF-R1-wPc"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="65" y="561"/>
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="btn_green_bookmarks" width="56" height="56"/>
|
||||
<image name="btn_green_bookmarks_pressed" width="56" height="56"/>
|
||||
<image name="btn_green_download" width="56" height="56"/>
|
||||
<image name="btn_green_download_pressed" width="56" height="56"/>
|
||||
<image name="btn_green_menu_1" width="56" height="56"/>
|
||||
<image name="btn_green_menu_pressed" width="56" height="56"/>
|
||||
<image name="btn_green_search" width="56" height="56"/>
|
||||
<image name="btn_green_search_pressed" width="56" height="56"/>
|
||||
<image name="btn_green_settings" width="56" height="56"/>
|
||||
<image name="btn_green_settings_pressed" width="56" height="56"/>
|
||||
<image name="btn_green_share" width="56" height="56"/>
|
||||
<image name="btn_green_share_pressed" width="56" height="56"/>
|
||||
<image name="img_counter" width="24" height="24"/>
|
||||
</resources>
|
||||
<simulatedMetricsContainer key="defaultSimulatedMetrics">
|
||||
<simulatedStatusBarMetrics key="statusBar"/>
|
||||
<simulatedOrientationMetrics key="orientation"/>
|
||||
<simulatedScreenMetrics key="destination" type="retina4"/>
|
||||
</simulatedMetricsContainer>
|
||||
</document>
|
||||
|
|
@ -20,7 +20,6 @@
|
|||
341522BF1B666A550077AA8F /* MWMAPIBarView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 341522BE1B666A550077AA8F /* MWMAPIBarView.mm */; };
|
||||
341C2A571B72092A00AD41A1 /* 02_droidsans-fallback.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */; };
|
||||
341C2A5B1B720B8A00AD41A1 /* MWMAPIBarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */; };
|
||||
3428BC131B55477E00C85B30 /* MWMSideMenuDownloadBadge.m in Sources */ = {isa = PBXBuildFile; fileRef = 3428BC121B55477E00C85B30 /* MWMSideMenuDownloadBadge.m */; };
|
||||
342AD76F1B53D30C00E0B997 /* UIButton+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 342AD76E1B53D30C00E0B997 /* UIButton+RuntimeAttributes.m */; };
|
||||
342AD7721B53D32F00E0B997 /* UIView+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 342AD7711B53D32F00E0B997 /* UIView+RuntimeAttributes.m */; };
|
||||
3438CDF41B85F1170051AA78 /* MWMConsole.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3438CDF31B85F1170051AA78 /* MWMConsole.mm */; };
|
||||
|
|
@ -94,14 +93,7 @@
|
|||
34BAB6E91BB2DA0C00DB941B /* MWMBottomMenuLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BAB6E81BB2DA0C00DB941B /* MWMBottomMenuLayout.mm */; settings = {ASSET_TAGS = (); }; };
|
||||
34BAB6ED1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BAB6EB1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewCell.mm */; settings = {ASSET_TAGS = (); }; };
|
||||
34BAB6EE1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BAB6EC1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewPortraitCell.xib */; settings = {ASSET_TAGS = (); }; };
|
||||
34BC72211B0DECAE0012A34B /* MWMLocationButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC720C1B0DECAE0012A34B /* MWMLocationButton.mm */; };
|
||||
34BC72221B0DECAE0012A34B /* MWMLocationButtonView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC720E1B0DECAE0012A34B /* MWMLocationButtonView.mm */; };
|
||||
34BC72231B0DECAE0012A34B /* MWMLocationButton.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BC720F1B0DECAE0012A34B /* MWMLocationButton.xib */; };
|
||||
34BC72241B0DECAE0012A34B /* MWMMapViewControlsManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */; };
|
||||
34BC72251B0DECAE0012A34B /* MWMSideMenuButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72151B0DECAE0012A34B /* MWMSideMenuButton.mm */; };
|
||||
34BC72261B0DECAE0012A34B /* MWMSideMenuManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72171B0DECAE0012A34B /* MWMSideMenuManager.mm */; };
|
||||
34BC72271B0DECAE0012A34B /* MWMSideMenuView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72191B0DECAE0012A34B /* MWMSideMenuView.mm */; };
|
||||
34BC72281B0DECAE0012A34B /* MWMSideMenuViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BC721A1B0DECAE0012A34B /* MWMSideMenuViews.xib */; };
|
||||
34BC72291B0DECAE0012A34B /* MWMZoomButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC721D1B0DECAE0012A34B /* MWMZoomButtons.mm */; };
|
||||
34BC722A1B0DECAE0012A34B /* MWMZoomButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BC721F1B0DECAE0012A34B /* MWMZoomButtonsView.m */; };
|
||||
34BC722B1B0DECAE0012A34B /* MWMZoomButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BC72201B0DECAE0012A34B /* MWMZoomButtonsView.xib */; };
|
||||
|
|
@ -387,6 +379,7 @@
|
|||
288765070DF74369002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
|
||||
28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
|
||||
29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.mm; sourceTree = "<group>"; };
|
||||
340537621BBED98600D452C6 /* MWMMapViewControlsCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MWMMapViewControlsCommon.h; path = APIBar/MWMMapViewControlsCommon.h; sourceTree = "<group>"; };
|
||||
340837111B7243CE00B5C185 /* MWMActivityViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMActivityViewController.h; sourceTree = "<group>"; };
|
||||
340837121B7243CE00B5C185 /* MWMActivityViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMActivityViewController.m; sourceTree = "<group>"; };
|
||||
340837141B72451A00B5C185 /* MWMShareLocationActivityItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMShareLocationActivityItem.h; sourceTree = "<group>"; };
|
||||
|
|
@ -397,12 +390,9 @@
|
|||
340E10621B949D1900D975D5 /* MWMSearchBookmarksManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchBookmarksManager.mm; sourceTree = "<group>"; };
|
||||
340F24611B14910500F874CD /* RouteState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RouteState.h; sourceTree = "<group>"; };
|
||||
340F24621B14910500F874CD /* RouteState.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RouteState.mm; sourceTree = "<group>"; };
|
||||
340F24641B15F01D00F874CD /* MWMSideMenuDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuDelegate.h; sourceTree = "<group>"; };
|
||||
341522BD1B666A550077AA8F /* MWMAPIBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAPIBarView.h; sourceTree = "<group>"; };
|
||||
341522BE1B666A550077AA8F /* MWMAPIBarView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAPIBarView.mm; sourceTree = "<group>"; };
|
||||
341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAPIBarView.xib; sourceTree = "<group>"; };
|
||||
3428BC111B55477E00C85B30 /* MWMSideMenuDownloadBadge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuDownloadBadge.h; sourceTree = "<group>"; };
|
||||
3428BC121B55477E00C85B30 /* MWMSideMenuDownloadBadge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSideMenuDownloadBadge.m; sourceTree = "<group>"; };
|
||||
342AD76D1B53D30C00E0B997 /* UIButton+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+RuntimeAttributes.h"; sourceTree = "<group>"; };
|
||||
342AD76E1B53D30C00E0B997 /* UIButton+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+RuntimeAttributes.m"; sourceTree = "<group>"; };
|
||||
342AD7701B53D32F00E0B997 /* UIView+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+RuntimeAttributes.h"; sourceTree = "<group>"; };
|
||||
|
|
@ -518,21 +508,8 @@
|
|||
34BAB6EA1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuCollectionViewCell.h; sourceTree = "<group>"; };
|
||||
34BAB6EB1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBottomMenuCollectionViewCell.mm; sourceTree = "<group>"; };
|
||||
34BAB6EC1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewPortraitCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBottomMenuCollectionViewPortraitCell.xib; sourceTree = "<group>"; };
|
||||
34BC720B1B0DECAE0012A34B /* MWMLocationButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationButton.h; sourceTree = "<group>"; };
|
||||
34BC720C1B0DECAE0012A34B /* MWMLocationButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMLocationButton.mm; sourceTree = "<group>"; };
|
||||
34BC720D1B0DECAE0012A34B /* MWMLocationButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationButtonView.h; sourceTree = "<group>"; };
|
||||
34BC720E1B0DECAE0012A34B /* MWMLocationButtonView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMLocationButtonView.mm; sourceTree = "<group>"; };
|
||||
34BC720F1B0DECAE0012A34B /* MWMLocationButton.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMLocationButton.xib; sourceTree = "<group>"; };
|
||||
34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapViewControlsManager.h; sourceTree = "<group>"; };
|
||||
34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapViewControlsManager.mm; sourceTree = "<group>"; };
|
||||
34BC72131B0DECAE0012A34B /* MWMMapViewControlsCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapViewControlsCommon.h; sourceTree = "<group>"; };
|
||||
34BC72141B0DECAE0012A34B /* MWMSideMenuButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuButton.h; sourceTree = "<group>"; };
|
||||
34BC72151B0DECAE0012A34B /* MWMSideMenuButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideMenuButton.mm; sourceTree = "<group>"; };
|
||||
34BC72161B0DECAE0012A34B /* MWMSideMenuManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuManager.h; sourceTree = "<group>"; };
|
||||
34BC72171B0DECAE0012A34B /* MWMSideMenuManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideMenuManager.mm; sourceTree = "<group>"; };
|
||||
34BC72181B0DECAE0012A34B /* MWMSideMenuView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuView.h; sourceTree = "<group>"; };
|
||||
34BC72191B0DECAE0012A34B /* MWMSideMenuView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideMenuView.mm; sourceTree = "<group>"; };
|
||||
34BC721A1B0DECAE0012A34B /* MWMSideMenuViews.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSideMenuViews.xib; sourceTree = "<group>"; };
|
||||
34BC721C1B0DECAE0012A34B /* MWMZoomButtons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMZoomButtons.h; sourceTree = "<group>"; };
|
||||
34BC721D1B0DECAE0012A34B /* MWMZoomButtons.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMZoomButtons.mm; sourceTree = "<group>"; };
|
||||
34BC721E1B0DECAE0012A34B /* MWMZoomButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMZoomButtonsView.h; sourceTree = "<group>"; };
|
||||
|
|
@ -551,7 +528,6 @@
|
|||
34CFFE8C1B7DE71C009D0C9F /* MWMSearchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchView.xib; sourceTree = "<group>"; };
|
||||
34CFFE8E1B7DE83D009D0C9F /* MWMSearchView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchView.h; sourceTree = "<group>"; };
|
||||
34CFFE8F1B7DE83D009D0C9F /* MWMSearchView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchView.mm; sourceTree = "<group>"; };
|
||||
34D56DDE1B3C310A00DFF4CC /* MWMSideMenuButtonDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuButtonDelegate.h; sourceTree = "<group>"; };
|
||||
34DF4D0F1AE77B9F0012702D /* MWMWKInterfaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWKInterfaceController.h; sourceTree = "<group>"; };
|
||||
34DF4D101AE77B9F0012702D /* MWMWKInterfaceController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWKInterfaceController.mm; sourceTree = "<group>"; };
|
||||
34F45E8C1B96E88100AC93F8 /* MWMSearchTabButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabButtonsView.h; sourceTree = "<group>"; };
|
||||
|
|
@ -794,7 +770,6 @@
|
|||
F6BD33831B6240F200F2CE18 /* MWMNavigationView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationView.mm; sourceTree = "<group>"; };
|
||||
F6BD33851B62412E00F2CE18 /* MWMNavigationDashboardEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardEntity.h; sourceTree = "<group>"; };
|
||||
F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboardEntity.mm; sourceTree = "<group>"; };
|
||||
F6BD33881B62423900F2CE18 /* MWMSideMenuManagerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuManagerDelegate.h; sourceTree = "<group>"; };
|
||||
F6C6FE1E1AD6BEA0009FDED7 /* MWMWatchLocationTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWatchLocationTracker.h; sourceTree = "<group>"; };
|
||||
F6C6FE1F1AD6BEA0009FDED7 /* MWMWatchLocationTracker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWatchLocationTracker.mm; sourceTree = "<group>"; };
|
||||
F6C9343A1AE4F94A00DDC624 /* MWMAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAnimator.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1403,11 +1378,10 @@
|
|||
children = (
|
||||
34CFFE881B7DE67F009D0C9F /* Search */,
|
||||
3465E7D51B66589900854C4D /* APIBar */,
|
||||
340537621BBED98600D452C6 /* MWMMapViewControlsCommon.h */,
|
||||
34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */,
|
||||
34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */,
|
||||
34BC720A1B0DECAE0012A34B /* LocationButton */,
|
||||
349C26AE1BB0116D0005DF2F /* BottomMenu */,
|
||||
34BC72121B0DECAE0012A34B /* SideMenu */,
|
||||
34BC721B1B0DECAE0012A34B /* ZoomButtons */,
|
||||
3497A9321B5CF8A900F51E55 /* NavigationDashboard */,
|
||||
F6F722F51AE156A000DA3DA1 /* PlacePage */,
|
||||
|
|
@ -1416,38 +1390,6 @@
|
|||
path = CustomViews/MapViewControls;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
34BC720A1B0DECAE0012A34B /* LocationButton */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
34BC720B1B0DECAE0012A34B /* MWMLocationButton.h */,
|
||||
34BC720C1B0DECAE0012A34B /* MWMLocationButton.mm */,
|
||||
34BC720F1B0DECAE0012A34B /* MWMLocationButton.xib */,
|
||||
34BC720D1B0DECAE0012A34B /* MWMLocationButtonView.h */,
|
||||
34BC720E1B0DECAE0012A34B /* MWMLocationButtonView.mm */,
|
||||
);
|
||||
path = LocationButton;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
34BC72121B0DECAE0012A34B /* SideMenu */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
34BC72131B0DECAE0012A34B /* MWMMapViewControlsCommon.h */,
|
||||
34BC72141B0DECAE0012A34B /* MWMSideMenuButton.h */,
|
||||
34BC72151B0DECAE0012A34B /* MWMSideMenuButton.mm */,
|
||||
34D56DDE1B3C310A00DFF4CC /* MWMSideMenuButtonDelegate.h */,
|
||||
F6BD33881B62423900F2CE18 /* MWMSideMenuManagerDelegate.h */,
|
||||
34BC72161B0DECAE0012A34B /* MWMSideMenuManager.h */,
|
||||
34BC72171B0DECAE0012A34B /* MWMSideMenuManager.mm */,
|
||||
34BC72181B0DECAE0012A34B /* MWMSideMenuView.h */,
|
||||
34BC72191B0DECAE0012A34B /* MWMSideMenuView.mm */,
|
||||
34BC721A1B0DECAE0012A34B /* MWMSideMenuViews.xib */,
|
||||
340F24641B15F01D00F874CD /* MWMSideMenuDelegate.h */,
|
||||
3428BC111B55477E00C85B30 /* MWMSideMenuDownloadBadge.h */,
|
||||
3428BC121B55477E00C85B30 /* MWMSideMenuDownloadBadge.m */,
|
||||
);
|
||||
path = SideMenu;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
34BC721B1B0DECAE0012A34B /* ZoomButtons */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -2348,7 +2290,6 @@
|
|||
97FC99DC19C1A2CD00C1CF98 /* resources-mdpi in Resources */,
|
||||
F63774E71B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib in Resources */,
|
||||
4A7D89C71B2EBF3B00AC843E /* resources-xhdpi_dark in Resources */,
|
||||
34BC72281B0DECAE0012A34B /* MWMSideMenuViews.xib in Resources */,
|
||||
97FC99DE19C1A2CD00C1CF98 /* resources-xhdpi in Resources */,
|
||||
97D40C0A184D031900A1D572 /* Images.xcassets in Resources */,
|
||||
F6BD337F1B62403B00F2CE18 /* MWMLandscapeRoutePreview.xib in Resources */,
|
||||
|
|
@ -2386,7 +2327,6 @@
|
|||
347FDDA11BB59B4E00871410 /* Mapsme.storyboard in Resources */,
|
||||
3438CDF91B8616760051AA78 /* MWMSearchShowOnMapCell.xib in Resources */,
|
||||
FA140657162A6288002BC1ED /* eye@2x.png in Resources */,
|
||||
34BC72231B0DECAE0012A34B /* MWMLocationButton.xib in Resources */,
|
||||
34BAB6EE1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */,
|
||||
349A358D1B53EABC009677EE /* MWMSearchDownloadMapRequest.xib in Resources */,
|
||||
4A23D15B1B8B4DD700D4EB6F /* drules_proto_clear.bin in Resources */,
|
||||
|
|
@ -2547,14 +2487,12 @@
|
|||
F6BBF2C61B4FFB72000CF8E2 /* MWMLocationAlert.mm in Sources */,
|
||||
F66A8FB01B09F268001B9C97 /* MWMPlacePage.mm in Sources */,
|
||||
EE7F29821219ECA300EB67A9 /* RenderContext.mm in Sources */,
|
||||
34BC72251B0DECAE0012A34B /* MWMSideMenuButton.mm in Sources */,
|
||||
F6ED13911B1EF96B0095C6DE /* MWMBookmarkDescriptionViewController.mm in Sources */,
|
||||
349A35851B53E967009677EE /* MWMDownloadMapRequestView.m in Sources */,
|
||||
F64F19991AB81A00006EAF7E /* MWMAlertViewController.mm in Sources */,
|
||||
FAFCB63613366E78001A5C59 /* WebViewController.mm in Sources */,
|
||||
F6FE2C0F1B03A006009814AA /* MWMPlacePageNavigationBar.mm in Sources */,
|
||||
F64A37D01B9EE24C00180464 /* MWMRouteHelperPanelsDrawer.mm in Sources */,
|
||||
34BC72221B0DECAE0012A34B /* MWMLocationButtonView.mm in Sources */,
|
||||
340F24631B14910500F874CD /* RouteState.mm in Sources */,
|
||||
F6830F111B85F6B900C42AAE /* MWMLanesPanel.mm in Sources */,
|
||||
9747264318323080006B7CB7 /* UIKitCategories.mm in Sources */,
|
||||
|
|
@ -2575,7 +2513,6 @@
|
|||
F6588E371B15D87A00EE1E58 /* MWMBookmarkColorCell.mm in Sources */,
|
||||
F6D409FA1B319BD70041730F /* ContextViews.mm in Sources */,
|
||||
349A357A1B53D4C9009677EE /* MWMCircularProgress.m in Sources */,
|
||||
3428BC131B55477E00C85B30 /* MWMSideMenuDownloadBadge.m in Sources */,
|
||||
FAA5C2A2144F135F005337F6 /* LocationManager.mm in Sources */,
|
||||
34B82ADA1B847FFC00180497 /* MWMSearchCell.mm in Sources */,
|
||||
F66A8FAC1B09F137001B9C97 /* MWMiPadPlacePage.mm in Sources */,
|
||||
|
|
@ -2623,8 +2560,6 @@
|
|||
97508423199522D300A7457D /* SettingsAndMoreVC.mm in Sources */,
|
||||
F6ED13541B1643900095C6DE /* MWMDirectionView.mm in Sources */,
|
||||
F63774EA1B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm in Sources */,
|
||||
34BC72271B0DECAE0012A34B /* MWMSideMenuView.mm in Sources */,
|
||||
34BC72211B0DECAE0012A34B /* MWMLocationButton.mm in Sources */,
|
||||
F64F19A31AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm in Sources */,
|
||||
97F61794183E7445009919E2 /* LinkCell.m in Sources */,
|
||||
34B82AD01B846B2C00180497 /* MWMSearchBookmarksCell.mm in Sources */,
|
||||
|
|
@ -2637,7 +2572,6 @@
|
|||
349A358C1B53EABC009677EE /* MWMSearchDownloadMapRequest.m in Sources */,
|
||||
F63732961AE9431E00A03764 /* MWMBasePlacePageView.mm in Sources */,
|
||||
F64F199B1AB81A00006EAF7E /* MWMAlert.mm in Sources */,
|
||||
34BC72261B0DECAE0012A34B /* MWMSideMenuManager.mm in Sources */,
|
||||
ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */,
|
||||
6C24A3B21AD7D65500A47B99 /* MWMWatchEventInfo.mm in Sources */,
|
||||
ED48BBBA17C2B1E2003E7E92 /* CircleView.mm in Sources */,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue