diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.mm b/iphone/Maps/Categories/UIColor+MapsMeColor.mm index 74d51788b6..498e93525e 100644 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.mm +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.mm @@ -63,10 +63,6 @@ NSDictionary * night = @{ @"alertBackground": [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha90], @"blackOpaque": [UIColor colorWithWhite:1. alpha:alpha04], - @"bannerBackground": - [UIColor colorWithRed:scaled(71.) green:scaled(75.) blue:scaled(80.) alpha:alpha100], - @"bannerButtonBackground": - [UIColor colorWithRed:scaled(45.) green:scaled(48.) blue:scaled(50.) alpha:alpha100], @"toastBackground": [UIColor colorWithWhite:0. alpha:alpha87], @"statusBarBackground": [UIColor colorWithWhite:0. alpha:alpha32] }; @@ -113,10 +109,6 @@ NSDictionary * day = @{ [UIColor colorWithRed:scaled(3.) green:scaled(122.) blue:scaled(255.) alpha:alpha26], @"alertBackground" : [UIColor colorWithWhite:1. alpha:alpha90], @"blackOpaque" : [UIColor colorWithWhite:0. alpha:alpha04], - @"bannerBackground" : - [UIColor colorWithRed:scaled(252.) green:scaled(247.) blue:scaled(237.) alpha:alpha100], - @"bannerButtonBackground" : - [UIColor colorWithRed:scaled(242.) green:scaled(234.) blue:scaled(218.) alpha:alpha100], @"toastBackground" : [UIColor colorWithWhite:1. alpha:alpha87], @"statusBarBackground" : [UIColor colorWithWhite:1. alpha:alpha36] }; @@ -356,9 +348,14 @@ UIColor * color(SEL cmd) + (UIColor *)bannerBackground { - return color(_cmd); + return [UIColor colorWithRed:scaled(249) green:scaled(251) blue:scaled(231) alpha:alpha100]; } -+ (UIColor *)bannerButtonBackground { return color(_cmd); } + ++ (UIColor *)bannerButtonBackground +{ + return [UIColor blackDividers]; +} + + (UIColor *)toastBackground { return color(_cmd); } + (UIColor *)statusBarBackground { return color(_cmd); } + (UIColor *)colorWithName:(NSString *)colorName diff --git a/iphone/Maps/Categories/UIFont+MapsMeFonts.h b/iphone/Maps/Categories/UIFont+MapsMeFonts.h index 85c2376178..6f675e5c53 100644 --- a/iphone/Maps/Categories/UIFont+MapsMeFonts.h +++ b/iphone/Maps/Categories/UIFont+MapsMeFonts.h @@ -12,7 +12,9 @@ + (UIFont *)regular24; + (UIFont *)regular32; + (UIFont *)regular52; ++ (UIFont *)medium9; + (UIFont *)medium10; ++ (UIFont *)medium12; + (UIFont *)medium14; + (UIFont *)medium16; + (UIFont *)medium17; diff --git a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm b/iphone/Maps/Categories/UIFont+MapsMeFonts.mm index 6211015014..1be4e8beed 100644 --- a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm +++ b/iphone/Maps/Categories/UIFont+MapsMeFonts.mm @@ -17,7 +17,9 @@ NSString * const kLightFontName = @"HelveticaNeue-Light"; + (UIFont *)regular24 { return [UIFont systemFontOfSize:24]; } + (UIFont *)regular32 { return [UIFont systemFontOfSize:32]; } + (UIFont *)regular52 { return [UIFont systemFontOfSize:52]; } ++ (UIFont *)medium9 { return [UIFont systemFontOfSize:9 weight:UIFontWeightMedium]; } + (UIFont *)medium10 { return [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; } ++ (UIFont *)medium12 { return [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; } + (UIFont *)medium14 { return [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; } + (UIFont *)medium16 { return [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; } + (UIFont *)medium17 { return [UIFont systemFontOfSize:17 weight:UIFontWeightMedium]; } diff --git a/iphone/Maps/UI/Ads/AdBanner.swift b/iphone/Maps/UI/Ads/AdBanner.swift index 0114bfd27b..6be1b35033 100644 --- a/iphone/Maps/UI/Ads/AdBanner.swift +++ b/iphone/Maps/UI/Ads/AdBanner.swift @@ -134,7 +134,6 @@ final class AdBanner: UITableViewCell { case let ad as GoogleNativeBanner: configGoogleNativeBanner(ad: ad) default: assert(false) } - backgroundColor = UIColor.bannerBackground() } @objc func highlightButton() { diff --git a/iphone/Maps/UI/Ads/AdBanner.xib b/iphone/Maps/UI/Ads/AdBanner.xib index 2b3c0e49c4..7a85ec0633 100644 --- a/iphone/Maps/UI/Ads/AdBanner.xib +++ b/iphone/Maps/UI/Ads/AdBanner.xib @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -28,6 +28,18 @@ + + + + + + + + + + + + @@ -38,6 +50,10 @@ + + + + @@ -49,9 +65,16 @@ + + + + + + +