forked from organicmaps/organicmaps
[MAPSME-3810] Clang-format.
This commit is contained in:
parent
7e3571ee4b
commit
0ffbea93c3
6 changed files with 14 additions and 22 deletions
|
@ -7,8 +7,8 @@
|
|||
#import "3party/Alohalytics/src/alohalytics_objc.h"
|
||||
|
||||
#import "AppInfo.h"
|
||||
#import "MWMController.h"
|
||||
#import "MWMConsts.h"
|
||||
#import "MWMController.h"
|
||||
#import "MWMFrameworkHelper.h"
|
||||
#import "MWMKeyboard.h"
|
||||
#import "MWMLocationManager.h"
|
||||
|
|
|
@ -20,7 +20,6 @@ CGFloat const alpha100 = 1.;
|
|||
BOOL isNightMode = NO;
|
||||
|
||||
CGFloat scaled(CGFloat f) { return f / 255.; }
|
||||
|
||||
NSDictionary<NSString *, UIColor *> * night = @{
|
||||
@"primaryDark" :
|
||||
[UIColor colorWithRed:scaled(25.) green:scaled(30) blue:scaled(35.) alpha:alpha100],
|
||||
|
@ -67,7 +66,7 @@ NSDictionary<NSString *, UIColor *> * night = @{
|
|||
@"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],
|
||||
[UIColor colorWithRed:scaled(45.) green:scaled(48.) blue:scaled(50.) alpha:alpha100],
|
||||
@"toastBackground" : [UIColor colorWithWhite:0. alpha:alpha87],
|
||||
@"statusBarBackground" : [UIColor colorWithWhite:0. alpha:alpha32]
|
||||
};
|
||||
|
@ -117,7 +116,7 @@ NSDictionary<NSString *, UIColor *> * day = @{
|
|||
@"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],
|
||||
[UIColor colorWithRed:scaled(242.) green:scaled(234.) blue:scaled(218.) alpha:alpha100],
|
||||
@"toastBackground" : [UIColor colorWithWhite:1. alpha:alpha87],
|
||||
@"statusBarBackground" : [UIColor colorWithWhite:1. alpha:alpha36]
|
||||
};
|
||||
|
@ -318,11 +317,7 @@ UIColor * color(SEL cmd)
|
|||
{
|
||||
return color(_cmd);
|
||||
}
|
||||
|
||||
+ (UIColor *)bannerButtonBackground
|
||||
{
|
||||
return color(_cmd);
|
||||
}
|
||||
+ (UIColor *)bannerButtonBackground { return color(_cmd); }
|
||||
+ (UIColor *)toastBackground { return color(_cmd); }
|
||||
+ (UIColor *)statusBarBackground { return color(_cmd); }
|
||||
+ (UIColor *)colorWithName:(NSString *)colorName
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#import "MWMButton.h"
|
||||
#import "MWMCommon.h"
|
||||
#import "MWMFrameworkListener.h"
|
||||
#import "MWMNetworkPolicy.h"
|
||||
#import "MWMObjectsCategorySelectorController.h"
|
||||
#import "MWMPlacePageManager.h"
|
||||
#import "MWMRoutePreview.h"
|
||||
|
@ -22,7 +23,6 @@
|
|||
#import "MapsAppDelegate.h"
|
||||
#import "Statistics.h"
|
||||
#import "SwiftBridge.h"
|
||||
#import "MWMNetworkPolicy.h"
|
||||
|
||||
#import "3party/Alohalytics/src/alohalytics_objc.h"
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
static NSString * const BOOKMARK_CATEGORY_DELETED_NOTIFICATION =
|
||||
@"BookmarkCategoryDeletedNotification";
|
||||
@"BookmarkCategoryDeletedNotification";
|
||||
|
||||
static NSString * const BOOKMARK_DELETED_NOTIFICATION = @"BookmarkDeletedNotification";
|
||||
|
||||
|
|
|
@ -233,11 +233,7 @@ using namespace place_page;
|
|||
: nil;
|
||||
}
|
||||
|
||||
- (banners::Banner)banner
|
||||
{
|
||||
return m_info.GetBanner();
|
||||
}
|
||||
|
||||
- (banners::Banner)banner { return m_info.GetBanner(); }
|
||||
- (void)assignOnlinePriceToLabel:(UILabel *)label
|
||||
{
|
||||
NSAssert(self.isBooking, @"Online price must be assigned to booking object!");
|
||||
|
|
|
@ -232,17 +232,18 @@ array<Class, 8> const kPreviewCells = {{[_MWMPPPTitle class], [_MWMPPPExternalTi
|
|||
case PreviewRows::Banner:
|
||||
auto banner = [data banner];
|
||||
NSString * bannerId = @(banner.m_bannerId.c_str());
|
||||
[Statistics logEvent:kStatPlacePageBannerShow withParameters:@{kStatTags : data.statisticsTags,
|
||||
kStatBanner : bannerId,
|
||||
kStatState : IPAD ? @1 : @0}];
|
||||
[Statistics logEvent:kStatPlacePageBannerShow
|
||||
withParameters:@{
|
||||
kStatTags : data.statisticsTags,
|
||||
kStatBanner : bannerId,
|
||||
kStatState : IPAD ? @1 : @0
|
||||
}];
|
||||
auto bannerCell = static_cast<MWMFBAdsBanner *>(c);
|
||||
using namespace banners;
|
||||
switch (banner.m_type)
|
||||
{
|
||||
case Banner::Type::None: NSAssert(false, @"Invalid banner type"); break;
|
||||
case Banner::Type::Facebook:
|
||||
[bannerCell configWithPlacementID:bannerId];
|
||||
break;
|
||||
case Banner::Type::Facebook: [bannerCell configWithPlacementID:bannerId]; break;
|
||||
}
|
||||
self.cachedBannerCell = bannerCell;
|
||||
return bannerCell;
|
||||
|
|
Loading…
Add table
Reference in a new issue