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

[ios] Fixed crash and wrong banner color.

Browse source
This commit is contained in:
VladiMihaylenko 2018-04-09 18:21:32 +03:00 • committed by Roman Kuznetsov
parent 5ebc0be5c1
commit 785b4d0cbd
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Categories/UIColor+MapsMeColor.mm
View file

@ -64,7 +64,8 @@ NSDictionary<NSString *, UIColor *> * night = @{
[UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha90],
@"blackOpaque": [UIColor colorWithWhite:1. alpha:alpha04],
@"toastBackground": [UIColor colorWithWhite:0. alpha:alpha87],
@"statusBarBackground": [UIColor colorWithWhite:0. alpha:alpha32]
@"statusBarBackground": [UIColor colorWithWhite:0. alpha:alpha32],
@"bannerBackground" : [UIColor colorWithRed:scaled(71) green:scaled(75) blue:scaled(79) alpha:alpha100]
};
NSDictionary<NSString *, UIColor *> * day = @{
@ -110,7 +111,8 @@ NSDictionary<NSString *, UIColor *> * day = @{
@"alertBackground" : [UIColor colorWithWhite:1. alpha:alpha90],
@"blackOpaque" : [UIColor colorWithWhite:0. alpha:alpha04],
@"toastBackground" : [UIColor colorWithWhite:1. alpha:alpha87],
@"statusBarBackground" : [UIColor colorWithWhite:1. alpha:alpha36]
@"statusBarBackground" : [UIColor colorWithWhite:1. alpha:alpha36],
@"bannerBackground" : [UIColor colorWithRed:scaled(249) green:scaled(251) blue:scaled(231) alpha:alpha100]
};
UIColor * color(SEL cmd)
@ -358,7 +360,7 @@ UIColor * color(SEL cmd)
+ (UIColor *)bannerBackground
{
return [UIColor colorWithRed:scaled(249) green:scaled(251) blue:scaled(231) alpha:alpha100];
return color(_cmd);
}
+ (UIColor *)bannerButtonBackground

2
iphone/Maps/UI/Search/MWMSearchView.xib
View file

@ -268,7 +268,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="updateFilter" destination="-1" eventType="touchUpInside" id="Dpe-pe-Kps"/>
<action selector="updateTap" destination="-1" eventType="touchUpInside" id="HXM-IS-ykz"/>
</connections>
</button>
<button hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vUE-KN-mbf" customClass="MWMButton">