From 64b8d162e6afeca997e5b75e64666d0cef010e18 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@maps.me>
Date: Mon, 18 Jan 2016 15:45:19 +0300
Subject: [PATCH] [ios] Compilation fixes after rebase.

---
 .../Login/MWMAuthorizationLoginViewController.mm            | 2 +-
 .../Cells/MWMOpeningHoursAddClosedTableViewCell.xib         | 1 -
 iphone/Maps/Classes/MapsAppDelegate.h                       | 4 ++--
 iphone/Maps/Classes/MapsAppDelegate.mm                      | 6 +++---
 iphone/Maps/UIColor+MapsMeColor.h                           | 1 -
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
index 6a6c5804e9..824ae8f3a6 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
@@ -41,7 +41,7 @@
 - (void)viewWillDisappear:(BOOL)animated
 {
   UINavigationBar * navBar = self.navigationController.navigationBar;
-  [MapsAppDelegate.theApp customizeAppearanceForNavigationBar:navBar];
+  [MapsAppDelegate customizeAppearanceForNavigationBar:navBar];
 }
 
 - (BOOL)shouldAutorotate
diff --git a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib
index 3e37f221af..91895a37df 100644
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib
@@ -25,7 +25,6 @@
                             <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="add_hours_closed"/>
-                            <userDefinedRuntimeAttribute type="string" keyPath="textColorDisabledName" value="linkBlueDisabled"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueDark"/>
                         </userDefinedRuntimeAttributes>
                         <connections>
diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h
index 7c5a2e75d5..b54da5361f 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.h
+++ b/iphone/Maps/Classes/MapsAppDelegate.h
@@ -33,7 +33,9 @@ typedef NS_ENUM(NSUInteger, MWMRoutingPlaneMode)
 
 - (void)enableStandby;
 - (void)disableStandby;
+
 + (void)customizeAppearance;
++ (void)customizeAppearanceForNavigationBar:(UINavigationBar *)navigationBar;
 
 - (void)disableDownloadIndicator;
 - (void)enableDownloadIndicator;
@@ -49,6 +51,4 @@ typedef NS_ENUM(NSUInteger, MWMRoutingPlaneMode)
 
 - (void)setMapStyle:(MapStyle)mapStyle;
 
-- (void)customizeAppearanceForNavigationBar:(UINavigationBar *)navigationBar;
-
 @end
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 877859c2ec..73c49ba0cb 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -512,7 +512,7 @@ void InitLocalizedStrings()
   [self.mapViewController setMapStyle: mapStyle];
 }
 
- (NSDictionary *)navigationBarTextAttributes
++ (NSDictionary *)navigationBarTextAttributes
 {
   return @{
     NSForegroundColorAttributeName : [UIColor whitePrimaryText],
@@ -520,7 +520,7 @@ void InitLocalizedStrings()
   };
 }
 
-- (void)customizeAppearanceForNavigationBar:(UINavigationBar *)navigationBar
++ (void)customizeAppearanceForNavigationBar:(UINavigationBar *)navigationBar
 {
   navigationBar.tintColor = [UIColor primary];
   navigationBar.barTintColor = [UIColor primary];
@@ -530,7 +530,7 @@ void InitLocalizedStrings()
   navigationBar.translucent = NO;
 }
 
-- (void)customizeAppearance
++ (void)customizeAppearance
 {
   [self customizeAppearanceForNavigationBar:[UINavigationBar appearance]];
 
diff --git a/iphone/Maps/UIColor+MapsMeColor.h b/iphone/Maps/UIColor+MapsMeColor.h
index fc9aa920d5..194daf7fc8 100644
--- a/iphone/Maps/UIColor+MapsMeColor.h
+++ b/iphone/Maps/UIColor+MapsMeColor.h
@@ -11,7 +11,6 @@
 + (UIColor *)orange;
 + (UIColor *)linkBlue;
 + (UIColor *)linkBlueDark;
-+ (UIColor *)linkBlueDisabled;
 + (UIColor *)blackPrimaryText;
 + (UIColor *)blackSecondaryText;
 + (UIColor *)blackStatusBarBackground;