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

Fixed alert layout

Browse source
This commit is contained in:
VladiMihaylenko 2015-03-10 11:17:34 +03:00 • committed by Alex Zolotarev
parent 9acc46c26e
commit 3f5af422f9
17 changed files with 283 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
iphone/Maps/Categories/UIKitCategories.m
View file

@ -10,14 +10,9 @@
- (void)performAfterDelay:(NSTimeInterval)delay block:(void (^)(void))block
{
#warning Переписать
[self performSelector:@selector(fireBlockAfterDelay:) withObject:[block copy] afterDelay:delay];
}
- (void)fireBlockAfterDelay:(void (^)(void))block
{
block();
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
block();
});
}
@end

21
iphone/Maps/Classes/MWMAlertDownloaderManager.h Normal file
View file

@ -0,0 +1,21 @@
//
// MWMMapsDownloaderDelegate.h
// Maps
//
// Created by v.mikhaylenko on 07.03.15.
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "MWMAlertViewControllerDelegate.h"
#include "../../../std/vector.hpp"
#include "../../../map/country_status_display.hpp"
@interface MWMAlertDownloaderManager : NSObject <MWMAlertViewControllerDelegate>
- (instancetype)initWithMapsIndexes:(const vector<storage::TIndex>&)indexes;
@property (nonatomic, copy) NSString *countryName;
@property (nonatomic, assign) NSUInteger size;
@end

32
iphone/Maps/Classes/MWMAlertDownloaderManager.mm Normal file
View file

@ -0,0 +1,32 @@
//
// MWMMapsDownloaderDelegate.m
// Maps
//
// Created by v.mikhaylenko on 07.03.15.
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
#import "MWMAlertDownloaderManager.h"
#include "Framework.h"
@implementation MWMAlertDownloaderManager {
vector<storage::TIndex> _indexes;
}
- (instancetype)initWithMapsIndexes:(const vector<storage::TIndex> &)indexes {
self = [super init];
if (self) {
_indexes = indexes;
self.countryName = [NSString stringWithUTF8String:GetFramework().GetCountryTree().GetActiveMapLayout().GetFormatedCountryName(_indexes[0]).c_str()];
self.size = GetFramework().GetCountryTree().GetActiveMapLayout().GetCountrySize(_indexes[0], storage::TMapOptions::EMapWithCarRouting).second/(1024 * 1024);
}
return self;
}
- (void)downloadMaps {
GetFramework().GetCountryTree().GetActiveMapLayout().DownloadMap(_indexes[0], storage::TMapOptions::EMapWithCarRouting);
}
@end

12
iphone/Maps/Classes/MWMAlertEntity.h
View file

@ -7,11 +7,21 @@
//
#import <Foundation/Foundation.h>
#include "../../../std/vector.hpp"
#include "../../../map/country_status_display.hpp"
typedef NS_ENUM(NSUInteger, MWMAlertEntityType) {
MWMAlertEntityTypeDownloader
};
@interface MWMAlertEntity : NSObject
@property (nonatomic, copy) NSString *title;
@property (nonatomic, copy) NSString *message;
@property (nonatomic, copy) NSString *contry;
@property (nonatomic, copy) NSString *location;
@property (nonatomic, copy) NSString *size;
@property (nonatomic, assign) NSUInteger size;
+ (instancetype)entityWithType:(MWMAlertEntityType)type;
@end

24
iphone/Maps/Classes/MWMAlertEntity.mm
View file

