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

[ios] Compilation fixes after rebase.

Browse source
This commit is contained in:
Alex Zolotarev 2016-01-18 15:45:19 +03:00 • committed by Sergey Yershov
parent 617225df5c
commit 64b8d162e6
5 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
View file

@ -41,7 +41,7 @@
- (void)viewWillDisappear:(BOOL)animated
{
UINavigationBar * navBar = self.navigationController.navigationBar;
[MapsAppDelegate.theApp customizeAppearanceForNavigationBar:navBar];
[MapsAppDelegate customizeAppearanceForNavigationBar:navBar];
}
- (BOOL)shouldAutorotate

1
iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib
View file

@ -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>

4
iphone/Maps/Classes/MapsAppDelegate.h
View file

@ -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

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

@ -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]];

1
iphone/Maps/UIColor+MapsMeColor.h
View file

@ -11,7 +11,6 @@
+ (UIColor *)orange;
+ (UIColor *)linkBlue;
+ (UIColor *)linkBlueDark;
+ (UIColor *)linkBlueDisabled;
+ (UIColor *)blackPrimaryText;
+ (UIColor *)blackSecondaryText;
+ (UIColor *)blackStatusBarBackground;