diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
index cf3e401b61..6a22079826 100644
--- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
@@ -89,14 +89,13 @@
case routing::IRouter::InconsistentMWMandRoute:
return [MWMDefaultAlert routeNotFoundAlert];
case routing::IRouter::RouteFileNotExist:
+ case routing::IRouter::FileTooOld:
return [MWMDefaultAlert routeFileNotExistAlert];
case routing::IRouter::InternalError:
return [MWMDefaultAlert internalErrorAlert];
case routing::IRouter::Cancelled:
case routing::IRouter::NoError:
case routing::IRouter::NeedMoreMaps:
- //TODO (mikhaylenko, grechuhin) Make proper flag processing.
- case routing::IRouter::FileTooOld:
return nil;
}
}
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib
index 123ac1c2e1..c46389c645 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib
@@ -61,6 +61,7 @@
+
@@ -80,6 +81,7 @@
+
@@ -94,7 +96,7 @@
-
+
@@ -126,6 +128,7 @@
+
diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
index 6c859ee524..09625d9bd9 100644
--- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
@@ -356,7 +356,7 @@ static CGFloat const kMinimumOffset = 20.;
- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
{
UIView * view = [[UIView alloc] init];
- view.backgroundColor = self.missedFiles.count == 2 && section == 0 ? UIColor.blackDividers : UIColor.clearColor;
+ view.backgroundColor = self.missedFiles.count == 2 && section == 0 ? UIColor.blackDividers : [UIColor colorWithWhite:0. alpha:0.06];
return view;
}
diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib
index 91a2b5bf74..7d27145a23 100644
--- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib
@@ -49,13 +49,13 @@
-
+
-
-
+
+
@@ -83,6 +83,7 @@
+
@@ -102,6 +103,7 @@
+
@@ -116,7 +118,7 @@
-
+
@@ -150,6 +152,7 @@
+
diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib
index 0f1117101d..15a85ef61c 100644
--- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib
+++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib
@@ -23,7 +23,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib
index f11fded203..a5d6f2a046 100644
--- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib
+++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib
@@ -56,7 +56,7 @@
-
+
diff --git a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib
index fb4a988b12..e460341483 100644
--- a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib
@@ -67,6 +67,7 @@
+
@@ -86,6 +87,7 @@
+
@@ -100,7 +102,7 @@
-
+
@@ -129,6 +131,7 @@
+
diff --git a/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib b/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib
index 5a639ae884..b6c5d363c0 100644
--- a/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/FeedbackAlert/MWMFeedbackAlert.xib
@@ -97,13 +97,14 @@
+
-
+
@@ -131,6 +132,7 @@
+
diff --git a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib
index 87155e6144..eeeb6bb9e1 100644
--- a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib
@@ -80,6 +80,7 @@
+
@@ -145,7 +146,7 @@
-
+
@@ -189,6 +190,7 @@
+
diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib
index 681d2ba040..946fcc7c63 100644
--- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib
@@ -168,6 +168,7 @@
+
@@ -181,7 +182,7 @@
-
+
@@ -208,6 +209,7 @@
+
diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib
index 3e6ca62d8f..372d573f9e 100644
--- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib
@@ -72,13 +72,14 @@
+
-
+
@@ -102,6 +103,7 @@
+
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 9c6e7fa1a3..a6b4c179e0 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -745,7 +745,6 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView)
case routing::IRouter::RouteFileNotExist:
case routing::IRouter::InconsistentMWMandRoute:
case routing::IRouter::NeedMoreMaps:
- //TODO (mikhaylenko, grechuhin) Make proper flag processing.
case routing::IRouter::FileTooOld:
case routing::IRouter::RouteNotFound:
[self presentDownloaderAlert:code countries:absentCountries routes:absentRoutes];
diff --git a/iphone/Maps/UIColor+MapsMeColor.h b/iphone/Maps/UIColor+MapsMeColor.h
index cd47a2fe15..4b269c98b5 100644
--- a/iphone/Maps/UIColor+MapsMeColor.h
+++ b/iphone/Maps/UIColor+MapsMeColor.h
@@ -26,6 +26,8 @@
+ (UIColor *)whiteSecondaryText;
+ (UIColor *)whiteHintText;
+ (UIColor *)whiteDividers;
++ (UIColor *)buttonBlueText;
++ (UIColor *)alertBackground;
+ (UIColor *)colorWithName:(NSString *)colorName;
diff --git a/iphone/Maps/UIColor+MapsMeColor.mm b/iphone/Maps/UIColor+MapsMeColor.mm
index 03a2b4ffbb..a5bcecb83c 100644
--- a/iphone/Maps/UIColor+MapsMeColor.mm
+++ b/iphone/Maps/UIColor+MapsMeColor.mm
@@ -103,6 +103,16 @@ static CGFloat const alpha100 = 1.;
return [[UIColor whiteColor] colorWithAlphaComponent:alpha12];
}
++ (UIColor *)buttonBlueText
+{
+ return [UIColor colorWithRed:scaled(3.) green:scaled(122.) blue:scaled(255.) alpha:alpha100];
+}
+
++ (UIColor *)alertBackground
+{
+ return [UIColor colorWithWhite:1. alpha:.88f];
+}
+
+ (UIColor *)colorWithName:(NSString *)colorName
{
#pragma clang diagnostic push