diff options
author | VladiMihaylenko <vxmihaylenko@gmail.com> | 2016-02-10 16:11:57 +0300 |
---|---|---|
committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:17:03 +0300 |
commit | 3637bef61936e7a26b6ec7e4e08987d6ea37129e (patch) | |
tree | e05da0f09a38a42ebbd7e922b122279f71acfd4d | |
parent | a346495efb949b2286a457956b76203aea59a263 (diff) |
[ios] Refactored cuisine displaying in place page.
-rw-r--r-- | iphone/Maps/Classes/MWMBasePlacePageView.mm | 15 | ||||
-rw-r--r-- | iphone/Maps/Classes/MWMPlacePageEntity.mm | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/iphone/Maps/Classes/MWMBasePlacePageView.mm b/iphone/Maps/Classes/MWMBasePlacePageView.mm index 6466426ba9..2ad75b31c5 100644 --- a/iphone/Maps/Classes/MWMBasePlacePageView.mm +++ b/iphone/Maps/Classes/MWMBasePlacePageView.mm @@ -13,6 +13,8 @@ extern CGFloat const kBottomPlacePageOffset = 15.; extern CGFloat const kLabelsBetweenOffset = 8.; +extern NSString * const kMWMCuisineSeparator; + namespace { CGFloat const kLeftOffset = 16.; @@ -106,7 +108,18 @@ enum class AttributePosition else { self.titleLabel.text = entity.title; - self.typeLabel.text = [entity.category capitalizedString]; + NSString * typeString = entity.category.capitalizedString; + NSRange const range = [typeString rangeOfString:kMWMCuisineSeparator]; + if (range.location != NSNotFound) + { + NSMutableAttributedString * str = [[NSMutableAttributedString alloc] initWithString:typeString]; + [str addAttributes:@{NSForegroundColorAttributeName : [UIColor blackHintText]} range:range]; + self.typeLabel.attributedText = str; + } + else + { + self.typeLabel.text = typeString; + } } [self.typeDescriptionView removeFromSuperview]; diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm index 787c7eada0..e152707221 100644 --- a/iphone/Maps/Classes/MWMPlacePageEntity.mm +++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm @@ -8,12 +8,12 @@ using feature::Metadata; extern NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS"; +extern NSString * const kMWMCuisineSeparator = @" • "; namespace { NSString * const kOSMCuisineSeparator = @";"; -NSString * const kMWMCuisineSeparator = @" • "; NSString * makeOSMCuisineString(NSSet<NSString *> * cuisines) { |