@ -7,7 +7,9 @@
//
#import "MWMAlertEntity.h"
#include <string>
#include <vector>
#include "../../../map/country_status_display.hpp"
#include <iostream>
@interface MWMAlertEntity ()
@ -16,16 +18,22 @@
@implementation MWMAlertEntity
- (instancetype)initWithCallbackString:(const std::string &)string {
self = [super init];
if (self) {
[self processCallbackString:string];
+ (instancetype)entityWithType:(MWMAlertEntityType)type {
MWMAlertEntity *entity = [[MWMAlertEntity alloc] init];
switch (type) {
case MWMAlertEntityTypeDownloader:
[self setupEntityDownloaderAlert:entity];
break;
}
return self;
return entity;
}
- (void)processCallbackString:(const std::string &)string {
+ (void)setupEntityDownloaderAlert:(MWMAlertEntity *)entity {
entity.title = @"Download all maps along your route";
entity.message = @"Creating routes between regions is only possible when all the maps are downloaded and updates";
entity.location = @"Chammpagne";
}
@end

6
iphone/Maps/Classes/MWMAlertViewController.h
View file

@ -8,9 +8,15 @@
#import <UIKit/UIKit.h>
#import "MWMAlert.h"
@protocol MWMAlertViewControllerDelegate;
@interface MWMAlertViewController : UIViewController
@property (nonatomic, weak) id<MWMAlertViewControllerDelegate> delegate;
@property (nonatomic, weak, readonly) UIViewController *ownerViewController;
- (instancetype)initWithViewController:(UIViewController *)viewController;
- (void)presentAlertWithType:(MWMAlertType)type;
- (void)close;
@end

13
iphone/Maps/Classes/MWMAlertViewController.m → iphone/Maps/Classes/MWMAlertViewController.mm
View file

@ -9,11 +9,12 @@
#import "MWMAlertViewController.h"
#import "MWMDownloadAllMapsAlert.h"
#import "MWMAlertEntity.h"
#import "MWMAlertViewControllerDelegate.h"
static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController";
@interface MWMAlertViewController ()
@property (nonatomic, weak) UIViewController *ownerViewController;
@property (nonatomic, weak, readwrite) UIViewController *ownerViewController;
@end
@implementation MWMAlertViewController
@ -36,13 +37,9 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
- (void)presentAlertWithType:(MWMAlertType)type {
MWMAlert *alert = [MWMAlert alertWithType:type];
alert.alertController = self;
MWMAlertEntity *entity = [[MWMAlertEntity alloc] init];
entity.title = @"Download all maps";
entity.message = @"hihihihihihihihihi hihihihihi hihihihihih ihihihihihihi hihihihih ihihihihih ihihihihihihihihi hihihihihihihihi hihihihihihihi hihihihihihihi hihihihihihi hihihihihi hihihihihi hihihihihi hihihihihi";
entity.contry = @"adbsgndlkgndklsnfkldsnglfdksjnglkdfsgjn";
entity.location = @"dkjsgnkdsnjglkdsng";
entity.size = @"1000";
MWMAlertEntity *entity = [MWMAlertEntity entityWithType:MWMAlertEntityTypeDownloader];
entity.contry = self.delegate.countryName;
entity.size = self.delegate.size;
[alert configureWithEntity:entity];
[self.view addSubview:alert];
alert.center = self.view.center;

17
iphone/Maps/Classes/MWMAlertViewControllerDelegate.h Normal file
View file

@ -0,0 +1,17 @@
//
// MWMAlertViewControllerDelegate.h
// Maps
//
// Created by v.mikhaylenko on 07.03.15.
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
#import <Foundation/Foundation.h>
@protocol MWMAlertViewControllerDelegate <NSObject>
@required
- (void)downloadMaps;
@property (nonatomic, copy) NSString *countryName;
@property (nonatomic, assign) NSUInteger size;
@end

10
iphone/Maps/Classes/MWMDownloadAllMapsAlert.m → iphone/Maps/Classes/MWMDownloadAllMapsAlert.mm
View file

@ -10,6 +10,8 @@
#import "MWMAlertViewController.h"
#import "MWMAlertEntity.h"
#import "UIKitCategories.h"
#import "MWMAlertViewControllerDelegate.h"
#import "ActiveMapsVC.h"
@interface MWMDownloadAllMapsAlert ()
@property (nonatomic, weak) IBOutlet UILabel *titleLabel;
@ -34,7 +36,7 @@
- (void)configureWithEntity:(MWMAlertEntity *)entity {
self.titleLabel.text = entity.title;
self.messageLabel.text = entity.message;
self.sizeLabel.text = entity.size;
self.sizeLabel.text = [NSString stringWithFormat:@"%@ MB",@(entity.size)];
self.locationLabel.text = entity.location;
self.countryLabel.text = entity.contry;
[self configureViewSize];
@ -52,7 +54,7 @@
- (void)configureSpecsViewSize {
const CGFloat topSpecsViewOffset = 12.;
const CGFloat bottonSpecsViewOffset = 10.;
const CGFloat middleSpecsViewOffset = 15.;
const CGFloat middleSpecsViewOffset = 10.;
const CGFloat specsViewHeight = topSpecsViewOffset + bottonSpecsViewOffset + middleSpecsViewOffset + self.countryLabel.frame.size.height + self.locationLabel.frame.size.height;
[self.specsView setHeight:specsViewHeight];
[self.locationLabel setMinY:topSpecsViewOffset];
@ -79,7 +81,11 @@
}
- (IBAction)downloadButtonTap:(id)sender {
[self.alertController.delegate downloadMaps];
[self.alertController close];
ActiveMapsVC *activeMapsViewController = [[ActiveMapsVC alloc] init];
[self.alertController.ownerViewController.navigationController pushViewController:activeMapsViewController animated:YES];
}
@end

15
iphone/Maps/Classes/MWMDownloaderController.h Normal file
View file

@ -0,0 +1,15 @@
//
// MWMDownloaderController.h
// Maps
//
// Created by v.mikhaylenko on 07.03.15.
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface MWMDownloaderController : UIViewController
- (instancetype)initWithViewController:(UIViewController *)viewController;
- (void)present;
- (void)close;
@end

33
iphone/Maps/Classes/MWMDownloaderController.m Normal file
View file

@ -0,0 +1,33 @@
//
// MWMDownloaderController.m
// Maps
//
// Created by v.mikhaylenko on 07.03.15.
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
#import "MWMDownloaderController.h"
@interface MWMDownloaderController ()
@property (nonatomic, weak) UIViewController *ownerViewController;
@end
@implementation MWMDownloaderController
- (instancetype)initWithViewController:(UIViewController *)viewController {
self = [super init];
if (self) {
self.ownerViewController = viewController;
}
return self;
}
- (void)present {
}
- (void)close {
}
@end

39
iphone/Maps/Classes/MWMDownloaderViewController.xib Normal file
View file

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMDownloaderController"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="280" height="63"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Champagne-Ardenne" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="b5C-OX-5oq">
<rect key="frame" x="23" y="12" width="167" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.81999999999999995" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="France" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9KB-Ag-7S5">
<rect key="frame" x="23" y="33" width="232" height="15"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.52000000000000002" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="343" y="277"/>
</view>
</objects>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>

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

@ -16,6 +16,7 @@
#import "CountryTreeVC.h"
#import "Reachability.h"
#import "MWMAlertViewController.h"
#import "MWMAlertDownloaderManager.h"
#import "../../Common/CustomAlertView.h"
@ -80,6 +81,7 @@
@property (nonatomic) ContainerView * containerView;
@property (nonatomic) UIImageView * apiBar;
@property (nonatomic) UILabel * apiTitleLabel;
@property (nonatomic, strong) MWMAlertDownloaderManager *downloaderManager;
@end
@ -149,7 +151,7 @@
if (res.IsValid())
{
NSMutableDictionary *routeInfo = [NSMutableDictionary new];
NSMutableDictionary *routeInfo = [NSMutableDictionary dictionary];
routeInfo[@"timeToTarget"] = @(res.m_time);
routeInfo[@"targetDistance"] = [NSString stringWithUTF8String:res.m_distToTarget.c_str()];
routeInfo[@"targetMetrics"] = [NSString stringWithUTF8String:res.m_targetUnitsSuffix.c_str()];
@ -740,39 +742,41 @@
f.SetRouteBuildingListener([self, &f](routing::IRouter::ResultCode code, vector<storage::TIndex> const & absentCountries)
{
[self.containerView.placePage showBuildingRoutingActivity:NO];
if (code == routing::IRouter::ResultCode::NoError)
{
f.GetBalloonManager().RemovePin();
f.GetBalloonManager().Dismiss();
[self.containerView.placePage setState:PlacePageStateHidden animated:YES withCallback:YES];
[self.searchView setState:SearchViewStateHidden animated:YES withCallback:YES];
[self performAfterDelay:0.3 block:^{
[self.routeView setState:RouteViewStateInfo animated:YES];
[self updateRoutingInfo];
}];
bool isDisclaimerApproved = false;
(void)Settings::Get("IsDisclaimerApproved", isDisclaimerApproved);
if (!isDisclaimerApproved)
{
NSString * title;
NSString * message;
if (SYSTEM_VERSION_IS_LESS_THAN(@"7.0"))
message = L(@"routing_disclaimer");
else
title = L(@"routing_disclaimer");
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:title message:message delegate:self cancelButtonTitle:L(@"cancel") otherButtonTitles:L(@"ok"), nil];
alert.tag = ALERT_VIEW_ROUTING_DISCLAIMER;
[alert show];
switch (code) {
case routing::IRouter::ResultCode::NoError: {
f.GetBalloonManager().RemovePin();
f.GetBalloonManager().Dismiss();
[self.containerView.placePage setState:PlacePageStateHidden animated:YES withCallback:YES];
[self.searchView setState:SearchViewStateHidden animated:YES withCallback:YES];
[self performAfterDelay:0.3 block:^{
[self.routeView setState:RouteViewStateInfo animated:YES];
[self updateRoutingInfo];
}];
bool isDisclaimerApproved = false;
(void)Settings::Get("IsDisclaimerApproved", isDisclaimerApproved);
if (!isDisclaimerApproved)
{
NSString * title;
NSString * message;
if (SYSTEM_VERSION_IS_LESS_THAN(@"7.0"))
message = L(@"routing_disclaimer");
else
title = L(@"routing_disclaimer");
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:title message:message delegate:self cancelButtonTitle:L(@"cancel") otherButtonTitles:L(@"ok"), nil];
alert.tag = ALERT_VIEW_ROUTING_DISCLAIMER;
[alert show];
}
break;
}
}
else
{
// TODO
// if (openDownloader)
// [self showDownloaderDialogWithMessageID:message];
// else
// [self showDialogWithMessageID:message];
case routing::IRouter::ResultCode::RouteFileNotExist: {
[self showDownloaderDialogWithCountries:absentCountries];
break;
}
default:
break;
}
});
}
@ -800,15 +804,11 @@
[[[UIAlertView alloc] initWithTitle:[NSString stringWithUTF8String:message.c_str()] message:nil delegate:self cancelButtonTitle:L(@"ok") otherButtonTitles:nil] show];
}
- (void)showDownloaderDialogWithMessageID:(string const &)message
{
- (void)showDownloaderDialogWithCountries:(vector<storage::TIndex> const &)countries {
MWMAlertViewController *alert = [[MWMAlertViewController alloc] initWithViewController:self];
self.downloaderManager = [[MWMAlertDownloaderManager alloc] initWithMapsIndexes:countries];
alert.delegate = self.downloaderManager;
[alert presentAlertWithType:MWMAlertTypeDownloadAllMaps];
// UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:[NSString stringWithUTF8String:message.c_str()] message:nil delegate:self cancelButtonTitle:L(@"cancel") otherButtonTitles:L(@"ok"), nil];
// alertView.tag = ALERT_VIEW_DOWNLOADER;
// [alertView show];
}
#pragma mark - Getters

2
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -400,8 +400,6 @@ void InitLocalizedStrings()
[UIApplication sharedApplication].applicationIconBadgeNumber = [[notification userInfo][@"OutOfDate"] integerValue];
}
#warning Переделать
- (UIWindow *)window {
return self->m_window;
}

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

@ -117,11 +117,14 @@
EEFE7C1412F8C9E1006AF8C3 /* fonts_blacklist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */; };
EEFE7C1512F8C9E1006AF8C3 /* fonts_whitelist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */; };
F6A85A151AA9AB23003667A2 /* MWMAlertEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6A85A141AA9AB23003667A2 /* MWMAlertEntity.mm */; };
F6A85A201AAB1175003667A2 /* MWMAlertDownloaderManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6A85A1F1AAB1175003667A2 /* MWMAlertDownloaderManager.mm */; };
F6A85A241AAB44AD003667A2 /* MWMDownloaderController.m in Sources */ = {isa = PBXBuildFile; fileRef = F6A85A231AAB44AD003667A2 /* MWMDownloaderController.m */; };
F6A85A271AAB4559003667A2 /* MWMDownloaderViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6A85A261AAB4559003667A2 /* MWMDownloaderViewController.xib */; };
F6DBF9A01AA75B6D00F2EC2C /* MWMDownloadAllMapsAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6DBF99F1AA75B6D00F2EC2C /* MWMDownloadAllMapsAlert.xib */; };
F6DBF9AC1AA847ED00F2EC2C /* MWMAlertViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F6DBF9AA1AA847ED00F2EC2C /* MWMAlertViewController.m */; };
F6DBF9AC1AA847ED00F2EC2C /* MWMAlertViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6DBF9AA1AA847ED00F2EC2C /* MWMAlertViewController.mm */; };
F6DBF9AD1AA847ED00F2EC2C /* MWMAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6DBF9AB1AA847ED00F2EC2C /* MWMAlertViewController.xib */; };
F6DBF9B01AA85E3500F2EC2C /* MWMAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = F6DBF9AF1AA85E3500F2EC2C /* MWMAlert.m */; };
F6DBF9B31AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = F6DBF9B21AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.m */; };
F6DBF9B31AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6DBF9B21AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.mm */; };
F6DBF9B61AA8779300F2EC2C /* CALayer+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = F6DBF9B51AA8779300F2EC2C /* CALayer+RuntimeAttributes.m */; };
F785EB4016386FC4003A38A8 /* BookmarkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F785EB3F16386FC4003A38A8 /* BookmarkCell.mm */; };
F7B90CD31521E6D200C054EE /* CustomNavigationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F7B90CD21521E6D100C054EE /* CustomNavigationView.mm */; };
@ -372,16 +375,22 @@
EED10A4411F78D120095FAD4 /* MapViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_blacklist.txt; path = ../../data/fonts_blacklist.txt; sourceTree = "<group>"; };
EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_whitelist.txt; path = ../../data/fonts_whitelist.txt; sourceTree = "<group>"; };
F6A85A131AA9AB23003667A2 /* MWMAlertEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAlertEntity.h; sourceTree = "<group>"; };
F6A85A131AA9AB23003667A2 /* MWMAlertEntity.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = MWMAlertEntity.h; sourceTree = "<group>"; };
F6A85A141AA9AB23003667A2 /* MWMAlertEntity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAlertEntity.mm; sourceTree = "<group>"; };
F6A85A1E1AAB1175003667A2 /* MWMAlertDownloaderManager.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = MWMAlertDownloaderManager.h; sourceTree = "<group>"; };
F6A85A1F1AAB1175003667A2 /* MWMAlertDownloaderManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAlertDownloaderManager.mm; sourceTree = "<group>"; };
F6A85A211AAB1408003667A2 /* MWMAlertViewControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAlertViewControllerDelegate.h; sourceTree = "<group>"; };
F6A85A221AAB44AD003667A2 /* MWMDownloaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMDownloaderController.h; sourceTree = "<group>"; };
F6A85A231AAB44AD003667A2 /* MWMDownloaderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMDownloaderController.m; sourceTree = "<group>"; };
F6A85A261AAB4559003667A2 /* MWMDownloaderViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMDownloaderViewController.xib; sourceTree = "<group>"; };
F6DBF99F1AA75B6D00F2EC2C /* MWMDownloadAllMapsAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMDownloadAllMapsAlert.xib; sourceTree = "<group>"; };
F6DBF9A91AA847ED00F2EC2C /* MWMAlertViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAlertViewController.h; sourceTree = "<group>"; };
F6DBF9AA1AA847ED00F2EC2C /* MWMAlertViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMAlertViewController.m; sourceTree = "<group>"; };
F6DBF9AA1AA847ED00F2EC2C /* MWMAlertViewController.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = MWMAlertViewController.mm; sourceTree = "<group>"; };
F6DBF9AB1AA847ED00F2EC2C /* MWMAlertViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAlertViewController.xib; sourceTree = "<group>"; };
F6DBF9AE1AA85E3500F2EC2C /* MWMAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAlert.h; sourceTree = "<group>"; };
F6DBF9AF1AA85E3500F2EC2C /* MWMAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMAlert.m; sourceTree = "<group>"; };
F6DBF9B11AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMDownloadAllMapsAlert.h; sourceTree = "<group>"; };
F6DBF9B21AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMDownloadAllMapsAlert.m; sourceTree = "<group>"; };
F6DBF9B21AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = MWMDownloadAllMapsAlert.mm; sourceTree = "<group>"; };
F6DBF9B41AA8779300F2EC2C /* CALayer+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CALayer+RuntimeAttributes.h"; sourceTree = "<group>"; };
F6DBF9B51AA8779300F2EC2C /* CALayer+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CALayer+RuntimeAttributes.m"; sourceTree = "<group>"; };
F785EB3E16386FC4003A38A8 /* BookmarkCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BookmarkCell.h; path = Bookmarks/BookmarkCell.h; sourceTree = SOURCE_ROOT; };
@ -509,6 +518,7 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
F6A85A251AAB44BB003667A2 /* DownloaderController */,
F6DBF99E1AA75AA700F2EC2C /* Custom Alert */,
97B4E9271851DAB300BEC5D7 /* Custom Views */,
FA4135DF120A25B90062D5B4 /* Settings */,
@ -826,7 +836,7 @@
isa = PBXGroup;
children = (
F6DBF9B11AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.h */,
F6DBF9B21AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.m */,
F6DBF9B21AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.mm */,
F6DBF99F1AA75B6D00F2EC2C /* MWMDownloadAllMapsAlert.xib */,
);
name = DownloadAllMaps;
@ -841,16 +851,29 @@
name = Entity;
sourceTree = "<group>";
};
F6A85A251AAB44BB003667A2 /* DownloaderController */ = {
isa = PBXGroup;
children = (
F6A85A221AAB44AD003667A2 /* MWMDownloaderController.h */,
F6A85A231AAB44AD003667A2 /* MWMDownloaderController.m */,
F6A85A261AAB4559003667A2 /* MWMDownloaderViewController.xib */,
);
name = DownloaderController;
sourceTree = "<group>";
};
F6DBF99E1AA75AA700F2EC2C /* Custom Alert */ = {
isa = PBXGroup;
children = (
F6A85A211AAB1408003667A2 /* MWMAlertViewControllerDelegate.h */,
F6DBF9A91AA847ED00F2EC2C /* MWMAlertViewController.h */,
F6DBF9AA1AA847ED00F2EC2C /* MWMAlertViewController.m */,
F6DBF9AA1AA847ED00F2EC2C /* MWMAlertViewController.mm */,
F6DBF9AB1AA847ED00F2EC2C /* MWMAlertViewController.xib */,
F6DBF9AE1AA85E3500F2EC2C /* MWMAlert.h */,
F6DBF9AF1AA85E3500F2EC2C /* MWMAlert.m */,
F6A85A161AA9CAAD003667A2 /* DownloadAllMaps */,
F6A85A1D1AA9CCF7003667A2 /* Entity */,
F6A85A1E1AAB1175003667A2 /* MWMAlertDownloaderManager.h */,
F6A85A1F1AAB1175003667A2 /* MWMAlertDownloaderManager.mm */,
);
name = "Custom Alert";
sourceTree = "<group>";
@ -1151,6 +1174,7 @@
F7E7BA331672328F00B4492E /* police@2x.png in Resources */,
F7E7BA341672328F00B4492E /* post.png in Resources */,
F7E7BA351672328F00B4492E /* post@2x.png in Resources */,
F6A85A271AAB4559003667A2 /* MWMDownloaderViewController.xib in Resources */,
F7E7BA361672328F00B4492E /* shop.png in Resources */,
F7E7BA371672328F00B4492E /* shop@2x.png in Resources */,
F7E7BA381672328F00B4492E /* toilet.png in Resources */,
@ -1220,6 +1244,7 @@
977E26BE19E31BBE00BA2219 /* CountryTreeVC.mm in Sources */,
97A0EEFC192F3B43009B2779 /* BottomMenuCell.mm in Sources */,
97D092B9190AA69700FF645B /* SmallCompassView.mm in Sources */,
F6A85A241AAB44AD003667A2 /* MWMDownloaderController.m in Sources */,
97A8001418B2140A000C07A2 /* SearchResultCell.m in Sources */,
97F0817E19AF72590098FB0B /* BadgeView.m in Sources */,
97A8002718B2741C000C07A2 /* SearchCell.m in Sources */,
@ -1239,7 +1264,7 @@
FA36B80D15403A4F004560CC /* BookmarksVC.mm in Sources */,
A32B6D4D1A14980500E54A65 /* iosOGLContextFactory.mm in Sources */,
9769D6EF1912BF3000CA6158 /* ContainerView.mm in Sources */,
F6DBF9AC1AA847ED00F2EC2C /* MWMAlertViewController.m in Sources */,
F6DBF9AC1AA847ED00F2EC2C /* MWMAlertViewController.mm in Sources */,
FAF457E715597D4600DCCC49 /* Framework.cpp in Sources */,
97CC93BB19599F4700369B42 /* SearchSuggestCell.m in Sources */,
FA054612155C465E001F4E37 /* SelectSetVC.mm in Sources */,
@ -1253,6 +1278,7 @@
97C98522186AE3CF00AF7E9E /* AppInfo.mm in Sources */,
978F9242183B660F000D6C7C /* SelectableCell.m in Sources */,
CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */,
F6A85A201AAB1175003667A2 /* MWMAlertDownloaderManager.mm in Sources */,
978F9244183B660F000D6C7C /* SwitchCell.m in Sources */,
EDB811A3175E1A9C00E36BF2 /* TwoButtonsView.m in Sources */,
97508423199522D300A7457D /* SettingsAndMoreVC.mm in Sources */,
@ -1260,7 +1286,7 @@
9773DB8F198652E600C4A9E9 /* PlacePageBookmarkDescriptionCell.m in Sources */,
97ABBA4518C8DF620079333C /* PlacePageView.mm in Sources */,
97F61794183E7445009919E2 /* LinkCell.m in Sources */,
F6DBF9B31AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.m in Sources */,
F6DBF9B31AA8611A00F2EC2C /* MWMDownloadAllMapsAlert.mm in Sources */,
976D86EC19C8697700C920EF /* ProgressView.m in Sources */,
97D092B1190A681F00FF645B /* PlacePageInfoCell.mm in Sources */,
B0FBFA271A515AFD0086819E /* ViewController.m in Sources */,

2
map/framework.cpp
View file

@ -2141,7 +2141,7 @@ void Framework::MatchLocationToRoute(location::GpsInfo & location, location::Rou
void Framework::CallRouteBuilded(IRouter::ResultCode code, vector<storage::TIndex> const & absentFiles)
{
if (code == IRouter::Cancelled)
return;
return;
m_routingCallback(code, absentFiles);
}

2
storage/index.hpp
View file

@ -23,7 +23,7 @@ namespace storage
m_country == other.m_country &&
m_region == other.m_region);
}
bool operator!=(TIndex const & other) const
{
return !(*this == other);